Merge branch 'master' into legacy

Override all files with 'master' version.

This version is meant to preserve git history as requested by bjorn.

1 files changed, 8 insertions, 0 deletions

diff --git a/npc/002-2/dedication.txt b/npc/002-2/dedication.txt
new file mode 100644
index 00000000..31978298
--- /dev/null
+++ b/npc/002-2/dedication.txt
@@ -0,0 +1,8 @@
+
+002-2,116,123,0	script	#IreneDedication	NPC400,{
+    mes "~ Irene Christina ~";
+    mes "The song in this house is dedicated to Irene.";
+    next;
+    mes "She had seen only twenty hours of this world when she died in her father's arms.";
+    close;
+}