Merge https://github.com/yenatch/pokered

Conflicts:
	main.asm

62 files changed, 0 insertions, 0 deletions

diff --git a/gfx/tilesets/00.png b/gfx/tilesets/00.png
deleted file mode 100755
index f264d943..00000000
--- a/gfx/tilesets/00.png
+++ /dev/null
diff --git a/gfx/tilesets/01.png b/gfx/tilesets/01.png
deleted file mode 100755
index 0b7c3a21..00000000
--- a/gfx/tilesets/01.png
+++ /dev/null
diff --git a/gfx/tilesets/02.png b/gfx/tilesets/02.png
deleted file mode 100755
index 970e457b..00000000
--- a/gfx/tilesets/02.png
+++ /dev/null
diff --git a/gfx/tilesets/03.png b/gfx/tilesets/03.png
deleted file mode 100755
index 4aeab369..00000000
--- a/gfx/tilesets/03.png
+++ /dev/null
diff --git a/gfx/tilesets/04.png b/gfx/tilesets/04.png
deleted file mode 100755
index 0b7c3a21..00000000
--- a/gfx/tilesets/04.png
+++ /dev/null
diff --git a/gfx/tilesets/05.png b/gfx/tilesets/05.png
deleted file mode 100755
index ca4b0669..00000000
--- a/gfx/tilesets/05.png
+++ /dev/null
diff --git a/gfx/tilesets/06.png b/gfx/tilesets/06.png
deleted file mode 100755
index 970e457b..00000000
--- a/gfx/tilesets/06.png
+++ /dev/null
diff --git a/gfx/tilesets/07.png b/gfx/tilesets/07.png
deleted file mode 100755
index ca4b0669..00000000
--- a/gfx/tilesets/07.png
+++ /dev/null
diff --git a/gfx/tilesets/08.png b/gfx/tilesets/08.png
deleted file mode 100755
index f9bc9020..00000000
--- a/gfx/tilesets/08.png
+++ /dev/null
diff --git a/gfx/tilesets/09.png b/gfx/tilesets/09.png
deleted file mode 100755
index fa3f8c9d..00000000
--- a/gfx/tilesets/09.png
+++ /dev/null
diff --git a/gfx/tilesets/0a.png b/gfx/tilesets/0a.png
deleted file mode 100755
index fa3f8c9d..00000000
--- a/gfx/tilesets/0a.png
+++ /dev/null
diff --git a/gfx/tilesets/0b.png b/gfx/tilesets/0b.png
deleted file mode 100755
index b017ccd7..00000000
--- a/gfx/tilesets/0b.png
+++ /dev/null
diff --git a/gfx/tilesets/0c.png b/gfx/tilesets/0c.png
deleted file mode 100755
index fa3f8c9d..00000000
--- a/gfx/tilesets/0c.png
+++ /dev/null
diff --git a/gfx/tilesets/0d.png b/gfx/tilesets/0d.png
deleted file mode 100755
index e3095f7d..00000000
--- a/gfx/tilesets/0d.png
+++ /dev/null
diff --git a/gfx/tilesets/0e.png b/gfx/tilesets/0e.png
deleted file mode 100755
index b931bc50..00000000
--- a/gfx/tilesets/0e.png
+++ /dev/null
diff --git a/gfx/tilesets/0f.png b/gfx/tilesets/0f.png
deleted file mode 100755
index cd5b3649..00000000
--- a/gfx/tilesets/0f.png
+++ /dev/null
diff --git a/gfx/tilesets/10.png b/gfx/tilesets/10.png
deleted file mode 100755
index a48f1d84..00000000
--- a/gfx/tilesets/10.png
+++ /dev/null
diff --git a/gfx/tilesets/11.png b/gfx/tilesets/11.png
deleted file mode 100755
index 32166273..00000000
--- a/gfx/tilesets/11.png
+++ /dev/null
diff --git a/gfx/tilesets/12.png b/gfx/tilesets/12.png
deleted file mode 100755
index 4b47b393..00000000
--- a/gfx/tilesets/12.png
+++ /dev/null
diff --git a/gfx/tilesets/13.png b/gfx/tilesets/13.png
deleted file mode 100755
index 2ec8f928..00000000
--- a/gfx/tilesets/13.png
+++ /dev/null
diff --git a/gfx/tilesets/14.png b/gfx/tilesets/14.png
deleted file mode 100755
index aac7064f..00000000
--- a/gfx/tilesets/14.png
+++ /dev/null
diff --git a/gfx/tilesets/15.png b/gfx/tilesets/15.png
deleted file mode 100755
index 7d0b5ea9..00000000
--- a/gfx/tilesets/15.png
+++ /dev/null
diff --git a/gfx/tilesets/16.png b/gfx/tilesets/16.png
deleted file mode 100755
index 5d69fec8..00000000
--- a/gfx/tilesets/16.png
+++ /dev/null
diff --git a/gfx/tilesets/17.png b/gfx/tilesets/17.png
deleted file mode 100755
index a4df8b6f..00000000
--- a/gfx/tilesets/17.png
+++ /dev/null
diff --git a/gfx/tilesets/11.2bpp b/gfx/tilesets/cavern.2bpp
index 1f3b5a86..1f3b5a86 100644
--- a/gfx/tilesets/11.2bpp
+++ b/gfx/tilesets/cavern.2bpp
diff --git a/gfx/tilesets/11.tilecoll b/gfx/tilesets/cavern.tilecoll
index dab3e10f..dab3e10f 100644
--- a/gfx/tilesets/11.tilecoll
+++ b/gfx/tilesets/cavern.tilecoll
diff --git a/gfx/tilesets/0f.2bpp b/gfx/tilesets/cemetery.2bpp
index d24c6437..d24c6437 100644
--- a/gfx/tilesets/0f.2bpp
+++ b/gfx/tilesets/cemetery.2bpp
diff --git a/gfx/tilesets/0f.tilecoll b/gfx/tilesets/cemetery.tilecoll
index f4bee2ee..f4bee2ee 100644
--- a/gfx/tilesets/0f.tilecoll
+++ b/gfx/tilesets/cemetery.tilecoll
diff --git a/gfx/tilesets/15.2bpp b/gfx/tilesets/club.2bpp
index da3072dc..da3072dc 100644
--- a/gfx/tilesets/15.2bpp
+++ b/gfx/tilesets/club.2bpp
diff --git a/gfx/tilesets/15.tilecoll b/gfx/tilesets/club.tilecoll
index 9bd5f3ba..9bd5f3ba 100644
--- a/gfx/tilesets/15.tilecoll
+++ b/gfx/tilesets/club.tilecoll
diff --git a/gfx/tilesets/16.2bpp b/gfx/tilesets/facility.2bpp
index a06ce48b..a06ce48b 100644
--- a/gfx/tilesets/16.2bpp
+++ b/gfx/tilesets/facility.2bpp
diff --git a/gfx/tilesets/16.tilecoll b/gfx/tilesets/facility.tilecoll
index d55b119b..d55b119b 100644
--- a/gfx/tilesets/16.tilecoll
+++ b/gfx/tilesets/facility.tilecoll
diff --git a/gfx/tilesets/03.2bpp b/gfx/tilesets/forest.2bpp
index 06cf7a20..06cf7a20 100644
--- a/gfx/tilesets/03.2bpp
+++ b/gfx/tilesets/forest.2bpp
diff --git a/gfx/tilesets/03.tilecoll b/gfx/tilesets/forest.tilecoll
index 45bf737e..45bf737e 100644
--- a/gfx/tilesets/03.tilecoll
+++ b/gfx/tilesets/forest.tilecoll
diff --git a/gfx/tilesets/09.2bpp b/gfx/tilesets/gate.2bpp
index 68f93945..68f93945 100644
--- a/gfx/tilesets/09.2bpp
+++ b/gfx/tilesets/gate.2bpp
diff --git a/gfx/tilesets/09.tilecoll b/gfx/tilesets/gate.tilecoll
index dd06b044..dd06b044 100644
--- a/gfx/tilesets/09.tilecoll
+++ b/gfx/tilesets/gate.tilecoll
diff --git a/gfx/tilesets/05.2bpp b/gfx/tilesets/gym.2bpp
index acca6721..acca6721 100644
--- a/gfx/tilesets/05.2bpp
+++ b/gfx/tilesets/gym.2bpp
diff --git a/gfx/tilesets/05.tilecoll b/gfx/tilesets/gym.tilecoll
index 916e2579..916e2579 100644
--- a/gfx/tilesets/05.tilecoll
+++ b/gfx/tilesets/gym.tilecoll
diff --git a/gfx/tilesets/08.2bpp b/gfx/tilesets/house.2bpp
index 2c15989c..2c15989c 100644
--- a/gfx/tilesets/08.2bpp
+++ b/gfx/tilesets/house.2bpp
diff --git a/gfx/tilesets/08.tilecoll b/gfx/tilesets/house.tilecoll
index 95497e70..95497e70 100644
--- a/gfx/tilesets/08.tilecoll
+++ b/gfx/tilesets/house.tilecoll
diff --git a/gfx/tilesets/10.2bpp b/gfx/tilesets/interior.2bpp
index cef7ede4..cef7ede4 100644
--- a/gfx/tilesets/10.2bpp
+++ b/gfx/tilesets/interior.2bpp
diff --git a/gfx/tilesets/10.tilecoll b/gfx/tilesets/interior.tilecoll
index b5d32687..b5d32687 100644
--- a/gfx/tilesets/10.tilecoll
+++ b/gfx/tilesets/interior.tilecoll
diff --git a/gfx/tilesets/14.2bpp b/gfx/tilesets/lab.2bpp
index 65a56f55..65a56f55 100644
--- a/gfx/tilesets/14.2bpp
+++ b/gfx/tilesets/lab.2bpp
diff --git a/gfx/tilesets/14.tilecoll b/gfx/tilesets/lab.tilecoll
index c171ba99..c171ba99 100644
--- a/gfx/tilesets/14.tilecoll
+++ b/gfx/tilesets/lab.tilecoll
diff --git a/gfx/tilesets/12.2bpp b/gfx/tilesets/lobby.2bpp
index 779ed27f..779ed27f 100644
--- a/gfx/tilesets/12.2bpp
+++ b/gfx/tilesets/lobby.2bpp
diff --git a/gfx/tilesets/12.tilecoll b/gfx/tilesets/lobby.tilecoll
index 6388083c..6388083c 100644
--- a/gfx/tilesets/12.tilecoll
+++ b/gfx/tilesets/lobby.tilecoll
diff --git a/gfx/tilesets/13.2bpp b/gfx/tilesets/mansion.2bpp
index c0063628..c0063628 100644
--- a/gfx/tilesets/13.2bpp
+++ b/gfx/tilesets/mansion.2bpp
diff --git a/gfx/tilesets/13.tilecoll b/gfx/tilesets/mansion.tilecoll
index e07ea10a..e07ea10a 100644
--- a/gfx/tilesets/13.tilecoll
+++ b/gfx/tilesets/mansion.tilecoll
diff --git a/gfx/tilesets/00.2bpp b/gfx/tilesets/overworld.2bpp
index 6e480769..6e480769 100644
--- a/gfx/tilesets/00.2bpp
+++ b/gfx/tilesets/overworld.2bpp
diff --git a/gfx/tilesets/00.tilecoll b/gfx/tilesets/overworld.tilecoll
index dae824f1..dae824f1 100644
--- a/gfx/tilesets/00.tilecoll
+++ b/gfx/tilesets/overworld.tilecoll
diff --git a/gfx/tilesets/17.2bpp b/gfx/tilesets/plateau.2bpp
index e277c12b..e277c12b 100644
--- a/gfx/tilesets/17.2bpp
+++ b/gfx/tilesets/plateau.2bpp
diff --git a/gfx/tilesets/17.tilecoll b/gfx/tilesets/plateau.tilecoll
index 5958688e..5958688e 100644
--- a/gfx/tilesets/17.tilecoll
+++ b/gfx/tilesets/plateau.tilecoll
diff --git a/gfx/tilesets/02.2bpp b/gfx/tilesets/pokecenter.2bpp
index 8f10e418..8f10e418 100644
--- a/gfx/tilesets/02.2bpp
+++ b/gfx/tilesets/pokecenter.2bpp
diff --git a/gfx/tilesets/02.tilecoll b/gfx/tilesets/pokecenter.tilecoll
index 928af693..928af693 100644
--- a/gfx/tilesets/02.tilecoll
+++ b/gfx/tilesets/pokecenter.tilecoll
diff --git a/gfx/tilesets/01.2bpp b/gfx/tilesets/reds_house.2bpp
index 1287b9a5..1287b9a5 100644
--- a/gfx/tilesets/01.2bpp
+++ b/gfx/tilesets/reds_house.2bpp
diff --git a/gfx/tilesets/01.tilecoll b/gfx/tilesets/reds_house.tilecoll
index b19db300..b19db300 100644
--- a/gfx/tilesets/01.tilecoll
+++ b/gfx/tilesets/reds_house.tilecoll
diff --git a/gfx/tilesets/0d.2bpp b/gfx/tilesets/ship.2bpp
index 7a032775..7a032775 100644
--- a/gfx/tilesets/0d.2bpp
+++ b/gfx/tilesets/ship.2bpp
diff --git a/gfx/tilesets/0d.tilecoll b/gfx/tilesets/ship.tilecoll
index d78bcc45..d78bcc45 100644
--- a/gfx/tilesets/0d.tilecoll
+++ b/gfx/tilesets/ship.tilecoll
diff --git a/gfx/tilesets/0e.2bpp b/gfx/tilesets/ship_port.2bpp
index 06dedfed..06dedfed 100644
--- a/gfx/tilesets/0e.2bpp
+++ b/gfx/tilesets/ship_port.2bpp
diff --git a/gfx/tilesets/0e.tilecoll b/gfx/tilesets/ship_port.tilecoll
index 2dc99b5c..2dc99b5c 100644
--- a/gfx/tilesets/0e.tilecoll
+++ b/gfx/tilesets/ship_port.tilecoll
diff --git a/gfx/tilesets/0b.2bpp b/gfx/tilesets/underground.2bpp
index 9c827e13..9c827e13 100644
--- a/gfx/tilesets/0b.2bpp
+++ b/gfx/tilesets/underground.2bpp
diff --git a/gfx/tilesets/0b.tilecoll b/gfx/tilesets/underground.tilecoll
index 75efd22b..75efd22b 100644
--- a/gfx/tilesets/0b.tilecoll
+++ b/gfx/tilesets/underground.tilecoll