From b10768d7539d01df09cdbd2ec66a82406c382e7c Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Sun, 13 Dec 2020 14:27:45 -0600
Subject: Use rgbgfx instead of gfx.py and use pokered's Makefile structure

---
 src/audio/music1.asm                | 116 ++++++++---------
 src/audio/music2.asm                | 116 ++++++++---------
 src/audio/sfx.asm                   |  18 +--
 src/engine/bank04.asm               |   4 +-
 src/engine/bank1c.asm               |   6 +-
 src/engine/home.asm                 | 244 ++++++++++++++++++------------------
 src/gfx/cards/grassenergy.8x6.png   | Bin 542 -> 593 bytes
 src/gfx/duel/cgb_symbols.t7.png     | Bin 2960 -> 1270 bytes
 src/gfx/duel/dmg_sgb_symbols.t7.png | Bin 3107 -> 1374 bytes
 src/gfx/duel/other.t7.png           | Bin 1588 -> 820 bytes
 src/gfx/fonts/full_width/4.t3.png   | Bin 2279 -> 1153 bytes
 src/gfx/fonts/symbols.png           | Bin 1398 -> 726 bytes
 src/layout.link                     | 180 ++++++++++++++++++++++++++
 src/rgbdscheck.asm                  |  12 ++
 14 files changed, 444 insertions(+), 252 deletions(-)
 create mode 100644 src/layout.link
 create mode 100644 src/rgbdscheck.asm

(limited to 'src')

diff --git a/src/audio/music1.asm b/src/audio/music1.asm
index a3a6e9e..03c55b9 100644
--- a/src/audio/music1.asm
+++ b/src/audio/music1.asm
@@ -106,13 +106,13 @@ Func_f406f: ; f406f (3d:406f)
 
 Music1_Init: ; f407d (3d:407d)
 	xor a
-	ld [rNR52], a
+	ldh [rNR52], a
 	ld a, $80
-	ld [rNR52], a
+	ldh [rNR52], a
 	ld a, $77
-	ld [rNR50], a
+	ldh [rNR50], a
 	ld a, $ff
-	ld [rNR51], a
+	ldh [rNR51], a
 	ld a, $3d
 	ld [wCurSongBank], a
 	ld a, $80
@@ -216,34 +216,34 @@ Music1_StopAllChannels: ; f414b (3d:414b)
 	bit 0, d
 	jr nz, .stop_channel_2
 	ld a, $8
-	ld [rNR12], a
+	ldh [rNR12], a
 	swap a
-	ld [rNR14], a
+	ldh [rNR14], a
 .stop_channel_2
 	xor a
 	ld [wMusicIsPlaying + 1], a
 	bit 1, d
 	jr nz, .stop_channel_4
 	ld a, $8
-	ld [rNR22], a
+	ldh [rNR22], a
 	swap a
-	ld [rNR24], a
+	ldh [rNR24], a
 .stop_channel_4
 	xor a
 	ld [wMusicIsPlaying + 3], a
 	bit 3, d
 	jr nz, .stop_channel_3
 	ld a, $8
-	ld [rNR42], a
+	ldh [rNR42], a
 	swap a
-	ld [rNR44], a
+	ldh [rNR44], a
 .stop_channel_3
 	xor a
 	ld [wMusicIsPlaying + 2], a
 	bit 2, d
 	jr nz, .done
 	ld a, $0
-	ld [rNR32], a
+	ldh [rNR32], a
 .done
 	ret
 
@@ -429,9 +429,9 @@ Music1_UpdateChannel1: ; f42a5 (3d:42a5)
 	bit 0, a
 	jr nz, .asm_f4309
 	ld a, $8
-	ld [rNR12], a
+	ldh [rNR12], a
 	swap a
-	ld [rNR14], a
+	ldh [rNR14], a
 .asm_f4309
 	ret
 
@@ -482,9 +482,9 @@ Music1_UpdateChannel2: ; f430a (3d:430a)
 	bit 1, a
 	jr nz, .asm_f436e
 	ld a, $8
-	ld [rNR22], a
+	ldh [rNR22], a
 	swap a
-	ld [rNR24], a
+	ldh [rNR24], a
 .asm_f436e
 	ret
 
@@ -506,7 +506,7 @@ Music1_UpdateChannel3: ; f436f (3d:436f)
 	cp $1
 	jr z, .asm_f4398
 	ld a, [wMusicE9 + 2]
-	ld [rNR32], a
+	ldh [rNR32], a
 .asm_f4398
 	ld a, [wddbb + 2]
 	dec a
@@ -531,9 +531,9 @@ Music1_UpdateChannel3: ; f436f (3d:436f)
 	bit 2, a
 	jr nz, .asm_f43cd
 	ld a, $0
-	ld [rNR32], a
+	ldh [rNR32], a
 	ld a, $80
-	ld [rNR34], a
+	ldh [rNR34], a
 .asm_f43cd
 	ret
 
@@ -569,9 +569,9 @@ Music1_UpdateChannel4: ; f43ce (3d:43ce)
 	xor a
 	ld [wddef], a
 	ld a, $8
-	ld [rNR42], a
+	ldh [rNR42], a
 	swap a
-	ld [rNR44], a
+	ldh [rNR44], a
 .asm_f4413
 	ret
 
@@ -1167,19 +1167,19 @@ Func_f4714: ; f4714 (3d:4714)
 	cp $80
 	jr z, .asm_f4733
 	ld a, [wMusicVolume]
-	ld [rNR12], a
+	ldh [rNR12], a
 	ld d, $80
 .asm_f4733
 	ld [hl], $2
 	ld a, $8
-	ld [rNR10], a
+	ldh [rNR10], a
 	ld a, [wMusicDuty1]
-	ld [rNR11], a
+	ldh [rNR11], a
 	ld a, [wMusicCh1CurPitch]
-	ld [rNR13], a
+	ldh [rNR13], a
 	ld a, [wMusicCh1CurOctave]
 	or d
-	ld [rNR14], a
+	ldh [rNR14], a
 .asm_f4749
 	ret
 .asm_f474a
@@ -1206,17 +1206,17 @@ Func_f475a: ; f475a (3d:475a)
 	cp $80
 	jr z, .asm_f4779
 	ld a, [wMusicVolume + 1]
-	ld [rNR22], a
+	ldh [rNR22], a
 	ld d, $80
 .asm_f4779
 	ld [hl], $2
 	ld a, [wMusicDuty2]
-	ld [rNR21], a
+	ldh [rNR21], a
 	ld a, [wMusicCh2CurPitch]
-	ld [rNR23], a
+	ldh [rNR23], a
 	ld a, [wMusicCh2CurOctave]
 	or d
-	ld [rNR24], a
+	ldh [rNR24], a
 .asm_f478b
 	ret
 .asm_f478c
@@ -1239,7 +1239,7 @@ Func_f479c: ; f479c (3d:479c)
 	or a
 	jr z, .no_wave_change
 	xor a
-	ld [rNR30], a
+	ldh [rNR30], a
 	call Music1_LoadWaveInstrument
 	ld d, $80
 .no_wave_change
@@ -1251,28 +1251,28 @@ Func_f479c: ; f479c (3d:479c)
 	cp $80
 	jr z, .asm_f47cc
 	ld a, [wMusicVolume + 2]
-	ld [rNR32], a
+	ldh [rNR32], a
 	xor a
-	ld [rNR30], a
+	ldh [rNR30], a
 	ld d, $80
 .asm_f47cc
 	ld [hl], $2
 	xor a
-	ld [rNR31], a
+	ldh [rNR31], a
 	ld a, [wMusicCh3CurPitch]
-	ld [rNR33], a
+	ldh [rNR33], a
 	ld a, $80
-	ld [rNR30], a
+	ldh [rNR30], a
 	ld a, [wMusicCh3CurOctave]
 	or d
-	ld [rNR34], a
+	ldh [rNR34], a
 .asm_f47e0
 	ret
 .asm_f47e1
 	ld hl, wMusicTie
 	ld [hl], $0
 	xor a
-	ld [rNR30], a
+	ldh [rNR30], a
 	ret
 
 Music1_LoadWaveInstrument: ; f479c (3d:47ea)
@@ -1349,7 +1349,7 @@ Func_f4839: ; f4839 (3d:4839)
 	jr nz, .asm_f4853
 	jr asm_f482a
 .asm_f4853
-	ld [rNR43], a
+	ldh [rNR43], a
 	inc de
 	ld a, d
 	ld [hld], a
@@ -1368,7 +1368,7 @@ Func_f485a: ; f485a (3d:485a)
 
 Func_f4866: ; f4866 (3d:4866)
 	ld a, [wMusicPanning]
-	ld [rNR50], a
+	ldh [rNR50], a
 	ld a, [wdd8c]
 	or a
 	ld hl, wMusicDC
@@ -1397,7 +1397,7 @@ Func_f4866: ; f4866 (3d:4866)
 	swap e
 	or e
 	and d
-	ld [rNR51], a
+	ldh [rNR51], a
 	ret
 
 Music1_UpdateVibrato: ; f4898 (3d:4898)
@@ -1495,13 +1495,13 @@ Func_f490b: ; f490b (3d:490b)
 	bit 0, a
 	jr nz, .done
 	ld a, e
-	ld [rNR13], a
-	ld a, [rNR11]
+	ldh [rNR13], a
+	ldh a, [rNR11]
 	and $c0
-	ld [rNR11], a
+	ldh [rNR11], a
 	ld a, d
 	and $3f
-	ld [rNR14], a
+	ldh [rNR14], a
 	ret
 .not_channel_1
 	cp $1
@@ -1513,12 +1513,12 @@ Func_f490b: ; f490b (3d:490b)
 	bit 1, a
 	jr nz, .done
 	ld a, e
-	ld [rNR23], a
-	ld a, [rNR21]
+	ldh [rNR23], a
+	ldh a, [rNR21]
 	and $c0
-	ld [rNR21], a
+	ldh [rNR21], a
 	ld a, d
-	ld [rNR24], a
+	ldh [rNR24], a
 	ret
 .not_channel_2
 	cp $2
@@ -1530,11 +1530,11 @@ Func_f490b: ; f490b (3d:490b)
 	bit 2, a
 	jr nz, .done
 	ld a, e
-	ld [rNR33], a
+	ldh [rNR33], a
 	xor a
-	ld [rNR31], a
+	ldh [rNR31], a
 	ld a, d
-	ld [rNR34], a
+	ldh [rNR34], a
 .done
 	ret
 
@@ -1567,28 +1567,28 @@ Func_f4980: ; f4980 (3d:4980)
 	bit 0, d
 	jr nz, .asm_f4990
 	ld a, $8
-	ld [rNR12], a
+	ldh [rNR12], a
 	swap a
-	ld [rNR14], a
+	ldh [rNR14], a
 .asm_f4990
 	bit 1, d
 	jr nz, .asm_f499c
 	swap a
-	ld [rNR22], a
+	ldh [rNR22], a
 	swap a
-	ld [rNR24], a
+	ldh [rNR24], a
 .asm_f499c
 	bit 3, d
 	jr nz, .asm_f49a8
 	swap a
-	ld [rNR42], a
+	ldh [rNR42], a
 	swap a
-	ld [rNR44], a
+	ldh [rNR44], a
 .asm_f49a8
 	bit 2, d
 	jr nz, .asm_f49b0
 	ld a, $0
-	ld [rNR32], a
+	ldh [rNR32], a
 .asm_f49b0
 	ret
 
diff --git a/src/audio/music2.asm b/src/audio/music2.asm
index e13389e..4a8178e 100644
--- a/src/audio/music2.asm
+++ b/src/audio/music2.asm
@@ -106,13 +106,13 @@ Func_f806f: ; f806f (3e:406f)
 
 Music2_Init: ; f807d (3e:407d)
 	xor a
-	ld [rNR52], a
+	ldh [rNR52], a
 	ld a, $80
-	ld [rNR52], a
+	ldh [rNR52], a
 	ld a, $77
-	ld [rNR50], a
+	ldh [rNR50], a
 	ld a, $ff
-	ld [rNR51], a
+	ldh [rNR51], a
 	ld a, $3d
 	ld [wCurSongBank], a
 	ld a, $80
@@ -216,34 +216,34 @@ Music2_StopAllChannels: ; f814b (3e:414b)
 	bit 0, d
 	jr nz, .stop_channel_2
 	ld a, $8
-	ld [rNR12], a
+	ldh [rNR12], a
 	swap a
-	ld [rNR14], a
+	ldh [rNR14], a
 .stop_channel_2
 	xor a
 	ld [wMusicIsPlaying + 1], a
 	bit 1, d
 	jr nz, .stop_channel_4
 	ld a, $8
-	ld [rNR22], a
+	ldh [rNR22], a
 	swap a
-	ld [rNR24], a
+	ldh [rNR24], a
 .stop_channel_4
 	xor a
 	ld [wMusicIsPlaying + 3], a
 	bit 3, d
 	jr nz, .stop_channel_3
 	ld a, $8
-	ld [rNR42], a
+	ldh [rNR42], a
 	swap a
-	ld [rNR44], a
+	ldh [rNR44], a
 .stop_channel_3
 	xor a
 	ld [wMusicIsPlaying + 2], a
 	bit 2, d
 	jr nz, .done
 	ld a, $0
-	ld [rNR32], a
+	ldh [rNR32], a
 .done
 	ret
 
@@ -429,9 +429,9 @@ Music2_UpdateChannel1: ; f82a5 (3e:42a5)
 	bit 0, a
 	jr nz, .asm_f8309
 	ld a, $8
-	ld [rNR12], a
+	ldh [rNR12], a
 	swap a
-	ld [rNR14], a
+	ldh [rNR14], a
 .asm_f8309
 	ret
 
@@ -482,9 +482,9 @@ Music2_UpdateChannel2: ; f830a (3e:430a)
 	bit 1, a
 	jr nz, .asm_f836e
 	ld a, $8
-	ld [rNR22], a
+	ldh [rNR22], a
 	swap a
-	ld [rNR24], a
+	ldh [rNR24], a
 .asm_f836e
 	ret
 
@@ -506,7 +506,7 @@ Music2_UpdateChannel3: ; f836f (3e:436f)
 	cp $1
 	jr z, .asm_f8398
 	ld a, [wMusicE9 + 2]
-	ld [rNR32], a
+	ldh [rNR32], a
 .asm_f8398
 	ld a, [wddbb + 2]
 	dec a
@@ -531,9 +531,9 @@ Music2_UpdateChannel3: ; f836f (3e:436f)
 	bit 2, a
 	jr nz, .asm_f83cd
 	ld a, $0
-	ld [rNR32], a
+	ldh [rNR32], a
 	ld a, $80
-	ld [rNR34], a
+	ldh [rNR34], a
 .asm_f83cd
 	ret
 
@@ -569,9 +569,9 @@ Music2_UpdateChannel4: ; f83ce (3e:43ce)
 	xor a
 	ld [wddef], a
 	ld a, $8
-	ld [rNR42], a
+	ldh [rNR42], a
 	swap a
-	ld [rNR44], a
+	ldh [rNR44], a
 .asm_f8413
 	ret
 
@@ -1167,19 +1167,19 @@ Func_f8714: ; f8714 (3e:4714)
 	cp $80
 	jr z, .asm_f8733
 	ld a, [wMusicVolume]
-	ld [rNR12], a
+	ldh [rNR12], a
 	ld d, $80
 .asm_f8733
 	ld [hl], $2
 	ld a, $8
-	ld [rNR10], a
+	ldh [rNR10], a
 	ld a, [wMusicDuty1]
-	ld [rNR11], a
+	ldh [rNR11], a
 	ld a, [wMusicCh1CurPitch]
-	ld [rNR13], a
+	ldh [rNR13], a
 	ld a, [wMusicCh1CurOctave]
 	or d
-	ld [rNR14], a
+	ldh [rNR14], a
 .asm_f8749
 	ret
 .asm_f874a
@@ -1206,17 +1206,17 @@ Func_f875a: ; f875a (3e:475a)
 	cp $80
 	jr z, .asm_f8779
 	ld a, [wMusicVolume + 1]
-	ld [rNR22], a
+	ldh [rNR22], a
 	ld d, $80
 .asm_f8779
 	ld [hl], $2
 	ld a, [wMusicDuty2]
-	ld [rNR21], a
+	ldh [rNR21], a
 	ld a, [wMusicCh2CurPitch]
-	ld [rNR23], a
+	ldh [rNR23], a
 	ld a, [wMusicCh2CurOctave]
 	or d
-	ld [rNR24], a
+	ldh [rNR24], a
 .asm_f878b
 	ret
 .asm_f878c
@@ -1239,7 +1239,7 @@ Func_f879c: ; f879c (3e:479c)
 	or a
 	jr z, .no_wave_change
 	xor a
-	ld [rNR30], a
+	ldh [rNR30], a
 	call Music2_LoadWaveInstrument
 	ld d, $80
 .no_wave_change
@@ -1251,28 +1251,28 @@ Func_f879c: ; f879c (3e:479c)
 	cp $80
 	jr z, .asm_f87cc
 	ld a, [wMusicVolume + 2]
-	ld [rNR32], a
+	ldh [rNR32], a
 	xor a
-	ld [rNR30], a
+	ldh [rNR30], a
 	ld d, $80
 .asm_f87cc
 	ld [hl], $2
 	xor a
-	ld [rNR31], a
+	ldh [rNR31], a
 	ld a, [wMusicCh3CurPitch]
-	ld [rNR33], a
+	ldh [rNR33], a
 	ld a, $80
-	ld [rNR30], a
+	ldh [rNR30], a
 	ld a, [wMusicCh3CurOctave]
 	or d
-	ld [rNR34], a
+	ldh [rNR34], a
 .asm_f87e0
 	ret
 .asm_f87e1
 	ld hl, wMusicTie
 	ld [hl], $0
 	xor a
-	ld [rNR30], a
+	ldh [rNR30], a
 	ret
 
 Music2_LoadWaveInstrument: ; f879c (3e:47ea)
@@ -1349,7 +1349,7 @@ Func_f8839: ; f8839 (3e:4839)
 	jr nz, .asm_f8853
 	jr asm_f882a
 .asm_f8853
-	ld [rNR43], a
+	ldh [rNR43], a
 	inc de
 	ld a, d
 	ld [hld], a
@@ -1368,7 +1368,7 @@ Func_f885a: ; f885a (3e:485a)
 
 Func_f8866: ; f8866 (3e:4866)
 	ld a, [wMusicPanning]
-	ld [rNR50], a
+	ldh [rNR50], a
 	ld a, [wdd8c]
 	or a
 	ld hl, wMusicDC
@@ -1397,7 +1397,7 @@ Func_f8866: ; f8866 (3e:4866)
 	swap e
 	or e
 	and d
-	ld [rNR51], a
+	ldh [rNR51], a
 	ret
 
 Func_f8898: ; f8898 (3e:4898)
@@ -1495,13 +1495,13 @@ Func_f890b: ; f890b (3e:490b)
 	bit 0, a
 	jr nz, .done
 	ld a, e
-	ld [rNR13], a
-	ld a, [rNR11]
+	ldh [rNR13], a
+	ldh a, [rNR11]
 	and $c0
-	ld [rNR11], a
+	ldh [rNR11], a
 	ld a, d
 	and $3f
-	ld [rNR14], a
+	ldh [rNR14], a
 	ret
 .not_channel_1
 	cp $1
@@ -1513,12 +1513,12 @@ Func_f890b: ; f890b (3e:490b)
 	bit 1, a
 	jr nz, .done
 	ld a, e
-	ld [rNR23], a
-	ld a, [rNR21]
+	ldh [rNR23], a
+	ldh a, [rNR21]
 	and $c0
-	ld [rNR21], a
+	ldh [rNR21], a
 	ld a, d
-	ld [rNR24], a
+	ldh [rNR24], a
 	ret
 .not_channel_2
 	cp $2
@@ -1530,11 +1530,11 @@ Func_f890b: ; f890b (3e:490b)
 	bit 2, a
 	jr nz, .done
 	ld a, e
-	ld [rNR33], a
+	ldh [rNR33], a
 	xor a
-	ld [rNR31], a
+	ldh [rNR31], a
 	ld a, d
-	ld [rNR34], a
+	ldh [rNR34], a
 .done
 	ret
 
@@ -1567,28 +1567,28 @@ Func_f8980: ; f8980 (3e:4980)
 	bit 0, d
 	jr nz, .asm_f8990
 	ld a, $8
-	ld [rNR12], a
+	ldh [rNR12], a
 	swap a
-	ld [rNR14], a
+	ldh [rNR14], a
 .asm_f8990
 	bit 1, d
 	jr nz, .asm_f899c
 	swap a
-	ld [rNR22], a
+	ldh [rNR22], a
 	swap a
-	ld [rNR24], a
+	ldh [rNR24], a
 .asm_f899c
 	bit 3, d
 	jr nz, .asm_f89a8
 	swap a
-	ld [rNR42], a
+	ldh [rNR42], a
 	swap a
-	ld [rNR44], a
+	ldh [rNR44], a
 .asm_f89a8
 	bit 2, d
 	jr nz, .asm_f89b0
 	ld a, $0
-	ld [rNR32], a
+	ldh [rNR32], a
 .asm_f89b0
 	ret
 
diff --git a/src/audio/sfx.asm b/src/audio/sfx.asm
index 6b3e2bc..c682191 100644
--- a/src/audio/sfx.asm
+++ b/src/audio/sfx.asm
@@ -400,7 +400,7 @@ SFX_7: ; fc202 (3f:4202)
 	ld h, [hl]
 	ld l, a
 	ld a, $0
-	ld [rNR30], a
+	ldh [rNR30], a
 	ld b, d
 	ld de, $ff30
 .asm_fc215
@@ -414,7 +414,7 @@ SFX_7: ; fc202 (3f:4202)
 	ld a, $1
 	ld [wMusicWaveChange], a
 	ld a, $80
-	ld [rNR30], a
+	ldh [rNR30], a
 	ld b, $0
 	pop hl
 	jp Func_fc094
@@ -481,14 +481,14 @@ Func_fc26c: ; fc26c (3f:426c)
 
 Func_fc279: ; fc279 (3f:4279)
 	ld a, $8
-	ld a, [rNR12]
-	ld a, [rNR22]
-	ld a, [rNR32]
-	ld a, [rNR42]
+	ldh a, [rNR12]
+	ldh a, [rNR22]
+	ldh a, [rNR32]
+	ldh a, [rNR42]
 	ld a, $80
-	ld a, [rNR14]
-	ld a, [rNR24]
-	ld a, [rNR44]
+	ldh a, [rNR14]
+	ldh a, [rNR24]
+	ldh a, [rNR44]
 	xor a
 	ld [wdd8c], a
 	ret
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm
index a1e504f..8fb4d29 100644
--- a/src/engine/bank04.asm
+++ b/src/engine/bank04.asm
@@ -13,8 +13,8 @@ Func_10000: ; 10000 (4:4000)
 	bit LCDC_ENABLE_F, a
 	jr nz, .asm_10025
 	xor a
-	ld [rSCX], a
-	ld [rSCY], a
+	ldh [rSCX], a
+	ldh [rSCY], a
 
 .asm_10025
 	call Func_1288c
diff --git a/src/engine/bank1c.asm b/src/engine/bank1c.asm
index cff0a96..b8ac4fb 100644
--- a/src/engine/bank1c.asm
+++ b/src/engine/bank1c.asm
@@ -176,13 +176,13 @@ Func_70136: ; 70136 (1c:4136)
 	or LCDC_BGON
 	ld [wLCDC], a
 	ld a, %11100100
-	ld [rBGP], a
+	ldh [rBGP], a
 	call SetBGP
 	xor a
 	ldh [hSCX], a
-	ld [rSCX], a
+	ldh [rSCX], a
 	ldh [hSCY], a
-	ld [rSCY], a
+	ldh [rSCY], a
 	pop de
 	pop bc
 	pop hl
diff --git a/src/engine/home.asm b/src/engine/home.asm
index ff887fd..f33ec2f 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -39,8 +39,8 @@ Start: ; 0150 (0:0150)
 	ld sp, $fffe
 	push af
 	xor a
-	ld [rIF], a
-	ld [rIE], a
+	ldh [rIF], a
+	ldh [rIE], a
 	call ZeroRAM
 	ld a, $1
 	call BankswitchROM
@@ -87,16 +87,16 @@ VBlankHandler: ; 019b (0:019b)
 .no_oam_copy
 	; flush scaling/windowing parameters
 	ldh a, [hSCX]
-	ld [rSCX], a
+	ldh [rSCX], a
 	ldh a, [hSCY]
-	ld [rSCY], a
+	ldh [rSCY], a
 	ldh a, [hWX]
-	ld [rWX], a
+	ldh [rWX], a
 	ldh a, [hWY]
-	ld [rWY], a
+	ldh [rWY], a
 	; flush LCDC
 	ld a, [wLCDC]
-	ld [rLCDC], a
+	ldh [rLCDC], a
 	ei
 	call wVBlankFunctionTrampoline
 	call FlushPalettesIfRequested
@@ -186,17 +186,17 @@ SetupTimer: ; 0241 (0:0241)
 	ld b, -68 ; Value for Normal Speed
 	call CheckForCGB
 	jr c, .set_timer
-	ld a, [rKEY1]
+	ldh a, [rKEY1]
 	and $80
 	jr z, .set_timer
 	ld b, $100 - 2 * 68 ; Value for CGB Double Speed
 .set_timer
 	ld a, b
-	ld [rTMA], a
+	ldh [rTMA], a
 	ld a, TAC_16384_HZ
-	ld [rTAC], a
+	ldh [rTAC], a
 	ld a, TAC_START | TAC_16384_HZ
-	ld [rTAC], a
+	ldh [rTAC], a
 	ret
 
 ; return carry if not CGB
@@ -231,36 +231,36 @@ EnableLCD: ; 0277 (0:0277)
 	ret nz               ; assert that LCD is off
 	or LCDC_ON           ;
 	ld [wLCDC], a        ;
-	ld [rLCDC], a        ; turn LCD on
+	ldh [rLCDC], a       ; turn LCD on
 	ld a, FLUSH_ALL_PALS
 	ld [wFlushPaletteFlags], a
 	ret
 
 ; wait for vblank, then turn LCD off
 DisableLCD: ; 028a (0:028a)
-	ld a, [rLCDC]        ;
+	ldh a, [rLCDC]       ;
 	bit LCDC_ENABLE_F, a ;
 	ret z                ; assert that LCD is on
-	ld a, [rIE]
+	ldh a, [rIE]
 	ld [wIE], a
 	res INT_VBLANK, a    ;
-	ld [rIE], a          ; disable vblank interrupt
+	ldh [rIE], a         ; disable vblank interrupt
 .wait_vblank
-	ld a, [rLY]          ;
+	ldh a, [rLY]         ;
 	cp LY_VBLANK         ;
 	jr nz, .wait_vblank  ; wait for vblank
-	ld a, [rLCDC]        ;
+	ldh a, [rLCDC]       ;
 	and LCDC_OFF         ;
-	ld [rLCDC], a        ;
+	ldh [rLCDC], a       ;
 	ld a, [wLCDC]        ;
 	and LCDC_OFF         ;
 	ld [wLCDC], a        ; turn LCD off
 	xor a
-	ld [rBGP], a
-	ld [rOBP0], a
-	ld [rOBP1], a
+	ldh [rBGP], a
+	ldh [rOBP0], a
+	ldh [rOBP1], a
 	ld a, [wIE]
-	ld [rIE], a
+	ldh [rIE], a
 	ret
 
 ; set OBJ size: 8x8
@@ -293,50 +293,50 @@ Set_WD_off: ; 02d4 (0:02d4)
 
 ; enable timer interrupt
 EnableInt_Timer: ; 02dd (0:02dd)
-	ld a, [rIE]
+	ldh a, [rIE]
 	or 1 << INT_TIMER
-	ld [rIE], a
+	ldh [rIE], a
 	ret
 
 ; enable vblank interrupt
 EnableInt_VBlank: ; 02e4 (0:02e4)
-	ld a, [rIE]
+	ldh a, [rIE]
 	or 1 << INT_VBLANK
-	ld [rIE], a
+	ldh [rIE], a
 	ret
 
 ; enable lcdc interrupt on hblank mode
 EnableInt_HBlank: ; 02eb (0:02eb)
-	ld a, [rSTAT]
+	ldh a, [rSTAT]
 	or 1 << STAT_MODE_HBLANK
-	ld [rSTAT], a
+	ldh [rSTAT], a
 	xor a
-	ld [rIF], a
-	ld a, [rIE]
+	ldh [rIF], a
+	ldh a, [rIE]
 	or 1 << INT_LCD_STAT
-	ld [rIE], a
+	ldh [rIE], a
 	ret
 
 ; disable lcdc interrupt and the hblank mode trigger
 DisableInt_HBlank: ; 02fb (0:02fb)
-	ld a, [rSTAT]
+	ldh a, [rSTAT]
 	and ~(1 << STAT_MODE_HBLANK)
-	ld [rSTAT], a
+	ldh [rSTAT], a
 	xor a
-	ld [rIF], a
-	ld a, [rIE]
+	ldh [rIF], a
+	ldh a, [rIE]
 	and ~(1 << INT_LCD_STAT)
-	ld [rIE], a
+	ldh [rIE], a
 	ret
 
 ; initialize scroll, window, and lcdc registers, set trampoline functions
 ; for the lcdc and vblank interrupts, latch clock data, and enable SRAM/RTC
 SetupRegisters: ; 030b (0:030b)
 	xor a
-	ld [rSCY], a
-	ld [rSCX], a
-	ld [rWY], a
-	ld [rWX], a
+	ldh [rSCY], a
+	ldh [rSCX], a
+	ldh [rWY], a
+	ldh [rWX], a
 	ld [wcab0], a
 	ld [wcab1], a
 	ld [wcab2], a
@@ -378,7 +378,7 @@ DetectConsole: ; 0349 (0:0349)
 	cp CONSOLE_CGB
 	ret nz
 	ld a, $01
-	ld [rSVBK], a
+	ldh [rSVBK], a
 	call SwitchToCGBDoubleSpeed
 	ret
 
@@ -386,10 +386,10 @@ DetectConsole: ; 0349 (0:0349)
 SetupPalettes: ; 036a (0:036a)
 	ld hl, wBGP
 	ld a, %11100100
-	ld [rBGP], a
+	ldh [rBGP], a
 	ld [hli], a ; wBGP
-	ld [rOBP0], a
-	ld [rOBP1], a
+	ldh [rOBP0], a
+	ldh [rOBP1], a
 	ld [hli], a ; wOBP0
 	ld [hl], a ; wOBP1
 	xor a
@@ -545,11 +545,11 @@ FlushPalettesIfRequested: ; 042d (0:042d)
 	; flush grayscale (non-CGB) palettes
 	ld hl, wBGP
 	ld a, [hli]
-	ld [rBGP], a
+	ldh [rBGP], a
 	ld a, [hli]
-	ld [rOBP0], a
+	ldh [rOBP0], a
 	ld a, [hl]
-	ld [rOBP1], a
+	ldh [rOBP1], a
 	ld a, [wConsole]
 	cp CONSOLE_CGB
 	jr z, .CGB
@@ -600,7 +600,7 @@ CopyCGBPalettes: ; 0467 (0:0467)
 	ld [$ff00+c], a
 	inc c
 .wait
-	ld a, [rSTAT]
+	ldh a, [rSTAT]
 	and 1 << STAT_BUSY ; wait until hblank or vblank
 	jr nz, .wait
 	ld a, [hl]
@@ -679,21 +679,21 @@ BCCoordToBGMap0Address: ; 04cf (0:04cf)
 ; the A + B + Start + Select combination resets the game
 ReadJoypad: ; 04de (0:04de)
 	ld a, JOY_BTNS_SELECT
-	ld [rJOYP], a
-	ld a, [rJOYP]
-	ld a, [rJOYP]
+	ldh [rJOYP], a
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
 	cpl
 	and JOY_INPUT_MASK
 	swap a
 	ld b, a ; buttons data
 	ld a, JOY_DPAD_SELECT
-	ld [rJOYP], a
-	ld a, [rJOYP]
-	ld a, [rJOYP]
-	ld a, [rJOYP]
-	ld a, [rJOYP]
-	ld a, [rJOYP]
-	ld a, [rJOYP]
+	ldh [rJOYP], a
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
 	cpl
 	and JOY_INPUT_MASK
 	or b
@@ -726,7 +726,7 @@ SaveButtonsHeld:
 	ld a, c
 	ldh [hKeysHeld], a
 	ld a, JOY_BTNS_SELECT | JOY_DPAD_SELECT
-	ld [rJOYP], a
+	ldh [rJOYP], a
 	ret
 
 ; clear joypad hmem data
@@ -824,7 +824,7 @@ CopyDMAFunction: ; 0593 (0:0593)
 ; CopyDMAFunction copies this function to hDMAFunction ($ff83)
 DMA: ; 05a1 (0:05a1)
 	ld a, HIGH(wOAM)
-	ld [rDMA], a
+	ldh [rDMA], a
 	ld a, $28
 .wait
 	dec a
@@ -1322,7 +1322,7 @@ BankswitchVRAM0: ; 07c5 (0:07c5)
 	push af
 	xor a
 	ldh [hBankVRAM], a
-	ld [rVBK], a
+	ldh [rVBK], a
 	pop af
 	ret
 
@@ -1331,14 +1331,14 @@ BankswitchVRAM1: ; 07cd (0:07cd)
 	push af
 	ld a, $1
 	ldh [hBankVRAM], a
-	ld [rVBK], a
+	ldh [rVBK], a
 	pop af
 	ret
 
 ; set current dest VRAM bank to a
 BankswitchVRAM: ; 07d6 (0:07d6)
 	ldh [hBankVRAM], a
-	ld [rVBK], a
+	ldh [rVBK], a
 	ret
 
 ; switch to CGB Normal Speed Mode if playing on CGB and current mode is Double Speed Mode
@@ -1361,20 +1361,20 @@ SwitchToCGBDoubleSpeed: ; 07e7 (0:07e7)
 
 ; switch between CGB Double Speed Mode and Normal Speed Mode
 CGBSpeedSwitch: ; 07f1 (0:07f1)
-	ld a, [rIE]
+	ldh a, [rIE]
 	push af
 	xor a
-	ld [rIE], a
+	ldh [rIE], a
 	set 0, [hl]
 	xor a
-	ld [rIF], a
-	ld [rIE], a
+	ldh [rIF], a
+	ldh [rIE], a
 	ld a, $30
-	ld [rJOYP], a
+	ldh [rJOYP], a
 	stop
 	call SetupTimer
 	pop af
-	ld [rIE], a
+	ldh [rIE], a
 	ret
 
 ; validate the saved data in SRAM
@@ -1983,30 +1983,30 @@ DetectSGB: ; 0b59 (0:0b59)
 	call Wait
 	ld hl, MltReq2Packet
 	call SendSGB
-	ld a, [rJOYP]
+	ldh a, [rJOYP]
 	and %11
 	cp SNES_JOYPAD1
 	jr nz, .sgb
 	ld a, P15
-	ld [rJOYP], a
-	ld a, [rJOYP]
-	ld a, [rJOYP]
+	ldh [rJOYP], a
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
 	ld a, P15 | P14
-	ld [rJOYP], a
+	ldh [rJOYP], a
 	ld a, P14
-	ld [rJOYP], a
-	ld a, [rJOYP]
-	ld a, [rJOYP]
-	ld a, [rJOYP]
-	ld a, [rJOYP]
-	ld a, [rJOYP]
-	ld a, [rJOYP]
+	ldh [rJOYP], a
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
 	ld a, P15 | P14
-	ld [rJOYP], a
-	ld a, [rJOYP]
-	ld a, [rJOYP]
-	ld a, [rJOYP]
-	ld a, [rJOYP]
+	ldh [rJOYP], a
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
+	ldh a, [rJOYP]
 	and %11
 	cp SNES_JOYPAD1
 	jr nz, .sgb
@@ -2037,13 +2037,13 @@ Func_0bcb: ; 0bcb (0:0bcb)
 	di
 	push de
 .wait_vbalnk
-	ld a, [rLY]
+	ldh a, [rLY]
 	cp LY_VBLANK + 3
 	jr nz, .wait_vbalnk
 	ld a, LCDC_BGON | LCDC_OBJON | LCDC_WIN9C00
-	ld [rLCDC], a
+	ldh [rLCDC], a
 	ld a, %11100100
-	ld [rBGP], a
+	ldh [rBGP], a
 	ld de, v0Tiles1
 	ld bc, v0BGMap0 - v0Tiles1
 .tiles_loop
@@ -2069,7 +2069,7 @@ Func_0bcb: ; 0bcb (0:0bcb)
 	dec c
 	jr nz, .bgmap_outer_loop
 	ld a, LCDC_BGON | LCDC_OBJON | LCDC_WIN9C00 | LCDC_ON
-	ld [rLCDC], a
+	ldh [rLCDC], a
 	pop hl
 	call SendSGB
 	ei
@@ -2098,12 +2098,12 @@ HblankCopyDataHLtoDE: ; 0c19 (0:0c19)
 .loop
 	ei
 	di
-	ld a, [rSTAT]        ;
+	ldh a, [rSTAT]       ;
 	and STAT_LCDC_STATUS ;
 	jr nz, .loop         ; assert hblank
 	ld a, [hl]
 	ld [de], a
-	ld a, [rSTAT]        ;
+	ldh a, [rSTAT]       ;
 	and STAT_LCDC_STATUS ;
 	jr nz, .loop         ; assert still in hblank
 	ei
@@ -2120,12 +2120,12 @@ HblankCopyDataDEtoHL: ; 0c32 (0:0c32)
 .loop
 	ei
 	di
-	ld a, [rSTAT]        ;
+	ldh a, [rSTAT]       ;
 	and STAT_LCDC_STATUS ;
 	jr nz, .loop         ; assert hblank
 	ld a, [de]
 	ld [hl], a
-	ld a, [rSTAT]        ;
+	ldh a, [rSTAT]       ;
 	and STAT_LCDC_STATUS ;
 	jr nz, .loop         ; assert still in hblank
 	ei
@@ -2228,13 +2228,13 @@ SerialTimerHandler: ; 0c91 (0:0c91)
 	jr z, .check_for_timeout
 	ret
 .begin_transfer
-	ld a, [rSC]          ;
+	ldh a, [rSC]         ;
 	add a                ; make sure that no serial transfer is active
 	ret c                ;
 	ld a, SC_INTERNAL
-	ld [rSC], a          ; use internal clock
+	ldh [rSC], a         ; use internal clock
 	ld a, SC_START | SC_INTERNAL
-	ld [rSC], a          ; use internal clock, set transfer start flag
+	ldh [rSC], a         ; use internal clock, set transfer start flag
 	ret
 .check_for_timeout
 	; sets bit7 of [wSerialFlags] if the serial interrupt hasn't triggered
@@ -2273,11 +2273,11 @@ Func_0cc5: ; 0cc5 (0:0cc5)
 	ret
 .asm_cdc
 	ld a, $29
-	ld [rSB], a
+	ldh [rSB], a
 	ld a, SC_INTERNAL
-	ld [rSC], a
+	ldh [rSC], a
 	ld a, SC_START | SC_INTERNAL
-	ld [rSC], a
+	ldh [rSC], a
 .asm_ce8
 	ld a, [hl]
 	or a
@@ -2330,17 +2330,17 @@ SerialHandler: ; 0d26 (0:0d26)
 	or a                 ;
 	jr z, .asm_d55       ; skip ahead if [wSerialOp] zero
 	; send/receive a byte
-	ld a, [rSB]
+	ldh a, [rSB]
 	call SerialHandleRecv
 	call SerialHandleSend ; returns byte to actually send
 	push af
 .wait_for_completion
-	ld a, [rSC]
+	ldh a, [rSC]
 	add a
 	jr c, .wait_for_completion
 	pop af
 	; end send/receive
-	ld [rSB], a          ; prepare sending byte (from Func_0dc8?)
+	ldh [rSB], a         ; prepare sending byte (from Func_0dc8?)
 	ld a, [wSerialOp]
 	cp $29
 	jr z, .done          ; if [wSerialOp] != $29, use external clock
@@ -2348,16 +2348,16 @@ SerialHandler: ; 0d26 (0:0d26)
 .asm_d55
 	ld a, $1
 	ld [wSerialRecvCounter], a
-	ld a, [rSB]
+	ldh a, [rSB]
 	ld [wSerialRecvBuf], a
 	ld a, $ac
-	ld [rSB], a
+	ldh [rSB], a
 	ld a, [wSerialRecvBuf]
 	cp $12               ; if [wSerialRecvBuf] != $12, use external clock
 	jr z, .done          ; and prepare for next byte. either way, return
 .asm_d6a
 	ld a, SC_START | SC_EXTERNAL
-	ld [rSC], a          ; transfer start, use external clock
+	ldh [rSC], a         ; transfer start, use external clock
 .done
 	ld hl, wSerialCounter
 	inc [hl]
@@ -2592,25 +2592,25 @@ SerialExchangeBytes: ; 0e63 (0:0e63)
 Func_0e8e: ; 0e8e (0:0e8e)
 	call ClearSerialData
 	ld a, $12
-	ld [rSB], a          ; send $12
+	ldh [rSB], a         ; send $12
 	ld a, SC_START | SC_EXTERNAL
-	ld [rSC], a          ; use external clock, set transfer start flag
-	ld a, [rIF]
+	ldh [rSC], a         ; use external clock, set transfer start flag
+	ldh a, [rIF]
 	and ~(1 << INT_SERIAL)
-	ld [rIF], a          ; clear serial interrupt flag
-	ld a, [rIE]
+	ldh [rIF], a         ; clear serial interrupt flag
+	ldh a, [rIE]
 	or 1 << INT_SERIAL   ; enable serial interrupt
-	ld [rIE], a
+	ldh [rIE], a
 	ret
 
 ; disable serial interrupt, and clear rSB, rSC, and serial registers in WRAM
 ResetSerial: ; 0ea6 (0:0ea6)
-	ld a, [rIE]
+	ldh a, [rIE]
 	and ~(1 << INT_SERIAL)
-	ld [rIE], a
+	ldh [rIE], a
 	xor a
-	ld [rSB], a
-	ld [rSC], a
+	ldh [rSB], a
+	ldh [rSC], a
 ;	fallthrough
 
 ; zero serial registers in WRAM
@@ -9400,14 +9400,14 @@ Func_31e5: ; 31e5 (0:31e5)
 	jr Func_31e0
 
 Func_31ea: ; 31ea (0:31ea)
-	ld a, [rSB]
+	ldh a, [rSB]
 	ld [wce6e], a
 Func_31ef: ; 31ef (0:31ef)
 	xor a
 	jr Func_31e0
 
 Func_31f2: ; 31f2 (0:31f2)
-	ld a, [rSB]
+	ldh a, [rSB]
 	ld [wce6f], a
 	xor a
 	ld [wce63], a
@@ -9434,11 +9434,11 @@ Func_31fc: ; 31fc (0:31fc)
 ;	fallthrough
 
 Func_3212: ; 3212 (0:3212)
-	ld [rSB], a
+	ldh [rSB], a
 	ld a, SC_INTERNAL
-	ld [rSC], a
+	ldh [rSC], a
 	ld a, SC_START | SC_INTERNAL
-	ld [rSC], a
+	ldh [rSC], a
 	ret
 
 ; doubles the damage at de if swords dance or focus energy was used
@@ -11255,7 +11255,7 @@ CallBC: ; 3c46 (0:3c46)
 
 DoFrameIfLCDEnabled: ; 3c48 (0:3c48)
 	push af
-	ld a, [rLCDC]
+	ldh a, [rLCDC]
 	bit LCDC_ENABLE_F, a
 	jr z, .done
 	push bc
diff --git a/src/gfx/cards/grassenergy.8x6.png b/src/gfx/cards/grassenergy.8x6.png
index 2046bcb..5cc6b30 100644
Binary files a/src/gfx/cards/grassenergy.8x6.png and b/src/gfx/cards/grassenergy.8x6.png differ
diff --git a/src/gfx/duel/cgb_symbols.t7.png b/src/gfx/duel/cgb_symbols.t7.png
index 578867f..ac0f54d 100644
Binary files a/src/gfx/duel/cgb_symbols.t7.png and b/src/gfx/duel/cgb_symbols.t7.png differ
diff --git a/src/gfx/duel/dmg_sgb_symbols.t7.png b/src/gfx/duel/dmg_sgb_symbols.t7.png
index 10715db..91eede5 100644
Binary files a/src/gfx/duel/dmg_sgb_symbols.t7.png and b/src/gfx/duel/dmg_sgb_symbols.t7.png differ
diff --git a/src/gfx/duel/other.t7.png b/src/gfx/duel/other.t7.png
index 796ecf7..d2aa1e9 100644
Binary files a/src/gfx/duel/other.t7.png and b/src/gfx/duel/other.t7.png differ
diff --git a/src/gfx/fonts/full_width/4.t3.png b/src/gfx/fonts/full_width/4.t3.png
index 6ccef5d..c872a6d 100644
Binary files a/src/gfx/fonts/full_width/4.t3.png and b/src/gfx/fonts/full_width/4.t3.png differ
diff --git a/src/gfx/fonts/symbols.png b/src/gfx/fonts/symbols.png
index 81afc3b..347001a 100644
Binary files a/src/gfx/fonts/symbols.png and b/src/gfx/fonts/symbols.png differ
diff --git a/src/layout.link b/src/layout.link
new file mode 100644
index 0000000..49511eb
--- /dev/null
+++ b/src/layout.link
@@ -0,0 +1,180 @@
+ROM0
+	org $0000
+	"rst00"
+	org $0008
+	"rst08"
+	org $0010
+	"rst10"
+	org $0018
+	"rst18"
+	org $0020
+	"rst20"
+	org $0028
+	"rst28"
+	org $0030
+	"rst30"
+	org $0038
+	"rst38"
+	org $0040
+	"vblank"
+	org $0048
+	"lcdc"
+	org $0050
+	"timer"
+	org $0058
+	"serial"
+	org $0060
+	"joypad"
+	org $0100
+	"romheader"
+	org $0150
+	"start"
+ROMX $01
+	"Bank 1"
+ROMX $02
+	"Bank 2"
+ROMX $03
+	"Bank 3"
+ROMX $04
+	"Bank 4"
+ROMX $06
+	"Bank 6"
+ROMX $07
+	"Bank 7"
+	"Booster Packs"
+ROMX $08
+	"Bank 8"
+ROMX $09
+	"Empty Bank 9"
+ROMX $0a
+	"Empty Bank A"
+ROMX $0b
+	"Effect Functions"
+ROMX $0c
+	"Decks"
+	"Cards"
+ROMX $0d
+	"Text 1"
+ROMX $0e
+	"Text 2"
+ROMX $0f
+	"Text 3"
+ROMX $10
+	"Text 4"
+ROMX $11
+	"Text 5"
+ROMX $12
+	"Text 6"
+ROMX $13
+	"Text 7"
+ROMX $14
+	"Text 8"
+ROMX $15
+	"Text 9"
+ROMX $16
+	"Text 10"
+ROMX $17
+	"Text 11"
+ROMX $18
+	"Text 12"
+ROMX $19
+	"Text 13"
+ROMX $1a
+	"Empty Bank 1A"
+ROMX $1b
+	"Empty Bank 1B"
+ROMX $1c
+	"Bank 1C"
+ROMX $1d
+	"Gfx 1"
+ROMX $1e
+	"Gfx 2"
+ROMX $1f
+	"Empty Bank 1F"
+ROMX $20
+	"Bank 20"
+ROMX $21
+	"Gfx 3"
+ROMX $22
+	"Gfx 4"
+ROMX $23
+	"Gfx 5"
+ROMX $24
+	"Gfx 6"
+ROMX $25
+	"Gfx 7"
+ROMX $26
+	"Gfx 8"
+ROMX $27
+	"Gfx 9"
+ROMX $28
+	"Gfx 10"
+ROMX $29
+	"Gfx 11"
+ROMX $2a
+	"Gfx 12"
+ROMX $2b
+	"Gfx 13"
+ROMX $2c
+	"Gfx 14"
+ROMX $2d
+	"Gfx 15"
+ROMX $2e
+	"Gfx 16"
+ROMX $2f
+	"Empty Bank 2F"
+ROMX $30
+	"Empty Bank 30"
+ROMX $31
+	"Card Gfx 1"
+ROMX $32
+	"Card Gfx 2"
+ROMX $33
+	"Card Gfx 3"
+ROMX $34
+	"Card Gfx 4"
+ROMX $35
+	"Card Gfx 5"
+ROMX $36
+	"Card Gfx 6"
+ROMX $37
+	"Card Gfx 7"
+ROMX $38
+	"Card Gfx 8"
+ROMX $39
+	"Card Gfx 9"
+ROMX $3a
+	"Card Gfx 10"
+ROMX $3b
+	"Card Gfx 11"
+ROMX $3c
+	"Empty Bank 3C"
+ROMX $3d
+	"Audio 1"
+ROMX $3e
+	"Audio 2"
+ROMX $3f
+	"Audio 3"
+WRAM0
+	"WRAM0"
+	"WRAM0 Duels 1"
+	"WRAM0 Text Engine"
+	"WRAM0 1"
+	"WRAM0 Serial Transfer"
+	"WRAM0 Duels 2"
+	"WRAM0 2"
+WRAMX 1
+	"WRAM1"
+	"WRAM1 Audio"
+VRAM $00
+	"VRAM0"
+VRAM $01
+	"VRAM1"
+SRAM $00
+	"SRAM0"
+SRAM $01
+	"SRAM1"
+SRAM $02
+	"SRAM2"
+SRAM $03
+	"SRAM3"
diff --git a/src/rgbdscheck.asm b/src/rgbdscheck.asm
new file mode 100644
index 0000000..622023d
--- /dev/null
+++ b/src/rgbdscheck.asm
@@ -0,0 +1,12 @@
+; poketcg requires rgbds 0.4.1 or newer.
+MAJOR EQU 0
+MINOR EQU 4
+PATCH EQU 1
+
+IF !DEF(__RGBDS_MAJOR__) || !DEF(__RGBDS_MINOR__) || !DEF(__RGBDS_PATCH__)
+	fail "poketcg requires rgbds {MAJOR}.{MINOR}.{PATCH} or newer."
+ELIF (__RGBDS_MAJOR__ < MAJOR) || \
+	(__RGBDS_MAJOR__ == MAJOR && __RGBDS_MINOR__ < MINOR) || \
+	(__RGBDS_MAJOR__ == MAJOR && __RGBDS_MINOR__ == MINOR && __RGBDS_PATCH__ < PATCH)
+	fail "poketcg requires rgbds {MAJOR}.{MINOR}.{PATCH} or newer."
+ENDC
-- 
cgit v1.2.3


From 39a28b59981b0c56b5b1d829b94c6e86c7a9c829 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Mon, 14 Dec 2020 11:09:57 -0600
Subject: Let rgbgfx generate pal files for card gfx and remove unnecessary gfx
 filename extension rules

---
 src/engine/home.asm                         |   2 +-
 src/gfx.asm                                 | 528 ++++++++++++++--------------
 src/gfx/booster_packs/colosseum2.png        | Bin 0 -> 1033 bytes
 src/gfx/booster_packs/colosseum2.t10.png    | Bin 1033 -> 0 bytes
 src/gfx/booster_packs/evolution2.png        | Bin 0 -> 1068 bytes
 src/gfx/booster_packs/evolution2.t10.png    | Bin 1068 -> 0 bytes
 src/gfx/booster_packs/laboratory2.png       | Bin 0 -> 1068 bytes
 src/gfx/booster_packs/laboratory2.t10.png   | Bin 1068 -> 0 bytes
 src/gfx/booster_packs/mystery2.png          | Bin 0 -> 1136 bytes
 src/gfx/booster_packs/mystery2.t10.png      | Bin 1136 -> 0 bytes
 src/gfx/cardpop/cardpop1.png                | Bin 0 -> 1452 bytes
 src/gfx/cardpop/cardpop1.t3.png             | Bin 1452 -> 0 bytes
 src/gfx/cardpop/cardpop2.png                | Bin 0 -> 803 bytes
 src/gfx/cardpop/cardpop2.t3.png             | Bin 803 -> 0 bytes
 src/gfx/cardpop/cardpop3.png                | Bin 0 -> 784 bytes
 src/gfx/cardpop/cardpop3.t3.png             | Bin 784 -> 0 bytes
 src/gfx/cards/abra.8x6.png                  | Bin 745 -> 0 bytes
 src/gfx/cards/abra.pal                      | Bin 8 -> 0 bytes
 src/gfx/cards/abra.png                      | Bin 0 -> 791 bytes
 src/gfx/cards/aerodactyl.8x6.png            | Bin 759 -> 0 bytes
 src/gfx/cards/aerodactyl.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/aerodactyl.png                | Bin 0 -> 810 bytes
 src/gfx/cards/alakazam.8x6.png              | Bin 755 -> 0 bytes
 src/gfx/cards/alakazam.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/alakazam.png                  | Bin 0 -> 806 bytes
 src/gfx/cards/arbok.8x6.png                 | Bin 831 -> 0 bytes
 src/gfx/cards/arbok.pal                     | Bin 8 -> 0 bytes
 src/gfx/cards/arbok.png                     | Bin 0 -> 875 bytes
 src/gfx/cards/arcanine1.8x6.png             | Bin 760 -> 0 bytes
 src/gfx/cards/arcanine1.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/arcanine1.png                 | Bin 0 -> 807 bytes
 src/gfx/cards/arcanine2.8x6.png             | Bin 772 -> 0 bytes
 src/gfx/cards/arcanine2.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/arcanine2.png                 | Bin 0 -> 809 bytes
 src/gfx/cards/articuno1.8x6.png             | Bin 793 -> 0 bytes
 src/gfx/cards/articuno1.pal                 |   1 -
 src/gfx/cards/articuno1.png                 | Bin 0 -> 847 bytes
 src/gfx/cards/articuno2.8x6.png             | Bin 795 -> 0 bytes
 src/gfx/cards/articuno2.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/articuno2.png                 | Bin 0 -> 831 bytes
 src/gfx/cards/beedrill.8x6.png              | Bin 825 -> 0 bytes
 src/gfx/cards/beedrill.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/beedrill.png                  | Bin 0 -> 869 bytes
 src/gfx/cards/bellsprout.8x6.png            | Bin 775 -> 0 bytes
 src/gfx/cards/bellsprout.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/bellsprout.png                | Bin 0 -> 817 bytes
 src/gfx/cards/bill.8x6.png                  | Bin 519 -> 0 bytes
 src/gfx/cards/bill.pal                      | Bin 8 -> 0 bytes
 src/gfx/cards/bill.png                      | Bin 0 -> 556 bytes
 src/gfx/cards/blastoise.8x6.png             | Bin 737 -> 0 bytes
 src/gfx/cards/blastoise.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/blastoise.png                 | Bin 0 -> 782 bytes
 src/gfx/cards/bulbasaur.8x6.png             | Bin 830 -> 0 bytes
 src/gfx/cards/bulbasaur.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/bulbasaur.png                 | Bin 0 -> 866 bytes
 src/gfx/cards/butterfree.8x6.png            | Bin 808 -> 0 bytes
 src/gfx/cards/butterfree.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/butterfree.png                | Bin 0 -> 844 bytes
 src/gfx/cards/caterpie.8x6.png              | Bin 801 -> 0 bytes
 src/gfx/cards/caterpie.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/caterpie.png                  | Bin 0 -> 841 bytes
 src/gfx/cards/chansey.8x6.png               | Bin 764 -> 0 bytes
 src/gfx/cards/chansey.pal                   |   1 -
 src/gfx/cards/chansey.png                   | Bin 0 -> 793 bytes
 src/gfx/cards/charizard.8x6.png             | Bin 801 -> 0 bytes
 src/gfx/cards/charizard.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/charizard.png                 | Bin 0 -> 843 bytes
 src/gfx/cards/charmander.8x6.png            | Bin 744 -> 0 bytes
 src/gfx/cards/charmander.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/charmander.png                | Bin 0 -> 780 bytes
 src/gfx/cards/charmeleon.8x6.png            | Bin 745 -> 0 bytes
 src/gfx/cards/charmeleon.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/charmeleon.png                | Bin 0 -> 785 bytes
 src/gfx/cards/clefable.8x6.png              | Bin 702 -> 0 bytes
 src/gfx/cards/clefable.pal                  |   1 -
 src/gfx/cards/clefable.png                  | Bin 0 -> 756 bytes
 src/gfx/cards/clefairy.8x6.png              | Bin 683 -> 0 bytes
 src/gfx/cards/clefairy.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/clefairy.png                  | Bin 0 -> 728 bytes
 src/gfx/cards/clefairydoll.8x6.png          | Bin 631 -> 0 bytes
 src/gfx/cards/clefairydoll.pal              | Bin 8 -> 0 bytes
 src/gfx/cards/clefairydoll.png              | Bin 0 -> 669 bytes
 src/gfx/cards/cloyster.8x6.png              | Bin 752 -> 0 bytes
 src/gfx/cards/cloyster.pal                  |   1 -
 src/gfx/cards/cloyster.png                  | Bin 0 -> 795 bytes
 src/gfx/cards/computersearch.8x6.png        | Bin 731 -> 0 bytes
 src/gfx/cards/computersearch.pal            | Bin 8 -> 0 bytes
 src/gfx/cards/computersearch.png            | Bin 0 -> 774 bytes
 src/gfx/cards/cubone.8x6.png                | Bin 675 -> 0 bytes
 src/gfx/cards/cubone.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/cubone.png                    | Bin 0 -> 715 bytes
 src/gfx/cards/defender.8x6.png              | Bin 478 -> 0 bytes
 src/gfx/cards/defender.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/defender.png                  | Bin 0 -> 526 bytes
 src/gfx/cards/devolutionspray.8x6.png       | Bin 481 -> 0 bytes
 src/gfx/cards/devolutionspray.pal           | Bin 8 -> 0 bytes
 src/gfx/cards/devolutionspray.png           | Bin 0 -> 522 bytes
 src/gfx/cards/dewgong.8x6.png               | Bin 775 -> 0 bytes
 src/gfx/cards/dewgong.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/dewgong.png                   | Bin 0 -> 814 bytes
 src/gfx/cards/diglett.8x6.png               | Bin 662 -> 0 bytes
 src/gfx/cards/diglett.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/diglett.png                   | Bin 0 -> 707 bytes
 src/gfx/cards/ditto.8x6.png                 | Bin 593 -> 0 bytes
 src/gfx/cards/ditto.pal                     | Bin 8 -> 0 bytes
 src/gfx/cards/ditto.png                     | Bin 0 -> 630 bytes
 src/gfx/cards/dodrio.8x6.png                | Bin 662 -> 0 bytes
 src/gfx/cards/dodrio.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/dodrio.png                    | Bin 0 -> 701 bytes
 src/gfx/cards/doduo.8x6.png                 | Bin 618 -> 0 bytes
 src/gfx/cards/doduo.pal                     | Bin 8 -> 0 bytes
 src/gfx/cards/doduo.png                     | Bin 0 -> 656 bytes
 src/gfx/cards/doublecolorlessenergy.8x6.png | Bin 538 -> 0 bytes
 src/gfx/cards/doublecolorlessenergy.pal     | Bin 8 -> 0 bytes
 src/gfx/cards/doublecolorlessenergy.png     | Bin 0 -> 576 bytes
 src/gfx/cards/dragonair.8x6.png             | Bin 755 -> 0 bytes
 src/gfx/cards/dragonair.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/dragonair.png                 | Bin 0 -> 796 bytes
 src/gfx/cards/dragonite1.8x6.png            | Bin 659 -> 0 bytes
 src/gfx/cards/dragonite1.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/dragonite1.png                | Bin 0 -> 701 bytes
 src/gfx/cards/dragonite2.8x6.png            | Bin 775 -> 0 bytes
 src/gfx/cards/dragonite2.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/dragonite2.png                | Bin 0 -> 827 bytes
 src/gfx/cards/dratini.8x6.png               | Bin 730 -> 0 bytes
 src/gfx/cards/dratini.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/dratini.png                   | Bin 0 -> 768 bytes
 src/gfx/cards/drowzee.8x6.png               | Bin 732 -> 0 bytes
 src/gfx/cards/drowzee.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/drowzee.png                   | Bin 0 -> 776 bytes
 src/gfx/cards/dugtrio.8x6.png               | Bin 657 -> 0 bytes
 src/gfx/cards/dugtrio.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/dugtrio.png                   | Bin 0 -> 695 bytes
 src/gfx/cards/eevee.8x6.png                 | Bin 784 -> 0 bytes
 src/gfx/cards/eevee.pal                     | Bin 8 -> 0 bytes
 src/gfx/cards/eevee.png                     | Bin 0 -> 819 bytes
 src/gfx/cards/ekans.8x6.png                 | Bin 770 -> 0 bytes
 src/gfx/cards/ekans.pal                     | Bin 8 -> 0 bytes
 src/gfx/cards/ekans.png                     | Bin 0 -> 811 bytes
 src/gfx/cards/electabuzz1.8x6.png           | Bin 704 -> 0 bytes
 src/gfx/cards/electabuzz1.pal               | Bin 8 -> 0 bytes
 src/gfx/cards/electabuzz1.png               | Bin 0 -> 759 bytes
 src/gfx/cards/electabuzz2.8x6.png           | Bin 616 -> 0 bytes
 src/gfx/cards/electabuzz2.pal               | Bin 8 -> 0 bytes
 src/gfx/cards/electabuzz2.png               | Bin 0 -> 667 bytes
 src/gfx/cards/electrode1.8x6.png            | Bin 732 -> 0 bytes
 src/gfx/cards/electrode1.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/electrode1.png                | Bin 0 -> 770 bytes
 src/gfx/cards/electrode2.8x6.png            | Bin 688 -> 0 bytes
 src/gfx/cards/electrode2.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/electrode2.png                | Bin 0 -> 731 bytes
 src/gfx/cards/energyremoval.8x6.png         | Bin 651 -> 0 bytes
 src/gfx/cards/energyremoval.pal             | Bin 8 -> 0 bytes
 src/gfx/cards/energyremoval.png             | Bin 0 -> 693 bytes
 src/gfx/cards/energyretrieval.8x6.png       | Bin 479 -> 0 bytes
 src/gfx/cards/energyretrieval.pal           | Bin 8 -> 0 bytes
 src/gfx/cards/energyretrieval.png           | Bin 0 -> 519 bytes
 src/gfx/cards/energysearch.8x6.png          | Bin 596 -> 0 bytes
 src/gfx/cards/energysearch.pal              | Bin 8 -> 0 bytes
 src/gfx/cards/energysearch.png              | Bin 0 -> 635 bytes
 src/gfx/cards/exeggcute.8x6.png             | Bin 756 -> 0 bytes
 src/gfx/cards/exeggcute.pal                 |   1 -
 src/gfx/cards/exeggcute.png                 | Bin 0 -> 795 bytes
 src/gfx/cards/exeggutor.8x6.png             | Bin 783 -> 0 bytes
 src/gfx/cards/exeggutor.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/exeggutor.png                 | Bin 0 -> 825 bytes
 src/gfx/cards/farfetchd.8x6.png             | Bin 718 -> 0 bytes
 src/gfx/cards/farfetchd.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/farfetchd.png                 | Bin 0 -> 760 bytes
 src/gfx/cards/fearow.8x6.png                | Bin 725 -> 0 bytes
 src/gfx/cards/fearow.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/fearow.png                    | Bin 0 -> 763 bytes
 src/gfx/cards/fightingenergy.8x6.png        | Bin 514 -> 0 bytes
 src/gfx/cards/fightingenergy.pal            | Bin 8 -> 0 bytes
 src/gfx/cards/fightingenergy.png            | Bin 0 -> 554 bytes
 src/gfx/cards/fireenergy.8x6.png            | Bin 558 -> 0 bytes
 src/gfx/cards/fireenergy.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/fireenergy.png                | Bin 0 -> 599 bytes
 src/gfx/cards/flareon1.8x6.png              | Bin 844 -> 0 bytes
 src/gfx/cards/flareon1.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/flareon1.png                  | Bin 0 -> 880 bytes
 src/gfx/cards/flareon2.8x6.png              | Bin 808 -> 0 bytes
 src/gfx/cards/flareon2.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/flareon2.png                  | Bin 0 -> 853 bytes
 src/gfx/cards/flyingpikachu.8x6.png         | Bin 633 -> 0 bytes
 src/gfx/cards/flyingpikachu.pal             | Bin 8 -> 0 bytes
 src/gfx/cards/flyingpikachu.png             | Bin 0 -> 672 bytes
 src/gfx/cards/fullheal.8x6.png              | Bin 561 -> 0 bytes
 src/gfx/cards/fullheal.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/fullheal.png                  | Bin 0 -> 612 bytes
 src/gfx/cards/gambler.8x6.png               | Bin 449 -> 0 bytes
 src/gfx/cards/gambler.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/gambler.png                   | Bin 0 -> 498 bytes
 src/gfx/cards/gastly1.8x6.png               | Bin 612 -> 0 bytes
 src/gfx/cards/gastly1.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/gastly1.png                   | Bin 0 -> 666 bytes
 src/gfx/cards/gastly2.8x6.png               | Bin 744 -> 0 bytes
 src/gfx/cards/gastly2.pal                   |   1 -
 src/gfx/cards/gastly2.png                   | Bin 0 -> 781 bytes
 src/gfx/cards/gengar.8x6.png                | Bin 664 -> 0 bytes
 src/gfx/cards/gengar.pal                    |   1 -
 src/gfx/cards/gengar.png                    | Bin 0 -> 713 bytes
 src/gfx/cards/geodude.8x6.png               | Bin 810 -> 0 bytes
 src/gfx/cards/geodude.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/geodude.png                   | Bin 0 -> 851 bytes
 src/gfx/cards/gloom.8x6.png                 | Bin 622 -> 0 bytes
 src/gfx/cards/gloom.pal                     | Bin 8 -> 0 bytes
 src/gfx/cards/gloom.png                     | Bin 0 -> 664 bytes
 src/gfx/cards/golbat.8x6.png                | Bin 795 -> 0 bytes
 src/gfx/cards/golbat.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/golbat.png                    | Bin 0 -> 840 bytes
 src/gfx/cards/goldeen.8x6.png               | Bin 766 -> 0 bytes
 src/gfx/cards/goldeen.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/goldeen.png                   | Bin 0 -> 796 bytes
 src/gfx/cards/golduck.8x6.png               | Bin 816 -> 0 bytes
 src/gfx/cards/golduck.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/golduck.png                   | Bin 0 -> 856 bytes
 src/gfx/cards/golem.8x6.png                 | Bin 809 -> 0 bytes
 src/gfx/cards/golem.pal                     | Bin 8 -> 0 bytes
 src/gfx/cards/golem.png                     | Bin 0 -> 849 bytes
 src/gfx/cards/grassenergy.8x6.png           | Bin 593 -> 0 bytes
 src/gfx/cards/grassenergy.pal               | Bin 8 -> 0 bytes
 src/gfx/cards/grassenergy.png               | Bin 0 -> 597 bytes
 src/gfx/cards/graveler.8x6.png              | Bin 836 -> 0 bytes
 src/gfx/cards/graveler.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/graveler.png                  | Bin 0 -> 869 bytes
 src/gfx/cards/grimer.8x6.png                | Bin 698 -> 0 bytes
 src/gfx/cards/grimer.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/grimer.png                    | Bin 0 -> 742 bytes
 src/gfx/cards/growlithe.8x6.png             | Bin 673 -> 0 bytes
 src/gfx/cards/growlithe.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/growlithe.png                 | Bin 0 -> 706 bytes
 src/gfx/cards/gustofwind.8x6.png            | Bin 775 -> 0 bytes
 src/gfx/cards/gustofwind.pal                |   1 -
 src/gfx/cards/gustofwind.png                | Bin 0 -> 819 bytes
 src/gfx/cards/gyarados.8x6.png              | Bin 734 -> 0 bytes
 src/gfx/cards/gyarados.pal                  |   1 -
 src/gfx/cards/gyarados.png                  | Bin 0 -> 786 bytes
 src/gfx/cards/haunter1.8x6.png              | Bin 594 -> 0 bytes
 src/gfx/cards/haunter1.pal                  |   1 -
 src/gfx/cards/haunter1.png                  | Bin 0 -> 652 bytes
 src/gfx/cards/haunter2.8x6.png              | Bin 470 -> 0 bytes
 src/gfx/cards/haunter2.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/haunter2.png                  | Bin 0 -> 523 bytes
 src/gfx/cards/hitmonchan.8x6.png            | Bin 772 -> 0 bytes
 src/gfx/cards/hitmonchan.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/hitmonchan.png                | Bin 0 -> 817 bytes
 src/gfx/cards/hitmonlee.8x6.png             | Bin 704 -> 0 bytes
 src/gfx/cards/hitmonlee.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/hitmonlee.png                 | Bin 0 -> 757 bytes
 src/gfx/cards/horsea.8x6.png                | Bin 703 -> 0 bytes
 src/gfx/cards/horsea.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/horsea.png                    | Bin 0 -> 740 bytes
 src/gfx/cards/hypno.8x6.png                 | Bin 715 -> 0 bytes
 src/gfx/cards/hypno.pal                     | Bin 8 -> 0 bytes
 src/gfx/cards/hypno.png                     | Bin 0 -> 769 bytes
 src/gfx/cards/imakuni.8x6.png               | Bin 708 -> 0 bytes
 src/gfx/cards/imakuni.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/imakuni.png                   | Bin 0 -> 753 bytes
 src/gfx/cards/imposterprofessoroak.8x6.png  | Bin 658 -> 0 bytes
 src/gfx/cards/imposterprofessoroak.pal      | Bin 8 -> 0 bytes
 src/gfx/cards/imposterprofessoroak.png      | Bin 0 -> 700 bytes
 src/gfx/cards/itemfinder.8x6.png            | Bin 468 -> 0 bytes
 src/gfx/cards/itemfinder.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/itemfinder.png                | Bin 0 -> 513 bytes
 src/gfx/cards/ivysaur.8x6.png               | Bin 785 -> 0 bytes
 src/gfx/cards/ivysaur.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/ivysaur.png                   | Bin 0 -> 839 bytes
 src/gfx/cards/jigglypuff1.8x6.png           | Bin 751 -> 0 bytes
 src/gfx/cards/jigglypuff1.pal               |   1 -
 src/gfx/cards/jigglypuff1.png               | Bin 0 -> 792 bytes
 src/gfx/cards/jigglypuff2.8x6.png           | Bin 648 -> 0 bytes
 src/gfx/cards/jigglypuff2.pal               | Bin 8 -> 0 bytes
 src/gfx/cards/jigglypuff2.png               | Bin 0 -> 682 bytes
 src/gfx/cards/jigglypuff3.8x6.png           | Bin 710 -> 0 bytes
 src/gfx/cards/jigglypuff3.pal               |   1 -
 src/gfx/cards/jigglypuff3.png               | Bin 0 -> 755 bytes
 src/gfx/cards/jolteon1.8x6.png              | Bin 725 -> 0 bytes
 src/gfx/cards/jolteon1.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/jolteon1.png                  | Bin 0 -> 759 bytes
 src/gfx/cards/jolteon2.8x6.png              | Bin 778 -> 0 bytes
 src/gfx/cards/jolteon2.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/jolteon2.png                  | Bin 0 -> 827 bytes
 src/gfx/cards/jynx.8x6.png                  | Bin 638 -> 0 bytes
 src/gfx/cards/jynx.pal                      | Bin 8 -> 0 bytes
 src/gfx/cards/jynx.png                      | Bin 0 -> 687 bytes
 src/gfx/cards/kabuto.8x6.png                | Bin 736 -> 0 bytes
 src/gfx/cards/kabuto.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/kabuto.png                    | Bin 0 -> 775 bytes
 src/gfx/cards/kabutops.8x6.png              | Bin 691 -> 0 bytes
 src/gfx/cards/kabutops.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/kabutops.png                  | Bin 0 -> 744 bytes
 src/gfx/cards/kadabra.8x6.png               | Bin 608 -> 0 bytes
 src/gfx/cards/kadabra.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/kadabra.png                   | Bin 0 -> 656 bytes
 src/gfx/cards/kakuna.8x6.png                | Bin 760 -> 0 bytes
 src/gfx/cards/kakuna.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/kakuna.png                    | Bin 0 -> 807 bytes
 src/gfx/cards/kangaskhan.8x6.png            | Bin 757 -> 0 bytes
 src/gfx/cards/kangaskhan.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/kangaskhan.png                | Bin 0 -> 802 bytes
 src/gfx/cards/kingler.8x6.png               | Bin 767 -> 0 bytes
 src/gfx/cards/kingler.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/kingler.png                   | Bin 0 -> 808 bytes
 src/gfx/cards/koffing.8x6.png               | Bin 802 -> 0 bytes
 src/gfx/cards/koffing.pal                   |   1 -
 src/gfx/cards/koffing.png                   | Bin 0 -> 841 bytes
 src/gfx/cards/krabby.8x6.png                | Bin 676 -> 0 bytes
 src/gfx/cards/krabby.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/krabby.png                    | Bin 0 -> 713 bytes
 src/gfx/cards/lapras.8x6.png                | Bin 639 -> 0 bytes
 src/gfx/cards/lapras.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/lapras.png                    | Bin 0 -> 698 bytes
 src/gfx/cards/lass.8x6.png                  | Bin 621 -> 0 bytes
 src/gfx/cards/lass.pal                      | Bin 8 -> 0 bytes
 src/gfx/cards/lass.png                      | Bin 0 -> 661 bytes
 src/gfx/cards/lickitung.8x6.png             | Bin 813 -> 0 bytes
 src/gfx/cards/lickitung.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/lickitung.png                 | Bin 0 -> 839 bytes
 src/gfx/cards/lightningenergy.8x6.png       | Bin 537 -> 0 bytes
 src/gfx/cards/lightningenergy.pal           | Bin 8 -> 0 bytes
 src/gfx/cards/lightningenergy.png           | Bin 0 -> 577 bytes
 src/gfx/cards/machamp.8x6.png               | Bin 776 -> 0 bytes
 src/gfx/cards/machamp.pal                   |   1 -
 src/gfx/cards/machamp.png                   | Bin 0 -> 830 bytes
 src/gfx/cards/machoke.8x6.png               | Bin 709 -> 0 bytes
 src/gfx/cards/machoke.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/machoke.png                   | Bin 0 -> 758 bytes
 src/gfx/cards/machop.8x6.png                | Bin 728 -> 0 bytes
 src/gfx/cards/machop.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/machop.png                    | Bin 0 -> 767 bytes
 src/gfx/cards/magikarp.8x6.png              | Bin 813 -> 0 bytes
 src/gfx/cards/magikarp.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/magikarp.png                  | Bin 0 -> 849 bytes
 src/gfx/cards/magmar1.8x6.png               | Bin 712 -> 0 bytes
 src/gfx/cards/magmar1.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/magmar1.png                   | Bin 0 -> 781 bytes
 src/gfx/cards/magmar2.8x6.png               | Bin 794 -> 0 bytes
 src/gfx/cards/magmar2.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/magmar2.png                   | Bin 0 -> 841 bytes
 src/gfx/cards/magnemite1.8x6.png            | Bin 652 -> 0 bytes
 src/gfx/cards/magnemite1.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/magnemite1.png                | Bin 0 -> 691 bytes
 src/gfx/cards/magnemite2.8x6.png            | Bin 650 -> 0 bytes
 src/gfx/cards/magnemite2.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/magnemite2.png                | Bin 0 -> 699 bytes
 src/gfx/cards/magneton1.8x6.png             | Bin 736 -> 0 bytes
 src/gfx/cards/magneton1.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/magneton1.png                 | Bin 0 -> 790 bytes
 src/gfx/cards/magneton2.8x6.png             | Bin 663 -> 0 bytes
 src/gfx/cards/magneton2.pal                 |   1 -
 src/gfx/cards/magneton2.png                 | Bin 0 -> 715 bytes
 src/gfx/cards/maintenance.8x6.png           | Bin 467 -> 0 bytes
 src/gfx/cards/maintenance.pal               | Bin 8 -> 0 bytes
 src/gfx/cards/maintenance.png               | Bin 0 -> 508 bytes
 src/gfx/cards/mankey.8x6.png                | Bin 797 -> 0 bytes
 src/gfx/cards/mankey.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/mankey.png                    | Bin 0 -> 837 bytes
 src/gfx/cards/marowak1.8x6.png              | Bin 731 -> 0 bytes
 src/gfx/cards/marowak1.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/marowak1.png                  | Bin 0 -> 768 bytes
 src/gfx/cards/marowak2.8x6.png              | Bin 763 -> 0 bytes
 src/gfx/cards/marowak2.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/marowak2.png                  | Bin 0 -> 798 bytes
 src/gfx/cards/meowth1.8x6.png               | Bin 794 -> 0 bytes
 src/gfx/cards/meowth1.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/meowth1.png                   | Bin 0 -> 836 bytes
 src/gfx/cards/meowth2.8x6.png               | Bin 773 -> 0 bytes
 src/gfx/cards/meowth2.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/meowth2.png                   | Bin 0 -> 813 bytes
 src/gfx/cards/metapod.8x6.png               | Bin 675 -> 0 bytes
 src/gfx/cards/metapod.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/metapod.png                   | Bin 0 -> 713 bytes
 src/gfx/cards/mew1.8x6.png                  | Bin 767 -> 0 bytes
 src/gfx/cards/mew1.pal                      | Bin 8 -> 0 bytes
 src/gfx/cards/mew1.png                      | Bin 0 -> 803 bytes
 src/gfx/cards/mew2.8x6.png                  | Bin 754 -> 0 bytes
 src/gfx/cards/mew2.pal                      | Bin 8 -> 0 bytes
 src/gfx/cards/mew2.png                      | Bin 0 -> 790 bytes
 src/gfx/cards/mew3.8x6.png                  | Bin 699 -> 0 bytes
 src/gfx/cards/mew3.pal                      |   1 -
 src/gfx/cards/mew3.png                      | Bin 0 -> 744 bytes
 src/gfx/cards/mewtwo1.8x6.png               | Bin 659 -> 0 bytes
 src/gfx/cards/mewtwo1.pal                   |   1 -
 src/gfx/cards/mewtwo1.png                   | Bin 0 -> 716 bytes
 src/gfx/cards/mewtwo2.8x6.png               | Bin 695 -> 0 bytes
 src/gfx/cards/mewtwo2.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/mewtwo2.png                   | Bin 0 -> 742 bytes
 src/gfx/cards/mewtwo3.8x6.png               | Bin 788 -> 0 bytes
 src/gfx/cards/mewtwo3.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/mewtwo3.png                   | Bin 0 -> 834 bytes
 src/gfx/cards/moltres1.8x6.png              | Bin 790 -> 0 bytes
 src/gfx/cards/moltres1.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/moltres1.png                  | Bin 0 -> 838 bytes
 src/gfx/cards/moltres2.8x6.png              | Bin 796 -> 0 bytes
 src/gfx/cards/moltres2.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/moltres2.png                  | Bin 0 -> 835 bytes
 src/gfx/cards/mrfuji.8x6.png                | Bin 746 -> 0 bytes
 src/gfx/cards/mrfuji.pal                    |   1 -
 src/gfx/cards/mrfuji.png                    | Bin 0 -> 785 bytes
 src/gfx/cards/mrmime.8x6.png                | Bin 709 -> 0 bytes
 src/gfx/cards/mrmime.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/mrmime.png                    | Bin 0 -> 769 bytes
 src/gfx/cards/muk.8x6.png                   | Bin 738 -> 0 bytes
 src/gfx/cards/muk.pal                       | Bin 8 -> 0 bytes
 src/gfx/cards/muk.png                       | Bin 0 -> 795 bytes
 src/gfx/cards/mysteriousfossil.8x6.png      | Bin 717 -> 0 bytes
 src/gfx/cards/mysteriousfossil.pal          | Bin 8 -> 0 bytes
 src/gfx/cards/mysteriousfossil.png          | Bin 0 -> 771 bytes
 src/gfx/cards/nidoking.8x6.png              | Bin 810 -> 0 bytes
 src/gfx/cards/nidoking.pal                  |   1 -
 src/gfx/cards/nidoking.png                  | Bin 0 -> 862 bytes
 src/gfx/cards/nidoqueen.8x6.png             | Bin 752 -> 0 bytes
 src/gfx/cards/nidoqueen.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/nidoqueen.png                 | Bin 0 -> 811 bytes
 src/gfx/cards/nidoranf.8x6.png              | Bin 769 -> 0 bytes
 src/gfx/cards/nidoranf.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/nidoranf.png                  | Bin 0 -> 819 bytes
 src/gfx/cards/nidoranm.8x6.png              | Bin 714 -> 0 bytes
 src/gfx/cards/nidoranm.pal                  |   1 -
 src/gfx/cards/nidoranm.png                  | Bin 0 -> 757 bytes
 src/gfx/cards/nidorina.8x6.png              | Bin 723 -> 0 bytes
 src/gfx/cards/nidorina.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/nidorina.png                  | Bin 0 -> 767 bytes
 src/gfx/cards/nidorino.8x6.png              | Bin 834 -> 0 bytes
 src/gfx/cards/nidorino.pal                  |   1 -
 src/gfx/cards/nidorino.png                  | Bin 0 -> 872 bytes
 src/gfx/cards/ninetails1.8x6.png            | Bin 760 -> 0 bytes
 src/gfx/cards/ninetails1.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/ninetails1.png                | Bin 0 -> 801 bytes
 src/gfx/cards/ninetails2.8x6.png            | Bin 670 -> 0 bytes
 src/gfx/cards/ninetails2.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/ninetails2.png                | Bin 0 -> 717 bytes
 src/gfx/cards/oddish.8x6.png                | Bin 708 -> 0 bytes
 src/gfx/cards/oddish.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/oddish.png                    | Bin 0 -> 753 bytes
 src/gfx/cards/omanyte.8x6.png               | Bin 792 -> 0 bytes
 src/gfx/cards/omanyte.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/omanyte.png                   | Bin 0 -> 835 bytes
 src/gfx/cards/omastar.8x6.png               | Bin 810 -> 0 bytes
 src/gfx/cards/omastar.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/omastar.png                   | Bin 0 -> 860 bytes
 src/gfx/cards/onix.8x6.png                  | Bin 762 -> 0 bytes
 src/gfx/cards/onix.pal                      | Bin 8 -> 0 bytes
 src/gfx/cards/onix.png                      | Bin 0 -> 803 bytes
 src/gfx/cards/paras.8x6.png                 | Bin 779 -> 0 bytes
 src/gfx/cards/paras.pal                     |   1 -
 src/gfx/cards/paras.png                     | Bin 0 -> 820 bytes
 src/gfx/cards/parasect.8x6.png              | Bin 813 -> 0 bytes
 src/gfx/cards/parasect.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/parasect.png                  | Bin 0 -> 852 bytes
 src/gfx/cards/persian.8x6.png               | Bin 690 -> 0 bytes
 src/gfx/cards/persian.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/persian.png                   | Bin 0 -> 729 bytes
 src/gfx/cards/pidgeot1.8x6.png              | Bin 782 -> 0 bytes
 src/gfx/cards/pidgeot1.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/pidgeot1.png                  | Bin 0 -> 815 bytes
 src/gfx/cards/pidgeot2.8x6.png              | Bin 749 -> 0 bytes
 src/gfx/cards/pidgeot2.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/pidgeot2.png                  | Bin 0 -> 794 bytes
 src/gfx/cards/pidgeotto.8x6.png             | Bin 675 -> 0 bytes
 src/gfx/cards/pidgeotto.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/pidgeotto.png                 | Bin 0 -> 712 bytes
 src/gfx/cards/pidgey.8x6.png                | Bin 611 -> 0 bytes
 src/gfx/cards/pidgey.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/pidgey.png                    | Bin 0 -> 653 bytes
 src/gfx/cards/pikachu1.8x6.png              | Bin 728 -> 0 bytes
 src/gfx/cards/pikachu1.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/pikachu1.png                  | Bin 0 -> 770 bytes
 src/gfx/cards/pikachu2.8x6.png              | Bin 754 -> 0 bytes
 src/gfx/cards/pikachu2.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/pikachu2.png                  | Bin 0 -> 794 bytes
 src/gfx/cards/pikachu3.8x6.png              | Bin 675 -> 0 bytes
 src/gfx/cards/pikachu3.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/pikachu3.png                  | Bin 0 -> 720 bytes
 src/gfx/cards/pikachu4.8x6.png              | Bin 753 -> 0 bytes
 src/gfx/cards/pikachu4.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/pikachu4.png                  | Bin 0 -> 789 bytes
 src/gfx/cards/pinsir.8x6.png                | Bin 745 -> 0 bytes
 src/gfx/cards/pinsir.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/pinsir.png                    | Bin 0 -> 800 bytes
 src/gfx/cards/pluspower.8x6.png             | Bin 531 -> 0 bytes
 src/gfx/cards/pluspower.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/pluspower.png                 | Bin 0 -> 579 bytes
 src/gfx/cards/pokeball.8x6.png              | Bin 549 -> 0 bytes
 src/gfx/cards/pokeball.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/pokeball.png                  | Bin 0 -> 594 bytes
 src/gfx/cards/pokedex.8x6.png               | Bin 750 -> 0 bytes
 src/gfx/cards/pokedex.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/pokedex.png                   | Bin 0 -> 791 bytes
 src/gfx/cards/pokemonbreeder.8x6.png        | Bin 616 -> 0 bytes
 src/gfx/cards/pokemonbreeder.pal            | Bin 8 -> 0 bytes
 src/gfx/cards/pokemonbreeder.png            | Bin 0 -> 654 bytes
 src/gfx/cards/pokemoncenter.8x6.png         | Bin 529 -> 0 bytes
 src/gfx/cards/pokemoncenter.pal             | Bin 8 -> 0 bytes
 src/gfx/cards/pokemoncenter.png             | Bin 0 -> 589 bytes
 src/gfx/cards/pokemonflute.8x6.png          | Bin 582 -> 0 bytes
 src/gfx/cards/pokemonflute.pal              | Bin 8 -> 0 bytes
 src/gfx/cards/pokemonflute.png              | Bin 0 -> 624 bytes
 src/gfx/cards/pokemontrader.8x6.png         | Bin 697 -> 0 bytes
 src/gfx/cards/pokemontrader.pal             | Bin 8 -> 0 bytes
 src/gfx/cards/pokemontrader.png             | Bin 0 -> 736 bytes
 src/gfx/cards/poliwag.8x6.png               | Bin 764 -> 0 bytes
 src/gfx/cards/poliwag.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/poliwag.png                   | Bin 0 -> 799 bytes
 src/gfx/cards/poliwhirl.8x6.png             | Bin 761 -> 0 bytes
 src/gfx/cards/poliwhirl.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/poliwhirl.png                 | Bin 0 -> 801 bytes
 src/gfx/cards/poliwrath.8x6.png             | Bin 773 -> 0 bytes
 src/gfx/cards/poliwrath.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/poliwrath.png                 | Bin 0 -> 821 bytes
 src/gfx/cards/ponyta.8x6.png                | Bin 668 -> 0 bytes
 src/gfx/cards/ponyta.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/ponyta.png                    | Bin 0 -> 718 bytes
 src/gfx/cards/porygon.8x6.png               | Bin 619 -> 0 bytes
 src/gfx/cards/porygon.pal                   |   1 -
 src/gfx/cards/porygon.png                   | Bin 0 -> 663 bytes
 src/gfx/cards/potion.8x6.png                | Bin 508 -> 0 bytes
 src/gfx/cards/potion.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/potion.png                    | Bin 0 -> 554 bytes
 src/gfx/cards/primeape.8x6.png              | Bin 756 -> 0 bytes
 src/gfx/cards/primeape.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/primeape.png                  | Bin 0 -> 796 bytes
 src/gfx/cards/professoroak.8x6.png          | Bin 738 -> 0 bytes
 src/gfx/cards/professoroak.pal              | Bin 8 -> 0 bytes
 src/gfx/cards/professoroak.png              | Bin 0 -> 778 bytes
 src/gfx/cards/psychicenergy.8x6.png         | Bin 536 -> 0 bytes
 src/gfx/cards/psychicenergy.pal             |   1 -
 src/gfx/cards/psychicenergy.png             | Bin 0 -> 576 bytes
 src/gfx/cards/psyduck.8x6.png               | Bin 782 -> 0 bytes
 src/gfx/cards/psyduck.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/psyduck.png                   | Bin 0 -> 818 bytes
 src/gfx/cards/raichu1.8x6.png               | Bin 771 -> 0 bytes
 src/gfx/cards/raichu1.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/raichu1.png                   | Bin 0 -> 815 bytes
 src/gfx/cards/raichu2.8x6.png               | Bin 789 -> 0 bytes
 src/gfx/cards/raichu2.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/raichu2.png                   | Bin 0 -> 834 bytes
 src/gfx/cards/rapidash.8x6.png              | Bin 686 -> 0 bytes
 src/gfx/cards/rapidash.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/rapidash.png                  | Bin 0 -> 723 bytes
 src/gfx/cards/raticate.8x6.png              | Bin 702 -> 0 bytes
 src/gfx/cards/raticate.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/raticate.png                  | Bin 0 -> 739 bytes
 src/gfx/cards/rattata.8x6.png               | Bin 748 -> 0 bytes
 src/gfx/cards/rattata.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/rattata.png                   | Bin 0 -> 788 bytes
 src/gfx/cards/recycle.8x6.png               | Bin 554 -> 0 bytes
 src/gfx/cards/recycle.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/recycle.png                   | Bin 0 -> 600 bytes
 src/gfx/cards/revive.8x6.png                | Bin 603 -> 0 bytes
 src/gfx/cards/revive.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/revive.png                    | Bin 0 -> 644 bytes
 src/gfx/cards/rhydon.8x6.png                | Bin 781 -> 0 bytes
 src/gfx/cards/rhydon.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/rhydon.png                    | Bin 0 -> 823 bytes
 src/gfx/cards/rhyhorn.8x6.png               | Bin 725 -> 0 bytes
 src/gfx/cards/rhyhorn.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/rhyhorn.png                   | Bin 0 -> 763 bytes
 src/gfx/cards/sandshrew.8x6.png             | Bin 776 -> 0 bytes
 src/gfx/cards/sandshrew.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/sandshrew.png                 | Bin 0 -> 816 bytes
 src/gfx/cards/sandslash.8x6.png             | Bin 789 -> 0 bytes
 src/gfx/cards/sandslash.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/sandslash.png                 | Bin 0 -> 831 bytes
 src/gfx/cards/scoopup.8x6.png               | Bin 726 -> 0 bytes
 src/gfx/cards/scoopup.pal                   |   1 -
 src/gfx/cards/scoopup.png                   | Bin 0 -> 766 bytes
 src/gfx/cards/scyther.8x6.png               | Bin 720 -> 0 bytes
 src/gfx/cards/scyther.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/scyther.png                   | Bin 0 -> 770 bytes
 src/gfx/cards/seadra.8x6.png                | Bin 789 -> 0 bytes
 src/gfx/cards/seadra.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/seadra.png                    | Bin 0 -> 824 bytes
 src/gfx/cards/seaking.8x6.png               | Bin 782 -> 0 bytes
 src/gfx/cards/seaking.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/seaking.png                   | Bin 0 -> 817 bytes
 src/gfx/cards/seel.8x6.png                  | Bin 759 -> 0 bytes
 src/gfx/cards/seel.pal                      | Bin 8 -> 0 bytes
 src/gfx/cards/seel.png                      | Bin 0 -> 794 bytes
 src/gfx/cards/shellder.8x6.png              | Bin 693 -> 0 bytes
 src/gfx/cards/shellder.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/shellder.png                  | Bin 0 -> 734 bytes
 src/gfx/cards/slowbro.8x6.png               | Bin 757 -> 0 bytes
 src/gfx/cards/slowbro.pal                   |   1 -
 src/gfx/cards/slowbro.png                   | Bin 0 -> 792 bytes
 src/gfx/cards/slowpoke1.8x6.png             | Bin 721 -> 0 bytes
 src/gfx/cards/slowpoke1.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/slowpoke1.png                 | Bin 0 -> 759 bytes
 src/gfx/cards/slowpoke2.8x6.png             | Bin 359 -> 0 bytes
 src/gfx/cards/slowpoke2.pal                 |   1 -
 src/gfx/cards/slowpoke2.png                 | Bin 0 -> 399 bytes
 src/gfx/cards/snorlax.8x6.png               | Bin 675 -> 0 bytes
 src/gfx/cards/snorlax.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/snorlax.png                   | Bin 0 -> 736 bytes
 src/gfx/cards/spearow.8x6.png               | Bin 781 -> 0 bytes
 src/gfx/cards/spearow.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/spearow.png                   | Bin 0 -> 809 bytes
 src/gfx/cards/squirtle.8x6.png              | Bin 775 -> 0 bytes
 src/gfx/cards/squirtle.pal                  |   1 -
 src/gfx/cards/squirtle.png                  | Bin 0 -> 812 bytes
 src/gfx/cards/starmie.8x6.png               | Bin 599 -> 0 bytes
 src/gfx/cards/starmie.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/starmie.png                   | Bin 0 -> 646 bytes
 src/gfx/cards/staryu.8x6.png                | Bin 627 -> 0 bytes
 src/gfx/cards/staryu.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/staryu.png                    | Bin 0 -> 669 bytes
 src/gfx/cards/superenergyremoval.8x6.png    | Bin 602 -> 0 bytes
 src/gfx/cards/superenergyremoval.pal        | Bin 8 -> 0 bytes
 src/gfx/cards/superenergyremoval.png        | Bin 0 -> 645 bytes
 src/gfx/cards/superenergyretrieval.8x6.png  | Bin 743 -> 0 bytes
 src/gfx/cards/superenergyretrieval.pal      | Bin 8 -> 0 bytes
 src/gfx/cards/superenergyretrieval.png      | Bin 0 -> 786 bytes
 src/gfx/cards/superpotion.8x6.png           | Bin 666 -> 0 bytes
 src/gfx/cards/superpotion.pal               | Bin 8 -> 0 bytes
 src/gfx/cards/superpotion.png               | Bin 0 -> 704 bytes
 src/gfx/cards/surfingpikachu1.8x6.png       | Bin 603 -> 0 bytes
 src/gfx/cards/surfingpikachu1.pal           | Bin 8 -> 0 bytes
 src/gfx/cards/surfingpikachu1.png           | Bin 0 -> 639 bytes
 src/gfx/cards/surfingpikachu2.8x6.png       | Bin 694 -> 0 bytes
 src/gfx/cards/surfingpikachu2.pal           | Bin 8 -> 0 bytes
 src/gfx/cards/surfingpikachu2.png           | Bin 0 -> 727 bytes
 src/gfx/cards/switch.8x6.png                | Bin 544 -> 0 bytes
 src/gfx/cards/switch.pal                    |   1 -
 src/gfx/cards/switch.png                    | Bin 0 -> 598 bytes
 src/gfx/cards/tangela1.8x6.png              | Bin 808 -> 0 bytes
 src/gfx/cards/tangela1.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/tangela1.png                  | Bin 0 -> 856 bytes
 src/gfx/cards/tangela2.8x6.png              | Bin 774 -> 0 bytes
 src/gfx/cards/tangela2.pal                  | Bin 8 -> 0 bytes
 src/gfx/cards/tangela2.png                  | Bin 0 -> 820 bytes
 src/gfx/cards/tauros.8x6.png                | Bin 774 -> 0 bytes
 src/gfx/cards/tauros.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/tauros.png                    | Bin 0 -> 816 bytes
 src/gfx/cards/tentacool.8x6.png             | Bin 763 -> 0 bytes
 src/gfx/cards/tentacool.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/tentacool.png                 | Bin 0 -> 802 bytes
 src/gfx/cards/tentacruel.8x6.png            | Bin 755 -> 0 bytes
 src/gfx/cards/tentacruel.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/tentacruel.png                | Bin 0 -> 796 bytes
 src/gfx/cards/vaporeon1.8x6.png             | Bin 697 -> 0 bytes
 src/gfx/cards/vaporeon1.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/vaporeon1.png                 | Bin 0 -> 737 bytes
 src/gfx/cards/vaporeon2.8x6.png             | Bin 760 -> 0 bytes
 src/gfx/cards/vaporeon2.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/vaporeon2.png                 | Bin 0 -> 811 bytes
 src/gfx/cards/venomoth.8x6.png              | Bin 784 -> 0 bytes
 src/gfx/cards/venomoth.pal                  |   1 -
 src/gfx/cards/venomoth.png                  | Bin 0 -> 833 bytes
 src/gfx/cards/venonat.8x6.png               | Bin 680 -> 0 bytes
 src/gfx/cards/venonat.pal                   |   1 -
 src/gfx/cards/venonat.png                   | Bin 0 -> 717 bytes
 src/gfx/cards/venusaur1.8x6.png             | Bin 731 -> 0 bytes
 src/gfx/cards/venusaur1.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/venusaur1.png                 | Bin 0 -> 769 bytes
 src/gfx/cards/venusaur2.8x6.png             | Bin 801 -> 0 bytes
 src/gfx/cards/venusaur2.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/venusaur2.png                 | Bin 0 -> 848 bytes
 src/gfx/cards/victreebel.8x6.png            | Bin 736 -> 0 bytes
 src/gfx/cards/victreebel.pal                | Bin 8 -> 0 bytes
 src/gfx/cards/victreebel.png                | Bin 0 -> 785 bytes
 src/gfx/cards/vileplume.8x6.png             | Bin 662 -> 0 bytes
 src/gfx/cards/vileplume.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/vileplume.png                 | Bin 0 -> 722 bytes
 src/gfx/cards/voltorb.8x6.png               | Bin 583 -> 0 bytes
 src/gfx/cards/voltorb.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/voltorb.png                   | Bin 0 -> 640 bytes
 src/gfx/cards/vulpix.8x6.png                | Bin 620 -> 0 bytes
 src/gfx/cards/vulpix.pal                    | Bin 8 -> 0 bytes
 src/gfx/cards/vulpix.png                    | Bin 0 -> 671 bytes
 src/gfx/cards/wartortle.8x6.png             | Bin 759 -> 0 bytes
 src/gfx/cards/wartortle.pal                 | Bin 8 -> 0 bytes
 src/gfx/cards/wartortle.png                 | Bin 0 -> 797 bytes
 src/gfx/cards/waterenergy.8x6.png           | Bin 501 -> 0 bytes
 src/gfx/cards/waterenergy.pal               | Bin 8 -> 0 bytes
 src/gfx/cards/waterenergy.png               | Bin 0 -> 539 bytes
 src/gfx/cards/weedle.8x6.png                | Bin 808 -> 0 bytes
 src/gfx/cards/weedle.pal                    |   1 -
 src/gfx/cards/weedle.png                    | Bin 0 -> 846 bytes
 src/gfx/cards/weepinbell.8x6.png            | Bin 763 -> 0 bytes
 src/gfx/cards/weepinbell.pal                |   1 -
 src/gfx/cards/weepinbell.png                | Bin 0 -> 802 bytes
 src/gfx/cards/weezing.8x6.png               | Bin 736 -> 0 bytes
 src/gfx/cards/weezing.pal                   |   1 -
 src/gfx/cards/weezing.png                   | Bin 0 -> 773 bytes
 src/gfx/cards/wigglytuff.8x6.png            | Bin 639 -> 0 bytes
 src/gfx/cards/wigglytuff.pal                |   1 -
 src/gfx/cards/wigglytuff.png                | Bin 0 -> 689 bytes
 src/gfx/cards/zapdos1.8x6.png               | Bin 705 -> 0 bytes
 src/gfx/cards/zapdos1.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/zapdos1.png                   | Bin 0 -> 757 bytes
 src/gfx/cards/zapdos2.8x6.png               | Bin 662 -> 0 bytes
 src/gfx/cards/zapdos2.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/zapdos2.png                   | Bin 0 -> 722 bytes
 src/gfx/cards/zapdos3.8x6.png               | Bin 585 -> 0 bytes
 src/gfx/cards/zapdos3.pal                   | Bin 8 -> 0 bytes
 src/gfx/cards/zapdos3.png                   | Bin 0 -> 626 bytes
 src/gfx/cards/zubat.8x6.png                 | Bin 777 -> 0 bytes
 src/gfx/cards/zubat.pal                     | Bin 8 -> 0 bytes
 src/gfx/cards/zubat.png                     | Bin 0 -> 818 bytes
 src/gfx/duel/anims/51.png                   | Bin 0 -> 552 bytes
 src/gfx/duel/anims/51.t10.png               | Bin 552 -> 0 bytes
 src/gfx/duel/cgb_symbols.png                | Bin 0 -> 1270 bytes
 src/gfx/duel/cgb_symbols.t7.png             | Bin 1270 -> 0 bytes
 src/gfx/duel/dmg_sgb_symbols.png            | Bin 0 -> 1374 bytes
 src/gfx/duel/dmg_sgb_symbols.t7.png         | Bin 1374 -> 0 bytes
 src/gfx/duel/other.png                      | Bin 0 -> 820 bytes
 src/gfx/duel/other.t7.png                   | Bin 820 -> 0 bytes
 src/gfx/fonts/full_width/4.png              | Bin 0 -> 1153 bytes
 src/gfx/fonts/full_width/4.t3.png           | Bin 1153 -> 0 bytes
 src/gfx/overworld_map.png                   | Bin 0 -> 2176 bytes
 src/gfx/overworld_map.t15.png               | Bin 2176 -> 0 bytes
 src/gfx/tilesets/challengehall.png          | Bin 0 -> 1736 bytes
 src/gfx/tilesets/challengehall.t3.png       | Bin 1736 -> 0 bytes
 src/gfx/tilesets/clubentrance.png           | Bin 0 -> 1573 bytes
 src/gfx/tilesets/clubentrance.t15.png       | Bin 1573 -> 0 bytes
 src/gfx/tilesets/clublobby.png              | Bin 0 -> 1401 bytes
 src/gfx/tilesets/clublobby.t8.png           | Bin 1401 -> 0 bytes
 src/gfx/tilesets/fightingclub.png           | Bin 0 -> 1080 bytes
 src/gfx/tilesets/fightingclub.t13.png       | Bin 1080 -> 0 bytes
 src/gfx/tilesets/fireclub.png               | Bin 0 -> 1066 bytes
 src/gfx/tilesets/fireclub.t9.png            | Bin 1066 -> 0 bytes
 src/gfx/tilesets/grassclub.png              | Bin 0 -> 1155 bytes
 src/gfx/tilesets/grassclub.t9.png           | Bin 1155 -> 0 bytes
 src/gfx/tilesets/hallofhonor.png            | Bin 0 -> 1369 bytes
 src/gfx/tilesets/hallofhonor.t7.png         | Bin 1369 -> 0 bytes
 src/gfx/tilesets/ishihara.png               | Bin 0 -> 926 bytes
 src/gfx/tilesets/ishihara.t3.png            | Bin 926 -> 0 bytes
 src/gfx/tilesets/lightningclub.png          | Bin 0 -> 1305 bytes
 src/gfx/tilesets/lightningclub.t13.png      | Bin 1305 -> 0 bytes
 src/gfx/tilesets/masonlaboratory.png        | Bin 0 -> 1664 bytes
 src/gfx/tilesets/masonlaboratory.t9.png     | Bin 1664 -> 0 bytes
 src/gfx/tilesets/pokemondome.png            | Bin 0 -> 2298 bytes
 src/gfx/tilesets/pokemondome.t1.png         | Bin 2298 -> 0 bytes
 src/gfx/tilesets/pokemondomeentrance.png    | Bin 0 -> 941 bytes
 src/gfx/tilesets/pokemondomeentrance.t2.png | Bin 941 -> 0 bytes
 src/gfx/tilesets/psychicclub.png            | Bin 0 -> 690 bytes
 src/gfx/tilesets/psychicclub.t6.png         | Bin 690 -> 0 bytes
 src/gfx/tilesets/rockclub.png               | Bin 0 -> 828 bytes
 src/gfx/tilesets/rockclub.t4.png            | Bin 828 -> 0 bytes
 src/gfx/tilesets/scienceclub.png            | Bin 0 -> 1051 bytes
 src/gfx/tilesets/scienceclub.t14.png        | Bin 1051 -> 0 bytes
 src/gfx/tilesets/waterclub.png              | Bin 0 -> 1825 bytes
 src/gfx/tilesets/waterclub.t15.png          | Bin 1825 -> 0 bytes
 src/gfx/titlescreen/titlescreen1.png        | Bin 0 -> 909 bytes
 src/gfx/titlescreen/titlescreen1.t15.png    | Bin 909 -> 0 bytes
 src/gfx/titlescreen/titlescreen2.png        | Bin 0 -> 950 bytes
 src/gfx/titlescreen/titlescreen2.t15.png    | Bin 950 -> 0 bytes
 src/gfx/titlescreen/titlescreen3.png        | Bin 0 -> 2572 bytes
 src/gfx/titlescreen/titlescreen3.t12.png    | Bin 2572 -> 0 bytes
 src/gfx/titlescreen/titlescreen4.png        | Bin 0 -> 3602 bytes
 src/gfx/titlescreen/titlescreen4.t5.png     | Bin 3602 -> 0 bytes
 src/gfx/titlescreen/titlescreen5.png        | Bin 0 -> 2007 bytes
 src/gfx/titlescreen/titlescreen5.t4.png     | Bin 2007 -> 0 bytes
 src/gfx/titlescreen/titlescreen6.png        | Bin 0 -> 2005 bytes
 src/gfx/titlescreen/titlescreen6.t12.png    | Bin 2005 -> 0 bytes
 756 files changed, 265 insertions(+), 300 deletions(-)
 create mode 100644 src/gfx/booster_packs/colosseum2.png
 delete mode 100644 src/gfx/booster_packs/colosseum2.t10.png
 create mode 100644 src/gfx/booster_packs/evolution2.png
 delete mode 100644 src/gfx/booster_packs/evolution2.t10.png
 create mode 100644 src/gfx/booster_packs/laboratory2.png
 delete mode 100644 src/gfx/booster_packs/laboratory2.t10.png
 create mode 100644 src/gfx/booster_packs/mystery2.png
 delete mode 100644 src/gfx/booster_packs/mystery2.t10.png
 create mode 100644 src/gfx/cardpop/cardpop1.png
 delete mode 100644 src/gfx/cardpop/cardpop1.t3.png
 create mode 100644 src/gfx/cardpop/cardpop2.png
 delete mode 100644 src/gfx/cardpop/cardpop2.t3.png
 create mode 100644 src/gfx/cardpop/cardpop3.png
 delete mode 100644 src/gfx/cardpop/cardpop3.t3.png
 delete mode 100644 src/gfx/cards/abra.8x6.png
 delete mode 100644 src/gfx/cards/abra.pal
 create mode 100644 src/gfx/cards/abra.png
 delete mode 100644 src/gfx/cards/aerodactyl.8x6.png
 delete mode 100644 src/gfx/cards/aerodactyl.pal
 create mode 100644 src/gfx/cards/aerodactyl.png
 delete mode 100644 src/gfx/cards/alakazam.8x6.png
 delete mode 100644 src/gfx/cards/alakazam.pal
 create mode 100644 src/gfx/cards/alakazam.png
 delete mode 100644 src/gfx/cards/arbok.8x6.png
 delete mode 100644 src/gfx/cards/arbok.pal
 create mode 100644 src/gfx/cards/arbok.png
 delete mode 100644 src/gfx/cards/arcanine1.8x6.png
 delete mode 100644 src/gfx/cards/arcanine1.pal
 create mode 100644 src/gfx/cards/arcanine1.png
 delete mode 100644 src/gfx/cards/arcanine2.8x6.png
 delete mode 100644 src/gfx/cards/arcanine2.pal
 create mode 100644 src/gfx/cards/arcanine2.png
 delete mode 100644 src/gfx/cards/articuno1.8x6.png
 delete mode 100644 src/gfx/cards/articuno1.pal
 create mode 100644 src/gfx/cards/articuno1.png
 delete mode 100644 src/gfx/cards/articuno2.8x6.png
 delete mode 100644 src/gfx/cards/articuno2.pal
 create mode 100644 src/gfx/cards/articuno2.png
 delete mode 100644 src/gfx/cards/beedrill.8x6.png
 delete mode 100644 src/gfx/cards/beedrill.pal
 create mode 100644 src/gfx/cards/beedrill.png
 delete mode 100644 src/gfx/cards/bellsprout.8x6.png
 delete mode 100644 src/gfx/cards/bellsprout.pal
 create mode 100644 src/gfx/cards/bellsprout.png
 delete mode 100644 src/gfx/cards/bill.8x6.png
 delete mode 100644 src/gfx/cards/bill.pal
 create mode 100644 src/gfx/cards/bill.png
 delete mode 100644 src/gfx/cards/blastoise.8x6.png
 delete mode 100644 src/gfx/cards/blastoise.pal
 create mode 100644 src/gfx/cards/blastoise.png
 delete mode 100644 src/gfx/cards/bulbasaur.8x6.png
 delete mode 100644 src/gfx/cards/bulbasaur.pal
 create mode 100644 src/gfx/cards/bulbasaur.png
 delete mode 100644 src/gfx/cards/butterfree.8x6.png
 delete mode 100644 src/gfx/cards/butterfree.pal
 create mode 100644 src/gfx/cards/butterfree.png
 delete mode 100644 src/gfx/cards/caterpie.8x6.png
 delete mode 100644 src/gfx/cards/caterpie.pal
 create mode 100644 src/gfx/cards/caterpie.png
 delete mode 100644 src/gfx/cards/chansey.8x6.png
 delete mode 100644 src/gfx/cards/chansey.pal
 create mode 100644 src/gfx/cards/chansey.png
 delete mode 100644 src/gfx/cards/charizard.8x6.png
 delete mode 100644 src/gfx/cards/charizard.pal
 create mode 100644 src/gfx/cards/charizard.png
 delete mode 100644 src/gfx/cards/charmander.8x6.png
 delete mode 100644 src/gfx/cards/charmander.pal
 create mode 100644 src/gfx/cards/charmander.png
 delete mode 100644 src/gfx/cards/charmeleon.8x6.png
 delete mode 100644 src/gfx/cards/charmeleon.pal
 create mode 100644 src/gfx/cards/charmeleon.png
 delete mode 100644 src/gfx/cards/clefable.8x6.png
 delete mode 100644 src/gfx/cards/clefable.pal
 create mode 100644 src/gfx/cards/clefable.png
 delete mode 100644 src/gfx/cards/clefairy.8x6.png
 delete mode 100644 src/gfx/cards/clefairy.pal
 create mode 100644 src/gfx/cards/clefairy.png
 delete mode 100644 src/gfx/cards/clefairydoll.8x6.png
 delete mode 100644 src/gfx/cards/clefairydoll.pal
 create mode 100644 src/gfx/cards/clefairydoll.png
 delete mode 100644 src/gfx/cards/cloyster.8x6.png
 delete mode 100644 src/gfx/cards/cloyster.pal
 create mode 100644 src/gfx/cards/cloyster.png
 delete mode 100644 src/gfx/cards/computersearch.8x6.png
 delete mode 100644 src/gfx/cards/computersearch.pal
 create mode 100644 src/gfx/cards/computersearch.png
 delete mode 100644 src/gfx/cards/cubone.8x6.png
 delete mode 100644 src/gfx/cards/cubone.pal
 create mode 100644 src/gfx/cards/cubone.png
 delete mode 100644 src/gfx/cards/defender.8x6.png
 delete mode 100644 src/gfx/cards/defender.pal
 create mode 100644 src/gfx/cards/defender.png
 delete mode 100644 src/gfx/cards/devolutionspray.8x6.png
 delete mode 100644 src/gfx/cards/devolutionspray.pal
 create mode 100644 src/gfx/cards/devolutionspray.png
 delete mode 100644 src/gfx/cards/dewgong.8x6.png
 delete mode 100644 src/gfx/cards/dewgong.pal
 create mode 100644 src/gfx/cards/dewgong.png
 delete mode 100644 src/gfx/cards/diglett.8x6.png
 delete mode 100644 src/gfx/cards/diglett.pal
 create mode 100644 src/gfx/cards/diglett.png
 delete mode 100644 src/gfx/cards/ditto.8x6.png
 delete mode 100644 src/gfx/cards/ditto.pal
 create mode 100644 src/gfx/cards/ditto.png
 delete mode 100644 src/gfx/cards/dodrio.8x6.png
 delete mode 100644 src/gfx/cards/dodrio.pal
 create mode 100644 src/gfx/cards/dodrio.png
 delete mode 100644 src/gfx/cards/doduo.8x6.png
 delete mode 100644 src/gfx/cards/doduo.pal
 create mode 100644 src/gfx/cards/doduo.png
 delete mode 100644 src/gfx/cards/doublecolorlessenergy.8x6.png
 delete mode 100644 src/gfx/cards/doublecolorlessenergy.pal
 create mode 100644 src/gfx/cards/doublecolorlessenergy.png
 delete mode 100644 src/gfx/cards/dragonair.8x6.png
 delete mode 100644 src/gfx/cards/dragonair.pal
 create mode 100644 src/gfx/cards/dragonair.png
 delete mode 100644 src/gfx/cards/dragonite1.8x6.png
 delete mode 100644 src/gfx/cards/dragonite1.pal
 create mode 100644 src/gfx/cards/dragonite1.png
 delete mode 100644 src/gfx/cards/dragonite2.8x6.png
 delete mode 100644 src/gfx/cards/dragonite2.pal
 create mode 100644 src/gfx/cards/dragonite2.png
 delete mode 100644 src/gfx/cards/dratini.8x6.png
 delete mode 100644 src/gfx/cards/dratini.pal
 create mode 100644 src/gfx/cards/dratini.png
 delete mode 100644 src/gfx/cards/drowzee.8x6.png
 delete mode 100644 src/gfx/cards/drowzee.pal
 create mode 100644 src/gfx/cards/drowzee.png
 delete mode 100644 src/gfx/cards/dugtrio.8x6.png
 delete mode 100644 src/gfx/cards/dugtrio.pal
 create mode 100644 src/gfx/cards/dugtrio.png
 delete mode 100644 src/gfx/cards/eevee.8x6.png
 delete mode 100644 src/gfx/cards/eevee.pal
 create mode 100644 src/gfx/cards/eevee.png
 delete mode 100644 src/gfx/cards/ekans.8x6.png
 delete mode 100644 src/gfx/cards/ekans.pal
 create mode 100644 src/gfx/cards/ekans.png
 delete mode 100644 src/gfx/cards/electabuzz1.8x6.png
 delete mode 100644 src/gfx/cards/electabuzz1.pal
 create mode 100644 src/gfx/cards/electabuzz1.png
 delete mode 100644 src/gfx/cards/electabuzz2.8x6.png
 delete mode 100644 src/gfx/cards/electabuzz2.pal
 create mode 100644 src/gfx/cards/electabuzz2.png
 delete mode 100644 src/gfx/cards/electrode1.8x6.png
 delete mode 100644 src/gfx/cards/electrode1.pal
 create mode 100644 src/gfx/cards/electrode1.png
 delete mode 100644 src/gfx/cards/electrode2.8x6.png
 delete mode 100644 src/gfx/cards/electrode2.pal
 create mode 100644 src/gfx/cards/electrode2.png
 delete mode 100644 src/gfx/cards/energyremoval.8x6.png
 delete mode 100644 src/gfx/cards/energyremoval.pal
 create mode 100644 src/gfx/cards/energyremoval.png
 delete mode 100644 src/gfx/cards/energyretrieval.8x6.png
 delete mode 100644 src/gfx/cards/energyretrieval.pal
 create mode 100644 src/gfx/cards/energyretrieval.png
 delete mode 100644 src/gfx/cards/energysearch.8x6.png
 delete mode 100644 src/gfx/cards/energysearch.pal
 create mode 100644 src/gfx/cards/energysearch.png
 delete mode 100644 src/gfx/cards/exeggcute.8x6.png
 delete mode 100644 src/gfx/cards/exeggcute.pal
 create mode 100644 src/gfx/cards/exeggcute.png
 delete mode 100644 src/gfx/cards/exeggutor.8x6.png
 delete mode 100644 src/gfx/cards/exeggutor.pal
 create mode 100644 src/gfx/cards/exeggutor.png
 delete mode 100644 src/gfx/cards/farfetchd.8x6.png
 delete mode 100644 src/gfx/cards/farfetchd.pal
 create mode 100644 src/gfx/cards/farfetchd.png
 delete mode 100644 src/gfx/cards/fearow.8x6.png
 delete mode 100644 src/gfx/cards/fearow.pal
 create mode 100644 src/gfx/cards/fearow.png
 delete mode 100644 src/gfx/cards/fightingenergy.8x6.png
 delete mode 100644 src/gfx/cards/fightingenergy.pal
 create mode 100644 src/gfx/cards/fightingenergy.png
 delete mode 100644 src/gfx/cards/fireenergy.8x6.png
 delete mode 100644 src/gfx/cards/fireenergy.pal
 create mode 100644 src/gfx/cards/fireenergy.png
 delete mode 100644 src/gfx/cards/flareon1.8x6.png
 delete mode 100644 src/gfx/cards/flareon1.pal
 create mode 100644 src/gfx/cards/flareon1.png
 delete mode 100644 src/gfx/cards/flareon2.8x6.png
 delete mode 100644 src/gfx/cards/flareon2.pal
 create mode 100644 src/gfx/cards/flareon2.png
 delete mode 100644 src/gfx/cards/flyingpikachu.8x6.png
 delete mode 100644 src/gfx/cards/flyingpikachu.pal
 create mode 100644 src/gfx/cards/flyingpikachu.png
 delete mode 100644 src/gfx/cards/fullheal.8x6.png
 delete mode 100644 src/gfx/cards/fullheal.pal
 create mode 100644 src/gfx/cards/fullheal.png
 delete mode 100644 src/gfx/cards/gambler.8x6.png
 delete mode 100644 src/gfx/cards/gambler.pal
 create mode 100644 src/gfx/cards/gambler.png
 delete mode 100644 src/gfx/cards/gastly1.8x6.png
 delete mode 100644 src/gfx/cards/gastly1.pal
 create mode 100644 src/gfx/cards/gastly1.png
 delete mode 100644 src/gfx/cards/gastly2.8x6.png
 delete mode 100644 src/gfx/cards/gastly2.pal
 create mode 100644 src/gfx/cards/gastly2.png
 delete mode 100644 src/gfx/cards/gengar.8x6.png
 delete mode 100644 src/gfx/cards/gengar.pal
 create mode 100644 src/gfx/cards/gengar.png
 delete mode 100644 src/gfx/cards/geodude.8x6.png
 delete mode 100644 src/gfx/cards/geodude.pal
 create mode 100644 src/gfx/cards/geodude.png
 delete mode 100644 src/gfx/cards/gloom.8x6.png
 delete mode 100644 src/gfx/cards/gloom.pal
 create mode 100644 src/gfx/cards/gloom.png
 delete mode 100644 src/gfx/cards/golbat.8x6.png
 delete mode 100644 src/gfx/cards/golbat.pal
 create mode 100644 src/gfx/cards/golbat.png
 delete mode 100644 src/gfx/cards/goldeen.8x6.png
 delete mode 100644 src/gfx/cards/goldeen.pal
 create mode 100644 src/gfx/cards/goldeen.png
 delete mode 100644 src/gfx/cards/golduck.8x6.png
 delete mode 100644 src/gfx/cards/golduck.pal
 create mode 100644 src/gfx/cards/golduck.png
 delete mode 100644 src/gfx/cards/golem.8x6.png
 delete mode 100644 src/gfx/cards/golem.pal
 create mode 100644 src/gfx/cards/golem.png
 delete mode 100644 src/gfx/cards/grassenergy.8x6.png
 delete mode 100644 src/gfx/cards/grassenergy.pal
 create mode 100644 src/gfx/cards/grassenergy.png
 delete mode 100644 src/gfx/cards/graveler.8x6.png
 delete mode 100644 src/gfx/cards/graveler.pal
 create mode 100644 src/gfx/cards/graveler.png
 delete mode 100644 src/gfx/cards/grimer.8x6.png
 delete mode 100644 src/gfx/cards/grimer.pal
 create mode 100644 src/gfx/cards/grimer.png
 delete mode 100644 src/gfx/cards/growlithe.8x6.png
 delete mode 100644 src/gfx/cards/growlithe.pal
 create mode 100644 src/gfx/cards/growlithe.png
 delete mode 100644 src/gfx/cards/gustofwind.8x6.png
 delete mode 100644 src/gfx/cards/gustofwind.pal
 create mode 100644 src/gfx/cards/gustofwind.png
 delete mode 100644 src/gfx/cards/gyarados.8x6.png
 delete mode 100644 src/gfx/cards/gyarados.pal
 create mode 100644 src/gfx/cards/gyarados.png
 delete mode 100644 src/gfx/cards/haunter1.8x6.png
 delete mode 100644 src/gfx/cards/haunter1.pal
 create mode 100644 src/gfx/cards/haunter1.png
 delete mode 100644 src/gfx/cards/haunter2.8x6.png
 delete mode 100644 src/gfx/cards/haunter2.pal
 create mode 100644 src/gfx/cards/haunter2.png
 delete mode 100644 src/gfx/cards/hitmonchan.8x6.png
 delete mode 100644 src/gfx/cards/hitmonchan.pal
 create mode 100644 src/gfx/cards/hitmonchan.png
 delete mode 100644 src/gfx/cards/hitmonlee.8x6.png
 delete mode 100644 src/gfx/cards/hitmonlee.pal
 create mode 100644 src/gfx/cards/hitmonlee.png
 delete mode 100644 src/gfx/cards/horsea.8x6.png
 delete mode 100644 src/gfx/cards/horsea.pal
 create mode 100644 src/gfx/cards/horsea.png
 delete mode 100644 src/gfx/cards/hypno.8x6.png
 delete mode 100644 src/gfx/cards/hypno.pal
 create mode 100644 src/gfx/cards/hypno.png
 delete mode 100644 src/gfx/cards/imakuni.8x6.png
 delete mode 100644 src/gfx/cards/imakuni.pal
 create mode 100644 src/gfx/cards/imakuni.png
 delete mode 100644 src/gfx/cards/imposterprofessoroak.8x6.png
 delete mode 100644 src/gfx/cards/imposterprofessoroak.pal
 create mode 100644 src/gfx/cards/imposterprofessoroak.png
 delete mode 100644 src/gfx/cards/itemfinder.8x6.png
 delete mode 100644 src/gfx/cards/itemfinder.pal
 create mode 100644 src/gfx/cards/itemfinder.png
 delete mode 100644 src/gfx/cards/ivysaur.8x6.png
 delete mode 100644 src/gfx/cards/ivysaur.pal
 create mode 100644 src/gfx/cards/ivysaur.png
 delete mode 100644 src/gfx/cards/jigglypuff1.8x6.png
 delete mode 100644 src/gfx/cards/jigglypuff1.pal
 create mode 100644 src/gfx/cards/jigglypuff1.png
 delete mode 100644 src/gfx/cards/jigglypuff2.8x6.png
 delete mode 100644 src/gfx/cards/jigglypuff2.pal
 create mode 100644 src/gfx/cards/jigglypuff2.png
 delete mode 100644 src/gfx/cards/jigglypuff3.8x6.png
 delete mode 100644 src/gfx/cards/jigglypuff3.pal
 create mode 100644 src/gfx/cards/jigglypuff3.png
 delete mode 100644 src/gfx/cards/jolteon1.8x6.png
 delete mode 100644 src/gfx/cards/jolteon1.pal
 create mode 100644 src/gfx/cards/jolteon1.png
 delete mode 100644 src/gfx/cards/jolteon2.8x6.png
 delete mode 100644 src/gfx/cards/jolteon2.pal
 create mode 100644 src/gfx/cards/jolteon2.png
 delete mode 100644 src/gfx/cards/jynx.8x6.png
 delete mode 100644 src/gfx/cards/jynx.pal
 create mode 100644 src/gfx/cards/jynx.png
 delete mode 100644 src/gfx/cards/kabuto.8x6.png
 delete mode 100644 src/gfx/cards/kabuto.pal
 create mode 100644 src/gfx/cards/kabuto.png
 delete mode 100644 src/gfx/cards/kabutops.8x6.png
 delete mode 100644 src/gfx/cards/kabutops.pal
 create mode 100644 src/gfx/cards/kabutops.png
 delete mode 100644 src/gfx/cards/kadabra.8x6.png
 delete mode 100644 src/gfx/cards/kadabra.pal
 create mode 100644 src/gfx/cards/kadabra.png
 delete mode 100644 src/gfx/cards/kakuna.8x6.png
 delete mode 100644 src/gfx/cards/kakuna.pal
 create mode 100644 src/gfx/cards/kakuna.png
 delete mode 100644 src/gfx/cards/kangaskhan.8x6.png
 delete mode 100644 src/gfx/cards/kangaskhan.pal
 create mode 100644 src/gfx/cards/kangaskhan.png
 delete mode 100644 src/gfx/cards/kingler.8x6.png
 delete mode 100644 src/gfx/cards/kingler.pal
 create mode 100644 src/gfx/cards/kingler.png
 delete mode 100644 src/gfx/cards/koffing.8x6.png
 delete mode 100644 src/gfx/cards/koffing.pal
 create mode 100644 src/gfx/cards/koffing.png
 delete mode 100644 src/gfx/cards/krabby.8x6.png
 delete mode 100644 src/gfx/cards/krabby.pal
 create mode 100644 src/gfx/cards/krabby.png
 delete mode 100644 src/gfx/cards/lapras.8x6.png
 delete mode 100644 src/gfx/cards/lapras.pal
 create mode 100644 src/gfx/cards/lapras.png
 delete mode 100644 src/gfx/cards/lass.8x6.png
 delete mode 100644 src/gfx/cards/lass.pal
 create mode 100644 src/gfx/cards/lass.png
 delete mode 100644 src/gfx/cards/lickitung.8x6.png
 delete mode 100644 src/gfx/cards/lickitung.pal
 create mode 100644 src/gfx/cards/lickitung.png
 delete mode 100644 src/gfx/cards/lightningenergy.8x6.png
 delete mode 100644 src/gfx/cards/lightningenergy.pal
 create mode 100644 src/gfx/cards/lightningenergy.png
 delete mode 100644 src/gfx/cards/machamp.8x6.png
 delete mode 100644 src/gfx/cards/machamp.pal
 create mode 100644 src/gfx/cards/machamp.png
 delete mode 100644 src/gfx/cards/machoke.8x6.png
 delete mode 100644 src/gfx/cards/machoke.pal
 create mode 100644 src/gfx/cards/machoke.png
 delete mode 100644 src/gfx/cards/machop.8x6.png
 delete mode 100644 src/gfx/cards/machop.pal
 create mode 100644 src/gfx/cards/machop.png
 delete mode 100644 src/gfx/cards/magikarp.8x6.png
 delete mode 100644 src/gfx/cards/magikarp.pal
 create mode 100644 src/gfx/cards/magikarp.png
 delete mode 100644 src/gfx/cards/magmar1.8x6.png
 delete mode 100644 src/gfx/cards/magmar1.pal
 create mode 100644 src/gfx/cards/magmar1.png
 delete mode 100644 src/gfx/cards/magmar2.8x6.png
 delete mode 100644 src/gfx/cards/magmar2.pal
 create mode 100644 src/gfx/cards/magmar2.png
 delete mode 100644 src/gfx/cards/magnemite1.8x6.png
 delete mode 100644 src/gfx/cards/magnemite1.pal
 create mode 100644 src/gfx/cards/magnemite1.png
 delete mode 100644 src/gfx/cards/magnemite2.8x6.png
 delete mode 100644 src/gfx/cards/magnemite2.pal
 create mode 100644 src/gfx/cards/magnemite2.png
 delete mode 100644 src/gfx/cards/magneton1.8x6.png
 delete mode 100644 src/gfx/cards/magneton1.pal
 create mode 100644 src/gfx/cards/magneton1.png
 delete mode 100644 src/gfx/cards/magneton2.8x6.png
 delete mode 100644 src/gfx/cards/magneton2.pal
 create mode 100644 src/gfx/cards/magneton2.png
 delete mode 100644 src/gfx/cards/maintenance.8x6.png
 delete mode 100644 src/gfx/cards/maintenance.pal
 create mode 100644 src/gfx/cards/maintenance.png
 delete mode 100644 src/gfx/cards/mankey.8x6.png
 delete mode 100644 src/gfx/cards/mankey.pal
 create mode 100644 src/gfx/cards/mankey.png
 delete mode 100644 src/gfx/cards/marowak1.8x6.png
 delete mode 100644 src/gfx/cards/marowak1.pal
 create mode 100644 src/gfx/cards/marowak1.png
 delete mode 100644 src/gfx/cards/marowak2.8x6.png
 delete mode 100644 src/gfx/cards/marowak2.pal
 create mode 100644 src/gfx/cards/marowak2.png
 delete mode 100644 src/gfx/cards/meowth1.8x6.png
 delete mode 100644 src/gfx/cards/meowth1.pal
 create mode 100644 src/gfx/cards/meowth1.png
 delete mode 100644 src/gfx/cards/meowth2.8x6.png
 delete mode 100644 src/gfx/cards/meowth2.pal
 create mode 100644 src/gfx/cards/meowth2.png
 delete mode 100644 src/gfx/cards/metapod.8x6.png
 delete mode 100644 src/gfx/cards/metapod.pal
 create mode 100644 src/gfx/cards/metapod.png
 delete mode 100644 src/gfx/cards/mew1.8x6.png
 delete mode 100644 src/gfx/cards/mew1.pal
 create mode 100644 src/gfx/cards/mew1.png
 delete mode 100644 src/gfx/cards/mew2.8x6.png
 delete mode 100644 src/gfx/cards/mew2.pal
 create mode 100644 src/gfx/cards/mew2.png
 delete mode 100644 src/gfx/cards/mew3.8x6.png
 delete mode 100644 src/gfx/cards/mew3.pal
 create mode 100644 src/gfx/cards/mew3.png
 delete mode 100644 src/gfx/cards/mewtwo1.8x6.png
 delete mode 100644 src/gfx/cards/mewtwo1.pal
 create mode 100644 src/gfx/cards/mewtwo1.png
 delete mode 100644 src/gfx/cards/mewtwo2.8x6.png
 delete mode 100644 src/gfx/cards/mewtwo2.pal
 create mode 100644 src/gfx/cards/mewtwo2.png
 delete mode 100644 src/gfx/cards/mewtwo3.8x6.png
 delete mode 100644 src/gfx/cards/mewtwo3.pal
 create mode 100644 src/gfx/cards/mewtwo3.png
 delete mode 100644 src/gfx/cards/moltres1.8x6.png
 delete mode 100644 src/gfx/cards/moltres1.pal
 create mode 100644 src/gfx/cards/moltres1.png
 delete mode 100644 src/gfx/cards/moltres2.8x6.png
 delete mode 100644 src/gfx/cards/moltres2.pal
 create mode 100644 src/gfx/cards/moltres2.png
 delete mode 100644 src/gfx/cards/mrfuji.8x6.png
 delete mode 100644 src/gfx/cards/mrfuji.pal
 create mode 100644 src/gfx/cards/mrfuji.png
 delete mode 100644 src/gfx/cards/mrmime.8x6.png
 delete mode 100644 src/gfx/cards/mrmime.pal
 create mode 100644 src/gfx/cards/mrmime.png
 delete mode 100644 src/gfx/cards/muk.8x6.png
 delete mode 100644 src/gfx/cards/muk.pal
 create mode 100644 src/gfx/cards/muk.png
 delete mode 100644 src/gfx/cards/mysteriousfossil.8x6.png
 delete mode 100644 src/gfx/cards/mysteriousfossil.pal
 create mode 100644 src/gfx/cards/mysteriousfossil.png
 delete mode 100644 src/gfx/cards/nidoking.8x6.png
 delete mode 100644 src/gfx/cards/nidoking.pal
 create mode 100644 src/gfx/cards/nidoking.png
 delete mode 100644 src/gfx/cards/nidoqueen.8x6.png
 delete mode 100644 src/gfx/cards/nidoqueen.pal
 create mode 100644 src/gfx/cards/nidoqueen.png
 delete mode 100644 src/gfx/cards/nidoranf.8x6.png
 delete mode 100644 src/gfx/cards/nidoranf.pal
 create mode 100644 src/gfx/cards/nidoranf.png
 delete mode 100644 src/gfx/cards/nidoranm.8x6.png
 delete mode 100644 src/gfx/cards/nidoranm.pal
 create mode 100644 src/gfx/cards/nidoranm.png
 delete mode 100644 src/gfx/cards/nidorina.8x6.png
 delete mode 100644 src/gfx/cards/nidorina.pal
 create mode 100644 src/gfx/cards/nidorina.png
 delete mode 100644 src/gfx/cards/nidorino.8x6.png
 delete mode 100644 src/gfx/cards/nidorino.pal
 create mode 100644 src/gfx/cards/nidorino.png
 delete mode 100644 src/gfx/cards/ninetails1.8x6.png
 delete mode 100644 src/gfx/cards/ninetails1.pal
 create mode 100644 src/gfx/cards/ninetails1.png
 delete mode 100644 src/gfx/cards/ninetails2.8x6.png
 delete mode 100644 src/gfx/cards/ninetails2.pal
 create mode 100644 src/gfx/cards/ninetails2.png
 delete mode 100644 src/gfx/cards/oddish.8x6.png
 delete mode 100644 src/gfx/cards/oddish.pal
 create mode 100644 src/gfx/cards/oddish.png
 delete mode 100644 src/gfx/cards/omanyte.8x6.png
 delete mode 100644 src/gfx/cards/omanyte.pal
 create mode 100644 src/gfx/cards/omanyte.png
 delete mode 100644 src/gfx/cards/omastar.8x6.png
 delete mode 100644 src/gfx/cards/omastar.pal
 create mode 100644 src/gfx/cards/omastar.png
 delete mode 100644 src/gfx/cards/onix.8x6.png
 delete mode 100644 src/gfx/cards/onix.pal
 create mode 100644 src/gfx/cards/onix.png
 delete mode 100644 src/gfx/cards/paras.8x6.png
 delete mode 100644 src/gfx/cards/paras.pal
 create mode 100644 src/gfx/cards/paras.png
 delete mode 100644 src/gfx/cards/parasect.8x6.png
 delete mode 100644 src/gfx/cards/parasect.pal
 create mode 100644 src/gfx/cards/parasect.png
 delete mode 100644 src/gfx/cards/persian.8x6.png
 delete mode 100644 src/gfx/cards/persian.pal
 create mode 100644 src/gfx/cards/persian.png
 delete mode 100644 src/gfx/cards/pidgeot1.8x6.png
 delete mode 100644 src/gfx/cards/pidgeot1.pal
 create mode 100644 src/gfx/cards/pidgeot1.png
 delete mode 100644 src/gfx/cards/pidgeot2.8x6.png
 delete mode 100644 src/gfx/cards/pidgeot2.pal
 create mode 100644 src/gfx/cards/pidgeot2.png
 delete mode 100644 src/gfx/cards/pidgeotto.8x6.png
 delete mode 100644 src/gfx/cards/pidgeotto.pal
 create mode 100644 src/gfx/cards/pidgeotto.png
 delete mode 100644 src/gfx/cards/pidgey.8x6.png
 delete mode 100644 src/gfx/cards/pidgey.pal
 create mode 100644 src/gfx/cards/pidgey.png
 delete mode 100644 src/gfx/cards/pikachu1.8x6.png
 delete mode 100644 src/gfx/cards/pikachu1.pal
 create mode 100644 src/gfx/cards/pikachu1.png
 delete mode 100644 src/gfx/cards/pikachu2.8x6.png
 delete mode 100644 src/gfx/cards/pikachu2.pal
 create mode 100644 src/gfx/cards/pikachu2.png
 delete mode 100644 src/gfx/cards/pikachu3.8x6.png
 delete mode 100644 src/gfx/cards/pikachu3.pal
 create mode 100644 src/gfx/cards/pikachu3.png
 delete mode 100644 src/gfx/cards/pikachu4.8x6.png
 delete mode 100644 src/gfx/cards/pikachu4.pal
 create mode 100644 src/gfx/cards/pikachu4.png
 delete mode 100644 src/gfx/cards/pinsir.8x6.png
 delete mode 100644 src/gfx/cards/pinsir.pal
 create mode 100644 src/gfx/cards/pinsir.png
 delete mode 100644 src/gfx/cards/pluspower.8x6.png
 delete mode 100644 src/gfx/cards/pluspower.pal
 create mode 100644 src/gfx/cards/pluspower.png
 delete mode 100644 src/gfx/cards/pokeball.8x6.png
 delete mode 100644 src/gfx/cards/pokeball.pal
 create mode 100644 src/gfx/cards/pokeball.png
 delete mode 100644 src/gfx/cards/pokedex.8x6.png
 delete mode 100644 src/gfx/cards/pokedex.pal
 create mode 100644 src/gfx/cards/pokedex.png
 delete mode 100644 src/gfx/cards/pokemonbreeder.8x6.png
 delete mode 100644 src/gfx/cards/pokemonbreeder.pal
 create mode 100644 src/gfx/cards/pokemonbreeder.png
 delete mode 100644 src/gfx/cards/pokemoncenter.8x6.png
 delete mode 100644 src/gfx/cards/pokemoncenter.pal
 create mode 100644 src/gfx/cards/pokemoncenter.png
 delete mode 100644 src/gfx/cards/pokemonflute.8x6.png
 delete mode 100644 src/gfx/cards/pokemonflute.pal
 create mode 100644 src/gfx/cards/pokemonflute.png
 delete mode 100644 src/gfx/cards/pokemontrader.8x6.png
 delete mode 100644 src/gfx/cards/pokemontrader.pal
 create mode 100644 src/gfx/cards/pokemontrader.png
 delete mode 100644 src/gfx/cards/poliwag.8x6.png
 delete mode 100644 src/gfx/cards/poliwag.pal
 create mode 100644 src/gfx/cards/poliwag.png
 delete mode 100644 src/gfx/cards/poliwhirl.8x6.png
 delete mode 100644 src/gfx/cards/poliwhirl.pal
 create mode 100644 src/gfx/cards/poliwhirl.png
 delete mode 100644 src/gfx/cards/poliwrath.8x6.png
 delete mode 100644 src/gfx/cards/poliwrath.pal
 create mode 100644 src/gfx/cards/poliwrath.png
 delete mode 100644 src/gfx/cards/ponyta.8x6.png
 delete mode 100644 src/gfx/cards/ponyta.pal
 create mode 100644 src/gfx/cards/ponyta.png
 delete mode 100644 src/gfx/cards/porygon.8x6.png
 delete mode 100644 src/gfx/cards/porygon.pal
 create mode 100644 src/gfx/cards/porygon.png
 delete mode 100644 src/gfx/cards/potion.8x6.png
 delete mode 100644 src/gfx/cards/potion.pal
 create mode 100644 src/gfx/cards/potion.png
 delete mode 100644 src/gfx/cards/primeape.8x6.png
 delete mode 100644 src/gfx/cards/primeape.pal
 create mode 100644 src/gfx/cards/primeape.png
 delete mode 100644 src/gfx/cards/professoroak.8x6.png
 delete mode 100644 src/gfx/cards/professoroak.pal
 create mode 100644 src/gfx/cards/professoroak.png
 delete mode 100644 src/gfx/cards/psychicenergy.8x6.png
 delete mode 100644 src/gfx/cards/psychicenergy.pal
 create mode 100644 src/gfx/cards/psychicenergy.png
 delete mode 100644 src/gfx/cards/psyduck.8x6.png
 delete mode 100644 src/gfx/cards/psyduck.pal
 create mode 100644 src/gfx/cards/psyduck.png
 delete mode 100644 src/gfx/cards/raichu1.8x6.png
 delete mode 100644 src/gfx/cards/raichu1.pal
 create mode 100644 src/gfx/cards/raichu1.png
 delete mode 100644 src/gfx/cards/raichu2.8x6.png
 delete mode 100644 src/gfx/cards/raichu2.pal
 create mode 100644 src/gfx/cards/raichu2.png
 delete mode 100644 src/gfx/cards/rapidash.8x6.png
 delete mode 100644 src/gfx/cards/rapidash.pal
 create mode 100644 src/gfx/cards/rapidash.png
 delete mode 100644 src/gfx/cards/raticate.8x6.png
 delete mode 100644 src/gfx/cards/raticate.pal
 create mode 100644 src/gfx/cards/raticate.png
 delete mode 100644 src/gfx/cards/rattata.8x6.png
 delete mode 100644 src/gfx/cards/rattata.pal
 create mode 100644 src/gfx/cards/rattata.png
 delete mode 100644 src/gfx/cards/recycle.8x6.png
 delete mode 100644 src/gfx/cards/recycle.pal
 create mode 100644 src/gfx/cards/recycle.png
 delete mode 100644 src/gfx/cards/revive.8x6.png
 delete mode 100644 src/gfx/cards/revive.pal
 create mode 100644 src/gfx/cards/revive.png
 delete mode 100644 src/gfx/cards/rhydon.8x6.png
 delete mode 100644 src/gfx/cards/rhydon.pal
 create mode 100644 src/gfx/cards/rhydon.png
 delete mode 100644 src/gfx/cards/rhyhorn.8x6.png
 delete mode 100644 src/gfx/cards/rhyhorn.pal
 create mode 100644 src/gfx/cards/rhyhorn.png
 delete mode 100644 src/gfx/cards/sandshrew.8x6.png
 delete mode 100644 src/gfx/cards/sandshrew.pal
 create mode 100644 src/gfx/cards/sandshrew.png
 delete mode 100644 src/gfx/cards/sandslash.8x6.png
 delete mode 100644 src/gfx/cards/sandslash.pal
 create mode 100644 src/gfx/cards/sandslash.png
 delete mode 100644 src/gfx/cards/scoopup.8x6.png
 delete mode 100644 src/gfx/cards/scoopup.pal
 create mode 100644 src/gfx/cards/scoopup.png
 delete mode 100644 src/gfx/cards/scyther.8x6.png
 delete mode 100644 src/gfx/cards/scyther.pal
 create mode 100644 src/gfx/cards/scyther.png
 delete mode 100644 src/gfx/cards/seadra.8x6.png
 delete mode 100644 src/gfx/cards/seadra.pal
 create mode 100644 src/gfx/cards/seadra.png
 delete mode 100644 src/gfx/cards/seaking.8x6.png
 delete mode 100644 src/gfx/cards/seaking.pal
 create mode 100644 src/gfx/cards/seaking.png
 delete mode 100644 src/gfx/cards/seel.8x6.png
 delete mode 100644 src/gfx/cards/seel.pal
 create mode 100644 src/gfx/cards/seel.png
 delete mode 100644 src/gfx/cards/shellder.8x6.png
 delete mode 100644 src/gfx/cards/shellder.pal
 create mode 100644 src/gfx/cards/shellder.png
 delete mode 100644 src/gfx/cards/slowbro.8x6.png
 delete mode 100644 src/gfx/cards/slowbro.pal
 create mode 100644 src/gfx/cards/slowbro.png
 delete mode 100644 src/gfx/cards/slowpoke1.8x6.png
 delete mode 100644 src/gfx/cards/slowpoke1.pal
 create mode 100644 src/gfx/cards/slowpoke1.png
 delete mode 100644 src/gfx/cards/slowpoke2.8x6.png
 delete mode 100644 src/gfx/cards/slowpoke2.pal
 create mode 100644 src/gfx/cards/slowpoke2.png
 delete mode 100644 src/gfx/cards/snorlax.8x6.png
 delete mode 100644 src/gfx/cards/snorlax.pal
 create mode 100644 src/gfx/cards/snorlax.png
 delete mode 100644 src/gfx/cards/spearow.8x6.png
 delete mode 100644 src/gfx/cards/spearow.pal
 create mode 100644 src/gfx/cards/spearow.png
 delete mode 100644 src/gfx/cards/squirtle.8x6.png
 delete mode 100644 src/gfx/cards/squirtle.pal
 create mode 100644 src/gfx/cards/squirtle.png
 delete mode 100644 src/gfx/cards/starmie.8x6.png
 delete mode 100644 src/gfx/cards/starmie.pal
 create mode 100644 src/gfx/cards/starmie.png
 delete mode 100644 src/gfx/cards/staryu.8x6.png
 delete mode 100644 src/gfx/cards/staryu.pal
 create mode 100644 src/gfx/cards/staryu.png
 delete mode 100644 src/gfx/cards/superenergyremoval.8x6.png
 delete mode 100644 src/gfx/cards/superenergyremoval.pal
 create mode 100644 src/gfx/cards/superenergyremoval.png
 delete mode 100644 src/gfx/cards/superenergyretrieval.8x6.png
 delete mode 100644 src/gfx/cards/superenergyretrieval.pal
 create mode 100644 src/gfx/cards/superenergyretrieval.png
 delete mode 100644 src/gfx/cards/superpotion.8x6.png
 delete mode 100644 src/gfx/cards/superpotion.pal
 create mode 100644 src/gfx/cards/superpotion.png
 delete mode 100644 src/gfx/cards/surfingpikachu1.8x6.png
 delete mode 100644 src/gfx/cards/surfingpikachu1.pal
 create mode 100644 src/gfx/cards/surfingpikachu1.png
 delete mode 100644 src/gfx/cards/surfingpikachu2.8x6.png
 delete mode 100644 src/gfx/cards/surfingpikachu2.pal
 create mode 100644 src/gfx/cards/surfingpikachu2.png
 delete mode 100644 src/gfx/cards/switch.8x6.png
 delete mode 100644 src/gfx/cards/switch.pal
 create mode 100644 src/gfx/cards/switch.png
 delete mode 100644 src/gfx/cards/tangela1.8x6.png
 delete mode 100644 src/gfx/cards/tangela1.pal
 create mode 100644 src/gfx/cards/tangela1.png
 delete mode 100644 src/gfx/cards/tangela2.8x6.png
 delete mode 100644 src/gfx/cards/tangela2.pal
 create mode 100644 src/gfx/cards/tangela2.png
 delete mode 100644 src/gfx/cards/tauros.8x6.png
 delete mode 100644 src/gfx/cards/tauros.pal
 create mode 100644 src/gfx/cards/tauros.png
 delete mode 100644 src/gfx/cards/tentacool.8x6.png
 delete mode 100644 src/gfx/cards/tentacool.pal
 create mode 100644 src/gfx/cards/tentacool.png
 delete mode 100644 src/gfx/cards/tentacruel.8x6.png
 delete mode 100644 src/gfx/cards/tentacruel.pal
 create mode 100644 src/gfx/cards/tentacruel.png
 delete mode 100644 src/gfx/cards/vaporeon1.8x6.png
 delete mode 100644 src/gfx/cards/vaporeon1.pal
 create mode 100644 src/gfx/cards/vaporeon1.png
 delete mode 100644 src/gfx/cards/vaporeon2.8x6.png
 delete mode 100644 src/gfx/cards/vaporeon2.pal
 create mode 100644 src/gfx/cards/vaporeon2.png
 delete mode 100644 src/gfx/cards/venomoth.8x6.png
 delete mode 100644 src/gfx/cards/venomoth.pal
 create mode 100644 src/gfx/cards/venomoth.png
 delete mode 100644 src/gfx/cards/venonat.8x6.png
 delete mode 100644 src/gfx/cards/venonat.pal
 create mode 100644 src/gfx/cards/venonat.png
 delete mode 100644 src/gfx/cards/venusaur1.8x6.png
 delete mode 100644 src/gfx/cards/venusaur1.pal
 create mode 100644 src/gfx/cards/venusaur1.png
 delete mode 100644 src/gfx/cards/venusaur2.8x6.png
 delete mode 100644 src/gfx/cards/venusaur2.pal
 create mode 100644 src/gfx/cards/venusaur2.png
 delete mode 100644 src/gfx/cards/victreebel.8x6.png
 delete mode 100644 src/gfx/cards/victreebel.pal
 create mode 100644 src/gfx/cards/victreebel.png
 delete mode 100644 src/gfx/cards/vileplume.8x6.png
 delete mode 100644 src/gfx/cards/vileplume.pal
 create mode 100644 src/gfx/cards/vileplume.png
 delete mode 100644 src/gfx/cards/voltorb.8x6.png
 delete mode 100644 src/gfx/cards/voltorb.pal
 create mode 100644 src/gfx/cards/voltorb.png
 delete mode 100644 src/gfx/cards/vulpix.8x6.png
 delete mode 100644 src/gfx/cards/vulpix.pal
 create mode 100644 src/gfx/cards/vulpix.png
 delete mode 100644 src/gfx/cards/wartortle.8x6.png
 delete mode 100644 src/gfx/cards/wartortle.pal
 create mode 100644 src/gfx/cards/wartortle.png
 delete mode 100644 src/gfx/cards/waterenergy.8x6.png
 delete mode 100644 src/gfx/cards/waterenergy.pal
 create mode 100644 src/gfx/cards/waterenergy.png
 delete mode 100644 src/gfx/cards/weedle.8x6.png
 delete mode 100644 src/gfx/cards/weedle.pal
 create mode 100644 src/gfx/cards/weedle.png
 delete mode 100644 src/gfx/cards/weepinbell.8x6.png
 delete mode 100644 src/gfx/cards/weepinbell.pal
 create mode 100644 src/gfx/cards/weepinbell.png
 delete mode 100644 src/gfx/cards/weezing.8x6.png
 delete mode 100644 src/gfx/cards/weezing.pal
 create mode 100644 src/gfx/cards/weezing.png
 delete mode 100644 src/gfx/cards/wigglytuff.8x6.png
 delete mode 100644 src/gfx/cards/wigglytuff.pal
 create mode 100644 src/gfx/cards/wigglytuff.png
 delete mode 100644 src/gfx/cards/zapdos1.8x6.png
 delete mode 100644 src/gfx/cards/zapdos1.pal
 create mode 100644 src/gfx/cards/zapdos1.png
 delete mode 100644 src/gfx/cards/zapdos2.8x6.png
 delete mode 100644 src/gfx/cards/zapdos2.pal
 create mode 100644 src/gfx/cards/zapdos2.png
 delete mode 100644 src/gfx/cards/zapdos3.8x6.png
 delete mode 100644 src/gfx/cards/zapdos3.pal
 create mode 100644 src/gfx/cards/zapdos3.png
 delete mode 100644 src/gfx/cards/zubat.8x6.png
 delete mode 100644 src/gfx/cards/zubat.pal
 create mode 100644 src/gfx/cards/zubat.png
 create mode 100644 src/gfx/duel/anims/51.png
 delete mode 100644 src/gfx/duel/anims/51.t10.png
 create mode 100644 src/gfx/duel/cgb_symbols.png
 delete mode 100644 src/gfx/duel/cgb_symbols.t7.png
 create mode 100644 src/gfx/duel/dmg_sgb_symbols.png
 delete mode 100644 src/gfx/duel/dmg_sgb_symbols.t7.png
 create mode 100644 src/gfx/duel/other.png
 delete mode 100644 src/gfx/duel/other.t7.png
 create mode 100644 src/gfx/fonts/full_width/4.png
 delete mode 100644 src/gfx/fonts/full_width/4.t3.png
 create mode 100644 src/gfx/overworld_map.png
 delete mode 100644 src/gfx/overworld_map.t15.png
 create mode 100644 src/gfx/tilesets/challengehall.png
 delete mode 100644 src/gfx/tilesets/challengehall.t3.png
 create mode 100644 src/gfx/tilesets/clubentrance.png
 delete mode 100644 src/gfx/tilesets/clubentrance.t15.png
 create mode 100644 src/gfx/tilesets/clublobby.png
 delete mode 100644 src/gfx/tilesets/clublobby.t8.png
 create mode 100644 src/gfx/tilesets/fightingclub.png
 delete mode 100644 src/gfx/tilesets/fightingclub.t13.png
 create mode 100644 src/gfx/tilesets/fireclub.png
 delete mode 100644 src/gfx/tilesets/fireclub.t9.png
 create mode 100644 src/gfx/tilesets/grassclub.png
 delete mode 100644 src/gfx/tilesets/grassclub.t9.png
 create mode 100644 src/gfx/tilesets/hallofhonor.png
 delete mode 100644 src/gfx/tilesets/hallofhonor.t7.png
 create mode 100644 src/gfx/tilesets/ishihara.png
 delete mode 100644 src/gfx/tilesets/ishihara.t3.png
 create mode 100644 src/gfx/tilesets/lightningclub.png
 delete mode 100644 src/gfx/tilesets/lightningclub.t13.png
 create mode 100644 src/gfx/tilesets/masonlaboratory.png
 delete mode 100644 src/gfx/tilesets/masonlaboratory.t9.png
 create mode 100644 src/gfx/tilesets/pokemondome.png
 delete mode 100644 src/gfx/tilesets/pokemondome.t1.png
 create mode 100644 src/gfx/tilesets/pokemondomeentrance.png
 delete mode 100644 src/gfx/tilesets/pokemondomeentrance.t2.png
 create mode 100644 src/gfx/tilesets/psychicclub.png
 delete mode 100644 src/gfx/tilesets/psychicclub.t6.png
 create mode 100644 src/gfx/tilesets/rockclub.png
 delete mode 100644 src/gfx/tilesets/rockclub.t4.png
 create mode 100644 src/gfx/tilesets/scienceclub.png
 delete mode 100644 src/gfx/tilesets/scienceclub.t14.png
 create mode 100644 src/gfx/tilesets/waterclub.png
 delete mode 100644 src/gfx/tilesets/waterclub.t15.png
 create mode 100644 src/gfx/titlescreen/titlescreen1.png
 delete mode 100644 src/gfx/titlescreen/titlescreen1.t15.png
 create mode 100644 src/gfx/titlescreen/titlescreen2.png
 delete mode 100644 src/gfx/titlescreen/titlescreen2.t15.png
 create mode 100644 src/gfx/titlescreen/titlescreen3.png
 delete mode 100644 src/gfx/titlescreen/titlescreen3.t12.png
 create mode 100644 src/gfx/titlescreen/titlescreen4.png
 delete mode 100644 src/gfx/titlescreen/titlescreen4.t5.png
 create mode 100644 src/gfx/titlescreen/titlescreen5.png
 delete mode 100644 src/gfx/titlescreen/titlescreen5.t4.png
 create mode 100644 src/gfx/titlescreen/titlescreen6.png
 delete mode 100644 src/gfx/titlescreen/titlescreen6.t12.png

(limited to 'src')

diff --git a/src/engine/home.asm b/src/engine/home.asm
index f33ec2f..90b0af1 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -6237,7 +6237,7 @@ DrawDuelBoxMessage: ; 2167 (0:2167)
 	jp FillRectangle
 
 ; load the tiles for the latin, katakana, and hiragana fonts into VRAM
-; from gfx/fonts/full_width/3.1bpp and gfx/fonts/full_width/4.t3.1bpp
+; from gfx/fonts/full_width/3.1bpp and gfx/fonts/full_width/4.1bpp
 LoadFullWidthFontTiles: ; 2189 (0:2189)
 	ld hl, FullWidthFonts + $3cc tiles_1bpp - $4000
 	ld a, BANK(Fonts); BANK(DuelGraphics)
diff --git a/src/gfx.asm b/src/gfx.asm
index d568802..e3b97cf 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -11,7 +11,7 @@ INCBIN "gfx/fonts/full_width/0_2_digits_kanji1.1bpp"
 INCBIN "gfx/fonts/full_width/1_kanji2.1bpp"
 INCBIN "gfx/fonts/full_width/2_kanji3.1bpp"
 INCBIN "gfx/fonts/full_width/3.1bpp"
-INCBIN "gfx/fonts/full_width/4.t3.1bpp"
+INCBIN "gfx/fonts/full_width/4.1bpp"
 
 HalfWidthFont:: ; 76668 (1d:6668)
 INCBIN "gfx/fonts/half_width.1bpp"
@@ -25,17 +25,17 @@ DuelCardHeaderGraphics:: ; 76ce8 (1d:6ce8)
 INCBIN "gfx/duel/card_headers.2bpp"
 
 DuelDmgSgbSymbolGraphics:: ; 76fe8 (1d:6fe8)
-INCBIN "gfx/duel/dmg_sgb_symbols.t7.2bpp"
+INCBIN "gfx/duel/dmg_sgb_symbols.2bpp"
 
 DuelCgbSymbolGraphics:: ; 777f8 (1d:77f8)
-INCBIN "gfx/duel/cgb_symbols.t7.2bpp", $0, $808
+INCBIN "gfx/duel/cgb_symbols.2bpp", $0, $808
 
 SECTION "Gfx 2", ROMX
 
-INCBIN "gfx/duel/cgb_symbols.t7.2bpp", $808, $8
+INCBIN "gfx/duel/cgb_symbols.2bpp", $808, $8
 
 DuelOtherGraphics:: ; 78008 (1e:4008)
-INCBIN "gfx/duel/other.t7.2bpp"
+INCBIN "gfx/duel/other.2bpp"
 
 DuelBoxMessages:: ; 78318 (1e:4318)
 INCBIN "gfx/duel/box_messages.2bpp"
@@ -50,7 +50,7 @@ SECTION "Gfx 3", ROMX
 
 IshiharaTilesetGfx: ; 87828 (21:7828)
 	dw $4d
-	INCBIN "gfx/tilesets/ishihara.t3.2bpp"
+	INCBIN "gfx/tilesets/ishihara.2bpp"
 
 SolidTiles1: ; 87cfa (21:7cfa)
 	dw $4
@@ -78,35 +78,35 @@ SECTION "Gfx 4", ROMX
 
 OverworldMapTiles: ; 88000 (22:4000)
 	dw $c1
-	INCBIN "gfx/overworld_map.t15.2bpp"
+	INCBIN "gfx/overworld_map.2bpp"
 
 MasonLaboratoryTilesetGfx: ; 88c12 (22:4c12)
 	dw $97
-	INCBIN "gfx/tilesets/masonlaboratory.t9.2bpp"
+	INCBIN "gfx/tilesets/masonlaboratory.2bpp"
 
 ClubEntranceTilesetGfx: ; 89584 (22:5584)
 	dw $81
-	INCBIN "gfx/tilesets/clubentrance.t15.2bpp"
+	INCBIN "gfx/tilesets/clubentrance.2bpp"
 
 ClubLobbyTilesetGfx: ; 89d96 (22:5d96)
 	dw $78
-	INCBIN "gfx/tilesets/clublobby.t8.2bpp"
+	INCBIN "gfx/tilesets/clublobby.2bpp"
 
 FightingClubTilesetGfx: ; 8a518 (22:6518)
 	dw $63
-	INCBIN "gfx/tilesets/fightingclub.t13.2bpp"
+	INCBIN "gfx/tilesets/fightingclub.2bpp"
 
 RockClubTilesetGfx: ; 8ab4a (22:6b4a)
 	dw $3c
-	INCBIN "gfx/tilesets/rockclub.t4.2bpp"
+	INCBIN "gfx/tilesets/rockclub.2bpp"
 
 WaterClubTilesetGfx: ; 8af0c (22:6f0c)
 	dw $a1
-	INCBIN "gfx/tilesets/waterclub.t15.2bpp"
+	INCBIN "gfx/tilesets/waterclub.2bpp"
 
 GrassClubTilesetGfx: ; 8b91e (22:791e)
 	dw $57
-	INCBIN "gfx/tilesets/grassclub.t9.2bpp"
+	INCBIN "gfx/tilesets/grassclub.2bpp"
 
 OWSpritePlayer: ; 8be90 (22:7e90)
 	dw $14
@@ -122,35 +122,35 @@ SECTION "Gfx 5", ROMX
 
 LightningClubTilesetGfx: ; 8c000 (23:4000)
 	dw $83
-	INCBIN "gfx/tilesets/lightningclub.t13.2bpp"
+	INCBIN "gfx/tilesets/lightningclub.2bpp"
 
 PsychicClubTilesetGfx: ; 8c832 (23:4832)
 	dw $3a
-	INCBIN "gfx/tilesets/psychicclub.t6.2bpp"
+	INCBIN "gfx/tilesets/psychicclub.2bpp"
 
 ScienceClubTilesetGfx: ; 8cbd4 (23:4bd4)
 	dw $52
-	INCBIN "gfx/tilesets/scienceclub.t14.2bpp"
+	INCBIN "gfx/tilesets/scienceclub.2bpp"
 
 FireClubTilesetGfx: ; 8d0f6 (23:50f6)
 	dw $57
-	INCBIN "gfx/tilesets/fireclub.t9.2bpp"
+	INCBIN "gfx/tilesets/fireclub.2bpp"
 
 ChallengeHallTilesetGfx: ; 8d668 (23:5668)
 	dw $9d
-	INCBIN "gfx/tilesets/challengehall.t3.2bpp"
+	INCBIN "gfx/tilesets/challengehall.2bpp"
 
 PokemonDomeEntranceTilesetGfx: ; 8e03a (23:603a)
 	dw $4e
-	INCBIN "gfx/tilesets/pokemondomeentrance.t2.2bpp"
+	INCBIN "gfx/tilesets/pokemondomeentrance.2bpp"
 
 PokemonDomeTilesetGfx: ; 8e51c (23:651c)
 	dw $cf
-	INCBIN "gfx/tilesets/pokemondome.t1.2bpp"
+	INCBIN "gfx/tilesets/pokemondome.2bpp"
 
 HallOfHonorTilesetGfx: ; 8f20e (23:720e)
 	dw $79
-	INCBIN "gfx/tilesets/hallofhonor.t7.2bpp"
+	INCBIN "gfx/tilesets/hallofhonor.2bpp"
 
 MedalGfx: ; 8f9a0 (23:79a0)
 	dw $48
@@ -187,15 +187,15 @@ SECTION "Gfx 6", ROMX
 
 CardPop1Gfx: ; 90000 (24:4000)
 	dw $bd
-	INCBIN "gfx/cardpop/cardpop1.t3.2bpp"
+	INCBIN "gfx/cardpop/cardpop1.2bpp"
 
 CardPop2Gfx: ; 90bd2 (24:4bd2)
 	dw $6d
-	INCBIN "gfx/cardpop/cardpop2.t3.2bpp"
+	INCBIN "gfx/cardpop/cardpop2.2bpp"
 
 CardPop3Gfx: ; 912a4 (24:52a4)
 	dw $5d
-	INCBIN "gfx/cardpop/cardpop3.t3.2bpp"
+	INCBIN "gfx/cardpop/cardpop3.2bpp"
 
 Colosseum1Gfx: ; 91876 (24:5876)
 	dw $60
@@ -203,7 +203,7 @@ Colosseum1Gfx: ; 91876 (24:5876)
 
 Colosseum2Gfx: ; 91e78 (24:5e78)
 	dw $56
-	INCBIN "gfx/booster_packs/colosseum2.t10.2bpp"
+	INCBIN "gfx/booster_packs/colosseum2.2bpp"
 
 Evolution1Gfx: ; 923da (24:63da)
 	dw $60
@@ -211,7 +211,7 @@ Evolution1Gfx: ; 923da (24:63da)
 
 Evolution2Gfx: ; 929dc (24:69dc)
 	dw $56
-	INCBIN "gfx/booster_packs/evolution2.t10.2bpp"
+	INCBIN "gfx/booster_packs/evolution2.2bpp"
 
 Mystery1Gfx: ; 92f3e (24:6f3e)
 	dw $60
@@ -219,7 +219,7 @@ Mystery1Gfx: ; 92f3e (24:6f3e)
 
 Mystery2Gfx: ; 93540 (24:7540)
 	dw $56
-	INCBIN "gfx/booster_packs/mystery2.t10.2bpp"
+	INCBIN "gfx/booster_packs/mystery2.2bpp"
 
 RonaldGfx: ; 93aa2 (24:7aa2)
 	dw $24
@@ -253,7 +253,7 @@ Laboratory1Gfx: ; 94000 (25:4000)
 
 Laboratory2Gfx: ; 94602 (25:4602)
 	dw $56
-	INCBIN "gfx/booster_packs/laboratory2.t10.2bpp"
+	INCBIN "gfx/booster_packs/laboratory2.2bpp"
 
 CharizardIntro1Gfx: ; 94b64 (25:4b64)
 	dw $60
@@ -281,11 +281,11 @@ AerodactylIntro2Gfx: ; 9696e (25:696e)
 
 Titlescreen1Gfx: ; 96f70 (25:6f70)
 	dw $61
-	INCBIN "gfx/titlescreen/titlescreen1.t15.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen1.2bpp"
 
 Titlescreen2Gfx: ; 97582 (25:7582)
 	dw $61
-	INCBIN "gfx/titlescreen/titlescreen2.t15.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen2.2bpp"
 
 CompaniesGfx: ; 97b94 (25:7b94)
 	dw $31
@@ -301,19 +301,19 @@ SECTION "Gfx 8", ROMX
 
 Titlescreen3Gfx: ; 98000 (26:4000)
 	dw $f4
-	INCBIN "gfx/titlescreen/titlescreen3.t12.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen3.2bpp"
 
 Titlescreen4Gfx: ; 98f42 (26:4f42)
 	dw $13b
-	INCBIN "gfx/titlescreen/titlescreen4.t5.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen4.2bpp"
 
 Titlescreen5Gfx: ; 9a2f4 (26:62f4)
 	dw $dc
-	INCBIN "gfx/titlescreen/titlescreen5.t4.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen5.2bpp"
 
 Titlescreen6Gfx: ; 9b0b6 (26:70b6)
 	dw $d4
-	INCBIN "gfx/titlescreen/titlescreen6.t12.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen6.2bpp"
 
 DoctorMasonOWGfx: ; 9bdf8 (26:7df8)
 	dw $14
@@ -857,7 +857,7 @@ Duel50Gfx: ; a81f8 (2a:41f8)
 
 Duel51Gfx: ; a836a (2a:436a)
 	dw $36
-	INCBIN "gfx/duel/anims/51.t10.2bpp"
+	INCBIN "gfx/duel/anims/51.2bpp"
 
 Duel52Gfx: ; a86cc (2a:46cc)
 	dw $0b
@@ -926,935 +926,935 @@ SECTION "Card Gfx 1", ROMX
 CardGraphics:: ; c4000 (31:4000)
 
 GrassEnergyCardGfx:: ; c4000 (31:4000)
-	INCBIN "gfx/cards/grassenergy.8x6.2bpp"
+	INCBIN "gfx/cards/grassenergy.2bpp"
 	INCBIN "gfx/cards/grassenergy.pal"
 
 FireEnergyCardGfx:: ; c4308 (31:4308)
-	INCBIN "gfx/cards/fireenergy.8x6.2bpp"
+	INCBIN "gfx/cards/fireenergy.2bpp"
 	INCBIN "gfx/cards/fireenergy.pal"
 
 WaterEnergyCardGfx:: ; c4610 (31:4610)
-	INCBIN "gfx/cards/waterenergy.8x6.2bpp"
+	INCBIN "gfx/cards/waterenergy.2bpp"
 	INCBIN "gfx/cards/waterenergy.pal"
 
 LightningEnergyCardGfx:: ; c4918 (31:4918)
-	INCBIN "gfx/cards/lightningenergy.8x6.2bpp"
+	INCBIN "gfx/cards/lightningenergy.2bpp"
 	INCBIN "gfx/cards/lightningenergy.pal"
 
 FightingEnergyCardGfx:: ; c4c20 (31:4c20)
-	INCBIN "gfx/cards/fightingenergy.8x6.2bpp"
+	INCBIN "gfx/cards/fightingenergy.2bpp"
 	INCBIN "gfx/cards/fightingenergy.pal"
 
 PsychicEnergyCardGfx:: ; c4f28 (31:4f28)
-	INCBIN "gfx/cards/psychicenergy.8x6.2bpp"
+	INCBIN "gfx/cards/psychicenergy.2bpp"
 	INCBIN "gfx/cards/psychicenergy.pal"
 
 DoubleColorlessEnergyCardGfx:: ; c5230 (31:5230)
-	INCBIN "gfx/cards/doublecolorlessenergy.8x6.2bpp"
+	INCBIN "gfx/cards/doublecolorlessenergy.2bpp"
 	INCBIN "gfx/cards/doublecolorlessenergy.pal"
 
 BulbasaurCardGfx:: ; c5538 (31:5538)
-	INCBIN "gfx/cards/bulbasaur.8x6.2bpp"
+	INCBIN "gfx/cards/bulbasaur.2bpp"
 	INCBIN "gfx/cards/bulbasaur.pal"
 
 IvysaurCardGfx:: ; c5840 (31:5840)
-	INCBIN "gfx/cards/ivysaur.8x6.2bpp"
+	INCBIN "gfx/cards/ivysaur.2bpp"
 	INCBIN "gfx/cards/ivysaur.pal"
 
 Venusaur1CardGfx:: ; c5b48 (31:5b48)
-	INCBIN "gfx/cards/venusaur1.8x6.2bpp"
+	INCBIN "gfx/cards/venusaur1.2bpp"
 	INCBIN "gfx/cards/venusaur1.pal"
 
 Venusaur2CardGfx:: ; c5e50 (31:5e50)
-	INCBIN "gfx/cards/venusaur2.8x6.2bpp"
+	INCBIN "gfx/cards/venusaur2.2bpp"
 	INCBIN "gfx/cards/venusaur2.pal"
 
 CaterpieCardGfx:: ; c6158 (31:6158)
-	INCBIN "gfx/cards/caterpie.8x6.2bpp"
+	INCBIN "gfx/cards/caterpie.2bpp"
 	INCBIN "gfx/cards/caterpie.pal"
 
 MetapodCardGfx:: ; c6460 (31:6460)
-	INCBIN "gfx/cards/metapod.8x6.2bpp"
+	INCBIN "gfx/cards/metapod.2bpp"
 	INCBIN "gfx/cards/metapod.pal"
 
 ButterfreeCardGfx:: ; c6768 (31:6768)
-	INCBIN "gfx/cards/butterfree.8x6.2bpp"
+	INCBIN "gfx/cards/butterfree.2bpp"
 	INCBIN "gfx/cards/butterfree.pal"
 
 WeedleCardGfx:: ; c6a70 (31:6a70)
-	INCBIN "gfx/cards/weedle.8x6.2bpp"
+	INCBIN "gfx/cards/weedle.2bpp"
 	INCBIN "gfx/cards/weedle.pal"
 
 KakunaCardGfx:: ; c6d78 (31:6d78)
-	INCBIN "gfx/cards/kakuna.8x6.2bpp"
+	INCBIN "gfx/cards/kakuna.2bpp"
 	INCBIN "gfx/cards/kakuna.pal"
 
 BeedrillCardGfx:: ; c7080 (31:7080)
-	INCBIN "gfx/cards/beedrill.8x6.2bpp"
+	INCBIN "gfx/cards/beedrill.2bpp"
 	INCBIN "gfx/cards/beedrill.pal"
 
 EkansCardGfx:: ; c7388 (31:7388)
-	INCBIN "gfx/cards/ekans.8x6.2bpp"
+	INCBIN "gfx/cards/ekans.2bpp"
 	INCBIN "gfx/cards/ekans.pal"
 
 ArbokCardGfx:: ; c7690 (31:7690)
-	INCBIN "gfx/cards/arbok.8x6.2bpp"
+	INCBIN "gfx/cards/arbok.2bpp"
 	INCBIN "gfx/cards/arbok.pal"
 
 NidoranFCardGfx:: ; c7998 (31:7998)
-	INCBIN "gfx/cards/nidoranf.8x6.2bpp"
+	INCBIN "gfx/cards/nidoranf.2bpp"
 	INCBIN "gfx/cards/nidoranf.pal"
 
 NidorinaCardGfx:: ; c7ca0 (31:7ca0)
-	INCBIN "gfx/cards/nidorina.8x6.2bpp"
+	INCBIN "gfx/cards/nidorina.2bpp"
 	INCBIN "gfx/cards/nidorina.pal"
 
 SECTION "Card Gfx 2", ROMX
 
 NidoqueenCardGfx:: ; c8000 (32:4000)
-	INCBIN "gfx/cards/nidoqueen.8x6.2bpp"
+	INCBIN "gfx/cards/nidoqueen.2bpp"
 	INCBIN "gfx/cards/nidoqueen.pal"
 
 NidoranMCardGfx:: ; c8308 (32:4308)
-	INCBIN "gfx/cards/nidoranm.8x6.2bpp"
+	INCBIN "gfx/cards/nidoranm.2bpp"
 	INCBIN "gfx/cards/nidoranm.pal"
 
 NidorinoCardGfx:: ; c8610 (32:4610)
-	INCBIN "gfx/cards/nidorino.8x6.2bpp"
+	INCBIN "gfx/cards/nidorino.2bpp"
 	INCBIN "gfx/cards/nidorino.pal"
 
 NidokingCardGfx:: ; c8918 (32:4918)
-	INCBIN "gfx/cards/nidoking.8x6.2bpp"
+	INCBIN "gfx/cards/nidoking.2bpp"
 	INCBIN "gfx/cards/nidoking.pal"
 
 ZubatCardGfx:: ; c8c20 (32:4c20)
-	INCBIN "gfx/cards/zubat.8x6.2bpp"
+	INCBIN "gfx/cards/zubat.2bpp"
 	INCBIN "gfx/cards/zubat.pal"
 
 GolbatCardGfx:: ; c8f28 (32:4f28)
-	INCBIN "gfx/cards/golbat.8x6.2bpp"
+	INCBIN "gfx/cards/golbat.2bpp"
 	INCBIN "gfx/cards/golbat.pal"
 
 OddishCardGfx:: ; c9230 (32:5230)
-	INCBIN "gfx/cards/oddish.8x6.2bpp"
+	INCBIN "gfx/cards/oddish.2bpp"
 	INCBIN "gfx/cards/oddish.pal"
 
 GloomCardGfx:: ; c9538 (32:5538)
-	INCBIN "gfx/cards/gloom.8x6.2bpp"
+	INCBIN "gfx/cards/gloom.2bpp"
 	INCBIN "gfx/cards/gloom.pal"
 
 VileplumeCardGfx:: ; c9840 (32:5840)
-	INCBIN "gfx/cards/vileplume.8x6.2bpp"
+	INCBIN "gfx/cards/vileplume.2bpp"
 	INCBIN "gfx/cards/vileplume.pal"
 
 ParasCardGfx:: ; c9b48 (32:5b48)
-	INCBIN "gfx/cards/paras.8x6.2bpp"
+	INCBIN "gfx/cards/paras.2bpp"
 	INCBIN "gfx/cards/paras.pal"
 
 ParasectCardGfx:: ; c9e50 (32:5e50)
-	INCBIN "gfx/cards/parasect.8x6.2bpp"
+	INCBIN "gfx/cards/parasect.2bpp"
 	INCBIN "gfx/cards/parasect.pal"
 
 VenonatCardGfx:: ; ca158 (32:6158)
-	INCBIN "gfx/cards/venonat.8x6.2bpp"
+	INCBIN "gfx/cards/venonat.2bpp"
 	INCBIN "gfx/cards/venonat.pal"
 
 VenomothCardGfx:: ; ca460 (32:6460)
-	INCBIN "gfx/cards/venomoth.8x6.2bpp"
+	INCBIN "gfx/cards/venomoth.2bpp"
 	INCBIN "gfx/cards/venomoth.pal"
 
 BellsproutCardGfx:: ; ca768 (32:6768)
-	INCBIN "gfx/cards/bellsprout.8x6.2bpp"
+	INCBIN "gfx/cards/bellsprout.2bpp"
 	INCBIN "gfx/cards/bellsprout.pal"
 
 WeepinbellCardGfx:: ; caa70 (32:6a70)
-	INCBIN "gfx/cards/weepinbell.8x6.2bpp"
+	INCBIN "gfx/cards/weepinbell.2bpp"
 	INCBIN "gfx/cards/weepinbell.pal"
 
 VictreebelCardGfx:: ; cad78 (32:6d78)
-	INCBIN "gfx/cards/victreebel.8x6.2bpp"
+	INCBIN "gfx/cards/victreebel.2bpp"
 	INCBIN "gfx/cards/victreebel.pal"
 
 GrimerCardGfx:: ; cb080 (32:7080)
-	INCBIN "gfx/cards/grimer.8x6.2bpp"
+	INCBIN "gfx/cards/grimer.2bpp"
 	INCBIN "gfx/cards/grimer.pal"
 
 MukCardGfx:: ; cb388 (32:7388)
-	INCBIN "gfx/cards/muk.8x6.2bpp"
+	INCBIN "gfx/cards/muk.2bpp"
 	INCBIN "gfx/cards/muk.pal"
 
 ExeggcuteCardGfx:: ; cb690 (32:7690)
-	INCBIN "gfx/cards/exeggcute.8x6.2bpp"
+	INCBIN "gfx/cards/exeggcute.2bpp"
 	INCBIN "gfx/cards/exeggcute.pal"
 
 ExeggutorCardGfx:: ; cb998 (32:7998)
-	INCBIN "gfx/cards/exeggutor.8x6.2bpp"
+	INCBIN "gfx/cards/exeggutor.2bpp"
 	INCBIN "gfx/cards/exeggutor.pal"
 
 KoffingCardGfx:: ; cbca0 (32:7ca0)
-	INCBIN "gfx/cards/koffing.8x6.2bpp"
+	INCBIN "gfx/cards/koffing.2bpp"
 	INCBIN "gfx/cards/koffing.pal"
 
 SECTION "Card Gfx 3", ROMX
 
 WeezingCardGfx:: ; cc000 (33:4000)
-	INCBIN "gfx/cards/weezing.8x6.2bpp"
+	INCBIN "gfx/cards/weezing.2bpp"
 	INCBIN "gfx/cards/weezing.pal"
 
 Tangela1CardGfx:: ; cc308 (33:4308)
-	INCBIN "gfx/cards/tangela1.8x6.2bpp"
+	INCBIN "gfx/cards/tangela1.2bpp"
 	INCBIN "gfx/cards/tangela1.pal"
 
 Tangela2CardGfx:: ; cc610 (33:4610)
-	INCBIN "gfx/cards/tangela2.8x6.2bpp"
+	INCBIN "gfx/cards/tangela2.2bpp"
 	INCBIN "gfx/cards/tangela2.pal"
 
 ScytherCardGfx:: ; cc918 (33:4918)
-	INCBIN "gfx/cards/scyther.8x6.2bpp"
+	INCBIN "gfx/cards/scyther.2bpp"
 	INCBIN "gfx/cards/scyther.pal"
 
 PinsirCardGfx:: ; ccc20 (33:4c20)
-	INCBIN "gfx/cards/pinsir.8x6.2bpp"
+	INCBIN "gfx/cards/pinsir.2bpp"
 	INCBIN "gfx/cards/pinsir.pal"
 
 CharmanderCardGfx:: ; ccf28 (33:4f28)
-	INCBIN "gfx/cards/charmander.8x6.2bpp"
+	INCBIN "gfx/cards/charmander.2bpp"
 	INCBIN "gfx/cards/charmander.pal"
 
 CharmeleonCardGfx:: ; cd230 (33:5230)
-	INCBIN "gfx/cards/charmeleon.8x6.2bpp"
+	INCBIN "gfx/cards/charmeleon.2bpp"
 	INCBIN "gfx/cards/charmeleon.pal"
 
 CharizardCardGfx:: ; cd538 (33:5538)
-	INCBIN "gfx/cards/charizard.8x6.2bpp"
+	INCBIN "gfx/cards/charizard.2bpp"
 	INCBIN "gfx/cards/charizard.pal"
 
 VulpixCardGfx:: ; cd840 (33:5840)
-	INCBIN "gfx/cards/vulpix.8x6.2bpp"
+	INCBIN "gfx/cards/vulpix.2bpp"
 	INCBIN "gfx/cards/vulpix.pal"
 
 Ninetails1CardGfx:: ; cdb48 (33:5b48)
-	INCBIN "gfx/cards/ninetails1.8x6.2bpp"
+	INCBIN "gfx/cards/ninetails1.2bpp"
 	INCBIN "gfx/cards/ninetails1.pal"
 
 Ninetails2CardGfx:: ; cde50 (33:5e50)
-	INCBIN "gfx/cards/ninetails2.8x6.2bpp"
+	INCBIN "gfx/cards/ninetails2.2bpp"
 	INCBIN "gfx/cards/ninetails2.pal"
 
 GrowlitheCardGfx:: ; ce158 (33:6158)
-	INCBIN "gfx/cards/growlithe.8x6.2bpp"
+	INCBIN "gfx/cards/growlithe.2bpp"
 	INCBIN "gfx/cards/growlithe.pal"
 
 Arcanine1CardGfx:: ; ce460 (33:6460)
-	INCBIN "gfx/cards/arcanine1.8x6.2bpp"
+	INCBIN "gfx/cards/arcanine1.2bpp"
 	INCBIN "gfx/cards/arcanine1.pal"
 
 Arcanine2CardGfx:: ; ce768 (33:6768)
-	INCBIN "gfx/cards/arcanine2.8x6.2bpp"
+	INCBIN "gfx/cards/arcanine2.2bpp"
 	INCBIN "gfx/cards/arcanine2.pal"
 
 PonytaCardGfx:: ; cea70 (33:6a70)
-	INCBIN "gfx/cards/ponyta.8x6.2bpp"
+	INCBIN "gfx/cards/ponyta.2bpp"
 	INCBIN "gfx/cards/ponyta.pal"
 
 RapidashCardGfx:: ; ced78 (33:6d78)
-	INCBIN "gfx/cards/rapidash.8x6.2bpp"
+	INCBIN "gfx/cards/rapidash.2bpp"
 	INCBIN "gfx/cards/rapidash.pal"
 
 Magmar1CardGfx:: ; cf080 (33:7080)
-	INCBIN "gfx/cards/magmar1.8x6.2bpp"
+	INCBIN "gfx/cards/magmar1.2bpp"
 	INCBIN "gfx/cards/magmar1.pal"
 
 Magmar2CardGfx:: ; cf388 (33:7388)
-	INCBIN "gfx/cards/magmar2.8x6.2bpp"
+	INCBIN "gfx/cards/magmar2.2bpp"
 	INCBIN "gfx/cards/magmar2.pal"
 
 Flareon1CardGfx:: ; cf690 (33:7690)
-	INCBIN "gfx/cards/flareon1.8x6.2bpp"
+	INCBIN "gfx/cards/flareon1.2bpp"
 	INCBIN "gfx/cards/flareon1.pal"
 
 Flareon2CardGfx:: ; cf998 (33:7998)
-	INCBIN "gfx/cards/flareon2.8x6.2bpp"
+	INCBIN "gfx/cards/flareon2.2bpp"
 	INCBIN "gfx/cards/flareon2.pal"
 
 Moltres1CardGfx:: ; cfca0 (33:7ca0)
-	INCBIN "gfx/cards/moltres1.8x6.2bpp"
+	INCBIN "gfx/cards/moltres1.2bpp"
 	INCBIN "gfx/cards/moltres1.pal"
 
 SECTION "Card Gfx 4", ROMX
 
 Moltres2CardGfx:: ; d0000 (34:4000)
-	INCBIN "gfx/cards/moltres2.8x6.2bpp"
+	INCBIN "gfx/cards/moltres2.2bpp"
 	INCBIN "gfx/cards/moltres2.pal"
 
 SquirtleCardGfx:: ; d0308 (34:4308)
-	INCBIN "gfx/cards/squirtle.8x6.2bpp"
+	INCBIN "gfx/cards/squirtle.2bpp"
 	INCBIN "gfx/cards/squirtle.pal"
 
 WartortleCardGfx:: ; d0610 (34:4610)
-	INCBIN "gfx/cards/wartortle.8x6.2bpp"
+	INCBIN "gfx/cards/wartortle.2bpp"
 	INCBIN "gfx/cards/wartortle.pal"
 
 BlastoiseCardGfx:: ; d0918 (34:4918)
-	INCBIN "gfx/cards/blastoise.8x6.2bpp"
+	INCBIN "gfx/cards/blastoise.2bpp"
 	INCBIN "gfx/cards/blastoise.pal"
 
 PsyduckCardGfx:: ; d0c20 (34:4c20)
-	INCBIN "gfx/cards/psyduck.8x6.2bpp"
+	INCBIN "gfx/cards/psyduck.2bpp"
 	INCBIN "gfx/cards/psyduck.pal"
 
 GolduckCardGfx:: ; d0f28 (34:4f28)
-	INCBIN "gfx/cards/golduck.8x6.2bpp"
+	INCBIN "gfx/cards/golduck.2bpp"
 	INCBIN "gfx/cards/golduck.pal"
 
 PoliwagCardGfx:: ; d1230 (34:5230)
-	INCBIN "gfx/cards/poliwag.8x6.2bpp"
+	INCBIN "gfx/cards/poliwag.2bpp"
 	INCBIN "gfx/cards/poliwag.pal"
 
 PoliwhirlCardGfx:: ; d1538 (34:5538)
-	INCBIN "gfx/cards/poliwhirl.8x6.2bpp"
+	INCBIN "gfx/cards/poliwhirl.2bpp"
 	INCBIN "gfx/cards/poliwhirl.pal"
 
 PoliwrathCardGfx:: ; d1840 (34:5840)
-	INCBIN "gfx/cards/poliwrath.8x6.2bpp"
+	INCBIN "gfx/cards/poliwrath.2bpp"
 	INCBIN "gfx/cards/poliwrath.pal"
 
 TentacoolCardGfx:: ; d1b48 (34:5b48)
-	INCBIN "gfx/cards/tentacool.8x6.2bpp"
+	INCBIN "gfx/cards/tentacool.2bpp"
 	INCBIN "gfx/cards/tentacool.pal"
 
 TentacruelCardGfx:: ; d1e50 (34:5e50)
-	INCBIN "gfx/cards/tentacruel.8x6.2bpp"
+	INCBIN "gfx/cards/tentacruel.2bpp"
 	INCBIN "gfx/cards/tentacruel.pal"
 
 SeelCardGfx:: ; d2158 (34:6158)
-	INCBIN "gfx/cards/seel.8x6.2bpp"
+	INCBIN "gfx/cards/seel.2bpp"
 	INCBIN "gfx/cards/seel.pal"
 
 DewgongCardGfx:: ; d2460 (34:6460)
-	INCBIN "gfx/cards/dewgong.8x6.2bpp"
+	INCBIN "gfx/cards/dewgong.2bpp"
 	INCBIN "gfx/cards/dewgong.pal"
 
 ShellderCardGfx:: ; d2768 (34:6768)
-	INCBIN "gfx/cards/shellder.8x6.2bpp"
+	INCBIN "gfx/cards/shellder.2bpp"
 	INCBIN "gfx/cards/shellder.pal"
 
 CloysterCardGfx:: ; d2a70 (34:6a70)
-	INCBIN "gfx/cards/cloyster.8x6.2bpp"
+	INCBIN "gfx/cards/cloyster.2bpp"
 	INCBIN "gfx/cards/cloyster.pal"
 
 KrabbyCardGfx:: ; d2d78 (34:6d78)
-	INCBIN "gfx/cards/krabby.8x6.2bpp"
+	INCBIN "gfx/cards/krabby.2bpp"
 	INCBIN "gfx/cards/krabby.pal"
 
 KinglerCardGfx:: ; d3080 (34:7080)
-	INCBIN "gfx/cards/kingler.8x6.2bpp"
+	INCBIN "gfx/cards/kingler.2bpp"
 	INCBIN "gfx/cards/kingler.pal"
 
 HorseaCardGfx:: ; d3388 (34:7388)
-	INCBIN "gfx/cards/horsea.8x6.2bpp"
+	INCBIN "gfx/cards/horsea.2bpp"
 	INCBIN "gfx/cards/horsea.pal"
 
 SeadraCardGfx:: ; d3690 (34:7690)
-	INCBIN "gfx/cards/seadra.8x6.2bpp"
+	INCBIN "gfx/cards/seadra.2bpp"
 	INCBIN "gfx/cards/seadra.pal"
 
 GoldeenCardGfx:: ; d3998 (34:7998)
-	INCBIN "gfx/cards/goldeen.8x6.2bpp"
+	INCBIN "gfx/cards/goldeen.2bpp"
 	INCBIN "gfx/cards/goldeen.pal"
 
 SeakingCardGfx:: ; d3ca0 (34:7ca0)
-	INCBIN "gfx/cards/seaking.8x6.2bpp"
+	INCBIN "gfx/cards/seaking.2bpp"
 	INCBIN "gfx/cards/seaking.pal"
 
 SECTION "Card Gfx 5", ROMX
 
 StaryuCardGfx:: ; d4000 (35:4000)
-	INCBIN "gfx/cards/staryu.8x6.2bpp"
+	INCBIN "gfx/cards/staryu.2bpp"
 	INCBIN "gfx/cards/staryu.pal"
 
 StarmieCardGfx:: ; d4308 (35:4308)
-	INCBIN "gfx/cards/starmie.8x6.2bpp"
+	INCBIN "gfx/cards/starmie.2bpp"
 	INCBIN "gfx/cards/starmie.pal"
 
 MagikarpCardGfx:: ; d4610 (35:4610)
-	INCBIN "gfx/cards/magikarp.8x6.2bpp"
+	INCBIN "gfx/cards/magikarp.2bpp"
 	INCBIN "gfx/cards/magikarp.pal"
 
 GyaradosCardGfx:: ; d4918 (35:4918)
-	INCBIN "gfx/cards/gyarados.8x6.2bpp"
+	INCBIN "gfx/cards/gyarados.2bpp"
 	INCBIN "gfx/cards/gyarados.pal"
 
 LaprasCardGfx:: ; d4c20 (35:4c20)
-	INCBIN "gfx/cards/lapras.8x6.2bpp"
+	INCBIN "gfx/cards/lapras.2bpp"
 	INCBIN "gfx/cards/lapras.pal"
 
 Vaporeon1CardGfx:: ; d4f28 (35:4f28)
-	INCBIN "gfx/cards/vaporeon1.8x6.2bpp"
+	INCBIN "gfx/cards/vaporeon1.2bpp"
 	INCBIN "gfx/cards/vaporeon1.pal"
 
 Vaporeon2CardGfx:: ; d5230 (35:5230)
-	INCBIN "gfx/cards/vaporeon2.8x6.2bpp"
+	INCBIN "gfx/cards/vaporeon2.2bpp"
 	INCBIN "gfx/cards/vaporeon2.pal"
 
 OmanyteCardGfx:: ; d5538 (35:5538)
-	INCBIN "gfx/cards/omanyte.8x6.2bpp"
+	INCBIN "gfx/cards/omanyte.2bpp"
 	INCBIN "gfx/cards/omanyte.pal"
 
 OmastarCardGfx:: ; d5840 (35:5840)
-	INCBIN "gfx/cards/omastar.8x6.2bpp"
+	INCBIN "gfx/cards/omastar.2bpp"
 	INCBIN "gfx/cards/omastar.pal"
 
 Articuno1CardGfx:: ; d5b48 (35:5b48)
-	INCBIN "gfx/cards/articuno1.8x6.2bpp"
+	INCBIN "gfx/cards/articuno1.2bpp"
 	INCBIN "gfx/cards/articuno1.pal"
 
 Articuno2CardGfx:: ; d5e50 (35:5e50)
-	INCBIN "gfx/cards/articuno2.8x6.2bpp"
+	INCBIN "gfx/cards/articuno2.2bpp"
 	INCBIN "gfx/cards/articuno2.pal"
 
 Pikachu1CardGfx:: ; d6158 (35:6158)
-	INCBIN "gfx/cards/pikachu1.8x6.2bpp"
+	INCBIN "gfx/cards/pikachu1.2bpp"
 	INCBIN "gfx/cards/pikachu1.pal"
 
 Pikachu2CardGfx:: ; d6460 (35:6460)
-	INCBIN "gfx/cards/pikachu2.8x6.2bpp"
+	INCBIN "gfx/cards/pikachu2.2bpp"
 	INCBIN "gfx/cards/pikachu2.pal"
 
 Pikachu3CardGfx:: ; d6768 (35:6768)
-	INCBIN "gfx/cards/pikachu3.8x6.2bpp"
+	INCBIN "gfx/cards/pikachu3.2bpp"
 	INCBIN "gfx/cards/pikachu3.pal"
 
 Pikachu4CardGfx:: ; d6a70 (35:6a70)
-	INCBIN "gfx/cards/pikachu4.8x6.2bpp"
+	INCBIN "gfx/cards/pikachu4.2bpp"
 	INCBIN "gfx/cards/pikachu4.pal"
 
 FlyingPikachuCardGfx:: ; d6d78 (35:6d78)
-	INCBIN "gfx/cards/flyingpikachu.8x6.2bpp"
+	INCBIN "gfx/cards/flyingpikachu.2bpp"
 	INCBIN "gfx/cards/flyingpikachu.pal"
 
 SurfingPikachu1CardGfx:: ; d7080 (35:7080)
-	INCBIN "gfx/cards/surfingpikachu1.8x6.2bpp"
+	INCBIN "gfx/cards/surfingpikachu1.2bpp"
 	INCBIN "gfx/cards/surfingpikachu1.pal"
 
 SurfingPikachu2CardGfx:: ; d7388 (35:7388)
-	INCBIN "gfx/cards/surfingpikachu2.8x6.2bpp"
+	INCBIN "gfx/cards/surfingpikachu2.2bpp"
 	INCBIN "gfx/cards/surfingpikachu2.pal"
 
 Raichu1CardGfx:: ; d7690 (35:7690)
-	INCBIN "gfx/cards/raichu1.8x6.2bpp"
+	INCBIN "gfx/cards/raichu1.2bpp"
 	INCBIN "gfx/cards/raichu1.pal"
 
 Raichu2CardGfx:: ; d7998 (35:7998)
-	INCBIN "gfx/cards/raichu2.8x6.2bpp"
+	INCBIN "gfx/cards/raichu2.2bpp"
 	INCBIN "gfx/cards/raichu2.pal"
 
 Magnemite1CardGfx:: ; d7ca0 (35:7ca0)
-	INCBIN "gfx/cards/magnemite1.8x6.2bpp"
+	INCBIN "gfx/cards/magnemite1.2bpp"
 	INCBIN "gfx/cards/magnemite1.pal"
 
 SECTION "Card Gfx 6", ROMX
 
 Magnemite2CardGfx:: ; d8000 (36:4000)
-	INCBIN "gfx/cards/magnemite2.8x6.2bpp"
+	INCBIN "gfx/cards/magnemite2.2bpp"
 	INCBIN "gfx/cards/magnemite2.pal"
 
 Magneton1CardGfx:: ; d8308 (36:4308)
-	INCBIN "gfx/cards/magneton1.8x6.2bpp"
+	INCBIN "gfx/cards/magneton1.2bpp"
 	INCBIN "gfx/cards/magneton1.pal"
 
 Magneton2CardGfx:: ; d8610 (36:4610)
-	INCBIN "gfx/cards/magneton2.8x6.2bpp"
+	INCBIN "gfx/cards/magneton2.2bpp"
 	INCBIN "gfx/cards/magneton2.pal"
 
 VoltorbCardGfx:: ; d8918 (36:4918)
-	INCBIN "gfx/cards/voltorb.8x6.2bpp"
+	INCBIN "gfx/cards/voltorb.2bpp"
 	INCBIN "gfx/cards/voltorb.pal"
 
 Electrode1CardGfx:: ; d8c20 (36:4c20)
-	INCBIN "gfx/cards/electrode1.8x6.2bpp"
+	INCBIN "gfx/cards/electrode1.2bpp"
 	INCBIN "gfx/cards/electrode1.pal"
 
 Electrode2CardGfx:: ; d8f28 (36:4f28)
-	INCBIN "gfx/cards/electrode2.8x6.2bpp"
+	INCBIN "gfx/cards/electrode2.2bpp"
 	INCBIN "gfx/cards/electrode2.pal"
 
 Electabuzz1CardGfx:: ; d9230 (36:5230)
-	INCBIN "gfx/cards/electabuzz1.8x6.2bpp"
+	INCBIN "gfx/cards/electabuzz1.2bpp"
 	INCBIN "gfx/cards/electabuzz1.pal"
 
 Electabuzz2CardGfx:: ; d9538 (36:5538)
-	INCBIN "gfx/cards/electabuzz2.8x6.2bpp"
+	INCBIN "gfx/cards/electabuzz2.2bpp"
 	INCBIN "gfx/cards/electabuzz2.pal"
 
 Jolteon1CardGfx:: ; d9840 (36:5840)
-	INCBIN "gfx/cards/jolteon1.8x6.2bpp"
+	INCBIN "gfx/cards/jolteon1.2bpp"
 	INCBIN "gfx/cards/jolteon1.pal"
 
 Jolteon2CardGfx:: ; d9b48 (36:5b48)
-	INCBIN "gfx/cards/jolteon2.8x6.2bpp"
+	INCBIN "gfx/cards/jolteon2.2bpp"
 	INCBIN "gfx/cards/jolteon2.pal"
 
 Zapdos1CardGfx:: ; d9e50 (36:5e50)
-	INCBIN "gfx/cards/zapdos1.8x6.2bpp"
+	INCBIN "gfx/cards/zapdos1.2bpp"
 	INCBIN "gfx/cards/zapdos1.pal"
 
 Zapdos2CardGfx:: ; da158 (36:6158)
-	INCBIN "gfx/cards/zapdos2.8x6.2bpp"
+	INCBIN "gfx/cards/zapdos2.2bpp"
 	INCBIN "gfx/cards/zapdos2.pal"
 
 Zapdos3CardGfx:: ; da460 (36:6460)
-	INCBIN "gfx/cards/zapdos3.8x6.2bpp"
+	INCBIN "gfx/cards/zapdos3.2bpp"
 	INCBIN "gfx/cards/zapdos3.pal"
 
 SandshrewCardGfx:: ; da768 (36:6768)
-	INCBIN "gfx/cards/sandshrew.8x6.2bpp"
+	INCBIN "gfx/cards/sandshrew.2bpp"
 	INCBIN "gfx/cards/sandshrew.pal"
 
 SandslashCardGfx:: ; daa70 (36:6a70)
-	INCBIN "gfx/cards/sandslash.8x6.2bpp"
+	INCBIN "gfx/cards/sandslash.2bpp"
 	INCBIN "gfx/cards/sandslash.pal"
 
 DiglettCardGfx:: ; dad78 (36:6d78)
-	INCBIN "gfx/cards/diglett.8x6.2bpp"
+	INCBIN "gfx/cards/diglett.2bpp"
 	INCBIN "gfx/cards/diglett.pal"
 
 DugtrioCardGfx:: ; db080 (36:7080)
-	INCBIN "gfx/cards/dugtrio.8x6.2bpp"
+	INCBIN "gfx/cards/dugtrio.2bpp"
 	INCBIN "gfx/cards/dugtrio.pal"
 
 MankeyCardGfx:: ; db388 (36:7388)
-	INCBIN "gfx/cards/mankey.8x6.2bpp"
+	INCBIN "gfx/cards/mankey.2bpp"
 	INCBIN "gfx/cards/mankey.pal"
 
 PrimeapeCardGfx:: ; db690 (36:7690)
-	INCBIN "gfx/cards/primeape.8x6.2bpp"
+	INCBIN "gfx/cards/primeape.2bpp"
 	INCBIN "gfx/cards/primeape.pal"
 
 MachopCardGfx:: ; db998 (36:7998)
-	INCBIN "gfx/cards/machop.8x6.2bpp"
+	INCBIN "gfx/cards/machop.2bpp"
 	INCBIN "gfx/cards/machop.pal"
 
 MachokeCardGfx:: ; dbca0 (36:7ca0)
-	INCBIN "gfx/cards/machoke.8x6.2bpp"
+	INCBIN "gfx/cards/machoke.2bpp"
 	INCBIN "gfx/cards/machoke.pal"
 
 SECTION "Card Gfx 7", ROMX
 
 MachampCardGfx:: ; dc000 (37:4000)
-	INCBIN "gfx/cards/machamp.8x6.2bpp"
+	INCBIN "gfx/cards/machamp.2bpp"
 	INCBIN "gfx/cards/machamp.pal"
 
 GeodudeCardGfx:: ; dc308 (37:4308)
-	INCBIN "gfx/cards/geodude.8x6.2bpp"
+	INCBIN "gfx/cards/geodude.2bpp"
 	INCBIN "gfx/cards/geodude.pal"
 
 GravelerCardGfx:: ; dc610 (37:4610)
-	INCBIN "gfx/cards/graveler.8x6.2bpp"
+	INCBIN "gfx/cards/graveler.2bpp"
 	INCBIN "gfx/cards/graveler.pal"
 
 GolemCardGfx:: ; dc918 (37:4918)
-	INCBIN "gfx/cards/golem.8x6.2bpp"
+	INCBIN "gfx/cards/golem.2bpp"
 	INCBIN "gfx/cards/golem.pal"
 
 OnixCardGfx:: ; dcc20 (37:4c20)
-	INCBIN "gfx/cards/onix.8x6.2bpp"
+	INCBIN "gfx/cards/onix.2bpp"
 	INCBIN "gfx/cards/onix.pal"
 
 CuboneCardGfx:: ; dcf28 (37:4f28)
-	INCBIN "gfx/cards/cubone.8x6.2bpp"
+	INCBIN "gfx/cards/cubone.2bpp"
 	INCBIN "gfx/cards/cubone.pal"
 
 Marowak1CardGfx:: ; dd230 (37:5230)
-	INCBIN "gfx/cards/marowak1.8x6.2bpp"
+	INCBIN "gfx/cards/marowak1.2bpp"
 	INCBIN "gfx/cards/marowak1.pal"
 
 Marowak2CardGfx:: ; dd538 (37:5538)
-	INCBIN "gfx/cards/marowak2.8x6.2bpp"
+	INCBIN "gfx/cards/marowak2.2bpp"
 	INCBIN "gfx/cards/marowak2.pal"
 
 HitmonleeCardGfx:: ; dd840 (37:5840)
-	INCBIN "gfx/cards/hitmonlee.8x6.2bpp"
+	INCBIN "gfx/cards/hitmonlee.2bpp"
 	INCBIN "gfx/cards/hitmonlee.pal"
 
 HitmonchanCardGfx:: ; ddb48 (37:5b48)
-	INCBIN "gfx/cards/hitmonchan.8x6.2bpp"
+	INCBIN "gfx/cards/hitmonchan.2bpp"
 	INCBIN "gfx/cards/hitmonchan.pal"
 
 RhyhornCardGfx:: ; dde50 (37:5e50)
-	INCBIN "gfx/cards/rhyhorn.8x6.2bpp"
+	INCBIN "gfx/cards/rhyhorn.2bpp"
 	INCBIN "gfx/cards/rhyhorn.pal"
 
 RhydonCardGfx:: ; de158 (37:6158)
-	INCBIN "gfx/cards/rhydon.8x6.2bpp"
+	INCBIN "gfx/cards/rhydon.2bpp"
 	INCBIN "gfx/cards/rhydon.pal"
 
 KabutoCardGfx:: ; de460 (37:6460)
-	INCBIN "gfx/cards/kabuto.8x6.2bpp"
+	INCBIN "gfx/cards/kabuto.2bpp"
 	INCBIN "gfx/cards/kabuto.pal"
 
 KabutopsCardGfx:: ; de768 (37:6768)
-	INCBIN "gfx/cards/kabutops.8x6.2bpp"
+	INCBIN "gfx/cards/kabutops.2bpp"
 	INCBIN "gfx/cards/kabutops.pal"
 
 AerodactylCardGfx:: ; dea70 (37:6a70)
-	INCBIN "gfx/cards/aerodactyl.8x6.2bpp"
+	INCBIN "gfx/cards/aerodactyl.2bpp"
 	INCBIN "gfx/cards/aerodactyl.pal"
 
 AbraCardGfx:: ; ded78 (37:6d78)
-	INCBIN "gfx/cards/abra.8x6.2bpp"
+	INCBIN "gfx/cards/abra.2bpp"
 	INCBIN "gfx/cards/abra.pal"
 
 KadabraCardGfx:: ; df080 (37:7080)
-	INCBIN "gfx/cards/kadabra.8x6.2bpp"
+	INCBIN "gfx/cards/kadabra.2bpp"
 	INCBIN "gfx/cards/kadabra.pal"
 
 AlakazamCardGfx:: ; df388 (37:7388)
-	INCBIN "gfx/cards/alakazam.8x6.2bpp"
+	INCBIN "gfx/cards/alakazam.2bpp"
 	INCBIN "gfx/cards/alakazam.pal"
 
 Slowpoke1CardGfx:: ; df690 (37:7690)
-	INCBIN "gfx/cards/slowpoke1.8x6.2bpp"
+	INCBIN "gfx/cards/slowpoke1.2bpp"
 	INCBIN "gfx/cards/slowpoke1.pal"
 
 Slowpoke2CardGfx:: ; df998 (37:7998)
-	INCBIN "gfx/cards/slowpoke2.8x6.2bpp"
+	INCBIN "gfx/cards/slowpoke2.2bpp"
 	INCBIN "gfx/cards/slowpoke2.pal"
 
 SlowbroCardGfx:: ; dfca0 (37:7ca0)
-	INCBIN "gfx/cards/slowbro.8x6.2bpp"
+	INCBIN "gfx/cards/slowbro.2bpp"
 	INCBIN "gfx/cards/slowbro.pal"
 
 SECTION "Card Gfx 8", ROMX
 
 Gastly1CardGfx:: ; e0000 (38:4000)
-	INCBIN "gfx/cards/gastly1.8x6.2bpp"
+	INCBIN "gfx/cards/gastly1.2bpp"
 	INCBIN "gfx/cards/gastly1.pal"
 
 Gastly2CardGfx:: ; e0308 (38:4308)
-	INCBIN "gfx/cards/gastly2.8x6.2bpp"
+	INCBIN "gfx/cards/gastly2.2bpp"
 	INCBIN "gfx/cards/gastly2.pal"
 
 Haunter1CardGfx:: ; e0610 (38:4610)
-	INCBIN "gfx/cards/haunter1.8x6.2bpp"
+	INCBIN "gfx/cards/haunter1.2bpp"
 	INCBIN "gfx/cards/haunter1.pal"
 
 Haunter2CardGfx:: ; e0918 (38:4918)
-	INCBIN "gfx/cards/haunter2.8x6.2bpp"
+	INCBIN "gfx/cards/haunter2.2bpp"
 	INCBIN "gfx/cards/haunter2.pal"
 
 GengarCardGfx:: ; e0c20 (38:4c20)
-	INCBIN "gfx/cards/gengar.8x6.2bpp"
+	INCBIN "gfx/cards/gengar.2bpp"
 	INCBIN "gfx/cards/gengar.pal"
 
 DrowzeeCardGfx:: ; e0f28 (38:4f28)
-	INCBIN "gfx/cards/drowzee.8x6.2bpp"
+	INCBIN "gfx/cards/drowzee.2bpp"
 	INCBIN "gfx/cards/drowzee.pal"
 
 HypnoCardGfx:: ; e1230 (38:5230)
-	INCBIN "gfx/cards/hypno.8x6.2bpp"
+	INCBIN "gfx/cards/hypno.2bpp"
 	INCBIN "gfx/cards/hypno.pal"
 
 MrMimeCardGfx:: ; e1538 (38:5538)
-	INCBIN "gfx/cards/mrmime.8x6.2bpp"
+	INCBIN "gfx/cards/mrmime.2bpp"
 	INCBIN "gfx/cards/mrmime.pal"
 
 JynxCardGfx:: ; e1840 (38:5840)
-	INCBIN "gfx/cards/jynx.8x6.2bpp"
+	INCBIN "gfx/cards/jynx.2bpp"
 	INCBIN "gfx/cards/jynx.pal"
 
 Mewtwo1CardGfx:: ; e1b48 (38:5b48)
-	INCBIN "gfx/cards/mewtwo1.8x6.2bpp"
+	INCBIN "gfx/cards/mewtwo1.2bpp"
 	INCBIN "gfx/cards/mewtwo1.pal"
 
 Mewtwo2CardGfx:: ; e1e50 (38:5e50)
-	INCBIN "gfx/cards/mewtwo2.8x6.2bpp"
+	INCBIN "gfx/cards/mewtwo2.2bpp"
 	INCBIN "gfx/cards/mewtwo2.pal"
 
 Mewtwo3CardGfx:: ; e2158 (38:6158)
-	INCBIN "gfx/cards/mewtwo3.8x6.2bpp"
+	INCBIN "gfx/cards/mewtwo3.2bpp"
 	INCBIN "gfx/cards/mewtwo3.pal"
 
 Mew1CardGfx:: ; e2460 (38:6460)
-	INCBIN "gfx/cards/mew1.8x6.2bpp"
+	INCBIN "gfx/cards/mew1.2bpp"
 	INCBIN "gfx/cards/mew1.pal"
 
 Mew2CardGfx:: ; e2768 (38:6768)
-	INCBIN "gfx/cards/mew2.8x6.2bpp"
+	INCBIN "gfx/cards/mew2.2bpp"
 	INCBIN "gfx/cards/mew2.pal"
 
 Mew3CardGfx:: ; e2a70 (38:6a70)
-	INCBIN "gfx/cards/mew3.8x6.2bpp"
+	INCBIN "gfx/cards/mew3.2bpp"
 	INCBIN "gfx/cards/mew3.pal"
 
 PidgeyCardGfx:: ; e2d78 (38:6d78)
-	INCBIN "gfx/cards/pidgey.8x6.2bpp"
+	INCBIN "gfx/cards/pidgey.2bpp"
 	INCBIN "gfx/cards/pidgey.pal"
 
 PidgeottoCardGfx:: ; e3080 (38:7080)
-	INCBIN "gfx/cards/pidgeotto.8x6.2bpp"
+	INCBIN "gfx/cards/pidgeotto.2bpp"
 	INCBIN "gfx/cards/pidgeotto.pal"
 
 Pidgeot1CardGfx:: ; e3388 (38:7388)
-	INCBIN "gfx/cards/pidgeot1.8x6.2bpp"
+	INCBIN "gfx/cards/pidgeot1.2bpp"
 	INCBIN "gfx/cards/pidgeot1.pal"
 
 Pidgeot2CardGfx:: ; e3690 (38:7690)
-	INCBIN "gfx/cards/pidgeot2.8x6.2bpp"
+	INCBIN "gfx/cards/pidgeot2.2bpp"
 	INCBIN "gfx/cards/pidgeot2.pal"
 
 RattataCardGfx:: ; e3998 (38:7998)
-	INCBIN "gfx/cards/rattata.8x6.2bpp"
+	INCBIN "gfx/cards/rattata.2bpp"
 	INCBIN "gfx/cards/rattata.pal"
 
 RaticateCardGfx:: ; e3ca0 (38:7ca0)
-	INCBIN "gfx/cards/raticate.8x6.2bpp"
+	INCBIN "gfx/cards/raticate.2bpp"
 	INCBIN "gfx/cards/raticate.pal"
 
 SECTION "Card Gfx 9", ROMX
 
 SpearowCardGfx:: ; e4000 (39:4000)
-	INCBIN "gfx/cards/spearow.8x6.2bpp"
+	INCBIN "gfx/cards/spearow.2bpp"
 	INCBIN "gfx/cards/spearow.pal"
 
 FearowCardGfx:: ; e4308 (39:4308)
-	INCBIN "gfx/cards/fearow.8x6.2bpp"
+	INCBIN "gfx/cards/fearow.2bpp"
 	INCBIN "gfx/cards/fearow.pal"
 
 ClefairyCardGfx:: ; e4610 (39:4610)
-	INCBIN "gfx/cards/clefairy.8x6.2bpp"
+	INCBIN "gfx/cards/clefairy.2bpp"
 	INCBIN "gfx/cards/clefairy.pal"
 
 ClefableCardGfx:: ; e4918 (39:4918)
-	INCBIN "gfx/cards/clefable.8x6.2bpp"
+	INCBIN "gfx/cards/clefable.2bpp"
 	INCBIN "gfx/cards/clefable.pal"
 
 Jigglypuff1CardGfx:: ; e4c20 (39:4c20)
-	INCBIN "gfx/cards/jigglypuff1.8x6.2bpp"
+	INCBIN "gfx/cards/jigglypuff1.2bpp"
 	INCBIN "gfx/cards/jigglypuff1.pal"
 
 Jigglypuff2CardGfx:: ; e4f28 (39:4f28)
-	INCBIN "gfx/cards/jigglypuff2.8x6.2bpp"
+	INCBIN "gfx/cards/jigglypuff2.2bpp"
 	INCBIN "gfx/cards/jigglypuff2.pal"
 
 Jigglypuff3CardGfx:: ; e5230 (39:5230)
-	INCBIN "gfx/cards/jigglypuff3.8x6.2bpp"
+	INCBIN "gfx/cards/jigglypuff3.2bpp"
 	INCBIN "gfx/cards/jigglypuff3.pal"
 
 WigglytuffCardGfx:: ; e5538 (39:5538)
-	INCBIN "gfx/cards/wigglytuff.8x6.2bpp"
+	INCBIN "gfx/cards/wigglytuff.2bpp"
 	INCBIN "gfx/cards/wigglytuff.pal"
 
 Meowth1CardGfx:: ; e5840 (39:5840)
-	INCBIN "gfx/cards/meowth1.8x6.2bpp"
+	INCBIN "gfx/cards/meowth1.2bpp"
 	INCBIN "gfx/cards/meowth1.pal"
 
 Meowth2CardGfx:: ; e5b48 (39:5b48)
-	INCBIN "gfx/cards/meowth2.8x6.2bpp"
+	INCBIN "gfx/cards/meowth2.2bpp"
 	INCBIN "gfx/cards/meowth2.pal"
 
 PersianCardGfx:: ; e5e50 (39:5e50)
-	INCBIN "gfx/cards/persian.8x6.2bpp"
+	INCBIN "gfx/cards/persian.2bpp"
 	INCBIN "gfx/cards/persian.pal"
 
 FarfetchdCardGfx:: ; e6158 (39:6158)
-	INCBIN "gfx/cards/farfetchd.8x6.2bpp"
+	INCBIN "gfx/cards/farfetchd.2bpp"
 	INCBIN "gfx/cards/farfetchd.pal"
 
 DoduoCardGfx:: ; e6460 (39:6460)
-	INCBIN "gfx/cards/doduo.8x6.2bpp"
+	INCBIN "gfx/cards/doduo.2bpp"
 	INCBIN "gfx/cards/doduo.pal"
 
 DodrioCardGfx:: ; e6768 (39:6768)
-	INCBIN "gfx/cards/dodrio.8x6.2bpp"
+	INCBIN "gfx/cards/dodrio.2bpp"
 	INCBIN "gfx/cards/dodrio.pal"
 
 LickitungCardGfx:: ; e6a70 (39:6a70)
-	INCBIN "gfx/cards/lickitung.8x6.2bpp"
+	INCBIN "gfx/cards/lickitung.2bpp"
 	INCBIN "gfx/cards/lickitung.pal"
 
 ChanseyCardGfx:: ; e6d78 (39:6d78)
-	INCBIN "gfx/cards/chansey.8x6.2bpp"
+	INCBIN "gfx/cards/chansey.2bpp"
 	INCBIN "gfx/cards/chansey.pal"
 
 KangaskhanCardGfx:: ; e7080 (39:7080)
-	INCBIN "gfx/cards/kangaskhan.8x6.2bpp"
+	INCBIN "gfx/cards/kangaskhan.2bpp"
 	INCBIN "gfx/cards/kangaskhan.pal"
 
 TaurosCardGfx:: ; e7388 (39:7388)
-	INCBIN "gfx/cards/tauros.8x6.2bpp"
+	INCBIN "gfx/cards/tauros.2bpp"
 	INCBIN "gfx/cards/tauros.pal"
 
 DittoCardGfx:: ; e7690 (39:7690)
-	INCBIN "gfx/cards/ditto.8x6.2bpp"
+	INCBIN "gfx/cards/ditto.2bpp"
 	INCBIN "gfx/cards/ditto.pal"
 
 EeveeCardGfx:: ; e7998 (39:7998)
-	INCBIN "gfx/cards/eevee.8x6.2bpp"
+	INCBIN "gfx/cards/eevee.2bpp"
 	INCBIN "gfx/cards/eevee.pal"
 
 PorygonCardGfx:: ; e7ca0 (39:7ca0)
-	INCBIN "gfx/cards/porygon.8x6.2bpp"
+	INCBIN "gfx/cards/porygon.2bpp"
 	INCBIN "gfx/cards/porygon.pal"
 
 SECTION "Card Gfx 10", ROMX
 
 SnorlaxCardGfx:: ; e8000 (3a:4000)
-	INCBIN "gfx/cards/snorlax.8x6.2bpp"
+	INCBIN "gfx/cards/snorlax.2bpp"
 	INCBIN "gfx/cards/snorlax.pal"
 
 DratiniCardGfx:: ; e8308 (3a:4308)
-	INCBIN "gfx/cards/dratini.8x6.2bpp"
+	INCBIN "gfx/cards/dratini.2bpp"
 	INCBIN "gfx/cards/dratini.pal"
 
 DragonairCardGfx:: ; e8610 (3a:4610)
-	INCBIN "gfx/cards/dragonair.8x6.2bpp"
+	INCBIN "gfx/cards/dragonair.2bpp"
 	INCBIN "gfx/cards/dragonair.pal"
 
 Dragonite1CardGfx:: ; e8918 (3a:4918)
-	INCBIN "gfx/cards/dragonite1.8x6.2bpp"
+	INCBIN "gfx/cards/dragonite1.2bpp"
 	INCBIN "gfx/cards/dragonite1.pal"
 
 Dragonite2CardGfx:: ; e8c20 (3a:4c20)
-	INCBIN "gfx/cards/dragonite2.8x6.2bpp"
+	INCBIN "gfx/cards/dragonite2.2bpp"
 	INCBIN "gfx/cards/dragonite2.pal"
 
 ProfessorOakCardGfx:: ; e8f28 (3a:4f28)
-	INCBIN "gfx/cards/professoroak.8x6.2bpp"
+	INCBIN "gfx/cards/professoroak.2bpp"
 	INCBIN "gfx/cards/professoroak.pal"
 
 ImposterProfessorOakCardGfx:: ; e9230 (3a:5230)
-	INCBIN "gfx/cards/imposterprofessoroak.8x6.2bpp"
+	INCBIN "gfx/cards/imposterprofessoroak.2bpp"
 	INCBIN "gfx/cards/imposterprofessoroak.pal"
 
 BillCardGfx:: ; e9538 (3a:5538)
-	INCBIN "gfx/cards/bill.8x6.2bpp"
+	INCBIN "gfx/cards/bill.2bpp"
 	INCBIN "gfx/cards/bill.pal"
 
 MrFujiCardGfx:: ; e9840 (3a:5840)
-	INCBIN "gfx/cards/mrfuji.8x6.2bpp"
+	INCBIN "gfx/cards/mrfuji.2bpp"
 	INCBIN "gfx/cards/mrfuji.pal"
 
 LassCardGfx:: ; e9b48 (3a:5b48)
-	INCBIN "gfx/cards/lass.8x6.2bpp"
+	INCBIN "gfx/cards/lass.2bpp"
 	INCBIN "gfx/cards/lass.pal"
 
 ImakuniCardGfx:: ; e9e50 (3a:5e50)
-	INCBIN "gfx/cards/imakuni.8x6.2bpp"
+	INCBIN "gfx/cards/imakuni.2bpp"
 	INCBIN "gfx/cards/imakuni.pal"
 
 PokemonTraderCardGfx:: ; ea158 (3a:6158)
-	INCBIN "gfx/cards/pokemontrader.8x6.2bpp"
+	INCBIN "gfx/cards/pokemontrader.2bpp"
 	INCBIN "gfx/cards/pokemontrader.pal"
 
 PokemonBreederCardGfx:: ; ea460 (3a:6460)
-	INCBIN "gfx/cards/pokemonbreeder.8x6.2bpp"
+	INCBIN "gfx/cards/pokemonbreeder.2bpp"
 	INCBIN "gfx/cards/pokemonbreeder.pal"
 
 ClefairyDollCardGfx:: ; ea768 (3a:6768)
-	INCBIN "gfx/cards/clefairydoll.8x6.2bpp"
+	INCBIN "gfx/cards/clefairydoll.2bpp"
 	INCBIN "gfx/cards/clefairydoll.pal"
 
 MysteriousFossilCardGfx:: ; eaa70 (3a:6a70)
-	INCBIN "gfx/cards/mysteriousfossil.8x6.2bpp"
+	INCBIN "gfx/cards/mysteriousfossil.2bpp"
 	INCBIN "gfx/cards/mysteriousfossil.pal"
 
 EnergyRetrievalCardGfx:: ; ead78 (3a:6d78)
-	INCBIN "gfx/cards/energyretrieval.8x6.2bpp"
+	INCBIN "gfx/cards/energyretrieval.2bpp"
 	INCBIN "gfx/cards/energyretrieval.pal"
 
 SuperEnergyRetrievalCardGfx:: ; eb080 (3a:7080)
-	INCBIN "gfx/cards/superenergyretrieval.8x6.2bpp"
+	INCBIN "gfx/cards/superenergyretrieval.2bpp"
 	INCBIN "gfx/cards/superenergyretrieval.pal"
 
 EnergySearchCardGfx:: ; eb388 (3a:7388)
-	INCBIN "gfx/cards/energysearch.8x6.2bpp"
+	INCBIN "gfx/cards/energysearch.2bpp"
 	INCBIN "gfx/cards/energysearch.pal"
 
 EnergyRemovalCardGfx:: ; eb690 (3a:7690)
-	INCBIN "gfx/cards/energyremoval.8x6.2bpp"
+	INCBIN "gfx/cards/energyremoval.2bpp"
 	INCBIN "gfx/cards/energyremoval.pal"
 
 SuperEnergyRemovalCardGfx:: ; eb998 (3a:7998)
-	INCBIN "gfx/cards/superenergyremoval.8x6.2bpp"
+	INCBIN "gfx/cards/superenergyremoval.2bpp"
 	INCBIN "gfx/cards/superenergyremoval.pal"
 
 SwitchCardGfx:: ; ebca0 (3a:7ca0)
-	INCBIN "gfx/cards/switch.8x6.2bpp"
+	INCBIN "gfx/cards/switch.2bpp"
 	INCBIN "gfx/cards/switch.pal"
 
 SECTION "Card Gfx 11", ROMX
 
 PokemonCenterCardGfx:: ; ec000 (3b:4000)
-	INCBIN "gfx/cards/pokemoncenter.8x6.2bpp"
+	INCBIN "gfx/cards/pokemoncenter.2bpp"
 	INCBIN "gfx/cards/pokemoncenter.pal"
 
 PokeBallCardGfx:: ; ec308 (3b:4308)
-	INCBIN "gfx/cards/pokeball.8x6.2bpp"
+	INCBIN "gfx/cards/pokeball.2bpp"
 	INCBIN "gfx/cards/pokeball.pal"
 
 ScoopUpCardGfx:: ; ec610 (3b:4610)
-	INCBIN "gfx/cards/scoopup.8x6.2bpp"
+	INCBIN "gfx/cards/scoopup.2bpp"
 	INCBIN "gfx/cards/scoopup.pal"
 
 ComputerSearchCardGfx:: ; ec918 (3b:4918)
-	INCBIN "gfx/cards/computersearch.8x6.2bpp"
+	INCBIN "gfx/cards/computersearch.2bpp"
 	INCBIN "gfx/cards/computersearch.pal"
 
 PokedexCardGfx:: ; ecc20 (3b:4c20)
-	INCBIN "gfx/cards/pokedex.8x6.2bpp"
+	INCBIN "gfx/cards/pokedex.2bpp"
 	INCBIN "gfx/cards/pokedex.pal"
 
 PlusPowerCardGfx:: ; ecf28 (3b:4f28)
-	INCBIN "gfx/cards/pluspower.8x6.2bpp"
+	INCBIN "gfx/cards/pluspower.2bpp"
 	INCBIN "gfx/cards/pluspower.pal"
 
 DefenderCardGfx:: ; ed230 (3b:5230)
-	INCBIN "gfx/cards/defender.8x6.2bpp"
+	INCBIN "gfx/cards/defender.2bpp"
 	INCBIN "gfx/cards/defender.pal"
 
 ItemFinderCardGfx:: ; ed538 (3b:5538)
-	INCBIN "gfx/cards/itemfinder.8x6.2bpp"
+	INCBIN "gfx/cards/itemfinder.2bpp"
 	INCBIN "gfx/cards/itemfinder.pal"
 
 GustOfWindCardGfx:: ; ed840 (3b:5840)
-	INCBIN "gfx/cards/gustofwind.8x6.2bpp"
+	INCBIN "gfx/cards/gustofwind.2bpp"
 	INCBIN "gfx/cards/gustofwind.pal"
 
 DevolutionSprayCardGfx:: ; edb48 (3b:5b48)
-	INCBIN "gfx/cards/devolutionspray.8x6.2bpp"
+	INCBIN "gfx/cards/devolutionspray.2bpp"
 	INCBIN "gfx/cards/devolutionspray.pal"
 
 PotionCardGfx:: ; ede50 (3b:5e50)
-	INCBIN "gfx/cards/potion.8x6.2bpp"
+	INCBIN "gfx/cards/potion.2bpp"
 	INCBIN "gfx/cards/potion.pal"
 
 SuperPotionCardGfx:: ; ee158 (3b:6158)
-	INCBIN "gfx/cards/superpotion.8x6.2bpp"
+	INCBIN "gfx/cards/superpotion.2bpp"
 	INCBIN "gfx/cards/superpotion.pal"
 
 FullHealCardGfx:: ; ee460 (3b:6460)
-	INCBIN "gfx/cards/fullheal.8x6.2bpp"
+	INCBIN "gfx/cards/fullheal.2bpp"
 	INCBIN "gfx/cards/fullheal.pal"
 
 ReviveCardGfx:: ; ee768 (3b:6768)
-	INCBIN "gfx/cards/revive.8x6.2bpp"
+	INCBIN "gfx/cards/revive.2bpp"
 	INCBIN "gfx/cards/revive.pal"
 
 MaintenanceCardGfx:: ; eea70 (3b:6a70)
-	INCBIN "gfx/cards/maintenance.8x6.2bpp"
+	INCBIN "gfx/cards/maintenance.2bpp"
 	INCBIN "gfx/cards/maintenance.pal"
 
 PokemonFluteCardGfx:: ; eed78 (3b:6d78)
-	INCBIN "gfx/cards/pokemonflute.8x6.2bpp"
+	INCBIN "gfx/cards/pokemonflute.2bpp"
 	INCBIN "gfx/cards/pokemonflute.pal"
 
 GamblerCardGfx:: ; ef080 (3b:7080)
-	INCBIN "gfx/cards/gambler.8x6.2bpp"
+	INCBIN "gfx/cards/gambler.2bpp"
 	INCBIN "gfx/cards/gambler.pal"
 
 RecycleCardGfx:: ; ef388 (3b:7388)
-	INCBIN "gfx/cards/recycle.8x6.2bpp"
+	INCBIN "gfx/cards/recycle.2bpp"
 	INCBIN "gfx/cards/recycle.pal"
 
 rept $970
diff --git a/src/gfx/booster_packs/colosseum2.png b/src/gfx/booster_packs/colosseum2.png
new file mode 100644
index 0000000..1da1a52
Binary files /dev/null and b/src/gfx/booster_packs/colosseum2.png differ
diff --git a/src/gfx/booster_packs/colosseum2.t10.png b/src/gfx/booster_packs/colosseum2.t10.png
deleted file mode 100644
index 1da1a52..0000000
Binary files a/src/gfx/booster_packs/colosseum2.t10.png and /dev/null differ
diff --git a/src/gfx/booster_packs/evolution2.png b/src/gfx/booster_packs/evolution2.png
new file mode 100644
index 0000000..09affa5
Binary files /dev/null and b/src/gfx/booster_packs/evolution2.png differ
diff --git a/src/gfx/booster_packs/evolution2.t10.png b/src/gfx/booster_packs/evolution2.t10.png
deleted file mode 100644
index 09affa5..0000000
Binary files a/src/gfx/booster_packs/evolution2.t10.png and /dev/null differ
diff --git a/src/gfx/booster_packs/laboratory2.png b/src/gfx/booster_packs/laboratory2.png
new file mode 100644
index 0000000..4feb880
Binary files /dev/null and b/src/gfx/booster_packs/laboratory2.png differ
diff --git a/src/gfx/booster_packs/laboratory2.t10.png b/src/gfx/booster_packs/laboratory2.t10.png
deleted file mode 100644
index 4feb880..0000000
Binary files a/src/gfx/booster_packs/laboratory2.t10.png and /dev/null differ
diff --git a/src/gfx/booster_packs/mystery2.png b/src/gfx/booster_packs/mystery2.png
new file mode 100644
index 0000000..fc04dbf
Binary files /dev/null and b/src/gfx/booster_packs/mystery2.png differ
diff --git a/src/gfx/booster_packs/mystery2.t10.png b/src/gfx/booster_packs/mystery2.t10.png
deleted file mode 100644
index fc04dbf..0000000
Binary files a/src/gfx/booster_packs/mystery2.t10.png and /dev/null differ
diff --git a/src/gfx/cardpop/cardpop1.png b/src/gfx/cardpop/cardpop1.png
new file mode 100644
index 0000000..c607d8d
Binary files /dev/null and b/src/gfx/cardpop/cardpop1.png differ
diff --git a/src/gfx/cardpop/cardpop1.t3.png b/src/gfx/cardpop/cardpop1.t3.png
deleted file mode 100644
index c607d8d..0000000
Binary files a/src/gfx/cardpop/cardpop1.t3.png and /dev/null differ
diff --git a/src/gfx/cardpop/cardpop2.png b/src/gfx/cardpop/cardpop2.png
new file mode 100644
index 0000000..75e5149
Binary files /dev/null and b/src/gfx/cardpop/cardpop2.png differ
diff --git a/src/gfx/cardpop/cardpop2.t3.png b/src/gfx/cardpop/cardpop2.t3.png
deleted file mode 100644
index 75e5149..0000000
Binary files a/src/gfx/cardpop/cardpop2.t3.png and /dev/null differ
diff --git a/src/gfx/cardpop/cardpop3.png b/src/gfx/cardpop/cardpop3.png
new file mode 100644
index 0000000..48bd233
Binary files /dev/null and b/src/gfx/cardpop/cardpop3.png differ
diff --git a/src/gfx/cardpop/cardpop3.t3.png b/src/gfx/cardpop/cardpop3.t3.png
deleted file mode 100644
index 48bd233..0000000
Binary files a/src/gfx/cardpop/cardpop3.t3.png and /dev/null differ
diff --git a/src/gfx/cards/abra.8x6.png b/src/gfx/cards/abra.8x6.png
deleted file mode 100644
index 336068c..0000000
Binary files a/src/gfx/cards/abra.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/abra.pal b/src/gfx/cards/abra.pal
deleted file mode 100644
index 8478895..0000000
Binary files a/src/gfx/cards/abra.pal and /dev/null differ
diff --git a/src/gfx/cards/abra.png b/src/gfx/cards/abra.png
new file mode 100644
index 0000000..e3e8509
Binary files /dev/null and b/src/gfx/cards/abra.png differ
diff --git a/src/gfx/cards/aerodactyl.8x6.png b/src/gfx/cards/aerodactyl.8x6.png
deleted file mode 100644
index f250570..0000000
Binary files a/src/gfx/cards/aerodactyl.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/aerodactyl.pal b/src/gfx/cards/aerodactyl.pal
deleted file mode 100644
index 40075fb..0000000
Binary files a/src/gfx/cards/aerodactyl.pal and /dev/null differ
diff --git a/src/gfx/cards/aerodactyl.png b/src/gfx/cards/aerodactyl.png
new file mode 100644
index 0000000..c7bbc9e
Binary files /dev/null and b/src/gfx/cards/aerodactyl.png differ
diff --git a/src/gfx/cards/alakazam.8x6.png b/src/gfx/cards/alakazam.8x6.png
deleted file mode 100644
index de51bc8..0000000
Binary files a/src/gfx/cards/alakazam.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/alakazam.pal b/src/gfx/cards/alakazam.pal
deleted file mode 100644
index 9905df9..0000000
Binary files a/src/gfx/cards/alakazam.pal and /dev/null differ
diff --git a/src/gfx/cards/alakazam.png b/src/gfx/cards/alakazam.png
new file mode 100644
index 0000000..099fd66
Binary files /dev/null and b/src/gfx/cards/alakazam.png differ
diff --git a/src/gfx/cards/arbok.8x6.png b/src/gfx/cards/arbok.8x6.png
deleted file mode 100644
index 4d0bccb..0000000
Binary files a/src/gfx/cards/arbok.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/arbok.pal b/src/gfx/cards/arbok.pal
deleted file mode 100644
index 7220a36..0000000
Binary files a/src/gfx/cards/arbok.pal and /dev/null differ
diff --git a/src/gfx/cards/arbok.png b/src/gfx/cards/arbok.png
new file mode 100644
index 0000000..0393921
Binary files /dev/null and b/src/gfx/cards/arbok.png differ
diff --git a/src/gfx/cards/arcanine1.8x6.png b/src/gfx/cards/arcanine1.8x6.png
deleted file mode 100644
index 31cb8b0..0000000
Binary files a/src/gfx/cards/arcanine1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/arcanine1.pal b/src/gfx/cards/arcanine1.pal
deleted file mode 100644
index 844f708..0000000
Binary files a/src/gfx/cards/arcanine1.pal and /dev/null differ
diff --git a/src/gfx/cards/arcanine1.png b/src/gfx/cards/arcanine1.png
new file mode 100644
index 0000000..840865b
Binary files /dev/null and b/src/gfx/cards/arcanine1.png differ
diff --git a/src/gfx/cards/arcanine2.8x6.png b/src/gfx/cards/arcanine2.8x6.png
deleted file mode 100644
index 64fc0bd..0000000
Binary files a/src/gfx/cards/arcanine2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/arcanine2.pal b/src/gfx/cards/arcanine2.pal
deleted file mode 100644
index f30b0c5..0000000
Binary files a/src/gfx/cards/arcanine2.pal and /dev/null differ
diff --git a/src/gfx/cards/arcanine2.png b/src/gfx/cards/arcanine2.png
new file mode 100644
index 0000000..e943cc4
Binary files /dev/null and b/src/gfx/cards/arcanine2.png differ
diff --git a/src/gfx/cards/articuno1.8x6.png b/src/gfx/cards/articuno1.8x6.png
deleted file mode 100644
index f9c54c4..0000000
Binary files a/src/gfx/cards/articuno1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/articuno1.pal b/src/gfx/cards/articuno1.pal
deleted file mode 100644
index a7ba53f..0000000
--- a/src/gfx/cards/articuno1.pal
+++ /dev/null
@@ -1 +0,0 @@
-��~�U�
\ No newline at end of file
diff --git a/src/gfx/cards/articuno1.png b/src/gfx/cards/articuno1.png
new file mode 100644
index 0000000..e03d821
Binary files /dev/null and b/src/gfx/cards/articuno1.png differ
diff --git a/src/gfx/cards/articuno2.8x6.png b/src/gfx/cards/articuno2.8x6.png
deleted file mode 100644
index d7bdc49..0000000
Binary files a/src/gfx/cards/articuno2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/articuno2.pal b/src/gfx/cards/articuno2.pal
deleted file mode 100644
index 7d7d50e..0000000
Binary files a/src/gfx/cards/articuno2.pal and /dev/null differ
diff --git a/src/gfx/cards/articuno2.png b/src/gfx/cards/articuno2.png
new file mode 100644
index 0000000..948c5a6
Binary files /dev/null and b/src/gfx/cards/articuno2.png differ
diff --git a/src/gfx/cards/beedrill.8x6.png b/src/gfx/cards/beedrill.8x6.png
deleted file mode 100644
index ec6af50..0000000
Binary files a/src/gfx/cards/beedrill.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/beedrill.pal b/src/gfx/cards/beedrill.pal
deleted file mode 100644
index 23f06a5..0000000
Binary files a/src/gfx/cards/beedrill.pal and /dev/null differ
diff --git a/src/gfx/cards/beedrill.png b/src/gfx/cards/beedrill.png
new file mode 100644
index 0000000..fabacc9
Binary files /dev/null and b/src/gfx/cards/beedrill.png differ
diff --git a/src/gfx/cards/bellsprout.8x6.png b/src/gfx/cards/bellsprout.8x6.png
deleted file mode 100644
index 6dd6297..0000000
Binary files a/src/gfx/cards/bellsprout.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/bellsprout.pal b/src/gfx/cards/bellsprout.pal
deleted file mode 100644
index ede7e7b..0000000
Binary files a/src/gfx/cards/bellsprout.pal and /dev/null differ
diff --git a/src/gfx/cards/bellsprout.png b/src/gfx/cards/bellsprout.png
new file mode 100644
index 0000000..044fd5b
Binary files /dev/null and b/src/gfx/cards/bellsprout.png differ
diff --git a/src/gfx/cards/bill.8x6.png b/src/gfx/cards/bill.8x6.png
deleted file mode 100644
index f730116..0000000
Binary files a/src/gfx/cards/bill.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/bill.pal b/src/gfx/cards/bill.pal
deleted file mode 100644
index aab4025..0000000
Binary files a/src/gfx/cards/bill.pal and /dev/null differ
diff --git a/src/gfx/cards/bill.png b/src/gfx/cards/bill.png
new file mode 100644
index 0000000..d915777
Binary files /dev/null and b/src/gfx/cards/bill.png differ
diff --git a/src/gfx/cards/blastoise.8x6.png b/src/gfx/cards/blastoise.8x6.png
deleted file mode 100644
index 68c7ddb..0000000
Binary files a/src/gfx/cards/blastoise.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/blastoise.pal b/src/gfx/cards/blastoise.pal
deleted file mode 100644
index 0145e41..0000000
Binary files a/src/gfx/cards/blastoise.pal and /dev/null differ
diff --git a/src/gfx/cards/blastoise.png b/src/gfx/cards/blastoise.png
new file mode 100644
index 0000000..d2bc5bb
Binary files /dev/null and b/src/gfx/cards/blastoise.png differ
diff --git a/src/gfx/cards/bulbasaur.8x6.png b/src/gfx/cards/bulbasaur.8x6.png
deleted file mode 100644
index fdb0552..0000000
Binary files a/src/gfx/cards/bulbasaur.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/bulbasaur.pal b/src/gfx/cards/bulbasaur.pal
deleted file mode 100644
index 1d1a8a0..0000000
Binary files a/src/gfx/cards/bulbasaur.pal and /dev/null differ
diff --git a/src/gfx/cards/bulbasaur.png b/src/gfx/cards/bulbasaur.png
new file mode 100644
index 0000000..5bda906
Binary files /dev/null and b/src/gfx/cards/bulbasaur.png differ
diff --git a/src/gfx/cards/butterfree.8x6.png b/src/gfx/cards/butterfree.8x6.png
deleted file mode 100644
index 5c02eb1..0000000
Binary files a/src/gfx/cards/butterfree.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/butterfree.pal b/src/gfx/cards/butterfree.pal
deleted file mode 100644
index 66dd06d..0000000
Binary files a/src/gfx/cards/butterfree.pal and /dev/null differ
diff --git a/src/gfx/cards/butterfree.png b/src/gfx/cards/butterfree.png
new file mode 100644
index 0000000..c1c8d4e
Binary files /dev/null and b/src/gfx/cards/butterfree.png differ
diff --git a/src/gfx/cards/caterpie.8x6.png b/src/gfx/cards/caterpie.8x6.png
deleted file mode 100644
index c1784e0..0000000
Binary files a/src/gfx/cards/caterpie.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/caterpie.pal b/src/gfx/cards/caterpie.pal
deleted file mode 100644
index 13c1994..0000000
Binary files a/src/gfx/cards/caterpie.pal and /dev/null differ
diff --git a/src/gfx/cards/caterpie.png b/src/gfx/cards/caterpie.png
new file mode 100644
index 0000000..06cef2a
Binary files /dev/null and b/src/gfx/cards/caterpie.png differ
diff --git a/src/gfx/cards/chansey.8x6.png b/src/gfx/cards/chansey.8x6.png
deleted file mode 100644
index e63a246..0000000
Binary files a/src/gfx/cards/chansey.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/chansey.pal b/src/gfx/cards/chansey.pal
deleted file mode 100644
index 87ec980..0000000
--- a/src/gfx/cards/chansey.pal
+++ /dev/null
@@ -1 +0,0 @@
-_kB1�
\ No newline at end of file
diff --git a/src/gfx/cards/chansey.png b/src/gfx/cards/chansey.png
new file mode 100644
index 0000000..ae31291
Binary files /dev/null and b/src/gfx/cards/chansey.png differ
diff --git a/src/gfx/cards/charizard.8x6.png b/src/gfx/cards/charizard.8x6.png
deleted file mode 100644
index d5d22ef..0000000
Binary files a/src/gfx/cards/charizard.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/charizard.pal b/src/gfx/cards/charizard.pal
deleted file mode 100644
index 13c5ead..0000000
Binary files a/src/gfx/cards/charizard.pal and /dev/null differ
diff --git a/src/gfx/cards/charizard.png b/src/gfx/cards/charizard.png
new file mode 100644
index 0000000..6dc3968
Binary files /dev/null and b/src/gfx/cards/charizard.png differ
diff --git a/src/gfx/cards/charmander.8x6.png b/src/gfx/cards/charmander.8x6.png
deleted file mode 100644
index 7fadeaf..0000000
Binary files a/src/gfx/cards/charmander.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/charmander.pal b/src/gfx/cards/charmander.pal
deleted file mode 100644
index 85d1934..0000000
Binary files a/src/gfx/cards/charmander.pal and /dev/null differ
diff --git a/src/gfx/cards/charmander.png b/src/gfx/cards/charmander.png
new file mode 100644
index 0000000..8b2f4f0
Binary files /dev/null and b/src/gfx/cards/charmander.png differ
diff --git a/src/gfx/cards/charmeleon.8x6.png b/src/gfx/cards/charmeleon.8x6.png
deleted file mode 100644
index c996d81..0000000
Binary files a/src/gfx/cards/charmeleon.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/charmeleon.pal b/src/gfx/cards/charmeleon.pal
deleted file mode 100644
index 6133a9e..0000000
Binary files a/src/gfx/cards/charmeleon.pal and /dev/null differ
diff --git a/src/gfx/cards/charmeleon.png b/src/gfx/cards/charmeleon.png
new file mode 100644
index 0000000..b7ffb64
Binary files /dev/null and b/src/gfx/cards/charmeleon.png differ
diff --git a/src/gfx/cards/clefable.8x6.png b/src/gfx/cards/clefable.8x6.png
deleted file mode 100644
index 014b1b9..0000000
Binary files a/src/gfx/cards/clefable.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/clefable.pal b/src/gfx/cards/clefable.pal
deleted file mode 100644
index 5f85ff1..0000000
--- a/src/gfx/cards/clefable.pal
+++ /dev/null
@@ -1 +0,0 @@
-�V�
\ No newline at end of file
diff --git a/src/gfx/cards/clefable.png b/src/gfx/cards/clefable.png
new file mode 100644
index 0000000..7c0cb86
Binary files /dev/null and b/src/gfx/cards/clefable.png differ
diff --git a/src/gfx/cards/clefairy.8x6.png b/src/gfx/cards/clefairy.8x6.png
deleted file mode 100644
index cfc66ef..0000000
Binary files a/src/gfx/cards/clefairy.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/clefairy.pal b/src/gfx/cards/clefairy.pal
deleted file mode 100644
index 1b27709..0000000
Binary files a/src/gfx/cards/clefairy.pal and /dev/null differ
diff --git a/src/gfx/cards/clefairy.png b/src/gfx/cards/clefairy.png
new file mode 100644
index 0000000..eda9e4d
Binary files /dev/null and b/src/gfx/cards/clefairy.png differ
diff --git a/src/gfx/cards/clefairydoll.8x6.png b/src/gfx/cards/clefairydoll.8x6.png
deleted file mode 100644
index c12f8c4..0000000
Binary files a/src/gfx/cards/clefairydoll.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/clefairydoll.pal b/src/gfx/cards/clefairydoll.pal
deleted file mode 100644
index 2d980d8..0000000
Binary files a/src/gfx/cards/clefairydoll.pal and /dev/null differ
diff --git a/src/gfx/cards/clefairydoll.png b/src/gfx/cards/clefairydoll.png
new file mode 100644
index 0000000..e607ea1
Binary files /dev/null and b/src/gfx/cards/clefairydoll.png differ
diff --git a/src/gfx/cards/cloyster.8x6.png b/src/gfx/cards/cloyster.8x6.png
deleted file mode 100644
index 5f59e88..0000000
Binary files a/src/gfx/cards/cloyster.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/cloyster.pal b/src/gfx/cards/cloyster.pal
deleted file mode 100644
index 8243bd0..0000000
--- a/src/gfx/cards/cloyster.pal
+++ /dev/null
@@ -1 +0,0 @@
-_kU
\ No newline at end of file
diff --git a/src/gfx/cards/cloyster.png b/src/gfx/cards/cloyster.png
new file mode 100644
index 0000000..c24df71
Binary files /dev/null and b/src/gfx/cards/cloyster.png differ
diff --git a/src/gfx/cards/computersearch.8x6.png b/src/gfx/cards/computersearch.8x6.png
deleted file mode 100644
index 79f1c78..0000000
Binary files a/src/gfx/cards/computersearch.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/computersearch.pal b/src/gfx/cards/computersearch.pal
deleted file mode 100644
index de3a143..0000000
Binary files a/src/gfx/cards/computersearch.pal and /dev/null differ
diff --git a/src/gfx/cards/computersearch.png b/src/gfx/cards/computersearch.png
new file mode 100644
index 0000000..4786ab3
Binary files /dev/null and b/src/gfx/cards/computersearch.png differ
diff --git a/src/gfx/cards/cubone.8x6.png b/src/gfx/cards/cubone.8x6.png
deleted file mode 100644
index 49d5b23..0000000
Binary files a/src/gfx/cards/cubone.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/cubone.pal b/src/gfx/cards/cubone.pal
deleted file mode 100644
index 3352c5b..0000000
Binary files a/src/gfx/cards/cubone.pal and /dev/null differ
diff --git a/src/gfx/cards/cubone.png b/src/gfx/cards/cubone.png
new file mode 100644
index 0000000..d914d25
Binary files /dev/null and b/src/gfx/cards/cubone.png differ
diff --git a/src/gfx/cards/defender.8x6.png b/src/gfx/cards/defender.8x6.png
deleted file mode 100644
index adde4fc..0000000
Binary files a/src/gfx/cards/defender.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/defender.pal b/src/gfx/cards/defender.pal
deleted file mode 100644
index 541b683..0000000
Binary files a/src/gfx/cards/defender.pal and /dev/null differ
diff --git a/src/gfx/cards/defender.png b/src/gfx/cards/defender.png
new file mode 100644
index 0000000..bdeb050
Binary files /dev/null and b/src/gfx/cards/defender.png differ
diff --git a/src/gfx/cards/devolutionspray.8x6.png b/src/gfx/cards/devolutionspray.8x6.png
deleted file mode 100644
index b3b69a4..0000000
Binary files a/src/gfx/cards/devolutionspray.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/devolutionspray.pal b/src/gfx/cards/devolutionspray.pal
deleted file mode 100644
index 5b1619f..0000000
Binary files a/src/gfx/cards/devolutionspray.pal and /dev/null differ
diff --git a/src/gfx/cards/devolutionspray.png b/src/gfx/cards/devolutionspray.png
new file mode 100644
index 0000000..de65594
Binary files /dev/null and b/src/gfx/cards/devolutionspray.png differ
diff --git a/src/gfx/cards/dewgong.8x6.png b/src/gfx/cards/dewgong.8x6.png
deleted file mode 100644
index c4be81b..0000000
Binary files a/src/gfx/cards/dewgong.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/dewgong.pal b/src/gfx/cards/dewgong.pal
deleted file mode 100644
index ae4ee37..0000000
Binary files a/src/gfx/cards/dewgong.pal and /dev/null differ
diff --git a/src/gfx/cards/dewgong.png b/src/gfx/cards/dewgong.png
new file mode 100644
index 0000000..21d8f49
Binary files /dev/null and b/src/gfx/cards/dewgong.png differ
diff --git a/src/gfx/cards/diglett.8x6.png b/src/gfx/cards/diglett.8x6.png
deleted file mode 100644
index cae6aef..0000000
Binary files a/src/gfx/cards/diglett.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/diglett.pal b/src/gfx/cards/diglett.pal
deleted file mode 100644
index 96817c1..0000000
Binary files a/src/gfx/cards/diglett.pal and /dev/null differ
diff --git a/src/gfx/cards/diglett.png b/src/gfx/cards/diglett.png
new file mode 100644
index 0000000..06e3f98
Binary files /dev/null and b/src/gfx/cards/diglett.png differ
diff --git a/src/gfx/cards/ditto.8x6.png b/src/gfx/cards/ditto.8x6.png
deleted file mode 100644
index 566dcf4..0000000
Binary files a/src/gfx/cards/ditto.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/ditto.pal b/src/gfx/cards/ditto.pal
deleted file mode 100644
index fcc03f2..0000000
Binary files a/src/gfx/cards/ditto.pal and /dev/null differ
diff --git a/src/gfx/cards/ditto.png b/src/gfx/cards/ditto.png
new file mode 100644
index 0000000..14cf202
Binary files /dev/null and b/src/gfx/cards/ditto.png differ
diff --git a/src/gfx/cards/dodrio.8x6.png b/src/gfx/cards/dodrio.8x6.png
deleted file mode 100644
index 222bb79..0000000
Binary files a/src/gfx/cards/dodrio.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/dodrio.pal b/src/gfx/cards/dodrio.pal
deleted file mode 100644
index 5209538..0000000
Binary files a/src/gfx/cards/dodrio.pal and /dev/null differ
diff --git a/src/gfx/cards/dodrio.png b/src/gfx/cards/dodrio.png
new file mode 100644
index 0000000..4792c45
Binary files /dev/null and b/src/gfx/cards/dodrio.png differ
diff --git a/src/gfx/cards/doduo.8x6.png b/src/gfx/cards/doduo.8x6.png
deleted file mode 100644
index fad2467..0000000
Binary files a/src/gfx/cards/doduo.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/doduo.pal b/src/gfx/cards/doduo.pal
deleted file mode 100644
index b3e7b20..0000000
Binary files a/src/gfx/cards/doduo.pal and /dev/null differ
diff --git a/src/gfx/cards/doduo.png b/src/gfx/cards/doduo.png
new file mode 100644
index 0000000..31b44af
Binary files /dev/null and b/src/gfx/cards/doduo.png differ
diff --git a/src/gfx/cards/doublecolorlessenergy.8x6.png b/src/gfx/cards/doublecolorlessenergy.8x6.png
deleted file mode 100644
index b3b367b..0000000
Binary files a/src/gfx/cards/doublecolorlessenergy.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/doublecolorlessenergy.pal b/src/gfx/cards/doublecolorlessenergy.pal
deleted file mode 100644
index 85c7d41..0000000
Binary files a/src/gfx/cards/doublecolorlessenergy.pal and /dev/null differ
diff --git a/src/gfx/cards/doublecolorlessenergy.png b/src/gfx/cards/doublecolorlessenergy.png
new file mode 100644
index 0000000..767be48
Binary files /dev/null and b/src/gfx/cards/doublecolorlessenergy.png differ
diff --git a/src/gfx/cards/dragonair.8x6.png b/src/gfx/cards/dragonair.8x6.png
deleted file mode 100644
index e0cf766..0000000
Binary files a/src/gfx/cards/dragonair.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/dragonair.pal b/src/gfx/cards/dragonair.pal
deleted file mode 100644
index 96b3358..0000000
Binary files a/src/gfx/cards/dragonair.pal and /dev/null differ
diff --git a/src/gfx/cards/dragonair.png b/src/gfx/cards/dragonair.png
new file mode 100644
index 0000000..5c88db3
Binary files /dev/null and b/src/gfx/cards/dragonair.png differ
diff --git a/src/gfx/cards/dragonite1.8x6.png b/src/gfx/cards/dragonite1.8x6.png
deleted file mode 100644
index 10c4ed9..0000000
Binary files a/src/gfx/cards/dragonite1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/dragonite1.pal b/src/gfx/cards/dragonite1.pal
deleted file mode 100644
index 9b3e049..0000000
Binary files a/src/gfx/cards/dragonite1.pal and /dev/null differ
diff --git a/src/gfx/cards/dragonite1.png b/src/gfx/cards/dragonite1.png
new file mode 100644
index 0000000..205b109
Binary files /dev/null and b/src/gfx/cards/dragonite1.png differ
diff --git a/src/gfx/cards/dragonite2.8x6.png b/src/gfx/cards/dragonite2.8x6.png
deleted file mode 100644
index 9d15c00..0000000
Binary files a/src/gfx/cards/dragonite2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/dragonite2.pal b/src/gfx/cards/dragonite2.pal
deleted file mode 100644
index 1313288..0000000
Binary files a/src/gfx/cards/dragonite2.pal and /dev/null differ
diff --git a/src/gfx/cards/dragonite2.png b/src/gfx/cards/dragonite2.png
new file mode 100644
index 0000000..8ba22a7
Binary files /dev/null and b/src/gfx/cards/dragonite2.png differ
diff --git a/src/gfx/cards/dratini.8x6.png b/src/gfx/cards/dratini.8x6.png
deleted file mode 100644
index 1c66ac3..0000000
Binary files a/src/gfx/cards/dratini.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/dratini.pal b/src/gfx/cards/dratini.pal
deleted file mode 100644
index 8cb1478..0000000
Binary files a/src/gfx/cards/dratini.pal and /dev/null differ
diff --git a/src/gfx/cards/dratini.png b/src/gfx/cards/dratini.png
new file mode 100644
index 0000000..77aaa63
Binary files /dev/null and b/src/gfx/cards/dratini.png differ
diff --git a/src/gfx/cards/drowzee.8x6.png b/src/gfx/cards/drowzee.8x6.png
deleted file mode 100644
index 3239903..0000000
Binary files a/src/gfx/cards/drowzee.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/drowzee.pal b/src/gfx/cards/drowzee.pal
deleted file mode 100644
index e1ac5f8..0000000
Binary files a/src/gfx/cards/drowzee.pal and /dev/null differ
diff --git a/src/gfx/cards/drowzee.png b/src/gfx/cards/drowzee.png
new file mode 100644
index 0000000..ee65440
Binary files /dev/null and b/src/gfx/cards/drowzee.png differ
diff --git a/src/gfx/cards/dugtrio.8x6.png b/src/gfx/cards/dugtrio.8x6.png
deleted file mode 100644
index bffe640..0000000
Binary files a/src/gfx/cards/dugtrio.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/dugtrio.pal b/src/gfx/cards/dugtrio.pal
deleted file mode 100644
index 6d8c3d2..0000000
Binary files a/src/gfx/cards/dugtrio.pal and /dev/null differ
diff --git a/src/gfx/cards/dugtrio.png b/src/gfx/cards/dugtrio.png
new file mode 100644
index 0000000..41d93d6
Binary files /dev/null and b/src/gfx/cards/dugtrio.png differ
diff --git a/src/gfx/cards/eevee.8x6.png b/src/gfx/cards/eevee.8x6.png
deleted file mode 100644
index 3114928..0000000
Binary files a/src/gfx/cards/eevee.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/eevee.pal b/src/gfx/cards/eevee.pal
deleted file mode 100644
index 0cf883c..0000000
Binary files a/src/gfx/cards/eevee.pal and /dev/null differ
diff --git a/src/gfx/cards/eevee.png b/src/gfx/cards/eevee.png
new file mode 100644
index 0000000..534ed3d
Binary files /dev/null and b/src/gfx/cards/eevee.png differ
diff --git a/src/gfx/cards/ekans.8x6.png b/src/gfx/cards/ekans.8x6.png
deleted file mode 100644
index 416e073..0000000
Binary files a/src/gfx/cards/ekans.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/ekans.pal b/src/gfx/cards/ekans.pal
deleted file mode 100644
index 73f6a7c..0000000
Binary files a/src/gfx/cards/ekans.pal and /dev/null differ
diff --git a/src/gfx/cards/ekans.png b/src/gfx/cards/ekans.png
new file mode 100644
index 0000000..16b6be7
Binary files /dev/null and b/src/gfx/cards/ekans.png differ
diff --git a/src/gfx/cards/electabuzz1.8x6.png b/src/gfx/cards/electabuzz1.8x6.png
deleted file mode 100644
index 75ed8f5..0000000
Binary files a/src/gfx/cards/electabuzz1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/electabuzz1.pal b/src/gfx/cards/electabuzz1.pal
deleted file mode 100644
index eab69c6..0000000
Binary files a/src/gfx/cards/electabuzz1.pal and /dev/null differ
diff --git a/src/gfx/cards/electabuzz1.png b/src/gfx/cards/electabuzz1.png
new file mode 100644
index 0000000..c6b6711
Binary files /dev/null and b/src/gfx/cards/electabuzz1.png differ
diff --git a/src/gfx/cards/electabuzz2.8x6.png b/src/gfx/cards/electabuzz2.8x6.png
deleted file mode 100644
index 8ca64a8..0000000
Binary files a/src/gfx/cards/electabuzz2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/electabuzz2.pal b/src/gfx/cards/electabuzz2.pal
deleted file mode 100644
index c4110cb..0000000
Binary files a/src/gfx/cards/electabuzz2.pal and /dev/null differ
diff --git a/src/gfx/cards/electabuzz2.png b/src/gfx/cards/electabuzz2.png
new file mode 100644
index 0000000..84a0067
Binary files /dev/null and b/src/gfx/cards/electabuzz2.png differ
diff --git a/src/gfx/cards/electrode1.8x6.png b/src/gfx/cards/electrode1.8x6.png
deleted file mode 100644
index cdc1fca..0000000
Binary files a/src/gfx/cards/electrode1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/electrode1.pal b/src/gfx/cards/electrode1.pal
deleted file mode 100644
index 09074fa..0000000
Binary files a/src/gfx/cards/electrode1.pal and /dev/null differ
diff --git a/src/gfx/cards/electrode1.png b/src/gfx/cards/electrode1.png
new file mode 100644
index 0000000..2c3c67a
Binary files /dev/null and b/src/gfx/cards/electrode1.png differ
diff --git a/src/gfx/cards/electrode2.8x6.png b/src/gfx/cards/electrode2.8x6.png
deleted file mode 100644
index 29ccc8b..0000000
Binary files a/src/gfx/cards/electrode2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/electrode2.pal b/src/gfx/cards/electrode2.pal
deleted file mode 100644
index 7cb4fe9..0000000
Binary files a/src/gfx/cards/electrode2.pal and /dev/null differ
diff --git a/src/gfx/cards/electrode2.png b/src/gfx/cards/electrode2.png
new file mode 100644
index 0000000..10a6163
Binary files /dev/null and b/src/gfx/cards/electrode2.png differ
diff --git a/src/gfx/cards/energyremoval.8x6.png b/src/gfx/cards/energyremoval.8x6.png
deleted file mode 100644
index 1958df7..0000000
Binary files a/src/gfx/cards/energyremoval.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/energyremoval.pal b/src/gfx/cards/energyremoval.pal
deleted file mode 100644
index ce72955..0000000
Binary files a/src/gfx/cards/energyremoval.pal and /dev/null differ
diff --git a/src/gfx/cards/energyremoval.png b/src/gfx/cards/energyremoval.png
new file mode 100644
index 0000000..860d517
Binary files /dev/null and b/src/gfx/cards/energyremoval.png differ
diff --git a/src/gfx/cards/energyretrieval.8x6.png b/src/gfx/cards/energyretrieval.8x6.png
deleted file mode 100644
index 270f967..0000000
Binary files a/src/gfx/cards/energyretrieval.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/energyretrieval.pal b/src/gfx/cards/energyretrieval.pal
deleted file mode 100644
index 770704b..0000000
Binary files a/src/gfx/cards/energyretrieval.pal and /dev/null differ
diff --git a/src/gfx/cards/energyretrieval.png b/src/gfx/cards/energyretrieval.png
new file mode 100644
index 0000000..93154be
Binary files /dev/null and b/src/gfx/cards/energyretrieval.png differ
diff --git a/src/gfx/cards/energysearch.8x6.png b/src/gfx/cards/energysearch.8x6.png
deleted file mode 100644
index d5d5328..0000000
Binary files a/src/gfx/cards/energysearch.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/energysearch.pal b/src/gfx/cards/energysearch.pal
deleted file mode 100644
index a638ba4..0000000
Binary files a/src/gfx/cards/energysearch.pal and /dev/null differ
diff --git a/src/gfx/cards/energysearch.png b/src/gfx/cards/energysearch.png
new file mode 100644
index 0000000..0fe54fd
Binary files /dev/null and b/src/gfx/cards/energysearch.png differ
diff --git a/src/gfx/cards/exeggcute.8x6.png b/src/gfx/cards/exeggcute.8x6.png
deleted file mode 100644
index 585aa5d..0000000
Binary files a/src/gfx/cards/exeggcute.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/exeggcute.pal b/src/gfx/cards/exeggcute.pal
deleted file mode 100644
index b9cf4ad..0000000
--- a/src/gfx/cards/exeggcute.pal
+++ /dev/null
@@ -1 +0,0 @@
-_�U  
\ No newline at end of file
diff --git a/src/gfx/cards/exeggcute.png b/src/gfx/cards/exeggcute.png
new file mode 100644
index 0000000..1ae396f
Binary files /dev/null and b/src/gfx/cards/exeggcute.png differ
diff --git a/src/gfx/cards/exeggutor.8x6.png b/src/gfx/cards/exeggutor.8x6.png
deleted file mode 100644
index 6687638..0000000
Binary files a/src/gfx/cards/exeggutor.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/exeggutor.pal b/src/gfx/cards/exeggutor.pal
deleted file mode 100644
index 5296d43..0000000
Binary files a/src/gfx/cards/exeggutor.pal and /dev/null differ
diff --git a/src/gfx/cards/exeggutor.png b/src/gfx/cards/exeggutor.png
new file mode 100644
index 0000000..1403e38
Binary files /dev/null and b/src/gfx/cards/exeggutor.png differ
diff --git a/src/gfx/cards/farfetchd.8x6.png b/src/gfx/cards/farfetchd.8x6.png
deleted file mode 100644
index b156585..0000000
Binary files a/src/gfx/cards/farfetchd.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/farfetchd.pal b/src/gfx/cards/farfetchd.pal
deleted file mode 100644
index 2681635..0000000
Binary files a/src/gfx/cards/farfetchd.pal and /dev/null differ
diff --git a/src/gfx/cards/farfetchd.png b/src/gfx/cards/farfetchd.png
new file mode 100644
index 0000000..fc5d678
Binary files /dev/null and b/src/gfx/cards/farfetchd.png differ
diff --git a/src/gfx/cards/fearow.8x6.png b/src/gfx/cards/fearow.8x6.png
deleted file mode 100644
index 25f0d12..0000000
Binary files a/src/gfx/cards/fearow.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/fearow.pal b/src/gfx/cards/fearow.pal
deleted file mode 100644
index 5855ba7..0000000
Binary files a/src/gfx/cards/fearow.pal and /dev/null differ
diff --git a/src/gfx/cards/fearow.png b/src/gfx/cards/fearow.png
new file mode 100644
index 0000000..dbc9197
Binary files /dev/null and b/src/gfx/cards/fearow.png differ
diff --git a/src/gfx/cards/fightingenergy.8x6.png b/src/gfx/cards/fightingenergy.8x6.png
deleted file mode 100644
index 2c63c5b..0000000
Binary files a/src/gfx/cards/fightingenergy.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/fightingenergy.pal b/src/gfx/cards/fightingenergy.pal
deleted file mode 100644
index 8680b0c..0000000
Binary files a/src/gfx/cards/fightingenergy.pal and /dev/null differ
diff --git a/src/gfx/cards/fightingenergy.png b/src/gfx/cards/fightingenergy.png
new file mode 100644
index 0000000..ef50467
Binary files /dev/null and b/src/gfx/cards/fightingenergy.png differ
diff --git a/src/gfx/cards/fireenergy.8x6.png b/src/gfx/cards/fireenergy.8x6.png
deleted file mode 100644
index 2cb3419..0000000
Binary files a/src/gfx/cards/fireenergy.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/fireenergy.pal b/src/gfx/cards/fireenergy.pal
deleted file mode 100644
index 3cc39b1..0000000
Binary files a/src/gfx/cards/fireenergy.pal and /dev/null differ
diff --git a/src/gfx/cards/fireenergy.png b/src/gfx/cards/fireenergy.png
new file mode 100644
index 0000000..451dd4f
Binary files /dev/null and b/src/gfx/cards/fireenergy.png differ
diff --git a/src/gfx/cards/flareon1.8x6.png b/src/gfx/cards/flareon1.8x6.png
deleted file mode 100644
index eb5ebe3..0000000
Binary files a/src/gfx/cards/flareon1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/flareon1.pal b/src/gfx/cards/flareon1.pal
deleted file mode 100644
index 2c9594a..0000000
Binary files a/src/gfx/cards/flareon1.pal and /dev/null differ
diff --git a/src/gfx/cards/flareon1.png b/src/gfx/cards/flareon1.png
new file mode 100644
index 0000000..0faa467
Binary files /dev/null and b/src/gfx/cards/flareon1.png differ
diff --git a/src/gfx/cards/flareon2.8x6.png b/src/gfx/cards/flareon2.8x6.png
deleted file mode 100644
index 6c32566..0000000
Binary files a/src/gfx/cards/flareon2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/flareon2.pal b/src/gfx/cards/flareon2.pal
deleted file mode 100644
index 28c1b50..0000000
Binary files a/src/gfx/cards/flareon2.pal and /dev/null differ
diff --git a/src/gfx/cards/flareon2.png b/src/gfx/cards/flareon2.png
new file mode 100644
index 0000000..9e822ae
Binary files /dev/null and b/src/gfx/cards/flareon2.png differ
diff --git a/src/gfx/cards/flyingpikachu.8x6.png b/src/gfx/cards/flyingpikachu.8x6.png
deleted file mode 100644
index 14168a3..0000000
Binary files a/src/gfx/cards/flyingpikachu.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/flyingpikachu.pal b/src/gfx/cards/flyingpikachu.pal
deleted file mode 100644
index 00880ab..0000000
Binary files a/src/gfx/cards/flyingpikachu.pal and /dev/null differ
diff --git a/src/gfx/cards/flyingpikachu.png b/src/gfx/cards/flyingpikachu.png
new file mode 100644
index 0000000..155855d
Binary files /dev/null and b/src/gfx/cards/flyingpikachu.png differ
diff --git a/src/gfx/cards/fullheal.8x6.png b/src/gfx/cards/fullheal.8x6.png
deleted file mode 100644
index 281cc20..0000000
Binary files a/src/gfx/cards/fullheal.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/fullheal.pal b/src/gfx/cards/fullheal.pal
deleted file mode 100644
index 3a5a83c..0000000
Binary files a/src/gfx/cards/fullheal.pal and /dev/null differ
diff --git a/src/gfx/cards/fullheal.png b/src/gfx/cards/fullheal.png
new file mode 100644
index 0000000..d6a5c34
Binary files /dev/null and b/src/gfx/cards/fullheal.png differ
diff --git a/src/gfx/cards/gambler.8x6.png b/src/gfx/cards/gambler.8x6.png
deleted file mode 100644
index 1aeb1e3..0000000
Binary files a/src/gfx/cards/gambler.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/gambler.pal b/src/gfx/cards/gambler.pal
deleted file mode 100644
index 58f8ec9..0000000
Binary files a/src/gfx/cards/gambler.pal and /dev/null differ
diff --git a/src/gfx/cards/gambler.png b/src/gfx/cards/gambler.png
new file mode 100644
index 0000000..aa67e41
Binary files /dev/null and b/src/gfx/cards/gambler.png differ
diff --git a/src/gfx/cards/gastly1.8x6.png b/src/gfx/cards/gastly1.8x6.png
deleted file mode 100644
index 2a7bd88..0000000
Binary files a/src/gfx/cards/gastly1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/gastly1.pal b/src/gfx/cards/gastly1.pal
deleted file mode 100644
index 61e1ce3..0000000
Binary files a/src/gfx/cards/gastly1.pal and /dev/null differ
diff --git a/src/gfx/cards/gastly1.png b/src/gfx/cards/gastly1.png
new file mode 100644
index 0000000..4bac9e6
Binary files /dev/null and b/src/gfx/cards/gastly1.png differ
diff --git a/src/gfx/cards/gastly2.8x6.png b/src/gfx/cards/gastly2.8x6.png
deleted file mode 100644
index b9d56b2..0000000
Binary files a/src/gfx/cards/gastly2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/gastly2.pal b/src/gfx/cards/gastly2.pal
deleted file mode 100644
index ce711a8..0000000
--- a/src/gfx/cards/gastly2.pal
+++ /dev/null
@@ -1 +0,0 @@
-��0
\ No newline at end of file
diff --git a/src/gfx/cards/gastly2.png b/src/gfx/cards/gastly2.png
new file mode 100644
index 0000000..06d393f
Binary files /dev/null and b/src/gfx/cards/gastly2.png differ
diff --git a/src/gfx/cards/gengar.8x6.png b/src/gfx/cards/gengar.8x6.png
deleted file mode 100644
index 53d9bf9..0000000
Binary files a/src/gfx/cards/gengar.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/gengar.pal b/src/gfx/cards/gengar.pal
deleted file mode 100644
index 42817c1..0000000
--- a/src/gfx/cards/gengar.pal
+++ /dev/null
@@ -1 +0,0 @@
-_ �T
\ No newline at end of file
diff --git a/src/gfx/cards/gengar.png b/src/gfx/cards/gengar.png
new file mode 100644
index 0000000..74026d0
Binary files /dev/null and b/src/gfx/cards/gengar.png differ
diff --git a/src/gfx/cards/geodude.8x6.png b/src/gfx/cards/geodude.8x6.png
deleted file mode 100644
index 1c5a0fb..0000000
Binary files a/src/gfx/cards/geodude.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/geodude.pal b/src/gfx/cards/geodude.pal
deleted file mode 100644
index f4ca2f0..0000000
Binary files a/src/gfx/cards/geodude.pal and /dev/null differ
diff --git a/src/gfx/cards/geodude.png b/src/gfx/cards/geodude.png
new file mode 100644
index 0000000..5d7c9eb
Binary files /dev/null and b/src/gfx/cards/geodude.png differ
diff --git a/src/gfx/cards/gloom.8x6.png b/src/gfx/cards/gloom.8x6.png
deleted file mode 100644
index 973001b..0000000
Binary files a/src/gfx/cards/gloom.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/gloom.pal b/src/gfx/cards/gloom.pal
deleted file mode 100644
index c10860d..0000000
Binary files a/src/gfx/cards/gloom.pal and /dev/null differ
diff --git a/src/gfx/cards/gloom.png b/src/gfx/cards/gloom.png
new file mode 100644
index 0000000..e306d98
Binary files /dev/null and b/src/gfx/cards/gloom.png differ
diff --git a/src/gfx/cards/golbat.8x6.png b/src/gfx/cards/golbat.8x6.png
deleted file mode 100644
index 342b48c..0000000
Binary files a/src/gfx/cards/golbat.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/golbat.pal b/src/gfx/cards/golbat.pal
deleted file mode 100644
index 4d58109..0000000
Binary files a/src/gfx/cards/golbat.pal and /dev/null differ
diff --git a/src/gfx/cards/golbat.png b/src/gfx/cards/golbat.png
new file mode 100644
index 0000000..239d662
Binary files /dev/null and b/src/gfx/cards/golbat.png differ
diff --git a/src/gfx/cards/goldeen.8x6.png b/src/gfx/cards/goldeen.8x6.png
deleted file mode 100644
index 8427b7b..0000000
Binary files a/src/gfx/cards/goldeen.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/goldeen.pal b/src/gfx/cards/goldeen.pal
deleted file mode 100644
index 5cab2b8..0000000
Binary files a/src/gfx/cards/goldeen.pal and /dev/null differ
diff --git a/src/gfx/cards/goldeen.png b/src/gfx/cards/goldeen.png
new file mode 100644
index 0000000..93bc336
Binary files /dev/null and b/src/gfx/cards/goldeen.png differ
diff --git a/src/gfx/cards/golduck.8x6.png b/src/gfx/cards/golduck.8x6.png
deleted file mode 100644
index cdbdf51..0000000
Binary files a/src/gfx/cards/golduck.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/golduck.pal b/src/gfx/cards/golduck.pal
deleted file mode 100644
index 45e3791..0000000
Binary files a/src/gfx/cards/golduck.pal and /dev/null differ
diff --git a/src/gfx/cards/golduck.png b/src/gfx/cards/golduck.png
new file mode 100644
index 0000000..ab6e83f
Binary files /dev/null and b/src/gfx/cards/golduck.png differ
diff --git a/src/gfx/cards/golem.8x6.png b/src/gfx/cards/golem.8x6.png
deleted file mode 100644
index e64b911..0000000
Binary files a/src/gfx/cards/golem.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/golem.pal b/src/gfx/cards/golem.pal
deleted file mode 100644
index c0ec481..0000000
Binary files a/src/gfx/cards/golem.pal and /dev/null differ
diff --git a/src/gfx/cards/golem.png b/src/gfx/cards/golem.png
new file mode 100644
index 0000000..cffba36
Binary files /dev/null and b/src/gfx/cards/golem.png differ
diff --git a/src/gfx/cards/grassenergy.8x6.png b/src/gfx/cards/grassenergy.8x6.png
deleted file mode 100644
index 5cc6b30..0000000
Binary files a/src/gfx/cards/grassenergy.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/grassenergy.pal b/src/gfx/cards/grassenergy.pal
deleted file mode 100644
index e4d0aaa..0000000
Binary files a/src/gfx/cards/grassenergy.pal and /dev/null differ
diff --git a/src/gfx/cards/grassenergy.png b/src/gfx/cards/grassenergy.png
new file mode 100644
index 0000000..e76556f
Binary files /dev/null and b/src/gfx/cards/grassenergy.png differ
diff --git a/src/gfx/cards/graveler.8x6.png b/src/gfx/cards/graveler.8x6.png
deleted file mode 100644
index 13a8892..0000000
Binary files a/src/gfx/cards/graveler.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/graveler.pal b/src/gfx/cards/graveler.pal
deleted file mode 100644
index 50d56dc..0000000
Binary files a/src/gfx/cards/graveler.pal and /dev/null differ
diff --git a/src/gfx/cards/graveler.png b/src/gfx/cards/graveler.png
new file mode 100644
index 0000000..0d83998
Binary files /dev/null and b/src/gfx/cards/graveler.png differ
diff --git a/src/gfx/cards/grimer.8x6.png b/src/gfx/cards/grimer.8x6.png
deleted file mode 100644
index 19a6737..0000000
Binary files a/src/gfx/cards/grimer.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/grimer.pal b/src/gfx/cards/grimer.pal
deleted file mode 100644
index 7a5c4d1..0000000
Binary files a/src/gfx/cards/grimer.pal and /dev/null differ
diff --git a/src/gfx/cards/grimer.png b/src/gfx/cards/grimer.png
new file mode 100644
index 0000000..19d3cbb
Binary files /dev/null and b/src/gfx/cards/grimer.png differ
diff --git a/src/gfx/cards/growlithe.8x6.png b/src/gfx/cards/growlithe.8x6.png
deleted file mode 100644
index 76ce33c..0000000
Binary files a/src/gfx/cards/growlithe.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/growlithe.pal b/src/gfx/cards/growlithe.pal
deleted file mode 100644
index 6d8c3d2..0000000
Binary files a/src/gfx/cards/growlithe.pal and /dev/null differ
diff --git a/src/gfx/cards/growlithe.png b/src/gfx/cards/growlithe.png
new file mode 100644
index 0000000..293020a
Binary files /dev/null and b/src/gfx/cards/growlithe.png differ
diff --git a/src/gfx/cards/gustofwind.8x6.png b/src/gfx/cards/gustofwind.8x6.png
deleted file mode 100644
index 70de29d..0000000
Binary files a/src/gfx/cards/gustofwind.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/gustofwind.pal b/src/gfx/cards/gustofwind.pal
deleted file mode 100644
index 343e078..0000000
--- a/src/gfx/cards/gustofwind.pal
+++ /dev/null
@@ -1 +0,0 @@
-_k�!�@
\ No newline at end of file
diff --git a/src/gfx/cards/gustofwind.png b/src/gfx/cards/gustofwind.png
new file mode 100644
index 0000000..4d6e073
Binary files /dev/null and b/src/gfx/cards/gustofwind.png differ
diff --git a/src/gfx/cards/gyarados.8x6.png b/src/gfx/cards/gyarados.8x6.png
deleted file mode 100644
index 20c5dac..0000000
Binary files a/src/gfx/cards/gyarados.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/gyarados.pal b/src/gfx/cards/gyarados.pal
deleted file mode 100644
index dd1984c..0000000
--- a/src/gfx/cards/gyarados.pal
+++ /dev/null
@@ -1 +0,0 @@
-�kH�A�
\ No newline at end of file
diff --git a/src/gfx/cards/gyarados.png b/src/gfx/cards/gyarados.png
new file mode 100644
index 0000000..7f5b645
Binary files /dev/null and b/src/gfx/cards/gyarados.png differ
diff --git a/src/gfx/cards/haunter1.8x6.png b/src/gfx/cards/haunter1.8x6.png
deleted file mode 100644
index 1dc1869..0000000
Binary files a/src/gfx/cards/haunter1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/haunter1.pal b/src/gfx/cards/haunter1.pal
deleted file mode 100644
index f3af7c0..0000000
--- a/src/gfx/cards/haunter1.pal
+++ /dev/null
@@ -1 +0,0 @@
-_U 
\ No newline at end of file
diff --git a/src/gfx/cards/haunter1.png b/src/gfx/cards/haunter1.png
new file mode 100644
index 0000000..afef947
Binary files /dev/null and b/src/gfx/cards/haunter1.png differ
diff --git a/src/gfx/cards/haunter2.8x6.png b/src/gfx/cards/haunter2.8x6.png
deleted file mode 100644
index ffb76a2..0000000
Binary files a/src/gfx/cards/haunter2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/haunter2.pal b/src/gfx/cards/haunter2.pal
deleted file mode 100644
index 09ac25b..0000000
Binary files a/src/gfx/cards/haunter2.pal and /dev/null differ
diff --git a/src/gfx/cards/haunter2.png b/src/gfx/cards/haunter2.png
new file mode 100644
index 0000000..cb68e59
Binary files /dev/null and b/src/gfx/cards/haunter2.png differ
diff --git a/src/gfx/cards/hitmonchan.8x6.png b/src/gfx/cards/hitmonchan.8x6.png
deleted file mode 100644
index e9869ac..0000000
Binary files a/src/gfx/cards/hitmonchan.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/hitmonchan.pal b/src/gfx/cards/hitmonchan.pal
deleted file mode 100644
index 60ce3d0..0000000
Binary files a/src/gfx/cards/hitmonchan.pal and /dev/null differ
diff --git a/src/gfx/cards/hitmonchan.png b/src/gfx/cards/hitmonchan.png
new file mode 100644
index 0000000..2828e3f
Binary files /dev/null and b/src/gfx/cards/hitmonchan.png differ
diff --git a/src/gfx/cards/hitmonlee.8x6.png b/src/gfx/cards/hitmonlee.8x6.png
deleted file mode 100644
index e67fe78..0000000
Binary files a/src/gfx/cards/hitmonlee.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/hitmonlee.pal b/src/gfx/cards/hitmonlee.pal
deleted file mode 100644
index 857d807..0000000
Binary files a/src/gfx/cards/hitmonlee.pal and /dev/null differ
diff --git a/src/gfx/cards/hitmonlee.png b/src/gfx/cards/hitmonlee.png
new file mode 100644
index 0000000..6a40b93
Binary files /dev/null and b/src/gfx/cards/hitmonlee.png differ
diff --git a/src/gfx/cards/horsea.8x6.png b/src/gfx/cards/horsea.8x6.png
deleted file mode 100644
index 19a95d8..0000000
Binary files a/src/gfx/cards/horsea.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/horsea.pal b/src/gfx/cards/horsea.pal
deleted file mode 100644
index 3dbe59a..0000000
Binary files a/src/gfx/cards/horsea.pal and /dev/null differ
diff --git a/src/gfx/cards/horsea.png b/src/gfx/cards/horsea.png
new file mode 100644
index 0000000..43116fe
Binary files /dev/null and b/src/gfx/cards/horsea.png differ
diff --git a/src/gfx/cards/hypno.8x6.png b/src/gfx/cards/hypno.8x6.png
deleted file mode 100644
index e58a6c2..0000000
Binary files a/src/gfx/cards/hypno.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/hypno.pal b/src/gfx/cards/hypno.pal
deleted file mode 100644
index c6f4cdd..0000000
Binary files a/src/gfx/cards/hypno.pal and /dev/null differ
diff --git a/src/gfx/cards/hypno.png b/src/gfx/cards/hypno.png
new file mode 100644
index 0000000..22b1dfa
Binary files /dev/null and b/src/gfx/cards/hypno.png differ
diff --git a/src/gfx/cards/imakuni.8x6.png b/src/gfx/cards/imakuni.8x6.png
deleted file mode 100644
index ff95e64..0000000
Binary files a/src/gfx/cards/imakuni.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/imakuni.pal b/src/gfx/cards/imakuni.pal
deleted file mode 100644
index f9c9e88..0000000
Binary files a/src/gfx/cards/imakuni.pal and /dev/null differ
diff --git a/src/gfx/cards/imakuni.png b/src/gfx/cards/imakuni.png
new file mode 100644
index 0000000..ce74375
Binary files /dev/null and b/src/gfx/cards/imakuni.png differ
diff --git a/src/gfx/cards/imposterprofessoroak.8x6.png b/src/gfx/cards/imposterprofessoroak.8x6.png
deleted file mode 100644
index 2f78301..0000000
Binary files a/src/gfx/cards/imposterprofessoroak.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/imposterprofessoroak.pal b/src/gfx/cards/imposterprofessoroak.pal
deleted file mode 100644
index 4fdad0f..0000000
Binary files a/src/gfx/cards/imposterprofessoroak.pal and /dev/null differ
diff --git a/src/gfx/cards/imposterprofessoroak.png b/src/gfx/cards/imposterprofessoroak.png
new file mode 100644
index 0000000..88bfb1c
Binary files /dev/null and b/src/gfx/cards/imposterprofessoroak.png differ
diff --git a/src/gfx/cards/itemfinder.8x6.png b/src/gfx/cards/itemfinder.8x6.png
deleted file mode 100644
index 3ba1499..0000000
Binary files a/src/gfx/cards/itemfinder.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/itemfinder.pal b/src/gfx/cards/itemfinder.pal
deleted file mode 100644
index 763c960..0000000
Binary files a/src/gfx/cards/itemfinder.pal and /dev/null differ
diff --git a/src/gfx/cards/itemfinder.png b/src/gfx/cards/itemfinder.png
new file mode 100644
index 0000000..48bee2e
Binary files /dev/null and b/src/gfx/cards/itemfinder.png differ
diff --git a/src/gfx/cards/ivysaur.8x6.png b/src/gfx/cards/ivysaur.8x6.png
deleted file mode 100644
index 4220b52..0000000
Binary files a/src/gfx/cards/ivysaur.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/ivysaur.pal b/src/gfx/cards/ivysaur.pal
deleted file mode 100644
index 4bf4f92..0000000
Binary files a/src/gfx/cards/ivysaur.pal and /dev/null differ
diff --git a/src/gfx/cards/ivysaur.png b/src/gfx/cards/ivysaur.png
new file mode 100644
index 0000000..64d7d4f
Binary files /dev/null and b/src/gfx/cards/ivysaur.png differ
diff --git a/src/gfx/cards/jigglypuff1.8x6.png b/src/gfx/cards/jigglypuff1.8x6.png
deleted file mode 100644
index 0986137..0000000
Binary files a/src/gfx/cards/jigglypuff1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/jigglypuff1.pal b/src/gfx/cards/jigglypuff1.pal
deleted file mode 100644
index 6a8a81a..0000000
--- a/src/gfx/cards/jigglypuff1.pal
+++ /dev/null
@@ -1 +0,0 @@
-��i�2
\ No newline at end of file
diff --git a/src/gfx/cards/jigglypuff1.png b/src/gfx/cards/jigglypuff1.png
new file mode 100644
index 0000000..4c1ae0a
Binary files /dev/null and b/src/gfx/cards/jigglypuff1.png differ
diff --git a/src/gfx/cards/jigglypuff2.8x6.png b/src/gfx/cards/jigglypuff2.8x6.png
deleted file mode 100644
index 8fb626e..0000000
Binary files a/src/gfx/cards/jigglypuff2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/jigglypuff2.pal b/src/gfx/cards/jigglypuff2.pal
deleted file mode 100644
index 147ab62..0000000
Binary files a/src/gfx/cards/jigglypuff2.pal and /dev/null differ
diff --git a/src/gfx/cards/jigglypuff2.png b/src/gfx/cards/jigglypuff2.png
new file mode 100644
index 0000000..a94cba9
Binary files /dev/null and b/src/gfx/cards/jigglypuff2.png differ
diff --git a/src/gfx/cards/jigglypuff3.8x6.png b/src/gfx/cards/jigglypuff3.8x6.png
deleted file mode 100644
index b67b5ba..0000000
Binary files a/src/gfx/cards/jigglypuff3.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/jigglypuff3.pal b/src/gfx/cards/jigglypuff3.pal
deleted file mode 100644
index f7ef5d5..0000000
--- a/src/gfx/cards/jigglypuff3.pal
+++ /dev/null
@@ -1 +0,0 @@
-��0D#
\ No newline at end of file
diff --git a/src/gfx/cards/jigglypuff3.png b/src/gfx/cards/jigglypuff3.png
new file mode 100644
index 0000000..a7e8e54
Binary files /dev/null and b/src/gfx/cards/jigglypuff3.png differ
diff --git a/src/gfx/cards/jolteon1.8x6.png b/src/gfx/cards/jolteon1.8x6.png
deleted file mode 100644
index 81d403b..0000000
Binary files a/src/gfx/cards/jolteon1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/jolteon1.pal b/src/gfx/cards/jolteon1.pal
deleted file mode 100644
index d88630e..0000000
Binary files a/src/gfx/cards/jolteon1.pal and /dev/null differ
diff --git a/src/gfx/cards/jolteon1.png b/src/gfx/cards/jolteon1.png
new file mode 100644
index 0000000..2af9377
Binary files /dev/null and b/src/gfx/cards/jolteon1.png differ
diff --git a/src/gfx/cards/jolteon2.8x6.png b/src/gfx/cards/jolteon2.8x6.png
deleted file mode 100644
index 308966c..0000000
Binary files a/src/gfx/cards/jolteon2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/jolteon2.pal b/src/gfx/cards/jolteon2.pal
deleted file mode 100644
index 2b1bea1..0000000
Binary files a/src/gfx/cards/jolteon2.pal and /dev/null differ
diff --git a/src/gfx/cards/jolteon2.png b/src/gfx/cards/jolteon2.png
new file mode 100644
index 0000000..5a40770
Binary files /dev/null and b/src/gfx/cards/jolteon2.png differ
diff --git a/src/gfx/cards/jynx.8x6.png b/src/gfx/cards/jynx.8x6.png
deleted file mode 100644
index 048ae21..0000000
Binary files a/src/gfx/cards/jynx.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/jynx.pal b/src/gfx/cards/jynx.pal
deleted file mode 100644
index 4992e3c..0000000
Binary files a/src/gfx/cards/jynx.pal and /dev/null differ
diff --git a/src/gfx/cards/jynx.png b/src/gfx/cards/jynx.png
new file mode 100644
index 0000000..93a71f0
Binary files /dev/null and b/src/gfx/cards/jynx.png differ
diff --git a/src/gfx/cards/kabuto.8x6.png b/src/gfx/cards/kabuto.8x6.png
deleted file mode 100644
index 3ebcaf7..0000000
Binary files a/src/gfx/cards/kabuto.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/kabuto.pal b/src/gfx/cards/kabuto.pal
deleted file mode 100644
index f26725b..0000000
Binary files a/src/gfx/cards/kabuto.pal and /dev/null differ
diff --git a/src/gfx/cards/kabuto.png b/src/gfx/cards/kabuto.png
new file mode 100644
index 0000000..86ed76b
Binary files /dev/null and b/src/gfx/cards/kabuto.png differ
diff --git a/src/gfx/cards/kabutops.8x6.png b/src/gfx/cards/kabutops.8x6.png
deleted file mode 100644
index 4efff6b..0000000
Binary files a/src/gfx/cards/kabutops.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/kabutops.pal b/src/gfx/cards/kabutops.pal
deleted file mode 100644
index 44fd608..0000000
Binary files a/src/gfx/cards/kabutops.pal and /dev/null differ
diff --git a/src/gfx/cards/kabutops.png b/src/gfx/cards/kabutops.png
new file mode 100644
index 0000000..e16d426
Binary files /dev/null and b/src/gfx/cards/kabutops.png differ
diff --git a/src/gfx/cards/kadabra.8x6.png b/src/gfx/cards/kadabra.8x6.png
deleted file mode 100644
index fe66443..0000000
Binary files a/src/gfx/cards/kadabra.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/kadabra.pal b/src/gfx/cards/kadabra.pal
deleted file mode 100644
index 6b874e3..0000000
Binary files a/src/gfx/cards/kadabra.pal and /dev/null differ
diff --git a/src/gfx/cards/kadabra.png b/src/gfx/cards/kadabra.png
new file mode 100644
index 0000000..350ab8a
Binary files /dev/null and b/src/gfx/cards/kadabra.png differ
diff --git a/src/gfx/cards/kakuna.8x6.png b/src/gfx/cards/kakuna.8x6.png
deleted file mode 100644
index 9739a1b..0000000
Binary files a/src/gfx/cards/kakuna.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/kakuna.pal b/src/gfx/cards/kakuna.pal
deleted file mode 100644
index 743ac9f..0000000
Binary files a/src/gfx/cards/kakuna.pal and /dev/null differ
diff --git a/src/gfx/cards/kakuna.png b/src/gfx/cards/kakuna.png
new file mode 100644
index 0000000..e185ef6
Binary files /dev/null and b/src/gfx/cards/kakuna.png differ
diff --git a/src/gfx/cards/kangaskhan.8x6.png b/src/gfx/cards/kangaskhan.8x6.png
deleted file mode 100644
index 192fba2..0000000
Binary files a/src/gfx/cards/kangaskhan.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/kangaskhan.pal b/src/gfx/cards/kangaskhan.pal
deleted file mode 100644
index 8a1f94c..0000000
Binary files a/src/gfx/cards/kangaskhan.pal and /dev/null differ
diff --git a/src/gfx/cards/kangaskhan.png b/src/gfx/cards/kangaskhan.png
new file mode 100644
index 0000000..c14b97e
Binary files /dev/null and b/src/gfx/cards/kangaskhan.png differ
diff --git a/src/gfx/cards/kingler.8x6.png b/src/gfx/cards/kingler.8x6.png
deleted file mode 100644
index 19966d9..0000000
Binary files a/src/gfx/cards/kingler.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/kingler.pal b/src/gfx/cards/kingler.pal
deleted file mode 100644
index 3b01628..0000000
Binary files a/src/gfx/cards/kingler.pal and /dev/null differ
diff --git a/src/gfx/cards/kingler.png b/src/gfx/cards/kingler.png
new file mode 100644
index 0000000..a90a4f9
Binary files /dev/null and b/src/gfx/cards/kingler.png differ
diff --git a/src/gfx/cards/koffing.8x6.png b/src/gfx/cards/koffing.8x6.png
deleted file mode 100644
index cda1a9d..0000000
Binary files a/src/gfx/cards/koffing.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/koffing.pal b/src/gfx/cards/koffing.pal
deleted file mode 100644
index e2f1b01..0000000
--- a/src/gfx/cards/koffing.pal
+++ /dev/null
@@ -1 +0,0 @@
-�3�U@
\ No newline at end of file
diff --git a/src/gfx/cards/koffing.png b/src/gfx/cards/koffing.png
new file mode 100644
index 0000000..eac4d34
Binary files /dev/null and b/src/gfx/cards/koffing.png differ
diff --git a/src/gfx/cards/krabby.8x6.png b/src/gfx/cards/krabby.8x6.png
deleted file mode 100644
index 5dda9a9..0000000
Binary files a/src/gfx/cards/krabby.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/krabby.pal b/src/gfx/cards/krabby.pal
deleted file mode 100644
index b521b6e..0000000
Binary files a/src/gfx/cards/krabby.pal and /dev/null differ
diff --git a/src/gfx/cards/krabby.png b/src/gfx/cards/krabby.png
new file mode 100644
index 0000000..a669a26
Binary files /dev/null and b/src/gfx/cards/krabby.png differ
diff --git a/src/gfx/cards/lapras.8x6.png b/src/gfx/cards/lapras.8x6.png
deleted file mode 100644
index 2212622..0000000
Binary files a/src/gfx/cards/lapras.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/lapras.pal b/src/gfx/cards/lapras.pal
deleted file mode 100644
index 096c79d..0000000
Binary files a/src/gfx/cards/lapras.pal and /dev/null differ
diff --git a/src/gfx/cards/lapras.png b/src/gfx/cards/lapras.png
new file mode 100644
index 0000000..7388e8c
Binary files /dev/null and b/src/gfx/cards/lapras.png differ
diff --git a/src/gfx/cards/lass.8x6.png b/src/gfx/cards/lass.8x6.png
deleted file mode 100644
index aad9f17..0000000
Binary files a/src/gfx/cards/lass.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/lass.pal b/src/gfx/cards/lass.pal
deleted file mode 100644
index fdbadf4..0000000
Binary files a/src/gfx/cards/lass.pal and /dev/null differ
diff --git a/src/gfx/cards/lass.png b/src/gfx/cards/lass.png
new file mode 100644
index 0000000..1c33c6f
Binary files /dev/null and b/src/gfx/cards/lass.png differ
diff --git a/src/gfx/cards/lickitung.8x6.png b/src/gfx/cards/lickitung.8x6.png
deleted file mode 100644
index 857e21a..0000000
Binary files a/src/gfx/cards/lickitung.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/lickitung.pal b/src/gfx/cards/lickitung.pal
deleted file mode 100644
index 8f9a149..0000000
Binary files a/src/gfx/cards/lickitung.pal and /dev/null differ
diff --git a/src/gfx/cards/lickitung.png b/src/gfx/cards/lickitung.png
new file mode 100644
index 0000000..0abc593
Binary files /dev/null and b/src/gfx/cards/lickitung.png differ
diff --git a/src/gfx/cards/lightningenergy.8x6.png b/src/gfx/cards/lightningenergy.8x6.png
deleted file mode 100644
index 3fdc83c..0000000
Binary files a/src/gfx/cards/lightningenergy.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/lightningenergy.pal b/src/gfx/cards/lightningenergy.pal
deleted file mode 100644
index fc96784..0000000
Binary files a/src/gfx/cards/lightningenergy.pal and /dev/null differ
diff --git a/src/gfx/cards/lightningenergy.png b/src/gfx/cards/lightningenergy.png
new file mode 100644
index 0000000..d4b627b
Binary files /dev/null and b/src/gfx/cards/lightningenergy.png differ
diff --git a/src/gfx/cards/machamp.8x6.png b/src/gfx/cards/machamp.8x6.png
deleted file mode 100644
index 55f52fb..0000000
Binary files a/src/gfx/cards/machamp.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/machamp.pal b/src/gfx/cards/machamp.pal
deleted file mode 100644
index a138a9a..0000000
--- a/src/gfx/cards/machamp.pal
+++ /dev/null
@@ -1 +0,0 @@
-��V�U�
\ No newline at end of file
diff --git a/src/gfx/cards/machamp.png b/src/gfx/cards/machamp.png
new file mode 100644
index 0000000..3f21a3b
Binary files /dev/null and b/src/gfx/cards/machamp.png differ
diff --git a/src/gfx/cards/machoke.8x6.png b/src/gfx/cards/machoke.8x6.png
deleted file mode 100644
index 943d13a..0000000
Binary files a/src/gfx/cards/machoke.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/machoke.pal b/src/gfx/cards/machoke.pal
deleted file mode 100644
index 948967d..0000000
Binary files a/src/gfx/cards/machoke.pal and /dev/null differ
diff --git a/src/gfx/cards/machoke.png b/src/gfx/cards/machoke.png
new file mode 100644
index 0000000..fe76d14
Binary files /dev/null and b/src/gfx/cards/machoke.png differ
diff --git a/src/gfx/cards/machop.8x6.png b/src/gfx/cards/machop.8x6.png
deleted file mode 100644
index 256a710..0000000
Binary files a/src/gfx/cards/machop.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/machop.pal b/src/gfx/cards/machop.pal
deleted file mode 100644
index 060094b..0000000
Binary files a/src/gfx/cards/machop.pal and /dev/null differ
diff --git a/src/gfx/cards/machop.png b/src/gfx/cards/machop.png
new file mode 100644
index 0000000..ab9d40c
Binary files /dev/null and b/src/gfx/cards/machop.png differ
diff --git a/src/gfx/cards/magikarp.8x6.png b/src/gfx/cards/magikarp.8x6.png
deleted file mode 100644
index 0f40b78..0000000
Binary files a/src/gfx/cards/magikarp.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/magikarp.pal b/src/gfx/cards/magikarp.pal
deleted file mode 100644
index 252df21..0000000
Binary files a/src/gfx/cards/magikarp.pal and /dev/null differ
diff --git a/src/gfx/cards/magikarp.png b/src/gfx/cards/magikarp.png
new file mode 100644
index 0000000..41d79af
Binary files /dev/null and b/src/gfx/cards/magikarp.png differ
diff --git a/src/gfx/cards/magmar1.8x6.png b/src/gfx/cards/magmar1.8x6.png
deleted file mode 100644
index 571bdc6..0000000
Binary files a/src/gfx/cards/magmar1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/magmar1.pal b/src/gfx/cards/magmar1.pal
deleted file mode 100644
index f201dfb..0000000
Binary files a/src/gfx/cards/magmar1.pal and /dev/null differ
diff --git a/src/gfx/cards/magmar1.png b/src/gfx/cards/magmar1.png
new file mode 100644
index 0000000..b24106b
Binary files /dev/null and b/src/gfx/cards/magmar1.png differ
diff --git a/src/gfx/cards/magmar2.8x6.png b/src/gfx/cards/magmar2.8x6.png
deleted file mode 100644
index 64cd043..0000000
Binary files a/src/gfx/cards/magmar2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/magmar2.pal b/src/gfx/cards/magmar2.pal
deleted file mode 100644
index 00ddb8f..0000000
Binary files a/src/gfx/cards/magmar2.pal and /dev/null differ
diff --git a/src/gfx/cards/magmar2.png b/src/gfx/cards/magmar2.png
new file mode 100644
index 0000000..7722142
Binary files /dev/null and b/src/gfx/cards/magmar2.png differ
diff --git a/src/gfx/cards/magnemite1.8x6.png b/src/gfx/cards/magnemite1.8x6.png
deleted file mode 100644
index d81dfb3..0000000
Binary files a/src/gfx/cards/magnemite1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/magnemite1.pal b/src/gfx/cards/magnemite1.pal
deleted file mode 100644
index 632ec88..0000000
Binary files a/src/gfx/cards/magnemite1.pal and /dev/null differ
diff --git a/src/gfx/cards/magnemite1.png b/src/gfx/cards/magnemite1.png
new file mode 100644
index 0000000..ff85f09
Binary files /dev/null and b/src/gfx/cards/magnemite1.png differ
diff --git a/src/gfx/cards/magnemite2.8x6.png b/src/gfx/cards/magnemite2.8x6.png
deleted file mode 100644
index 8cb3f4d..0000000
Binary files a/src/gfx/cards/magnemite2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/magnemite2.pal b/src/gfx/cards/magnemite2.pal
deleted file mode 100644
index 8b36fae..0000000
Binary files a/src/gfx/cards/magnemite2.pal and /dev/null differ
diff --git a/src/gfx/cards/magnemite2.png b/src/gfx/cards/magnemite2.png
new file mode 100644
index 0000000..c1b84e6
Binary files /dev/null and b/src/gfx/cards/magnemite2.png differ
diff --git a/src/gfx/cards/magneton1.8x6.png b/src/gfx/cards/magneton1.8x6.png
deleted file mode 100644
index efcc9f9..0000000
Binary files a/src/gfx/cards/magneton1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/magneton1.pal b/src/gfx/cards/magneton1.pal
deleted file mode 100644
index 632ec88..0000000
Binary files a/src/gfx/cards/magneton1.pal and /dev/null differ
diff --git a/src/gfx/cards/magneton1.png b/src/gfx/cards/magneton1.png
new file mode 100644
index 0000000..d555492
Binary files /dev/null and b/src/gfx/cards/magneton1.png differ
diff --git a/src/gfx/cards/magneton2.8x6.png b/src/gfx/cards/magneton2.8x6.png
deleted file mode 100644
index e20b2f4..0000000
Binary files a/src/gfx/cards/magneton2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/magneton2.pal b/src/gfx/cards/magneton2.pal
deleted file mode 100644
index 5b13617..0000000
--- a/src/gfx/cards/magneton2.pal
+++ /dev/null
@@ -1 +0,0 @@
-��B�
\ No newline at end of file
diff --git a/src/gfx/cards/magneton2.png b/src/gfx/cards/magneton2.png
new file mode 100644
index 0000000..77eebd7
Binary files /dev/null and b/src/gfx/cards/magneton2.png differ
diff --git a/src/gfx/cards/maintenance.8x6.png b/src/gfx/cards/maintenance.8x6.png
deleted file mode 100644
index 915487a..0000000
Binary files a/src/gfx/cards/maintenance.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/maintenance.pal b/src/gfx/cards/maintenance.pal
deleted file mode 100644
index fb3554f..0000000
Binary files a/src/gfx/cards/maintenance.pal and /dev/null differ
diff --git a/src/gfx/cards/maintenance.png b/src/gfx/cards/maintenance.png
new file mode 100644
index 0000000..dba26b4
Binary files /dev/null and b/src/gfx/cards/maintenance.png differ
diff --git a/src/gfx/cards/mankey.8x6.png b/src/gfx/cards/mankey.8x6.png
deleted file mode 100644
index 06b4ab3..0000000
Binary files a/src/gfx/cards/mankey.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/mankey.pal b/src/gfx/cards/mankey.pal
deleted file mode 100644
index f63660e..0000000
Binary files a/src/gfx/cards/mankey.pal and /dev/null differ
diff --git a/src/gfx/cards/mankey.png b/src/gfx/cards/mankey.png
new file mode 100644
index 0000000..74af8e1
Binary files /dev/null and b/src/gfx/cards/mankey.png differ
diff --git a/src/gfx/cards/marowak1.8x6.png b/src/gfx/cards/marowak1.8x6.png
deleted file mode 100644
index 10d6eca..0000000
Binary files a/src/gfx/cards/marowak1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/marowak1.pal b/src/gfx/cards/marowak1.pal
deleted file mode 100644
index 021cbd4..0000000
Binary files a/src/gfx/cards/marowak1.pal and /dev/null differ
diff --git a/src/gfx/cards/marowak1.png b/src/gfx/cards/marowak1.png
new file mode 100644
index 0000000..7926178
Binary files /dev/null and b/src/gfx/cards/marowak1.png differ
diff --git a/src/gfx/cards/marowak2.8x6.png b/src/gfx/cards/marowak2.8x6.png
deleted file mode 100644
index a7023bc..0000000
Binary files a/src/gfx/cards/marowak2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/marowak2.pal b/src/gfx/cards/marowak2.pal
deleted file mode 100644
index 05e97c9..0000000
Binary files a/src/gfx/cards/marowak2.pal and /dev/null differ
diff --git a/src/gfx/cards/marowak2.png b/src/gfx/cards/marowak2.png
new file mode 100644
index 0000000..ec924b6
Binary files /dev/null and b/src/gfx/cards/marowak2.png differ
diff --git a/src/gfx/cards/meowth1.8x6.png b/src/gfx/cards/meowth1.8x6.png
deleted file mode 100644
index 3225611..0000000
Binary files a/src/gfx/cards/meowth1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/meowth1.pal b/src/gfx/cards/meowth1.pal
deleted file mode 100644
index 1505390..0000000
Binary files a/src/gfx/cards/meowth1.pal and /dev/null differ
diff --git a/src/gfx/cards/meowth1.png b/src/gfx/cards/meowth1.png
new file mode 100644
index 0000000..80f502e
Binary files /dev/null and b/src/gfx/cards/meowth1.png differ
diff --git a/src/gfx/cards/meowth2.8x6.png b/src/gfx/cards/meowth2.8x6.png
deleted file mode 100644
index 6dd0c10..0000000
Binary files a/src/gfx/cards/meowth2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/meowth2.pal b/src/gfx/cards/meowth2.pal
deleted file mode 100644
index ae55a01..0000000
Binary files a/src/gfx/cards/meowth2.pal and /dev/null differ
diff --git a/src/gfx/cards/meowth2.png b/src/gfx/cards/meowth2.png
new file mode 100644
index 0000000..264ce17
Binary files /dev/null and b/src/gfx/cards/meowth2.png differ
diff --git a/src/gfx/cards/metapod.8x6.png b/src/gfx/cards/metapod.8x6.png
deleted file mode 100644
index 3c1df91..0000000
Binary files a/src/gfx/cards/metapod.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/metapod.pal b/src/gfx/cards/metapod.pal
deleted file mode 100644
index 51a1848..0000000
Binary files a/src/gfx/cards/metapod.pal and /dev/null differ
diff --git a/src/gfx/cards/metapod.png b/src/gfx/cards/metapod.png
new file mode 100644
index 0000000..3ab895a
Binary files /dev/null and b/src/gfx/cards/metapod.png differ
diff --git a/src/gfx/cards/mew1.8x6.png b/src/gfx/cards/mew1.8x6.png
deleted file mode 100644
index aa5e5d5..0000000
Binary files a/src/gfx/cards/mew1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/mew1.pal b/src/gfx/cards/mew1.pal
deleted file mode 100644
index 7fc106d..0000000
Binary files a/src/gfx/cards/mew1.pal and /dev/null differ
diff --git a/src/gfx/cards/mew1.png b/src/gfx/cards/mew1.png
new file mode 100644
index 0000000..983848f
Binary files /dev/null and b/src/gfx/cards/mew1.png differ
diff --git a/src/gfx/cards/mew2.8x6.png b/src/gfx/cards/mew2.8x6.png
deleted file mode 100644
index 8658006..0000000
Binary files a/src/gfx/cards/mew2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/mew2.pal b/src/gfx/cards/mew2.pal
deleted file mode 100644
index 81ae1e6..0000000
Binary files a/src/gfx/cards/mew2.pal and /dev/null differ
diff --git a/src/gfx/cards/mew2.png b/src/gfx/cards/mew2.png
new file mode 100644
index 0000000..a2106fb
Binary files /dev/null and b/src/gfx/cards/mew2.png differ
diff --git a/src/gfx/cards/mew3.8x6.png b/src/gfx/cards/mew3.8x6.png
deleted file mode 100644
index 189a97b..0000000
Binary files a/src/gfx/cards/mew3.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/mew3.pal b/src/gfx/cards/mew3.pal
deleted file mode 100644
index e2c6160..0000000
--- a/src/gfx/cards/mew3.pal
+++ /dev/null
@@ -1 +0,0 @@
-��UB
\ No newline at end of file
diff --git a/src/gfx/cards/mew3.png b/src/gfx/cards/mew3.png
new file mode 100644
index 0000000..476c1bc
Binary files /dev/null and b/src/gfx/cards/mew3.png differ
diff --git a/src/gfx/cards/mewtwo1.8x6.png b/src/gfx/cards/mewtwo1.8x6.png
deleted file mode 100644
index b5566c5..0000000
Binary files a/src/gfx/cards/mewtwo1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/mewtwo1.pal b/src/gfx/cards/mewtwo1.pal
deleted file mode 100644
index 5ae9d52..0000000
--- a/src/gfx/cards/mewtwo1.pal
+++ /dev/null
@@ -1 +0,0 @@
-�j�h 
\ No newline at end of file
diff --git a/src/gfx/cards/mewtwo1.png b/src/gfx/cards/mewtwo1.png
new file mode 100644
index 0000000..0200721
Binary files /dev/null and b/src/gfx/cards/mewtwo1.png differ
diff --git a/src/gfx/cards/mewtwo2.8x6.png b/src/gfx/cards/mewtwo2.8x6.png
deleted file mode 100644
index 9f36308..0000000
Binary files a/src/gfx/cards/mewtwo2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/mewtwo2.pal b/src/gfx/cards/mewtwo2.pal
deleted file mode 100644
index bde36b5..0000000
Binary files a/src/gfx/cards/mewtwo2.pal and /dev/null differ
diff --git a/src/gfx/cards/mewtwo2.png b/src/gfx/cards/mewtwo2.png
new file mode 100644
index 0000000..9ffefad
Binary files /dev/null and b/src/gfx/cards/mewtwo2.png differ
diff --git a/src/gfx/cards/mewtwo3.8x6.png b/src/gfx/cards/mewtwo3.8x6.png
deleted file mode 100644
index bbe8c6e..0000000
Binary files a/src/gfx/cards/mewtwo3.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/mewtwo3.pal b/src/gfx/cards/mewtwo3.pal
deleted file mode 100644
index d643585..0000000
Binary files a/src/gfx/cards/mewtwo3.pal and /dev/null differ
diff --git a/src/gfx/cards/mewtwo3.png b/src/gfx/cards/mewtwo3.png
new file mode 100644
index 0000000..18abd5c
Binary files /dev/null and b/src/gfx/cards/mewtwo3.png differ
diff --git a/src/gfx/cards/moltres1.8x6.png b/src/gfx/cards/moltres1.8x6.png
deleted file mode 100644
index cc867ea..0000000
Binary files a/src/gfx/cards/moltres1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/moltres1.pal b/src/gfx/cards/moltres1.pal
deleted file mode 100644
index 481d6d0..0000000
Binary files a/src/gfx/cards/moltres1.pal and /dev/null differ
diff --git a/src/gfx/cards/moltres1.png b/src/gfx/cards/moltres1.png
new file mode 100644
index 0000000..e12fe97
Binary files /dev/null and b/src/gfx/cards/moltres1.png differ
diff --git a/src/gfx/cards/moltres2.8x6.png b/src/gfx/cards/moltres2.8x6.png
deleted file mode 100644
index 220cbee..0000000
Binary files a/src/gfx/cards/moltres2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/moltres2.pal b/src/gfx/cards/moltres2.pal
deleted file mode 100644
index a60186f..0000000
Binary files a/src/gfx/cards/moltres2.pal and /dev/null differ
diff --git a/src/gfx/cards/moltres2.png b/src/gfx/cards/moltres2.png
new file mode 100644
index 0000000..5071ef4
Binary files /dev/null and b/src/gfx/cards/moltres2.png differ
diff --git a/src/gfx/cards/mrfuji.8x6.png b/src/gfx/cards/mrfuji.8x6.png
deleted file mode 100644
index f012d07..0000000
Binary files a/src/gfx/cards/mrfuji.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/mrfuji.pal b/src/gfx/cards/mrfuji.pal
deleted file mode 100644
index 7a0bbac..0000000
--- a/src/gfx/cards/mrfuji.pal
+++ /dev/null
@@ -1 +0,0 @@
-_W" 
\ No newline at end of file
diff --git a/src/gfx/cards/mrfuji.png b/src/gfx/cards/mrfuji.png
new file mode 100644
index 0000000..d1b37ae
Binary files /dev/null and b/src/gfx/cards/mrfuji.png differ
diff --git a/src/gfx/cards/mrmime.8x6.png b/src/gfx/cards/mrmime.8x6.png
deleted file mode 100644
index 2c16ea4..0000000
Binary files a/src/gfx/cards/mrmime.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/mrmime.pal b/src/gfx/cards/mrmime.pal
deleted file mode 100644
index 50495ae..0000000
Binary files a/src/gfx/cards/mrmime.pal and /dev/null differ
diff --git a/src/gfx/cards/mrmime.png b/src/gfx/cards/mrmime.png
new file mode 100644
index 0000000..42605aa
Binary files /dev/null and b/src/gfx/cards/mrmime.png differ
diff --git a/src/gfx/cards/muk.8x6.png b/src/gfx/cards/muk.8x6.png
deleted file mode 100644
index 972d445..0000000
Binary files a/src/gfx/cards/muk.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/muk.pal b/src/gfx/cards/muk.pal
deleted file mode 100644
index ed9a7d9..0000000
Binary files a/src/gfx/cards/muk.pal and /dev/null differ
diff --git a/src/gfx/cards/muk.png b/src/gfx/cards/muk.png
new file mode 100644
index 0000000..51893c1
Binary files /dev/null and b/src/gfx/cards/muk.png differ
diff --git a/src/gfx/cards/mysteriousfossil.8x6.png b/src/gfx/cards/mysteriousfossil.8x6.png
deleted file mode 100644
index 93752fc..0000000
Binary files a/src/gfx/cards/mysteriousfossil.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/mysteriousfossil.pal b/src/gfx/cards/mysteriousfossil.pal
deleted file mode 100644
index 0013d02..0000000
Binary files a/src/gfx/cards/mysteriousfossil.pal and /dev/null differ
diff --git a/src/gfx/cards/mysteriousfossil.png b/src/gfx/cards/mysteriousfossil.png
new file mode 100644
index 0000000..1226faa
Binary files /dev/null and b/src/gfx/cards/mysteriousfossil.png differ
diff --git a/src/gfx/cards/nidoking.8x6.png b/src/gfx/cards/nidoking.8x6.png
deleted file mode 100644
index eff3ccf..0000000
Binary files a/src/gfx/cards/nidoking.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/nidoking.pal b/src/gfx/cards/nidoking.pal
deleted file mode 100644
index a58a343..0000000
--- a/src/gfx/cards/nidoking.pal
+++ /dev/null
@@ -1 +0,0 @@
-��iU 
\ No newline at end of file
diff --git a/src/gfx/cards/nidoking.png b/src/gfx/cards/nidoking.png
new file mode 100644
index 0000000..2e6f08a
Binary files /dev/null and b/src/gfx/cards/nidoking.png differ
diff --git a/src/gfx/cards/nidoqueen.8x6.png b/src/gfx/cards/nidoqueen.8x6.png
deleted file mode 100644
index 5c67daa..0000000
Binary files a/src/gfx/cards/nidoqueen.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/nidoqueen.pal b/src/gfx/cards/nidoqueen.pal
deleted file mode 100644
index fc2202a..0000000
Binary files a/src/gfx/cards/nidoqueen.pal and /dev/null differ
diff --git a/src/gfx/cards/nidoqueen.png b/src/gfx/cards/nidoqueen.png
new file mode 100644
index 0000000..383bbe7
Binary files /dev/null and b/src/gfx/cards/nidoqueen.png differ
diff --git a/src/gfx/cards/nidoranf.8x6.png b/src/gfx/cards/nidoranf.8x6.png
deleted file mode 100644
index 17de19e..0000000
Binary files a/src/gfx/cards/nidoranf.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/nidoranf.pal b/src/gfx/cards/nidoranf.pal
deleted file mode 100644
index e2209b7..0000000
Binary files a/src/gfx/cards/nidoranf.pal and /dev/null differ
diff --git a/src/gfx/cards/nidoranf.png b/src/gfx/cards/nidoranf.png
new file mode 100644
index 0000000..f859596
Binary files /dev/null and b/src/gfx/cards/nidoranf.png differ
diff --git a/src/gfx/cards/nidoranm.8x6.png b/src/gfx/cards/nidoranm.8x6.png
deleted file mode 100644
index 00718d9..0000000
Binary files a/src/gfx/cards/nidoranm.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/nidoranm.pal b/src/gfx/cards/nidoranm.pal
deleted file mode 100644
index b8f783c..0000000
--- a/src/gfx/cards/nidoranm.pal
+++ /dev/null
@@ -1 +0,0 @@
-_k�U�0 
\ No newline at end of file
diff --git a/src/gfx/cards/nidoranm.png b/src/gfx/cards/nidoranm.png
new file mode 100644
index 0000000..bbb304b
Binary files /dev/null and b/src/gfx/cards/nidoranm.png differ
diff --git a/src/gfx/cards/nidorina.8x6.png b/src/gfx/cards/nidorina.8x6.png
deleted file mode 100644
index c879610..0000000
Binary files a/src/gfx/cards/nidorina.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/nidorina.pal b/src/gfx/cards/nidorina.pal
deleted file mode 100644
index cd74af4..0000000
Binary files a/src/gfx/cards/nidorina.pal and /dev/null differ
diff --git a/src/gfx/cards/nidorina.png b/src/gfx/cards/nidorina.png
new file mode 100644
index 0000000..939e887
Binary files /dev/null and b/src/gfx/cards/nidorina.png differ
diff --git a/src/gfx/cards/nidorino.8x6.png b/src/gfx/cards/nidorino.8x6.png
deleted file mode 100644
index 65f851c..0000000
Binary files a/src/gfx/cards/nidorino.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/nidorino.pal b/src/gfx/cards/nidorino.pal
deleted file mode 100644
index 8310b61..0000000
--- a/src/gfx/cards/nidorino.pal
+++ /dev/null
@@ -1 +0,0 @@
-_kVA 
\ No newline at end of file
diff --git a/src/gfx/cards/nidorino.png b/src/gfx/cards/nidorino.png
new file mode 100644
index 0000000..d9bc6ca
Binary files /dev/null and b/src/gfx/cards/nidorino.png differ
diff --git a/src/gfx/cards/ninetails1.8x6.png b/src/gfx/cards/ninetails1.8x6.png
deleted file mode 100644
index eba870d..0000000
Binary files a/src/gfx/cards/ninetails1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/ninetails1.pal b/src/gfx/cards/ninetails1.pal
deleted file mode 100644
index 90d7857..0000000
Binary files a/src/gfx/cards/ninetails1.pal and /dev/null differ
diff --git a/src/gfx/cards/ninetails1.png b/src/gfx/cards/ninetails1.png
new file mode 100644
index 0000000..38ed8be
Binary files /dev/null and b/src/gfx/cards/ninetails1.png differ
diff --git a/src/gfx/cards/ninetails2.8x6.png b/src/gfx/cards/ninetails2.8x6.png
deleted file mode 100644
index 2003e52..0000000
Binary files a/src/gfx/cards/ninetails2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/ninetails2.pal b/src/gfx/cards/ninetails2.pal
deleted file mode 100644
index 8341ea2..0000000
Binary files a/src/gfx/cards/ninetails2.pal and /dev/null differ
diff --git a/src/gfx/cards/ninetails2.png b/src/gfx/cards/ninetails2.png
new file mode 100644
index 0000000..43a165d
Binary files /dev/null and b/src/gfx/cards/ninetails2.png differ
diff --git a/src/gfx/cards/oddish.8x6.png b/src/gfx/cards/oddish.8x6.png
deleted file mode 100644
index b37f1c0..0000000
Binary files a/src/gfx/cards/oddish.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/oddish.pal b/src/gfx/cards/oddish.pal
deleted file mode 100644
index e798b00..0000000
Binary files a/src/gfx/cards/oddish.pal and /dev/null differ
diff --git a/src/gfx/cards/oddish.png b/src/gfx/cards/oddish.png
new file mode 100644
index 0000000..b5474e6
Binary files /dev/null and b/src/gfx/cards/oddish.png differ
diff --git a/src/gfx/cards/omanyte.8x6.png b/src/gfx/cards/omanyte.8x6.png
deleted file mode 100644
index b56b359..0000000
Binary files a/src/gfx/cards/omanyte.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/omanyte.pal b/src/gfx/cards/omanyte.pal
deleted file mode 100644
index cddccc7..0000000
Binary files a/src/gfx/cards/omanyte.pal and /dev/null differ
diff --git a/src/gfx/cards/omanyte.png b/src/gfx/cards/omanyte.png
new file mode 100644
index 0000000..f1ec65f
Binary files /dev/null and b/src/gfx/cards/omanyte.png differ
diff --git a/src/gfx/cards/omastar.8x6.png b/src/gfx/cards/omastar.8x6.png
deleted file mode 100644
index ba090fc..0000000
Binary files a/src/gfx/cards/omastar.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/omastar.pal b/src/gfx/cards/omastar.pal
deleted file mode 100644
index b9f69b3..0000000
Binary files a/src/gfx/cards/omastar.pal and /dev/null differ
diff --git a/src/gfx/cards/omastar.png b/src/gfx/cards/omastar.png
new file mode 100644
index 0000000..bce6c17
Binary files /dev/null and b/src/gfx/cards/omastar.png differ
diff --git a/src/gfx/cards/onix.8x6.png b/src/gfx/cards/onix.8x6.png
deleted file mode 100644
index 5d48c2c..0000000
Binary files a/src/gfx/cards/onix.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/onix.pal b/src/gfx/cards/onix.pal
deleted file mode 100644
index b8cc75e..0000000
Binary files a/src/gfx/cards/onix.pal and /dev/null differ
diff --git a/src/gfx/cards/onix.png b/src/gfx/cards/onix.png
new file mode 100644
index 0000000..44ef65e
Binary files /dev/null and b/src/gfx/cards/onix.png differ
diff --git a/src/gfx/cards/paras.8x6.png b/src/gfx/cards/paras.8x6.png
deleted file mode 100644
index 6054beb..0000000
Binary files a/src/gfx/cards/paras.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/paras.pal b/src/gfx/cards/paras.pal
deleted file mode 100644
index 2865103..0000000
--- a/src/gfx/cards/paras.pal
+++ /dev/null
@@ -1 +0,0 @@
-��
\ No newline at end of file
diff --git a/src/gfx/cards/paras.png b/src/gfx/cards/paras.png
new file mode 100644
index 0000000..61a5e98
Binary files /dev/null and b/src/gfx/cards/paras.png differ
diff --git a/src/gfx/cards/parasect.8x6.png b/src/gfx/cards/parasect.8x6.png
deleted file mode 100644
index 3c772f4..0000000
Binary files a/src/gfx/cards/parasect.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/parasect.pal b/src/gfx/cards/parasect.pal
deleted file mode 100644
index a6f1581..0000000
Binary files a/src/gfx/cards/parasect.pal and /dev/null differ
diff --git a/src/gfx/cards/parasect.png b/src/gfx/cards/parasect.png
new file mode 100644
index 0000000..d5bd538
Binary files /dev/null and b/src/gfx/cards/parasect.png differ
diff --git a/src/gfx/cards/persian.8x6.png b/src/gfx/cards/persian.8x6.png
deleted file mode 100644
index 0cdc9ee..0000000
Binary files a/src/gfx/cards/persian.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/persian.pal b/src/gfx/cards/persian.pal
deleted file mode 100644
index 17afb1f..0000000
Binary files a/src/gfx/cards/persian.pal and /dev/null differ
diff --git a/src/gfx/cards/persian.png b/src/gfx/cards/persian.png
new file mode 100644
index 0000000..59144bf
Binary files /dev/null and b/src/gfx/cards/persian.png differ
diff --git a/src/gfx/cards/pidgeot1.8x6.png b/src/gfx/cards/pidgeot1.8x6.png
deleted file mode 100644
index 4f3422a..0000000
Binary files a/src/gfx/cards/pidgeot1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/pidgeot1.pal b/src/gfx/cards/pidgeot1.pal
deleted file mode 100644
index 0cb3532..0000000
Binary files a/src/gfx/cards/pidgeot1.pal and /dev/null differ
diff --git a/src/gfx/cards/pidgeot1.png b/src/gfx/cards/pidgeot1.png
new file mode 100644
index 0000000..e6498b4
Binary files /dev/null and b/src/gfx/cards/pidgeot1.png differ
diff --git a/src/gfx/cards/pidgeot2.8x6.png b/src/gfx/cards/pidgeot2.8x6.png
deleted file mode 100644
index ede4ad5..0000000
Binary files a/src/gfx/cards/pidgeot2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/pidgeot2.pal b/src/gfx/cards/pidgeot2.pal
deleted file mode 100644
index b5f5ea0..0000000
Binary files a/src/gfx/cards/pidgeot2.pal and /dev/null differ
diff --git a/src/gfx/cards/pidgeot2.png b/src/gfx/cards/pidgeot2.png
new file mode 100644
index 0000000..8e5f742
Binary files /dev/null and b/src/gfx/cards/pidgeot2.png differ
diff --git a/src/gfx/cards/pidgeotto.8x6.png b/src/gfx/cards/pidgeotto.8x6.png
deleted file mode 100644
index ec7e03d..0000000
Binary files a/src/gfx/cards/pidgeotto.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/pidgeotto.pal b/src/gfx/cards/pidgeotto.pal
deleted file mode 100644
index 14413aa..0000000
Binary files a/src/gfx/cards/pidgeotto.pal and /dev/null differ
diff --git a/src/gfx/cards/pidgeotto.png b/src/gfx/cards/pidgeotto.png
new file mode 100644
index 0000000..f52c342
Binary files /dev/null and b/src/gfx/cards/pidgeotto.png differ
diff --git a/src/gfx/cards/pidgey.8x6.png b/src/gfx/cards/pidgey.8x6.png
deleted file mode 100644
index 5fc97a5..0000000
Binary files a/src/gfx/cards/pidgey.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/pidgey.pal b/src/gfx/cards/pidgey.pal
deleted file mode 100644
index 52c807a..0000000
Binary files a/src/gfx/cards/pidgey.pal and /dev/null differ
diff --git a/src/gfx/cards/pidgey.png b/src/gfx/cards/pidgey.png
new file mode 100644
index 0000000..e32186a
Binary files /dev/null and b/src/gfx/cards/pidgey.png differ
diff --git a/src/gfx/cards/pikachu1.8x6.png b/src/gfx/cards/pikachu1.8x6.png
deleted file mode 100644
index 5696eb2..0000000
Binary files a/src/gfx/cards/pikachu1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/pikachu1.pal b/src/gfx/cards/pikachu1.pal
deleted file mode 100644
index 31ce085..0000000
Binary files a/src/gfx/cards/pikachu1.pal and /dev/null differ
diff --git a/src/gfx/cards/pikachu1.png b/src/gfx/cards/pikachu1.png
new file mode 100644
index 0000000..a28298a
Binary files /dev/null and b/src/gfx/cards/pikachu1.png differ
diff --git a/src/gfx/cards/pikachu2.8x6.png b/src/gfx/cards/pikachu2.8x6.png
deleted file mode 100644
index b97b530..0000000
Binary files a/src/gfx/cards/pikachu2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/pikachu2.pal b/src/gfx/cards/pikachu2.pal
deleted file mode 100644
index 0a5206f..0000000
Binary files a/src/gfx/cards/pikachu2.pal and /dev/null differ
diff --git a/src/gfx/cards/pikachu2.png b/src/gfx/cards/pikachu2.png
new file mode 100644
index 0000000..f85b40a
Binary files /dev/null and b/src/gfx/cards/pikachu2.png differ
diff --git a/src/gfx/cards/pikachu3.8x6.png b/src/gfx/cards/pikachu3.8x6.png
deleted file mode 100644
index 4dec614..0000000
Binary files a/src/gfx/cards/pikachu3.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/pikachu3.pal b/src/gfx/cards/pikachu3.pal
deleted file mode 100644
index 7e93511..0000000
Binary files a/src/gfx/cards/pikachu3.pal and /dev/null differ
diff --git a/src/gfx/cards/pikachu3.png b/src/gfx/cards/pikachu3.png
new file mode 100644
index 0000000..e0155e5
Binary files /dev/null and b/src/gfx/cards/pikachu3.png differ
diff --git a/src/gfx/cards/pikachu4.8x6.png b/src/gfx/cards/pikachu4.8x6.png
deleted file mode 100644
index b355807..0000000
Binary files a/src/gfx/cards/pikachu4.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/pikachu4.pal b/src/gfx/cards/pikachu4.pal
deleted file mode 100644
index 4cdf54b..0000000
Binary files a/src/gfx/cards/pikachu4.pal and /dev/null differ
diff --git a/src/gfx/cards/pikachu4.png b/src/gfx/cards/pikachu4.png
new file mode 100644
index 0000000..c918c94
Binary files /dev/null and b/src/gfx/cards/pikachu4.png differ
diff --git a/src/gfx/cards/pinsir.8x6.png b/src/gfx/cards/pinsir.8x6.png
deleted file mode 100644
index 1e23b81..0000000
Binary files a/src/gfx/cards/pinsir.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/pinsir.pal b/src/gfx/cards/pinsir.pal
deleted file mode 100644
index 13418da..0000000
Binary files a/src/gfx/cards/pinsir.pal and /dev/null differ
diff --git a/src/gfx/cards/pinsir.png b/src/gfx/cards/pinsir.png
new file mode 100644
index 0000000..35a7a67
Binary files /dev/null and b/src/gfx/cards/pinsir.png differ
diff --git a/src/gfx/cards/pluspower.8x6.png b/src/gfx/cards/pluspower.8x6.png
deleted file mode 100644
index efb4b1c..0000000
Binary files a/src/gfx/cards/pluspower.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/pluspower.pal b/src/gfx/cards/pluspower.pal
deleted file mode 100644
index 6ab8631..0000000
Binary files a/src/gfx/cards/pluspower.pal and /dev/null differ
diff --git a/src/gfx/cards/pluspower.png b/src/gfx/cards/pluspower.png
new file mode 100644
index 0000000..5882fcc
Binary files /dev/null and b/src/gfx/cards/pluspower.png differ
diff --git a/src/gfx/cards/pokeball.8x6.png b/src/gfx/cards/pokeball.8x6.png
deleted file mode 100644
index bd99dfd..0000000
Binary files a/src/gfx/cards/pokeball.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/pokeball.pal b/src/gfx/cards/pokeball.pal
deleted file mode 100644
index c6230de..0000000
Binary files a/src/gfx/cards/pokeball.pal and /dev/null differ
diff --git a/src/gfx/cards/pokeball.png b/src/gfx/cards/pokeball.png
new file mode 100644
index 0000000..bb2750d
Binary files /dev/null and b/src/gfx/cards/pokeball.png differ
diff --git a/src/gfx/cards/pokedex.8x6.png b/src/gfx/cards/pokedex.8x6.png
deleted file mode 100644
index 970be3e..0000000
Binary files a/src/gfx/cards/pokedex.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/pokedex.pal b/src/gfx/cards/pokedex.pal
deleted file mode 100644
index ab3a819..0000000
Binary files a/src/gfx/cards/pokedex.pal and /dev/null differ
diff --git a/src/gfx/cards/pokedex.png b/src/gfx/cards/pokedex.png
new file mode 100644
index 0000000..cb94fed
Binary files /dev/null and b/src/gfx/cards/pokedex.png differ
diff --git a/src/gfx/cards/pokemonbreeder.8x6.png b/src/gfx/cards/pokemonbreeder.8x6.png
deleted file mode 100644
index 0661bde..0000000
Binary files a/src/gfx/cards/pokemonbreeder.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/pokemonbreeder.pal b/src/gfx/cards/pokemonbreeder.pal
deleted file mode 100644
index 411a545..0000000
Binary files a/src/gfx/cards/pokemonbreeder.pal and /dev/null differ
diff --git a/src/gfx/cards/pokemonbreeder.png b/src/gfx/cards/pokemonbreeder.png
new file mode 100644
index 0000000..c9b875f
Binary files /dev/null and b/src/gfx/cards/pokemonbreeder.png differ
diff --git a/src/gfx/cards/pokemoncenter.8x6.png b/src/gfx/cards/pokemoncenter.8x6.png
deleted file mode 100644
index 2ddffb8..0000000
Binary files a/src/gfx/cards/pokemoncenter.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/pokemoncenter.pal b/src/gfx/cards/pokemoncenter.pal
deleted file mode 100644
index 318425d..0000000
Binary files a/src/gfx/cards/pokemoncenter.pal and /dev/null differ
diff --git a/src/gfx/cards/pokemoncenter.png b/src/gfx/cards/pokemoncenter.png
new file mode 100644
index 0000000..652446c
Binary files /dev/null and b/src/gfx/cards/pokemoncenter.png differ
diff --git a/src/gfx/cards/pokemonflute.8x6.png b/src/gfx/cards/pokemonflute.8x6.png
deleted file mode 100644
index f9cb9df..0000000
Binary files a/src/gfx/cards/pokemonflute.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/pokemonflute.pal b/src/gfx/cards/pokemonflute.pal
deleted file mode 100644
index 5185e49..0000000
Binary files a/src/gfx/cards/pokemonflute.pal and /dev/null differ
diff --git a/src/gfx/cards/pokemonflute.png b/src/gfx/cards/pokemonflute.png
new file mode 100644
index 0000000..979ebf1
Binary files /dev/null and b/src/gfx/cards/pokemonflute.png differ
diff --git a/src/gfx/cards/pokemontrader.8x6.png b/src/gfx/cards/pokemontrader.8x6.png
deleted file mode 100644
index c35959d..0000000
Binary files a/src/gfx/cards/pokemontrader.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/pokemontrader.pal b/src/gfx/cards/pokemontrader.pal
deleted file mode 100644
index c0ce4fc..0000000
Binary files a/src/gfx/cards/pokemontrader.pal and /dev/null differ
diff --git a/src/gfx/cards/pokemontrader.png b/src/gfx/cards/pokemontrader.png
new file mode 100644
index 0000000..bc9dfc2
Binary files /dev/null and b/src/gfx/cards/pokemontrader.png differ
diff --git a/src/gfx/cards/poliwag.8x6.png b/src/gfx/cards/poliwag.8x6.png
deleted file mode 100644
index e555007..0000000
Binary files a/src/gfx/cards/poliwag.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/poliwag.pal b/src/gfx/cards/poliwag.pal
deleted file mode 100644
index b7612e9..0000000
Binary files a/src/gfx/cards/poliwag.pal and /dev/null differ
diff --git a/src/gfx/cards/poliwag.png b/src/gfx/cards/poliwag.png
new file mode 100644
index 0000000..f4e0ae8
Binary files /dev/null and b/src/gfx/cards/poliwag.png differ
diff --git a/src/gfx/cards/poliwhirl.8x6.png b/src/gfx/cards/poliwhirl.8x6.png
deleted file mode 100644
index bf73eca..0000000
Binary files a/src/gfx/cards/poliwhirl.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/poliwhirl.pal b/src/gfx/cards/poliwhirl.pal
deleted file mode 100644
index 1ece94a..0000000
Binary files a/src/gfx/cards/poliwhirl.pal and /dev/null differ
diff --git a/src/gfx/cards/poliwhirl.png b/src/gfx/cards/poliwhirl.png
new file mode 100644
index 0000000..e778014
Binary files /dev/null and b/src/gfx/cards/poliwhirl.png differ
diff --git a/src/gfx/cards/poliwrath.8x6.png b/src/gfx/cards/poliwrath.8x6.png
deleted file mode 100644
index d4af8a2..0000000
Binary files a/src/gfx/cards/poliwrath.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/poliwrath.pal b/src/gfx/cards/poliwrath.pal
deleted file mode 100644
index 91d9eda..0000000
Binary files a/src/gfx/cards/poliwrath.pal and /dev/null differ
diff --git a/src/gfx/cards/poliwrath.png b/src/gfx/cards/poliwrath.png
new file mode 100644
index 0000000..5d50e45
Binary files /dev/null and b/src/gfx/cards/poliwrath.png differ
diff --git a/src/gfx/cards/ponyta.8x6.png b/src/gfx/cards/ponyta.8x6.png
deleted file mode 100644
index 051665a..0000000
Binary files a/src/gfx/cards/ponyta.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/ponyta.pal b/src/gfx/cards/ponyta.pal
deleted file mode 100644
index 0109046..0000000
Binary files a/src/gfx/cards/ponyta.pal and /dev/null differ
diff --git a/src/gfx/cards/ponyta.png b/src/gfx/cards/ponyta.png
new file mode 100644
index 0000000..c4b7554
Binary files /dev/null and b/src/gfx/cards/ponyta.png differ
diff --git a/src/gfx/cards/porygon.8x6.png b/src/gfx/cards/porygon.8x6.png
deleted file mode 100644
index bd21d61..0000000
Binary files a/src/gfx/cards/porygon.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/porygon.pal b/src/gfx/cards/porygon.pal
deleted file mode 100644
index 6d540f9..0000000
--- a/src/gfx/cards/porygon.pal
+++ /dev/null
@@ -1 +0,0 @@
-�j�  
\ No newline at end of file
diff --git a/src/gfx/cards/porygon.png b/src/gfx/cards/porygon.png
new file mode 100644
index 0000000..a2ebed7
Binary files /dev/null and b/src/gfx/cards/porygon.png differ
diff --git a/src/gfx/cards/potion.8x6.png b/src/gfx/cards/potion.8x6.png
deleted file mode 100644
index 2ea8805..0000000
Binary files a/src/gfx/cards/potion.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/potion.pal b/src/gfx/cards/potion.pal
deleted file mode 100644
index 182bfcb..0000000
Binary files a/src/gfx/cards/potion.pal and /dev/null differ
diff --git a/src/gfx/cards/potion.png b/src/gfx/cards/potion.png
new file mode 100644
index 0000000..15ae183
Binary files /dev/null and b/src/gfx/cards/potion.png differ
diff --git a/src/gfx/cards/primeape.8x6.png b/src/gfx/cards/primeape.8x6.png
deleted file mode 100644
index 6b3186d..0000000
Binary files a/src/gfx/cards/primeape.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/primeape.pal b/src/gfx/cards/primeape.pal
deleted file mode 100644
index 56cdfa1..0000000
Binary files a/src/gfx/cards/primeape.pal and /dev/null differ
diff --git a/src/gfx/cards/primeape.png b/src/gfx/cards/primeape.png
new file mode 100644
index 0000000..fdfc577
Binary files /dev/null and b/src/gfx/cards/primeape.png differ
diff --git a/src/gfx/cards/professoroak.8x6.png b/src/gfx/cards/professoroak.8x6.png
deleted file mode 100644
index 1073c5a..0000000
Binary files a/src/gfx/cards/professoroak.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/professoroak.pal b/src/gfx/cards/professoroak.pal
deleted file mode 100644
index 4ad5671..0000000
Binary files a/src/gfx/cards/professoroak.pal and /dev/null differ
diff --git a/src/gfx/cards/professoroak.png b/src/gfx/cards/professoroak.png
new file mode 100644
index 0000000..aaf249a
Binary files /dev/null and b/src/gfx/cards/professoroak.png differ
diff --git a/src/gfx/cards/psychicenergy.8x6.png b/src/gfx/cards/psychicenergy.8x6.png
deleted file mode 100644
index d2ed9ab..0000000
Binary files a/src/gfx/cards/psychicenergy.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/psychicenergy.pal b/src/gfx/cards/psychicenergy.pal
deleted file mode 100644
index 44fd31a..0000000
--- a/src/gfx/cards/psychicenergy.pal
+++ /dev/null
@@ -1 +0,0 @@
-_�i�@ 
\ No newline at end of file
diff --git a/src/gfx/cards/psychicenergy.png b/src/gfx/cards/psychicenergy.png
new file mode 100644
index 0000000..20d54d8
Binary files /dev/null and b/src/gfx/cards/psychicenergy.png differ
diff --git a/src/gfx/cards/psyduck.8x6.png b/src/gfx/cards/psyduck.8x6.png
deleted file mode 100644
index 22f2188..0000000
Binary files a/src/gfx/cards/psyduck.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/psyduck.pal b/src/gfx/cards/psyduck.pal
deleted file mode 100644
index e94c8ff..0000000
Binary files a/src/gfx/cards/psyduck.pal and /dev/null differ
diff --git a/src/gfx/cards/psyduck.png b/src/gfx/cards/psyduck.png
new file mode 100644
index 0000000..323ae49
Binary files /dev/null and b/src/gfx/cards/psyduck.png differ
diff --git a/src/gfx/cards/raichu1.8x6.png b/src/gfx/cards/raichu1.8x6.png
deleted file mode 100644
index 84aa606..0000000
Binary files a/src/gfx/cards/raichu1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/raichu1.pal b/src/gfx/cards/raichu1.pal
deleted file mode 100644
index 390ad34..0000000
Binary files a/src/gfx/cards/raichu1.pal and /dev/null differ
diff --git a/src/gfx/cards/raichu1.png b/src/gfx/cards/raichu1.png
new file mode 100644
index 0000000..9b2d6ff
Binary files /dev/null and b/src/gfx/cards/raichu1.png differ
diff --git a/src/gfx/cards/raichu2.8x6.png b/src/gfx/cards/raichu2.8x6.png
deleted file mode 100644
index 708699a..0000000
Binary files a/src/gfx/cards/raichu2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/raichu2.pal b/src/gfx/cards/raichu2.pal
deleted file mode 100644
index 8cef515..0000000
Binary files a/src/gfx/cards/raichu2.pal and /dev/null differ
diff --git a/src/gfx/cards/raichu2.png b/src/gfx/cards/raichu2.png
new file mode 100644
index 0000000..8c35b05
Binary files /dev/null and b/src/gfx/cards/raichu2.png differ
diff --git a/src/gfx/cards/rapidash.8x6.png b/src/gfx/cards/rapidash.8x6.png
deleted file mode 100644
index 0ae1186..0000000
Binary files a/src/gfx/cards/rapidash.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/rapidash.pal b/src/gfx/cards/rapidash.pal
deleted file mode 100644
index 87185a3..0000000
Binary files a/src/gfx/cards/rapidash.pal and /dev/null differ
diff --git a/src/gfx/cards/rapidash.png b/src/gfx/cards/rapidash.png
new file mode 100644
index 0000000..d86f93e
Binary files /dev/null and b/src/gfx/cards/rapidash.png differ
diff --git a/src/gfx/cards/raticate.8x6.png b/src/gfx/cards/raticate.8x6.png
deleted file mode 100644
index 8c79e7f..0000000
Binary files a/src/gfx/cards/raticate.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/raticate.pal b/src/gfx/cards/raticate.pal
deleted file mode 100644
index 9a861fc..0000000
Binary files a/src/gfx/cards/raticate.pal and /dev/null differ
diff --git a/src/gfx/cards/raticate.png b/src/gfx/cards/raticate.png
new file mode 100644
index 0000000..a20c6b9
Binary files /dev/null and b/src/gfx/cards/raticate.png differ
diff --git a/src/gfx/cards/rattata.8x6.png b/src/gfx/cards/rattata.8x6.png
deleted file mode 100644
index 2bf4f19..0000000
Binary files a/src/gfx/cards/rattata.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/rattata.pal b/src/gfx/cards/rattata.pal
deleted file mode 100644
index 9e49d97..0000000
Binary files a/src/gfx/cards/rattata.pal and /dev/null differ
diff --git a/src/gfx/cards/rattata.png b/src/gfx/cards/rattata.png
new file mode 100644
index 0000000..d90ea49
Binary files /dev/null and b/src/gfx/cards/rattata.png differ
diff --git a/src/gfx/cards/recycle.8x6.png b/src/gfx/cards/recycle.8x6.png
deleted file mode 100644
index e7e809c..0000000
Binary files a/src/gfx/cards/recycle.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/recycle.pal b/src/gfx/cards/recycle.pal
deleted file mode 100644
index 9da25ce..0000000
Binary files a/src/gfx/cards/recycle.pal and /dev/null differ
diff --git a/src/gfx/cards/recycle.png b/src/gfx/cards/recycle.png
new file mode 100644
index 0000000..32637ce
Binary files /dev/null and b/src/gfx/cards/recycle.png differ
diff --git a/src/gfx/cards/revive.8x6.png b/src/gfx/cards/revive.8x6.png
deleted file mode 100644
index 6cf1afa..0000000
Binary files a/src/gfx/cards/revive.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/revive.pal b/src/gfx/cards/revive.pal
deleted file mode 100644
index 5b62c4f..0000000
Binary files a/src/gfx/cards/revive.pal and /dev/null differ
diff --git a/src/gfx/cards/revive.png b/src/gfx/cards/revive.png
new file mode 100644
index 0000000..e2df762
Binary files /dev/null and b/src/gfx/cards/revive.png differ
diff --git a/src/gfx/cards/rhydon.8x6.png b/src/gfx/cards/rhydon.8x6.png
deleted file mode 100644
index c420a66..0000000
Binary files a/src/gfx/cards/rhydon.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/rhydon.pal b/src/gfx/cards/rhydon.pal
deleted file mode 100644
index 311cd3e..0000000
Binary files a/src/gfx/cards/rhydon.pal and /dev/null differ
diff --git a/src/gfx/cards/rhydon.png b/src/gfx/cards/rhydon.png
new file mode 100644
index 0000000..550256f
Binary files /dev/null and b/src/gfx/cards/rhydon.png differ
diff --git a/src/gfx/cards/rhyhorn.8x6.png b/src/gfx/cards/rhyhorn.8x6.png
deleted file mode 100644
index 591f7b5..0000000
Binary files a/src/gfx/cards/rhyhorn.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/rhyhorn.pal b/src/gfx/cards/rhyhorn.pal
deleted file mode 100644
index fd637ff..0000000
Binary files a/src/gfx/cards/rhyhorn.pal and /dev/null differ
diff --git a/src/gfx/cards/rhyhorn.png b/src/gfx/cards/rhyhorn.png
new file mode 100644
index 0000000..62740d4
Binary files /dev/null and b/src/gfx/cards/rhyhorn.png differ
diff --git a/src/gfx/cards/sandshrew.8x6.png b/src/gfx/cards/sandshrew.8x6.png
deleted file mode 100644
index db01d0c..0000000
Binary files a/src/gfx/cards/sandshrew.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/sandshrew.pal b/src/gfx/cards/sandshrew.pal
deleted file mode 100644
index 5b6f131..0000000
Binary files a/src/gfx/cards/sandshrew.pal and /dev/null differ
diff --git a/src/gfx/cards/sandshrew.png b/src/gfx/cards/sandshrew.png
new file mode 100644
index 0000000..c83e2c4
Binary files /dev/null and b/src/gfx/cards/sandshrew.png differ
diff --git a/src/gfx/cards/sandslash.8x6.png b/src/gfx/cards/sandslash.8x6.png
deleted file mode 100644
index 438b2e2..0000000
Binary files a/src/gfx/cards/sandslash.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/sandslash.pal b/src/gfx/cards/sandslash.pal
deleted file mode 100644
index 1935ba9..0000000
Binary files a/src/gfx/cards/sandslash.pal and /dev/null differ
diff --git a/src/gfx/cards/sandslash.png b/src/gfx/cards/sandslash.png
new file mode 100644
index 0000000..a6d739d
Binary files /dev/null and b/src/gfx/cards/sandslash.png differ
diff --git a/src/gfx/cards/scoopup.8x6.png b/src/gfx/cards/scoopup.8x6.png
deleted file mode 100644
index 3e75ec7..0000000
Binary files a/src/gfx/cards/scoopup.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/scoopup.pal b/src/gfx/cards/scoopup.pal
deleted file mode 100644
index 343e078..0000000
--- a/src/gfx/cards/scoopup.pal
+++ /dev/null
@@ -1 +0,0 @@
-_k�!�@
\ No newline at end of file
diff --git a/src/gfx/cards/scoopup.png b/src/gfx/cards/scoopup.png
new file mode 100644
index 0000000..e9364ff
Binary files /dev/null and b/src/gfx/cards/scoopup.png differ
diff --git a/src/gfx/cards/scyther.8x6.png b/src/gfx/cards/scyther.8x6.png
deleted file mode 100644
index 85d9255..0000000
Binary files a/src/gfx/cards/scyther.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/scyther.pal b/src/gfx/cards/scyther.pal
deleted file mode 100644
index 1da0cd9..0000000
Binary files a/src/gfx/cards/scyther.pal and /dev/null differ
diff --git a/src/gfx/cards/scyther.png b/src/gfx/cards/scyther.png
new file mode 100644
index 0000000..ddc9624
Binary files /dev/null and b/src/gfx/cards/scyther.png differ
diff --git a/src/gfx/cards/seadra.8x6.png b/src/gfx/cards/seadra.8x6.png
deleted file mode 100644
index 168eb4e..0000000
Binary files a/src/gfx/cards/seadra.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/seadra.pal b/src/gfx/cards/seadra.pal
deleted file mode 100644
index 1fc8f85..0000000
Binary files a/src/gfx/cards/seadra.pal and /dev/null differ
diff --git a/src/gfx/cards/seadra.png b/src/gfx/cards/seadra.png
new file mode 100644
index 0000000..1ceefc6
Binary files /dev/null and b/src/gfx/cards/seadra.png differ
diff --git a/src/gfx/cards/seaking.8x6.png b/src/gfx/cards/seaking.8x6.png
deleted file mode 100644
index ada6702..0000000
Binary files a/src/gfx/cards/seaking.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/seaking.pal b/src/gfx/cards/seaking.pal
deleted file mode 100644
index 08a50b6..0000000
Binary files a/src/gfx/cards/seaking.pal and /dev/null differ
diff --git a/src/gfx/cards/seaking.png b/src/gfx/cards/seaking.png
new file mode 100644
index 0000000..8f58c89
Binary files /dev/null and b/src/gfx/cards/seaking.png differ
diff --git a/src/gfx/cards/seel.8x6.png b/src/gfx/cards/seel.8x6.png
deleted file mode 100644
index 9face9f..0000000
Binary files a/src/gfx/cards/seel.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/seel.pal b/src/gfx/cards/seel.pal
deleted file mode 100644
index ba76726..0000000
Binary files a/src/gfx/cards/seel.pal and /dev/null differ
diff --git a/src/gfx/cards/seel.png b/src/gfx/cards/seel.png
new file mode 100644
index 0000000..dec2c2f
Binary files /dev/null and b/src/gfx/cards/seel.png differ
diff --git a/src/gfx/cards/shellder.8x6.png b/src/gfx/cards/shellder.8x6.png
deleted file mode 100644
index ad49832..0000000
Binary files a/src/gfx/cards/shellder.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/shellder.pal b/src/gfx/cards/shellder.pal
deleted file mode 100644
index 70e70bf..0000000
Binary files a/src/gfx/cards/shellder.pal and /dev/null differ
diff --git a/src/gfx/cards/shellder.png b/src/gfx/cards/shellder.png
new file mode 100644
index 0000000..1c336f6
Binary files /dev/null and b/src/gfx/cards/shellder.png differ
diff --git a/src/gfx/cards/slowbro.8x6.png b/src/gfx/cards/slowbro.8x6.png
deleted file mode 100644
index ad59fd6..0000000
Binary files a/src/gfx/cards/slowbro.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/slowbro.pal b/src/gfx/cards/slowbro.pal
deleted file mode 100644
index 4b51616..0000000
--- a/src/gfx/cards/slowbro.pal
+++ /dev/null
@@ -1 +0,0 @@
-_3�
� 
\ No newline at end of file
diff --git a/src/gfx/cards/slowbro.png b/src/gfx/cards/slowbro.png
new file mode 100644
index 0000000..e574738
Binary files /dev/null and b/src/gfx/cards/slowbro.png differ
diff --git a/src/gfx/cards/slowpoke1.8x6.png b/src/gfx/cards/slowpoke1.8x6.png
deleted file mode 100644
index a74d1a4..0000000
Binary files a/src/gfx/cards/slowpoke1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/slowpoke1.pal b/src/gfx/cards/slowpoke1.pal
deleted file mode 100644
index 81b0ad9..0000000
Binary files a/src/gfx/cards/slowpoke1.pal and /dev/null differ
diff --git a/src/gfx/cards/slowpoke1.png b/src/gfx/cards/slowpoke1.png
new file mode 100644
index 0000000..54cd6c9
Binary files /dev/null and b/src/gfx/cards/slowpoke1.png differ
diff --git a/src/gfx/cards/slowpoke2.8x6.png b/src/gfx/cards/slowpoke2.8x6.png
deleted file mode 100644
index 834cf05..0000000
Binary files a/src/gfx/cards/slowpoke2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/slowpoke2.pal b/src/gfx/cards/slowpoke2.pal
deleted file mode 100644
index 73881a1..0000000
--- a/src/gfx/cards/slowpoke2.pal
+++ /dev/null
@@ -1 +0,0 @@
-_k��0�
\ No newline at end of file
diff --git a/src/gfx/cards/slowpoke2.png b/src/gfx/cards/slowpoke2.png
new file mode 100644
index 0000000..c951930
Binary files /dev/null and b/src/gfx/cards/slowpoke2.png differ
diff --git a/src/gfx/cards/snorlax.8x6.png b/src/gfx/cards/snorlax.8x6.png
deleted file mode 100644
index 4eb26a4..0000000
Binary files a/src/gfx/cards/snorlax.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/snorlax.pal b/src/gfx/cards/snorlax.pal
deleted file mode 100644
index e1d7d63..0000000
Binary files a/src/gfx/cards/snorlax.pal and /dev/null differ
diff --git a/src/gfx/cards/snorlax.png b/src/gfx/cards/snorlax.png
new file mode 100644
index 0000000..cfd5ca7
Binary files /dev/null and b/src/gfx/cards/snorlax.png differ
diff --git a/src/gfx/cards/spearow.8x6.png b/src/gfx/cards/spearow.8x6.png
deleted file mode 100644
index f76c643..0000000
Binary files a/src/gfx/cards/spearow.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/spearow.pal b/src/gfx/cards/spearow.pal
deleted file mode 100644
index f241eaa..0000000
Binary files a/src/gfx/cards/spearow.pal and /dev/null differ
diff --git a/src/gfx/cards/spearow.png b/src/gfx/cards/spearow.png
new file mode 100644
index 0000000..c3d39dd
Binary files /dev/null and b/src/gfx/cards/spearow.png differ
diff --git a/src/gfx/cards/squirtle.8x6.png b/src/gfx/cards/squirtle.8x6.png
deleted file mode 100644
index e8907eb..0000000
Binary files a/src/gfx/cards/squirtle.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/squirtle.pal b/src/gfx/cards/squirtle.pal
deleted file mode 100644
index a7aaec5..0000000
--- a/src/gfx/cards/squirtle.pal
+++ /dev/null
@@ -1 +0,0 @@
-�kLC��
\ No newline at end of file
diff --git a/src/gfx/cards/squirtle.png b/src/gfx/cards/squirtle.png
new file mode 100644
index 0000000..ba604ac
Binary files /dev/null and b/src/gfx/cards/squirtle.png differ
diff --git a/src/gfx/cards/starmie.8x6.png b/src/gfx/cards/starmie.8x6.png
deleted file mode 100644
index 5e4c0b1..0000000
Binary files a/src/gfx/cards/starmie.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/starmie.pal b/src/gfx/cards/starmie.pal
deleted file mode 100644
index 7bcf392..0000000
Binary files a/src/gfx/cards/starmie.pal and /dev/null differ
diff --git a/src/gfx/cards/starmie.png b/src/gfx/cards/starmie.png
new file mode 100644
index 0000000..96efadd
Binary files /dev/null and b/src/gfx/cards/starmie.png differ
diff --git a/src/gfx/cards/staryu.8x6.png b/src/gfx/cards/staryu.8x6.png
deleted file mode 100644
index 1e63f1c..0000000
Binary files a/src/gfx/cards/staryu.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/staryu.pal b/src/gfx/cards/staryu.pal
deleted file mode 100644
index 2664741..0000000
Binary files a/src/gfx/cards/staryu.pal and /dev/null differ
diff --git a/src/gfx/cards/staryu.png b/src/gfx/cards/staryu.png
new file mode 100644
index 0000000..23b5322
Binary files /dev/null and b/src/gfx/cards/staryu.png differ
diff --git a/src/gfx/cards/superenergyremoval.8x6.png b/src/gfx/cards/superenergyremoval.8x6.png
deleted file mode 100644
index f71ac87..0000000
Binary files a/src/gfx/cards/superenergyremoval.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/superenergyremoval.pal b/src/gfx/cards/superenergyremoval.pal
deleted file mode 100644
index f6fab91..0000000
Binary files a/src/gfx/cards/superenergyremoval.pal and /dev/null differ
diff --git a/src/gfx/cards/superenergyremoval.png b/src/gfx/cards/superenergyremoval.png
new file mode 100644
index 0000000..05460b7
Binary files /dev/null and b/src/gfx/cards/superenergyremoval.png differ
diff --git a/src/gfx/cards/superenergyretrieval.8x6.png b/src/gfx/cards/superenergyretrieval.8x6.png
deleted file mode 100644
index be4c186..0000000
Binary files a/src/gfx/cards/superenergyretrieval.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/superenergyretrieval.pal b/src/gfx/cards/superenergyretrieval.pal
deleted file mode 100644
index 9dcf420..0000000
Binary files a/src/gfx/cards/superenergyretrieval.pal and /dev/null differ
diff --git a/src/gfx/cards/superenergyretrieval.png b/src/gfx/cards/superenergyretrieval.png
new file mode 100644
index 0000000..93e967b
Binary files /dev/null and b/src/gfx/cards/superenergyretrieval.png differ
diff --git a/src/gfx/cards/superpotion.8x6.png b/src/gfx/cards/superpotion.8x6.png
deleted file mode 100644
index b476aba..0000000
Binary files a/src/gfx/cards/superpotion.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/superpotion.pal b/src/gfx/cards/superpotion.pal
deleted file mode 100644
index fe84a56..0000000
Binary files a/src/gfx/cards/superpotion.pal and /dev/null differ
diff --git a/src/gfx/cards/superpotion.png b/src/gfx/cards/superpotion.png
new file mode 100644
index 0000000..86ac5ef
Binary files /dev/null and b/src/gfx/cards/superpotion.png differ
diff --git a/src/gfx/cards/surfingpikachu1.8x6.png b/src/gfx/cards/surfingpikachu1.8x6.png
deleted file mode 100644
index 9b84774..0000000
Binary files a/src/gfx/cards/surfingpikachu1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/surfingpikachu1.pal b/src/gfx/cards/surfingpikachu1.pal
deleted file mode 100644
index f7a0dd9..0000000
Binary files a/src/gfx/cards/surfingpikachu1.pal and /dev/null differ
diff --git a/src/gfx/cards/surfingpikachu1.png b/src/gfx/cards/surfingpikachu1.png
new file mode 100644
index 0000000..029c89b
Binary files /dev/null and b/src/gfx/cards/surfingpikachu1.png differ
diff --git a/src/gfx/cards/surfingpikachu2.8x6.png b/src/gfx/cards/surfingpikachu2.8x6.png
deleted file mode 100644
index 53e796a..0000000
Binary files a/src/gfx/cards/surfingpikachu2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/surfingpikachu2.pal b/src/gfx/cards/surfingpikachu2.pal
deleted file mode 100644
index f7a0dd9..0000000
Binary files a/src/gfx/cards/surfingpikachu2.pal and /dev/null differ
diff --git a/src/gfx/cards/surfingpikachu2.png b/src/gfx/cards/surfingpikachu2.png
new file mode 100644
index 0000000..3fac2c2
Binary files /dev/null and b/src/gfx/cards/surfingpikachu2.png differ
diff --git a/src/gfx/cards/switch.8x6.png b/src/gfx/cards/switch.8x6.png
deleted file mode 100644
index cdcec01..0000000
Binary files a/src/gfx/cards/switch.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/switch.pal b/src/gfx/cards/switch.pal
deleted file mode 100644
index 4675255..0000000
--- a/src/gfx/cards/switch.pal
+++ /dev/null
@@ -1 +0,0 @@
-_k�  
\ No newline at end of file
diff --git a/src/gfx/cards/switch.png b/src/gfx/cards/switch.png
new file mode 100644
index 0000000..c93063b
Binary files /dev/null and b/src/gfx/cards/switch.png differ
diff --git a/src/gfx/cards/tangela1.8x6.png b/src/gfx/cards/tangela1.8x6.png
deleted file mode 100644
index 0907f14..0000000
Binary files a/src/gfx/cards/tangela1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/tangela1.pal b/src/gfx/cards/tangela1.pal
deleted file mode 100644
index 245aa95..0000000
Binary files a/src/gfx/cards/tangela1.pal and /dev/null differ
diff --git a/src/gfx/cards/tangela1.png b/src/gfx/cards/tangela1.png
new file mode 100644
index 0000000..9f4fdb8
Binary files /dev/null and b/src/gfx/cards/tangela1.png differ
diff --git a/src/gfx/cards/tangela2.8x6.png b/src/gfx/cards/tangela2.8x6.png
deleted file mode 100644
index 5fb06c8..0000000
Binary files a/src/gfx/cards/tangela2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/tangela2.pal b/src/gfx/cards/tangela2.pal
deleted file mode 100644
index 0eedb04..0000000
Binary files a/src/gfx/cards/tangela2.pal and /dev/null differ
diff --git a/src/gfx/cards/tangela2.png b/src/gfx/cards/tangela2.png
new file mode 100644
index 0000000..c689a50
Binary files /dev/null and b/src/gfx/cards/tangela2.png differ
diff --git a/src/gfx/cards/tauros.8x6.png b/src/gfx/cards/tauros.8x6.png
deleted file mode 100644
index 8a372a2..0000000
Binary files a/src/gfx/cards/tauros.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/tauros.pal b/src/gfx/cards/tauros.pal
deleted file mode 100644
index ac7554b..0000000
Binary files a/src/gfx/cards/tauros.pal and /dev/null differ
diff --git a/src/gfx/cards/tauros.png b/src/gfx/cards/tauros.png
new file mode 100644
index 0000000..04a7a64
Binary files /dev/null and b/src/gfx/cards/tauros.png differ
diff --git a/src/gfx/cards/tentacool.8x6.png b/src/gfx/cards/tentacool.8x6.png
deleted file mode 100644
index 7da303a..0000000
Binary files a/src/gfx/cards/tentacool.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/tentacool.pal b/src/gfx/cards/tentacool.pal
deleted file mode 100644
index 210122c..0000000
Binary files a/src/gfx/cards/tentacool.pal and /dev/null differ
diff --git a/src/gfx/cards/tentacool.png b/src/gfx/cards/tentacool.png
new file mode 100644
index 0000000..fe24fae
Binary files /dev/null and b/src/gfx/cards/tentacool.png differ
diff --git a/src/gfx/cards/tentacruel.8x6.png b/src/gfx/cards/tentacruel.8x6.png
deleted file mode 100644
index 74b2c43..0000000
Binary files a/src/gfx/cards/tentacruel.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/tentacruel.pal b/src/gfx/cards/tentacruel.pal
deleted file mode 100644
index 212e1bf..0000000
Binary files a/src/gfx/cards/tentacruel.pal and /dev/null differ
diff --git a/src/gfx/cards/tentacruel.png b/src/gfx/cards/tentacruel.png
new file mode 100644
index 0000000..9c69872
Binary files /dev/null and b/src/gfx/cards/tentacruel.png differ
diff --git a/src/gfx/cards/vaporeon1.8x6.png b/src/gfx/cards/vaporeon1.8x6.png
deleted file mode 100644
index 3ac523a..0000000
Binary files a/src/gfx/cards/vaporeon1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/vaporeon1.pal b/src/gfx/cards/vaporeon1.pal
deleted file mode 100644
index 0c16866..0000000
Binary files a/src/gfx/cards/vaporeon1.pal and /dev/null differ
diff --git a/src/gfx/cards/vaporeon1.png b/src/gfx/cards/vaporeon1.png
new file mode 100644
index 0000000..487bc18
Binary files /dev/null and b/src/gfx/cards/vaporeon1.png differ
diff --git a/src/gfx/cards/vaporeon2.8x6.png b/src/gfx/cards/vaporeon2.8x6.png
deleted file mode 100644
index a90ba62..0000000
Binary files a/src/gfx/cards/vaporeon2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/vaporeon2.pal b/src/gfx/cards/vaporeon2.pal
deleted file mode 100644
index 5455a43..0000000
Binary files a/src/gfx/cards/vaporeon2.pal and /dev/null differ
diff --git a/src/gfx/cards/vaporeon2.png b/src/gfx/cards/vaporeon2.png
new file mode 100644
index 0000000..d370ea0
Binary files /dev/null and b/src/gfx/cards/vaporeon2.png differ
diff --git a/src/gfx/cards/venomoth.8x6.png b/src/gfx/cards/venomoth.8x6.png
deleted file mode 100644
index d1c9fce..0000000
Binary files a/src/gfx/cards/venomoth.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/venomoth.pal b/src/gfx/cards/venomoth.pal
deleted file mode 100644
index 663c93f..0000000
--- a/src/gfx/cards/venomoth.pal
+++ /dev/null
@@ -1 +0,0 @@
-_U0
\ No newline at end of file
diff --git a/src/gfx/cards/venomoth.png b/src/gfx/cards/venomoth.png
new file mode 100644
index 0000000..47d6510
Binary files /dev/null and b/src/gfx/cards/venomoth.png differ
diff --git a/src/gfx/cards/venonat.8x6.png b/src/gfx/cards/venonat.8x6.png
deleted file mode 100644
index 1638261..0000000
Binary files a/src/gfx/cards/venonat.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/venonat.pal b/src/gfx/cards/venonat.pal
deleted file mode 100644
index 5be80c9..0000000
--- a/src/gfx/cards/venonat.pal
+++ /dev/null
@@ -1 +0,0 @@
-ZT
\ No newline at end of file
diff --git a/src/gfx/cards/venonat.png b/src/gfx/cards/venonat.png
new file mode 100644
index 0000000..5b6d970
Binary files /dev/null and b/src/gfx/cards/venonat.png differ
diff --git a/src/gfx/cards/venusaur1.8x6.png b/src/gfx/cards/venusaur1.8x6.png
deleted file mode 100644
index d2d3989..0000000
Binary files a/src/gfx/cards/venusaur1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/venusaur1.pal b/src/gfx/cards/venusaur1.pal
deleted file mode 100644
index ff5c74c..0000000
Binary files a/src/gfx/cards/venusaur1.pal and /dev/null differ
diff --git a/src/gfx/cards/venusaur1.png b/src/gfx/cards/venusaur1.png
new file mode 100644
index 0000000..9f71a39
Binary files /dev/null and b/src/gfx/cards/venusaur1.png differ
diff --git a/src/gfx/cards/venusaur2.8x6.png b/src/gfx/cards/venusaur2.8x6.png
deleted file mode 100644
index dcfa858..0000000
Binary files a/src/gfx/cards/venusaur2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/venusaur2.pal b/src/gfx/cards/venusaur2.pal
deleted file mode 100644
index fc789ff..0000000
Binary files a/src/gfx/cards/venusaur2.pal and /dev/null differ
diff --git a/src/gfx/cards/venusaur2.png b/src/gfx/cards/venusaur2.png
new file mode 100644
index 0000000..5f91e9b
Binary files /dev/null and b/src/gfx/cards/venusaur2.png differ
diff --git a/src/gfx/cards/victreebel.8x6.png b/src/gfx/cards/victreebel.8x6.png
deleted file mode 100644
index d8536a0..0000000
Binary files a/src/gfx/cards/victreebel.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/victreebel.pal b/src/gfx/cards/victreebel.pal
deleted file mode 100644
index 529eecf..0000000
Binary files a/src/gfx/cards/victreebel.pal and /dev/null differ
diff --git a/src/gfx/cards/victreebel.png b/src/gfx/cards/victreebel.png
new file mode 100644
index 0000000..37cf69c
Binary files /dev/null and b/src/gfx/cards/victreebel.png differ
diff --git a/src/gfx/cards/vileplume.8x6.png b/src/gfx/cards/vileplume.8x6.png
deleted file mode 100644
index a3766d5..0000000
Binary files a/src/gfx/cards/vileplume.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/vileplume.pal b/src/gfx/cards/vileplume.pal
deleted file mode 100644
index 3c4f707..0000000
Binary files a/src/gfx/cards/vileplume.pal and /dev/null differ
diff --git a/src/gfx/cards/vileplume.png b/src/gfx/cards/vileplume.png
new file mode 100644
index 0000000..7ef4386
Binary files /dev/null and b/src/gfx/cards/vileplume.png differ
diff --git a/src/gfx/cards/voltorb.8x6.png b/src/gfx/cards/voltorb.8x6.png
deleted file mode 100644
index cb39c66..0000000
Binary files a/src/gfx/cards/voltorb.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/voltorb.pal b/src/gfx/cards/voltorb.pal
deleted file mode 100644
index 01eca85..0000000
Binary files a/src/gfx/cards/voltorb.pal and /dev/null differ
diff --git a/src/gfx/cards/voltorb.png b/src/gfx/cards/voltorb.png
new file mode 100644
index 0000000..a9e0ec9
Binary files /dev/null and b/src/gfx/cards/voltorb.png differ
diff --git a/src/gfx/cards/vulpix.8x6.png b/src/gfx/cards/vulpix.8x6.png
deleted file mode 100644
index e83d888..0000000
Binary files a/src/gfx/cards/vulpix.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/vulpix.pal b/src/gfx/cards/vulpix.pal
deleted file mode 100644
index eb6af99..0000000
Binary files a/src/gfx/cards/vulpix.pal and /dev/null differ
diff --git a/src/gfx/cards/vulpix.png b/src/gfx/cards/vulpix.png
new file mode 100644
index 0000000..987a5dd
Binary files /dev/null and b/src/gfx/cards/vulpix.png differ
diff --git a/src/gfx/cards/wartortle.8x6.png b/src/gfx/cards/wartortle.8x6.png
deleted file mode 100644
index fad87c7..0000000
Binary files a/src/gfx/cards/wartortle.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/wartortle.pal b/src/gfx/cards/wartortle.pal
deleted file mode 100644
index 0c9dd7c..0000000
Binary files a/src/gfx/cards/wartortle.pal and /dev/null differ
diff --git a/src/gfx/cards/wartortle.png b/src/gfx/cards/wartortle.png
new file mode 100644
index 0000000..5c046f7
Binary files /dev/null and b/src/gfx/cards/wartortle.png differ
diff --git a/src/gfx/cards/waterenergy.8x6.png b/src/gfx/cards/waterenergy.8x6.png
deleted file mode 100644
index 1fe022e..0000000
Binary files a/src/gfx/cards/waterenergy.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/waterenergy.pal b/src/gfx/cards/waterenergy.pal
deleted file mode 100644
index 387346f..0000000
Binary files a/src/gfx/cards/waterenergy.pal and /dev/null differ
diff --git a/src/gfx/cards/waterenergy.png b/src/gfx/cards/waterenergy.png
new file mode 100644
index 0000000..d1f28e2
Binary files /dev/null and b/src/gfx/cards/waterenergy.png differ
diff --git a/src/gfx/cards/weedle.8x6.png b/src/gfx/cards/weedle.8x6.png
deleted file mode 100644
index f53e060..0000000
Binary files a/src/gfx/cards/weedle.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/weedle.pal b/src/gfx/cards/weedle.pal
deleted file mode 100644
index e640ad3..0000000
--- a/src/gfx/cards/weedle.pal
+++ /dev/null
@@ -1 +0,0 @@
-�k_1
\ No newline at end of file
diff --git a/src/gfx/cards/weedle.png b/src/gfx/cards/weedle.png
new file mode 100644
index 0000000..6073fb7
Binary files /dev/null and b/src/gfx/cards/weedle.png differ
diff --git a/src/gfx/cards/weepinbell.8x6.png b/src/gfx/cards/weepinbell.8x6.png
deleted file mode 100644
index bdff148..0000000
Binary files a/src/gfx/cards/weepinbell.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/weepinbell.pal b/src/gfx/cards/weepinbell.pal
deleted file mode 100644
index b1c7dc7..0000000
--- a/src/gfx/cards/weepinbell.pal
+++ /dev/null
@@ -1 +0,0 @@
-�C�

\ No newline at end of file
diff --git a/src/gfx/cards/weepinbell.png b/src/gfx/cards/weepinbell.png
new file mode 100644
index 0000000..aa0acb7
Binary files /dev/null and b/src/gfx/cards/weepinbell.png differ
diff --git a/src/gfx/cards/weezing.8x6.png b/src/gfx/cards/weezing.8x6.png
deleted file mode 100644
index 12d3514..0000000
Binary files a/src/gfx/cards/weezing.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/weezing.pal b/src/gfx/cards/weezing.pal
deleted file mode 100644
index 4d7faab..0000000
--- a/src/gfx/cards/weezing.pal
+++ /dev/null
@@ -1 +0,0 @@
-�L3�@ 
\ No newline at end of file
diff --git a/src/gfx/cards/weezing.png b/src/gfx/cards/weezing.png
new file mode 100644
index 0000000..eaadb67
Binary files /dev/null and b/src/gfx/cards/weezing.png differ
diff --git a/src/gfx/cards/wigglytuff.8x6.png b/src/gfx/cards/wigglytuff.8x6.png
deleted file mode 100644
index 3429ddf..0000000
Binary files a/src/gfx/cards/wigglytuff.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/wigglytuff.pal b/src/gfx/cards/wigglytuff.pal
deleted file mode 100644
index b8f2caf..0000000
--- a/src/gfx/cards/wigglytuff.pal
+++ /dev/null
@@ -1 +0,0 @@
-�j�2
\ No newline at end of file
diff --git a/src/gfx/cards/wigglytuff.png b/src/gfx/cards/wigglytuff.png
new file mode 100644
index 0000000..762ad41
Binary files /dev/null and b/src/gfx/cards/wigglytuff.png differ
diff --git a/src/gfx/cards/zapdos1.8x6.png b/src/gfx/cards/zapdos1.8x6.png
deleted file mode 100644
index b34c5c7..0000000
Binary files a/src/gfx/cards/zapdos1.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/zapdos1.pal b/src/gfx/cards/zapdos1.pal
deleted file mode 100644
index f68430a..0000000
Binary files a/src/gfx/cards/zapdos1.pal and /dev/null differ
diff --git a/src/gfx/cards/zapdos1.png b/src/gfx/cards/zapdos1.png
new file mode 100644
index 0000000..321dba7
Binary files /dev/null and b/src/gfx/cards/zapdos1.png differ
diff --git a/src/gfx/cards/zapdos2.8x6.png b/src/gfx/cards/zapdos2.8x6.png
deleted file mode 100644
index 1583f11..0000000
Binary files a/src/gfx/cards/zapdos2.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/zapdos2.pal b/src/gfx/cards/zapdos2.pal
deleted file mode 100644
index fe18659..0000000
Binary files a/src/gfx/cards/zapdos2.pal and /dev/null differ
diff --git a/src/gfx/cards/zapdos2.png b/src/gfx/cards/zapdos2.png
new file mode 100644
index 0000000..43c1164
Binary files /dev/null and b/src/gfx/cards/zapdos2.png differ
diff --git a/src/gfx/cards/zapdos3.8x6.png b/src/gfx/cards/zapdos3.8x6.png
deleted file mode 100644
index 3683243..0000000
Binary files a/src/gfx/cards/zapdos3.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/zapdos3.pal b/src/gfx/cards/zapdos3.pal
deleted file mode 100644
index fc0facc..0000000
Binary files a/src/gfx/cards/zapdos3.pal and /dev/null differ
diff --git a/src/gfx/cards/zapdos3.png b/src/gfx/cards/zapdos3.png
new file mode 100644
index 0000000..def590c
Binary files /dev/null and b/src/gfx/cards/zapdos3.png differ
diff --git a/src/gfx/cards/zubat.8x6.png b/src/gfx/cards/zubat.8x6.png
deleted file mode 100644
index 2a0c346..0000000
Binary files a/src/gfx/cards/zubat.8x6.png and /dev/null differ
diff --git a/src/gfx/cards/zubat.pal b/src/gfx/cards/zubat.pal
deleted file mode 100644
index 3583362..0000000
Binary files a/src/gfx/cards/zubat.pal and /dev/null differ
diff --git a/src/gfx/cards/zubat.png b/src/gfx/cards/zubat.png
new file mode 100644
index 0000000..f6cdc0e
Binary files /dev/null and b/src/gfx/cards/zubat.png differ
diff --git a/src/gfx/duel/anims/51.png b/src/gfx/duel/anims/51.png
new file mode 100644
index 0000000..98eb770
Binary files /dev/null and b/src/gfx/duel/anims/51.png differ
diff --git a/src/gfx/duel/anims/51.t10.png b/src/gfx/duel/anims/51.t10.png
deleted file mode 100644
index 98eb770..0000000
Binary files a/src/gfx/duel/anims/51.t10.png and /dev/null differ
diff --git a/src/gfx/duel/cgb_symbols.png b/src/gfx/duel/cgb_symbols.png
new file mode 100644
index 0000000..ac0f54d
Binary files /dev/null and b/src/gfx/duel/cgb_symbols.png differ
diff --git a/src/gfx/duel/cgb_symbols.t7.png b/src/gfx/duel/cgb_symbols.t7.png
deleted file mode 100644
index ac0f54d..0000000
Binary files a/src/gfx/duel/cgb_symbols.t7.png and /dev/null differ
diff --git a/src/gfx/duel/dmg_sgb_symbols.png b/src/gfx/duel/dmg_sgb_symbols.png
new file mode 100644
index 0000000..91eede5
Binary files /dev/null and b/src/gfx/duel/dmg_sgb_symbols.png differ
diff --git a/src/gfx/duel/dmg_sgb_symbols.t7.png b/src/gfx/duel/dmg_sgb_symbols.t7.png
deleted file mode 100644
index 91eede5..0000000
Binary files a/src/gfx/duel/dmg_sgb_symbols.t7.png and /dev/null differ
diff --git a/src/gfx/duel/other.png b/src/gfx/duel/other.png
new file mode 100644
index 0000000..d2aa1e9
Binary files /dev/null and b/src/gfx/duel/other.png differ
diff --git a/src/gfx/duel/other.t7.png b/src/gfx/duel/other.t7.png
deleted file mode 100644
index d2aa1e9..0000000
Binary files a/src/gfx/duel/other.t7.png and /dev/null differ
diff --git a/src/gfx/fonts/full_width/4.png b/src/gfx/fonts/full_width/4.png
new file mode 100644
index 0000000..c872a6d
Binary files /dev/null and b/src/gfx/fonts/full_width/4.png differ
diff --git a/src/gfx/fonts/full_width/4.t3.png b/src/gfx/fonts/full_width/4.t3.png
deleted file mode 100644
index c872a6d..0000000
Binary files a/src/gfx/fonts/full_width/4.t3.png and /dev/null differ
diff --git a/src/gfx/overworld_map.png b/src/gfx/overworld_map.png
new file mode 100644
index 0000000..5d8e819
Binary files /dev/null and b/src/gfx/overworld_map.png differ
diff --git a/src/gfx/overworld_map.t15.png b/src/gfx/overworld_map.t15.png
deleted file mode 100644
index 5d8e819..0000000
Binary files a/src/gfx/overworld_map.t15.png and /dev/null differ
diff --git a/src/gfx/tilesets/challengehall.png b/src/gfx/tilesets/challengehall.png
new file mode 100644
index 0000000..9783378
Binary files /dev/null and b/src/gfx/tilesets/challengehall.png differ
diff --git a/src/gfx/tilesets/challengehall.t3.png b/src/gfx/tilesets/challengehall.t3.png
deleted file mode 100644
index 9783378..0000000
Binary files a/src/gfx/tilesets/challengehall.t3.png and /dev/null differ
diff --git a/src/gfx/tilesets/clubentrance.png b/src/gfx/tilesets/clubentrance.png
new file mode 100644
index 0000000..e641020
Binary files /dev/null and b/src/gfx/tilesets/clubentrance.png differ
diff --git a/src/gfx/tilesets/clubentrance.t15.png b/src/gfx/tilesets/clubentrance.t15.png
deleted file mode 100644
index e641020..0000000
Binary files a/src/gfx/tilesets/clubentrance.t15.png and /dev/null differ
diff --git a/src/gfx/tilesets/clublobby.png b/src/gfx/tilesets/clublobby.png
new file mode 100644
index 0000000..7a5a7be
Binary files /dev/null and b/src/gfx/tilesets/clublobby.png differ
diff --git a/src/gfx/tilesets/clublobby.t8.png b/src/gfx/tilesets/clublobby.t8.png
deleted file mode 100644
index 7a5a7be..0000000
Binary files a/src/gfx/tilesets/clublobby.t8.png and /dev/null differ
diff --git a/src/gfx/tilesets/fightingclub.png b/src/gfx/tilesets/fightingclub.png
new file mode 100644
index 0000000..6747644
Binary files /dev/null and b/src/gfx/tilesets/fightingclub.png differ
diff --git a/src/gfx/tilesets/fightingclub.t13.png b/src/gfx/tilesets/fightingclub.t13.png
deleted file mode 100644
index 6747644..0000000
Binary files a/src/gfx/tilesets/fightingclub.t13.png and /dev/null differ
diff --git a/src/gfx/tilesets/fireclub.png b/src/gfx/tilesets/fireclub.png
new file mode 100644
index 0000000..28638bd
Binary files /dev/null and b/src/gfx/tilesets/fireclub.png differ
diff --git a/src/gfx/tilesets/fireclub.t9.png b/src/gfx/tilesets/fireclub.t9.png
deleted file mode 100644
index 28638bd..0000000
Binary files a/src/gfx/tilesets/fireclub.t9.png and /dev/null differ
diff --git a/src/gfx/tilesets/grassclub.png b/src/gfx/tilesets/grassclub.png
new file mode 100644
index 0000000..69496ad
Binary files /dev/null and b/src/gfx/tilesets/grassclub.png differ
diff --git a/src/gfx/tilesets/grassclub.t9.png b/src/gfx/tilesets/grassclub.t9.png
deleted file mode 100644
index 69496ad..0000000
Binary files a/src/gfx/tilesets/grassclub.t9.png and /dev/null differ
diff --git a/src/gfx/tilesets/hallofhonor.png b/src/gfx/tilesets/hallofhonor.png
new file mode 100644
index 0000000..358630d
Binary files /dev/null and b/src/gfx/tilesets/hallofhonor.png differ
diff --git a/src/gfx/tilesets/hallofhonor.t7.png b/src/gfx/tilesets/hallofhonor.t7.png
deleted file mode 100644
index 358630d..0000000
Binary files a/src/gfx/tilesets/hallofhonor.t7.png and /dev/null differ
diff --git a/src/gfx/tilesets/ishihara.png b/src/gfx/tilesets/ishihara.png
new file mode 100644
index 0000000..4761a69
Binary files /dev/null and b/src/gfx/tilesets/ishihara.png differ
diff --git a/src/gfx/tilesets/ishihara.t3.png b/src/gfx/tilesets/ishihara.t3.png
deleted file mode 100644
index 4761a69..0000000
Binary files a/src/gfx/tilesets/ishihara.t3.png and /dev/null differ
diff --git a/src/gfx/tilesets/lightningclub.png b/src/gfx/tilesets/lightningclub.png
new file mode 100644
index 0000000..bbe0572
Binary files /dev/null and b/src/gfx/tilesets/lightningclub.png differ
diff --git a/src/gfx/tilesets/lightningclub.t13.png b/src/gfx/tilesets/lightningclub.t13.png
deleted file mode 100644
index bbe0572..0000000
Binary files a/src/gfx/tilesets/lightningclub.t13.png and /dev/null differ
diff --git a/src/gfx/tilesets/masonlaboratory.png b/src/gfx/tilesets/masonlaboratory.png
new file mode 100644
index 0000000..4c5d90b
Binary files /dev/null and b/src/gfx/tilesets/masonlaboratory.png differ
diff --git a/src/gfx/tilesets/masonlaboratory.t9.png b/src/gfx/tilesets/masonlaboratory.t9.png
deleted file mode 100644
index 4c5d90b..0000000
Binary files a/src/gfx/tilesets/masonlaboratory.t9.png and /dev/null differ
diff --git a/src/gfx/tilesets/pokemondome.png b/src/gfx/tilesets/pokemondome.png
new file mode 100644
index 0000000..b4abf6c
Binary files /dev/null and b/src/gfx/tilesets/pokemondome.png differ
diff --git a/src/gfx/tilesets/pokemondome.t1.png b/src/gfx/tilesets/pokemondome.t1.png
deleted file mode 100644
index b4abf6c..0000000
Binary files a/src/gfx/tilesets/pokemondome.t1.png and /dev/null differ
diff --git a/src/gfx/tilesets/pokemondomeentrance.png b/src/gfx/tilesets/pokemondomeentrance.png
new file mode 100644
index 0000000..c80ef7f
Binary files /dev/null and b/src/gfx/tilesets/pokemondomeentrance.png differ
diff --git a/src/gfx/tilesets/pokemondomeentrance.t2.png b/src/gfx/tilesets/pokemondomeentrance.t2.png
deleted file mode 100644
index c80ef7f..0000000
Binary files a/src/gfx/tilesets/pokemondomeentrance.t2.png and /dev/null differ
diff --git a/src/gfx/tilesets/psychicclub.png b/src/gfx/tilesets/psychicclub.png
new file mode 100644
index 0000000..6a3a00f
Binary files /dev/null and b/src/gfx/tilesets/psychicclub.png differ
diff --git a/src/gfx/tilesets/psychicclub.t6.png b/src/gfx/tilesets/psychicclub.t6.png
deleted file mode 100644
index 6a3a00f..0000000
Binary files a/src/gfx/tilesets/psychicclub.t6.png and /dev/null differ
diff --git a/src/gfx/tilesets/rockclub.png b/src/gfx/tilesets/rockclub.png
new file mode 100644
index 0000000..59bf1bb
Binary files /dev/null and b/src/gfx/tilesets/rockclub.png differ
diff --git a/src/gfx/tilesets/rockclub.t4.png b/src/gfx/tilesets/rockclub.t4.png
deleted file mode 100644
index 59bf1bb..0000000
Binary files a/src/gfx/tilesets/rockclub.t4.png and /dev/null differ
diff --git a/src/gfx/tilesets/scienceclub.png b/src/gfx/tilesets/scienceclub.png
new file mode 100644
index 0000000..a736fe1
Binary files /dev/null and b/src/gfx/tilesets/scienceclub.png differ
diff --git a/src/gfx/tilesets/scienceclub.t14.png b/src/gfx/tilesets/scienceclub.t14.png
deleted file mode 100644
index a736fe1..0000000
Binary files a/src/gfx/tilesets/scienceclub.t14.png and /dev/null differ
diff --git a/src/gfx/tilesets/waterclub.png b/src/gfx/tilesets/waterclub.png
new file mode 100644
index 0000000..815e5ae
Binary files /dev/null and b/src/gfx/tilesets/waterclub.png differ
diff --git a/src/gfx/tilesets/waterclub.t15.png b/src/gfx/tilesets/waterclub.t15.png
deleted file mode 100644
index 815e5ae..0000000
Binary files a/src/gfx/tilesets/waterclub.t15.png and /dev/null differ
diff --git a/src/gfx/titlescreen/titlescreen1.png b/src/gfx/titlescreen/titlescreen1.png
new file mode 100644
index 0000000..82b39e5
Binary files /dev/null and b/src/gfx/titlescreen/titlescreen1.png differ
diff --git a/src/gfx/titlescreen/titlescreen1.t15.png b/src/gfx/titlescreen/titlescreen1.t15.png
deleted file mode 100644
index 82b39e5..0000000
Binary files a/src/gfx/titlescreen/titlescreen1.t15.png and /dev/null differ
diff --git a/src/gfx/titlescreen/titlescreen2.png b/src/gfx/titlescreen/titlescreen2.png
new file mode 100644
index 0000000..f54b7c3
Binary files /dev/null and b/src/gfx/titlescreen/titlescreen2.png differ
diff --git a/src/gfx/titlescreen/titlescreen2.t15.png b/src/gfx/titlescreen/titlescreen2.t15.png
deleted file mode 100644
index f54b7c3..0000000
Binary files a/src/gfx/titlescreen/titlescreen2.t15.png and /dev/null differ
diff --git a/src/gfx/titlescreen/titlescreen3.png b/src/gfx/titlescreen/titlescreen3.png
new file mode 100644
index 0000000..adddee4
Binary files /dev/null and b/src/gfx/titlescreen/titlescreen3.png differ
diff --git a/src/gfx/titlescreen/titlescreen3.t12.png b/src/gfx/titlescreen/titlescreen3.t12.png
deleted file mode 100644
index adddee4..0000000
Binary files a/src/gfx/titlescreen/titlescreen3.t12.png and /dev/null differ
diff --git a/src/gfx/titlescreen/titlescreen4.png b/src/gfx/titlescreen/titlescreen4.png
new file mode 100644
index 0000000..1d3cb92
Binary files /dev/null and b/src/gfx/titlescreen/titlescreen4.png differ
diff --git a/src/gfx/titlescreen/titlescreen4.t5.png b/src/gfx/titlescreen/titlescreen4.t5.png
deleted file mode 100644
index 1d3cb92..0000000
Binary files a/src/gfx/titlescreen/titlescreen4.t5.png and /dev/null differ
diff --git a/src/gfx/titlescreen/titlescreen5.png b/src/gfx/titlescreen/titlescreen5.png
new file mode 100644
index 0000000..3cb6ab3
Binary files /dev/null and b/src/gfx/titlescreen/titlescreen5.png differ
diff --git a/src/gfx/titlescreen/titlescreen5.t4.png b/src/gfx/titlescreen/titlescreen5.t4.png
deleted file mode 100644
index 3cb6ab3..0000000
Binary files a/src/gfx/titlescreen/titlescreen5.t4.png and /dev/null differ
diff --git a/src/gfx/titlescreen/titlescreen6.png b/src/gfx/titlescreen/titlescreen6.png
new file mode 100644
index 0000000..4f0dbe8
Binary files /dev/null and b/src/gfx/titlescreen/titlescreen6.png differ
diff --git a/src/gfx/titlescreen/titlescreen6.t12.png b/src/gfx/titlescreen/titlescreen6.t12.png
deleted file mode 100644
index 4f0dbe8..0000000
Binary files a/src/gfx/titlescreen/titlescreen6.t12.png and /dev/null differ
-- 
cgit v1.2.3


From de98637af1bbb51d98cfdfc1555ce6f205f45401 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Mon, 14 Dec 2020 12:02:36 -0600
Subject: Clean up whitespace

---
 src/data/map_objects.asm        |   1 -
 src/engine/bank02.asm           |   1 -
 src/engine/bank03.asm           | 552 ++++++++++++++++++++--------------------
 src/engine/bank06.asm           |   6 +-
 src/engine/effect_functions.asm |  45 ++--
 src/engine/home.asm             |   2 +-
 src/wram.asm                    |   4 +-
 7 files changed, 298 insertions(+), 313 deletions(-)

(limited to 'src')

diff --git a/src/data/map_objects.asm b/src/data/map_objects.asm
index 4749a19..069b12d 100644
--- a/src/data/map_objects.asm
+++ b/src/data/map_objects.asm
@@ -538,7 +538,6 @@ PokemonDomeEntranceObjects: ; 13e5e (3:7e5e)
 	tx Text0500
 	tx Text04ff
 
-
 	db NORTH, 2, 8
 	dw PrintInteractableObjectText
 	tx Text0502
diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm
index eefd707..3cee5df 100644
--- a/src/engine/bank02.asm
+++ b/src/engine/bank02.asm
@@ -191,7 +191,6 @@ DuelCheckMenu_OppPlayArea: ; 80da (2:40da)
 	call DrawYourOrOppPlayArea_DrawArrows
 	call DrawWideTextBox
 
-
 ; reset cursor blink
 	xor a
 	ld [wCheckMenuCursorBlinkCounter], a
diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm
index 58367e2..efd2b8e 100644
--- a/src/engine/bank03.asm
+++ b/src/engine/bank03.asm
@@ -3439,48 +3439,48 @@ Script_d827: ; d827 (3:5827)
 ; 0xd82d
 
 	INCROM $d82d, $d834
-	
+
 AfterTutorialBattleScript: ; d834 (3:5834)
-        start_script
-        run_command ScriptCommand_PrintTextString
-        tx Text05eb
-        run_command ScriptCommand_PrintTextString
-        tx Text05ef
-        run_command ScriptCommand_CloseTextBox
-        run_command ScriptCommand_MoveActiveNPC
-        dw NPCMovement_d896
-        run_command ScriptCommand_SetPlayerDirection
-        db NORTH
-        run_command ScriptCommand_MovePlayer
-        db NORTH
-        db $01
-        run_command ScriptCommand_MovePlayer
-        db NORTH
-        db $01
-        run_command ScriptCommand_MovePlayer
-        db NORTH
-        db $01
-        run_command ScriptCommand_SetPlayerDirection
-        db EAST
-        run_command ScriptCommand_MovePlayer
-        db EAST
-        db $01
-        run_command ScriptCommand_MovePlayer
-        db EAST
-        db $01
-        run_command ScriptCommand_SetPlayerDirection
-        db NORTH
-        run_command ScriptCommand_PrintTextString
-        tx Text05f0
-        run_command ScriptCommand_CloseTextBox
-        run_command Func_ccdc
-        tx Text05f1
-        run_command ScriptCommand_CloseTextBox
-        run_command ScriptCommand_PrintTextString
-        tx Text05f2
-        run_command Func_d271
+	start_script
+	run_command ScriptCommand_PrintTextString
+	tx Text05eb
+	run_command ScriptCommand_PrintTextString
+	tx Text05ef
+	run_command ScriptCommand_CloseTextBox
+	run_command ScriptCommand_MoveActiveNPC
+	dw NPCMovement_d896
+	run_command ScriptCommand_SetPlayerDirection
+	db NORTH
+	run_command ScriptCommand_MovePlayer
+	db NORTH
+	db $01
+	run_command ScriptCommand_MovePlayer
+	db NORTH
+	db $01
+	run_command ScriptCommand_MovePlayer
+	db NORTH
+	db $01
+	run_command ScriptCommand_SetPlayerDirection
+	db EAST
+	run_command ScriptCommand_MovePlayer
+	db EAST
+	db $01
+	run_command ScriptCommand_MovePlayer
+	db EAST
+	db $01
+	run_command ScriptCommand_SetPlayerDirection
+	db NORTH
+	run_command ScriptCommand_PrintTextString
+	tx Text05f0
+	run_command ScriptCommand_CloseTextBox
+	run_command Func_ccdc
+	tx Text05f1
+	run_command ScriptCommand_CloseTextBox
+	run_command ScriptCommand_PrintTextString
+	tx Text05f2
+	run_command Func_d271
 ; 0xd860
-	
+
 	INCROM $d860, $d880
 
 NPCMovement_d880: ; d880 (3:5880)
@@ -3512,7 +3512,7 @@ NPCMovement_d88b: ; d88b (3:588b)
 NPCMovement_d894: ; d894 (4:5894)
 	db SOUTH | NO_MOVE
 	db $ff
-	
+
 NPCMovement_d896: ; d896 (3:5896)
 	db NORTH
 	db NORTH
@@ -3847,6 +3847,7 @@ FightingClubLobbyAfterDuel: ; dc68 (3:5c68)
 	ld hl, .after_duel_table
 	call FindEndOfBattleScript
 	ret
+
 .after_duel_table
 	db NPC_IMAKUNI
 	db NPC_IMAKUNI
@@ -3984,12 +3985,10 @@ Script_Butch: ; dd8d (3:5d8d)
 Script_Granny1: ; dd9f (3:5d9f)
 	INCROM $dd9f, $dda3
 
-
-
 FightingClubAfterDuel: ; dda3 (3:5da3)
-        ld hl, .after_duel_table
-        call FindEndOfBattleScript
-        ret
+	ld hl, .after_duel_table
+	call FindEndOfBattleScript
+	ret
 ; 0xddaa
 
 .after_duel_table
@@ -4017,149 +4016,147 @@ FightingClubAfterDuel: ; dda3 (3:5da3)
 ; ddc3
 
 Script_Mitch: ; ddc3 (3:5dc3)
-        start_script
-        run_command ScriptCommand_TryGivePCPack
-        db $02
-        run_command ScriptCommand_JumpIfFlagNonzero2
-        db EVENT_FLAG_0F
-        dw Script_Mitch_AlreadyHaveMedal
-        run_command ScriptCommand_JumpBasedOnFightingClubPupilStatus
-        dw .first_interaction
-        dw .three_pupils_remaining
-        dw .two_pupils_remaining
-        dw .one_pupil_remaining
-        dw .all_pupils_defeated
+	start_script
+	run_command ScriptCommand_TryGivePCPack
+	db $02
+	run_command ScriptCommand_JumpIfFlagNonzero2
+	db EVENT_FLAG_0F
+	dw Script_Mitch_AlreadyHaveMedal
+	run_command ScriptCommand_JumpBasedOnFightingClubPupilStatus
+	dw .first_interaction
+	dw .three_pupils_remaining
+	dw .two_pupils_remaining
+	dw .one_pupil_remaining
+	dw .all_pupils_defeated
 .first_interaction
-        run_command ScriptCommand_PrintTextString
-        tx Text0477
-        run_command ScriptCommand_SetFlagValue
-        db EVENT_FLAG_11
-        db $01
-        run_command ScriptCommand_SetFlagValue
-        db EVENT_FLAG_17
-        db $01
-        run_command ScriptCommand_SetFlagValue
-        db EVENT_FLAG_20
-        db $01
-        run_command ScriptCommand_QuitScriptFully
+	run_command ScriptCommand_PrintTextString
+	tx Text0477
+	run_command ScriptCommand_SetFlagValue
+	db EVENT_FLAG_11
+	db $01
+	run_command ScriptCommand_SetFlagValue
+	db EVENT_FLAG_17
+	db $01
+	run_command ScriptCommand_SetFlagValue
+	db EVENT_FLAG_20
+	db $01
+	run_command ScriptCommand_QuitScriptFully
 ; 0xdde2
 .three_pupils_remaining
-        run_command ScriptCommand_PrintTextQuitFully
-        tx Text0478
+	run_command ScriptCommand_PrintTextQuitFully
+	tx Text0478
 ; 0xdde5
 .two_pupils_remaining
-        run_command ScriptCommand_PrintTextQuitFully
-        tx Text0479
+	run_command ScriptCommand_PrintTextQuitFully
+	tx Text0479
 ; 0xdde8
 .one_pupil_remaining
-        run_command ScriptCommand_PrintTextQuitFully
-        tx Text047a
+	run_command ScriptCommand_PrintTextQuitFully
+	tx Text047a
 ; 0xddeb
 .all_pupils_defeated
-        run_command ScriptCommand_PrintTextString
-        tx Text047b
-        run_command ScriptCommand_AskQuestionJump
-        tx Text047c
-        dw .do_battle
-        run_command ScriptCommand_PrintTextString
-        tx Text047d
-        run_command ScriptCommand_QuitScriptFully
+	run_command ScriptCommand_PrintTextString
+	tx Text047b
+	run_command ScriptCommand_AskQuestionJump
+	tx Text047c
+	dw .do_battle
+	run_command ScriptCommand_PrintTextString
+	tx Text047d
+	run_command ScriptCommand_QuitScriptFully
 ; 0xddf7
 .do_battle
-        run_command ScriptCommand_PrintTextString
-        tx Text047e
-        run_command ScriptCommand_StartBattle
-        db PRIZES_6
-        db FIRST_STRIKE_DECK_ID
-        db MUSIC_DUEL_THEME_2
-        run_command ScriptCommand_QuitScriptFully
+	run_command ScriptCommand_PrintTextString
+	tx Text047e
+	run_command ScriptCommand_StartBattle
+	db PRIZES_6
+	db FIRST_STRIKE_DECK_ID
+	db MUSIC_DUEL_THEME_2
+	run_command ScriptCommand_QuitScriptFully
 ; 0xddff
 
 Script_BeatMitch: ; ddff (3:5dff)
-        start_script
-        run_command ScriptCommand_JumpIfFlagNonzero2
-        db EVENT_FLAG_0F
-        dw Script_Mitch_GiveBoosters
-        run_command ScriptCommand_PrintTextString
-        tx Text047f
-        run_command ScriptCommand_MaxOutFlagValue
-        db EVENT_FLAG_0F
-        run_command ScriptCommand_TryGiveMedalPCPacks
-        run_command Func_d125
-        db $0f
-        run_command Func_d435
-        db $01
-        run_command ScriptCommand_PrintTextString
-        tx Text0480
-        run_command ScriptCommand_GiveBoosterPacks
-        db BOOSTER_LABORATORY_NEUTRAL
-        db BOOSTER_LABORATORY_NEUTRAL
-        db NO_BOOSTER
-        run_command ScriptCommand_PrintTextString
-        tx Text0481
-        run_command ScriptCommand_QuitScriptFully
+	start_script
+	run_command ScriptCommand_JumpIfFlagNonzero2
+	db EVENT_FLAG_0F
+	dw Script_Mitch_GiveBoosters
+	run_command ScriptCommand_PrintTextString
+	tx Text047f
+	run_command ScriptCommand_MaxOutFlagValue
+	db EVENT_FLAG_0F
+	run_command ScriptCommand_TryGiveMedalPCPacks
+	run_command Func_d125
+	db $0f
+	run_command Func_d435
+	db $01
+	run_command ScriptCommand_PrintTextString
+	tx Text0480
+	run_command ScriptCommand_GiveBoosterPacks
+	db BOOSTER_LABORATORY_NEUTRAL
+	db BOOSTER_LABORATORY_NEUTRAL
+	db NO_BOOSTER
+	run_command ScriptCommand_PrintTextString
+	tx Text0481
+	run_command ScriptCommand_QuitScriptFully
 ; 0xde19
 
 Script_LoseToMitch: ; de19 (3:5e19)
-        start_script
-        run_command ScriptCommand_JumpIfFlagNonzero2
-        db EVENT_FLAG_0F
-        dw Script_Mitch_PrintTrainHarderText
-        run_command ScriptCommand_PrintTextQuitFully
-        tx Text0482
+	start_script
+	run_command ScriptCommand_JumpIfFlagNonzero2
+	db EVENT_FLAG_0F
+	dw Script_Mitch_PrintTrainHarderText
+	run_command ScriptCommand_PrintTextQuitFully
+	tx Text0482
 ; 0xde21
 
-Script_Mitch_AlreadyHaveMedal: ; 0xde21
-        run_command ScriptCommand_PrintTextString
-        tx Text0483
-        run_command ScriptCommand_AskQuestionJump
-        tx Text047c
-        dw .do_battle
-        run_command ScriptCommand_PrintTextString
-        tx Text0484
-        run_command ScriptCommand_QuitScriptFully
+Script_Mitch_AlreadyHaveMedal: ; de21 (3:5e21)
+	run_command ScriptCommand_PrintTextString
+	tx Text0483
+	run_command ScriptCommand_AskQuestionJump
+	tx Text047c
+	dw .do_battle
+	run_command ScriptCommand_PrintTextString
+	tx Text0484
+	run_command ScriptCommand_QuitScriptFully
 ; 0xde2d
 .do_battle
-        run_command ScriptCommand_PrintTextString
-        tx Text0485
-        run_command ScriptCommand_StartBattle
-        db PRIZES_6
-        db FIRST_STRIKE_DECK_ID
-        db MUSIC_DUEL_THEME_2
-        run_command ScriptCommand_QuitScriptFully
+	run_command ScriptCommand_PrintTextString
+	tx Text0485
+	run_command ScriptCommand_StartBattle
+	db PRIZES_6
+	db FIRST_STRIKE_DECK_ID
+	db MUSIC_DUEL_THEME_2
+	run_command ScriptCommand_QuitScriptFully
 ; 0xde35
 
-Script_Mitch_GiveBoosters:
-        run_command ScriptCommand_PrintTextString
-        tx Text0486
-        run_command ScriptCommand_GiveBoosterPacks
-        db BOOSTER_LABORATORY_NEUTRAL
-        db BOOSTER_LABORATORY_NEUTRAL
-        db NO_BOOSTER
-        run_command ScriptCommand_PrintTextString
-        tx Text0487
-        run_command ScriptCommand_QuitScriptFully
+Script_Mitch_GiveBoosters: ; de35 (3:5e35)
+	run_command ScriptCommand_PrintTextString
+	tx Text0486
+	run_command ScriptCommand_GiveBoosterPacks
+	db BOOSTER_LABORATORY_NEUTRAL
+	db BOOSTER_LABORATORY_NEUTRAL
+	db NO_BOOSTER
+	run_command ScriptCommand_PrintTextString
+	tx Text0487
+	run_command ScriptCommand_QuitScriptFully
 ; 0xde40
 
-Script_Mitch_PrintTrainHarderText:
-        run_command ScriptCommand_PrintTextQuitFully
-        tx Text0488
+Script_Mitch_PrintTrainHarderText: ; de40 (3:5e40)
+	run_command ScriptCommand_PrintTextQuitFully
+	tx Text0488
 ; 0xde43
 
 	INCROM $de43, $ded1
-  
+
 Script_Clerk2: ; ded1 (3:5ed1)
 	INCROM $ded1, $ded5
 
-
 RockClubLobbyAfterDuel: ; ded5 (3:5ed5)
-        ld hl, .after_duel_table
-        call FindEndOfBattleScript
-        ret
+	ld hl, .after_duel_table
+	call FindEndOfBattleScript
+	ret
 ; 0xdedc
 
 .after_duel_table
-
 	db NPC_CHRIS
 	db NPC_CHRIS
 	dw $5f0c
@@ -4173,7 +4170,7 @@ RockClubLobbyAfterDuel: ; ded5 (3:5ed5)
 ; 0xdee9
 
 	INCROM $dee9, $def2
-  
+
 Script_Chris: ; def2 (3:5ef2)
 	INCROM $def2, $df39
 
@@ -4201,11 +4198,10 @@ Script_Gene: ; e03e (3:603e)
 Script_Clerk3: ; e09e (3:609e)
 	INCROM $e09e, $e0a2
 
-  
 WaterClubLobbyAfterDuel: ; e0a2 (3:60a2)
-        ld hl, .after_duel_table
-        call FindEndOfBattleScript
-        ret
+	ld hl, .after_duel_table
+	call FindEndOfBattleScript
+	ret
 ; 0xe0a9
 
 .after_duel_table
@@ -4216,7 +4212,6 @@ WaterClubLobbyAfterDuel: ; e0a2 (3:60a2)
 	db $00
 ; 0xe0b0
 
-
 Preload_ImakuniInWaterClubLobby: ; e0b0 (3:60b0)
 	get_flag_value EVENT_IMAKUNI_STATE
 	cp IMAKUNI_TALKED
@@ -4855,9 +4850,9 @@ Script_Clerk4: ; e369 (3:6369)
 	INCROM $e369, $e36d
 
 LightningClubLobbyAfterDuel: ; e36d (3:636d)
-        ld hl, .after_duel_table
-        call FindEndOfBattleScript
-        ret
+	ld hl, .after_duel_table
+	call FindEndOfBattleScript
+	ret
 ; 0xe374
 
 .after_duel_table
@@ -5492,15 +5487,13 @@ ScriptJump_FinishedSecondRonaldFight: ; e959 (3:6959)
 	run_command ScriptCommand_QuitScriptFully
 ; 0xe963
 
-
 PsychicClubLobbyAfterDuel: ; e963 (3:6963)
-        ld hl, .after_duel_table
-        call FindEndOfBattleScript
-        ret
+	ld hl, .after_duel_table
+	call FindEndOfBattleScript
+	ret
 ; 0xe96a
 
 .after_duel_table
-
 	db NPC_ROBERT
 	db NPC_ROBERT
 	dw $6995
@@ -5508,16 +5501,16 @@ PsychicClubLobbyAfterDuel: ; e963 (3:6963)
 	db $00
 
 	INCROM $e971, $e980
-  
+
 Script_Robert: ; e980 (3:6980)
 	INCROM $e980, $e9a5
-  
+
 Script_Pappy1: ; e9a5 (3:69a5)
 	INCROM $e9a5, $ea30
 
 Script_Gal3: ; ea30 (3:6a30)
 	INCROM $ea30, $ea3b
-  
+
 Script_Chap4: ; ea3b (3:6a3b)
 	INCROM $ea3b, $ea60
 
@@ -5526,25 +5519,23 @@ Script_Daniel: ; ea60 (3:6a60)
 
 Script_Stephanie: ; eaa2 (3:6aa2)
 	INCROM $eaa2, $eadf
-  
+
 Script_Murray2: ; eadf (3:6adf)
 	INCROM $eadf, $eadf
 
 Script_Murray1: ; eadf (3:6adf)
 	INCROM $eadf, $eb53
-  
+
 Script_Clerk7: ; eb53 (3:6b53)
 	INCROM $eb53, $eb57
 
-
 ScienceClubLobbyAfterDuel:; eb57 (3:6b57)
-        ld hl, .after_duel_table
-        call FindEndOfBattleScript
-        ret
+	ld hl, .after_duel_table
+	call FindEndOfBattleScript
+	ret
 ; 0xeb5e
 
 .after_duel_table
-	
 	db NPC_IMAKUNI
 	db NPC_IMAKUNI
 	dw Script_BeatImakuni
@@ -5553,7 +5544,7 @@ ScienceClubLobbyAfterDuel:; eb57 (3:6b57)
 ; 0xeb65
 
 	INCROM $eb65, $eb84
-  
+
 Script_Lad1: ; eb84 (3:6b84)
 	INCROM $eb84, $ebc1
 
@@ -5582,9 +5573,9 @@ Script_Clerk8: ; ed45 (3:6d45)
 	INCROM $ed45, $ed49
 
 FireClubLobbyAfterDuel: ; ed49 (3:6d49)
-        ld hl, .after_duel_table
-        call FindEndOfBattleScript
-        ret
+	ld hl, .after_duel_table
+	call FindEndOfBattleScript
+	ret
 ; 0xed50
 
 .after_duel_table
@@ -5677,8 +5668,7 @@ Script_ee76: ; ee76 (3:6e76)
 Script_Mania: ; ee88 (3:6e88)
 	INCROM $ee88, $ee93
 
-
-FireClubAfterDuel: ;ee93  (3:6e93)
+FireClubAfterDuel: ; ee93  (3:6e93)
 	ld hl, .after_duel_table
 	call FindEndOfBattleScript
 	ret
@@ -5686,18 +5676,18 @@ FireClubAfterDuel: ;ee93  (3:6e93)
 .after_duel_table
 	db NPC_JOHN
 	db NPC_JOHN
-	dw $6ec8 
+	dw $6ec8
 	dw $6ed4
- 
+
 	db NPC_ADAM
 	db NPC_ADAM
-	dw $6eed 
-	dw $6ef9 
+	dw $6eed
+	dw $6ef9
 
 	db NPC_JONATHAN
 	db NPC_JONATHAN
-	dw $6f12 
-	dw $6f1e 
+	dw $6f12
+	dw $6f1e
 
 	db NPC_KEN
 	db NPC_KEN
@@ -5717,111 +5707,109 @@ Script_Jonathan: ; eefd (3:6efd)
 	INCROM $eefd, $ef22
 
 Script_Ken: ; ef22 (3:6f22)
-        start_script
-        run_command ScriptCommand_TryGivePCPack
-        db $09
-        run_command ScriptCommand_JumpIfFlagNonzero2
-        db EVENT_FLAG_23
-        dw .have_300_cards
-        run_command ScriptCommand_CheckRawAmountOfCardsOwned
-        dw 300
-        dw .have_300_cards
-        run_command ScriptCommand_JumpIfFlagZero1
-        db EVENT_FLAG_24
-        dw NO_JUMP
-        run_command ScriptCommand_PrintVariableText
-        tx Text06ba
-        tx Text06bb
-        run_command ScriptCommand_SetFlagValue
-        db EVENT_FLAG_24
-        db $01
-        run_command ScriptCommand_QuitScriptFully
+	start_script
+	run_command ScriptCommand_TryGivePCPack
+	db $09
+	run_command ScriptCommand_JumpIfFlagNonzero2
+	db EVENT_FLAG_23
+	dw .have_300_cards
+	run_command ScriptCommand_CheckRawAmountOfCardsOwned
+	dw 300
+	dw .have_300_cards
+	run_command ScriptCommand_JumpIfFlagZero1
+	db EVENT_FLAG_24
+	dw NO_JUMP
+	run_command ScriptCommand_PrintVariableText
+	tx Text06ba
+	tx Text06bb
+	run_command ScriptCommand_SetFlagValue
+	db EVENT_FLAG_24
+	db $01
+	run_command ScriptCommand_QuitScriptFully
 .have_300_cards
-        run_command ScriptCommand_MaxOutFlagValue
-        db EVENT_FLAG_23
-        run_command ScriptCommand_JumpIfFlagNonzero2
-        db EVENT_FLAG_0A
-        dw Script_KenBattle_AlreadyHaveMedal
-        run_command ScriptCommand_JumpIfFlagZero1
-        db EVENT_FLAG_24
-        dw NO_JUMP
-        run_command ScriptCommand_PrintVariableText
-        tx Text06bc
-        tx Text06bd
-        run_command ScriptCommand_SetFlagValue
-        db EVENT_FLAG_24
-        db $01
-        run_command ScriptCommand_AskQuestionJump
-        tx Text06be
-        dw .do_battle
-        run_command ScriptCommand_PrintTextString
-        tx Text06bf
-        run_command ScriptCommand_QuitScriptFully
+	run_command ScriptCommand_MaxOutFlagValue
+	db EVENT_FLAG_23
+	run_command ScriptCommand_JumpIfFlagNonzero2
+	db EVENT_FLAG_0A
+	dw Script_KenBattle_AlreadyHaveMedal
+	run_command ScriptCommand_JumpIfFlagZero1
+	db EVENT_FLAG_24
+	dw NO_JUMP
+	run_command ScriptCommand_PrintVariableText
+	tx Text06bc
+	tx Text06bd
+	run_command ScriptCommand_SetFlagValue
+	db EVENT_FLAG_24
+	db $01
+	run_command ScriptCommand_AskQuestionJump
+	tx Text06be
+	dw .do_battle
+	run_command ScriptCommand_PrintTextString
+	tx Text06bf
+	run_command ScriptCommand_QuitScriptFully
 .do_battle
-        run_command ScriptCommand_PrintTextString
-        tx Text06c0
-        run_command ScriptCommand_StartBattle
-        db PRIZES_6
-        db FIRE_CHARGE_DECK_ID
-        db MUSIC_DUEL_THEME_2
-        run_command ScriptCommand_QuitScriptFully
+	run_command ScriptCommand_PrintTextString
+	tx Text06c0
+	run_command ScriptCommand_StartBattle
+	db PRIZES_6
+	db FIRE_CHARGE_DECK_ID
+	db MUSIC_DUEL_THEME_2
+	run_command ScriptCommand_QuitScriptFully
 ; 0xef5e
 
 Script_BeatKen: ; ef5e (3:6f5e)
-        start_script
-        run_command ScriptCommand_PrintTextString
-        tx Text06c1
-        run_command ScriptCommand_JumpIfFlagNonzero2
-        db EVENT_FLAG_0A
-        dw .give_booster_packs
-        run_command ScriptCommand_MaxOutFlagValue
-        db EVENT_FLAG_0A
-        run_command ScriptCommand_TryGiveMedalPCPacks
-        run_command Func_d125
-        db $0a
-        run_command Func_d435
-        db $08
-        run_command ScriptCommand_PrintTextString
-        tx Text06c2
+	start_script
+	run_command ScriptCommand_PrintTextString
+	tx Text06c1
+	run_command ScriptCommand_JumpIfFlagNonzero2
+	db EVENT_FLAG_0A
+	dw .give_booster_packs
+	run_command ScriptCommand_MaxOutFlagValue
+	db EVENT_FLAG_0A
+	run_command ScriptCommand_TryGiveMedalPCPacks
+	run_command Func_d125
+	db $0a
+	run_command Func_d435
+	db $08
+	run_command ScriptCommand_PrintTextString
+	tx Text06c2
 .give_booster_packs
-        run_command ScriptCommand_GiveBoosterPacks
-        db BOOSTER_MYSTERY_NEUTRAL
-        db BOOSTER_MYSTERY_NEUTRAL
-        db NO_BOOSTER
-        run_command ScriptCommand_PrintTextString
-        tx Text06c3
-        run_command ScriptCommand_QuitScriptFully
+	run_command ScriptCommand_GiveBoosterPacks
+	db BOOSTER_MYSTERY_NEUTRAL
+	db BOOSTER_MYSTERY_NEUTRAL
+	db NO_BOOSTER
+	run_command ScriptCommand_PrintTextString
+	tx Text06c3
+	run_command ScriptCommand_QuitScriptFully
 ; 0xef78
 
-
-
 Script_LoseToKen: ; ef78 (3:6f78)
-        start_script
-        run_command ScriptCommand_JumpIfFlagZero2
-        db EVENT_FLAG_0A
-        dw NO_JUMP
-        run_command ScriptCommand_PrintVariableText
-        tx Text06c4
-        tx Text06c5
-        run_command ScriptCommand_QuitScriptFully
+	start_script
+	run_command ScriptCommand_JumpIfFlagZero2
+	db EVENT_FLAG_0A
+	dw NO_JUMP
+	run_command ScriptCommand_PrintVariableText
+	tx Text06c4
+	tx Text06c5
+	run_command ScriptCommand_QuitScriptFully
 ; 0xef83
 
 Script_KenBattle_AlreadyHaveMedal: ; ef83 (3:6f83)
-        run_command ScriptCommand_PrintTextString
-        tx Text06c6
-        run_command ScriptCommand_AskQuestionJump
-        tx Text06be
-        dw .do_battle
-        run_command ScriptCommand_PrintTextQuitFully
-        tx Text06bf
+	run_command ScriptCommand_PrintTextString
+	tx Text06c6
+	run_command ScriptCommand_AskQuestionJump
+	tx Text06be
+	dw .do_battle
+	run_command ScriptCommand_PrintTextQuitFully
+	tx Text06bf
 .do_battle
-        run_command ScriptCommand_PrintTextString
-        tx Text06c7
-        run_command ScriptCommand_StartBattle
-        db PRIZES_6
-        db FIRE_CHARGE_DECK_ID
-        db MUSIC_DUEL_THEME_2
-        run_command ScriptCommand_QuitScriptFully
+	run_command ScriptCommand_PrintTextString
+	tx Text06c7
+	run_command ScriptCommand_StartBattle
+	db PRIZES_6
+	db FIRE_CHARGE_DECK_ID
+	db MUSIC_DUEL_THEME_2
+	run_command ScriptCommand_QuitScriptFully
 ; 0xef96
 
 Preload_Clerk9: ; ef96 (3:6f96)
diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm
index 7833675..75916c4 100644
--- a/src/engine/bank06.asm
+++ b/src/engine/bank06.asm
@@ -1523,10 +1523,10 @@ Func_19a12: ; 19a12 (6:5a12)
 ; 0x19a1f
 
 	INCROM $19a1f, $19c20
-	
+
 Func_19c20: ; 19c20 (6:5c20)
-    INCROM $19c20, $1a4cf
-	
+	INCROM $19c20, $1a4cf
+
 Func_1a4cf: ; 1a4cf (6:64cf)
 	INCROM $1a4cf, $1a61f
 
diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm
index 4ed3dbe..896d03c 100644
--- a/src/engine/effect_functions.asm
+++ b/src/engine/effect_functions.asm
@@ -727,34 +727,33 @@ Func_2cbfb: ; 2cbfb (b:4bfb)
 ; 0x2cc0a
 
 	INCROM $2cc0a, $2f4e1
-	
+
 ImposterProfessorOakEffect: ; 2f4e1 (b:74e1)
-        call SwapTurn
-        call CreateHandCardList
-        call SortCardsInDuelTempListByID
-        ld hl, wDuelTempList
+	call SwapTurn
+	call CreateHandCardList
+	call SortCardsInDuelTempListByID
+	ld hl, wDuelTempList
 .return_hand_to_deck_loop
-        ld a, [hli]
-        cp $ff
-        jr z, .shuffle
-        call RemoveCardFromHand
-        call ReturnCardToDeck
-        jr .return_hand_to_deck_loop
+	ld a, [hli]
+	cp $ff
+	jr z, .shuffle
+	call RemoveCardFromHand
+	call ReturnCardToDeck
+	jr .return_hand_to_deck_loop
 .shuffle
-        call Func_2c0bd
-        ld a, $07
-        bank1call $4935
-        ld c, $07
+	call Func_2c0bd
+	ld a, $07
+	bank1call $4935
+	ld c, $07
 .draw_loop
-        call DrawCardFromDeck
-        jr c, .revert_turn_to_user
-        call AddCardToHand
-        dec c
-        jr nz, .draw_loop
+	call DrawCardFromDeck
+	jr c, .revert_turn_to_user
+	call AddCardToHand
+	dec c
+	jr nz, .draw_loop
 .revert_turn_to_user
-        call SwapTurn
-        ret
+	call SwapTurn
+	ret
 ; 0x2f513
 
-
 	INCROM $2f513, $30000
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 90b0af1..860e551 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -11461,7 +11461,7 @@ DrawSpriteAnimationFrame: ; 3cc4 (0:3cc4)
 	call BankswitchROM
 	ret
 
-; Loads a pointer to the current animation frame into SPRITE_ANIM_FRAME_DATA_POINTER using 
+; Loads a pointer to the current animation frame into SPRITE_ANIM_FRAME_DATA_POINTER using
 ; the current frame's offset
 ; [wd4ca] - current frame offset
 ; wTempPointer* - Pointer to current Animation
diff --git a/src/wram.asm b/src/wram.asm
index bb1f346..9797034 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -2321,10 +2321,10 @@ wd4b0:: ; d4b0
 
 wd4b1:: ; d4b1
 	ds $1
-	
+
 wd4b2:: ; d4b2
 	ds $1
-	
+
 	ds $b
 
 wd4be:: ; d4be
-- 
cgit v1.2.3


From f4d31e19b0de7c9390f5645b551212ce2696b7b5 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Mon, 14 Dec 2020 13:03:18 -0600
Subject: Clean up some address comments

---
 src/engine/bank01.asm           | 26 ++++++++---------
 src/engine/bank02.asm           | 30 ++++++++++----------
 src/engine/bank03.asm           | 41 ++++-----------------------
 src/engine/bank04.asm           |  2 +-
 src/engine/bank05.asm           |  6 ++--
 src/engine/bank06.asm           | 62 ++++++++++++++++++++---------------------
 src/engine/bank07.asm           |  5 ++--
 src/engine/booster_packs.asm    |  4 +--
 src/engine/effect_functions.asm |  4 +--
 src/engine/home.asm             | 30 ++++++++++----------
 src/wram.asm                    | 10 +++----
 11 files changed, 93 insertions(+), 127 deletions(-)

(limited to 'src')

diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm
index c4a6b27..40c3edf 100644
--- a/src/engine/bank01.asm
+++ b/src/engine/bank01.asm
@@ -1019,7 +1019,7 @@ HandleEnergyDiscardMenuInput: ; 46b7 (1:46b7)
 	scf
 	ret
 
-EnergyDiscardCardListParameters:
+EnergyDiscardCardListParameters: ; 46f3 (1:46f3)
 	db 1, 5 ; cursor x, cursor y
 	db 4 ; item x
 	db 14 ; maximum length, in tiles, occupied by the name and level string of each card in the list
@@ -1161,7 +1161,7 @@ OpenMovePage: ; 478b (1:478b)
 	jr z, .loop
 	ret
 
-AttackMenuParameters:
+AttackMenuParameters: ; 47e4 (1:47e4)
 	db 1, 13 ; cursor x, cursor y
 	db 2 ; y displacement between items
 	db 2 ; number of items
@@ -1554,7 +1554,7 @@ PrintNumberOfHandAndDeckCards: ; 49ed (1:49ed)
 	jr nz, PrintOpponentNumberOfHandAndDeckCards
 ;	fallthrough
 
-PrintPlayerNumberOfHandAndDeckCards:
+PrintPlayerNumberOfHandAndDeckCards: ; 49f3 (1:49f3)
 	ld a, [wPlayerNumberOfCardsInHand]
 	ld hl, wNumCardsBeingDrawn
 	add [hl]
@@ -1572,7 +1572,7 @@ PrintPlayerNumberOfHandAndDeckCards:
 	lb bc, 10, 10
 	jp WriteTwoDigitNumberInTxSymbolFormat
 
-PrintOpponentNumberOfHandAndDeckCards:
+PrintOpponentNumberOfHandAndDeckCards: ; 4a14 (1:4a14)
 	ld a, [wOpponentNumberOfCardsInHand]
 	ld hl, wNumCardsBeingDrawn
 	add [hl]
@@ -1590,7 +1590,7 @@ PrintOpponentNumberOfHandAndDeckCards:
 	lb bc, 11, 3
 	jp WriteTwoDigitNumberInTxSymbolFormat
 
-DeckAndHandIconsTileData:
+DeckAndHandIconsTileData: ; 4a35 (1:4a35)
 ; x, y, tiles[], 0
 	db  4,  3, SYM_CROSS, 0 ; x for opponent's hand
 	db 10,  3, SYM_CROSS, 0 ; x for opponent's deck
@@ -1606,7 +1606,7 @@ DeckAndHandIconsTileData:
 	db 13, 10, $fa, $fb,  0 ; player's hand icon
 	db $ff
 
-DeckAndHandIconsCGBPalData:
+DeckAndHandIconsCGBPalData: ; 4a6e (1:4a6e)
 ; x, y, pals[], 0
 	db  8,  2, $02, $02, 0
 	db  8,  3, $02, $02, 0
@@ -2134,7 +2134,7 @@ DisplayNoBasicPokemonInHandScreen: ; 4e06 (1:4e06)
 	call WaitForWideTextBoxInput
 	ret
 
-NoBasicPokemonCardListParameters:
+NoBasicPokemonCardListParameters: ; 4e37 (1:4e37)
 	db 1, 3 ; cursor x, cursor y
 	db 4 ; item x
 	db 14 ; maximum length, in tiles, occupied by the name and level string of each card in the list
@@ -3061,7 +3061,7 @@ PracticeDuelVerify_Turn7Or8: ; 54b7 (1:54b7)
 	jr nz, ReturnWrongAction
 	ret
 
-ReturnWrongAction:
+ReturnWrongAction: ; 54c6 (1:54c6)
 	scf
 	ret
 
@@ -3230,7 +3230,7 @@ InitAndDrawCardListScreenLayout: ; 559a (1:559a)
 
 ; same as InitAndDrawCardListScreenLayout, except that variables like wSelectedDuelSubMenuItem,
 ; wNoItemSelectionMenuKeys, wCardListInfoBoxText, wCardListHeaderText, etc already set by caller.
-DrawCardListScreenLayout:
+DrawCardListScreenLayout: ; 55be (1:55be)
 	call ZeroObjectPositionsAndToggleOAMCopy
 	call EmptyScreen
 	call LoadSymbolsFont
@@ -5170,7 +5170,7 @@ Func_6137: ; 6137 (1:6137)
 	call EraseCursor
 ;	fallthrough
 
-Func_615c:
+Func_615c: ; 615c (1:615c)
 	ld a, [wCurrentDuelMenuItem]
 	ld d, a
 	add a
@@ -5194,7 +5194,7 @@ Func_616e: ; 616e (1:616e)
 	call EnableLCD
 ;	fallthrough
 
-Func_6186:
+Func_6186: ; 6186 (1:6186)
 	ld hl, wCurPlayAreaSlot
 	ldh a, [hTempPlayAreaLocation_ff9d]
 	ld [hli], a
@@ -6945,7 +6945,6 @@ Func_6cfa: ; 6cfa (1:6cfa)
 	pop hl
 	call WaitForWideTextBoxInput
 	ret
-; 0x6d3f
 
 Func_6d3f: ; 6d3f (1:6d3f)
 	or a
@@ -6985,7 +6984,6 @@ Func_6d3f: ; 6d3f (1:6d3f)
 	pop af
 	pop hl
 	ret
-; 0x6d84
 
 ; given the deck index of a turn holder's card in register a,
 ; and a pointer in hl to the wLoadedCard* buffer where the card data is loaded,
@@ -8042,7 +8040,6 @@ PlayMoveAnimation: ; 7494 (1:7494)
 Func_7571: ; 7571 (1:7571)
 	farcall Func_19c20
 	ret
-; 0x7576
 
 Func_7576: ; 7576 (1:7576)
 	farcall Func_1991f
@@ -8054,7 +8051,6 @@ Func_7576: ; 7576 (1:7576)
 Func_758f: ; 758f (1:758f)
 	farcall Func_1a4cf
 	ret
-; 0x7594
 
 Func_7594: ; 7594 (1:7594)
 	farcall Func_1a61f
diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm
index 3cee5df..1e6179b 100644
--- a/src/engine/bank02.asm
+++ b/src/engine/bank02.asm
@@ -105,7 +105,7 @@ OpenYourOrOppPlayAreaScreen_TurnHolderPlayArea: ; 809e (2:409e)
 	ldh [hWhoseTurn], a
 	ret
 
-OpenYourOrOppPlayAreaScreen_NonTurnHolderPlayArea:
+OpenYourOrOppPlayAreaScreen_NonTurnHolderPlayArea: ; 80a8 (2:40a8)
 	ldh a, [hWhoseTurn]
 	push af
 	bank1call OpenNonTurnHolderPlayAreaScreen
@@ -113,7 +113,7 @@ OpenYourOrOppPlayAreaScreen_NonTurnHolderPlayArea:
 	ldh [hWhoseTurn], a
 	ret
 
-OpenYourOrOppPlayAreaScreen_TurnHolderHand:
+OpenYourOrOppPlayAreaScreen_TurnHolderHand: ; 80b2 (2:40b2)
 	ldh a, [hWhoseTurn]
 	push af
 	bank1call OpenTurnHolderHandScreen_Simple
@@ -121,7 +121,7 @@ OpenYourOrOppPlayAreaScreen_TurnHolderHand:
 	ldh [hWhoseTurn], a
 	ret
 
-OpenYourOrOppPlayAreaScreen_NonTurnHolderHand:
+OpenYourOrOppPlayAreaScreen_NonTurnHolderHand: ; 80bc (2:40bc)
 	ldh a, [hWhoseTurn]
 	push af
 	bank1call OpenNonTurnHolderHandScreen_Simple
@@ -129,7 +129,7 @@ OpenYourOrOppPlayAreaScreen_NonTurnHolderHand:
 	ldh [hWhoseTurn], a
 	ret
 
-OpenYourOrOppPlayAreaScreen_TurnHolderDiscardPile:
+OpenYourOrOppPlayAreaScreen_TurnHolderDiscardPile: ; 80c6 (2:40c6)
 	ldh a, [hWhoseTurn]
 	push af
 	bank1call OpenTurnHolderDiscardPileScreen
@@ -137,7 +137,7 @@ OpenYourOrOppPlayAreaScreen_TurnHolderDiscardPile:
 	ldh [hWhoseTurn], a
 	ret
 
-OpenYourOrOppPlayAreaScreen_NonTurnHolderDiscardPile:
+OpenYourOrOppPlayAreaScreen_NonTurnHolderDiscardPile: ; 80d0 (2:40d0)
 	ldh a, [hWhoseTurn]
 	push af
 	bank1call OpenNonTurnHolderDiscardPileScreen
@@ -233,25 +233,25 @@ DuelCheckMenu_OppPlayArea: ; 80da (2:40da)
 	dw OpenYourOrOppPlayAreaScreen_NonTurnHolderHand
 	dw OpenYourOrOppPlayAreaScreen_NonTurnHolderDiscardPile
 
-CheckMenuData: ; (2:4158)
+CheckMenuData: ; 8158 (2:4158)
 	textitem  2, 14, InPlayAreaText
 	textitem  2, 16, YourPlayAreaText
 	textitem 12, 14, GlossaryText
 	textitem 12, 16, OppPlayAreaText
 	db $ff
 
-YourPlayAreaMenuData: ; (2:4169)
+YourPlayAreaMenuData: ; 8169 (2:4169)
 	textitem  2, 14, YourPokemonText
 	textitem 12, 14, YourHandText
 	textitem  2, 16, YourDiscardPileText2
 	db $ff
 
-OppPlayAreaMenuData: ; (2:4176)
+OppPlayAreaMenuData: ; 8176 (2:4176)
 	textitem  2, 14, OpponentsPokemonText
 	textitem  2, 16, OpponentsDiscardPileText2
 	db $ff
 
-OppPlayAreaMenuData_WithClairvoyance: ; (2:4176)
+OppPlayAreaMenuData_WithClairvoyance: ; 8176 (2:4176)
 	textitem  2, 14, OpponentsPokemonText
 	textitem 12, 14, OpponentsHandText
 	textitem  2, 16, OpponentsDiscardPileText2
@@ -1287,7 +1287,7 @@ HandleCheckMenuInput_YourOrOppPlayArea: ; 86ac (2:46ac)
 	call EraseCheckMenuCursor_YourOrOppPlayArea
 	pop de
 
-;update x and y cursor positions
+; update x and y cursor positions
 	ld a, d
 	ld [wCheckMenuCursorXPosition], a
 	ld a, e
@@ -1512,7 +1512,7 @@ Func_8819: ; 8819 (2:4819)
 	call GetTurnDuelistVariable
 	jr Func_8855
 
-Func_883c:
+Func_883c: ; 883c (2:483c)
 	call CreateHandCardList
 	ret c
 	ld hl, wDuelTempList
@@ -1520,7 +1520,7 @@ Func_883c:
 	ld a, [hl]
 	jr Func_8855
 
-Func_8849:
+Func_8849: ; 8849 (2:4849)
 	call CreateDeckCardList
 	ret c
 	ld a, %01111111
@@ -1533,7 +1533,7 @@ Func_8849:
 ; output:
 ; a = ce5c
 ; with upper bit set if turn was swapped
-Func_8855:
+Func_8855: ; 8855 (2:4855)
 	ld b, a
 	ld a, [$ce5c]
 	or a
@@ -2307,7 +2307,7 @@ HandleCheckMenuInput: ; 9065 (2:5065)
 	call EraseCheckMenuCursor
 	pop de
 
-;update x and y cursor positions
+; update x and y cursor positions
 	ld a, d
 	ld [wCheckMenuCursorXPosition], a
 	ld a, e
@@ -2359,7 +2359,7 @@ EraseCheckMenuCursor: ; 90d8 (2:50d8)
 ; draws in the cursor position
 ; input:
 ; a = tile byte to draw
-DrawCheckMenuCursor:
+DrawCheckMenuCursor: ; 90da (2:50da)
 	ld e, a
 	ld a, 10
 	ld l, a
diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm
index efd2b8e..8c4b599 100644
--- a/src/engine/bank03.asm
+++ b/src/engine/bank03.asm
@@ -2107,7 +2107,7 @@ ScriptCommand_MoveWramNPC: ; ce52 (3:4e52)
 
 ; Executes movement on an arbitrary NPC using values in a and on the stack
 ; Changes and fixes Temp NPC using stack values
-ExecuteArbitraryNPCMovementFromStack:
+ExecuteArbitraryNPCMovementFromStack: ; ce5d (3:4e5d)
 	ld [wTempNPC], a
 	call FindLoadedNPC
 	call ExecuteNPCMovement
@@ -3104,7 +3104,7 @@ ScriptCommand_JumpIfFlagNonzero2: ; d4ca (3:54ca)
 .noJumpArgs
 	jp IncreaseScriptPointerBy4
 
-ScriptCommand_JumpIfFlagZero2:
+ScriptCommand_JumpIfFlagZero2: ; d4df (3:54df)
 	ld a, c
 	call GetEventFlagValue
 	or a
@@ -3989,7 +3989,6 @@ FightingClubAfterDuel: ; dda3 (3:5da3)
 	ld hl, .after_duel_table
 	call FindEndOfBattleScript
 	ret
-; 0xddaa
 
 .after_duel_table
 	db NPC_CHRIS
@@ -4041,19 +4040,15 @@ Script_Mitch: ; ddc3 (3:5dc3)
 	db EVENT_FLAG_20
 	db $01
 	run_command ScriptCommand_QuitScriptFully
-; 0xdde2
 .three_pupils_remaining
 	run_command ScriptCommand_PrintTextQuitFully
 	tx Text0478
-; 0xdde5
 .two_pupils_remaining
 	run_command ScriptCommand_PrintTextQuitFully
 	tx Text0479
-; 0xdde8
 .one_pupil_remaining
 	run_command ScriptCommand_PrintTextQuitFully
 	tx Text047a
-; 0xddeb
 .all_pupils_defeated
 	run_command ScriptCommand_PrintTextString
 	tx Text047b
@@ -4063,7 +4058,6 @@ Script_Mitch: ; ddc3 (3:5dc3)
 	run_command ScriptCommand_PrintTextString
 	tx Text047d
 	run_command ScriptCommand_QuitScriptFully
-; 0xddf7
 .do_battle
 	run_command ScriptCommand_PrintTextString
 	tx Text047e
@@ -4072,7 +4066,6 @@ Script_Mitch: ; ddc3 (3:5dc3)
 	db FIRST_STRIKE_DECK_ID
 	db MUSIC_DUEL_THEME_2
 	run_command ScriptCommand_QuitScriptFully
-; 0xddff
 
 Script_BeatMitch: ; ddff (3:5dff)
 	start_script
@@ -4097,7 +4090,6 @@ Script_BeatMitch: ; ddff (3:5dff)
 	run_command ScriptCommand_PrintTextString
 	tx Text0481
 	run_command ScriptCommand_QuitScriptFully
-; 0xde19
 
 Script_LoseToMitch: ; de19 (3:5e19)
 	start_script
@@ -4106,7 +4098,6 @@ Script_LoseToMitch: ; de19 (3:5e19)
 	dw Script_Mitch_PrintTrainHarderText
 	run_command ScriptCommand_PrintTextQuitFully
 	tx Text0482
-; 0xde21
 
 Script_Mitch_AlreadyHaveMedal: ; de21 (3:5e21)
 	run_command ScriptCommand_PrintTextString
@@ -4117,7 +4108,6 @@ Script_Mitch_AlreadyHaveMedal: ; de21 (3:5e21)
 	run_command ScriptCommand_PrintTextString
 	tx Text0484
 	run_command ScriptCommand_QuitScriptFully
-; 0xde2d
 .do_battle
 	run_command ScriptCommand_PrintTextString
 	tx Text0485
@@ -4126,7 +4116,6 @@ Script_Mitch_AlreadyHaveMedal: ; de21 (3:5e21)
 	db FIRST_STRIKE_DECK_ID
 	db MUSIC_DUEL_THEME_2
 	run_command ScriptCommand_QuitScriptFully
-; 0xde35
 
 Script_Mitch_GiveBoosters: ; de35 (3:5e35)
 	run_command ScriptCommand_PrintTextString
@@ -4138,7 +4127,6 @@ Script_Mitch_GiveBoosters: ; de35 (3:5e35)
 	run_command ScriptCommand_PrintTextString
 	tx Text0487
 	run_command ScriptCommand_QuitScriptFully
-; 0xde40
 
 Script_Mitch_PrintTrainHarderText: ; de40 (3:5e40)
 	run_command ScriptCommand_PrintTextQuitFully
@@ -4154,7 +4142,6 @@ RockClubLobbyAfterDuel: ; ded5 (3:5ed5)
 	ld hl, .after_duel_table
 	call FindEndOfBattleScript
 	ret
-; 0xdedc
 
 .after_duel_table
 	db NPC_CHRIS
@@ -4202,7 +4189,6 @@ WaterClubLobbyAfterDuel: ; e0a2 (3:60a2)
 	ld hl, .after_duel_table
 	call FindEndOfBattleScript
 	ret
-; 0xe0a9
 
 .after_duel_table
 	db NPC_IMAKUNI
@@ -4210,7 +4196,6 @@ WaterClubLobbyAfterDuel: ; e0a2 (3:60a2)
 	dw Script_BeatImakuni
 	dw Script_LostToImakuni
 	db $00
-; 0xe0b0
 
 Preload_ImakuniInWaterClubLobby: ; e0b0 (3:60b0)
 	get_flag_value EVENT_IMAKUNI_STATE
@@ -4349,7 +4334,7 @@ WaterClubMovePlayer: ; e13f (3:613f)
 	ld bc, Script_NotReadyToSeeAmy
 	jp SetNextNPCAndScript
 
-WaterClubAfterDuel: ;e157 (3:6157)
+WaterClubAfterDuel: ; e157 (3:6157)
 	ld hl, .after_duel_table
 	call FindEndOfBattleScript
 	ret
@@ -4844,7 +4829,6 @@ ScriptJump_TalkToAmyAgain: ; e356 (3:6356)
 	db GO_GO_RAIN_DANCE_DECK_ID
 	db MUSIC_DUEL_THEME_2
 	run_command ScriptCommand_QuitScriptFully
-; 0xe369
 
 Script_Clerk4: ; e369 (3:6369)
 	INCROM $e369, $e36d
@@ -4853,7 +4837,6 @@ LightningClubLobbyAfterDuel: ; e36d (3:636d)
 	ld hl, .after_duel_table
 	call FindEndOfBattleScript
 	ret
-; 0xe374
 
 .after_duel_table
 	db NPC_IMAKUNI
@@ -5192,7 +5175,6 @@ Script_Lass2: ; e61f (3:661f)
 	db BLASTOISE
 	run_command ScriptCommand_PrintTextQuitFully
 	tx Text06f3
-; 0xe6d8
 
 Script_Granny2: ; e6d8 (3:66d8)
 	INCROM $e6d8, $e6e3
@@ -5262,7 +5244,6 @@ TrySecondRonaldFight: ; e837 (3:6837)
 	ret nz
 	ld bc, ScriptSecondRonaldFight
 	jp SetNextNPCAndScript
-; 0xe84c
 
 Script_Clerk6: ; e84c (3:684c)
 	INCROM $e84c, $e850
@@ -5382,7 +5363,7 @@ Script_LostToFirstRonaldFight: ; e8f7 (3:68f7)
 	run_command ScriptCommand_PrintTextString
 	tx Text064e
 
-ScriptJump_FinishedFirstRonaldFight:
+ScriptJump_FinishedFirstRonaldFight: ; e8fb (3:68fb)
 	run_command ScriptCommand_SetFlagValue
 	db EVENT_FLAG_4C
 	db $02
@@ -5485,13 +5466,11 @@ ScriptJump_FinishedSecondRonaldFight: ; e959 (3:6959)
 	run_command Func_cdcb
 	run_command Func_d41d
 	run_command ScriptCommand_QuitScriptFully
-; 0xe963
 
 PsychicClubLobbyAfterDuel: ; e963 (3:6963)
 	ld hl, .after_duel_table
 	call FindEndOfBattleScript
 	ret
-; 0xe96a
 
 .after_duel_table
 	db NPC_ROBERT
@@ -5529,11 +5508,10 @@ Script_Murray1: ; eadf (3:6adf)
 Script_Clerk7: ; eb53 (3:6b53)
 	INCROM $eb53, $eb57
 
-ScienceClubLobbyAfterDuel:; eb57 (3:6b57)
+ScienceClubLobbyAfterDuel: ; eb57 (3:6b57)
 	ld hl, .after_duel_table
 	call FindEndOfBattleScript
 	ret
-; 0xeb5e
 
 .after_duel_table
 	db NPC_IMAKUNI
@@ -5576,7 +5554,6 @@ FireClubLobbyAfterDuel: ; ed49 (3:6d49)
 	ld hl, .after_duel_table
 	call FindEndOfBattleScript
 	ret
-; 0xed50
 
 .after_duel_table
 	db NPC_JESSICA
@@ -5585,8 +5562,6 @@ FireClubLobbyAfterDuel: ; ed49 (3:6d49)
 	dw $6dce
 	db $00
 
-; 0xed57
-
 FireClubPressedA: ; ed57 (3:6d57)
 	ld hl, SlowpokePaintingObjectTable
 	call FindExtraInteractableObjects
@@ -5663,7 +5638,6 @@ Script_ee76: ; ee76 (3:6e76)
 	run_command ScriptCommand_ShowCardReceivedScreen
 	db SLOWPOKE1
 	run_command ScriptCommand_QuitScriptFully
-; 0xee88
 
 Script_Mania: ; ee88 (3:6e88)
 	INCROM $ee88, $ee93
@@ -5695,7 +5669,6 @@ FireClubAfterDuel: ; ee93  (3:6e93)
 	dw Script_LoseToKen
 
 	db $00
-; 0xeeb3
 
 Script_John: ; eeb3 (3:6eb3)
 	INCROM $eeb3, $eed8
@@ -5755,7 +5728,6 @@ Script_Ken: ; ef22 (3:6f22)
 	db FIRE_CHARGE_DECK_ID
 	db MUSIC_DUEL_THEME_2
 	run_command ScriptCommand_QuitScriptFully
-; 0xef5e
 
 Script_BeatKen: ; ef5e (3:6f5e)
 	start_script
@@ -5781,7 +5753,6 @@ Script_BeatKen: ; ef5e (3:6f5e)
 	run_command ScriptCommand_PrintTextString
 	tx Text06c3
 	run_command ScriptCommand_QuitScriptFully
-; 0xef78
 
 Script_LoseToKen: ; ef78 (3:6f78)
 	start_script
@@ -5792,7 +5763,6 @@ Script_LoseToKen: ; ef78 (3:6f78)
 	tx Text06c4
 	tx Text06c5
 	run_command ScriptCommand_QuitScriptFully
-; 0xef83
 
 Script_KenBattle_AlreadyHaveMedal: ; ef83 (3:6f83)
 	run_command ScriptCommand_PrintTextString
@@ -5810,7 +5780,6 @@ Script_KenBattle_AlreadyHaveMedal: ; ef83 (3:6f83)
 	db FIRE_CHARGE_DECK_ID
 	db MUSIC_DUEL_THEME_2
 	run_command ScriptCommand_QuitScriptFully
-; 0xef96
 
 Preload_Clerk9: ; ef96 (3:6f96)
 	call TryGiveMedalPCPacks
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm
index 8fb4d29..48f194c 100644
--- a/src/engine/bank04.asm
+++ b/src/engine/bank04.asm
@@ -1103,7 +1103,7 @@ _GameLoop: ; 126d1 (4:66d1)
 	scf
 	ret
 
-MainMenuFunctionTable:
+MainMenuFunctionTable: ; 126fc (4:66fc)
 	dw MainMenu_CardPop
 	dw MainMenu_ContinueFromDiary
 	dw MainMenu_NewGame
diff --git a/src/engine/bank05.asm b/src/engine/bank05.asm
index 6af2582..c5757e5 100644
--- a/src/engine/bank05.asm
+++ b/src/engine/bank05.asm
@@ -5738,7 +5738,7 @@ HandleSpecialAIMoves: ; 16dcd (5:6dcd)
 
 ; if any of card ID in a is found in deck,
 ; return a score of $80 + slots available in bench.
-HandleCallForFamily:
+HandleCallForFamily: ; 16e3e (5:6e3e)
 	ld a, CARD_LOCATION_DECK
 	call CheckIfAnyCardIDinLocation
 	jr nc, HandleSpecialAIMoves.zero
@@ -5754,7 +5754,7 @@ HandleCallForFamily:
 
 ; if any of NidoranM or NidoranF is found in deck,
 ; return a score of $80 + slots available in bench.
-HandleNidoranFCallForFamily:
+HandleNidoranFCallForFamily: ; 16e55 (5:6e55)
 	ld e, NIDORANM
 	ld a, CARD_LOCATION_DECK
 	call CheckIfAnyCardIDinLocation
@@ -5777,7 +5777,7 @@ HandleNidoranFCallForFamily:
 ; checks for certain card IDs of Fighting color in deck.
 ; if any of them are found, return a score of
 ; $80 + slots available in bench.
-HandleMarowak1CallForFriend:
+HandleMarowak1CallForFriend: ; 16e77 (5:6e77)
 	ld e, GEODUDE
 	ld a, CARD_LOCATION_DECK
 	call CheckIfAnyCardIDinLocation
diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm
index 75916c4..e6da805 100644
--- a/src/engine/bank06.asm
+++ b/src/engine/bank06.asm
@@ -90,7 +90,7 @@ _CopyCardNameAndLevel: ; 18000 (6:4000)
 	ret
 
 ; the name starts with TX_HALFWIDTH
-_CopyCardNameAndLevel_HalfwidthText:
+_CopyCardNameAndLevel_HalfwidthText: ; 18086 (6:4086)
 	ld a, [wcd9b]
 	inc a
 	add a
@@ -382,7 +382,7 @@ OpenInPlayAreaScreen: ; 180d5 (6:40d5)
 	dw OpenInPlayAreaScreen_NonTurnHolderPlayArea    ; 0x0e: INPLAYAREA_OPP_BENCH_4
 	dw OpenInPlayAreaScreen_NonTurnHolderPlayArea    ; 0x0f: INPLAYAREA_OPP_BENCH_5
 
-OpenInPlayAreaScreen_TurnHolderPlayArea:
+OpenInPlayAreaScreen_TurnHolderPlayArea: ; 18248 (6:4248)
 	; wInPlayAreaCurPosition constants conveniently map to (PLAY_AREA_* constants - 1)
 	; for bench locations. this mapping is taken for granted in the following code.
 	ld a, [wInPlayAreaCurPosition]
@@ -403,7 +403,7 @@ OpenInPlayAreaScreen_TurnHolderPlayArea:
 	bank1call OpenCardPage_FromCheckPlayArea
 	ret
 
-OpenInPlayAreaScreen_NonTurnHolderPlayArea:
+OpenInPlayAreaScreen_NonTurnHolderPlayArea: ; 1826a (6:426a)
 	ld a, [wInPlayAreaCurPosition]
 	sub INPLAYAREA_OPP_ACTIVE
 	or a
@@ -425,7 +425,7 @@ OpenInPlayAreaScreen_NonTurnHolderPlayArea:
 	call SwapTurn
 	ret
 
-OpenInPlayAreaScreen_TurnHolderHand:
+OpenInPlayAreaScreen_TurnHolderHand: ; 18293 (6:4293)
 	ldh a, [hWhoseTurn]
 	push af
 	bank1call OpenTurnHolderHandScreen_Simple
@@ -433,7 +433,7 @@ OpenInPlayAreaScreen_TurnHolderHand:
 	ldh [hWhoseTurn], a
 	ret
 
-OpenInPlayAreaScreen_NonTurnHolderHand:
+OpenInPlayAreaScreen_NonTurnHolderHand: ; 1829d (6:429d)
 	ldh a, [hWhoseTurn]
 	push af
 	bank1call OpenNonTurnHolderHandScreen_Simple
@@ -441,7 +441,7 @@ OpenInPlayAreaScreen_NonTurnHolderHand:
 	ldh [hWhoseTurn], a
 	ret
 
-OpenInPlayAreaScreen_TurnHolderDiscardPile:
+OpenInPlayAreaScreen_TurnHolderDiscardPile: ; 182a7 (6:42a7)
 	ldh a, [hWhoseTurn]
 	push af
 	bank1call OpenTurnHolderDiscardPileScreen
@@ -449,7 +449,7 @@ OpenInPlayAreaScreen_TurnHolderDiscardPile:
 	ldh [hWhoseTurn], a
 	ret
 
-OpenInPlayAreaScreen_NonTurnHolderDiscardPile:
+OpenInPlayAreaScreen_NonTurnHolderDiscardPile: ; 182b1 (6:42b1)
 	ldh a, [hWhoseTurn]
 	push af
 	bank1call OpenNonTurnHolderDiscardPileScreen
@@ -1197,7 +1197,7 @@ Func_19079: ; 19079 (6:5079)
 	call Func_3b6a
 	jp Func_18f9c.asm_4fd4
 
-PointerTable_006_508f: ; (6:508f)
+PointerTable_006_508f: ; 1908f (6:508f)
 	dw Func_18fdc
 	dw Func_19014
 	dw Func_18fdd
@@ -1715,32 +1715,32 @@ Func_1a73a: ; 1a73a (6:673a)
 	pop hl
 	ret
 
-WhatIsYourNameData: ; (6:675e)
+WhatIsYourNameData: ; 1a75e (6:675e)
 	textitem 1, 1, WhatIsYourNameText
 	db $ff
 ; [Deck1Data ~ Deck4Data]
 ; These are directed from around (2:4f05),
 ; without any bank description.
 ; That is, the developers hard-coded it. -_-;;
-Deck1Data: ; (6:6763)
+Deck1Data: ; 1a763 (6:6763)
 	textitem 2, 1, Text022b
 	textitem 14, 1, Text0219
 	db $ff
-Deck2Data: ; (6:676c)
+Deck2Data: ; 1a76c (6:676c)
 	textitem 2, 1, Text022c
 	textitem 14, 1, Text0219
 	db $ff
-Deck3Data: ; (6:6775)
+Deck3Data: ; 1a775 (6:6775)
 	textitem 2, 1, Text022d
 	textitem 14, 1, Text0219
 	db $ff
-Deck4Data: ; (6:677e)
+Deck4Data: ; 1a77e (6:677e)
 	textitem 2, 1, Text022e
 	textitem 14, 1, Text0219
 	db $ff
 
 ; set each byte zero from hl for b bytes.
-ClearMemory: ; (6:6787)
+ClearMemory: ; 1a787 (6:6787)
 	push af
 	push bc
 	push hl
@@ -1758,7 +1758,7 @@ ClearMemory: ; (6:6787)
 ; play different sfx by a.
 ; if a is 0xff play SFX_03 (usually following a B press),
 ; else play SFX_02 (usually following an A press).
-PlayAcceptOrDeclineSFX: ; (6:6794)
+PlayAcceptOrDeclineSFX: ; 1a794 (6:6794)
 	push af
 	inc a
 	jr z, .sfx_decline
@@ -1773,7 +1773,7 @@ PlayAcceptOrDeclineSFX: ; (6:6794)
 
 ; get player name from the user
 ; into hl
-InputPlayerName: ; (6:67a3)
+InputPlayerName: ; 1a7a3 (6:67a3)
 	ld e, l
 	ld d, h
 	ld a, MAX_PLAYER_NAME_LENGTH
@@ -1858,7 +1858,7 @@ InputPlayerName: ; (6:67a3)
 ; bc: position of name.
 ; de: dest. pointer.
 ; hl: pointer to text item of the question.
-InitializeInputName:
+InitializeInputName: ; 1a846 (6:6846)
 	ld [wNamingScreenBufferMaxLength], a
 	push hl
 	ld hl, wNamingScreenNamePosition
@@ -1900,7 +1900,7 @@ InitializeInputName:
 	ld [wNamingScreenBufferLength], a
 	ret
 
-FinalizeInputName:
+FinalizeInputName: ; 1a880 (6:6880)
 	ld hl, wNamingScreenDestPointer
 	ld e, [hl]
 	inc hl
@@ -1915,7 +1915,7 @@ FinalizeInputName:
 
 ; draws the keyboard frame
 ; and the question if it exists.
-DrawNamingScreenBG:
+DrawNamingScreenBG: ; 1a892 (6:6892)
 	call DrawTextboxForKeyboard
 	call PrintPlayerNameFromInput
 	ld hl, wNamingScreenQuestionPointer
@@ -1943,13 +1943,13 @@ DrawNamingScreenBG:
 	textitem $0f, $10, EndText ; "End"
 	db $ff
 
-DrawTextboxForKeyboard:
+DrawTextboxForKeyboard: ; 1a8c1 (6:68c1)
 	lb de, 0, 3 ; x, y
 	lb bc, 20, 15 ; w, h
 	call DrawRegularTextBox
 	ret
 
-PrintPlayerNameFromInput:
+PrintPlayerNameFromInput: ; 1a8cb (6:68cb)
 	ld hl, wNamingScreenNamePosition
 	ld d, [hl]
 	inc hl
@@ -1983,7 +1983,7 @@ endr
 
 ; check if button pressed.
 ; if pressed, set the carry bit on.
-NamingScreen_CheckButtonState:
+NamingScreen_CheckButtonState: ; 1a908 (6:6908)
 	xor a
 	ld [wPlaysSfx], a
 	ldh a, [hDPadHeld]
@@ -2232,7 +2232,7 @@ Func_1aa28: ; 1aa28 (6:6a28)
 ; load, to the first tile of v0Tiles0, the graphics for the
 ; blinking black square used in name input screens.
 ; for inputting full width text.
-LoadTextCursorTile:
+LoadTextCursorTile: ; 1aa65 (6:6a65)
 	ld hl, v0Tiles0 + $00 tiles
 	ld de, .data
 	ld b, 0
@@ -2253,7 +2253,7 @@ endr
 
 ; set the carry bit on,
 ; if "End" was selected.
-NamingScreen_ProcessInput:
+NamingScreen_ProcessInput: ; 1aa87 (6:6a87)
 	ld a, [wNamingScreenCursorX]
 	ld h, a
 	ld a, [wNamingScreenCursorY]
@@ -2416,7 +2416,7 @@ NamingScreen_ProcessInput:
 ; it seems to have been deprecated as the game was translated into english.
 ; but it can still be applied to english, such as upper-lower case transition.
 ; hl: info. pointer.
-TransformCharacter:
+TransformCharacter: ; 1ab61 (6:6b61)
 	ld a, [wNamingScreenBufferLength]
 	or a
 	jr z, .return ; if the length is zero, just return.
@@ -2468,7 +2468,7 @@ TransformCharacter:
 ; it returns the pointer to the proper information.
 ; h: position x.
 ; l: position y.
-GetCharInfoFromPos_Player:
+GetCharInfoFromPos_Player: ; 1ab93 (6:6b93)
 	push de
 	; (information index) = (x) * (height) + (y)
 	; (height) = 0x05(Deck) or 0x06(Player)
@@ -2510,7 +2510,7 @@ else
 endc
 ENDM
 
-KeyboardData_Player: ; (6:6baf)
+KeyboardData_Player: ; 1abaf (6:6baf)
 	kbitem $04, $02, $11, $00, TX_FULLWIDTH3,   "A"
 	kbitem $06, $02, $12, $00, TX_FULLWIDTH3,   "J"
 	kbitem $08, $02, $13, $00, TX_FULLWIDTH3,   "S"
@@ -2737,7 +2737,7 @@ InputDeckName: ; 1ad89 (6:6d89)
 ; load, to the first tile of v0Tiles0, the graphics for the
 ; blinking black square used in name input screens.
 ; for inputting half width text.
-LoadHalfWidthTextCursorTile:
+LoadHalfWidthTextCursorTile: ; 1ae37 (6:6e37)
 	ld hl, v0Tiles0 + $00 tiles
 	ld de, .data
 	ld b, 0
@@ -2757,7 +2757,7 @@ rept TILE_SIZE
 endr
 
 ; it's only for naming the deck.
-ProcessTextWithUnderbar:
+ProcessTextWithUnderbar: ; 1ae59 (6:6e59)
 	ld hl, wNamingScreenNamePosition
 	ld d, [hl]
 	inc hl
@@ -3036,7 +3036,7 @@ Func_1afc2: ; 1afc2 (6:6fc2)
 ; its unit size is 3, and player's is 6.
 ; h: x
 ; l: y
-GetCharInfoFromPos_Deck:
+GetCharInfoFromPos_Deck: ; 1b000 (6:7000)
 	push de
 	ld e, l
 	ld d, h
@@ -3058,7 +3058,7 @@ GetCharInfoFromPos_Deck:
 	jr nz, .loop
 	ret
 
-KeyboardData_Deck: ; (6:7019)
+KeyboardData_Deck: ; 1b019 (6:7019)
 	db $04, $02, "A"
 	db $06, $02, "J"
 	db $08, $02, "S"
diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm
index af41613..9d2b203 100644
--- a/src/engine/bank07.asm
+++ b/src/engine/bank07.asm
@@ -625,7 +625,7 @@ Func_1c8ef: ; 1c8ef (7:48ef)
 .address
 	dw Func_1c94a
 
-Func_1c94a:
+Func_1c94a: ; 1c94a (7:494a)
 	ld e, l
 	ld d, h
 	ld c, 3
@@ -777,6 +777,7 @@ macro_1ca04: MACRO
 	dw \1
 	db \2
 ENDM
+
 Data_1ca04:
 ; value(2), flag(1)
 	macro_1ca04 $5858, $08
@@ -795,7 +796,7 @@ Data_1ca04:
 	macro_1ca04 $2838, $00
 	macro_1ca04 $2818, $00
 
-Func_1ca31:
+Func_1ca31: ; 1ca31 (7:4a6b)
 	push hl
 	push bc
 	ld a, [wd4ac]
diff --git a/src/engine/booster_packs.asm b/src/engine/booster_packs.asm
index 8e7d0c2..a799d71 100644
--- a/src/engine/booster_packs.asm
+++ b/src/engine/booster_packs.asm
@@ -388,7 +388,7 @@ GenerateTwoTypesEnergyBooster:  ; 1e3ab (7:63ab)
 	jr nz, .add_two_energies_to_booster_loop
 ;	fallthrough
 
-ZeroBoosterRarityData:
+ZeroBoosterRarityData: ; 1e3be (7:63be)
 	xor a
 	ld [wBoosterData_CommonAmount], a
 	ld [wBoosterData_UncommonAmount], a
@@ -453,7 +453,7 @@ PutEnergiesAndNonEnergiesTogether: ; 1e3f3 (7:63f3)
 	ret
 
 ; add the final cards drawn from the booster pack to the player's colection (sCardCollection)
-AddBoosterCardsToCollection:; 1e40a (7:640a)
+AddBoosterCardsToCollection: ; 1e40a (7:640a)
 	push hl
 	ld hl, wBoosterCardsDrawn
 .add_cards_loop
diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm
index 896d03c..d881a5c 100644
--- a/src/engine/effect_functions.asm
+++ b/src/engine/effect_functions.asm
@@ -35,7 +35,7 @@ SleepEffect: ; 2c030 (b:4030)
 	lb bc, PSN_DBLPSN, ASLEEP
 	jr ApplyStatusEffect
 
-ApplyStatusEffect:
+ApplyStatusEffect: ; 2c035 (b:4035)
 	ldh a, [hWhoseTurn]
 	ld hl, wWhoseTurn
 	cp [hl]
@@ -102,7 +102,7 @@ Func_2c087: ; 2c087 (b:4087)
 Func_2c08a: ; 2c08a (b:408a)
 	ld a, $1
 
-Func_2c08c:
+Func_2c08c: ; 2c08c (b:408c)
 	push de
 	push af
 	ld a, OPPACTION_TOSS_COIN_A_TIMES
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 860e551..cd9c9c9 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -505,11 +505,11 @@ SetBGP: ; 040c (0:040c)
 ;	fallthrough
 
 ; Flush non-CGB palettes and the first CGB palette
-FlushPalette0:
+FlushPalette0: ; 040f (0:040f)
 	ld a, FLUSH_ONE_PAL
 ;	fallthrough
 
-FlushPalettes:
+FlushPalettes: ; 0411 (0:0411)
 	ld [wFlushPaletteFlags], a
 	ld a, [wLCDC]
 	rla
@@ -722,7 +722,7 @@ Reset: ; 051b (0:051b)
 	di
 	jp Start
 
-SaveButtonsHeld:
+SaveButtonsHeld: ; 0522 (0:0522)
 	ld a, c
 	ldh [hKeysHeld], a
 	ld a, JOY_BTNS_SELECT | JOY_DPAD_SELECT
@@ -939,7 +939,7 @@ WriteBCDNumberInTextFormat: ; 0614 (0:0614)
 
 ; given a BCD digit in the (lower nybble) of register a, write it in text (ascii)
 ;  format to hl. numbers above 9 end up converted to half-width font tiles.
-WriteBCDDigitInTextFormat:
+WriteBCDDigitInTextFormat: ; 061b (0:061b)
 	and $0f
 	add "0"
 	cp "9" + 1
@@ -4328,7 +4328,7 @@ CopyMoveDataAndDamage_FromDeckIndex: ; 16c0 (0:16c0)
 	call LoadCardDataToBuffer1_FromDeckIndex
 ;	fallthrough
 
-CopyMoveDataAndDamage:
+CopyMoveDataAndDamage: ; 16ca (0:16ca)
 	ld a, [wLoadedCard1ID]
 	ld [wTempCardID_ccc2], a
 	ld hl, wLoadedCard1Move1
@@ -5669,7 +5669,7 @@ DrawRegularTextBoxDMG: ; 1e88 (0:1e88)
 
 ; continue drawing a labeled or regular textbox on DMG or SGB:
 ; body and bottom line of either type of textbox
-ContinueDrawingTextBoxDMGorSGB:
+ContinueDrawingTextBoxDMGorSGB: ; 1e93 (0:1e93)
 	dec c
 	dec c
 .draw_text_box_body_loop
@@ -5720,7 +5720,7 @@ CopyLine: ; 1ea5 (0:1ea5)
 	ret
 
 ; DrawRegularTextBox branches here on CGB console
-DrawRegularTextBoxCGB:
+DrawRegularTextBoxCGB: ; 1ec9 (0:1ec9)
 	call DECoordToBGMap0Address
 	; top line (border) of the text box
 	ld a, SYM_BOX_TOP
@@ -5730,7 +5730,7 @@ DrawRegularTextBoxCGB:
 
 ; continue drawing a labeled or regular textbox on CGB:
 ; body and bottom line of either type of textbox
-ContinueDrawingTextBoxCGB:
+ContinueDrawingTextBoxCGB: ; 1ed4 (0:1ed4)
 	dec c
 	dec c
 .draw_text_box_body_loop
@@ -5764,7 +5764,7 @@ CopyCurrentLineTilesAndAttrCGB: ; 1efb (0:1efb)
 	pop hl
 ;	fallthrough
 
-CopyCurrentLineAttrCGB:
+CopyCurrentLineAttrCGB: ; 1f00 (0:1f00)
 	call BankswitchVRAM1
 	ld a, [wTextBoxFrameType] ; on CGB, wTextBoxFrameType determines the palette and the other attributes
 	ld e, a
@@ -5785,7 +5785,7 @@ DrawRegularTextBoxSGB: ; 1f0f (0:1f0f)
 	ret z
 ;	fallthrough
 
-ColorizeTextBoxSGB:
+ColorizeTextBoxSGB: ; 1f1b (0:1f1b)
 	push bc
 	push de
 	ld hl, wTempSGBPacket
@@ -7465,7 +7465,7 @@ PrintCardListItems: ; 2799 (0:2799)
 
 ; like PrintCardListItems, except more parameters are already initialized
 ; called instead of PrintCardListItems to reload the list after moving up or down
-ReloadCardListItems:
+ReloadCardListItems: ; 27af (0:27af)
 	ld e, SYM_SPACE
 	ld a, [wListScrollOffset]
 	or a
@@ -8042,7 +8042,7 @@ YesOrNoMenuWithText_LeftAligned: ; 2afe (0:2afe)
 	lb de, 2, 16 ; x, y
 ;	fallthrough
 
-HandleYesOrNoMenu:
+HandleYesOrNoMenu: ; 2b0a (0:2b0a)
 	ld a, d
 	ld [wLeftmostItemCursorX], a
 	lb bc, SYM_CURSOR_R, SYM_SPACE ; cursor tile, tile behind cursor
@@ -10343,7 +10343,7 @@ GetArenaCardWeakness: ; 3730 (0:3730)
 	ld a, DUELVARS_ARENA_CARD
 ;	fallthrough
 
-GetCardWeakness:
+GetCardWeakness: ; 3739 (0:3739)
 	call GetTurnDuelistVariable
 	call LoadCardDataToBuffer2_FromDeckIndex
 	ld a, [wLoadedCard2Weakness]
@@ -10368,7 +10368,7 @@ GetArenaCardResistance: ; 374a (0:374a)
 	ld a, DUELVARS_ARENA_CARD
 ;	fallthrough
 
-GetCardResistance:
+GetCardResistance: ; 3753 (0:3753)
 	call GetTurnDuelistVariable
 	call LoadCardDataToBuffer2_FromDeckIndex
 	ld a, [wLoadedCard2Resistance]
@@ -11525,7 +11525,7 @@ GetSpriteAnimBufferProperty: ; 3dbf (0:3dbf)
 	ld a, [wWhichSprite]
 ;	fallthrough
 
-GetSpriteAnimBufferProperty_SpriteInA:
+GetSpriteAnimBufferProperty_SpriteInA: ; 3dc2 (0:3dc2)
 	cp SPRITE_ANIM_BUFFER_CAPACITY
 	jr c, .got_sprite
 	debug_ret
diff --git a/src/wram.asm b/src/wram.asm
index 9797034..ae6d10a 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -346,7 +346,7 @@ wBoosterTempNonEnergiesDrawn:: ; c400
 	ds $b
 wBoosterTempEnergiesDrawn:: ; c40b
 	ds $b
-wBoosterCardsDrawnEnd::
+wBoosterCardsDrawnEnd:: ; c416
 	ds $6a
 
 NEXTU
@@ -1427,10 +1427,10 @@ wAIVenusaur2PlayAreaLocation:: ; ce05
 
 wce06:: ; ce06
 ; number of cards to be transferred by AI using Energy Trans.
-wAINumberOfEnergyTransCards::
+wAINumberOfEnergyTransCards:: ; ce06
 ; used for storing weakness of Player's Arena card
 ; in AI routine dealing with Shift Pkmn Power.
-wAIDefendingPokemonWeakness::
+wAIDefendingPokemonWeakness:: ; ce06
 	ds $1
 
 wce07:: ; ce07
@@ -2037,7 +2037,7 @@ NEXTU
 ; $00: passable (floor)
 ; $40: unpassable and talkable (NPC or talkable wall)
 ; $80: unpassable and untalkable (wall)
-wPermissionMap::
+wPermissionMap:: ; d133
 	ds $100
 
 ENDU
@@ -2249,7 +2249,7 @@ wd3d0:: ; d3d0
 wLoadedFlagBits:: ; d3d1
 	ds $1
 
-wEventFlags::
+wEventFlags:: ; d3d2
 	ds $40
 
 ; 0 keeps looping, other values break the loop in RST20
-- 
cgit v1.2.3


From d4c65263cd550f057681f86f5d09c3676ebab755 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Mon, 14 Dec 2020 15:47:00 -0600
Subject: Fix some comment alignment

---
 src/data/booster_packs.asm   |   4 +-
 src/data/map_headers.asm     |  66 +++++++-------
 src/data/move_animations.asm |   2 +-
 src/engine/booster_packs.asm |  12 +--
 src/engine/home.asm          |  14 +--
 src/gfx.asm                  |   8 +-
 src/macros/scripts.asm       | 206 +++++++++++++++++++++----------------------
 src/macros/text.asm          |   6 +-
 src/wram.asm                 |   2 +-
 9 files changed, 160 insertions(+), 160 deletions(-)

(limited to 'src')

diff --git a/src/data/booster_packs.asm b/src/data/booster_packs.asm
index 7d1090c..8524ca6 100644
--- a/src/data/booster_packs.asm
+++ b/src/data/booster_packs.asm
@@ -37,7 +37,7 @@ BoosterPack_ColosseumNeutral:: ; 1e4e4 (7:64e4)
 
 BoosterPack_ColosseumGrass:: ; 1e4f0 (7:64f0)
 	booster_set COLOSSEUM ; booster pack set
-	dw GRASS_ENERGY  ; energy or energy generation function
+	dw GRASS_ENERGY ; energy or energy generation function
 
 ; Card Type Chances
 	db 48 ; Grass Type Chance
@@ -52,7 +52,7 @@ BoosterPack_ColosseumGrass:: ; 1e4f0 (7:64f0)
 
 BoosterPack_ColosseumFire:: ; 1e4fc (7:64fc)
 	booster_set COLOSSEUM ; booster pack set
-	dw FIRE_ENERGY  ; energy or energy generation function
+	dw FIRE_ENERGY ; energy or energy generation function
 
 ; Card Type Chances
 	db 16 ; Grass Type Chance
diff --git a/src/data/map_headers.asm b/src/data/map_headers.asm
index 7f57a06..06a2e20 100644
--- a/src/data/map_headers.asm
+++ b/src/data/map_headers.asm
@@ -1,37 +1,37 @@
 ; TODO: figure out the rest of the data for each map
 ; related to the table at 20:4e5d
 MapHeaders: ; 1c374 (7:4374)
-	db $00,$01,$00,$01,$01,MUSIC_OVERWORLD   ; OVERWORLD_MAP
-	db $02,$03,$00,$02,$02,MUSIC_OVERWORLD   ; MASON_LABORATORY
-	db $06,$07,$00,$02,$02,MUSIC_OVERWORLD   ; DECK_MACHINE_ROOM
-	db $0A,$0B,$00,$03,$03,MUSIC_OVERWORLD   ; ISHIHARAS_HOUSE
-	db $0C,$0D,$00,$03,$04,MUSIC_OVERWORLD   ; FIGHTING_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD   ; FIGHTING_CLUB_LOBBY
-	db $20,$21,$00,$04,$0D,MUSIC_CLUB_3       ; FIGHTING_CLUB
-	db $0E,$0F,$00,$03,$05,MUSIC_OVERWORLD   ; ROCK_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD   ; ROCK_CLUB_LOBBY
-	db $22,$23,$00,$04,$0E,MUSIC_CLUB_2       ; ROCK_CLUB
-	db $10,$11,$00,$03,$06,MUSIC_OVERWORLD   ; WATER_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD   ; WATER_CLUB_LOBBY
-	db $24,$25,$00,$02,$0F,MUSIC_CLUB_2       ; WATER_CLUB
-	db $12,$13,$00,$03,$07,MUSIC_OVERWORLD   ; LIGHTNING_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD   ; LIGHTNING_CLUB_LOBBY
-	db $26,$27,$00,$05,$10,MUSIC_CLUB_1       ; LIGHTNING_CLUB
-	db $14,$15,$00,$03,$08,MUSIC_OVERWORLD   ; GRASS_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD   ; GRASS_CLUB_LOBBY
-	db $28,$29,$00,$06,$11,MUSIC_CLUB_1       ; GRASS_CLUB
-	db $16,$17,$00,$03,$09,MUSIC_OVERWORLD   ; PSYCHIC_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD   ; PSYCHIC_CLUB_LOBBY
-	db $2A,$2B,$00,$07,$12,MUSIC_CLUB_2       ; PSYCHIC_CLUB
-	db $18,$19,$00,$03,$0A,MUSIC_OVERWORLD   ; SCIENCE_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD   ; SCIENCE_CLUB_LOBBY
-	db $2C,$2D,$00,$06,$13,MUSIC_CLUB_3       ; SCIENCE_CLUB
-	db $1A,$1B,$00,$03,$0B,MUSIC_OVERWORLD   ; FIRE_CLUB_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD   ; FIRE_CLUB_LOBBY
-	db $2E,$2F,$00,$08,$14,MUSIC_CLUB_3       ; FIRE_CLUB
-	db $1C,$1D,$00,$03,$04,MUSIC_OVERWORLD   ; CHALLENGE_HALL_ENTRANCE
-	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD   ; CHALLENGE_HALL_LOBBY
-	db $30,$31,$00,$09,$15,MUSIC_OVERWORLD   ; CHALLENGE_HALL
-	db $32,$33,$00,$0A,$16,MUSIC_OVERWORLD   ; POKEMON_DOME_ENTRANCE
-	db $36,$37,$00,$0A,$17,MUSIC_POKEMON_DOME ; POKEMON_DOME
+	db $00,$01,$00,$01,$01,MUSIC_OVERWORLD     ; OVERWORLD_MAP
+	db $02,$03,$00,$02,$02,MUSIC_OVERWORLD     ; MASON_LABORATORY
+	db $06,$07,$00,$02,$02,MUSIC_OVERWORLD     ; DECK_MACHINE_ROOM
+	db $0A,$0B,$00,$03,$03,MUSIC_OVERWORLD     ; ISHIHARAS_HOUSE
+	db $0C,$0D,$00,$03,$04,MUSIC_OVERWORLD     ; FIGHTING_CLUB_ENTRANCE
+	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; FIGHTING_CLUB_LOBBY
+	db $20,$21,$00,$04,$0D,MUSIC_CLUB_3        ; FIGHTING_CLUB
+	db $0E,$0F,$00,$03,$05,MUSIC_OVERWORLD     ; ROCK_CLUB_ENTRANCE
+	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; ROCK_CLUB_LOBBY
+	db $22,$23,$00,$04,$0E,MUSIC_CLUB_2        ; ROCK_CLUB
+	db $10,$11,$00,$03,$06,MUSIC_OVERWORLD     ; WATER_CLUB_ENTRANCE
+	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; WATER_CLUB_LOBBY
+	db $24,$25,$00,$02,$0F,MUSIC_CLUB_2        ; WATER_CLUB
+	db $12,$13,$00,$03,$07,MUSIC_OVERWORLD     ; LIGHTNING_CLUB_ENTRANCE
+	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; LIGHTNING_CLUB_LOBBY
+	db $26,$27,$00,$05,$10,MUSIC_CLUB_1        ; LIGHTNING_CLUB
+	db $14,$15,$00,$03,$08,MUSIC_OVERWORLD     ; GRASS_CLUB_ENTRANCE
+	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; GRASS_CLUB_LOBBY
+	db $28,$29,$00,$06,$11,MUSIC_CLUB_1        ; GRASS_CLUB
+	db $16,$17,$00,$03,$09,MUSIC_OVERWORLD     ; PSYCHIC_CLUB_ENTRANCE
+	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; PSYCHIC_CLUB_LOBBY
+	db $2A,$2B,$00,$07,$12,MUSIC_CLUB_2        ; PSYCHIC_CLUB
+	db $18,$19,$00,$03,$0A,MUSIC_OVERWORLD     ; SCIENCE_CLUB_ENTRANCE
+	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; SCIENCE_CLUB_LOBBY
+	db $2C,$2D,$00,$06,$13,MUSIC_CLUB_3        ; SCIENCE_CLUB
+	db $1A,$1B,$00,$03,$0B,MUSIC_OVERWORLD     ; FIRE_CLUB_ENTRANCE
+	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; FIRE_CLUB_LOBBY
+	db $2E,$2F,$00,$08,$14,MUSIC_CLUB_3        ; FIRE_CLUB
+	db $1C,$1D,$00,$03,$04,MUSIC_OVERWORLD     ; CHALLENGE_HALL_ENTRANCE
+	db $1E,$1F,$00,$03,$0C,MUSIC_OVERWORLD     ; CHALLENGE_HALL_LOBBY
+	db $30,$31,$00,$09,$15,MUSIC_OVERWORLD     ; CHALLENGE_HALL
+	db $32,$33,$00,$0A,$16,MUSIC_OVERWORLD     ; POKEMON_DOME_ENTRANCE
+	db $36,$37,$00,$0A,$17,MUSIC_POKEMON_DOME  ; POKEMON_DOME
 	db $3A,$3B,$00,$0A,$18,MUSIC_HALL_OF_HONOR ; HALL_OF_HONOR
diff --git a/src/data/move_animations.asm b/src/data/move_animations.asm
index f774afa..9ead157 100644
--- a/src/data/move_animations.asm
+++ b/src/data/move_animations.asm
@@ -167,7 +167,7 @@ PointerTable_MoveAnimation:
 	dw MoveAnimation_5673
 	dw MoveAnimation_5673
 
-MoveAnimation_52c6:    ; (6:52c6)
+MoveAnimation_52c6: ; (6:52c6)
 	anim_player         ANIM_SPELL_MOVE
 	anim_opponent       ANIM_GET_HIT
 	anim_normal         ANIM_SHAKE1
diff --git a/src/engine/booster_packs.asm b/src/engine/booster_packs.asm
index a799d71..238a8b2 100644
--- a/src/engine/booster_packs.asm
+++ b/src/engine/booster_packs.asm
@@ -164,7 +164,7 @@ GetBoosterCardType: ; 1e2a0 (7:62a0)
 	pop hl
 	ret
 
-CardTypeTable:  ; 1e2b1 (7:62b1)
+CardTypeTable: ; 1e2b1 (7:62b1)
 	db BOOSTER_CARD_TYPE_FIRE      ; TYPE_PKMN_FIRE
 	db BOOSTER_CARD_TYPE_GRASS     ; TYPE_PKMN_GRASS
 	db BOOSTER_CARD_TYPE_LIGHTNING ; TYPE_PKMN_LIGHTNING
@@ -344,7 +344,7 @@ GenerateRandomEnergy: ; 1e387 (7:6387)
 	jr AddBoosterEnergyToDrawnEnergies
 
 ; generates a booster with 10 random energies
-GenerateRandomEnergyBooster:  ; 1e390 (7:6390)
+GenerateRandomEnergyBooster: ; 1e390 (7:6390)
 	ld a, NUM_CARDS_IN_BOOSTER
 .generate_energy_loop
 	push af
@@ -355,22 +355,22 @@ GenerateRandomEnergyBooster:  ; 1e390 (7:6390)
 	jr ZeroBoosterRarityData
 
 ; generates a booster with 5 Lightning energies and 5 Fire energies
-GenerateEnergyBoosterLightningFire:  ; 1e39c (7:639c)
+GenerateEnergyBoosterLightningFire: ; 1e39c (7:639c)
 	ld hl, EnergyBoosterLightningFireData
 	jr GenerateTwoTypesEnergyBooster
 
 ; generates a booster with 5 Water energies and 5 Fighting energies
-GenerateEnergyBoosterWaterFighting:  ; 1e3a1 (7:63a1)
+GenerateEnergyBoosterWaterFighting: ; 1e3a1 (7:63a1)
 	ld hl, EnergyBoosterWaterFightingData
 	jr GenerateTwoTypesEnergyBooster
 
 ; generates a booster with 5 Grass energies and 5 Psychic energies
-GenerateEnergyBoosterGrassPsychic:  ; 1e3a6 (7:63a6)
+GenerateEnergyBoosterGrassPsychic: ; 1e3a6 (7:63a6)
 	ld hl, EnergyBoosterGrassPsychicData
 	jr GenerateTwoTypesEnergyBooster
 
 ; generates a booster with 5 energies of 2 different types each
-GenerateTwoTypesEnergyBooster:  ; 1e3ab (7:63ab)
+GenerateTwoTypesEnergyBooster: ; 1e3ab (7:63ab)
 	ld b, $02
 .add_two_energies_to_booster_loop
 	ld c, NUM_CARDS_IN_BOOSTER / 2
diff --git a/src/engine/home.asm b/src/engine/home.asm
index cd9c9c9..0094924 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -653,7 +653,7 @@ EmptyScreen: ; 04a2 (0:04a2)
 AttrBlkPacket_EmptyScreen: ; 04bf (0:04bf)
 	sgb ATTR_BLK, 1 ; sgb_command, length
 	db 1 ; number of data sets
-	; Control Code,  Color Palette Designation, X1, Y1, X2, Y2
+	; Control Code, Color Palette Designation, X1, Y1, X2, Y2
 	db ATTR_BLK_CTRL_INSIDE + ATTR_BLK_CTRL_LINE, 0 << 0 + 0 << 2, 0, 0, 19, 17 ; data set 1
 	ds 6 ; data set 2
 	ds 2 ; data set 3
@@ -1928,7 +1928,7 @@ Pal23Packet_0b00: ; 0b00 (0:0b00)
 AttrBlkPacket_0b10: ; 0b10 (0:0b10)
 	sgb ATTR_BLK, 1 ; sgb_command, length
 	db 1 ; number of data sets
-	; Control Code,  Color Palette Designation, X1, Y1, X2, Y2
+	; Control Code, Color Palette Designation, X1, Y1, X2, Y2
 	db ATTR_BLK_CTRL_INSIDE + ATTR_BLK_CTRL_LINE, 1 << 0 + 2 << 2, 5, 5, 10, 10 ; data set 1
 	ds 6 ; data set 2
 	ds 2 ; data set 3
@@ -5830,7 +5830,7 @@ ColorizeTextBoxSGB: ; 1f1b (0:1f1b)
 AttrBlkPacket_TextBox: ; 1f4f (0:1f4f)
 	sgb ATTR_BLK, 1 ; sgb_command, length
 	db 1 ; number of data sets
-	; Control Code,  Color Palette Designation, X1, Y1, X2, Y2
+	; Control Code, Color Palette Designation, X1, Y1, X2, Y2
 	db ATTR_BLK_CTRL_INSIDE + ATTR_BLK_CTRL_LINE, 0 << 0 + 1 << 2, 0, 0, 0, 0 ; data set 1
 	ds 6 ; data set 2
 	ds 2 ; data set 3
@@ -6182,7 +6182,7 @@ LoadSymbolsFont: ; 2119 (0:2119)
 ; if $4000 ≤ hl ≤ $7fff
 ;   copy b tiles from Gfx2:hl to de
 CopyFontsOrDuelGraphicsTiles: ; 2121 (0:2121)
-	ld a, BANK(Fonts); BANK(DuelGraphics)
+	ld a, BANK(Fonts) ; BANK(DuelGraphics)
 	call BankpushROM
 	ld c, TILE_SIZE
 	call CopyGfxData
@@ -6240,7 +6240,7 @@ DrawDuelBoxMessage: ; 2167 (0:2167)
 ; from gfx/fonts/full_width/3.1bpp and gfx/fonts/full_width/4.1bpp
 LoadFullWidthFontTiles: ; 2189 (0:2189)
 	ld hl, FullWidthFonts + $3cc tiles_1bpp - $4000
-	ld a, BANK(Fonts); BANK(DuelGraphics)
+	ld a, BANK(Fonts) ; BANK(DuelGraphics)
 	call BankpushROM
 	push hl
 	ld e, l
@@ -6999,7 +6999,7 @@ ConvertTileNumberToTileDataAddress: ; 2518 (0:2518)
 ; create, at wTextTileBuffer, a full-width font tile given its
 ; within the full-width font graphics (FullWidthFonts) in hl
 CreateFullWidthFontTile: ; 252e (0:252e)
-	ld a, BANK(Fonts); BANK(DuelGraphics)
+	ld a, BANK(Fonts) ; BANK(DuelGraphics)
 	call BankpushROM
 	ld de, wTextTileBuffer
 	push de
@@ -8977,7 +8977,7 @@ LoadCardGfx: ; 2fa0 (0:2fa0)
 
 ; identical to CopyFontsOrDuelGraphicsTiles
 CopyFontsOrDuelGraphicsTiles2: ; 2fcb (0:2fcb)
-	ld a, BANK(Fonts); BANK(DuelGraphics)
+	ld a, BANK(Fonts) ; BANK(DuelGraphics)
 	call BankpushROM
 	ld c, TILE_SIZE
 	call CopyGfxData
diff --git a/src/gfx.asm b/src/gfx.asm
index e3b97cf..2cf2d77 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -910,16 +910,16 @@ FightingGfx: ; a8e12 (2a:4e12)
 	INCROM $a8e54, $ac000
 
 SECTION "Gfx 13", ROMX
-	INCROM  $ac000, $b0000
+	INCROM $ac000, $b0000
 
 SECTION "Gfx 14", ROMX
-	INCROM  $b0000, $b4000
+	INCROM $b0000, $b4000
 
 SECTION "Gfx 15", ROMX
-	INCROM  $b4000, $b8000
+	INCROM $b4000, $b8000
 
 SECTION "Gfx 16", ROMX
-	INCROM  $b8000, $bc000
+	INCROM $b8000, $bc000
 
 SECTION "Card Gfx 1", ROMX
 
diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm
index ed7b30d..3a2552e 100644
--- a/src/macros/scripts.asm
+++ b/src/macros/scripts.asm
@@ -14,107 +14,107 @@ ENDM
 ;ENDM
 
 	const_def
-	const ScriptCommand_EndScriptLoop1_index         ; $00
-	const ScriptCommand_CloseAdvancedTextBox_index   ; $01
-	const ScriptCommand_PrintTextString_index        ; $02
-	const Func_ccdc_index                       ; $03
-	const ScriptCommand_AskQuestionJump_index        ; $04
-	const ScriptCommand_StartBattle_index            ; $05
-	const ScriptCommand_PrintVariableText_index      ; $06
-	const Func_cda8_index                       ; $07
-	const ScriptCommand_PrintTextQuitFully_index      ; $08
-	const Func_cdcb_index                       ; $09
-	const ScriptCommand_MoveActiveNPCByDirection_index                       ; $0a
-	const ScriptCommand_CloseTextBox_index           ; $0b
-	const ScriptCommand_GiveBoosterPacks_index       ; $0c
-	const ScriptCommand_CheckIfCardInCollectionOrDecks_index                       ; $0d
-	const ScriptCommand_CheckIfCardInCollection_index                       ; $0e
-	const ScriptCommand_GiveCard_index                       ; $0f
-	const ScriptCommand_TakeCard_index                       ; $10
-	const Func_cf53_index                       ; $11
-	const Func_cf7b_index                       ; $12
-	const ScriptCommand_CheckRawAmountOfCardsOwned_index                       ; $13
-	const ScriptCommand_JumpBasedOnFightingClubPupilStatus_index                       ; $14
-	const Func_cfc6_index                       ; $15
-	const Func_cfd4_index                       ; $16
-	const Func_d00b_index                       ; $17
-	const Func_d025_index                       ; $18
-	const Func_d032_index                       ; $19
-	const Func_d03f_index                       ; $1a
-	const ScriptCommand_Jump_index                   ; $1b
-	const ScriptCommand_TryGiveMedalPCPacks_index                       ; $1c
-	const ScriptCommand_SetPlayerDirection_index                       ; $1d
-	const ScriptCommand_MovePlayer_index             ; $1e
-	const ScriptCommand_ShowCardReceivedScreen_index                       ; $1f
-	const ScriptCommand_SetDialogName_index          ; $20
-	const ScriptCommand_SetNextNPCandScript_index                       ; $21
-	const Func_d095_index                       ; $22
-	const Func_d0be_index                       ; $23
-	const ScriptCommand_DoFrames_index               ; $24
-	const Func_d0d9_index                       ; $25
-	const ScriptCommand_JumpIfPlayerCoordMatches_index                       ; $26
+	const ScriptCommand_EndScriptLoop1_index                      ; $00
+	const ScriptCommand_CloseAdvancedTextBox_index                ; $01
+	const ScriptCommand_PrintTextString_index                     ; $02
+	const Func_ccdc_index                                         ; $03
+	const ScriptCommand_AskQuestionJump_index                     ; $04
+	const ScriptCommand_StartBattle_index                         ; $05
+	const ScriptCommand_PrintVariableText_index                   ; $06
+	const Func_cda8_index                                         ; $07
+	const ScriptCommand_PrintTextQuitFully_index                  ; $08
+	const Func_cdcb_index                                         ; $09
+	const ScriptCommand_MoveActiveNPCByDirection_index            ; $0a
+	const ScriptCommand_CloseTextBox_index                        ; $0b
+	const ScriptCommand_GiveBoosterPacks_index                    ; $0c
+	const ScriptCommand_CheckIfCardInCollectionOrDecks_index      ; $0d
+	const ScriptCommand_CheckIfCardInCollection_index             ; $0e
+	const ScriptCommand_GiveCard_index                            ; $0f
+	const ScriptCommand_TakeCard_index                            ; $10
+	const Func_cf53_index                                         ; $11
+	const Func_cf7b_index                                         ; $12
+	const ScriptCommand_CheckRawAmountOfCardsOwned_index          ; $13
+	const ScriptCommand_JumpBasedOnFightingClubPupilStatus_index  ; $14
+	const Func_cfc6_index                                         ; $15
+	const Func_cfd4_index                                         ; $16
+	const Func_d00b_index                                         ; $17
+	const Func_d025_index                                         ; $18
+	const Func_d032_index                                         ; $19
+	const Func_d03f_index                                         ; $1a
+	const ScriptCommand_Jump_index                                ; $1b
+	const ScriptCommand_TryGiveMedalPCPacks_index                 ; $1c
+	const ScriptCommand_SetPlayerDirection_index                  ; $1d
+	const ScriptCommand_MovePlayer_index                          ; $1e
+	const ScriptCommand_ShowCardReceivedScreen_index              ; $1f
+	const ScriptCommand_SetDialogName_index                       ; $20
+	const ScriptCommand_SetNextNPCandScript_index                 ; $21
+	const Func_d095_index                                         ; $22
+	const Func_d0be_index                                         ; $23
+	const ScriptCommand_DoFrames_index                            ; $24
+	const Func_d0d9_index                                         ; $25
+	const ScriptCommand_JumpIfPlayerCoordMatches_index            ; $26
 	const ScriptCommand_MoveActiveNPC_index                       ; $27
-	const ScriptCommand_GiveOneOfEachTrainerBooster_index                       ; $28
-	const Func_d103_index                       ; $29
-	const Func_d125_index                       ; $2a
-	const Func_d135_index                       ; $2b
-	const Func_d16b_index                       ; $2c
-	const Func_cd4f_index                       ; $2d
-	const Func_cd94_index                       ; $2e
-	const ScriptCommand_MoveWramNPC_index                       ; $2f
-	const Func_cdd8_index                       ; $30
-	const Func_cdf5_index                       ; $31
-	const Func_d195_index                       ; $32
-	const Func_d1ad_index                       ; $33
-	const Func_d1b3_index                       ; $34
-	const ScriptCommand_QuitScriptFully_index     ; $35
-	const Func_d244_index                       ; $36
-	const Func_d24c_index                       ; $37
-	const ScriptCommand_OpenDeckMachine_index        ; $38
-	const Func_d271_index                       ; $39
-	const ScriptCommand_EnterMap_index                       ; $3a
-	const ScriptCommand_MoveArbitraryNPC_index                       ; $3b
-	const Func_d209_index                       ; $3c
-	const Func_d38f_index                       ; $3d
-	const Func_d396_index                       ; $3e
-	const Func_cd76_index                       ; $3f
-	const Func_d39d_index                       ; $40
-	const Func_d3b9_index                       ; $41
-	const ScriptCommand_TryGivePCPack_index             ; $42
-	const ScriptCommand_nop_index                    ; $43
-	const Func_d3d4_index                       ; $44
-	const Func_d3e0_index                       ; $45
-	const Func_d3fe_index                       ; $46
-	const Func_d408_index                       ; $47
-	const Func_d40f_index                       ; $48
-	const ScriptCommand_PlaySFX_index                       ; $49
-	const ScriptCommand_PauseSong_index                       ; $4a
-	const ScriptCommand_ResumeSong_index                       ; $4b
-	const Func_d41d_index                       ; $4c
-	const ScriptCommand_WaitForSongToFinish_index                       ; $4d
-	const Func_d435_index                       ; $4e
-	const ScriptCommand_AskQuestionJumpDefaultYes_index                       ; $4f
-	const Func_d2f6_index                       ; $50
-	const Func_d317_index                       ; $51
-	const Func_d43d_index                       ; $52
-	const ScriptCommand_EndScriptLoop2_index         ; $53
-	const ScriptCommand_EndScriptLoop3_index         ; $54
-	const ScriptCommand_EndScriptLoop4_index         ; $55
-	const ScriptCommand_EndScriptLoop5_index         ; $56
-	const ScriptCommand_EndScriptLoop6_index         ; $57
-	const ScriptCommand_SetFlagValue_index           ; $58
-	const ScriptCommand_JumpIfFlagZero1_index        ; $59
-	const ScriptCommand_JumpIfFlagNonzero1_index     ; $5a
-	const ScriptCommand_JumpIfFlagEqual_index        ; $5b
-	const ScriptCommand_JumpIfFlagNotEqual_index     ; $5c
-	const ScriptCommand_JumpIfFlagNotLessThan_index  ; $5d
-	const ScriptCommand_JumpIfFlagLessThan_index     ; $5e
-	const ScriptCommand_MaxOutFlagValue_index        ; $5f
-	const ScriptCommand_ZeroOutFlagValue_index       ; $60
-	const ScriptCommand_JumpIfFlagNonzero2_index     ; $61
-	const ScriptCommand_JumpIfFlagZero2_index        ; $62
-	const ScriptCommand_IncrementFlagValue_index     ; $63
-	const ScriptCommand_EndScriptLoop7_index         ; $64
-	const ScriptCommand_EndScriptLoop8_index         ; $65
-	const ScriptCommand_EndScriptLoop9_index         ; $66
-	const ScriptCommand_EndScriptLoop10_index        ; $67
+	const ScriptCommand_GiveOneOfEachTrainerBooster_index         ; $28
+	const Func_d103_index                                         ; $29
+	const Func_d125_index                                         ; $2a
+	const Func_d135_index                                         ; $2b
+	const Func_d16b_index                                         ; $2c
+	const Func_cd4f_index                                         ; $2d
+	const Func_cd94_index                                         ; $2e
+	const ScriptCommand_MoveWramNPC_index                         ; $2f
+	const Func_cdd8_index                                         ; $30
+	const Func_cdf5_index                                         ; $31
+	const Func_d195_index                                         ; $32
+	const Func_d1ad_index                                         ; $33
+	const Func_d1b3_index                                         ; $34
+	const ScriptCommand_QuitScriptFully_index                     ; $35
+	const Func_d244_index                                         ; $36
+	const Func_d24c_index                                         ; $37
+	const ScriptCommand_OpenDeckMachine_index                     ; $38
+	const Func_d271_index                                         ; $39
+	const ScriptCommand_EnterMap_index                            ; $3a
+	const ScriptCommand_MoveArbitraryNPC_index                    ; $3b
+	const Func_d209_index                                         ; $3c
+	const Func_d38f_index                                         ; $3d
+	const Func_d396_index                                         ; $3e
+	const Func_cd76_index                                         ; $3f
+	const Func_d39d_index                                         ; $40
+	const Func_d3b9_index                                         ; $41
+	const ScriptCommand_TryGivePCPack_index                       ; $42
+	const ScriptCommand_nop_index                                 ; $43
+	const Func_d3d4_index                                         ; $44
+	const Func_d3e0_index                                         ; $45
+	const Func_d3fe_index                                         ; $46
+	const Func_d408_index                                         ; $47
+	const Func_d40f_index                                         ; $48
+	const ScriptCommand_PlaySFX_index                             ; $49
+	const ScriptCommand_PauseSong_index                           ; $4a
+	const ScriptCommand_ResumeSong_index                          ; $4b
+	const Func_d41d_index                                         ; $4c
+	const ScriptCommand_WaitForSongToFinish_index                 ; $4d
+	const Func_d435_index                                         ; $4e
+	const ScriptCommand_AskQuestionJumpDefaultYes_index           ; $4f
+	const Func_d2f6_index                                         ; $50
+	const Func_d317_index                                         ; $51
+	const Func_d43d_index                                         ; $52
+	const ScriptCommand_EndScriptLoop2_index                      ; $53
+	const ScriptCommand_EndScriptLoop3_index                      ; $54
+	const ScriptCommand_EndScriptLoop4_index                      ; $55
+	const ScriptCommand_EndScriptLoop5_index                      ; $56
+	const ScriptCommand_EndScriptLoop6_index                      ; $57
+	const ScriptCommand_SetFlagValue_index                        ; $58
+	const ScriptCommand_JumpIfFlagZero1_index                     ; $59
+	const ScriptCommand_JumpIfFlagNonzero1_index                  ; $5a
+	const ScriptCommand_JumpIfFlagEqual_index                     ; $5b
+	const ScriptCommand_JumpIfFlagNotEqual_index                  ; $5c
+	const ScriptCommand_JumpIfFlagNotLessThan_index               ; $5d
+	const ScriptCommand_JumpIfFlagLessThan_index                  ; $5e
+	const ScriptCommand_MaxOutFlagValue_index                     ; $5f
+	const ScriptCommand_ZeroOutFlagValue_index                    ; $60
+	const ScriptCommand_JumpIfFlagNonzero2_index                  ; $61
+	const ScriptCommand_JumpIfFlagZero2_index                     ; $62
+	const ScriptCommand_IncrementFlagValue_index                  ; $63
+	const ScriptCommand_EndScriptLoop7_index                      ; $64
+	const ScriptCommand_EndScriptLoop8_index                      ; $65
+	const ScriptCommand_EndScriptLoop9_index                      ; $66
+	const ScriptCommand_EndScriptLoop10_index                     ; $67
diff --git a/src/macros/text.asm b/src/macros/text.asm
index 2b29afe..bd33833 100644
--- a/src/macros/text.asm
+++ b/src/macros/text.asm
@@ -1,6 +1,6 @@
-text   EQUS "db TX_HALFWIDTH, "
-line   EQUS "db TX_LINE, "
-done   EQUS "db TX_END"
+text EQUS "db TX_HALFWIDTH, "
+line EQUS "db TX_LINE, "
+done EQUS "db TX_END"
 
 half2full EQUS "db TX_HALF2FULL"
 
diff --git a/src/wram.asm b/src/wram.asm
index ae6d10a..895074c 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -1552,7 +1552,7 @@ wCoinTossScreenTextID:: ; ce4e
 	ds $2
 
 ; set to PLAYER_TURN in the "Your Play Area" screen
-; set to OPPONENT_TURN in the  "Opp Play Area" screen
+; set to OPPONENT_TURN in the "Opp Play Area" screen
 ; alternates when drawing the "In Play Area" screen
 wCheckMenuPlayAreaWhichDuelist:: ; ce50
 	ds $1
-- 
cgit v1.2.3


From a134c1f9a9c197ee9662c8177fa487ec938f5294 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Tue, 15 Dec 2020 11:32:10 -0600
Subject: Mark a few duplicate hiragana characters This fixes compatibility
 with rgbds v0.4.2

---
 src/constants/charmaps.asm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/constants/charmaps.asm b/src/constants/charmaps.asm
index baa3f46..d223e1f 100644
--- a/src/constants/charmaps.asm
+++ b/src/constants/charmaps.asm
@@ -279,11 +279,11 @@ ENDM
 	fwcharmap 0, "ぷ", $54
 	fwcharmap 0, "ぺ", $55
 	fwcharmap 0, "ぽ", $56
-	fwcharmap 0, "あ", $57
-	fwcharmap 0, "い", $58
-	fwcharmap 0, "う", $59
-	fwcharmap 0, "え", $5a
-	fwcharmap 0, "お", $5b
+	fwcharmap 0, "あ(2)", $57
+	fwcharmap 0, "い(2)", $58
+	fwcharmap 0, "う(2)", $59
+	fwcharmap 0, "え(2)", $5a
+	fwcharmap 0, "お(2)", $5b
 	fwcharmap 0, "ゃ", $5c
 	fwcharmap 0, "ゅ", $5d
 	fwcharmap 0, "ょ", $5e
-- 
cgit v1.2.3