Merge pull request #144 from kr3nshaw/master

Replaced narccomp with knarc

7 files changed, 770 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index b7b31dbb..c3cd2c77 100644
--- a/Makefile
+++ b/Makefile
@@ -31,9 +31,9 @@ endif
 
 ifeq ($(OS),Windows_NT)
 EXE := .exe
-WINE := 
+WINE :=
 else
-EXE := 
+EXE :=
 WINE := wine
 endif
 
@@ -175,6 +175,7 @@ MWCCARM  = tools/mwccarm/$(MWCCVERSION)/mwccarm.exe
 # have to use mwldarm for now.
 # TODO: Is there a hack workaround to let us go back to GNU LD? Ideally, the
 # only dependency should be MWCCARM.
+KNARC = tools/knarc/knarc$(EXE)
 MWLDARM  = tools/mwccarm/$(MWCCVERSION)/mwldarm.exe
 MWASMARM = tools/mwccarm/$(MWCCVERSION)/mwasmarm.exe
 NARCCOMP = tools/narccomp/narccomp$(EXE)
@@ -316,15 +317,11 @@ DUMMY != mkdir -p $(ALL_DIRS)
 %.png: ;
 %.pal: ;
 
-##################### Filesystem #####################
-
-%.narc: members = $(wildcard $(@D)/$*/*.bin)
-%.narc: $$(members)
-	$(NARCCOMP) -o $@ -p 255 $^
+%.narc:
+	$(KNARC) -d $(basename $@)/ -p $@
 
-%.arc: members = $(wildcard $(@D)/$*/*.bin)
-%.arc: $$(members)
-	$(NARCCOMP) -o $@ -p 255 $^
+%.arc:
+	$(KNARC) -d $(basename $@)/ -p $@
 
 files/poketool/personal/pms.narc: ;
 
diff --git a/tools/knarc/.gitignore b/tools/knarc/.gitignore
new file mode 100644
index 00000000..20bde9af
--- /dev/null
+++ b/tools/knarc/.gitignore
@@ -0,0 +1 @@
+knarc
diff --git a/tools/knarc/Makefile b/tools/knarc/Makefile
new file mode 100644
index 00000000..336fad3f
--- /dev/null
+++ b/tools/knarc/Makefile
@@ -0,0 +1,17 @@
+CXX ?= g++-9
+
+CXXFLAGS := -std=c++17 -O2 -Wall -Wno-switch -lstdc++fs
+
+SRCS := Source.cpp Narc.cpp
+HEADERS := Narc.h
+
+.PHONY: all clean
+
+all: knarc
+	@:
+
+knarc: $(SRCS) $(HEADERS)
+	$(CXX) $(SRCS) -o $@ $(LDFLAGS) $(CXXFLAGS)
+
+clean:
+	$(RM) knarc knarc.exe
diff --git a/tools/knarc/Narc.cpp b/tools/knarc/Narc.cpp
new file mode 100644
index 00000000..506e050f
--- /dev/null
+++ b/tools/knarc/Narc.cpp
@@ -0,0 +1,543 @@
+#include "Narc.h"
+
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <fstream>
+#include <iomanip>
+#include <ios>
+#include <map>
+#include <memory>
+#include <regex>
+#include <sstream>
+#include <stack>
+#include <string>
+#include <vector>
+
+#if __GNUC__ <= 7
+#include <experimental/filesystem>
+namespace fs = std::experimental::filesystem;
+#else
+#include <filesystem>
+namespace fs = std::filesystem;
+#endif
+
+using namespace std;
+
+void Narc::AlignDword(ofstream& ofs, uint8_t paddingChar)
+{
+	if ((ofs.tellp() % 4) != 0)
+	{
+		for (int i = 4 - (ofs.tellp() % 4); i-- > 0; )
+		{
+			ofs.write(reinterpret_cast<char*>(&paddingChar), sizeof(uint8_t));
+		}
+	}
+}
+
+bool Narc::Cleanup(ifstream& ifs, const NarcError& e)
+{
+	ifs.close();
+
+	error = e;
+
+	return false;
+}
+
+bool Narc::Cleanup(ofstream& ofs, const NarcError& e)
+{
+	ofs.close();
+
+	error = e;
+
+	return false;
+}
+
+vector<fs::directory_entry> Narc::OrderedDirectoryIterator(const fs::path& path, bool recursive) const
+{
+	vector<fs::directory_entry> v;
+
+	for (const auto& de : fs::directory_iterator(path))
+	{
+		v.push_back(de);
+	}
+
+	sort(v.begin(), v.end(), [](const fs::directory_entry& a, const fs::directory_entry& b)
+		{
+			// I fucking hate C++
+			string aStr = a.path().filename().string();
+			string bStr = b.path().filename().string();
+
+			for (size_t i = 0; i < aStr.size(); ++i)
+			{
+				aStr[i] = tolower(aStr[i]);
+			}
+
+			for (size_t i = 0; i < bStr.size(); ++i)
+			{
+				bStr[i] = tolower(bStr[i]);
+			}
+
+			return aStr < bStr;
+		});
+
+	if (recursive)
+	{
+		size_t vSize = v.size();
+
+		for (size_t i = 0; i < vSize; ++i)
+		{
+			if (is_directory(v[i]))
+			{
+				vector<fs::directory_entry> temp = OrderedDirectoryIterator(v[i], true);
+
+				v.insert(v.end(), temp.begin(), temp.end());
+			}
+		}
+	}
+
+	return v;
+}
+
+NarcError Narc::GetError() const
+{
+	return error;
+}
+
+bool Narc::Pack(const fs::path& fileName, const fs::path& directory)
+{
+	ofstream ofs(fileName, ios::binary);
+
+	if (!ofs.good()) { return Cleanup(ofs, NarcError::InvalidOutputFile); }
+
+	vector<FileAllocationTableEntry> fatEntries;
+	uint16_t directoryCounter = 1;
+
+	for (const auto& de : OrderedDirectoryIterator(directory, true))
+	{
+		if (is_directory(de))
+		{
+			++directoryCounter;
+		}
+		else
+		{
+			fatEntries.push_back(FileAllocationTableEntry
+				{
+					.Start = 0x0,
+					.End = 0x0
+				});
+
+			if (fatEntries.size() > 1)
+			{
+				fatEntries.back().Start = fatEntries.rbegin()[1].End;
+
+				if ((fatEntries.rbegin()[1].End % 4) != 0)
+				{
+					fatEntries.back().Start += 4 - (fatEntries.rbegin()[1].End % 4);
+				}
+			}
+
+			fatEntries.back().End = fatEntries.back().Start + static_cast<uint32_t>(file_size(de));
+		}
+	}
+
+	FileAllocationTable fat
+	{
+		.Id = 0x46415442,
+		.ChunkSize = sizeof(FileAllocationTable) + ((uint32_t)fatEntries.size() * sizeof(FileAllocationTableEntry)),
+		.FileCount = static_cast<uint16_t>(fatEntries.size()),
+		.Reserved = 0x0
+	};
+
+	map<fs::path, string> subTables;
+	vector<fs::path> paths;
+
+	directoryCounter = 0;
+
+	for (const auto& de : OrderedDirectoryIterator(directory, true))
+	{
+		if (!subTables.count(de.path().parent_path()))
+		{
+			subTables.insert({ de.path().parent_path(), "" });
+			paths.push_back(de.path().parent_path());
+		}
+
+		if (is_directory(de))
+		{
+			++directoryCounter;
+
+			subTables[de.path().parent_path()] += static_cast<uint8_t>(0x80 + de.path().filename().string().size());
+			subTables[de.path().parent_path()] += de.path().filename().string();
+			subTables[de.path().parent_path()] += (0xF000 + directoryCounter) & 0xFF;
+			subTables[de.path().parent_path()] += (0xF000 + directoryCounter) >> 8;
+		}
+		else
+		{
+			subTables[de.path().parent_path()] += static_cast<uint8_t>(de.path().filename().string().size());
+			subTables[de.path().parent_path()] += de.path().filename().string();
+		}
+	}
+
+	for (auto& subTable : subTables)
+	{
+		subTable.second += '\0';
+	}
+
+	vector<FileNameTableEntry> fntEntries;
+
+	if (!regex_match(fs::directory_iterator(directory)->path().string(), regex(".*_\\d{4,8}\\.bin")))
+	{
+		fntEntries.push_back(
+			{
+				.Offset = (directoryCounter + 1) * sizeof(FileNameTableEntry),
+				.FirstFileId = 0x0,
+				.Utility = static_cast<uint16_t>(directoryCounter + 1)
+			});
+
+		for (uint16_t i = 0; i < directoryCounter; ++i)
+		{
+			fntEntries.push_back(
+				{
+					.Offset = fntEntries.back().Offset + subTables[paths[i]].size(),
+					.FirstFileId = fntEntries.back().FirstFileId,
+					.Utility = 0x0
+				});
+
+			for (size_t j = 0; j < (subTables[paths[i]].size() - 1); ++j)
+			{
+				if (static_cast<uint8_t>(subTables[paths[i]][j]) <= 0x7F)
+				{
+					j += static_cast<uint8_t>(subTables[paths[i]][j]);
+					++fntEntries.back().FirstFileId;
+				}
+				else if (static_cast<uint8_t>(subTables[paths[i]][j]) <= 0xFF)
+				{
+					j += static_cast<uint8_t>(subTables[paths[i]][j]) - 0x80 + 0x2;
+				}
+			}
+
+			fntEntries.back().Utility = 0xF000 + (find(paths.begin(), paths.end(), paths[i + 1].parent_path()) - paths.begin());
+		}
+	}
+	else
+	{
+		fntEntries.push_back(
+			{
+				.Offset = 0x4,
+				.FirstFileId = 0x0,
+				.Utility = 0x1
+			});
+	}
+
+	FileNameTable fnt
+	{
+		.Id = 0x464E5442,
+		.ChunkSize = sizeof(FileNameTable) + (fntEntries.size() * sizeof(FileNameTableEntry))
+	};
+
+	if (!regex_match(fs::directory_iterator(directory)->path().string(), regex(".*_\\d{4,8}\\.bin")))
+	{
+		for (const auto& subTable : subTables)
+		{
+			fnt.ChunkSize += subTable.second.size();
+		}
+	}
+
+	if ((fnt.ChunkSize % 4) != 0)
+	{
+		fnt.ChunkSize += 4 - (fnt.ChunkSize % 4);
+	}
+
+	FileImages fi
+	{
+		.Id = 0x46494D47,
+		.ChunkSize = sizeof(FileImages) + fatEntries.back().End
+	};
+
+	if ((fi.ChunkSize % 4) != 0)
+	{
+		fi.ChunkSize += 4 - (fi.ChunkSize % 4);
+	}
+
+	Header header
+	{
+		.Id = 0x4352414E,
+		.ByteOrderMark = 0xFFFE,
+		.Version = 0x100,
+		.FileSize = sizeof(Header) + fat.ChunkSize + fnt.ChunkSize + fi.ChunkSize,
+		.ChunkSize = sizeof(Header),
+		.ChunkCount = 0x3
+	};
+
+	ofs.write(reinterpret_cast<char*>(&header), sizeof(Header));
+	ofs.write(reinterpret_cast<char*>(&fat), sizeof(FileAllocationTable));
+
+	for (auto& entry : fatEntries)
+	{
+		ofs.write(reinterpret_cast<char*>(&entry), sizeof(FileAllocationTableEntry));
+	}
+
+	ofs.write(reinterpret_cast<char*>(&fnt), sizeof(FileNameTable));
+
+	for (auto& entry : fntEntries)
+	{
+		ofs.write(reinterpret_cast<char*>(&entry), sizeof(FileNameTableEntry));
+	}
+
+	if (!regex_match(fs::directory_iterator(directory)->path().string(), regex(".*_\\d{4,8}\\.bin")))
+	{
+		for (const auto& path : paths)
+		{
+			ofs << subTables[path];
+		}
+	}
+
+	AlignDword(ofs, 0xFF);
+
+	ofs.write(reinterpret_cast<char*>(&fi), sizeof(FileImages));
+
+	for (const auto& de : OrderedDirectoryIterator(directory, true))
+	{
+		if (is_directory(de))
+		{
+			continue;
+		}
+
+		ifstream ifs(de.path(), ios::binary | ios::ate);
+
+		if (!ifs.good())
+		{
+			ifs.close();
+
+			return Cleanup(ofs, NarcError::InvalidInputFile);
+		}
+
+		streampos length = ifs.tellg();
+		unique_ptr<char[]> buffer = make_unique<char[]>(static_cast<unsigned int>(length));
+
+		ifs.seekg(0);
+		ifs.read(buffer.get(), length);
+		ifs.close();
+
+		ofs.write(buffer.get(), length);
+
+		AlignDword(ofs, 0xFF);
+	}
+
+	ofs.close();
+
+	return error == NarcError::None ? true : false;
+}
+
+bool Narc::Unpack(const fs::path& fileName, const fs::path& directory)
+{
+	ifstream ifs(fileName, ios::binary);
+
+	if (!ifs.good()) { return Cleanup(ifs, NarcError::InvalidInputFile); }
+
+	Header header;
+	ifs.read(reinterpret_cast<char*>(&header), sizeof(Header));
+
+	if (header.Id != 0x4352414E) { return Cleanup(ifs, NarcError::InvalidHeaderId); }
+	if (header.ByteOrderMark != 0xFFFE) { return Cleanup(ifs, NarcError::InvalidByteOrderMark); }
+	if ((header.Version != 0x0100) && (header.Version != 0x0000)) { return Cleanup(ifs, NarcError::InvalidVersion); }
+	if (header.ChunkSize != 0x10) { return Cleanup(ifs, NarcError::InvalidHeaderSize); }
+	if (header.ChunkCount != 0x3) { return Cleanup(ifs, NarcError::InvalidChunkCount); }
+
+	FileAllocationTable fat;
+	ifs.read(reinterpret_cast<char*>(&fat), sizeof(FileAllocationTable));
+
+	if (fat.Id != 0x46415442) { return Cleanup(ifs, NarcError::InvalidFileAllocationTableId); }
+	if (fat.Reserved != 0x0) { return Cleanup(ifs, NarcError::InvalidFileAllocationTableReserved); }
+
+	unique_ptr<FileAllocationTableEntry[]> fatEntries = make_unique<FileAllocationTableEntry[]>(fat.FileCount);
+
+	for (uint16_t i = 0; i < fat.FileCount; ++i)
+	{
+		ifs.read(reinterpret_cast<char*>(&fatEntries.get()[i]), sizeof(FileAllocationTableEntry));
+	}
+
+	FileNameTable fnt;
+	vector<FileNameTableEntry> FileNameTableEntries;
+	ifs.read(reinterpret_cast<char*>(&fnt), sizeof(FileNameTable));
+
+	if (fnt.Id != 0x464E5442) { return Cleanup(ifs, NarcError::InvalidFileNameTableId); }
+
+	vector<FileNameTableEntry> fntEntries;
+
+	do
+	{
+		fntEntries.push_back(FileNameTableEntry());
+
+		ifs.read(reinterpret_cast<char*>(&fntEntries.back().Offset), sizeof(uint32_t));
+		ifs.read(reinterpret_cast<char*>(&fntEntries.back().FirstFileId), sizeof(uint16_t));
+		ifs.read(reinterpret_cast<char*>(&fntEntries.back().Utility), sizeof(uint16_t));
+	} while (static_cast<uint32_t>(ifs.tellg()) < (header.ChunkSize + fat.ChunkSize + sizeof(FileNameTable) + fntEntries[0].Offset));
+
+	unique_ptr<string[]> fileNames = make_unique<string[]>(0xFFFF);
+
+	for (size_t i = 0; i < fntEntries.size(); ++i)
+	{
+		ifs.seekg(static_cast<uint64_t>(header.ChunkSize) + fat.ChunkSize + sizeof(FileNameTable) + fntEntries[i].Offset);
+
+		uint16_t fileId = 0x0000;
+
+		for (uint8_t length = 0x80; length != 0x00; ifs.read(reinterpret_cast<char*>(&length), sizeof(uint8_t)))
+		{
+			if (length <= 0x7F)
+			{
+				for (uint8_t j = 0; j < length; ++j)
+				{
+					uint8_t c;
+					ifs.read(reinterpret_cast<char*>(&c), sizeof(uint8_t));
+
+					fileNames.get()[fntEntries[i].FirstFileId + fileId] += c;
+				}
+
+				++fileId;
+			}
+			else if (length == 0x80)
+			{
+				// Reserved
+			}
+			else if (length <= 0xFF)
+			{
+				length -= 0x80;
+				string directoryName;
+
+				for (uint8_t j = 0; j < length; ++j)
+				{
+					uint8_t c;
+					ifs.read(reinterpret_cast<char*>(&c), sizeof(uint8_t));
+
+					directoryName += c;
+				}
+
+				uint16_t directoryId;
+				ifs.read(reinterpret_cast<char*>(&directoryId), sizeof(uint16_t));
+
+				fileNames.get()[directoryId] = directoryName;
+			}
+			else
+			{
+				return Cleanup(ifs, NarcError::InvalidFileNameTableEntryId);
+			}
+		}
+	}
+
+	if ((ifs.tellg() % 4) != 0)
+	{
+		ifs.seekg(4 - (ifs.tellg() % 4), ios::cur);
+	}
+
+	FileImages fi;
+	ifs.read(reinterpret_cast<char*>(&fi), sizeof(FileImages));
+
+	if (fi.Id != 0x46494D47) { return Cleanup(ifs, NarcError::InvalidFileImagesId); }
+
+	fs::create_directory(directory);
+	fs::current_path(directory);
+
+	if (fnt.ChunkSize == 0x10)
+	{
+		for (uint16_t i = 0; i < fat.FileCount; ++i)
+		{
+			ifs.seekg(static_cast<uint64_t>(header.ChunkSize) + fat.ChunkSize + fnt.ChunkSize + 8 + fatEntries.get()[i].Start);
+
+			unique_ptr<char[]> buffer = make_unique<char[]>(fatEntries.get()[i].End - fatEntries.get()[i].Start);
+			ifs.read(buffer.get(), fatEntries.get()[i].End - fatEntries.get()[i].Start);
+
+			ostringstream oss;
+			oss << fileName.stem().string() << "_" << setfill('0') << setw(8) << i << ".bin";
+
+			ofstream ofs(oss.str(), ios::binary);
+
+			if (!ofs.good())
+			{
+				ofs.close();
+
+				return Cleanup(ifs, NarcError::InvalidOutputFile);
+			}
+
+			ofs.write(buffer.get(), fatEntries.get()[i].End - fatEntries.get()[i].Start);
+			ofs.close();
+		}
+	}
+	else
+	{
+		fs::path absolutePath = fs::absolute(fs::current_path());
+
+		for (size_t i = 0; i < fntEntries.size(); ++i)
+		{
+			fs::current_path(absolutePath);
+			stack<string> directories;
+
+			for (uint16_t j = fntEntries[i].Utility; j > 0xF000; j = fntEntries[j - 0xF000].Utility)
+			{
+				directories.push(fileNames.get()[j]);
+			}
+
+			for (; !directories.empty(); directories.pop())
+			{
+				fs::create_directory(directories.top());
+				fs::current_path(directories.top());
+			}
+
+			if (fntEntries[i].Utility >= 0xF000)
+			{
+				fs::create_directory(fileNames.get()[0xF000 + i]);
+				fs::current_path(fileNames.get()[0xF000 + i]);
+			}
+
+			ifs.seekg(static_cast<uint64_t>(header.ChunkSize) + fat.ChunkSize + sizeof(FileNameTable) + fntEntries[i].Offset);
+
+			uint16_t fileId = 0x0000;
+
+			for (uint8_t length = 0x80; length != 0x00; ifs.read(reinterpret_cast<char*>(&length), sizeof(uint8_t)))
+			{
+				if (length <= 0x7F)
+				{
+					streampos savedPosition = ifs.tellg();
+
+					ifs.seekg(static_cast<uint64_t>(header.ChunkSize) + fat.ChunkSize + fnt.ChunkSize + 8 + fatEntries.get()[fntEntries[i].FirstFileId + fileId].Start);
+
+					unique_ptr<char[]> buffer = make_unique<char[]>(fatEntries.get()[fntEntries[i].FirstFileId + fileId].End - fatEntries.get()[fntEntries[i].FirstFileId + fileId].Start);
+					ifs.read(buffer.get(), fatEntries.get()[fntEntries[i].FirstFileId + fileId].End - fatEntries.get()[fntEntries[i].FirstFileId + fileId].Start);
+
+					ofstream ofs(fileNames.get()[fntEntries[i].FirstFileId + fileId], ios::binary);
+
+					if (!ofs.good())
+					{
+						ofs.close();
+
+						return Cleanup(ifs, NarcError::InvalidOutputFile);
+					}
+
+					ofs.write(buffer.get(), fatEntries.get()[fntEntries[i].FirstFileId + fileId].End - fatEntries.get()[fntEntries[i].FirstFileId + fileId].Start);
+					ofs.close();
+
+					ifs.seekg(savedPosition);
+					ifs.seekg(length, ios::cur);
+
+					++fileId;
+				}
+				else if (length == 0x80)
+				{
+					// Reserved
+				}
+				else if (length <= 0xFF)
+				{
+					ifs.seekg(static_cast<uint64_t>(length) - 0x80 + 0x2, ios::cur);
+				}
+				else
+				{
+					return Cleanup(ifs, NarcError::InvalidFileNameTableEntryId);
+				}
+			}
+		}
+	}
+
+	ifs.close();
+
+	return error == NarcError::None ? true : false;
+}
diff --git a/tools/knarc/Narc.h b/tools/knarc/Narc.h
new file mode 100644
index 00000000..4516d2d5
--- /dev/null
+++ b/tools/knarc/Narc.h
@@ -0,0 +1,93 @@
+#pragma once
+
+#include <cstdint>
+#include <fstream>
+#include <string>
+#include <vector>
+
+#if __GNUC__ <= 7
+#include <experimental/filesystem>
+namespace fs = std::experimental::filesystem;
+#else
+#include <filesystem>
+namespace fs = std::filesystem;
+#endif
+
+enum class NarcError
+{
+	None,
+	InvalidInputFile,
+	InvalidHeaderId,
+	InvalidByteOrderMark,
+	InvalidVersion,
+	InvalidHeaderSize,
+	InvalidChunkCount,
+	InvalidFileAllocationTableId,
+	InvalidFileAllocationTableReserved,
+	InvalidFileNameTableId,
+	InvalidFileNameTableEntryId,
+	InvalidFileImagesId,
+	InvalidOutputFile
+};
+
+struct Header
+{
+	uint32_t Id;
+	uint16_t ByteOrderMark;
+	uint16_t Version;
+	uint32_t FileSize;
+	uint16_t ChunkSize;
+	uint16_t ChunkCount;
+};
+
+struct FileAllocationTable
+{
+	uint32_t Id;
+	uint32_t ChunkSize;
+	uint16_t FileCount;
+	uint16_t Reserved;
+};
+
+struct FileAllocationTableEntry
+{
+	uint32_t Start;
+	uint32_t End;
+};
+
+struct FileNameTable
+{
+	uint32_t Id;
+	uint32_t ChunkSize;
+};
+
+struct FileNameTableEntry
+{
+	uint32_t Offset;
+	uint16_t FirstFileId;
+	uint16_t Utility;
+};
+
+struct FileImages
+{
+	uint32_t Id;
+	uint32_t ChunkSize;
+};
+
+class Narc
+{
+	public:
+		NarcError GetError() const;
+
+		bool Pack(const fs::path& fileName, const fs::path& directory);
+		bool Unpack(const fs::path& fileName, const fs::path& directory);
+
+	private:
+		NarcError error = NarcError::None;
+
+		void AlignDword(std::ofstream& ofs, uint8_t paddingChar);
+
+		bool Cleanup(std::ifstream& ifs, const NarcError& e);
+		bool Cleanup(std::ofstream& ofs, const NarcError& e);
+
+		std::vector<fs::directory_entry> OrderedDirectoryIterator(const fs::path& path, bool recursive) const;
+};
diff --git a/tools/knarc/Source.cpp b/tools/knarc/Source.cpp
new file mode 100644
index 00000000..51bb5320
--- /dev/null
+++ b/tools/knarc/Source.cpp
@@ -0,0 +1,108 @@
+#include <cstring>
+#include <iostream>
+#include <string>
+
+#include "Narc.h"
+
+using namespace std;
+
+void PrintError(NarcError error)
+{
+	switch (error)
+	{
+		case NarcError::None:								cout << "ERROR: No error???" << endl;										break;
+		case NarcError::InvalidInputFile:					cout << "ERROR: Invalid input file" << endl;								break;
+		case NarcError::InvalidHeaderId:					cout << "ERROR: Invalid header ID" << endl;									break;
+		case NarcError::InvalidByteOrderMark:				cout << "ERROR: Invalid byte order mark" << endl;							break;
+		case NarcError::InvalidVersion:						cout << "ERROR: Invalid NARC version" << endl;								break;
+		case NarcError::InvalidHeaderSize:					cout << "ERROR: Invalid header size" << endl;								break;
+		case NarcError::InvalidChunkCount:					cout << "ERROR: Invalid chunk count" << endl;								break;
+		case NarcError::InvalidFileAllocationTableId:		cout << "ERROR: Invalid file allocation table ID" << endl;					break;
+		case NarcError::InvalidFileAllocationTableReserved:	cout << "ERROR: Invalid file allocation table reserved section" << endl;	break;
+		case NarcError::InvalidFileNameTableId:				cout << "ERROR: Invalid file name table ID" << endl;						break;
+		case NarcError::InvalidFileNameTableEntryId:		cout << "ERROR: Invalid file name table entry ID" << endl;					break;
+		case NarcError::InvalidFileImagesId:				cout << "ERROR: Invalid file images ID" << endl;							break;
+		case NarcError::InvalidOutputFile:					cout << "ERROR: Invalid output file" << endl;								break;
+		default:											cout << "ERROR: Unknown error???" << endl;									break;
+	}
+}
+
+int main(int argc, char* argv[])
+{
+	if (argc != 5)
+	{
+		cout << "OVERVIEW: Knarc" << endl << endl;
+		cout << "USAGE: knarc [options] <inputs>" << endl << endl;
+		cout << "OPTIONS:" << endl;
+		cout << "\t-d\tDirectory to pack from/unpack to" << endl;
+		cout << "\t-p\tPack" << endl;
+		cout << "\t-u\tUnpack" << endl;
+
+		return 1;
+	}
+
+	string directory = "";
+	string fileName = "";
+	bool pack = false;
+
+	for (int i = 1; i < argc; ++i)
+	{
+		if (!strcmp(argv[i], "-d"))
+		{
+			if (i == (argc - 1))
+			{
+				cerr << "ERROR: No directory specified" << endl;
+
+				return 1;
+			}
+
+			directory = argv[++i];
+		}
+		else if (!strcmp(argv[i], "-p"))
+		{
+			if (i == (argc - 1))
+			{
+				cerr << "ERROR: No NARC specified to pack to" << endl;
+
+				return 1;
+			}
+
+			fileName = argv[++i];
+			pack = true;
+		}
+		else if (!strcmp(argv[i], "-u"))
+		{
+			if (i == (argc - 1))
+			{
+				cerr << "ERROR: No NARC specified to unpack from" << endl;
+
+				return 1;
+			}
+
+			fileName = argv[++i];
+		}
+	}
+
+	Narc narc;
+
+	if (pack)
+	{
+		if (!narc.Pack(fileName, directory))
+		{
+			PrintError(narc.GetError());
+
+			return 1;
+		}
+	}
+	else
+	{
+		if (!narc.Unpack(fileName, directory))
+		{
+			PrintError(narc.GetError());
+
+			return 1;
+		}
+	}
+
+	return 0;
+}
diff --git a/tools/narccomp/.gitignore b/tools/narccomp/.gitignore
new file mode 100644
index 00000000..e96a03a5
--- /dev/null
+++ b/tools/narccomp/.gitignore
@@ -0,0 +1 @@
+narccomp