Merge http://github.com/dannye/tcg

Conflicts:
	wram.asm

41 files changed, 0 insertions, 0 deletions

diff --git a/gfx/trainers/aaron.png b/gfx/duelists/aaron.png
index bbd8bbc..bbd8bbc 100755
--- a/gfx/trainers/aaron.png
+++ b/gfx/duelists/aaron.png
diff --git a/gfx/trainers/adam.png b/gfx/duelists/adam.png
index 859bc86..859bc86 100755
--- a/gfx/trainers/adam.png
+++ b/gfx/duelists/adam.png
diff --git a/gfx/trainers/amanda.png b/gfx/duelists/amanda.png
index be16167..be16167 100755
--- a/gfx/trainers/amanda.png
+++ b/gfx/duelists/amanda.png
diff --git a/gfx/trainers/amy.png b/gfx/duelists/amy.png
index 0ca501d..0ca501d 100755
--- a/gfx/trainers/amy.png
+++ b/gfx/duelists/amy.png
diff --git a/gfx/trainers/andrew.png b/gfx/duelists/andrew.png
index 45508af..45508af 100755
--- a/gfx/trainers/andrew.png
+++ b/gfx/duelists/andrew.png
diff --git a/gfx/trainers/brandon.png b/gfx/duelists/brandon.png
index 32b1934..32b1934 100755
--- a/gfx/trainers/brandon.png
+++ b/gfx/duelists/brandon.png
diff --git a/gfx/trainers/brittany.png b/gfx/duelists/brittany.png
index 4e5e2a0..4e5e2a0 100755
--- a/gfx/trainers/brittany.png
+++ b/gfx/duelists/brittany.png
diff --git a/gfx/trainers/chris.png b/gfx/duelists/chris.png
index c645e12..c645e12 100755
--- a/gfx/trainers/chris.png
+++ b/gfx/duelists/chris.png
diff --git a/gfx/trainers/courtney.png b/gfx/duelists/courtney.png
index fff4a8a..fff4a8a 100755
--- a/gfx/trainers/courtney.png
+++ b/gfx/duelists/courtney.png
diff --git a/gfx/trainers/daniel.png b/gfx/duelists/daniel.png
index f3a36ac..f3a36ac 100755
--- a/gfx/trainers/daniel.png
+++ b/gfx/duelists/daniel.png
diff --git a/gfx/trainers/david.png b/gfx/duelists/david.png
index f1de43e..f1de43e 100755
--- a/gfx/trainers/david.png
+++ b/gfx/duelists/david.png
diff --git a/gfx/trainers/erik.png b/gfx/duelists/erik.png
index 287b615..287b615 100755
--- a/gfx/trainers/erik.png
+++ b/gfx/duelists/erik.png
diff --git a/gfx/trainers/gene.png b/gfx/duelists/gene.png
index ee368c1..ee368c1 100755
--- a/gfx/trainers/gene.png
+++ b/gfx/duelists/gene.png
diff --git a/gfx/trainers/heather.png b/gfx/duelists/heather.png
index 69baa70..69baa70 100755
--- a/gfx/trainers/heather.png
+++ b/gfx/duelists/heather.png
diff --git a/gfx/trainers/imakuni.png b/gfx/duelists/imakuni.png
index 1c6e8a7..1c6e8a7 100755
--- a/gfx/trainers/imakuni.png
+++ b/gfx/duelists/imakuni.png
diff --git a/gfx/trainers/isaac.png b/gfx/duelists/isaac.png
index 2aab212..2aab212 100755
--- a/gfx/trainers/isaac.png
+++ b/gfx/duelists/isaac.png
diff --git a/gfx/trainers/jack.png b/gfx/duelists/jack.png
index e8c3799..e8c3799 100755
--- a/gfx/trainers/jack.png
+++ b/gfx/duelists/jack.png
diff --git a/gfx/trainers/jennifer.png b/gfx/duelists/jennifer.png
index c218186..c218186 100755
--- a/gfx/trainers/jennifer.png
+++ b/gfx/duelists/jennifer.png
diff --git a/gfx/trainers/jessica.png b/gfx/duelists/jessica.png
index 0460d52..0460d52 100755
--- a/gfx/trainers/jessica.png
+++ b/gfx/duelists/jessica.png
diff --git a/gfx/trainers/john.png b/gfx/duelists/john.png
index 51ea430..51ea430 100755
--- a/gfx/trainers/john.png
+++ b/gfx/duelists/john.png
diff --git a/gfx/trainers/jonathan.png b/gfx/duelists/jonathan.png
index 40d6593..40d6593 100755
--- a/gfx/trainers/jonathan.png
+++ b/gfx/duelists/jonathan.png
diff --git a/gfx/trainers/joseph.png b/gfx/duelists/joseph.png
index 6ca588f..6ca588f 100755
--- a/gfx/trainers/joseph.png
+++ b/gfx/duelists/joseph.png
diff --git a/gfx/trainers/joshua.png b/gfx/duelists/joshua.png
index 5dd8b7f..5dd8b7f 100755
--- a/gfx/trainers/joshua.png
+++ b/gfx/duelists/joshua.png
diff --git a/gfx/trainers/ken.png b/gfx/duelists/ken.png
index 4da8ca2..4da8ca2 100755
--- a/gfx/trainers/ken.png
+++ b/gfx/duelists/ken.png
diff --git a/gfx/trainers/kristin.png b/gfx/duelists/kristin.png
index d265ae3..d265ae3 100755
--- a/gfx/trainers/kristin.png
+++ b/gfx/duelists/kristin.png
diff --git a/gfx/trainers/matthew.png b/gfx/duelists/matthew.png
index bd828e6..bd828e6 100755
--- a/gfx/trainers/matthew.png
+++ b/gfx/duelists/matthew.png
diff --git a/gfx/trainers/michael.png b/gfx/duelists/michael.png
index 454cdc3..454cdc3 100755
--- a/gfx/trainers/michael.png
+++ b/gfx/duelists/michael.png
diff --git a/gfx/trainers/mitch.png b/gfx/duelists/mitch.png
index 38c58fe..38c58fe 100755
--- a/gfx/trainers/mitch.png
+++ b/gfx/duelists/mitch.png
diff --git a/gfx/trainers/murray.png b/gfx/duelists/murray.png
index 32bd818..32bd818 100755
--- a/gfx/trainers/murray.png
+++ b/gfx/duelists/murray.png
diff --git a/gfx/trainers/nicholas.png b/gfx/duelists/nicholas.png
index 81f5b53..81f5b53 100755
--- a/gfx/trainers/nicholas.png
+++ b/gfx/duelists/nicholas.png
diff --git a/gfx/trainers/nikki.png b/gfx/duelists/nikki.png
index 2c4e205..2c4e205 100755
--- a/gfx/trainers/nikki.png
+++ b/gfx/duelists/nikki.png
diff --git a/gfx/trainers/player.png b/gfx/duelists/player.png
index 8b81fbe..8b81fbe 100755
--- a/gfx/trainers/player.png
+++ b/gfx/duelists/player.png
diff --git a/gfx/trainers/rick.png b/gfx/duelists/rick.png
index 7dcbdc0..7dcbdc0 100755
--- a/gfx/trainers/rick.png
+++ b/gfx/duelists/rick.png
diff --git a/gfx/trainers/robert.png b/gfx/duelists/robert.png
index 2172ae6..2172ae6 100755
--- a/gfx/trainers/robert.png
+++ b/gfx/duelists/robert.png
diff --git a/gfx/trainers/rod.png b/gfx/duelists/rod.png
index 4c57dd7..4c57dd7 100755
--- a/gfx/trainers/rod.png
+++ b/gfx/duelists/rod.png
diff --git a/gfx/trainers/ronald.png b/gfx/duelists/ronald.png
index 26a1245..26a1245 100755
--- a/gfx/trainers/ronald.png
+++ b/gfx/duelists/ronald.png
diff --git a/gfx/trainers/ryan.png b/gfx/duelists/ryan.png
index ab0f84c..ab0f84c 100755
--- a/gfx/trainers/ryan.png
+++ b/gfx/duelists/ryan.png
diff --git a/gfx/trainers/sam.png b/gfx/duelists/sam.png
index 7a52ac3..7a52ac3 100755
--- a/gfx/trainers/sam.png
+++ b/gfx/duelists/sam.png
diff --git a/gfx/trainers/sara.png b/gfx/duelists/sara.png
index f6319bb..f6319bb 100755
--- a/gfx/trainers/sara.png
+++ b/gfx/duelists/sara.png
diff --git a/gfx/trainers/stephanie.png b/gfx/duelists/stephanie.png
index a0a3ff8..a0a3ff8 100755
--- a/gfx/trainers/stephanie.png
+++ b/gfx/duelists/stephanie.png
diff --git a/gfx/trainers/steve.png b/gfx/duelists/steve.png
index 216cee0..216cee0 100755
--- a/gfx/trainers/steve.png
+++ b/gfx/duelists/steve.png