Merge branch 'master' into master

38 files changed, 74 insertions, 74 deletions

diff --git a/files/wazaeffect/effectclact/wechar/.knarcignore b/files/wazaeffect/effectclact/wechar/.knarcignore
index 7f2a9d3a..6f78fd1b 100644
--- a/files/wazaeffect/effectclact/wechar/.knarcignore
+++ b/files/wazaeffect/effectclact/wechar/.knarcignore
@@ -1,74 +1,74 @@
-narc_0022.bin
-narc_0036.bin
-narc_0023.bin
-narc_0035.bin
-narc_0021.bin
-narc_0009.bin
-narc_0008.bin
-narc_0020.bin
-narc_0034.bin
-narc_0018.bin
-narc_0030.bin
-narc_0024.bin
-narc_0025.bin
-narc_0031.bin
-narc_0019.bin
-narc_0027.bin
-narc_0033.bin
-narc_0032.bin
-narc_0026.bin
-narc_0003.bin
-narc_0017.bin
-narc_0016.bin
-narc_0002.bin
-narc_0014.bin
-narc_0000.bin
-narc_0028.bin
-narc_0029.bin
-narc_0001.bin
-narc_0015.bin
-narc_0011.bin
-narc_0005.bin
-narc_0004.bin
-narc_0010.bin
-narc_0006.bin
-narc_0012.bin
-narc_0013.bin
-narc_0007.bin
-narc_0022.bin
-narc_0036.bin
-narc_0023.bin
-narc_0035.bin
-narc_0021.bin
-narc_0009.bin
-narc_0008.bin
-narc_0020.bin
-narc_0034.bin
-narc_0018.bin
-narc_0030.bin
-narc_0024.bin
-narc_0025.bin
-narc_0031.bin
-narc_0019.bin
-narc_0027.bin
-narc_0033.bin
-narc_0032.bin
-narc_0026.bin
-narc_0003.bin
-narc_0017.bin
-narc_0016.bin
-narc_0002.bin
-narc_0014.bin
-narc_0000.bin
-narc_0028.bin
-narc_0029.bin
-narc_0001.bin
-narc_0015.bin
-narc_0011.bin
-narc_0005.bin
-narc_0004.bin
-narc_0010.bin
-narc_0006.bin
-narc_0012.bin
-narc_0013.bin
-narc_0007.bin
+narc_0022.NCGR
+narc_0036.NCGR
+narc_0023.NCGR
+narc_0035.NCGR
+narc_0021.NCGR
+narc_0009.NCGR
+narc_0008.NCGR
+narc_0020.NCGR
+narc_0034.NCGR
+narc_0018.NCGR
+narc_0030.NCGR
+narc_0024.NCGR
+narc_0025.NCGR
+narc_0031.NCGR
+narc_0019.NCGR
+narc_0027.NCGR
+narc_0033.NCGR
+narc_0032.NCGR
+narc_0026.NCGR
+narc_0003.NCGR
+narc_0017.NCGR
+narc_0016.NCGR
+narc_0002.NCGR
+narc_0014.NCGR
+narc_0000.NCGR
+narc_0028.NCGR
+narc_0029.NCGR
+narc_0001.NCGR
+narc_0015.NCGR
+narc_0011.NCGR
+narc_0005.NCGR
+narc_0004.NCGR
+narc_0010.NCGR
+narc_0006.NCGR
+narc_0012.NCGR
+narc_0013.NCGR
+narc_0007.NCGR
+narc_0022.NCGR
+narc_0036.NCGR
+narc_0023.NCGR
+narc_0035.NCGR
+narc_0021.NCGR
+narc_0009.NCGR
+narc_0008.NCGR
+narc_0020.NCGR
+narc_0034.NCGR
+narc_0018.NCGR
+narc_0030.NCGR
+narc_0024.NCGR
+narc_0025.NCGR
+narc_0031.NCGR
+narc_0019.NCGR
+narc_0027.NCGR
+narc_0033.NCGR
+narc_0032.NCGR
+narc_0026.NCGR
+narc_0003.NCGR
+narc_0017.NCGR
+narc_0016.NCGR
+narc_0002.NCGR
+narc_0014.NCGR
+narc_0000.NCGR
+narc_0028.NCGR
+narc_0029.NCGR
+narc_0001.NCGR
+narc_0015.NCGR
+narc_0011.NCGR
+narc_0005.NCGR
+narc_0004.NCGR
+narc_0010.NCGR
+narc_0006.NCGR
+narc_0012.NCGR
+narc_0013.NCGR
+narc_0007.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0000.bin b/files/wazaeffect/effectclact/wechar/narc_0000.NCGR
index 1e232d01..1e232d01 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0000.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0000.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0001.bin b/files/wazaeffect/effectclact/wechar/narc_0001.NCGR
index da9042c9..da9042c9 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0001.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0001.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0002.bin b/files/wazaeffect/effectclact/wechar/narc_0002.NCGR
index ac4861e8..ac4861e8 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0002.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0002.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0003.bin b/files/wazaeffect/effectclact/wechar/narc_0003.NCGR
index 1566bd96..1566bd96 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0003.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0003.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0004.bin b/files/wazaeffect/effectclact/wechar/narc_0004.NCGR
index 3e9183b0..3e9183b0 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0004.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0004.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0005.bin b/files/wazaeffect/effectclact/wechar/narc_0005.NCGR
index 865a3c0f..865a3c0f 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0005.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0005.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0006.bin b/files/wazaeffect/effectclact/wechar/narc_0006.NCGR
index 8cc6f544..8cc6f544 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0006.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0006.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0007.bin b/files/wazaeffect/effectclact/wechar/narc_0007.NCGR
index a5fa39a5..a5fa39a5 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0007.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0007.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0008.bin b/files/wazaeffect/effectclact/wechar/narc_0008.NCGR
index b514a037..b514a037 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0008.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0008.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0009.bin b/files/wazaeffect/effectclact/wechar/narc_0009.NCGR
index f18cbd0e..f18cbd0e 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0009.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0009.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0010.bin b/files/wazaeffect/effectclact/wechar/narc_0010.NCGR
index 8f418c68..8f418c68 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0010.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0010.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0011.bin b/files/wazaeffect/effectclact/wechar/narc_0011.NCGR
index dc5bb82a..dc5bb82a 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0011.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0011.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0012.bin b/files/wazaeffect/effectclact/wechar/narc_0012.NCGR
index d03d9d25..d03d9d25 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0012.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0012.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0013.bin b/files/wazaeffect/effectclact/wechar/narc_0013.NCGR
index 1285aeb9..1285aeb9 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0013.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0013.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0014.bin b/files/wazaeffect/effectclact/wechar/narc_0014.NCGR
index 3dab9eb2..3dab9eb2 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0014.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0014.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0015.bin b/files/wazaeffect/effectclact/wechar/narc_0015.NCGR
index 1401f214..1401f214 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0015.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0015.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0016.bin b/files/wazaeffect/effectclact/wechar/narc_0016.NCGR
index b8b91dbe..b8b91dbe 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0016.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0016.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0017.bin b/files/wazaeffect/effectclact/wechar/narc_0017.NCGR
index 714f342e..714f342e 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0017.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0017.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0018.bin b/files/wazaeffect/effectclact/wechar/narc_0018.NCGR
index e125ca56..e125ca56 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0018.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0018.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0019.bin b/files/wazaeffect/effectclact/wechar/narc_0019.NCGR
index 8487cfc2..8487cfc2 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0019.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0019.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0020.bin b/files/wazaeffect/effectclact/wechar/narc_0020.NCGR
index 6e1e03fd..6e1e03fd 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0020.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0020.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0021.bin b/files/wazaeffect/effectclact/wechar/narc_0021.NCGR
index 1566bd96..1566bd96 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0021.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0021.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0022.bin b/files/wazaeffect/effectclact/wechar/narc_0022.NCGR
index c5c50a66..c5c50a66 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0022.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0022.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0023.bin b/files/wazaeffect/effectclact/wechar/narc_0023.NCGR
index c23b2e3d..c23b2e3d 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0023.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0023.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0024.bin b/files/wazaeffect/effectclact/wechar/narc_0024.NCGR
index 82774f60..82774f60 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0024.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0024.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0025.bin b/files/wazaeffect/effectclact/wechar/narc_0025.NCGR
index 5491738e..5491738e 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0025.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0025.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0026.bin b/files/wazaeffect/effectclact/wechar/narc_0026.NCGR
index 9dcf6616..9dcf6616 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0026.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0026.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0027.bin b/files/wazaeffect/effectclact/wechar/narc_0027.NCGR
index e761d203..e761d203 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0027.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0027.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0028.bin b/files/wazaeffect/effectclact/wechar/narc_0028.NCGR
index 284f8a4f..284f8a4f 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0028.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0028.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0029.bin b/files/wazaeffect/effectclact/wechar/narc_0029.NCGR
index 20c16cba..20c16cba 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0029.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0029.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0030.bin b/files/wazaeffect/effectclact/wechar/narc_0030.NCGR
index 1c9d634c..1c9d634c 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0030.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0030.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0031.bin b/files/wazaeffect/effectclact/wechar/narc_0031.NCGR
index d14c9866..d14c9866 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0031.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0031.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0032.bin b/files/wazaeffect/effectclact/wechar/narc_0032.NCGR
index df54fcf8..df54fcf8 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0032.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0032.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0033.bin b/files/wazaeffect/effectclact/wechar/narc_0033.NCGR
index 76834116..76834116 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0033.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0033.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0034.bin b/files/wazaeffect/effectclact/wechar/narc_0034.NCGR
index ad41c2a5..ad41c2a5 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0034.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0034.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0035.bin b/files/wazaeffect/effectclact/wechar/narc_0035.NCGR
index 6951f4ac..6951f4ac 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0035.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0035.NCGR
diff --git a/files/wazaeffect/effectclact/wechar/narc_0036.bin b/files/wazaeffect/effectclact/wechar/narc_0036.NCGR
index e7ac6f92..e7ac6f92 100644
--- a/files/wazaeffect/effectclact/wechar/narc_0036.bin
+++ b/files/wazaeffect/effectclact/wechar/narc_0036.NCGR