Merge pull request #6 from stag019/srcrgbgfx

Move source code into "src/". Update Makefile/scan_includes.

611 files changed, 5 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index e8d3827..b4c8b5a 100755
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 .SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .pal
 .SECONDEXPANSION:
 
-OBJS = main.o gfx.o text.o audio.o wram.o
+OBJS = src/main.o src/gfx.o src/text.o src/audio.o src/wram.o
 
 $(foreach obj, $(OBJS), \
 	$(eval $(obj:.o=)_dep = $(shell python extras/scan_includes.py $(obj:.o=.asm))) \
@@ -16,7 +16,7 @@ compare: baserom.gbc tcg.gbc
 	cmp baserom.gbc tcg.gbc
 
 $(OBJS): $$*.asm $$($$*_dep)
-	rgbasm -o $@ $<
+	rgbasm -i src/ -o $@ $<
 
 tcg.gbc: $(OBJS)
 	rgblink -n $*.sym -o $@ $(OBJS)
diff --git a/extras/scan_includes.py b/extras/scan_includes.py
index 7f34e92..466402c 100755
--- a/extras/scan_includes.py
+++ b/extras/scan_includes.py
@@ -12,15 +12,15 @@ import configuration
 conf = configuration.Config()
 
 def recursive_scan(filename, includes = []):
-	if (filename[-4:] == '.asm' or filename[-3] == '.tx') and os.path.exists(filename):
+	if (filename[-4:] == '.asm') and os.path.exists(filename):
 		lines = open(filename).readlines()
 		for line in lines:
 			for directive in ('INCLUDE', 'INCBIN'):
 				if directive in line:
 					line = line[:line.find(';')]
 					if directive in line:
-						include = line.split('"')[1]
-						if include not in includes:
+						include = "src/" + line.split('"')[1]
+						if include not in includes and include != "src/baserom.gbc":
 							includes += [include]
 							includes = recursive_scan(os.path.join(conf.path, include), includes)
 						break
diff --git a/audio.asm b/src/audio.asm
index adfa6a6..adfa6a6 100755
--- a/audio.asm
+++ b/src/audio.asm
diff --git a/audio/music/boosterpack.asm b/src/audio/music/boosterpack.asm
index c5287d0..c5287d0 100644
--- a/audio/music/boosterpack.asm
+++ b/src/audio/music/boosterpack.asm
diff --git a/audio/music/cardpop.asm b/src/audio/music/cardpop.asm
index e536dca..e536dca 100644
--- a/audio/music/cardpop.asm
+++ b/src/audio/music/cardpop.asm
diff --git a/audio/music/challengehall.asm b/src/audio/music/challengehall.asm
index 0bd1876..0bd1876 100644
--- a/audio/music/challengehall.asm
+++ b/src/audio/music/challengehall.asm
diff --git a/audio/music/club1.asm b/src/audio/music/club1.asm
index 785a126..785a126 100644
--- a/audio/music/club1.asm
+++ b/src/audio/music/club1.asm
diff --git a/audio/music/club2.asm b/src/audio/music/club2.asm
index 2b608d5..2b608d5 100644
--- a/audio/music/club2.asm
+++ b/src/audio/music/club2.asm
diff --git a/audio/music/club3.asm b/src/audio/music/club3.asm
index 1407cd5..1407cd5 100644
--- a/audio/music/club3.asm
+++ b/src/audio/music/club3.asm
diff --git a/audio/music/credits.asm b/src/audio/music/credits.asm
index 6a8b050..6a8b050 100644
--- a/audio/music/credits.asm
+++ b/src/audio/music/credits.asm
diff --git a/audio/music/darkdiddly.asm b/src/audio/music/darkdiddly.asm
index a82dd00..a82dd00 100644
--- a/audio/music/darkdiddly.asm
+++ b/src/audio/music/darkdiddly.asm
diff --git a/audio/music/deckmachine.asm b/src/audio/music/deckmachine.asm
index f947df9..f947df9 100644
--- a/audio/music/deckmachine.asm
+++ b/src/audio/music/deckmachine.asm
diff --git a/audio/music/dueltheme1.asm b/src/audio/music/dueltheme1.asm
index 4487bc1..4487bc1 100644
--- a/audio/music/dueltheme1.asm
+++ b/src/audio/music/dueltheme1.asm
diff --git a/audio/music/dueltheme2.asm b/src/audio/music/dueltheme2.asm
index 2dc8816..2dc8816 100644
--- a/audio/music/dueltheme2.asm
+++ b/src/audio/music/dueltheme2.asm
diff --git a/audio/music/dueltheme3.asm b/src/audio/music/dueltheme3.asm
index 55ed4e1..55ed4e1 100644
--- a/audio/music/dueltheme3.asm
+++ b/src/audio/music/dueltheme3.asm
diff --git a/audio/music/hallofhonor.asm b/src/audio/music/hallofhonor.asm
index 3117df7..3117df7 100644
--- a/audio/music/hallofhonor.asm
+++ b/src/audio/music/hallofhonor.asm
diff --git a/audio/music/imakuni.asm b/src/audio/music/imakuni.asm
index 74cf2d7..74cf2d7 100644
--- a/audio/music/imakuni.asm
+++ b/src/audio/music/imakuni.asm
diff --git a/audio/music/matchloss.asm b/src/audio/music/matchloss.asm
index a80a9be..a80a9be 100644
--- a/audio/music/matchloss.asm
+++ b/src/audio/music/matchloss.asm
diff --git a/audio/music/matchstart1.asm b/src/audio/music/matchstart1.asm
index 92557ab..92557ab 100644
--- a/audio/music/matchstart1.asm
+++ b/src/audio/music/matchstart1.asm
diff --git a/audio/music/matchstart2.asm b/src/audio/music/matchstart2.asm
index ef56499..ef56499 100644
--- a/audio/music/matchstart2.asm
+++ b/src/audio/music/matchstart2.asm
diff --git a/audio/music/matchstart3.asm b/src/audio/music/matchstart3.asm
index 995d017..995d017 100644
--- a/audio/music/matchstart3.asm
+++ b/src/audio/music/matchstart3.asm
diff --git a/audio/music/matchvictory.asm b/src/audio/music/matchvictory.asm
index 44adeea..44adeea 100644
--- a/audio/music/matchvictory.asm
+++ b/src/audio/music/matchvictory.asm
diff --git a/audio/music/medal.asm b/src/audio/music/medal.asm
index 638c365..638c365 100644
--- a/audio/music/medal.asm
+++ b/src/audio/music/medal.asm
diff --git a/audio/music/overworld.asm b/src/audio/music/overworld.asm
index 3497988..3497988 100644
--- a/audio/music/overworld.asm
+++ b/src/audio/music/overworld.asm
diff --git a/audio/music/pausemenu.asm b/src/audio/music/pausemenu.asm
index 7ac67d9..7ac67d9 100644
--- a/audio/music/pausemenu.asm
+++ b/src/audio/music/pausemenu.asm
diff --git a/audio/music/pcmainmenu.asm b/src/audio/music/pcmainmenu.asm
index bd9ae7f..bd9ae7f 100644
--- a/audio/music/pcmainmenu.asm
+++ b/src/audio/music/pcmainmenu.asm
diff --git a/audio/music/pokemondome.asm b/src/audio/music/pokemondome.asm
index b7b5a84..b7b5a84 100644
--- a/audio/music/pokemondome.asm
+++ b/src/audio/music/pokemondome.asm
diff --git a/audio/music/ronald.asm b/src/audio/music/ronald.asm
index 54817ac..54817ac 100644
--- a/audio/music/ronald.asm
+++ b/src/audio/music/ronald.asm
diff --git a/audio/music/titlescreen.asm b/src/audio/music/titlescreen.asm
index f95689c..f95689c 100644
--- a/audio/music/titlescreen.asm
+++ b/src/audio/music/titlescreen.asm
diff --git a/audio/music1.asm b/src/audio/music1.asm
index 0e1767b..0e1767b 100755
--- a/audio/music1.asm
+++ b/src/audio/music1.asm
diff --git a/audio/music1_headers.asm b/src/audio/music1_headers.asm
index 3344365..3344365 100755
--- a/audio/music1_headers.asm
+++ b/src/audio/music1_headers.asm
diff --git a/audio/music2.asm b/src/audio/music2.asm
index 6ed8e63..6ed8e63 100755
--- a/audio/music2.asm
+++ b/src/audio/music2.asm
diff --git a/audio/music2_headers.asm b/src/audio/music2_headers.asm
index cafaa4f..cafaa4f 100755
--- a/audio/music2_headers.asm
+++ b/src/audio/music2_headers.asm
diff --git a/audio/noise_instruments.asm b/src/audio/noise_instruments.asm
index 96433ab..96433ab 100755
--- a/audio/noise_instruments.asm
+++ b/src/audio/noise_instruments.asm
diff --git a/audio/sfx.asm b/src/audio/sfx.asm
index cb3e2a8..cb3e2a8 100755
--- a/audio/sfx.asm
+++ b/src/audio/sfx.asm
diff --git a/audio/sfx/sfx_01.asm b/src/audio/sfx/sfx_01.asm
index c2f1874..c2f1874 100644
--- a/audio/sfx/sfx_01.asm
+++ b/src/audio/sfx/sfx_01.asm
diff --git a/audio/sfx/sfx_02.asm b/src/audio/sfx/sfx_02.asm
index b105b15..b105b15 100644
--- a/audio/sfx/sfx_02.asm
+++ b/src/audio/sfx/sfx_02.asm
diff --git a/audio/sfx/sfx_03.asm b/src/audio/sfx/sfx_03.asm
index 59cadb1..59cadb1 100644
--- a/audio/sfx/sfx_03.asm
+++ b/src/audio/sfx/sfx_03.asm
diff --git a/audio/sfx/sfx_04.asm b/src/audio/sfx/sfx_04.asm
index 2ec8391..2ec8391 100644
--- a/audio/sfx/sfx_04.asm
+++ b/src/audio/sfx/sfx_04.asm
diff --git a/audio/sfx/sfx_05.asm b/src/audio/sfx/sfx_05.asm
index 7a12390..7a12390 100644
--- a/audio/sfx/sfx_05.asm
+++ b/src/audio/sfx/sfx_05.asm
diff --git a/audio/sfx/sfx_06.asm b/src/audio/sfx/sfx_06.asm
index 6d33acb..6d33acb 100644
--- a/audio/sfx/sfx_06.asm
+++ b/src/audio/sfx/sfx_06.asm
diff --git a/audio/sfx/sfx_07.asm b/src/audio/sfx/sfx_07.asm
index 0888aa7..0888aa7 100644
--- a/audio/sfx/sfx_07.asm
+++ b/src/audio/sfx/sfx_07.asm
diff --git a/audio/sfx/sfx_08.asm b/src/audio/sfx/sfx_08.asm
index 4711720..4711720 100644
--- a/audio/sfx/sfx_08.asm
+++ b/src/audio/sfx/sfx_08.asm
diff --git a/audio/sfx/sfx_09.asm b/src/audio/sfx/sfx_09.asm
index 648ef18..648ef18 100644
--- a/audio/sfx/sfx_09.asm
+++ b/src/audio/sfx/sfx_09.asm
diff --git a/audio/sfx/sfx_0a.asm b/src/audio/sfx/sfx_0a.asm
index ea1ec1f..ea1ec1f 100644
--- a/audio/sfx/sfx_0a.asm
+++ b/src/audio/sfx/sfx_0a.asm
diff --git a/audio/sfx/sfx_0b.asm b/src/audio/sfx/sfx_0b.asm
index 5712c37..5712c37 100644
--- a/audio/sfx/sfx_0b.asm
+++ b/src/audio/sfx/sfx_0b.asm
diff --git a/audio/sfx/sfx_0c.asm b/src/audio/sfx/sfx_0c.asm
index 7aebc8a..7aebc8a 100644
--- a/audio/sfx/sfx_0c.asm
+++ b/src/audio/sfx/sfx_0c.asm
diff --git a/audio/sfx/sfx_0d.asm b/src/audio/sfx/sfx_0d.asm
index 3b8e511..3b8e511 100644
--- a/audio/sfx/sfx_0d.asm
+++ b/src/audio/sfx/sfx_0d.asm
diff --git a/audio/sfx/sfx_0e.asm b/src/audio/sfx/sfx_0e.asm
index bb3c6b3..bb3c6b3 100644
--- a/audio/sfx/sfx_0e.asm
+++ b/src/audio/sfx/sfx_0e.asm
diff --git a/audio/sfx/sfx_0f.asm b/src/audio/sfx/sfx_0f.asm
index 0a997df..0a997df 100644
--- a/audio/sfx/sfx_0f.asm
+++ b/src/audio/sfx/sfx_0f.asm
diff --git a/audio/sfx/sfx_10.asm b/src/audio/sfx/sfx_10.asm
index 6c013c8..6c013c8 100644
--- a/audio/sfx/sfx_10.asm
+++ b/src/audio/sfx/sfx_10.asm
diff --git a/audio/sfx/sfx_11.asm b/src/audio/sfx/sfx_11.asm
index dd036c7..dd036c7 100644
--- a/audio/sfx/sfx_11.asm
+++ b/src/audio/sfx/sfx_11.asm
diff --git a/audio/sfx/sfx_12.asm b/src/audio/sfx/sfx_12.asm
index 27cb676..27cb676 100644
--- a/audio/sfx/sfx_12.asm
+++ b/src/audio/sfx/sfx_12.asm
diff --git a/audio/sfx/sfx_13.asm b/src/audio/sfx/sfx_13.asm
index cd8a7a5..cd8a7a5 100644
--- a/audio/sfx/sfx_13.asm
+++ b/src/audio/sfx/sfx_13.asm
diff --git a/audio/sfx/sfx_14.asm b/src/audio/sfx/sfx_14.asm
index a6b0d77..a6b0d77 100644
--- a/audio/sfx/sfx_14.asm
+++ b/src/audio/sfx/sfx_14.asm
diff --git a/audio/sfx/sfx_15.asm b/src/audio/sfx/sfx_15.asm
index fc5613d..fc5613d 100644
--- a/audio/sfx/sfx_15.asm
+++ b/src/audio/sfx/sfx_15.asm
diff --git a/audio/sfx/sfx_16.asm b/src/audio/sfx/sfx_16.asm
index 9b096fa..9b096fa 100644
--- a/audio/sfx/sfx_16.asm
+++ b/src/audio/sfx/sfx_16.asm
diff --git a/audio/sfx/sfx_17.asm b/src/audio/sfx/sfx_17.asm
index 56f08e1..56f08e1 100644
--- a/audio/sfx/sfx_17.asm
+++ b/src/audio/sfx/sfx_17.asm
diff --git a/audio/sfx/sfx_18.asm b/src/audio/sfx/sfx_18.asm
index a0fdb06..a0fdb06 100644
--- a/audio/sfx/sfx_18.asm
+++ b/src/audio/sfx/sfx_18.asm
diff --git a/audio/sfx/sfx_19.asm b/src/audio/sfx/sfx_19.asm
index b01c70e..b01c70e 100644
--- a/audio/sfx/sfx_19.asm
+++ b/src/audio/sfx/sfx_19.asm
diff --git a/audio/sfx/sfx_1a.asm b/src/audio/sfx/sfx_1a.asm
index ce0d0d8..ce0d0d8 100644
--- a/audio/sfx/sfx_1a.asm
+++ b/src/audio/sfx/sfx_1a.asm
diff --git a/audio/sfx/sfx_1b.asm b/src/audio/sfx/sfx_1b.asm
index 43e3ba4..43e3ba4 100644
--- a/audio/sfx/sfx_1b.asm
+++ b/src/audio/sfx/sfx_1b.asm
diff --git a/audio/sfx/sfx_1c.asm b/src/audio/sfx/sfx_1c.asm
index 76c1f46..76c1f46 100644
--- a/audio/sfx/sfx_1c.asm
+++ b/src/audio/sfx/sfx_1c.asm
diff --git a/audio/sfx/sfx_1d.asm b/src/audio/sfx/sfx_1d.asm
index 5f472e9..5f472e9 100644
--- a/audio/sfx/sfx_1d.asm
+++ b/src/audio/sfx/sfx_1d.asm
diff --git a/audio/sfx/sfx_1e.asm b/src/audio/sfx/sfx_1e.asm
index 9e921ed..9e921ed 100644
--- a/audio/sfx/sfx_1e.asm
+++ b/src/audio/sfx/sfx_1e.asm
diff --git a/audio/sfx/sfx_1f.asm b/src/audio/sfx/sfx_1f.asm
index 7e45dda..7e45dda 100644
--- a/audio/sfx/sfx_1f.asm
+++ b/src/audio/sfx/sfx_1f.asm
diff --git a/audio/sfx/sfx_20.asm b/src/audio/sfx/sfx_20.asm
index 0711a70..0711a70 100644
--- a/audio/sfx/sfx_20.asm
+++ b/src/audio/sfx/sfx_20.asm
diff --git a/audio/sfx/sfx_21.asm b/src/audio/sfx/sfx_21.asm
index 709f14c..709f14c 100644
--- a/audio/sfx/sfx_21.asm
+++ b/src/audio/sfx/sfx_21.asm
diff --git a/audio/sfx/sfx_22.asm b/src/audio/sfx/sfx_22.asm
index 6fc2583..6fc2583 100644
--- a/audio/sfx/sfx_22.asm
+++ b/src/audio/sfx/sfx_22.asm
diff --git a/audio/sfx/sfx_23.asm b/src/audio/sfx/sfx_23.asm
index 6546376..6546376 100644
--- a/audio/sfx/sfx_23.asm
+++ b/src/audio/sfx/sfx_23.asm
diff --git a/audio/sfx/sfx_24.asm b/src/audio/sfx/sfx_24.asm
index e609cc2..e609cc2 100644
--- a/audio/sfx/sfx_24.asm
+++ b/src/audio/sfx/sfx_24.asm
diff --git a/audio/sfx/sfx_25.asm b/src/audio/sfx/sfx_25.asm
index d1c3d13..d1c3d13 100644
--- a/audio/sfx/sfx_25.asm
+++ b/src/audio/sfx/sfx_25.asm
diff --git a/audio/sfx/sfx_26.asm b/src/audio/sfx/sfx_26.asm
index 5d7bcb4..5d7bcb4 100644
--- a/audio/sfx/sfx_26.asm
+++ b/src/audio/sfx/sfx_26.asm
diff --git a/audio/sfx/sfx_27.asm b/src/audio/sfx/sfx_27.asm
index 70d9fad..70d9fad 100644
--- a/audio/sfx/sfx_27.asm
+++ b/src/audio/sfx/sfx_27.asm
diff --git a/audio/sfx/sfx_28.asm b/src/audio/sfx/sfx_28.asm
index c4c1ebb..c4c1ebb 100644
--- a/audio/sfx/sfx_28.asm
+++ b/src/audio/sfx/sfx_28.asm
diff --git a/audio/sfx/sfx_29.asm b/src/audio/sfx/sfx_29.asm
index 129b23e..129b23e 100644
--- a/audio/sfx/sfx_29.asm
+++ b/src/audio/sfx/sfx_29.asm
diff --git a/audio/sfx/sfx_2a.asm b/src/audio/sfx/sfx_2a.asm
index a1560bd..a1560bd 100644
--- a/audio/sfx/sfx_2a.asm
+++ b/src/audio/sfx/sfx_2a.asm
diff --git a/audio/sfx/sfx_2b.asm b/src/audio/sfx/sfx_2b.asm
index 8cf6b66..8cf6b66 100644
--- a/audio/sfx/sfx_2b.asm
+++ b/src/audio/sfx/sfx_2b.asm
diff --git a/audio/sfx/sfx_2c.asm b/src/audio/sfx/sfx_2c.asm
index cc5bb48..cc5bb48 100644
--- a/audio/sfx/sfx_2c.asm
+++ b/src/audio/sfx/sfx_2c.asm
diff --git a/audio/sfx/sfx_2d.asm b/src/audio/sfx/sfx_2d.asm
index d9fb760..d9fb760 100644
--- a/audio/sfx/sfx_2d.asm
+++ b/src/audio/sfx/sfx_2d.asm
diff --git a/audio/sfx/sfx_2e.asm b/src/audio/sfx/sfx_2e.asm
index 03cd8bd..03cd8bd 100644
--- a/audio/sfx/sfx_2e.asm
+++ b/src/audio/sfx/sfx_2e.asm
diff --git a/audio/sfx/sfx_2f.asm b/src/audio/sfx/sfx_2f.asm
index 0f034f1..0f034f1 100644
--- a/audio/sfx/sfx_2f.asm
+++ b/src/audio/sfx/sfx_2f.asm
diff --git a/audio/sfx/sfx_30.asm b/src/audio/sfx/sfx_30.asm
index c96ca1c..c96ca1c 100644
--- a/audio/sfx/sfx_30.asm
+++ b/src/audio/sfx/sfx_30.asm
diff --git a/audio/sfx/sfx_31.asm b/src/audio/sfx/sfx_31.asm
index d900fa3..d900fa3 100644
--- a/audio/sfx/sfx_31.asm
+++ b/src/audio/sfx/sfx_31.asm
diff --git a/audio/sfx/sfx_32.asm b/src/audio/sfx/sfx_32.asm
index 20e300d..20e300d 100644
--- a/audio/sfx/sfx_32.asm
+++ b/src/audio/sfx/sfx_32.asm
diff --git a/audio/sfx/sfx_33.asm b/src/audio/sfx/sfx_33.asm
index 3696a16..3696a16 100644
--- a/audio/sfx/sfx_33.asm
+++ b/src/audio/sfx/sfx_33.asm
diff --git a/audio/sfx/sfx_34.asm b/src/audio/sfx/sfx_34.asm
index 94fb687..94fb687 100644
--- a/audio/sfx/sfx_34.asm
+++ b/src/audio/sfx/sfx_34.asm
diff --git a/audio/sfx/sfx_35.asm b/src/audio/sfx/sfx_35.asm
index db50b5b..db50b5b 100644
--- a/audio/sfx/sfx_35.asm
+++ b/src/audio/sfx/sfx_35.asm
diff --git a/audio/sfx/sfx_36.asm b/src/audio/sfx/sfx_36.asm
index 04c7c52..04c7c52 100644
--- a/audio/sfx/sfx_36.asm
+++ b/src/audio/sfx/sfx_36.asm
diff --git a/audio/sfx/sfx_37.asm b/src/audio/sfx/sfx_37.asm
index 0be5964..0be5964 100644
--- a/audio/sfx/sfx_37.asm
+++ b/src/audio/sfx/sfx_37.asm
diff --git a/audio/sfx/sfx_38.asm b/src/audio/sfx/sfx_38.asm
index 66af1e6..66af1e6 100644
--- a/audio/sfx/sfx_38.asm
+++ b/src/audio/sfx/sfx_38.asm
diff --git a/audio/sfx/sfx_39.asm b/src/audio/sfx/sfx_39.asm
index 68146e0..68146e0 100644
--- a/audio/sfx/sfx_39.asm
+++ b/src/audio/sfx/sfx_39.asm
diff --git a/audio/sfx/sfx_3a.asm b/src/audio/sfx/sfx_3a.asm
index 961e94c..961e94c 100644
--- a/audio/sfx/sfx_3a.asm
+++ b/src/audio/sfx/sfx_3a.asm
diff --git a/audio/sfx/sfx_3b.asm b/src/audio/sfx/sfx_3b.asm
index b134155..b134155 100644
--- a/audio/sfx/sfx_3b.asm
+++ b/src/audio/sfx/sfx_3b.asm
diff --git a/audio/sfx/sfx_3c.asm b/src/audio/sfx/sfx_3c.asm
index 045b4f6..045b4f6 100644
--- a/audio/sfx/sfx_3c.asm
+++ b/src/audio/sfx/sfx_3c.asm
diff --git a/audio/sfx/sfx_3d.asm b/src/audio/sfx/sfx_3d.asm
index da0a093..da0a093 100644
--- a/audio/sfx/sfx_3d.asm
+++ b/src/audio/sfx/sfx_3d.asm
diff --git a/audio/sfx/sfx_3e.asm b/src/audio/sfx/sfx_3e.asm
index c5db7f1..c5db7f1 100644
--- a/audio/sfx/sfx_3e.asm
+++ b/src/audio/sfx/sfx_3e.asm
diff --git a/audio/sfx/sfx_3f.asm b/src/audio/sfx/sfx_3f.asm
index e672dc5..e672dc5 100644
--- a/audio/sfx/sfx_3f.asm
+++ b/src/audio/sfx/sfx_3f.asm
diff --git a/audio/sfx/sfx_40.asm b/src/audio/sfx/sfx_40.asm
index 9599a66..9599a66 100644
--- a/audio/sfx/sfx_40.asm
+++ b/src/audio/sfx/sfx_40.asm
diff --git a/audio/sfx/sfx_41.asm b/src/audio/sfx/sfx_41.asm
index 57a78bb..57a78bb 100644
--- a/audio/sfx/sfx_41.asm
+++ b/src/audio/sfx/sfx_41.asm
diff --git a/audio/sfx/sfx_42.asm b/src/audio/sfx/sfx_42.asm
index 5ee3bfe..5ee3bfe 100644
--- a/audio/sfx/sfx_42.asm
+++ b/src/audio/sfx/sfx_42.asm
diff --git a/audio/sfx/sfx_43.asm b/src/audio/sfx/sfx_43.asm
index dd7f416..dd7f416 100644
--- a/audio/sfx/sfx_43.asm
+++ b/src/audio/sfx/sfx_43.asm
diff --git a/audio/sfx/sfx_44.asm b/src/audio/sfx/sfx_44.asm
index 807779b..807779b 100644
--- a/audio/sfx/sfx_44.asm
+++ b/src/audio/sfx/sfx_44.asm
diff --git a/audio/sfx/sfx_45.asm b/src/audio/sfx/sfx_45.asm
index 6242983..6242983 100644
--- a/audio/sfx/sfx_45.asm
+++ b/src/audio/sfx/sfx_45.asm
diff --git a/audio/sfx/sfx_46.asm b/src/audio/sfx/sfx_46.asm
index f680133..f680133 100644
--- a/audio/sfx/sfx_46.asm
+++ b/src/audio/sfx/sfx_46.asm
diff --git a/audio/sfx/sfx_47.asm b/src/audio/sfx/sfx_47.asm
index 2e14f11..2e14f11 100644
--- a/audio/sfx/sfx_47.asm
+++ b/src/audio/sfx/sfx_47.asm
diff --git a/audio/sfx/sfx_48.asm b/src/audio/sfx/sfx_48.asm
index e74ee65..e74ee65 100644
--- a/audio/sfx/sfx_48.asm
+++ b/src/audio/sfx/sfx_48.asm
diff --git a/audio/sfx/sfx_49.asm b/src/audio/sfx/sfx_49.asm
index 2e777af..2e777af 100644
--- a/audio/sfx/sfx_49.asm
+++ b/src/audio/sfx/sfx_49.asm
diff --git a/audio/sfx/sfx_4a.asm b/src/audio/sfx/sfx_4a.asm
index b4f59ed..b4f59ed 100644
--- a/audio/sfx/sfx_4a.asm
+++ b/src/audio/sfx/sfx_4a.asm
diff --git a/audio/sfx/sfx_4b.asm b/src/audio/sfx/sfx_4b.asm
index de97c38..de97c38 100644
--- a/audio/sfx/sfx_4b.asm
+++ b/src/audio/sfx/sfx_4b.asm
diff --git a/audio/sfx/sfx_4c.asm b/src/audio/sfx/sfx_4c.asm
index 55cde21..55cde21 100644
--- a/audio/sfx/sfx_4c.asm
+++ b/src/audio/sfx/sfx_4c.asm
diff --git a/audio/sfx/sfx_4d.asm b/src/audio/sfx/sfx_4d.asm
index 6fa0447..6fa0447 100644
--- a/audio/sfx/sfx_4d.asm
+++ b/src/audio/sfx/sfx_4d.asm
diff --git a/audio/sfx/sfx_4e.asm b/src/audio/sfx/sfx_4e.asm
index a797bd3..a797bd3 100644
--- a/audio/sfx/sfx_4e.asm
+++ b/src/audio/sfx/sfx_4e.asm
diff --git a/audio/sfx/sfx_4f.asm b/src/audio/sfx/sfx_4f.asm
index b407f80..b407f80 100644
--- a/audio/sfx/sfx_4f.asm
+++ b/src/audio/sfx/sfx_4f.asm
diff --git a/audio/sfx/sfx_50.asm b/src/audio/sfx/sfx_50.asm
index 2ae5e33..2ae5e33 100644
--- a/audio/sfx/sfx_50.asm
+++ b/src/audio/sfx/sfx_50.asm
diff --git a/audio/sfx/sfx_51.asm b/src/audio/sfx/sfx_51.asm
index 114ccda..114ccda 100644
--- a/audio/sfx/sfx_51.asm
+++ b/src/audio/sfx/sfx_51.asm
diff --git a/audio/sfx/sfx_52.asm b/src/audio/sfx/sfx_52.asm
index c3e8b3a..c3e8b3a 100644
--- a/audio/sfx/sfx_52.asm
+++ b/src/audio/sfx/sfx_52.asm
diff --git a/audio/sfx/sfx_53.asm b/src/audio/sfx/sfx_53.asm
index f59c97c..f59c97c 100644
--- a/audio/sfx/sfx_53.asm
+++ b/src/audio/sfx/sfx_53.asm
diff --git a/audio/sfx/sfx_54.asm b/src/audio/sfx/sfx_54.asm
index de05745..de05745 100644
--- a/audio/sfx/sfx_54.asm
+++ b/src/audio/sfx/sfx_54.asm
diff --git a/audio/sfx/sfx_55.asm b/src/audio/sfx/sfx_55.asm
index 2bd0b61..2bd0b61 100644
--- a/audio/sfx/sfx_55.asm
+++ b/src/audio/sfx/sfx_55.asm
diff --git a/audio/sfx/sfx_56.asm b/src/audio/sfx/sfx_56.asm
index d36edf5..d36edf5 100644
--- a/audio/sfx/sfx_56.asm
+++ b/src/audio/sfx/sfx_56.asm
diff --git a/audio/sfx/sfx_57.asm b/src/audio/sfx/sfx_57.asm
index 3d2f5df..3d2f5df 100644
--- a/audio/sfx/sfx_57.asm
+++ b/src/audio/sfx/sfx_57.asm
diff --git a/audio/sfx/sfx_58.asm b/src/audio/sfx/sfx_58.asm
index 68e7271..68e7271 100644
--- a/audio/sfx/sfx_58.asm
+++ b/src/audio/sfx/sfx_58.asm
diff --git a/audio/sfx/sfx_59.asm b/src/audio/sfx/sfx_59.asm
index b948993..b948993 100644
--- a/audio/sfx/sfx_59.asm
+++ b/src/audio/sfx/sfx_59.asm
diff --git a/audio/sfx/sfx_5a.asm b/src/audio/sfx/sfx_5a.asm
index 4cdbcab..4cdbcab 100644
--- a/audio/sfx/sfx_5a.asm
+++ b/src/audio/sfx/sfx_5a.asm
diff --git a/audio/sfx/sfx_5b.asm b/src/audio/sfx/sfx_5b.asm
index 528894a..528894a 100644
--- a/audio/sfx/sfx_5b.asm
+++ b/src/audio/sfx/sfx_5b.asm
diff --git a/audio/sfx/sfx_5c.asm b/src/audio/sfx/sfx_5c.asm
index 393f521..393f521 100644
--- a/audio/sfx/sfx_5c.asm
+++ b/src/audio/sfx/sfx_5c.asm
diff --git a/audio/sfx/sfx_5d.asm b/src/audio/sfx/sfx_5d.asm
index 343ec7f..343ec7f 100644
--- a/audio/sfx/sfx_5d.asm
+++ b/src/audio/sfx/sfx_5d.asm
diff --git a/audio/sfx/sfx_5e.asm b/src/audio/sfx/sfx_5e.asm
index 0d69559..0d69559 100644
--- a/audio/sfx/sfx_5e.asm
+++ b/src/audio/sfx/sfx_5e.asm
diff --git a/audio/sfx/sfx_5f.asm b/src/audio/sfx/sfx_5f.asm
index a79d11e..a79d11e 100644
--- a/audio/sfx/sfx_5f.asm
+++ b/src/audio/sfx/sfx_5f.asm
diff --git a/audio/sfx_headers.asm b/src/audio/sfx_headers.asm
index 6485425..6485425 100755
--- a/audio/sfx_headers.asm
+++ b/src/audio/sfx_headers.asm
diff --git a/audio/vibrato_types.asm b/src/audio/vibrato_types.asm
index d51546e..d51546e 100755
--- a/audio/vibrato_types.asm
+++ b/src/audio/vibrato_types.asm
diff --git a/audio/wave_instruments.asm b/src/audio/wave_instruments.asm
index 98197dc..98197dc 100755
--- a/audio/wave_instruments.asm
+++ b/src/audio/wave_instruments.asm
diff --git a/constants.asm b/src/constants.asm
index 5985ff1..5985ff1 100755
--- a/constants.asm
+++ b/src/constants.asm
diff --git a/constants/card_constants.asm b/src/constants/card_constants.asm
index bef5f3f..bef5f3f 100755
--- a/constants/card_constants.asm
+++ b/src/constants/card_constants.asm
diff --git a/constants/deck_constants.asm b/src/constants/deck_constants.asm
index 9f2198b..9f2198b 100755
--- a/constants/deck_constants.asm
+++ b/src/constants/deck_constants.asm
diff --git a/constants/duelist_constants.asm b/src/constants/duelist_constants.asm
index 2fbb190..2fbb190 100755
--- a/constants/duelist_constants.asm
+++ b/src/constants/duelist_constants.asm
diff --git a/constants/hardware_constants.asm b/src/constants/hardware_constants.asm
index 8e926a1..8e926a1 100644
--- a/constants/hardware_constants.asm
+++ b/src/constants/hardware_constants.asm
diff --git a/constants/map_constants.asm b/src/constants/map_constants.asm
index c2e2388..c2e2388 100755
--- a/constants/map_constants.asm
+++ b/src/constants/map_constants.asm
diff --git a/constants/misc_constants.asm b/src/constants/misc_constants.asm
index d985e77..d985e77 100644
--- a/constants/misc_constants.asm
+++ b/src/constants/misc_constants.asm
diff --git a/constants/music_constants.asm b/src/constants/music_constants.asm
index a4c2526..a4c2526 100755
--- a/constants/music_constants.asm
+++ b/src/constants/music_constants.asm
diff --git a/constants/set_constants.asm b/src/constants/set_constants.asm
index d3cfa57..d3cfa57 100755
--- a/constants/set_constants.asm
+++ b/src/constants/set_constants.asm
diff --git a/constants/text_constants.asm b/src/constants/text_constants.asm
index a018be1..a018be1 100755
--- a/constants/text_constants.asm
+++ b/src/constants/text_constants.asm
diff --git a/constants/type_constants.asm b/src/constants/type_constants.asm
index 59f8821..59f8821 100755
--- a/constants/type_constants.asm
+++ b/src/constants/type_constants.asm
diff --git a/data/cards.asm b/src/data/cards.asm
index 9cfb1a7..9cfb1a7 100755
--- a/data/cards.asm
+++ b/src/data/cards.asm
diff --git a/data/decks.asm b/src/data/decks.asm
index cb29df4..cb29df4 100755
--- a/data/decks.asm
+++ b/src/data/decks.asm
diff --git a/data/map_scripts.asm b/src/data/map_scripts.asm
index b85eb6f..b85eb6f 100755
--- a/data/map_scripts.asm
+++ b/src/data/map_scripts.asm
diff --git a/data/map_songs.asm b/src/data/map_songs.asm
index afb54a8..afb54a8 100755
--- a/data/map_songs.asm
+++ b/src/data/map_songs.asm
diff --git a/data/overworld_indexes.asm b/src/data/overworld_indexes.asm
index 7df99de..7df99de 100755
--- a/data/overworld_indexes.asm
+++ b/src/data/overworld_indexes.asm
diff --git a/data/warp_data.asm b/src/data/warp_data.asm
index cb34721..cb34721 100755
--- a/data/warp_data.asm
+++ b/src/data/warp_data.asm
diff --git a/engine/bank1.asm b/src/engine/bank1.asm
index c29a4c4..c29a4c4 100755
--- a/engine/bank1.asm
+++ b/src/engine/bank1.asm
diff --git a/engine/bank1c.asm b/src/engine/bank1c.asm
index e11aaef..e11aaef 100755
--- a/engine/bank1c.asm
+++ b/src/engine/bank1c.asm
diff --git a/engine/bank2.asm b/src/engine/bank2.asm
index 1c82b47..1c82b47 100755
--- a/engine/bank2.asm
+++ b/src/engine/bank2.asm
diff --git a/engine/bank20.asm b/src/engine/bank20.asm
index 11ca29a..11ca29a 100755
--- a/engine/bank20.asm
+++ b/src/engine/bank20.asm
diff --git a/engine/bank3.asm b/src/engine/bank3.asm
index 38a56cd..38a56cd 100755
--- a/engine/bank3.asm
+++ b/src/engine/bank3.asm
diff --git a/engine/bank4.asm b/src/engine/bank4.asm
index f144aa6..f144aa6 100755
--- a/engine/bank4.asm
+++ b/src/engine/bank4.asm
diff --git a/engine/bank6.asm b/src/engine/bank6.asm
index 7535b3f..7535b3f 100755
--- a/engine/bank6.asm
+++ b/src/engine/bank6.asm
diff --git a/engine/bank7.asm b/src/engine/bank7.asm
index 7622b0d..7622b0d 100755
--- a/engine/bank7.asm
+++ b/src/engine/bank7.asm
diff --git a/engine/home.asm b/src/engine/home.asm
index dd06781..dd06781 100755
--- a/engine/home.asm
+++ b/src/engine/home.asm
diff --git a/gfx.asm b/src/gfx.asm
index 7124af2..7124af2 100644
--- a/gfx.asm
+++ b/src/gfx.asm
diff --git a/gfx/boosterpacks/aerodactylintro1.png b/src/gfx/boosterpacks/aerodactylintro1.png
index e18b96b..e18b96b 100755
--- a/gfx/boosterpacks/aerodactylintro1.png
+++ b/src/gfx/boosterpacks/aerodactylintro1.png
diff --git a/gfx/boosterpacks/aerodactylintro2.png b/src/gfx/boosterpacks/aerodactylintro2.png
index ba347b5..ba347b5 100755
--- a/gfx/boosterpacks/aerodactylintro2.png
+++ b/src/gfx/boosterpacks/aerodactylintro2.png
diff --git a/gfx/boosterpacks/boosterpack_oam.png b/src/gfx/boosterpacks/boosterpack_oam.png
index dcb3850..dcb3850 100755
--- a/gfx/boosterpacks/boosterpack_oam.png
+++ b/src/gfx/boosterpacks/boosterpack_oam.png
diff --git a/gfx/boosterpacks/charizardintro1.png b/src/gfx/boosterpacks/charizardintro1.png
index 50e757f..50e757f 100755
--- a/gfx/boosterpacks/charizardintro1.png
+++ b/src/gfx/boosterpacks/charizardintro1.png
diff --git a/gfx/boosterpacks/charizardintro2.png b/src/gfx/boosterpacks/charizardintro2.png
index c7ec7b4..c7ec7b4 100755
--- a/gfx/boosterpacks/charizardintro2.png
+++ b/src/gfx/boosterpacks/charizardintro2.png
diff --git a/gfx/boosterpacks/colosseum1.png b/src/gfx/boosterpacks/colosseum1.png
index 9ce2500..9ce2500 100755
--- a/gfx/boosterpacks/colosseum1.png
+++ b/src/gfx/boosterpacks/colosseum1.png
diff --git a/gfx/boosterpacks/colosseum2.png b/src/gfx/boosterpacks/colosseum2.png
index 1da1a52..1da1a52 100644
--- a/gfx/boosterpacks/colosseum2.png
+++ b/src/gfx/boosterpacks/colosseum2.png
diff --git a/gfx/boosterpacks/evolution1.png b/src/gfx/boosterpacks/evolution1.png
index 15caac5..15caac5 100755
--- a/gfx/boosterpacks/evolution1.png
+++ b/src/gfx/boosterpacks/evolution1.png
diff --git a/gfx/boosterpacks/evolution2.png b/src/gfx/boosterpacks/evolution2.png
index 09affa5..09affa5 100644
--- a/gfx/boosterpacks/evolution2.png
+++ b/src/gfx/boosterpacks/evolution2.png
diff --git a/gfx/boosterpacks/laboratory1.png b/src/gfx/boosterpacks/laboratory1.png
index 5444be5..5444be5 100755
--- a/gfx/boosterpacks/laboratory1.png
+++ b/src/gfx/boosterpacks/laboratory1.png
diff --git a/gfx/boosterpacks/laboratory2.png b/src/gfx/boosterpacks/laboratory2.png
index 4feb880..4feb880 100644
--- a/gfx/boosterpacks/laboratory2.png
+++ b/src/gfx/boosterpacks/laboratory2.png
diff --git a/gfx/boosterpacks/mystery1.png b/src/gfx/boosterpacks/mystery1.png
index 06a5749..06a5749 100755
--- a/gfx/boosterpacks/mystery1.png
+++ b/src/gfx/boosterpacks/mystery1.png
diff --git a/gfx/boosterpacks/mystery2.png b/src/gfx/boosterpacks/mystery2.png
index fc04dbf..fc04dbf 100644
--- a/gfx/boosterpacks/mystery2.png
+++ b/src/gfx/boosterpacks/mystery2.png
diff --git a/gfx/boosterpacks/scytherintro1.png b/src/gfx/boosterpacks/scytherintro1.png
index 3e6bd36..3e6bd36 100755
--- a/gfx/boosterpacks/scytherintro1.png
+++ b/src/gfx/boosterpacks/scytherintro1.png
diff --git a/gfx/boosterpacks/scytherintro2.png b/src/gfx/boosterpacks/scytherintro2.png
index c6fd814..c6fd814 100755
--- a/gfx/boosterpacks/scytherintro2.png
+++ b/src/gfx/boosterpacks/scytherintro2.png
diff --git a/gfx/cardpop1.png b/src/gfx/cardpop1.png
index c607d8d..c607d8d 100644
--- a/gfx/cardpop1.png
+++ b/src/gfx/cardpop1.png
diff --git a/gfx/cardpop2.png b/src/gfx/cardpop2.png
index 75e5149..75e5149 100644
--- a/gfx/cardpop2.png
+++ b/src/gfx/cardpop2.png
diff --git a/gfx/cardpop3.png b/src/gfx/cardpop3.png
index 48bd233..48bd233 100644
--- a/gfx/cardpop3.png
+++ b/src/gfx/cardpop3.png
diff --git a/gfx/cards/abra.png b/src/gfx/cards/abra.png
index e3e8509..e3e8509 100644
--- a/gfx/cards/abra.png
+++ b/src/gfx/cards/abra.png
diff --git a/gfx/cards/aerodactyl.png b/src/gfx/cards/aerodactyl.png
index c7bbc9e..c7bbc9e 100644
--- a/gfx/cards/aerodactyl.png
+++ b/src/gfx/cards/aerodactyl.png
diff --git a/gfx/cards/alakazam.png b/src/gfx/cards/alakazam.png
index 099fd66..099fd66 100644
--- a/gfx/cards/alakazam.png
+++ b/src/gfx/cards/alakazam.png
diff --git a/gfx/cards/arbok.png b/src/gfx/cards/arbok.png
index 0393921..0393921 100644
--- a/gfx/cards/arbok.png
+++ b/src/gfx/cards/arbok.png
diff --git a/gfx/cards/arcanine1.png b/src/gfx/cards/arcanine1.png
index 840865b..840865b 100644
--- a/gfx/cards/arcanine1.png
+++ b/src/gfx/cards/arcanine1.png
diff --git a/gfx/cards/arcanine2.png b/src/gfx/cards/arcanine2.png
index e943cc4..e943cc4 100644
--- a/gfx/cards/arcanine2.png
+++ b/src/gfx/cards/arcanine2.png
diff --git a/gfx/cards/articuno1.png b/src/gfx/cards/articuno1.png
index e03d821..e03d821 100644
--- a/gfx/cards/articuno1.png
+++ b/src/gfx/cards/articuno1.png
diff --git a/gfx/cards/articuno2.png b/src/gfx/cards/articuno2.png
index 948c5a6..948c5a6 100644
--- a/gfx/cards/articuno2.png
+++ b/src/gfx/cards/articuno2.png
diff --git a/gfx/cards/beedrill.png b/src/gfx/cards/beedrill.png
index fabacc9..fabacc9 100644
--- a/gfx/cards/beedrill.png
+++ b/src/gfx/cards/beedrill.png
diff --git a/gfx/cards/bellsprout.png b/src/gfx/cards/bellsprout.png
index 044fd5b..044fd5b 100644
--- a/gfx/cards/bellsprout.png
+++ b/src/gfx/cards/bellsprout.png
diff --git a/gfx/cards/bill.png b/src/gfx/cards/bill.png
index d915777..d915777 100644
--- a/gfx/cards/bill.png
+++ b/src/gfx/cards/bill.png
diff --git a/gfx/cards/blastoise.png b/src/gfx/cards/blastoise.png
index d2bc5bb..d2bc5bb 100644
--- a/gfx/cards/blastoise.png
+++ b/src/gfx/cards/blastoise.png
diff --git a/gfx/cards/bulbasaur.png b/src/gfx/cards/bulbasaur.png
index 5bda906..5bda906 100644
--- a/gfx/cards/bulbasaur.png
+++ b/src/gfx/cards/bulbasaur.png
diff --git a/gfx/cards/butterfree.png b/src/gfx/cards/butterfree.png
index c1c8d4e..c1c8d4e 100644
--- a/gfx/cards/butterfree.png
+++ b/src/gfx/cards/butterfree.png
diff --git a/gfx/cards/caterpie.png b/src/gfx/cards/caterpie.png
index 06cef2a..06cef2a 100644
--- a/gfx/cards/caterpie.png
+++ b/src/gfx/cards/caterpie.png
diff --git a/gfx/cards/chansey.png b/src/gfx/cards/chansey.png
index ae31291..ae31291 100644
--- a/gfx/cards/chansey.png
+++ b/src/gfx/cards/chansey.png
diff --git a/gfx/cards/charizard.png b/src/gfx/cards/charizard.png
index 6dc3968..6dc3968 100644
--- a/gfx/cards/charizard.png
+++ b/src/gfx/cards/charizard.png
diff --git a/gfx/cards/charmander.png b/src/gfx/cards/charmander.png
index 8b2f4f0..8b2f4f0 100644
--- a/gfx/cards/charmander.png
+++ b/src/gfx/cards/charmander.png
diff --git a/gfx/cards/charmeleon.png b/src/gfx/cards/charmeleon.png
index b7ffb64..b7ffb64 100644
--- a/gfx/cards/charmeleon.png
+++ b/src/gfx/cards/charmeleon.png
diff --git a/gfx/cards/clefable.png b/src/gfx/cards/clefable.png
index 7c0cb86..7c0cb86 100644
--- a/gfx/cards/clefable.png
+++ b/src/gfx/cards/clefable.png
diff --git a/gfx/cards/clefairy.png b/src/gfx/cards/clefairy.png
index eda9e4d..eda9e4d 100644
--- a/gfx/cards/clefairy.png
+++ b/src/gfx/cards/clefairy.png
diff --git a/gfx/cards/clefairydoll.png b/src/gfx/cards/clefairydoll.png
index e607ea1..e607ea1 100644
--- a/gfx/cards/clefairydoll.png
+++ b/src/gfx/cards/clefairydoll.png
diff --git a/gfx/cards/cloyster.png b/src/gfx/cards/cloyster.png
index c24df71..c24df71 100644
--- a/gfx/cards/cloyster.png
+++ b/src/gfx/cards/cloyster.png
diff --git a/gfx/cards/computersearch.png b/src/gfx/cards/computersearch.png
index 4786ab3..4786ab3 100644
--- a/gfx/cards/computersearch.png
+++ b/src/gfx/cards/computersearch.png
diff --git a/gfx/cards/cubone.png b/src/gfx/cards/cubone.png
index d914d25..d914d25 100644
--- a/gfx/cards/cubone.png
+++ b/src/gfx/cards/cubone.png
diff --git a/gfx/cards/defender.png b/src/gfx/cards/defender.png
index bdeb050..bdeb050 100644
--- a/gfx/cards/defender.png
+++ b/src/gfx/cards/defender.png
diff --git a/gfx/cards/devolutionspray.png b/src/gfx/cards/devolutionspray.png
index de65594..de65594 100644
--- a/gfx/cards/devolutionspray.png
+++ b/src/gfx/cards/devolutionspray.png
diff --git a/gfx/cards/dewgong.png b/src/gfx/cards/dewgong.png
index 21d8f49..21d8f49 100644
--- a/gfx/cards/dewgong.png
+++ b/src/gfx/cards/dewgong.png
diff --git a/gfx/cards/diglett.png b/src/gfx/cards/diglett.png
index 06e3f98..06e3f98 100644
--- a/gfx/cards/diglett.png
+++ b/src/gfx/cards/diglett.png
diff --git a/gfx/cards/ditto.png b/src/gfx/cards/ditto.png
index 14cf202..14cf202 100644
--- a/gfx/cards/ditto.png
+++ b/src/gfx/cards/ditto.png
diff --git a/gfx/cards/dodrio.png b/src/gfx/cards/dodrio.png
index 4792c45..4792c45 100644
--- a/gfx/cards/dodrio.png
+++ b/src/gfx/cards/dodrio.png
diff --git a/gfx/cards/doduo.png b/src/gfx/cards/doduo.png
index 31b44af..31b44af 100644
--- a/gfx/cards/doduo.png
+++ b/src/gfx/cards/doduo.png
diff --git a/gfx/cards/doublecolorlessenergy.png b/src/gfx/cards/doublecolorlessenergy.png
index 767be48..767be48 100644
--- a/gfx/cards/doublecolorlessenergy.png
+++ b/src/gfx/cards/doublecolorlessenergy.png
diff --git a/gfx/cards/dragonair.png b/src/gfx/cards/dragonair.png
index 5c88db3..5c88db3 100644
--- a/gfx/cards/dragonair.png
+++ b/src/gfx/cards/dragonair.png
diff --git a/gfx/cards/dragonite1.png b/src/gfx/cards/dragonite1.png
index 205b109..205b109 100644
--- a/gfx/cards/dragonite1.png
+++ b/src/gfx/cards/dragonite1.png
diff --git a/gfx/cards/dragonite2.png b/src/gfx/cards/dragonite2.png
index 8ba22a7..8ba22a7 100644
--- a/gfx/cards/dragonite2.png
+++ b/src/gfx/cards/dragonite2.png
diff --git a/gfx/cards/dratini.png b/src/gfx/cards/dratini.png
index 77aaa63..77aaa63 100644
--- a/gfx/cards/dratini.png
+++ b/src/gfx/cards/dratini.png
diff --git a/gfx/cards/drowzee.png b/src/gfx/cards/drowzee.png
index ee65440..ee65440 100644
--- a/gfx/cards/drowzee.png
+++ b/src/gfx/cards/drowzee.png
diff --git a/gfx/cards/dugtrio.png b/src/gfx/cards/dugtrio.png
index 41d93d6..41d93d6 100644
--- a/gfx/cards/dugtrio.png
+++ b/src/gfx/cards/dugtrio.png
diff --git a/gfx/cards/eevee.png b/src/gfx/cards/eevee.png
index 534ed3d..534ed3d 100644
--- a/gfx/cards/eevee.png
+++ b/src/gfx/cards/eevee.png
diff --git a/gfx/cards/ekans.png b/src/gfx/cards/ekans.png
index 16b6be7..16b6be7 100644
--- a/gfx/cards/ekans.png
+++ b/src/gfx/cards/ekans.png
diff --git a/gfx/cards/electabuzz1.png b/src/gfx/cards/electabuzz1.png
index c6b6711..c6b6711 100644
--- a/gfx/cards/electabuzz1.png
+++ b/src/gfx/cards/electabuzz1.png
diff --git a/gfx/cards/electabuzz2.png b/src/gfx/cards/electabuzz2.png
index 84a0067..84a0067 100644
--- a/gfx/cards/electabuzz2.png
+++ b/src/gfx/cards/electabuzz2.png
diff --git a/gfx/cards/electrode1.png b/src/gfx/cards/electrode1.png
index 2c3c67a..2c3c67a 100644
--- a/gfx/cards/electrode1.png
+++ b/src/gfx/cards/electrode1.png
diff --git a/gfx/cards/electrode2.png b/src/gfx/cards/electrode2.png
index 10a6163..10a6163 100644
--- a/gfx/cards/electrode2.png
+++ b/src/gfx/cards/electrode2.png
diff --git a/gfx/cards/energyremoval.png b/src/gfx/cards/energyremoval.png
index 860d517..860d517 100644
--- a/gfx/cards/energyremoval.png
+++ b/src/gfx/cards/energyremoval.png
diff --git a/gfx/cards/energyretrieval.png b/src/gfx/cards/energyretrieval.png
index 93154be..93154be 100644
--- a/gfx/cards/energyretrieval.png
+++ b/src/gfx/cards/energyretrieval.png
diff --git a/gfx/cards/energysearch.png b/src/gfx/cards/energysearch.png
index 0fe54fd..0fe54fd 100644
--- a/gfx/cards/energysearch.png
+++ b/src/gfx/cards/energysearch.png
diff --git a/gfx/cards/exeggcute.png b/src/gfx/cards/exeggcute.png
index 1ae396f..1ae396f 100644
--- a/gfx/cards/exeggcute.png
+++ b/src/gfx/cards/exeggcute.png
diff --git a/gfx/cards/exeggutor.png b/src/gfx/cards/exeggutor.png
index 1403e38..1403e38 100644
--- a/gfx/cards/exeggutor.png
+++ b/src/gfx/cards/exeggutor.png
diff --git a/gfx/cards/farfetchd.png b/src/gfx/cards/farfetchd.png
index fc5d678..fc5d678 100644
--- a/gfx/cards/farfetchd.png
+++ b/src/gfx/cards/farfetchd.png
diff --git a/gfx/cards/fearow.png b/src/gfx/cards/fearow.png
index dbc9197..dbc9197 100644
--- a/gfx/cards/fearow.png
+++ b/src/gfx/cards/fearow.png
diff --git a/gfx/cards/fightingenergy.png b/src/gfx/cards/fightingenergy.png
index ef50467..ef50467 100644
--- a/gfx/cards/fightingenergy.png
+++ b/src/gfx/cards/fightingenergy.png
diff --git a/gfx/cards/fireenergy.png b/src/gfx/cards/fireenergy.png
index 451dd4f..451dd4f 100644
--- a/gfx/cards/fireenergy.png
+++ b/src/gfx/cards/fireenergy.png
diff --git a/gfx/cards/flareon1.png b/src/gfx/cards/flareon1.png
index 0faa467..0faa467 100644
--- a/gfx/cards/flareon1.png
+++ b/src/gfx/cards/flareon1.png
diff --git a/gfx/cards/flareon2.png b/src/gfx/cards/flareon2.png
index 9e822ae..9e822ae 100644
--- a/gfx/cards/flareon2.png
+++ b/src/gfx/cards/flareon2.png
diff --git a/gfx/cards/flyingpikachu.png b/src/gfx/cards/flyingpikachu.png
index 155855d..155855d 100644
--- a/gfx/cards/flyingpikachu.png
+++ b/src/gfx/cards/flyingpikachu.png
diff --git a/gfx/cards/fullheal.png b/src/gfx/cards/fullheal.png
index d6a5c34..d6a5c34 100644
--- a/gfx/cards/fullheal.png
+++ b/src/gfx/cards/fullheal.png
diff --git a/gfx/cards/gambler.png b/src/gfx/cards/gambler.png
index aa67e41..aa67e41 100644
--- a/gfx/cards/gambler.png
+++ b/src/gfx/cards/gambler.png
diff --git a/gfx/cards/gastly1.png b/src/gfx/cards/gastly1.png
index 4bac9e6..4bac9e6 100644
--- a/gfx/cards/gastly1.png
+++ b/src/gfx/cards/gastly1.png
diff --git a/gfx/cards/gastly2.png b/src/gfx/cards/gastly2.png
index 06d393f..06d393f 100644
--- a/gfx/cards/gastly2.png
+++ b/src/gfx/cards/gastly2.png
diff --git a/gfx/cards/gengar.png b/src/gfx/cards/gengar.png
index 74026d0..74026d0 100644
--- a/gfx/cards/gengar.png
+++ b/src/gfx/cards/gengar.png
diff --git a/gfx/cards/geodude.png b/src/gfx/cards/geodude.png
index 5d7c9eb..5d7c9eb 100644
--- a/gfx/cards/geodude.png
+++ b/src/gfx/cards/geodude.png
diff --git a/gfx/cards/gloom.png b/src/gfx/cards/gloom.png
index e306d98..e306d98 100644
--- a/gfx/cards/gloom.png
+++ b/src/gfx/cards/gloom.png
diff --git a/gfx/cards/golbat.png b/src/gfx/cards/golbat.png
index 239d662..239d662 100644
--- a/gfx/cards/golbat.png
+++ b/src/gfx/cards/golbat.png
diff --git a/gfx/cards/goldeen.png b/src/gfx/cards/goldeen.png
index 93bc336..93bc336 100644
--- a/gfx/cards/goldeen.png
+++ b/src/gfx/cards/goldeen.png
diff --git a/gfx/cards/golduck.png b/src/gfx/cards/golduck.png
index ab6e83f..ab6e83f 100644
--- a/gfx/cards/golduck.png
+++ b/src/gfx/cards/golduck.png
diff --git a/gfx/cards/golem.png b/src/gfx/cards/golem.png
index cffba36..cffba36 100644
--- a/gfx/cards/golem.png
+++ b/src/gfx/cards/golem.png
diff --git a/gfx/cards/grassenergy.png b/src/gfx/cards/grassenergy.png
index e76556f..e76556f 100644
--- a/gfx/cards/grassenergy.png
+++ b/src/gfx/cards/grassenergy.png
diff --git a/gfx/cards/graveler.png b/src/gfx/cards/graveler.png
index 0d83998..0d83998 100644
--- a/gfx/cards/graveler.png
+++ b/src/gfx/cards/graveler.png
diff --git a/gfx/cards/grimer.png b/src/gfx/cards/grimer.png
index 19d3cbb..19d3cbb 100644
--- a/gfx/cards/grimer.png
+++ b/src/gfx/cards/grimer.png
diff --git a/gfx/cards/growlithe.png b/src/gfx/cards/growlithe.png
index 293020a..293020a 100644
--- a/gfx/cards/growlithe.png
+++ b/src/gfx/cards/growlithe.png
diff --git a/gfx/cards/gustofwind.png b/src/gfx/cards/gustofwind.png
index 4d6e073..4d6e073 100644
--- a/gfx/cards/gustofwind.png
+++ b/src/gfx/cards/gustofwind.png
diff --git a/gfx/cards/gyarados.png b/src/gfx/cards/gyarados.png
index 7f5b645..7f5b645 100644
--- a/gfx/cards/gyarados.png
+++ b/src/gfx/cards/gyarados.png
diff --git a/gfx/cards/haunter1.png b/src/gfx/cards/haunter1.png
index afef947..afef947 100644
--- a/gfx/cards/haunter1.png
+++ b/src/gfx/cards/haunter1.png
diff --git a/gfx/cards/haunter2.png b/src/gfx/cards/haunter2.png
index cb68e59..cb68e59 100644
--- a/gfx/cards/haunter2.png
+++ b/src/gfx/cards/haunter2.png
diff --git a/gfx/cards/hitmonchan.png b/src/gfx/cards/hitmonchan.png
index 2828e3f..2828e3f 100644
--- a/gfx/cards/hitmonchan.png
+++ b/src/gfx/cards/hitmonchan.png
diff --git a/gfx/cards/hitmonlee.png b/src/gfx/cards/hitmonlee.png
index 6a40b93..6a40b93 100644
--- a/gfx/cards/hitmonlee.png
+++ b/src/gfx/cards/hitmonlee.png
diff --git a/gfx/cards/horsea.png b/src/gfx/cards/horsea.png
index 43116fe..43116fe 100644
--- a/gfx/cards/horsea.png
+++ b/src/gfx/cards/horsea.png
diff --git a/gfx/cards/hypno.png b/src/gfx/cards/hypno.png
index 22b1dfa..22b1dfa 100644
--- a/gfx/cards/hypno.png
+++ b/src/gfx/cards/hypno.png
diff --git a/gfx/cards/imakuni.png b/src/gfx/cards/imakuni.png
index ce74375..ce74375 100644
--- a/gfx/cards/imakuni.png
+++ b/src/gfx/cards/imakuni.png
diff --git a/gfx/cards/imposterprofessoroak.png b/src/gfx/cards/imposterprofessoroak.png
index 88bfb1c..88bfb1c 100644
--- a/gfx/cards/imposterprofessoroak.png
+++ b/src/gfx/cards/imposterprofessoroak.png
diff --git a/gfx/cards/itemfinder.png b/src/gfx/cards/itemfinder.png
index 48bee2e..48bee2e 100644
--- a/gfx/cards/itemfinder.png
+++ b/src/gfx/cards/itemfinder.png
diff --git a/gfx/cards/ivysaur.png b/src/gfx/cards/ivysaur.png
index 64d7d4f..64d7d4f 100644
--- a/gfx/cards/ivysaur.png
+++ b/src/gfx/cards/ivysaur.png
diff --git a/gfx/cards/jigglypuff1.png b/src/gfx/cards/jigglypuff1.png
index 4c1ae0a..4c1ae0a 100644
--- a/gfx/cards/jigglypuff1.png
+++ b/src/gfx/cards/jigglypuff1.png
diff --git a/gfx/cards/jigglypuff2.png b/src/gfx/cards/jigglypuff2.png
index a94cba9..a94cba9 100644
--- a/gfx/cards/jigglypuff2.png
+++ b/src/gfx/cards/jigglypuff2.png
diff --git a/gfx/cards/jigglypuff3.png b/src/gfx/cards/jigglypuff3.png
index a7e8e54..a7e8e54 100644
--- a/gfx/cards/jigglypuff3.png
+++ b/src/gfx/cards/jigglypuff3.png
diff --git a/gfx/cards/jolteon1.png b/src/gfx/cards/jolteon1.png
index 2af9377..2af9377 100644
--- a/gfx/cards/jolteon1.png
+++ b/src/gfx/cards/jolteon1.png
diff --git a/gfx/cards/jolteon2.png b/src/gfx/cards/jolteon2.png
index 5a40770..5a40770 100644
--- a/gfx/cards/jolteon2.png
+++ b/src/gfx/cards/jolteon2.png
diff --git a/gfx/cards/jynx.png b/src/gfx/cards/jynx.png
index 93a71f0..93a71f0 100644
--- a/gfx/cards/jynx.png
+++ b/src/gfx/cards/jynx.png
diff --git a/gfx/cards/kabuto.png b/src/gfx/cards/kabuto.png
index 86ed76b..86ed76b 100644
--- a/gfx/cards/kabuto.png
+++ b/src/gfx/cards/kabuto.png
diff --git a/gfx/cards/kabutops.png b/src/gfx/cards/kabutops.png
index e16d426..e16d426 100644
--- a/gfx/cards/kabutops.png
+++ b/src/gfx/cards/kabutops.png
diff --git a/gfx/cards/kadabra.png b/src/gfx/cards/kadabra.png
index 350ab8a..350ab8a 100644
--- a/gfx/cards/kadabra.png
+++ b/src/gfx/cards/kadabra.png
diff --git a/gfx/cards/kakuna.png b/src/gfx/cards/kakuna.png
index e185ef6..e185ef6 100644
--- a/gfx/cards/kakuna.png
+++ b/src/gfx/cards/kakuna.png
diff --git a/gfx/cards/kangaskhan.png b/src/gfx/cards/kangaskhan.png
index c14b97e..c14b97e 100644
--- a/gfx/cards/kangaskhan.png
+++ b/src/gfx/cards/kangaskhan.png
diff --git a/gfx/cards/kingler.png b/src/gfx/cards/kingler.png
index a90a4f9..a90a4f9 100644
--- a/gfx/cards/kingler.png
+++ b/src/gfx/cards/kingler.png
diff --git a/gfx/cards/koffing.png b/src/gfx/cards/koffing.png
index eac4d34..eac4d34 100644
--- a/gfx/cards/koffing.png
+++ b/src/gfx/cards/koffing.png
diff --git a/gfx/cards/krabby.png b/src/gfx/cards/krabby.png
index a669a26..a669a26 100644
--- a/gfx/cards/krabby.png
+++ b/src/gfx/cards/krabby.png
diff --git a/gfx/cards/lapras.png b/src/gfx/cards/lapras.png
index 7388e8c..7388e8c 100644
--- a/gfx/cards/lapras.png
+++ b/src/gfx/cards/lapras.png
diff --git a/gfx/cards/lass.png b/src/gfx/cards/lass.png
index 1c33c6f..1c33c6f 100644
--- a/gfx/cards/lass.png
+++ b/src/gfx/cards/lass.png
diff --git a/gfx/cards/lickitung.png b/src/gfx/cards/lickitung.png
index 0abc593..0abc593 100644
--- a/gfx/cards/lickitung.png
+++ b/src/gfx/cards/lickitung.png
diff --git a/gfx/cards/lightningenergy.png b/src/gfx/cards/lightningenergy.png
index d4b627b..d4b627b 100644
--- a/gfx/cards/lightningenergy.png
+++ b/src/gfx/cards/lightningenergy.png
diff --git a/gfx/cards/machamp.png b/src/gfx/cards/machamp.png
index 3f21a3b..3f21a3b 100644
--- a/gfx/cards/machamp.png
+++ b/src/gfx/cards/machamp.png
diff --git a/gfx/cards/machoke.png b/src/gfx/cards/machoke.png
index fe76d14..fe76d14 100644
--- a/gfx/cards/machoke.png
+++ b/src/gfx/cards/machoke.png
diff --git a/gfx/cards/machop.png b/src/gfx/cards/machop.png
index ab9d40c..ab9d40c 100644
--- a/gfx/cards/machop.png
+++ b/src/gfx/cards/machop.png
diff --git a/gfx/cards/magikarp.png b/src/gfx/cards/magikarp.png
index 41d79af..41d79af 100644
--- a/gfx/cards/magikarp.png
+++ b/src/gfx/cards/magikarp.png
diff --git a/gfx/cards/magmar1.png b/src/gfx/cards/magmar1.png
index b24106b..b24106b 100644
--- a/gfx/cards/magmar1.png
+++ b/src/gfx/cards/magmar1.png
diff --git a/gfx/cards/magmar2.png b/src/gfx/cards/magmar2.png
index 7722142..7722142 100644
--- a/gfx/cards/magmar2.png
+++ b/src/gfx/cards/magmar2.png
diff --git a/gfx/cards/magnemite1.png b/src/gfx/cards/magnemite1.png
index ff85f09..ff85f09 100644
--- a/gfx/cards/magnemite1.png
+++ b/src/gfx/cards/magnemite1.png
diff --git a/gfx/cards/magnemite2.png b/src/gfx/cards/magnemite2.png
index c1b84e6..c1b84e6 100644
--- a/gfx/cards/magnemite2.png
+++ b/src/gfx/cards/magnemite2.png
diff --git a/gfx/cards/magneton1.png b/src/gfx/cards/magneton1.png
index d555492..d555492 100644
--- a/gfx/cards/magneton1.png
+++ b/src/gfx/cards/magneton1.png
diff --git a/gfx/cards/magneton2.png b/src/gfx/cards/magneton2.png
index 77eebd7..77eebd7 100644
--- a/gfx/cards/magneton2.png
+++ b/src/gfx/cards/magneton2.png
diff --git a/gfx/cards/maintenance.png b/src/gfx/cards/maintenance.png
index dba26b4..dba26b4 100644
--- a/gfx/cards/maintenance.png
+++ b/src/gfx/cards/maintenance.png
diff --git a/gfx/cards/mankey.png b/src/gfx/cards/mankey.png
index 74af8e1..74af8e1 100644
--- a/gfx/cards/mankey.png
+++ b/src/gfx/cards/mankey.png
diff --git a/gfx/cards/marowak1.png b/src/gfx/cards/marowak1.png
index 7926178..7926178 100644
--- a/gfx/cards/marowak1.png
+++ b/src/gfx/cards/marowak1.png
diff --git a/gfx/cards/marowak2.png b/src/gfx/cards/marowak2.png
index ec924b6..ec924b6 100644
--- a/gfx/cards/marowak2.png
+++ b/src/gfx/cards/marowak2.png
diff --git a/gfx/cards/meowth1.png b/src/gfx/cards/meowth1.png
index 80f502e..80f502e 100644
--- a/gfx/cards/meowth1.png
+++ b/src/gfx/cards/meowth1.png
diff --git a/gfx/cards/meowth2.png b/src/gfx/cards/meowth2.png
index 264ce17..264ce17 100644
--- a/gfx/cards/meowth2.png
+++ b/src/gfx/cards/meowth2.png
diff --git a/gfx/cards/metapod.png b/src/gfx/cards/metapod.png
index 3ab895a..3ab895a 100644
--- a/gfx/cards/metapod.png
+++ b/src/gfx/cards/metapod.png
diff --git a/gfx/cards/mew1.png b/src/gfx/cards/mew1.png
index 983848f..983848f 100644
--- a/gfx/cards/mew1.png
+++ b/src/gfx/cards/mew1.png
diff --git a/gfx/cards/mew2.png b/src/gfx/cards/mew2.png
index a2106fb..a2106fb 100644
--- a/gfx/cards/mew2.png
+++ b/src/gfx/cards/mew2.png
diff --git a/gfx/cards/mew3.png b/src/gfx/cards/mew3.png
index 476c1bc..476c1bc 100644
--- a/gfx/cards/mew3.png
+++ b/src/gfx/cards/mew3.png
diff --git a/gfx/cards/mewtwo1.png b/src/gfx/cards/mewtwo1.png
index 0200721..0200721 100644
--- a/gfx/cards/mewtwo1.png
+++ b/src/gfx/cards/mewtwo1.png
diff --git a/gfx/cards/mewtwo2.png b/src/gfx/cards/mewtwo2.png
index 9ffefad..9ffefad 100644
--- a/gfx/cards/mewtwo2.png
+++ b/src/gfx/cards/mewtwo2.png
diff --git a/gfx/cards/mewtwo3.png b/src/gfx/cards/mewtwo3.png
index 18abd5c..18abd5c 100644
--- a/gfx/cards/mewtwo3.png
+++ b/src/gfx/cards/mewtwo3.png
diff --git a/gfx/cards/moltres1.png b/src/gfx/cards/moltres1.png
index e12fe97..e12fe97 100644
--- a/gfx/cards/moltres1.png
+++ b/src/gfx/cards/moltres1.png
diff --git a/gfx/cards/moltres2.png b/src/gfx/cards/moltres2.png
index 5071ef4..5071ef4 100644
--- a/gfx/cards/moltres2.png
+++ b/src/gfx/cards/moltres2.png
diff --git a/gfx/cards/mrfuji.png b/src/gfx/cards/mrfuji.png
index d1b37ae..d1b37ae 100644
--- a/gfx/cards/mrfuji.png
+++ b/src/gfx/cards/mrfuji.png
diff --git a/gfx/cards/mrmime.png b/src/gfx/cards/mrmime.png
index 42605aa..42605aa 100644
--- a/gfx/cards/mrmime.png
+++ b/src/gfx/cards/mrmime.png
diff --git a/gfx/cards/muk.png b/src/gfx/cards/muk.png
index 51893c1..51893c1 100644
--- a/gfx/cards/muk.png
+++ b/src/gfx/cards/muk.png
diff --git a/gfx/cards/mysteriousfossil.png b/src/gfx/cards/mysteriousfossil.png
index 1226faa..1226faa 100644
--- a/gfx/cards/mysteriousfossil.png
+++ b/src/gfx/cards/mysteriousfossil.png
diff --git a/gfx/cards/nidoking.png b/src/gfx/cards/nidoking.png
index 2e6f08a..2e6f08a 100644
--- a/gfx/cards/nidoking.png
+++ b/src/gfx/cards/nidoking.png
diff --git a/gfx/cards/nidoqueen.png b/src/gfx/cards/nidoqueen.png
index 383bbe7..383bbe7 100644
--- a/gfx/cards/nidoqueen.png
+++ b/src/gfx/cards/nidoqueen.png
diff --git a/gfx/cards/nidoranf.png b/src/gfx/cards/nidoranf.png
index f859596..f859596 100644
--- a/gfx/cards/nidoranf.png
+++ b/src/gfx/cards/nidoranf.png
diff --git a/gfx/cards/nidoranm.png b/src/gfx/cards/nidoranm.png
index bbb304b..bbb304b 100644
--- a/gfx/cards/nidoranm.png
+++ b/src/gfx/cards/nidoranm.png
diff --git a/gfx/cards/nidorina.png b/src/gfx/cards/nidorina.png
index 939e887..939e887 100644
--- a/gfx/cards/nidorina.png
+++ b/src/gfx/cards/nidorina.png
diff --git a/gfx/cards/nidorino.png b/src/gfx/cards/nidorino.png
index d9bc6ca..d9bc6ca 100644
--- a/gfx/cards/nidorino.png
+++ b/src/gfx/cards/nidorino.png
diff --git a/gfx/cards/ninetails1.png b/src/gfx/cards/ninetails1.png
index 38ed8be..38ed8be 100644
--- a/gfx/cards/ninetails1.png
+++ b/src/gfx/cards/ninetails1.png
diff --git a/gfx/cards/ninetails2.png b/src/gfx/cards/ninetails2.png
index 43a165d..43a165d 100644
--- a/gfx/cards/ninetails2.png
+++ b/src/gfx/cards/ninetails2.png
diff --git a/gfx/cards/oddish.png b/src/gfx/cards/oddish.png
index b5474e6..b5474e6 100644
--- a/gfx/cards/oddish.png
+++ b/src/gfx/cards/oddish.png
diff --git a/gfx/cards/omanyte.png b/src/gfx/cards/omanyte.png
index f1ec65f..f1ec65f 100644
--- a/gfx/cards/omanyte.png
+++ b/src/gfx/cards/omanyte.png
diff --git a/gfx/cards/omastar.png b/src/gfx/cards/omastar.png
index bce6c17..bce6c17 100644
--- a/gfx/cards/omastar.png
+++ b/src/gfx/cards/omastar.png
diff --git a/gfx/cards/onix.png b/src/gfx/cards/onix.png
index 44ef65e..44ef65e 100644
--- a/gfx/cards/onix.png
+++ b/src/gfx/cards/onix.png
diff --git a/gfx/cards/paras.png b/src/gfx/cards/paras.png
index 61a5e98..61a5e98 100644
--- a/gfx/cards/paras.png
+++ b/src/gfx/cards/paras.png
diff --git a/gfx/cards/parasect.png b/src/gfx/cards/parasect.png
index d5bd538..d5bd538 100644
--- a/gfx/cards/parasect.png
+++ b/src/gfx/cards/parasect.png
diff --git a/gfx/cards/persian.png b/src/gfx/cards/persian.png
index 59144bf..59144bf 100644
--- a/gfx/cards/persian.png
+++ b/src/gfx/cards/persian.png
diff --git a/gfx/cards/pidgeot1.png b/src/gfx/cards/pidgeot1.png
index e6498b4..e6498b4 100644
--- a/gfx/cards/pidgeot1.png
+++ b/src/gfx/cards/pidgeot1.png
diff --git a/gfx/cards/pidgeot2.png b/src/gfx/cards/pidgeot2.png
index 8e5f742..8e5f742 100644
--- a/gfx/cards/pidgeot2.png
+++ b/src/gfx/cards/pidgeot2.png
diff --git a/gfx/cards/pidgeotto.png b/src/gfx/cards/pidgeotto.png
index f52c342..f52c342 100644
--- a/gfx/cards/pidgeotto.png
+++ b/src/gfx/cards/pidgeotto.png
diff --git a/gfx/cards/pidgey.png b/src/gfx/cards/pidgey.png
index e32186a..e32186a 100644
--- a/gfx/cards/pidgey.png
+++ b/src/gfx/cards/pidgey.png
diff --git a/gfx/cards/pikachu1.png b/src/gfx/cards/pikachu1.png
index a28298a..a28298a 100644
--- a/gfx/cards/pikachu1.png
+++ b/src/gfx/cards/pikachu1.png
diff --git a/gfx/cards/pikachu2.png b/src/gfx/cards/pikachu2.png
index f85b40a..f85b40a 100644
--- a/gfx/cards/pikachu2.png
+++ b/src/gfx/cards/pikachu2.png
diff --git a/gfx/cards/pikachu3.png b/src/gfx/cards/pikachu3.png
index e0155e5..e0155e5 100644
--- a/gfx/cards/pikachu3.png
+++ b/src/gfx/cards/pikachu3.png
diff --git a/gfx/cards/pikachu4.png b/src/gfx/cards/pikachu4.png
index c918c94..c918c94 100644
--- a/gfx/cards/pikachu4.png
+++ b/src/gfx/cards/pikachu4.png
diff --git a/gfx/cards/pinsir.png b/src/gfx/cards/pinsir.png
index 35a7a67..35a7a67 100644
--- a/gfx/cards/pinsir.png
+++ b/src/gfx/cards/pinsir.png
diff --git a/gfx/cards/pluspower.png b/src/gfx/cards/pluspower.png
index 5882fcc..5882fcc 100644
--- a/gfx/cards/pluspower.png
+++ b/src/gfx/cards/pluspower.png
diff --git a/gfx/cards/pokeball.png b/src/gfx/cards/pokeball.png
index bb2750d..bb2750d 100644
--- a/gfx/cards/pokeball.png
+++ b/src/gfx/cards/pokeball.png
diff --git a/gfx/cards/pokedex.png b/src/gfx/cards/pokedex.png
index cb94fed..cb94fed 100644
--- a/gfx/cards/pokedex.png
+++ b/src/gfx/cards/pokedex.png
diff --git a/gfx/cards/pokemonbreeder.png b/src/gfx/cards/pokemonbreeder.png
index c9b875f..c9b875f 100644
--- a/gfx/cards/pokemonbreeder.png
+++ b/src/gfx/cards/pokemonbreeder.png
diff --git a/gfx/cards/pokemoncenter.png b/src/gfx/cards/pokemoncenter.png
index 652446c..652446c 100644
--- a/gfx/cards/pokemoncenter.png
+++ b/src/gfx/cards/pokemoncenter.png
diff --git a/gfx/cards/pokemonflute.png b/src/gfx/cards/pokemonflute.png
index 979ebf1..979ebf1 100644
--- a/gfx/cards/pokemonflute.png
+++ b/src/gfx/cards/pokemonflute.png
diff --git a/gfx/cards/pokemontrader.png b/src/gfx/cards/pokemontrader.png
index bc9dfc2..bc9dfc2 100644
--- a/gfx/cards/pokemontrader.png
+++ b/src/gfx/cards/pokemontrader.png
diff --git a/gfx/cards/poliwag.png b/src/gfx/cards/poliwag.png
index f4e0ae8..f4e0ae8 100644
--- a/gfx/cards/poliwag.png
+++ b/src/gfx/cards/poliwag.png
diff --git a/gfx/cards/poliwhirl.png b/src/gfx/cards/poliwhirl.png
index e778014..e778014 100644
--- a/gfx/cards/poliwhirl.png
+++ b/src/gfx/cards/poliwhirl.png
diff --git a/gfx/cards/poliwrath.png b/src/gfx/cards/poliwrath.png
index 5d50e45..5d50e45 100644
--- a/gfx/cards/poliwrath.png
+++ b/src/gfx/cards/poliwrath.png
diff --git a/gfx/cards/ponyta.png b/src/gfx/cards/ponyta.png
index c4b7554..c4b7554 100644
--- a/gfx/cards/ponyta.png
+++ b/src/gfx/cards/ponyta.png
diff --git a/gfx/cards/porygon.png b/src/gfx/cards/porygon.png
index a2ebed7..a2ebed7 100644
--- a/gfx/cards/porygon.png
+++ b/src/gfx/cards/porygon.png
diff --git a/gfx/cards/potion.png b/src/gfx/cards/potion.png
index 15ae183..15ae183 100644
--- a/gfx/cards/potion.png
+++ b/src/gfx/cards/potion.png
diff --git a/gfx/cards/primeape.png b/src/gfx/cards/primeape.png
index fdfc577..fdfc577 100644
--- a/gfx/cards/primeape.png
+++ b/src/gfx/cards/primeape.png
diff --git a/gfx/cards/professoroak.png b/src/gfx/cards/professoroak.png
index aaf249a..aaf249a 100644
--- a/gfx/cards/professoroak.png
+++ b/src/gfx/cards/professoroak.png
diff --git a/gfx/cards/psychicenergy.png b/src/gfx/cards/psychicenergy.png
index 20d54d8..20d54d8 100644
--- a/gfx/cards/psychicenergy.png
+++ b/src/gfx/cards/psychicenergy.png
diff --git a/gfx/cards/psyduck.png b/src/gfx/cards/psyduck.png
index 323ae49..323ae49 100644
--- a/gfx/cards/psyduck.png
+++ b/src/gfx/cards/psyduck.png
diff --git a/gfx/cards/raichu1.png b/src/gfx/cards/raichu1.png
index 9b2d6ff..9b2d6ff 100644
--- a/gfx/cards/raichu1.png
+++ b/src/gfx/cards/raichu1.png
diff --git a/gfx/cards/raichu2.png b/src/gfx/cards/raichu2.png
index 8c35b05..8c35b05 100644
--- a/gfx/cards/raichu2.png
+++ b/src/gfx/cards/raichu2.png
diff --git a/gfx/cards/rapidash.png b/src/gfx/cards/rapidash.png
index d86f93e..d86f93e 100644
--- a/gfx/cards/rapidash.png
+++ b/src/gfx/cards/rapidash.png
diff --git a/gfx/cards/raticate.png b/src/gfx/cards/raticate.png
index a20c6b9..a20c6b9 100644
--- a/gfx/cards/raticate.png
+++ b/src/gfx/cards/raticate.png
diff --git a/gfx/cards/rattata.png b/src/gfx/cards/rattata.png
index d90ea49..d90ea49 100644
--- a/gfx/cards/rattata.png
+++ b/src/gfx/cards/rattata.png
diff --git a/gfx/cards/recycle.png b/src/gfx/cards/recycle.png
index 32637ce..32637ce 100644
--- a/gfx/cards/recycle.png
+++ b/src/gfx/cards/recycle.png
diff --git a/gfx/cards/revive.png b/src/gfx/cards/revive.png
index e2df762..e2df762 100644
--- a/gfx/cards/revive.png
+++ b/src/gfx/cards/revive.png
diff --git a/gfx/cards/rhydon.png b/src/gfx/cards/rhydon.png
index 550256f..550256f 100644
--- a/gfx/cards/rhydon.png
+++ b/src/gfx/cards/rhydon.png
diff --git a/gfx/cards/rhyhorn.png b/src/gfx/cards/rhyhorn.png
index 62740d4..62740d4 100644
--- a/gfx/cards/rhyhorn.png
+++ b/src/gfx/cards/rhyhorn.png
diff --git a/gfx/cards/sandshrew.png b/src/gfx/cards/sandshrew.png
index c83e2c4..c83e2c4 100644
--- a/gfx/cards/sandshrew.png
+++ b/src/gfx/cards/sandshrew.png
diff --git a/gfx/cards/sandslash.png b/src/gfx/cards/sandslash.png
index a6d739d..a6d739d 100644
--- a/gfx/cards/sandslash.png
+++ b/src/gfx/cards/sandslash.png
diff --git a/gfx/cards/scoopup.png b/src/gfx/cards/scoopup.png
index e9364ff..e9364ff 100644
--- a/gfx/cards/scoopup.png
+++ b/src/gfx/cards/scoopup.png
diff --git a/gfx/cards/scyther.png b/src/gfx/cards/scyther.png
index ddc9624..ddc9624 100644
--- a/gfx/cards/scyther.png
+++ b/src/gfx/cards/scyther.png
diff --git a/gfx/cards/seadra.png b/src/gfx/cards/seadra.png
index 1ceefc6..1ceefc6 100644
--- a/gfx/cards/seadra.png
+++ b/src/gfx/cards/seadra.png
diff --git a/gfx/cards/seaking.png b/src/gfx/cards/seaking.png
index 8f58c89..8f58c89 100644
--- a/gfx/cards/seaking.png
+++ b/src/gfx/cards/seaking.png
diff --git a/gfx/cards/seel.png b/src/gfx/cards/seel.png
index dec2c2f..dec2c2f 100644
--- a/gfx/cards/seel.png
+++ b/src/gfx/cards/seel.png
diff --git a/gfx/cards/shellder.png b/src/gfx/cards/shellder.png
index 1c336f6..1c336f6 100644
--- a/gfx/cards/shellder.png
+++ b/src/gfx/cards/shellder.png
diff --git a/gfx/cards/slowbro.png b/src/gfx/cards/slowbro.png
index e574738..e574738 100644
--- a/gfx/cards/slowbro.png
+++ b/src/gfx/cards/slowbro.png
diff --git a/gfx/cards/slowpoke1.png b/src/gfx/cards/slowpoke1.png
index 54cd6c9..54cd6c9 100644
--- a/gfx/cards/slowpoke1.png
+++ b/src/gfx/cards/slowpoke1.png
diff --git a/gfx/cards/slowpoke2.png b/src/gfx/cards/slowpoke2.png
index c951930..c951930 100644
--- a/gfx/cards/slowpoke2.png
+++ b/src/gfx/cards/slowpoke2.png
diff --git a/gfx/cards/snorlax.png b/src/gfx/cards/snorlax.png
index cfd5ca7..cfd5ca7 100644
--- a/gfx/cards/snorlax.png
+++ b/src/gfx/cards/snorlax.png
diff --git a/gfx/cards/spearow.png b/src/gfx/cards/spearow.png
index c3d39dd..c3d39dd 100644
--- a/gfx/cards/spearow.png
+++ b/src/gfx/cards/spearow.png
diff --git a/gfx/cards/squirtle.png b/src/gfx/cards/squirtle.png
index ba604ac..ba604ac 100644
--- a/gfx/cards/squirtle.png
+++ b/src/gfx/cards/squirtle.png
diff --git a/gfx/cards/starmie.png b/src/gfx/cards/starmie.png
index 96efadd..96efadd 100644
--- a/gfx/cards/starmie.png
+++ b/src/gfx/cards/starmie.png
diff --git a/gfx/cards/staryu.png b/src/gfx/cards/staryu.png
index 23b5322..23b5322 100644
--- a/gfx/cards/staryu.png
+++ b/src/gfx/cards/staryu.png
diff --git a/gfx/cards/superenergyremoval.png b/src/gfx/cards/superenergyremoval.png
index 05460b7..05460b7 100644
--- a/gfx/cards/superenergyremoval.png
+++ b/src/gfx/cards/superenergyremoval.png
diff --git a/gfx/cards/superenergyretrieval.png b/src/gfx/cards/superenergyretrieval.png
index 93e967b..93e967b 100644
--- a/gfx/cards/superenergyretrieval.png
+++ b/src/gfx/cards/superenergyretrieval.png
diff --git a/gfx/cards/superpotion.png b/src/gfx/cards/superpotion.png
index 86ac5ef..86ac5ef 100644
--- a/gfx/cards/superpotion.png
+++ b/src/gfx/cards/superpotion.png
diff --git a/gfx/cards/surfingpikachu1.png b/src/gfx/cards/surfingpikachu1.png
index 029c89b..029c89b 100644
--- a/gfx/cards/surfingpikachu1.png
+++ b/src/gfx/cards/surfingpikachu1.png
diff --git a/gfx/cards/surfingpikachu2.png b/src/gfx/cards/surfingpikachu2.png
index 3fac2c2..3fac2c2 100644
--- a/gfx/cards/surfingpikachu2.png
+++ b/src/gfx/cards/surfingpikachu2.png
diff --git a/gfx/cards/switch.png b/src/gfx/cards/switch.png
index c93063b..c93063b 100644
--- a/gfx/cards/switch.png
+++ b/src/gfx/cards/switch.png
diff --git a/gfx/cards/tangela1.png b/src/gfx/cards/tangela1.png
index 9f4fdb8..9f4fdb8 100644
--- a/gfx/cards/tangela1.png
+++ b/src/gfx/cards/tangela1.png
diff --git a/gfx/cards/tangela2.png b/src/gfx/cards/tangela2.png
index c689a50..c689a50 100644
--- a/gfx/cards/tangela2.png
+++ b/src/gfx/cards/tangela2.png
diff --git a/gfx/cards/tauros.png b/src/gfx/cards/tauros.png
index 04a7a64..04a7a64 100644
--- a/gfx/cards/tauros.png
+++ b/src/gfx/cards/tauros.png
diff --git a/gfx/cards/tentacool.png b/src/gfx/cards/tentacool.png
index fe24fae..fe24fae 100644
--- a/gfx/cards/tentacool.png
+++ b/src/gfx/cards/tentacool.png
diff --git a/gfx/cards/tentacruel.png b/src/gfx/cards/tentacruel.png
index 9c69872..9c69872 100644
--- a/gfx/cards/tentacruel.png
+++ b/src/gfx/cards/tentacruel.png
diff --git a/gfx/cards/vaporeon1.png b/src/gfx/cards/vaporeon1.png
index 487bc18..487bc18 100644
--- a/gfx/cards/vaporeon1.png
+++ b/src/gfx/cards/vaporeon1.png
diff --git a/gfx/cards/vaporeon2.png b/src/gfx/cards/vaporeon2.png
index d370ea0..d370ea0 100644
--- a/gfx/cards/vaporeon2.png
+++ b/src/gfx/cards/vaporeon2.png
diff --git a/gfx/cards/venomoth.png b/src/gfx/cards/venomoth.png
index 47d6510..47d6510 100644
--- a/gfx/cards/venomoth.png
+++ b/src/gfx/cards/venomoth.png
diff --git a/gfx/cards/venonat.png b/src/gfx/cards/venonat.png
index 5b6d970..5b6d970 100644
--- a/gfx/cards/venonat.png
+++ b/src/gfx/cards/venonat.png
diff --git a/gfx/cards/venusaur1.png b/src/gfx/cards/venusaur1.png
index 9f71a39..9f71a39 100644
--- a/gfx/cards/venusaur1.png
+++ b/src/gfx/cards/venusaur1.png
diff --git a/gfx/cards/venusaur2.png b/src/gfx/cards/venusaur2.png
index 5f91e9b..5f91e9b 100644
--- a/gfx/cards/venusaur2.png
+++ b/src/gfx/cards/venusaur2.png
diff --git a/gfx/cards/victreebel.png b/src/gfx/cards/victreebel.png
index 37cf69c..37cf69c 100644
--- a/gfx/cards/victreebel.png
+++ b/src/gfx/cards/victreebel.png
diff --git a/gfx/cards/vileplume.png b/src/gfx/cards/vileplume.png
index 7ef4386..7ef4386 100644
--- a/gfx/cards/vileplume.png
+++ b/src/gfx/cards/vileplume.png
diff --git a/gfx/cards/voltorb.png b/src/gfx/cards/voltorb.png
index a9e0ec9..a9e0ec9 100644
--- a/gfx/cards/voltorb.png
+++ b/src/gfx/cards/voltorb.png
diff --git a/gfx/cards/vulpix.png b/src/gfx/cards/vulpix.png
index 987a5dd..987a5dd 100644
--- a/gfx/cards/vulpix.png
+++ b/src/gfx/cards/vulpix.png
diff --git a/gfx/cards/wartortle.png b/src/gfx/cards/wartortle.png
index 5c046f7..5c046f7 100644
--- a/gfx/cards/wartortle.png
+++ b/src/gfx/cards/wartortle.png
diff --git a/gfx/cards/waterenergy.png b/src/gfx/cards/waterenergy.png
index d1f28e2..d1f28e2 100644
--- a/gfx/cards/waterenergy.png
+++ b/src/gfx/cards/waterenergy.png
diff --git a/gfx/cards/weedle.png b/src/gfx/cards/weedle.png
index 6073fb7..6073fb7 100644
--- a/gfx/cards/weedle.png
+++ b/src/gfx/cards/weedle.png
diff --git a/gfx/cards/weepinbell.png b/src/gfx/cards/weepinbell.png
index aa0acb7..aa0acb7 100644
--- a/gfx/cards/weepinbell.png
+++ b/src/gfx/cards/weepinbell.png
diff --git a/gfx/cards/weezing.png b/src/gfx/cards/weezing.png
index eaadb67..eaadb67 100644
--- a/gfx/cards/weezing.png
+++ b/src/gfx/cards/weezing.png
diff --git a/gfx/cards/wigglytuff.png b/src/gfx/cards/wigglytuff.png
index 762ad41..762ad41 100644
--- a/gfx/cards/wigglytuff.png
+++ b/src/gfx/cards/wigglytuff.png
diff --git a/gfx/cards/zapdos1.png b/src/gfx/cards/zapdos1.png
index 321dba7..321dba7 100644
--- a/gfx/cards/zapdos1.png
+++ b/src/gfx/cards/zapdos1.png
diff --git a/gfx/cards/zapdos2.png b/src/gfx/cards/zapdos2.png
index 43c1164..43c1164 100644
--- a/gfx/cards/zapdos2.png
+++ b/src/gfx/cards/zapdos2.png
diff --git a/gfx/cards/zapdos3.png b/src/gfx/cards/zapdos3.png
index def590c..def590c 100644
--- a/gfx/cards/zapdos3.png
+++ b/src/gfx/cards/zapdos3.png
diff --git a/gfx/cards/zubat.png b/src/gfx/cards/zubat.png
index f6cdc0e..f6cdc0e 100644
--- a/gfx/cards/zubat.png
+++ b/src/gfx/cards/zubat.png
diff --git a/gfx/companies.png b/src/gfx/companies.png
index c51bd7d..c51bd7d 100755
--- a/gfx/companies.png
+++ b/src/gfx/companies.png
diff --git a/gfx/copyright.png b/src/gfx/copyright.png
index e5ec75a..e5ec75a 100644
--- a/gfx/copyright.png
+++ b/src/gfx/copyright.png
diff --git a/gfx/duel/0.png b/src/gfx/duel/0.png
index f74b710..f74b710 100755
--- a/gfx/duel/0.png
+++ b/src/gfx/duel/0.png
diff --git a/gfx/duel/1.png b/src/gfx/duel/1.png
index fbdd03d..fbdd03d 100755
--- a/gfx/duel/1.png
+++ b/src/gfx/duel/1.png
diff --git a/gfx/duel/10.png b/src/gfx/duel/10.png
index abf7bf4..abf7bf4 100755
--- a/gfx/duel/10.png
+++ b/src/gfx/duel/10.png
diff --git a/gfx/duel/11.png b/src/gfx/duel/11.png
index 73a3564..73a3564 100755
--- a/gfx/duel/11.png
+++ b/src/gfx/duel/11.png
diff --git a/gfx/duel/12.png b/src/gfx/duel/12.png
index 55a7aff..55a7aff 100755
--- a/gfx/duel/12.png
+++ b/src/gfx/duel/12.png
diff --git a/gfx/duel/13.png b/src/gfx/duel/13.png
index 56cfaae..56cfaae 100755
--- a/gfx/duel/13.png
+++ b/src/gfx/duel/13.png
diff --git a/gfx/duel/14.png b/src/gfx/duel/14.png
index 4d7d038..4d7d038 100755
--- a/gfx/duel/14.png
+++ b/src/gfx/duel/14.png
diff --git a/gfx/duel/15.png b/src/gfx/duel/15.png
index 7003067..7003067 100755
--- a/gfx/duel/15.png
+++ b/src/gfx/duel/15.png
diff --git a/gfx/duel/16.png b/src/gfx/duel/16.png
index 8f15645..8f15645 100755
--- a/gfx/duel/16.png
+++ b/src/gfx/duel/16.png
diff --git a/gfx/duel/17.png b/src/gfx/duel/17.png
index 87cfac5..87cfac5 100755
--- a/gfx/duel/17.png
+++ b/src/gfx/duel/17.png
diff --git a/gfx/duel/18.png b/src/gfx/duel/18.png
index e1a10b1..e1a10b1 100755
--- a/gfx/duel/18.png
+++ b/src/gfx/duel/18.png
diff --git a/gfx/duel/19.png b/src/gfx/duel/19.png
index b2642f4..b2642f4 100755
--- a/gfx/duel/19.png
+++ b/src/gfx/duel/19.png
diff --git a/gfx/duel/2.png b/src/gfx/duel/2.png
index 6e10c3b..6e10c3b 100755
--- a/gfx/duel/2.png
+++ b/src/gfx/duel/2.png
diff --git a/gfx/duel/20.png b/src/gfx/duel/20.png
index 0b7fdaa..0b7fdaa 100755
--- a/gfx/duel/20.png
+++ b/src/gfx/duel/20.png
diff --git a/gfx/duel/21.png b/src/gfx/duel/21.png
index 8a6a885..8a6a885 100755
--- a/gfx/duel/21.png
+++ b/src/gfx/duel/21.png
diff --git a/gfx/duel/22.png b/src/gfx/duel/22.png
index 79f7a26..79f7a26 100755
--- a/gfx/duel/22.png
+++ b/src/gfx/duel/22.png
diff --git a/gfx/duel/23.png b/src/gfx/duel/23.png
index f04ef12..f04ef12 100755
--- a/gfx/duel/23.png
+++ b/src/gfx/duel/23.png
diff --git a/gfx/duel/24.png b/src/gfx/duel/24.png
index bfc7f47..bfc7f47 100755
--- a/gfx/duel/24.png
+++ b/src/gfx/duel/24.png
diff --git a/gfx/duel/25.png b/src/gfx/duel/25.png
index e71cec1..e71cec1 100755
--- a/gfx/duel/25.png
+++ b/src/gfx/duel/25.png
diff --git a/gfx/duel/26.png b/src/gfx/duel/26.png
index f8ed483..f8ed483 100755
--- a/gfx/duel/26.png
+++ b/src/gfx/duel/26.png
diff --git a/gfx/duel/27.png b/src/gfx/duel/27.png
index 4efe481..4efe481 100755
--- a/gfx/duel/27.png
+++ b/src/gfx/duel/27.png
diff --git a/gfx/duel/28.png b/src/gfx/duel/28.png
index 5962e5b..5962e5b 100755
--- a/gfx/duel/28.png
+++ b/src/gfx/duel/28.png
diff --git a/gfx/duel/29.png b/src/gfx/duel/29.png
index d73be15..d73be15 100755
--- a/gfx/duel/29.png
+++ b/src/gfx/duel/29.png
diff --git a/gfx/duel/3.png b/src/gfx/duel/3.png
index a4cd613..a4cd613 100755
--- a/gfx/duel/3.png
+++ b/src/gfx/duel/3.png
diff --git a/gfx/duel/30.png b/src/gfx/duel/30.png
index eb4f993..eb4f993 100755
--- a/gfx/duel/30.png
+++ b/src/gfx/duel/30.png
diff --git a/gfx/duel/31.png b/src/gfx/duel/31.png
index 726a9de..726a9de 100755
--- a/gfx/duel/31.png
+++ b/src/gfx/duel/31.png
diff --git a/gfx/duel/32.png b/src/gfx/duel/32.png
index 5696434..5696434 100755
--- a/gfx/duel/32.png
+++ b/src/gfx/duel/32.png
diff --git a/gfx/duel/33.png b/src/gfx/duel/33.png
index cec3c5c..cec3c5c 100755
--- a/gfx/duel/33.png
+++ b/src/gfx/duel/33.png
diff --git a/gfx/duel/34.png b/src/gfx/duel/34.png
index 3a23454..3a23454 100755
--- a/gfx/duel/34.png
+++ b/src/gfx/duel/34.png
diff --git a/gfx/duel/35.png b/src/gfx/duel/35.png
index 88b9a8a..88b9a8a 100755
--- a/gfx/duel/35.png
+++ b/src/gfx/duel/35.png
diff --git a/gfx/duel/36.png b/src/gfx/duel/36.png
index 75c6606..75c6606 100755
--- a/gfx/duel/36.png
+++ b/src/gfx/duel/36.png
diff --git a/gfx/duel/37.png b/src/gfx/duel/37.png
index 124a4aa..124a4aa 100755
--- a/gfx/duel/37.png
+++ b/src/gfx/duel/37.png
diff --git a/gfx/duel/38.png b/src/gfx/duel/38.png
index d13659f..d13659f 100755
--- a/gfx/duel/38.png
+++ b/src/gfx/duel/38.png
diff --git a/gfx/duel/39.png b/src/gfx/duel/39.png
index 72a5047..72a5047 100755
--- a/gfx/duel/39.png
+++ b/src/gfx/duel/39.png
diff --git a/gfx/duel/4.png b/src/gfx/duel/4.png
index bb53fa0..bb53fa0 100755
--- a/gfx/duel/4.png
+++ b/src/gfx/duel/4.png
diff --git a/gfx/duel/40.png b/src/gfx/duel/40.png
index f5c374a..f5c374a 100755
--- a/gfx/duel/40.png
+++ b/src/gfx/duel/40.png
diff --git a/gfx/duel/41.png b/src/gfx/duel/41.png
index fdd1218..fdd1218 100755
--- a/gfx/duel/41.png
+++ b/src/gfx/duel/41.png
diff --git a/gfx/duel/42.png b/src/gfx/duel/42.png
index 099ca70..099ca70 100755
--- a/gfx/duel/42.png
+++ b/src/gfx/duel/42.png
diff --git a/gfx/duel/43.png b/src/gfx/duel/43.png
index 216de05..216de05 100755
--- a/gfx/duel/43.png
+++ b/src/gfx/duel/43.png
diff --git a/gfx/duel/44.png b/src/gfx/duel/44.png
index b3a043e..b3a043e 100755
--- a/gfx/duel/44.png
+++ b/src/gfx/duel/44.png
diff --git a/gfx/duel/45.png b/src/gfx/duel/45.png
index b466614..b466614 100755
--- a/gfx/duel/45.png
+++ b/src/gfx/duel/45.png
diff --git a/gfx/duel/46.png b/src/gfx/duel/46.png
index 9a01563..9a01563 100755
--- a/gfx/duel/46.png
+++ b/src/gfx/duel/46.png
diff --git a/gfx/duel/47.png b/src/gfx/duel/47.png
index 9bf5047..9bf5047 100755
--- a/gfx/duel/47.png
+++ b/src/gfx/duel/47.png
diff --git a/gfx/duel/48.png b/src/gfx/duel/48.png
index 100bb49..100bb49 100755
--- a/gfx/duel/48.png
+++ b/src/gfx/duel/48.png
diff --git a/gfx/duel/49.png b/src/gfx/duel/49.png
index 07ba688..07ba688 100755
--- a/gfx/duel/49.png
+++ b/src/gfx/duel/49.png
diff --git a/gfx/duel/5.png b/src/gfx/duel/5.png
index baf7475..baf7475 100755
--- a/gfx/duel/5.png
+++ b/src/gfx/duel/5.png
diff --git a/gfx/duel/50.png b/src/gfx/duel/50.png
index b82049f..b82049f 100755
--- a/gfx/duel/50.png
+++ b/src/gfx/duel/50.png
diff --git a/gfx/duel/51.png b/src/gfx/duel/51.png
index 98eb770..98eb770 100644
--- a/gfx/duel/51.png
+++ b/src/gfx/duel/51.png
diff --git a/gfx/duel/52.png b/src/gfx/duel/52.png
index 420136f..420136f 100755
--- a/gfx/duel/52.png
+++ b/src/gfx/duel/52.png
diff --git a/gfx/duel/53.png b/src/gfx/duel/53.png
index 10a21f5..10a21f5 100755
--- a/gfx/duel/53.png
+++ b/src/gfx/duel/53.png
diff --git a/gfx/duel/54.png b/src/gfx/duel/54.png
index 7dbb527..7dbb527 100755
--- a/gfx/duel/54.png
+++ b/src/gfx/duel/54.png
diff --git a/gfx/duel/6.png b/src/gfx/duel/6.png
index 80cc739..80cc739 100755
--- a/gfx/duel/6.png
+++ b/src/gfx/duel/6.png
diff --git a/gfx/duel/7.png b/src/gfx/duel/7.png
index c309ce9..c309ce9 100755
--- a/gfx/duel/7.png
+++ b/src/gfx/duel/7.png
diff --git a/gfx/duel/8.png b/src/gfx/duel/8.png
index 479b251..479b251 100755
--- a/gfx/duel/8.png
+++ b/src/gfx/duel/8.png
diff --git a/gfx/duel/9.png b/src/gfx/duel/9.png
index 3667ca8..3667ca8 100755
--- a/gfx/duel/9.png
+++ b/src/gfx/duel/9.png
diff --git a/gfx/duel/duel1.png b/src/gfx/duel/duel1.png
index e36c5fb..e36c5fb 100644
--- a/gfx/duel/duel1.png
+++ b/src/gfx/duel/duel1.png
diff --git a/gfx/duel/duel2.png b/src/gfx/duel/duel2.png
index c8ce50f..c8ce50f 100755
--- a/gfx/duel/duel2.png
+++ b/src/gfx/duel/duel2.png
diff --git a/gfx/duel/poison.png b/src/gfx/duel/poison.png
index 8f8b22c..8f8b22c 100755
--- a/gfx/duel/poison.png
+++ b/src/gfx/duel/poison.png
diff --git a/gfx/duelists/aaron.png b/src/gfx/duelists/aaron.png
index bbd8bbc..bbd8bbc 100755
--- a/gfx/duelists/aaron.png
+++ b/src/gfx/duelists/aaron.png
diff --git a/gfx/duelists/adam.png b/src/gfx/duelists/adam.png
index 859bc86..859bc86 100755
--- a/gfx/duelists/adam.png
+++ b/src/gfx/duelists/adam.png
diff --git a/gfx/duelists/amanda.png b/src/gfx/duelists/amanda.png
index be16167..be16167 100755
--- a/gfx/duelists/amanda.png
+++ b/src/gfx/duelists/amanda.png
diff --git a/gfx/duelists/amy.png b/src/gfx/duelists/amy.png
index 0ca501d..0ca501d 100755
--- a/gfx/duelists/amy.png
+++ b/src/gfx/duelists/amy.png
diff --git a/gfx/duelists/andrew.png b/src/gfx/duelists/andrew.png
index 45508af..45508af 100755
--- a/gfx/duelists/andrew.png
+++ b/src/gfx/duelists/andrew.png
diff --git a/gfx/duelists/brandon.png b/src/gfx/duelists/brandon.png
index 32b1934..32b1934 100755
--- a/gfx/duelists/brandon.png
+++ b/src/gfx/duelists/brandon.png
diff --git a/gfx/duelists/brittany.png b/src/gfx/duelists/brittany.png
index 4e5e2a0..4e5e2a0 100755
--- a/gfx/duelists/brittany.png
+++ b/src/gfx/duelists/brittany.png
diff --git a/gfx/duelists/chris.png b/src/gfx/duelists/chris.png
index c645e12..c645e12 100755
--- a/gfx/duelists/chris.png
+++ b/src/gfx/duelists/chris.png
diff --git a/gfx/duelists/courtney.png b/src/gfx/duelists/courtney.png
index fff4a8a..fff4a8a 100755
--- a/gfx/duelists/courtney.png
+++ b/src/gfx/duelists/courtney.png
diff --git a/gfx/duelists/daniel.png b/src/gfx/duelists/daniel.png
index f3a36ac..f3a36ac 100755
--- a/gfx/duelists/daniel.png
+++ b/src/gfx/duelists/daniel.png
diff --git a/gfx/duelists/david.png b/src/gfx/duelists/david.png
index f1de43e..f1de43e 100755
--- a/gfx/duelists/david.png
+++ b/src/gfx/duelists/david.png
diff --git a/gfx/duelists/erik.png b/src/gfx/duelists/erik.png
index 287b615..287b615 100755
--- a/gfx/duelists/erik.png
+++ b/src/gfx/duelists/erik.png
diff --git a/gfx/duelists/gene.png b/src/gfx/duelists/gene.png
index ee368c1..ee368c1 100755
--- a/gfx/duelists/gene.png
+++ b/src/gfx/duelists/gene.png
diff --git a/gfx/duelists/heather.png b/src/gfx/duelists/heather.png
index 69baa70..69baa70 100755
--- a/gfx/duelists/heather.png
+++ b/src/gfx/duelists/heather.png
diff --git a/gfx/duelists/imakuni.png b/src/gfx/duelists/imakuni.png
index 1c6e8a7..1c6e8a7 100755
--- a/gfx/duelists/imakuni.png
+++ b/src/gfx/duelists/imakuni.png
diff --git a/gfx/duelists/isaac.png b/src/gfx/duelists/isaac.png
index 2aab212..2aab212 100755
--- a/gfx/duelists/isaac.png
+++ b/src/gfx/duelists/isaac.png
diff --git a/gfx/duelists/jack.png b/src/gfx/duelists/jack.png
index e8c3799..e8c3799 100755
--- a/gfx/duelists/jack.png
+++ b/src/gfx/duelists/jack.png
diff --git a/gfx/duelists/jennifer.png b/src/gfx/duelists/jennifer.png
index c218186..c218186 100755
--- a/gfx/duelists/jennifer.png
+++ b/src/gfx/duelists/jennifer.png
diff --git a/gfx/duelists/jessica.png b/src/gfx/duelists/jessica.png
index 0460d52..0460d52 100755
--- a/gfx/duelists/jessica.png
+++ b/src/gfx/duelists/jessica.png
diff --git a/gfx/duelists/john.png b/src/gfx/duelists/john.png
index 51ea430..51ea430 100755
--- a/gfx/duelists/john.png
+++ b/src/gfx/duelists/john.png
diff --git a/gfx/duelists/jonathan.png b/src/gfx/duelists/jonathan.png
index 40d6593..40d6593 100755
--- a/gfx/duelists/jonathan.png
+++ b/src/gfx/duelists/jonathan.png
diff --git a/gfx/duelists/joseph.png b/src/gfx/duelists/joseph.png
index 6ca588f..6ca588f 100755
--- a/gfx/duelists/joseph.png
+++ b/src/gfx/duelists/joseph.png
diff --git a/gfx/duelists/joshua.png b/src/gfx/duelists/joshua.png
index 5dd8b7f..5dd8b7f 100755
--- a/gfx/duelists/joshua.png
+++ b/src/gfx/duelists/joshua.png
diff --git a/gfx/duelists/ken.png b/src/gfx/duelists/ken.png
index 4da8ca2..4da8ca2 100755
--- a/gfx/duelists/ken.png
+++ b/src/gfx/duelists/ken.png
diff --git a/gfx/duelists/kristin.png b/src/gfx/duelists/kristin.png
index d265ae3..d265ae3 100755
--- a/gfx/duelists/kristin.png
+++ b/src/gfx/duelists/kristin.png
diff --git a/gfx/duelists/matthew.png b/src/gfx/duelists/matthew.png
index bd828e6..bd828e6 100755
--- a/gfx/duelists/matthew.png
+++ b/src/gfx/duelists/matthew.png
diff --git a/gfx/duelists/michael.png b/src/gfx/duelists/michael.png
index 454cdc3..454cdc3 100755
--- a/gfx/duelists/michael.png
+++ b/src/gfx/duelists/michael.png
diff --git a/gfx/duelists/mitch.png b/src/gfx/duelists/mitch.png
index 38c58fe..38c58fe 100755
--- a/gfx/duelists/mitch.png
+++ b/src/gfx/duelists/mitch.png
diff --git a/gfx/duelists/murray.png b/src/gfx/duelists/murray.png
index 32bd818..32bd818 100755
--- a/gfx/duelists/murray.png
+++ b/src/gfx/duelists/murray.png
diff --git a/gfx/duelists/nicholas.png b/src/gfx/duelists/nicholas.png
index 81f5b53..81f5b53 100755
--- a/gfx/duelists/nicholas.png
+++ b/src/gfx/duelists/nicholas.png
diff --git a/gfx/duelists/nikki.png b/src/gfx/duelists/nikki.png
index 2c4e205..2c4e205 100755
--- a/gfx/duelists/nikki.png
+++ b/src/gfx/duelists/nikki.png
diff --git a/gfx/duelists/player.png b/src/gfx/duelists/player.png
index 8b81fbe..8b81fbe 100755
--- a/gfx/duelists/player.png
+++ b/src/gfx/duelists/player.png
diff --git a/gfx/duelists/rick.png b/src/gfx/duelists/rick.png
index 7dcbdc0..7dcbdc0 100755
--- a/gfx/duelists/rick.png
+++ b/src/gfx/duelists/rick.png
diff --git a/gfx/duelists/robert.png b/src/gfx/duelists/robert.png
index 2172ae6..2172ae6 100755
--- a/gfx/duelists/robert.png
+++ b/src/gfx/duelists/robert.png
diff --git a/gfx/duelists/rod.png b/src/gfx/duelists/rod.png
index 4c57dd7..4c57dd7 100755
--- a/gfx/duelists/rod.png
+++ b/src/gfx/duelists/rod.png
diff --git a/gfx/duelists/ronald.png b/src/gfx/duelists/ronald.png
index 26a1245..26a1245 100755
--- a/gfx/duelists/ronald.png
+++ b/src/gfx/duelists/ronald.png
diff --git a/gfx/duelists/ryan.png b/src/gfx/duelists/ryan.png
index ab0f84c..ab0f84c 100755
--- a/gfx/duelists/ryan.png
+++ b/src/gfx/duelists/ryan.png
diff --git a/gfx/duelists/sam.png b/src/gfx/duelists/sam.png
index 7a52ac3..7a52ac3 100755
--- a/gfx/duelists/sam.png
+++ b/src/gfx/duelists/sam.png
diff --git a/gfx/duelists/sara.png b/src/gfx/duelists/sara.png
index f6319bb..f6319bb 100755
--- a/gfx/duelists/sara.png
+++ b/src/gfx/duelists/sara.png
diff --git a/gfx/duelists/stephanie.png b/src/gfx/duelists/stephanie.png
index a0a3ff8..a0a3ff8 100755
--- a/gfx/duelists/stephanie.png
+++ b/src/gfx/duelists/stephanie.png
diff --git a/gfx/duelists/steve.png b/src/gfx/duelists/steve.png
index 216cee0..216cee0 100755
--- a/gfx/duelists/steve.png
+++ b/src/gfx/duelists/steve.png
diff --git a/gfx/fonts.png b/src/gfx/fonts.png
index 5dc1fe8..5dc1fe8 100644
--- a/gfx/fonts.png
+++ b/src/gfx/fonts.png
diff --git a/gfx/medals.png b/src/gfx/medals.png
index 024bd9a..024bd9a 100755
--- a/gfx/medals.png
+++ b/src/gfx/medals.png
diff --git a/gfx/nintendo.png b/src/gfx/nintendo.png
index c687908..c687908 100644
--- a/gfx/nintendo.png
+++ b/src/gfx/nintendo.png
diff --git a/gfx/overworld_map.png b/src/gfx/overworld_map.png
index 5d8e819..5d8e819 100644
--- a/gfx/overworld_map.png
+++ b/src/gfx/overworld_map.png
diff --git a/gfx/ow/doctormason.png b/src/gfx/ow/doctormason.png
index 8b0f384..8b0f384 100755
--- a/gfx/ow/doctormason.png
+++ b/src/gfx/ow/doctormason.png
diff --git a/gfx/ow/help_desk_lady.png b/src/gfx/ow/help_desk_lady.png
index 92bb5ef..92bb5ef 100755
--- a/gfx/ow/help_desk_lady.png
+++ b/src/gfx/ow/help_desk_lady.png
diff --git a/gfx/ow/player.png b/src/gfx/ow/player.png
index 2f891ef..2f891ef 100755
--- a/gfx/ow/player.png
+++ b/src/gfx/ow/player.png
diff --git a/gfx/ow/ronald.png b/src/gfx/ow/ronald.png
index 4cd2be0..4cd2be0 100755
--- a/gfx/ow/ronald.png
+++ b/src/gfx/ow/ronald.png
diff --git a/gfx/ow/sprite0.png b/src/gfx/ow/sprite0.png
index 0eceeb6..0eceeb6 100755
--- a/gfx/ow/sprite0.png
+++ b/src/gfx/ow/sprite0.png
diff --git a/gfx/ow/sprite1.png b/src/gfx/ow/sprite1.png
index b3fa35f..b3fa35f 100755
--- a/gfx/ow/sprite1.png
+++ b/src/gfx/ow/sprite1.png
diff --git a/gfx/ow/sprite10.png b/src/gfx/ow/sprite10.png
index e63ba2b..e63ba2b 100755
--- a/gfx/ow/sprite10.png
+++ b/src/gfx/ow/sprite10.png
diff --git a/gfx/ow/sprite11.png b/src/gfx/ow/sprite11.png
index 4a231fe..4a231fe 100755
--- a/gfx/ow/sprite11.png
+++ b/src/gfx/ow/sprite11.png
diff --git a/gfx/ow/sprite12.png b/src/gfx/ow/sprite12.png
index b24cd69..b24cd69 100755
--- a/gfx/ow/sprite12.png
+++ b/src/gfx/ow/sprite12.png
diff --git a/gfx/ow/sprite13.png b/src/gfx/ow/sprite13.png
index d55c62c..d55c62c 100755
--- a/gfx/ow/sprite13.png
+++ b/src/gfx/ow/sprite13.png
diff --git a/gfx/ow/sprite14.png b/src/gfx/ow/sprite14.png
index 0026093..0026093 100755
--- a/gfx/ow/sprite14.png
+++ b/src/gfx/ow/sprite14.png
diff --git a/gfx/ow/sprite15.png b/src/gfx/ow/sprite15.png
index 67a227d..67a227d 100755
--- a/gfx/ow/sprite15.png
+++ b/src/gfx/ow/sprite15.png
diff --git a/gfx/ow/sprite16.png b/src/gfx/ow/sprite16.png
index 0baa4eb..0baa4eb 100755
--- a/gfx/ow/sprite16.png
+++ b/src/gfx/ow/sprite16.png
diff --git a/gfx/ow/sprite17.png b/src/gfx/ow/sprite17.png
index 2f696e6..2f696e6 100755
--- a/gfx/ow/sprite17.png
+++ b/src/gfx/ow/sprite17.png
diff --git a/gfx/ow/sprite18.png b/src/gfx/ow/sprite18.png
index 97281b6..97281b6 100755
--- a/gfx/ow/sprite18.png
+++ b/src/gfx/ow/sprite18.png
diff --git a/gfx/ow/sprite19.png b/src/gfx/ow/sprite19.png
index 437a376..437a376 100755
--- a/gfx/ow/sprite19.png
+++ b/src/gfx/ow/sprite19.png
diff --git a/gfx/ow/sprite2.png b/src/gfx/ow/sprite2.png
index 0bda3be..0bda3be 100755
--- a/gfx/ow/sprite2.png
+++ b/src/gfx/ow/sprite2.png
diff --git a/gfx/ow/sprite20.png b/src/gfx/ow/sprite20.png
index 3da8ad9..3da8ad9 100755
--- a/gfx/ow/sprite20.png
+++ b/src/gfx/ow/sprite20.png
diff --git a/gfx/ow/sprite21.png b/src/gfx/ow/sprite21.png
index 7d07d78..7d07d78 100755
--- a/gfx/ow/sprite21.png
+++ b/src/gfx/ow/sprite21.png
diff --git a/gfx/ow/sprite22.png b/src/gfx/ow/sprite22.png
index 2d47555..2d47555 100755
--- a/gfx/ow/sprite22.png
+++ b/src/gfx/ow/sprite22.png
diff --git a/gfx/ow/sprite23.png b/src/gfx/ow/sprite23.png
index 8432c39..8432c39 100755
--- a/gfx/ow/sprite23.png
+++ b/src/gfx/ow/sprite23.png
diff --git a/gfx/ow/sprite24.png b/src/gfx/ow/sprite24.png
index 0d7b908..0d7b908 100755
--- a/gfx/ow/sprite24.png
+++ b/src/gfx/ow/sprite24.png
diff --git a/gfx/ow/sprite25.png b/src/gfx/ow/sprite25.png
index 1e161da..1e161da 100755
--- a/gfx/ow/sprite25.png
+++ b/src/gfx/ow/sprite25.png
diff --git a/gfx/ow/sprite26.png b/src/gfx/ow/sprite26.png
index 6a5f4cd..6a5f4cd 100755
--- a/gfx/ow/sprite26.png
+++ b/src/gfx/ow/sprite26.png
diff --git a/gfx/ow/sprite27.png b/src/gfx/ow/sprite27.png
index 7b738e4..7b738e4 100755
--- a/gfx/ow/sprite27.png
+++ b/src/gfx/ow/sprite27.png
diff --git a/gfx/ow/sprite28.png b/src/gfx/ow/sprite28.png
index 0ba9e64..0ba9e64 100755
--- a/gfx/ow/sprite28.png
+++ b/src/gfx/ow/sprite28.png
diff --git a/gfx/ow/sprite29.png b/src/gfx/ow/sprite29.png
index 5926395..5926395 100755
--- a/gfx/ow/sprite29.png
+++ b/src/gfx/ow/sprite29.png
diff --git a/gfx/ow/sprite3.png b/src/gfx/ow/sprite3.png
index 2fac558..2fac558 100755
--- a/gfx/ow/sprite3.png
+++ b/src/gfx/ow/sprite3.png
diff --git a/gfx/ow/sprite30.png b/src/gfx/ow/sprite30.png
index ef25140..ef25140 100755
--- a/gfx/ow/sprite30.png
+++ b/src/gfx/ow/sprite30.png
diff --git a/gfx/ow/sprite31.png b/src/gfx/ow/sprite31.png
index 1494e05..1494e05 100755
--- a/gfx/ow/sprite31.png
+++ b/src/gfx/ow/sprite31.png
diff --git a/gfx/ow/sprite32.png b/src/gfx/ow/sprite32.png
index 7d3fac1..7d3fac1 100755
--- a/gfx/ow/sprite32.png
+++ b/src/gfx/ow/sprite32.png
diff --git a/gfx/ow/sprite4.png b/src/gfx/ow/sprite4.png
index a12569b..a12569b 100755
--- a/gfx/ow/sprite4.png
+++ b/src/gfx/ow/sprite4.png
diff --git a/gfx/ow/sprite5.png b/src/gfx/ow/sprite5.png
index d46c9bb..d46c9bb 100755
--- a/gfx/ow/sprite5.png
+++ b/src/gfx/ow/sprite5.png
diff --git a/gfx/ow/sprite6.png b/src/gfx/ow/sprite6.png
index 2423fd1..2423fd1 100755
--- a/gfx/ow/sprite6.png
+++ b/src/gfx/ow/sprite6.png
diff --git a/gfx/ow/sprite7.png b/src/gfx/ow/sprite7.png
index c7f1d29..c7f1d29 100755
--- a/gfx/ow/sprite7.png
+++ b/src/gfx/ow/sprite7.png
diff --git a/gfx/ow/sprite8.png b/src/gfx/ow/sprite8.png
index 2527ae9..2527ae9 100755
--- a/gfx/ow/sprite8.png
+++ b/src/gfx/ow/sprite8.png
diff --git a/gfx/ow/sprite9.png b/src/gfx/ow/sprite9.png
index 69c5451..69c5451 100755
--- a/gfx/ow/sprite9.png
+++ b/src/gfx/ow/sprite9.png
diff --git a/gfx/ow_map_oam.png b/src/gfx/ow_map_oam.png
index 323fc59..323fc59 100755
--- a/gfx/ow_map_oam.png
+++ b/src/gfx/ow_map_oam.png
diff --git a/gfx/solid_tiles.png b/src/gfx/solid_tiles.png
index 3657e48..3657e48 100644
--- a/gfx/solid_tiles.png
+++ b/src/gfx/solid_tiles.png
diff --git a/gfx/tilesets/challengehall.png b/src/gfx/tilesets/challengehall.png
index 9783378..9783378 100644
--- a/gfx/tilesets/challengehall.png
+++ b/src/gfx/tilesets/challengehall.png
diff --git a/gfx/tilesets/clubentrance.png b/src/gfx/tilesets/clubentrance.png
index e641020..e641020 100644
--- a/gfx/tilesets/clubentrance.png
+++ b/src/gfx/tilesets/clubentrance.png
diff --git a/gfx/tilesets/clublobby.png b/src/gfx/tilesets/clublobby.png
index 7a5a7be..7a5a7be 100644
--- a/gfx/tilesets/clublobby.png
+++ b/src/gfx/tilesets/clublobby.png
diff --git a/gfx/tilesets/fightingclub.png b/src/gfx/tilesets/fightingclub.png
index 6747644..6747644 100644
--- a/gfx/tilesets/fightingclub.png
+++ b/src/gfx/tilesets/fightingclub.png
diff --git a/gfx/tilesets/fireclub.png b/src/gfx/tilesets/fireclub.png
index 28638bd..28638bd 100644
--- a/gfx/tilesets/fireclub.png
+++ b/src/gfx/tilesets/fireclub.png
diff --git a/gfx/tilesets/grassclub.png b/src/gfx/tilesets/grassclub.png
index 69496ad..69496ad 100644
--- a/gfx/tilesets/grassclub.png
+++ b/src/gfx/tilesets/grassclub.png
diff --git a/gfx/tilesets/hallofhonor.png b/src/gfx/tilesets/hallofhonor.png
index 358630d..358630d 100644
--- a/gfx/tilesets/hallofhonor.png
+++ b/src/gfx/tilesets/hallofhonor.png
diff --git a/gfx/tilesets/ishihara.png b/src/gfx/tilesets/ishihara.png
index 4761a69..4761a69 100644
--- a/gfx/tilesets/ishihara.png
+++ b/src/gfx/tilesets/ishihara.png
diff --git a/gfx/tilesets/lightningclub.png b/src/gfx/tilesets/lightningclub.png
index bbe0572..bbe0572 100644
--- a/gfx/tilesets/lightningclub.png
+++ b/src/gfx/tilesets/lightningclub.png
diff --git a/gfx/tilesets/masonlaboratory.png b/src/gfx/tilesets/masonlaboratory.png
index 4c5d90b..4c5d90b 100644
--- a/gfx/tilesets/masonlaboratory.png
+++ b/src/gfx/tilesets/masonlaboratory.png
diff --git a/gfx/tilesets/pokemondome.png b/src/gfx/tilesets/pokemondome.png
index b4abf6c..b4abf6c 100644
--- a/gfx/tilesets/pokemondome.png
+++ b/src/gfx/tilesets/pokemondome.png
diff --git a/gfx/tilesets/pokemondomeentrance.png b/src/gfx/tilesets/pokemondomeentrance.png
index c80ef7f..c80ef7f 100644
--- a/gfx/tilesets/pokemondomeentrance.png
+++ b/src/gfx/tilesets/pokemondomeentrance.png
diff --git a/gfx/tilesets/psychicclub.png b/src/gfx/tilesets/psychicclub.png
index 6a3a00f..6a3a00f 100644
--- a/gfx/tilesets/psychicclub.png
+++ b/src/gfx/tilesets/psychicclub.png
diff --git a/gfx/tilesets/rockclub.png b/src/gfx/tilesets/rockclub.png
index 59bf1bb..59bf1bb 100644
--- a/gfx/tilesets/rockclub.png
+++ b/src/gfx/tilesets/rockclub.png
diff --git a/gfx/tilesets/scienceclub.png b/src/gfx/tilesets/scienceclub.png
index a736fe1..a736fe1 100644
--- a/gfx/tilesets/scienceclub.png
+++ b/src/gfx/tilesets/scienceclub.png
diff --git a/gfx/tilesets/waterclub.png b/src/gfx/tilesets/waterclub.png
index 815e5ae..815e5ae 100644
--- a/gfx/tilesets/waterclub.png
+++ b/src/gfx/tilesets/waterclub.png
diff --git a/gfx/titlescreen/colorless.png b/src/gfx/titlescreen/colorless.png
index fe55d79..fe55d79 100755
--- a/gfx/titlescreen/colorless.png
+++ b/src/gfx/titlescreen/colorless.png
diff --git a/gfx/titlescreen/fighting.png b/src/gfx/titlescreen/fighting.png
index 849d5d6..849d5d6 100755
--- a/gfx/titlescreen/fighting.png
+++ b/src/gfx/titlescreen/fighting.png
diff --git a/gfx/titlescreen/fire.png b/src/gfx/titlescreen/fire.png
index 518fcfc..518fcfc 100755
--- a/gfx/titlescreen/fire.png
+++ b/src/gfx/titlescreen/fire.png
diff --git a/gfx/titlescreen/grass.png b/src/gfx/titlescreen/grass.png
index b864fc4..b864fc4 100755
--- a/gfx/titlescreen/grass.png
+++ b/src/gfx/titlescreen/grass.png
diff --git a/gfx/titlescreen/lightning.png b/src/gfx/titlescreen/lightning.png
index 9dcddef..9dcddef 100755
--- a/gfx/titlescreen/lightning.png
+++ b/src/gfx/titlescreen/lightning.png
diff --git a/gfx/titlescreen/press_start.png b/src/gfx/titlescreen/press_start.png
index de9dc9f..de9dc9f 100755
--- a/gfx/titlescreen/press_start.png
+++ b/src/gfx/titlescreen/press_start.png
diff --git a/gfx/titlescreen/psychic.png b/src/gfx/titlescreen/psychic.png
index 60bbe0b..60bbe0b 100755
--- a/gfx/titlescreen/psychic.png
+++ b/src/gfx/titlescreen/psychic.png
diff --git a/gfx/titlescreen/titlescreen1.png b/src/gfx/titlescreen/titlescreen1.png
index 82b39e5..82b39e5 100644
--- a/gfx/titlescreen/titlescreen1.png
+++ b/src/gfx/titlescreen/titlescreen1.png
diff --git a/gfx/titlescreen/titlescreen2.png b/src/gfx/titlescreen/titlescreen2.png
index f54b7c3..f54b7c3 100644
--- a/gfx/titlescreen/titlescreen2.png
+++ b/src/gfx/titlescreen/titlescreen2.png
diff --git a/gfx/titlescreen/titlescreen3.png b/src/gfx/titlescreen/titlescreen3.png
index adddee4..adddee4 100644
--- a/gfx/titlescreen/titlescreen3.png
+++ b/src/gfx/titlescreen/titlescreen3.png
diff --git a/gfx/titlescreen/titlescreen4.png b/src/gfx/titlescreen/titlescreen4.png
index 1d3cb92..1d3cb92 100644
--- a/gfx/titlescreen/titlescreen4.png
+++ b/src/gfx/titlescreen/titlescreen4.png
diff --git a/gfx/titlescreen/titlescreen5.png b/src/gfx/titlescreen/titlescreen5.png
index 3cb6ab3..3cb6ab3 100644
--- a/gfx/titlescreen/titlescreen5.png
+++ b/src/gfx/titlescreen/titlescreen5.png
diff --git a/gfx/titlescreen/titlescreen6.png b/src/gfx/titlescreen/titlescreen6.png
index 4f0dbe8..4f0dbe8 100644
--- a/gfx/titlescreen/titlescreen6.png
+++ b/src/gfx/titlescreen/titlescreen6.png
diff --git a/gfx/titlescreen/water.png b/src/gfx/titlescreen/water.png
index 124f54c..124f54c 100755
--- a/gfx/titlescreen/water.png
+++ b/src/gfx/titlescreen/water.png
diff --git a/gfx/unnamed/1.png b/src/gfx/unnamed/1.png
index ebab414..ebab414 100755
--- a/gfx/unnamed/1.png
+++ b/src/gfx/unnamed/1.png
diff --git a/gfx/unnamed/10.png b/src/gfx/unnamed/10.png
index 212a40d..212a40d 100755
--- a/gfx/unnamed/10.png
+++ b/src/gfx/unnamed/10.png
diff --git a/gfx/unnamed/11.png b/src/gfx/unnamed/11.png
index 65bebfb..65bebfb 100755
--- a/gfx/unnamed/11.png
+++ b/src/gfx/unnamed/11.png
diff --git a/gfx/unnamed/2.png b/src/gfx/unnamed/2.png
index dd82623..dd82623 100755
--- a/gfx/unnamed/2.png
+++ b/src/gfx/unnamed/2.png
diff --git a/gfx/unnamed/3.png b/src/gfx/unnamed/3.png
index 7b97f92..7b97f92 100755
--- a/gfx/unnamed/3.png
+++ b/src/gfx/unnamed/3.png
diff --git a/gfx/unnamed/4.png b/src/gfx/unnamed/4.png
index 16b7344..16b7344 100755
--- a/gfx/unnamed/4.png
+++ b/src/gfx/unnamed/4.png
diff --git a/gfx/unnamed/5.png b/src/gfx/unnamed/5.png
index dc60679..dc60679 100755
--- a/gfx/unnamed/5.png
+++ b/src/gfx/unnamed/5.png
diff --git a/gfx/unnamed/6.png b/src/gfx/unnamed/6.png
index de82420..de82420 100755
--- a/gfx/unnamed/6.png
+++ b/src/gfx/unnamed/6.png
diff --git a/gfx/unnamed/7.png b/src/gfx/unnamed/7.png
index c40fc22..c40fc22 100755
--- a/gfx/unnamed/7.png
+++ b/src/gfx/unnamed/7.png
diff --git a/gfx/unnamed/8.png b/src/gfx/unnamed/8.png
index 5ea882f..5ea882f 100755
--- a/gfx/unnamed/8.png
+++ b/src/gfx/unnamed/8.png
diff --git a/gfx/unnamed/9.png b/src/gfx/unnamed/9.png
index 36310a4..36310a4 100755
--- a/gfx/unnamed/9.png
+++ b/src/gfx/unnamed/9.png
diff --git a/gfx/vwf.png b/src/gfx/vwf.png
index 39e783e..39e783e 100755
--- a/gfx/vwf.png
+++ b/src/gfx/vwf.png
diff --git a/hram.asm b/src/hram.asm
index ebac5a9..ebac5a9 100644
--- a/hram.asm
+++ b/src/hram.asm
diff --git a/macros.asm b/src/macros.asm
index 8fbf35c..8fbf35c 100755
--- a/macros.asm
+++ b/src/macros.asm
diff --git a/main.asm b/src/main.asm
index 43c9e56..43c9e56 100755
--- a/main.asm
+++ b/src/main.asm
diff --git a/text.asm b/src/text.asm
index 3bb3aee..3bb3aee 100755
--- a/text.asm
+++ b/src/text.asm
diff --git a/text/text1.asm b/src/text/text1.asm
index 3d10001..3d10001 100755
--- a/text/text1.asm
+++ b/src/text/text1.asm
diff --git a/text/text2.asm b/src/text/text2.asm
index 6164638..6164638 100644
--- a/text/text2.asm
+++ b/src/text/text2.asm
diff --git a/text/text3.asm b/src/text/text3.asm
index de8239c..de8239c 100644
--- a/text/text3.asm
+++ b/src/text/text3.asm
diff --git a/text/text4.asm b/src/text/text4.asm
index 5a16284..5a16284 100644
--- a/text/text4.asm
+++ b/src/text/text4.asm
diff --git a/text/text5.asm b/src/text/text5.asm
index 6fbceaa..6fbceaa 100644
--- a/text/text5.asm
+++ b/src/text/text5.asm
diff --git a/text/text6.asm b/src/text/text6.asm
index 553943e..553943e 100644
--- a/text/text6.asm
+++ b/src/text/text6.asm
diff --git a/text/text7.asm b/src/text/text7.asm
index 1f0f3d1..1f0f3d1 100644
--- a/text/text7.asm
+++ b/src/text/text7.asm
diff --git a/text/text8.asm b/src/text/text8.asm
index 46c711d..46c711d 100644
--- a/text/text8.asm
+++ b/src/text/text8.asm
diff --git a/text/text9.asm b/src/text/text9.asm
index ef44df8..ef44df8 100644
--- a/text/text9.asm
+++ b/src/text/text9.asm
diff --git a/text/text_offsets.asm b/src/text/text_offsets.asm
index 9fe8a60..9fe8a60 100755
--- a/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
diff --git a/text/texta.asm b/src/text/texta.asm
index dbe0aed..dbe0aed 100644
--- a/text/texta.asm
+++ b/src/text/texta.asm
diff --git a/text/textb.asm b/src/text/textb.asm
index 108f8ac..108f8ac 100644
--- a/text/textb.asm
+++ b/src/text/textb.asm
diff --git a/text/textc.asm b/src/text/textc.asm
index 5256939..5256939 100644
--- a/text/textc.asm
+++ b/src/text/textc.asm
diff --git a/text/textd.asm b/src/text/textd.asm
index 91593c3..91593c3 100644
--- a/text/textd.asm
+++ b/src/text/textd.asm
diff --git a/wram.asm b/src/wram.asm
index 79db58e..79db58e 100755
--- a/wram.asm
+++ b/src/wram.asm