From 0d06193b29604e3c91c5beb05ceda7a0fa8b2458 Mon Sep 17 00:00:00 2001
From: brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 1 Aug 2012 05:29:32 +0000
Subject: [PATCH] - Follow up to r16545: fixed unreadable character at the
 beginning of jawaii.txt and fixed duplicate npc names.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16549 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/cities/jawaii.txt                | 4 ++--
 npc/re/cities/jawaii.txt             | 2 +-
 npc/re/jobs/3-1/rune_knight.txt      | 2 +-
 npc/re/quests/quests_lighthalzen.txt | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index aa467b02ff..2d18d6298a 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -1,4 +1,4 @@
-//===== rAthena Script =======================================
+//===== rAthena Script =======================================
 //= Jawaii (The Lovers' Paradise) Town script
 //===== By: ==================================================
 //= jAthena (1.0)
@@ -20,7 +20,7 @@
 //= 1.5 Fixed Script, and spelling errors, some thanks to Sparkles [DNett123]
 //= 1.6 Final corrections (not complete), thanks to the public, and DNett123!
 //= 1.6c added missing monsters. Still 1 type is missing [Lupus]
-//= 1.7 Fixed a lot of typo�s [Nexon]
+//= 1.7 Fixed a lot of typos [Nexon]
 //= 1.8 Removed monster spawns, added aegis ep 8.5 spawns to npc/mobs/fields/jawaii.txt [MasterOfMuppets]
 //= 2.0 Updated the npcs according to iRO [MasterOfMuppets]
 //= 2.01 fixed missing @ at randomdrink, thanks to theultramage [Lupus]
diff --git a/npc/re/cities/jawaii.txt b/npc/re/cities/jawaii.txt
index 02687149bb..04744d1ee0 100644
--- a/npc/re/cities/jawaii.txt
+++ b/npc/re/cities/jawaii.txt
@@ -1,4 +1,4 @@
-//===== rAthena Script =======================================
+//===== rAthena Script =======================================
 //= Jawaii Town Renewal
 //===== By: ==================================================
 //= Daegaladh, Masao
diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt
index e30ffd2abd..d42deb9e90 100644
--- a/npc/re/jobs/3-1/rune_knight.txt
+++ b/npc/re/jobs/3-1/rune_knight.txt
@@ -3728,7 +3728,7 @@ OnMyMobDead:
 	end;
 }
 
-job3_rune01,92,62,3	script	Kafra Employee	114,{
+job3_rune01,92,62,3	script	Kafra Employee#job3	114,{
 	cutin "kafra_04",2;
 	mes "[Kafra Employee]";
 	mes "Hello. Kafra Service are always with you.";
diff --git a/npc/re/quests/quests_lighthalzen.txt b/npc/re/quests/quests_lighthalzen.txt
index 5523e5dd01..09d92bef4b 100644
--- a/npc/re/quests/quests_lighthalzen.txt
+++ b/npc/re/quests/quests_lighthalzen.txt
@@ -12,4 +12,4 @@
 //= 1.0 Updated to match the new Izlude Map. [Masao]
 //============================================================ 
 
-izlude,171,73,6	duplicate(Scamp)	Scamp	853
+izlude,171,73,6	duplicate(Scamp)	Scamp#2	853