Merge branch 'master' of github.com:pret/pokediamond into pikalax_work

10 files changed, 0 insertions, 34 deletions

diff --git a/files/battle/graphic/batt_obj/.knarcignore b/files/battle/graphic/batt_obj/.knarcignore
index 50b4e110..9cb3ee46 100644
--- a/files/battle/graphic/batt_obj/.knarcignore
+++ b/files/battle/graphic/batt_obj/.knarcignore
@@ -408,4 +408,3 @@ narc_0173.NCGR
 narc_0198.NCGR
 *.png
 *.pal
-*.txt
\ No newline at end of file
diff --git a/files/battle/graphic/batt_obj/files.txt b/files/battle/graphic/batt_obj/files.txt
deleted file mode 100644
index 33518d57..00000000
--- a/files/battle/graphic/batt_obj/files.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-all recn after 203 seem to be equal (PokéBall throw animation)
-
-195:
-	47.rlcn
-	203.recn
-
-196:
-	48.rlcn
-	204.recn
-
-197:
-	49.rlcn
-	205.recn
-
-198:
-	50.rlcn
-	206.recn
-
-199:
-	51.rlcn
-	207.recn
-
-200:
-	52.rlcn
-	208.recn
-
-201:
-	53.rlcn
-	209.recn
-
-202:
-	54.rlcn
-	210.recn
\ No newline at end of file
diff --git a/files/battle/graphic/batt_obj/narc_0195.png b/files/battle/graphic/batt_obj/narc_0195.png
deleted file mode 100644
index ff94198c..00000000
--- a/files/battle/graphic/batt_obj/narc_0195.png
+++ /dev/null
diff --git a/files/battle/graphic/batt_obj/narc_0196.png b/files/battle/graphic/batt_obj/narc_0196.png
deleted file mode 100644
index a7c9478a..00000000
--- a/files/battle/graphic/batt_obj/narc_0196.png
+++ /dev/null
diff --git a/files/battle/graphic/batt_obj/narc_0197.png b/files/battle/graphic/batt_obj/narc_0197.png
deleted file mode 100644
index 9055895d..00000000
--- a/files/battle/graphic/batt_obj/narc_0197.png
+++ /dev/null
diff --git a/files/battle/graphic/batt_obj/narc_0198.png b/files/battle/graphic/batt_obj/narc_0198.png
deleted file mode 100644
index c404ddbf..00000000
--- a/files/battle/graphic/batt_obj/narc_0198.png
+++ /dev/null
diff --git a/files/battle/graphic/batt_obj/narc_0199.png b/files/battle/graphic/batt_obj/narc_0199.png
deleted file mode 100644
index efac1234..00000000
--- a/files/battle/graphic/batt_obj/narc_0199.png
+++ /dev/null
diff --git a/files/battle/graphic/batt_obj/narc_0200.png b/files/battle/graphic/batt_obj/narc_0200.png
deleted file mode 100644
index 4e00e2a1..00000000
--- a/files/battle/graphic/batt_obj/narc_0200.png
+++ /dev/null
diff --git a/files/battle/graphic/batt_obj/narc_0201.png b/files/battle/graphic/batt_obj/narc_0201.png
deleted file mode 100644
index de6fb27f..00000000
--- a/files/battle/graphic/batt_obj/narc_0201.png
+++ /dev/null
diff --git a/files/battle/graphic/batt_obj/narc_0202.png b/files/battle/graphic/batt_obj/narc_0202.png
deleted file mode 100644
index c947531a..00000000
--- a/files/battle/graphic/batt_obj/narc_0202.png
+++ /dev/null