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

23 files changed, 2 insertions, 0 deletions

diff --git a/files/graphic/demo_trade/narc_0027.bin b/files/graphic/demo_trade/narc_0027.NSBMD
index 3de52aa4..3de52aa4 100644
--- a/files/graphic/demo_trade/narc_0027.bin
+++ b/files/graphic/demo_trade/narc_0027.NSBMD
diff --git a/files/graphic/ending/narc_0000.bin b/files/graphic/ending/narc_0000.NSBMD
index 19bc6489..19bc6489 100644
--- a/files/graphic/ending/narc_0000.bin
+++ b/files/graphic/ending/narc_0000.NSBMD
diff --git a/files/graphic/ending/narc_0001.bin b/files/graphic/ending/narc_0001.NSBMD
index beb0ec8b..beb0ec8b 100644
--- a/files/graphic/ending/narc_0001.bin
+++ b/files/graphic/ending/narc_0001.NSBMD
diff --git a/files/graphic/ending/narc_0002.bin b/files/graphic/ending/narc_0002.NSBMD
index 093d1a9d..093d1a9d 100644
--- a/files/graphic/ending/narc_0002.bin
+++ b/files/graphic/ending/narc_0002.NSBMD
diff --git a/files/graphic/ending/narc_0003.bin b/files/graphic/ending/narc_0003.NSBTA
index bc2ec208..bc2ec208 100644
--- a/files/graphic/ending/narc_0003.bin
+++ b/files/graphic/ending/narc_0003.NSBTA
diff --git a/files/graphic/ev_pokeselect/narc_0000.bin b/files/graphic/ev_pokeselect/narc_0000.NSBCA
index 4d53e5bf..4d53e5bf 100644
--- a/files/graphic/ev_pokeselect/narc_0000.bin
+++ b/files/graphic/ev_pokeselect/narc_0000.NSBCA
diff --git a/files/graphic/ev_pokeselect/narc_0001.bin b/files/graphic/ev_pokeselect/narc_0001.NSBMD
index be54bee3..be54bee3 100644
--- a/files/graphic/ev_pokeselect/narc_0001.bin
+++ b/files/graphic/ev_pokeselect/narc_0001.NSBMD
diff --git a/files/graphic/ev_pokeselect/narc_0002.bin b/files/graphic/ev_pokeselect/narc_0002.NSBCA
index 16adb461..16adb461 100644
--- a/files/graphic/ev_pokeselect/narc_0002.bin
+++ b/files/graphic/ev_pokeselect/narc_0002.NSBCA
diff --git a/files/graphic/ev_pokeselect/narc_0003.bin b/files/graphic/ev_pokeselect/narc_0003.NSBMD
index 3d515b2d..3d515b2d 100644
--- a/files/graphic/ev_pokeselect/narc_0003.bin
+++ b/files/graphic/ev_pokeselect/narc_0003.NSBMD
diff --git a/files/graphic/ev_pokeselect/narc_0004.bin b/files/graphic/ev_pokeselect/narc_0004.NSBCA
index 785d6908..785d6908 100644
--- a/files/graphic/ev_pokeselect/narc_0004.bin
+++ b/files/graphic/ev_pokeselect/narc_0004.NSBCA
diff --git a/files/graphic/ev_pokeselect/narc_0005.bin b/files/graphic/ev_pokeselect/narc_0005.NSBMD
index 748dc501..748dc501 100644
--- a/files/graphic/ev_pokeselect/narc_0005.bin
+++ b/files/graphic/ev_pokeselect/narc_0005.NSBMD
diff --git a/files/graphic/ev_pokeselect/narc_0006.bin b/files/graphic/ev_pokeselect/narc_0006.NSBCA
index 94bca388..94bca388 100644
--- a/files/graphic/ev_pokeselect/narc_0006.bin
+++ b/files/graphic/ev_pokeselect/narc_0006.NSBCA
diff --git a/files/graphic/ev_pokeselect/narc_0007.bin b/files/graphic/ev_pokeselect/narc_0007.NSBMD
index 10d233c8..10d233c8 100644
--- a/files/graphic/ev_pokeselect/narc_0007.bin
+++ b/files/graphic/ev_pokeselect/narc_0007.NSBMD
diff --git a/files/graphic/ev_pokeselect/narc_0008.bin b/files/graphic/ev_pokeselect/narc_0008.NSBMD
index 80725591..80725591 100644
--- a/files/graphic/ev_pokeselect/narc_0008.bin
+++ b/files/graphic/ev_pokeselect/narc_0008.NSBMD
diff --git a/files/graphic/ev_pokeselect/narc_0009.bin b/files/graphic/ev_pokeselect/narc_0009.NSBMD
index 23c5d394..23c5d394 100644
--- a/files/graphic/ev_pokeselect/narc_0009.bin
+++ b/files/graphic/ev_pokeselect/narc_0009.NSBMD
diff --git a/files/graphic/hiden_effect/narc_0000.bin b/files/graphic/hiden_effect/narc_0000.NSBCA
index c12ead76..c12ead76 100644
--- a/files/graphic/hiden_effect/narc_0000.bin
+++ b/files/graphic/hiden_effect/narc_0000.NSBCA
diff --git a/files/graphic/hiden_effect/narc_0001.bin b/files/graphic/hiden_effect/narc_0001.NSBMA
index 70263d42..70263d42 100644
--- a/files/graphic/hiden_effect/narc_0001.bin
+++ b/files/graphic/hiden_effect/narc_0001.NSBMA
diff --git a/files/graphic/hiden_effect/narc_0002.bin b/files/graphic/hiden_effect/narc_0002.NSBTA
index d4066c4e..d4066c4e 100644
--- a/files/graphic/hiden_effect/narc_0002.bin
+++ b/files/graphic/hiden_effect/narc_0002.NSBTA
diff --git a/files/graphic/hiden_effect/narc_0003.bin b/files/graphic/hiden_effect/narc_0003.NSBMD
index adec36ef..adec36ef 100644
--- a/files/graphic/hiden_effect/narc_0003.bin
+++ b/files/graphic/hiden_effect/narc_0003.NSBMD
diff --git a/files/graphic/poketch/.knarcignore b/files/graphic/poketch/.knarcignore
index 2856080a..25285fc7 100644
--- a/files/graphic/poketch/.knarcignore
+++ b/files/graphic/poketch/.knarcignore
@@ -1,2 +1,4 @@
 *.png
 *.pal
+narc_0010.NCGR
+narc_0011.NSCR
diff --git a/files/graphic/poketch/narc_0010.bin b/files/graphic/poketch/narc_0010.bin
deleted file mode 100644
index 75d87f58..00000000
--- a/files/graphic/poketch/narc_0010.bin
+++ /dev/null
diff --git a/files/graphic/poketch/narc_0010.png b/files/graphic/poketch/narc_0010.png
new file mode 100644
index 00000000..0945423d
--- /dev/null
+++ b/files/graphic/poketch/narc_0010.png
diff --git a/files/graphic/poketch/narc_0011.NSCR b/files/graphic/poketch/narc_0011.NSCR
index 97830501..d2f5f9df 100644
--- a/files/graphic/poketch/narc_0011.NSCR
+++ b/files/graphic/poketch/narc_0011.NSCR