Merge branch 'master' into nitrogfx

51 files changed, 0 insertions, 0 deletions

diff --git a/files/demo/title/op_demo/narc_0000.bin b/files/demo/title/op_demo/narc_0000.NCLR
index 08fc93c7..08fc93c7 100644
--- a/files/demo/title/op_demo/narc_0000.bin
+++ b/files/demo/title/op_demo/narc_0000.NCLR
diff --git a/files/demo/title/op_demo/narc_0001.bin b/files/demo/title/op_demo/narc_0001.NCGR
index a8937801..a8937801 100644
--- a/files/demo/title/op_demo/narc_0001.bin
+++ b/files/demo/title/op_demo/narc_0001.NCGR
diff --git a/files/demo/title/op_demo/narc_0003.bin b/files/demo/title/op_demo/narc_0003.NCLR
index adeff6d6..adeff6d6 100644
--- a/files/demo/title/op_demo/narc_0003.bin
+++ b/files/demo/title/op_demo/narc_0003.NCLR
diff --git a/files/demo/title/op_demo/narc_0004.bin b/files/demo/title/op_demo/narc_0004.NCGR
index a8822817..a8822817 100644
--- a/files/demo/title/op_demo/narc_0004.bin
+++ b/files/demo/title/op_demo/narc_0004.NCGR
diff --git a/files/demo/title/op_demo/narc_0007.bin b/files/demo/title/op_demo/narc_0007.NCLR
index 7979c1ea..7979c1ea 100644
--- a/files/demo/title/op_demo/narc_0007.bin
+++ b/files/demo/title/op_demo/narc_0007.NCLR
diff --git a/files/demo/title/op_demo/narc_0008.bin b/files/demo/title/op_demo/narc_0008.NCGR
index dbeb49e7..dbeb49e7 100644
--- a/files/demo/title/op_demo/narc_0008.bin
+++ b/files/demo/title/op_demo/narc_0008.NCGR
diff --git a/files/demo/title/op_demo/narc_0010.bin b/files/demo/title/op_demo/narc_0010.NCLR
index 7979c1ea..7979c1ea 100644
--- a/files/demo/title/op_demo/narc_0010.bin
+++ b/files/demo/title/op_demo/narc_0010.NCLR
diff --git a/files/demo/title/op_demo/narc_0011.bin b/files/demo/title/op_demo/narc_0011.NCGR
index dbeb49e7..dbeb49e7 100644
--- a/files/demo/title/op_demo/narc_0011.bin
+++ b/files/demo/title/op_demo/narc_0011.NCGR
diff --git a/files/demo/title/op_demo/narc_0013.bin b/files/demo/title/op_demo/narc_0013.NCLR
index e4173626..e4173626 100644
--- a/files/demo/title/op_demo/narc_0013.bin
+++ b/files/demo/title/op_demo/narc_0013.NCLR
diff --git a/files/demo/title/op_demo/narc_0014.bin b/files/demo/title/op_demo/narc_0014.NCGR
index 620fb1aa..620fb1aa 100644
--- a/files/demo/title/op_demo/narc_0014.bin
+++ b/files/demo/title/op_demo/narc_0014.NCGR
diff --git a/files/demo/title/op_demo/narc_0016.bin b/files/demo/title/op_demo/narc_0016.NCLR
index e4173626..e4173626 100644
--- a/files/demo/title/op_demo/narc_0016.bin
+++ b/files/demo/title/op_demo/narc_0016.NCLR
diff --git a/files/demo/title/op_demo/narc_0017.bin b/files/demo/title/op_demo/narc_0017.NCGR
index 311d442f..311d442f 100644
--- a/files/demo/title/op_demo/narc_0017.bin
+++ b/files/demo/title/op_demo/narc_0017.NCGR
diff --git a/files/demo/title/op_demo/narc_0018.bin b/files/demo/title/op_demo/narc_0018.NCLR
index 1ff82e9a..1ff82e9a 100644
--- a/files/demo/title/op_demo/narc_0018.bin
+++ b/files/demo/title/op_demo/narc_0018.NCLR
diff --git a/files/demo/title/op_demo/narc_0019.bin b/files/demo/title/op_demo/narc_0019.NCGR
index 3f36d46f..3f36d46f 100644
--- a/files/demo/title/op_demo/narc_0019.bin
+++ b/files/demo/title/op_demo/narc_0019.NCGR
diff --git a/files/demo/title/op_demo/narc_0023.bin b/files/demo/title/op_demo/narc_0023.NCLR
index 86bd552a..86bd552a 100644
--- a/files/demo/title/op_demo/narc_0023.bin
+++ b/files/demo/title/op_demo/narc_0023.NCLR
diff --git a/files/demo/title/op_demo/narc_0027.bin b/files/demo/title/op_demo/narc_0027.NCGR
index 1b6b7fc3..1b6b7fc3 100644
--- a/files/demo/title/op_demo/narc_0027.bin
+++ b/files/demo/title/op_demo/narc_0027.NCGR
diff --git a/files/demo/title/op_demo/narc_0028.bin b/files/demo/title/op_demo/narc_0028.NCGR
index 1c884c0d..1c884c0d 100644
--- a/files/demo/title/op_demo/narc_0028.bin
+++ b/files/demo/title/op_demo/narc_0028.NCGR
diff --git a/files/demo/title/op_demo/narc_0029.bin b/files/demo/title/op_demo/narc_0029.NCLR
index 31d5d2c8..31d5d2c8 100644
--- a/files/demo/title/op_demo/narc_0029.bin
+++ b/files/demo/title/op_demo/narc_0029.NCLR
diff --git a/files/demo/title/op_demo/narc_0030.bin b/files/demo/title/op_demo/narc_0030.NCLR
index 4bb1abd8..4bb1abd8 100644
--- a/files/demo/title/op_demo/narc_0030.bin
+++ b/files/demo/title/op_demo/narc_0030.NCLR
diff --git a/files/demo/title/op_demo/narc_0031.bin b/files/demo/title/op_demo/narc_0031.NCLR
index d697138f..d697138f 100644
--- a/files/demo/title/op_demo/narc_0031.bin
+++ b/files/demo/title/op_demo/narc_0031.NCLR
diff --git a/files/demo/title/op_demo/narc_0032.bin b/files/demo/title/op_demo/narc_0032.NCLR
index adbdea92..adbdea92 100644
--- a/files/demo/title/op_demo/narc_0032.bin
+++ b/files/demo/title/op_demo/narc_0032.NCLR
diff --git a/files/demo/title/op_demo/narc_0033.bin b/files/demo/title/op_demo/narc_0033.NCLR
index fbfa0ddd..fbfa0ddd 100644
--- a/files/demo/title/op_demo/narc_0033.bin
+++ b/files/demo/title/op_demo/narc_0033.NCLR
diff --git a/files/demo/title/op_demo/narc_0034.bin b/files/demo/title/op_demo/narc_0034.NCLR
index 5bc4741c..5bc4741c 100644
--- a/files/demo/title/op_demo/narc_0034.bin
+++ b/files/demo/title/op_demo/narc_0034.NCLR
diff --git a/files/demo/title/op_demo/narc_0035.bin b/files/demo/title/op_demo/narc_0035.NCLR
index cdbb3fc5..cdbb3fc5 100644
--- a/files/demo/title/op_demo/narc_0035.bin
+++ b/files/demo/title/op_demo/narc_0035.NCLR
diff --git a/files/demo/title/op_demo/narc_0036.bin b/files/demo/title/op_demo/narc_0036.NCLR
index a21fda6f..a21fda6f 100644
--- a/files/demo/title/op_demo/narc_0036.bin
+++ b/files/demo/title/op_demo/narc_0036.NCLR
diff --git a/files/demo/title/op_demo/narc_0037.bin b/files/demo/title/op_demo/narc_0037.NCLR
index 59586a9d..59586a9d 100644
--- a/files/demo/title/op_demo/narc_0037.bin
+++ b/files/demo/title/op_demo/narc_0037.NCLR
diff --git a/files/demo/title/op_demo/narc_0038.bin b/files/demo/title/op_demo/narc_0038.NCGR
index 94228780..94228780 100644
--- a/files/demo/title/op_demo/narc_0038.bin
+++ b/files/demo/title/op_demo/narc_0038.NCGR
diff --git a/files/demo/title/op_demo/narc_0039.bin b/files/demo/title/op_demo/narc_0039.NCGR
index 1c2c6951..1c2c6951 100644
--- a/files/demo/title/op_demo/narc_0039.bin
+++ b/files/demo/title/op_demo/narc_0039.NCGR
diff --git a/files/demo/title/op_demo/narc_0040.bin b/files/demo/title/op_demo/narc_0040.NCGR
index 3a74a853..3a74a853 100644
--- a/files/demo/title/op_demo/narc_0040.bin
+++ b/files/demo/title/op_demo/narc_0040.NCGR
diff --git a/files/demo/title/op_demo/narc_0041.bin b/files/demo/title/op_demo/narc_0041.NCGR
index f042469a..f042469a 100644
--- a/files/demo/title/op_demo/narc_0041.bin
+++ b/files/demo/title/op_demo/narc_0041.NCGR
diff --git a/files/demo/title/op_demo/narc_0042.bin b/files/demo/title/op_demo/narc_0042.NCGR
index d36eb057..d36eb057 100644
--- a/files/demo/title/op_demo/narc_0042.bin
+++ b/files/demo/title/op_demo/narc_0042.NCGR
diff --git a/files/demo/title/op_demo/narc_0053.bin b/files/demo/title/op_demo/narc_0053.NCLR
index c4552f5c..c4552f5c 100644
--- a/files/demo/title/op_demo/narc_0053.bin
+++ b/files/demo/title/op_demo/narc_0053.NCLR
diff --git a/files/demo/title/op_demo/narc_0054.bin b/files/demo/title/op_demo/narc_0054.NCGR
index 946f684d..946f684d 100644
--- a/files/demo/title/op_demo/narc_0054.bin
+++ b/files/demo/title/op_demo/narc_0054.NCGR
diff --git a/files/demo/title/op_demo/narc_0055.bin b/files/demo/title/op_demo/narc_0055.NCGR
index dffd5cca..dffd5cca 100644
--- a/files/demo/title/op_demo/narc_0055.bin
+++ b/files/demo/title/op_demo/narc_0055.NCGR
diff --git a/files/demo/title/op_demo/narc_0056.bin b/files/demo/title/op_demo/narc_0056.NCGR
index 7de38e9c..7de38e9c 100644
--- a/files/demo/title/op_demo/narc_0056.bin
+++ b/files/demo/title/op_demo/narc_0056.NCGR
diff --git a/files/demo/title/op_demo/narc_0057.bin b/files/demo/title/op_demo/narc_0057.NCGR
index 95717d08..95717d08 100644
--- a/files/demo/title/op_demo/narc_0057.bin
+++ b/files/demo/title/op_demo/narc_0057.NCGR
diff --git a/files/demo/title/op_demo/narc_0058.bin b/files/demo/title/op_demo/narc_0058.NCGR
index 5d610662..5d610662 100644
--- a/files/demo/title/op_demo/narc_0058.bin
+++ b/files/demo/title/op_demo/narc_0058.NCGR
diff --git a/files/demo/title/op_demo/narc_0071.bin b/files/demo/title/op_demo/narc_0071.NCLR
index cbc14df1..cbc14df1 100644
--- a/files/demo/title/op_demo/narc_0071.bin
+++ b/files/demo/title/op_demo/narc_0071.NCLR
diff --git a/files/demo/title/op_demo/narc_0072.bin b/files/demo/title/op_demo/narc_0072.NCGR
index 05559339..05559339 100644
--- a/files/demo/title/op_demo/narc_0072.bin
+++ b/files/demo/title/op_demo/narc_0072.NCGR
diff --git a/files/demo/title/titledemo/narc_0001.bin b/files/demo/title/titledemo/narc_0001.NCGR
index b40573ef..b40573ef 100644
--- a/files/demo/title/titledemo/narc_0001.bin
+++ b/files/demo/title/titledemo/narc_0001.NCGR
diff --git a/files/demo/title/titledemo/narc_0002.bin b/files/demo/title/titledemo/narc_0002.NCLR
index f38c8aef..f38c8aef 100644
--- a/files/demo/title/titledemo/narc_0002.bin
+++ b/files/demo/title/titledemo/narc_0002.NCLR
diff --git a/files/demo/title/titledemo/narc_0003.bin b/files/demo/title/titledemo/narc_0003.NCGR
index 007b734c..007b734c 100644
--- a/files/demo/title/titledemo/narc_0003.bin
+++ b/files/demo/title/titledemo/narc_0003.NCGR
diff --git a/files/demo/title/titledemo/narc_0004.bin b/files/demo/title/titledemo/narc_0004.NCLR
index bf289579..bf289579 100644
--- a/files/demo/title/titledemo/narc_0004.bin
+++ b/files/demo/title/titledemo/narc_0004.NCLR
diff --git a/files/demo/title/titledemo/narc_0007.bin b/files/demo/title/titledemo/narc_0007.NCGR
index 999daf42..999daf42 100644
--- a/files/demo/title/titledemo/narc_0007.bin
+++ b/files/demo/title/titledemo/narc_0007.NCGR
diff --git a/files/demo/title/titledemo/narc_0009.bin b/files/demo/title/titledemo/narc_0009.NCLR
index d7ac121e..d7ac121e 100644
--- a/files/demo/title/titledemo/narc_0009.bin
+++ b/files/demo/title/titledemo/narc_0009.NCLR
diff --git a/files/demo/title/titledemo/narc_0010.bin b/files/demo/title/titledemo/narc_0010.NCLR
index 1dc5e984..1dc5e984 100644
--- a/files/demo/title/titledemo/narc_0010.bin
+++ b/files/demo/title/titledemo/narc_0010.NCLR
diff --git a/files/demo/title/titledemo/narc_0011.bin b/files/demo/title/titledemo/narc_0011.NCGR
index 999daf42..999daf42 100644
--- a/files/demo/title/titledemo/narc_0011.bin
+++ b/files/demo/title/titledemo/narc_0011.NCGR
diff --git a/files/demo/title/titledemo/narc_0013.bin b/files/demo/title/titledemo/narc_0013.NCLR
index 0dd59fd4..0dd59fd4 100644
--- a/files/demo/title/titledemo/narc_0013.bin
+++ b/files/demo/title/titledemo/narc_0013.NCLR
diff --git a/files/demo/title/titledemo/narc_0014.bin b/files/demo/title/titledemo/narc_0014.NCLR
index 4187c5bf..4187c5bf 100644
--- a/files/demo/title/titledemo/narc_0014.bin
+++ b/files/demo/title/titledemo/narc_0014.NCLR
diff --git a/files/demo/title/titledemo/narc_0015.bin b/files/demo/title/titledemo/narc_0015.NCGR
index 10e00b0e..10e00b0e 100644
--- a/files/demo/title/titledemo/narc_0015.bin
+++ b/files/demo/title/titledemo/narc_0015.NCGR
diff --git a/files/demo/title/titledemo/narc_0016.bin b/files/demo/title/titledemo/narc_0016.NCLR
index 697a342a..697a342a 100644
--- a/files/demo/title/titledemo/narc_0016.bin
+++ b/files/demo/title/titledemo/narc_0016.NCLR