Merge remote-tracking branch 'upstream/master'

Signed-off-by: shennetsind <ind@henn.et>

Conflicts:
	sql-files/main.sql
	sql-files/upgrades/index.txt
	src/common/mmo.h

11 files changed, 298 insertions, 298 deletions

diff --git a/npc/re/cities/alberta.txt b/npc/re/cities/alberta.txt
index d25b59b4a..4fb8bab6d 100644
--- a/npc/re/cities/alberta.txt
+++ b/npc/re/cities/alberta.txt
@@ -13,29 +13,29 @@
 
 // cities/amatsu.txt
 //============================================================
-alberta,246,74,3	duplicate(Sea_Captain_amatsu)	Sea Captain#ama1	709
+alberta,246,74,3	duplicate(Sea_Captain_amatsu)	Sea Captain#ama1	4_M_SEAMAN
 
 // cities/ayothaya.txt
 //============================================================
-alberta,246,29,3	duplicate(Aibakthing_ayothaya)	Aibakthing#ayo	843
+alberta,246,29,3	duplicate(Aibakthing_ayothaya)	Aibakthing#ayo	4_M_THAIONGBAK
 
 // cities/gonryun.txt
 //============================================================
-alberta,246,62,3	duplicate(Kunlun_Envoy_gonryun)	Kunlun Envoy#gon	776
+alberta,246,62,3	duplicate(Kunlun_Envoy_gonryun)	Kunlun Envoy#gon	4_M_TWMIDMAN
 
 // cities/louyang.txt
 //============================================================
-alberta,246,40,3	duplicate(Girl_louyang)	Girl#0lou	815
+alberta,246,40,3	duplicate(Girl_louyang)	Girl#0lou	4_F_CHNDRESS1
 
 // cities/moscovia.txt
 //============================================================
-alberta,246,51,4	duplicate(PR_Officer_moscovia)	Moscovia P.R. Officer#1	960
+alberta,246,51,4	duplicate(PR_Officer_moscovia)	Moscovia P.R. Officer#1	4_F_RUSWOMAN2
 
 // quests/quests_alberta.txt
 //============================================================
-alberta,244,118,4	duplicate(Sailor_alberta)	Sailor#tur	709
-alberta,246,114,4	duplicate(Turtle_Scholar_alberta)	Turtle Island Scholar	121
+alberta,244,118,4	duplicate(Sailor_alberta)	Sailor#tur	4_M_SEAMAN
+alberta,246,114,4	duplicate(Turtle_Scholar_alberta)	Turtle Island Scholar	2_M_MOLGENSTEIN
 
 // quests/skills/merchant_skills.txt
 //============================================================
-alberta,232,103,6	duplicate(Gershaun_alberta)	Gershaun	57
+alberta,232,103,6	duplicate(Gershaun_alberta)	Gershaun	1_M_LIBRARYMASTER
diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt
index 7be84507c..fe9f768c4 100644
--- a/npc/re/cities/brasilis.txt
+++ b/npc/re/cities/brasilis.txt
@@ -17,7 +17,7 @@
 // Brasilis Transportation
 //============================================================
 /* Pre-Renewal coordinates: alberta,247,115,3 */
-alberta,246,82,3	script	Crewman#bra2	100,{
+alberta,246,82,3	script	Crewman#bra2	4W_SAILOR,{
 	mes "[Crewman]";
 	mes "Hey, have you heard of a place called Brasilis?";
 	mes "It's a tropical city that's hot like the desert but also rainy. It is a very mysterious place.";
@@ -48,7 +48,7 @@ alberta,246,82,3	script	Crewman#bra2	100,{
 	}
 }
 
-brasilis,316,57,3	script	Crewman#bra1	100,{
+brasilis,316,57,3	script	Crewman#bra1	4W_SAILOR,{
 	mes "[Crewman]";
 	mes "My ship is going to back to Alberta, do you want to join us?";
 	next;
@@ -71,36 +71,36 @@ brasilis,316,57,3	script	Crewman#bra1	100,{
 
 // Generic Brasilis NPCs
 //============================================================
-brasilis,155,165,3	script	Signpost#bra1	858,{
+brasilis,155,165,3	script	Signpost#bra1	4_BULLETIN_BOARD2,{
 	mes ":: Art Museum ::";
 	close;
 }
 
-brasilis,195,231,3	script	Signpost#bra2	858,{
+brasilis,195,231,3	script	Signpost#bra2	4_BULLETIN_BOARD2,{
 	mes ":: Verass Monument ::";
 	close;
 }
 
-brasilis,240,247,3	script	Signpost#bra3	858,{
+brasilis,240,247,3	script	Signpost#bra3	4_BULLETIN_BOARD2,{
 	mes ":: Market ::";
 	mes " ";
 	mes "- For your Potions and Weaponry -";
 	close;
 }
 
-brasilis,303,309,3	script	Signpost#bra4	858,{
+brasilis,303,309,3	script	Signpost#bra4	4_BULLETIN_BOARD2,{
 	mes ":: Jungle Cable ::";
 	mes "";
 	mes "- Not for the faint of heart -";
 	close;
 }
 
-brasilis,278,137,3	script	Signpost#bra5	858,{
+brasilis,278,137,3	script	Signpost#bra5	4_BULLETIN_BOARD2,{
 	mes ":: Brasilis Hotel ::";
 	close;
 }
 
-brasilis,137,77,5	script	Ice-Cream Maker	85,{
+brasilis,137,77,5	script	Ice-Cream Maker	4_M_03,{
 	mes "[Ice Cream Maker]";
 	mes "Come~come~";
 	mes "Ice cream is the perfect snack for a hot day~";
diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt
index 37979d6d9..a0fa10275 100644
--- a/npc/re/cities/dewata.txt
+++ b/npc/re/cities/dewata.txt
@@ -16,7 +16,7 @@
 
 // Dewata Transportation
 //============================================================
-alberta,212,202,4	script	Dewata Sailor#alberta	536,{
+alberta,212,202,4	script	Dewata Sailor#alberta	4_M_DEWMAN,{
 	mes "[Dewata Sailor]";
 	mes "Do you want to visit ^8B4513Dewata Island^000000?";
 	mes "With it's dazzling waves and charming views it's a great place to relax.";
@@ -46,7 +46,7 @@ alberta,212,202,4	script	Dewata Sailor#alberta	536,{
 	}
 }
 
-dewata,229,49,6	script	Alberta Sailor#dewata	536,{
+dewata,229,49,6	script	Alberta Sailor#dewata	4_M_DEWMAN,{
 	mes "[Alberta Sailor]";
 	mes "Do you want to go back to Alberta?";
 	next;
@@ -69,7 +69,7 @@ dewata,229,49,6	script	Alberta Sailor#dewata	536,{
 
 // Generic Dewata NPCs
 //============================================================
-dewata,221,237,5	script	Young Man#dew-1	536,{
+dewata,221,237,5	script	Young Man#dew-1	4_M_DEWMAN,{
 	mes "[Fruit Fancier]";
 	mes "What's wrong with your faaaaaace? You must really be clueless!";
 	next;
@@ -165,7 +165,7 @@ dewata,221,237,5	script	Young Man#dew-1	536,{
 	}
 }
 
-dewata,114,243,6	script	Lazy Young Man#dew	536,1,1,{
+dewata,114,243,6	script	Lazy Young Man#dew	4_M_DEWMAN,1,1,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 500) {
 		mes "[Lazy Young Man]";
 		mes "Why are you carrying so much? Isn't it heavy?";
@@ -211,7 +211,7 @@ OnTouch:
 	end;
 }
 
-dewata,159,81,4	script	Tourist#dew-1	881,{
+dewata,159,81,4	script	Tourist#dew-1	4_M_SITDOWN,{
 	mes "[Nasolo]";
 	mes "Wow~ Pure ocean, a warm beach...";
 	mes "Perfect for a date with a girlfriend...";
@@ -226,7 +226,7 @@ dewata,159,81,4	script	Tourist#dew-1	881,{
 	close;
 }
 
-dewata,146,109,5	script	Restauranteur#dew	886,{
+dewata,146,109,5	script	Restauranteur#dew	4_COOK,{
 	if (checkweight(11532,1) == 0 || checkweight(11533,1) == 0 || MaxWeight - Weight < 500) {
 		mes "[Restauranteur]";
 		mes "You came to taste my dish? It is always good to eat with an empty stomach.";
@@ -311,7 +311,7 @@ dewata,146,109,5	script	Restauranteur#dew	886,{
 	}
 }
 
-dewata,147,107,6	script	Gourmet#dew	85,{
+dewata,147,107,6	script	Gourmet#dew	4_M_03,{
 	mes "[Gourmet]";
 	mes "Oh... it's like a party in my";
 	mes "mouth... and everyone's invited!";
@@ -327,7 +327,7 @@ dewata,147,107,6	script	Gourmet#dew	85,{
 	close;
 }
 
-dewata,154,107,4	script	Sightseer#dew	86,{
+dewata,154,107,4	script	Sightseer#dew	4_M_04,{
 	mes "[Tourist]";
 	mes "Wow...";
 	mes "How many has he already eaten?";
@@ -341,7 +341,7 @@ dewata,154,107,4	script	Sightseer#dew	86,{
 	close;
 }
 
-dewata,95,203,6	script	Travel Guide#dew	536,{
+dewata,95,203,6	script	Travel Guide#dew	4_M_DEWMAN,{
 	mes "[Guide]";
 	mes "This temple behind me is called Borobudur.";
 	mes "Borobudur temple was built in the 9th century";
@@ -366,7 +366,7 @@ dewata,95,203,6	script	Travel Guide#dew	536,{
 	close;
 }
 
-dewata,97,207,4	script	Tourist#dew1	803,{
+dewata,97,207,4	script	Tourist#dew1	1_F_SIGNZISK,{
 	mes "[Tourist]";
 	mes "Oh, dag-nabbit... I've gone and";
 	mes "picked the wrong tour guide...";
@@ -382,7 +382,7 @@ dewata,97,207,4	script	Tourist#dew1	803,{
 	close;
 }
 
-dewata,100,206,4	script	Tourist#dew2	59,{
+dewata,100,206,4	script	Tourist#dew2	1_M_ORIENT01,{
 	mes "[Tourist]";
 	mes "Hey, let's go there! Hurry up,";
 	mes "while the tour guide is explaining~";
@@ -393,7 +393,7 @@ dewata,100,206,4	script	Tourist#dew2	59,{
 	close;
 }
 
-dewata,101,206,4	script	Tourist#dew3	90,{
+dewata,101,206,4	script	Tourist#dew3	4_F_01,{
 	mes "[Tourist]";
 	mes "Aren't we going to get lost without the guide?";
 	next;
@@ -402,7 +402,7 @@ dewata,101,206,4	script	Tourist#dew3	90,{
 	close;
 }
 
-dewata,99,203,4	script	Tourist#dew4	755,{
+dewata,99,203,4	script	Tourist#dew4	4_M_SAGE_C,{
 	mes "[Tourist]";
 	mes "Oh~ This is very interesting. A";
 	mes "temple that worships the Buddha...";
@@ -418,7 +418,7 @@ dewata,99,203,4	script	Tourist#dew4	755,{
 	close;
 }
 
-dewata,67,186,8	script	Monk#dew1	834,{
+dewata,67,186,8	script	Monk#dew1	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "I am a monk, content to spend my days in religious study.";
 	next;
@@ -430,7 +430,7 @@ dewata,67,186,8	script	Monk#dew1	834,{
 	close;
 }
 
-dewata,65,188,8	script	Monk#dew2	834,{
+dewata,65,188,8	script	Monk#dew2	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "Borobudur temple is one of few temples left for worshiping the Great Buddha.";
 	next;
@@ -439,7 +439,7 @@ dewata,65,188,8	script	Monk#dew2	834,{
 	close;
 }
 
-dewata,63,190,8	script	Monk#dew3	834,{
+dewata,63,190,8	script	Monk#dew3	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "Are you a Tourist? You can make an offering and a wish to one of the shrines.";
 	next;
@@ -448,7 +448,7 @@ dewata,63,190,8	script	Monk#dew3	834,{
 	close;
 }
 
-dewata,62,192,8	script	Monk#dew4	834,{
+dewata,62,192,8	script	Monk#dew4	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "Our great Buddha is the king of souls and the leader of all good Gods.";
 	next;
@@ -460,7 +460,7 @@ dewata,62,192,8	script	Monk#dew4	834,{
 	close;
 }
 
-dewata,89,191,6	script	Small Shrine#dew1	844,{
+dewata,89,191,6	script	Small Shrine#dew1	CLEAR_NPC,{
 	mes "There is a small shrine here. There are many people making wishes.";
 	next;
 	switch(select("Make a donation.:Make a wish.:Walk away.")) {
@@ -559,11 +559,11 @@ L_Wish:
 	next;
 	return;
 }
-dewata,89,212,6	duplicate(Small Shrine#dew1)	Small Shrine#dew2	844
-dewata,68,212,6	duplicate(Small Shrine#dew1)	Small Shrine#dew3	844
-dewata,68,191,6	duplicate(Small Shrine#dew1)	Small Shrine#dew4	844
+dewata,89,212,6	duplicate(Small Shrine#dew1)	Small Shrine#dew2	CLEAR_NPC
+dewata,68,212,6	duplicate(Small Shrine#dew1)	Small Shrine#dew3	CLEAR_NPC
+dewata,68,191,6	duplicate(Small Shrine#dew1)	Small Shrine#dew4	CLEAR_NPC
 
-dewata,75,122,6	script	Monk#dewt1	834,{
+dewata,75,122,6	script	Monk#dewt1	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "You are a stranger here. What brings here to this quiet place?";
 	next;
@@ -579,7 +579,7 @@ dewata,75,122,6	script	Monk#dewt1	834,{
 	}
 }
 
-dewata,69,101,6	script	Monk#dewt2	834,{
+dewata,69,101,6	script	Monk#dewt2	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "We have a pagoda for the worship of Buddhas. Each temple has one of these towers, though not many people come here besides other monks.";
 	next;
@@ -614,7 +614,7 @@ dewata,69,101,6	script	Monk#dewt2	834,{
 	}
 }
 
-dewata,71,79,6	script	Monk#dewt3	834,{
+dewata,71,79,6	script	Monk#dewt3	4_M_BUDDHIST,{
 	mes "[Monk]";
 	mes "This tower is built on the edge of coastal cliff. You can pray with a cool ocean breeze in your hair.";
 	next;
@@ -623,7 +623,7 @@ dewata,71,79,6	script	Monk#dewt3	834,{
 	close;
 }
 
-dewata,211,272,4	script	Lodge Owner#dew	534,2,3,{
+dewata,211,272,4	script	Lodge Owner#dew	4_M_DEWOLDMAN,2,3,{
 OnTouch:
 	mes "[Lodge Owner]";
 	mes "These days, we have many honeymooners visiting here.";
@@ -640,7 +640,7 @@ OnTouch:
 	close;
 }
 
-dewata,245,244,4	script	Lodge Employee#dew	536,2,3,{
+dewata,245,244,4	script	Lodge Employee#dew	4_M_DEWMAN,2,3,{
 OnTouch:
 	mes "[Lodge employee]";
 	mes "Argg~ This is really ticking me off!";
@@ -657,7 +657,7 @@ OnTouch:
 	close;
 }
 
-dewata,233,263,8	script	Sweet Married Couple#1	828,2,3,{
+dewata,233,263,8	script	Sweet Married Couple#1	4_M_ROGUE,2,3,{
 OnTouch:
 	mes "[Sweet Husband]";
 	mes "You are the most beautiful thing in the world baby~";
@@ -677,7 +677,7 @@ OnTouch:
 	close;
 }
 
-dewata,234,263,8	script	Sweet Married Couple#2	727,2,3,{
+dewata,234,263,8	script	Sweet Married Couple#2	4_F_JOB_HUNTER,2,3,{
 OnTouch:
 	mes "[Sweet Wife]";
 	mes "Baby~ You know what flower that is~?";
@@ -708,7 +708,7 @@ OnTouch:
 	close;
 }
 
-dewata,279,213,4	script	Tourist#dew-2	887,2,3,{
+dewata,279,213,4	script	Tourist#dew-2	4_M_LIEMAN,2,3,{
 OnTouch:
 	mes "[Reclining Tourist]";
 	mes "Wow~ This is really comfy~";
@@ -726,7 +726,7 @@ OnTouch:
 	close;
 }
 
-dewata,269,208,4	script	Little Kid in Town#dew	538,2,3,{
+dewata,269,208,4	script	Little Kid in Town#dew	4_M_DEWBOY,2,3,{
 OnTouch:
 	mes "[Kid]";
 	mes "Hey "+((Sex)?"bro":"sis")+", look at that man!";
@@ -743,7 +743,7 @@ OnTouch:
 	close;
 }
 
-dewata,227,129,4	script	Sarr#dew	538,2,3,{
+dewata,227,129,4	script	Sarr#dew	4_M_DEWBOY,2,3,{
 OnTouch:
 	mes "[Sarr]";
 	mes "They're hiding so I should seek.";
@@ -766,7 +766,7 @@ OnTouch:
 	close;
 }
 
-dewata,239,140,4	script	Siyak#dew	539,2,3,{
+dewata,239,140,4	script	Siyak#dew	4_M_DEWGIRL,2,3,{
 OnTouch:
 	mes "[Siyak]";
 	mes "Hey come on, move over~ He's gonna find me~~";
@@ -784,7 +784,7 @@ OnTouch:
 	close;
 }
 
-dewata,193,145,4	script	Sipo#dew	538,2,3,{
+dewata,193,145,4	script	Sipo#dew	4_M_DEWBOY,2,3,{
 OnTouch:
 	mes "[Sipo]";
 	mes "Sarr won't find me here, right?";
@@ -801,7 +801,7 @@ OnTouch:
 	close;
 }
 
-dewata,228,177,4	script	Majya#dew	538,2,3,{
+dewata,228,177,4	script	Majya#dew	4_M_DEWBOY,2,3,{
 OnTouch:
 	mes "[Majya]";
 	mes "I was playing hide-and-seek with my friends...";
@@ -815,7 +815,7 @@ OnTouch:
 	close;
 }
 
-dewata,278,100,4	script	Missing Child#dew	703,2,3,{
+dewata,278,100,4	script	Missing Child#dew	4_F_KID2,2,3,{
 OnTouch:
 	mes "[Ukki]";
 	mes "WaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaa~";
@@ -840,7 +840,7 @@ OnTouch:
 	close;
 }
 
-dewata,249,87,4	script	Mum#dew	101,2,3,{
+dewata,249,87,4	script	Mum#dew	4W_F_01,2,3,{
 OnTouch:
 	mes "[Mum]";
 	mes "Ukki~ Ukki~ Where did she go?";
@@ -855,7 +855,7 @@ OnTouch:
 	close;
 }
 
-dewata,251,85,6	script	Poppa#dew	97,2,3,{
+dewata,251,85,6	script	Poppa#dew	4W_M_01,2,3,{
 OnTouch:
 	mes "[Poppa]";
 	mes "Honey, is Ukki lost again?";
@@ -876,7 +876,7 @@ OnTouch:
 	close;
 }
 
-dewata,278,281,4	script	Happily Married Grandpa	534,{
+dewata,278,281,4	script	Happily Married Grandpa	4_M_DEWOLDMAN,{
 	mes "[Happily Married Grandpa]";
 	mes "Today, I should ask my lady to";
 	mes "cook me some ^006400fried rice^000000.";
@@ -892,7 +892,7 @@ dewata,278,281,4	script	Happily Married Grandpa	534,{
 	close;
 }
 
-dewata,280,277,4	script	Happily Married Grandma	535,{
+dewata,280,277,4	script	Happily Married Grandma	4_M_DEWOLDWOMAN,{
 	mes "[Happily Married Grandma]";
 	mes "In my younger days,";
 	mes "there were many gentleman callers";
@@ -920,7 +920,7 @@ dewata,280,277,4	script	Happily Married Grandma	535,{
 	close;
 }
 
-dewata,165,103,6	script	Adventurer Semangat#dew	534,{
+dewata,165,103,6	script	Adventurer Semangat#dew	4_M_DEWOLDMAN,{
 	mes "[Adventurer Semangat]";
 	mes "I also traveled around the World";
 	mes "When I was young like you.";
@@ -942,7 +942,7 @@ dewata,165,103,6	script	Adventurer Semangat#dew	534,{
 	close;
 }
 
-dewata,139,114,6	script	Semangat's Wife#dew	535,{
+dewata,139,114,6	script	Semangat's Wife#dew	4_M_DEWOLDWOMAN,{
 	mes "[Semangat's Wife]";
 	mes "Where's that old man";
 	mes "gone off to again?";
@@ -977,7 +977,7 @@ dewata,139,114,6	script	Semangat's Wife#dew	535,{
 	}
 }
 
-dewata,181,88,6	script	Young Man#dew-2	536,{
+dewata,181,88,6	script	Young Man#dew-2	4_M_DEWMAN,{
 	mes "[Young Man]";
 	mes "Isn't ^8B4513Dewata^000000 beach";
 	mes "really beautiful?";
@@ -994,7 +994,7 @@ dewata,181,88,6	script	Young Man#dew-2	536,{
 	close;
 }
 
-dewata,179,204,4	script	Young Lady#dew	537,{
+dewata,179,204,4	script	Young Lady#dew	4_M_DEWWOMAN,{
 	mes "[Young Lady]";
 	mes "When you are outside of the town,";
 	mes "and meet ^FF0000Tiger, Monkey, or pig^000000,";
@@ -1016,7 +1016,7 @@ dewata,179,204,4	script	Young Lady#dew	537,{
 	close;
 }
 
-dewata,280,236,4	script	Settler#dew	726,{
+dewata,280,236,4	script	Settler#dew	4_F_JOB_BLACKSMITH,{
 	mes "[Settler]";
 	mes "I'm not really from ^8B4513Dewata^000000.";
 	mes "But while traveling,";
@@ -1036,7 +1036,7 @@ dewata,280,236,4	script	Settler#dew	726,{
 	close;
 }
 
-dewata,204,230,6	script	Dieting Lady#dew	537,{
+dewata,204,230,6	script	Dieting Lady#dew	4_M_DEWWOMAN,{
 	if (countitem(11533) == 0) {
 		mes "[Dieting Lady]";
 		mes "Ah~ I'm starving!!";
@@ -1081,7 +1081,7 @@ dewata,204,230,6	script	Dieting Lady#dew	537,{
 	}
 }
 
-dewata,117,156,6	script	Dreaming Kid#dew	538,{
+dewata,117,156,6	script	Dreaming Kid#dew	4_M_DEWBOY,{
 	mes "[Dreaming Kid]";
 	mes "My granny says";
 	mes "There was once a bird named ^FF0000Garuda^000000";
@@ -1099,7 +1099,7 @@ dewata,117,156,6	script	Dreaming Kid#dew	538,{
 	close;
 }
 
-dewata,144,216,4	script	Energetic Kid#dew	538,{
+dewata,144,216,4	script	Energetic Kid#dew	4_M_DEWBOY,{
 	mes "[Energetic Kid]";
 	mes "My parents used to tell me...";
 	next;
@@ -1120,7 +1120,7 @@ dewata,144,216,4	script	Energetic Kid#dew	538,{
 	close;
 }
 
-dewata,127,248,6	script	Wishing Kid#dew	539,{
+dewata,127,248,6	script	Wishing Kid#dew	4_M_DEWGIRL,{
 	mes "[Kid wishing to be an adult]";
 	mes "My family has been brewing";
 	mes "traditional Dewata wine for ages.";
@@ -1140,7 +1140,7 @@ dewata,127,248,6	script	Wishing Kid#dew	539,{
 	close;
 }
 
-dew_fild01,101,259,6	script	Jaty Tribe Gatekeeper	541,{
+dew_fild01,101,259,6	script	Jaty Tribe Gatekeeper	4_M_DEWZATIMAN,{
 	mes "[Jaty Tribe Gatekeeper]";
 	mes "Welcome to ^FF0000Jaty^000000 town.";
 	mes "Our tribe reveres strength and bravery.";
@@ -1148,7 +1148,7 @@ dew_fild01,101,259,6	script	Jaty Tribe Gatekeeper	541,{
 	close;
 }
 
-dew_fild01,106,306,4	script	R. Jaty Tribe Warrior	541,{
+dew_fild01,106,306,4	script	R. Jaty Tribe Warrior	4_M_DEWZATIMAN,{
 	mes "[Reserved Jaty Warrior]";
 	mes "I want to be the very best";
 	mes "like no one ever was.";
diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt
index af8ec7824..f46ce2651 100644
--- a/npc/re/cities/dicastes.txt
+++ b/npc/re/cities/dicastes.txt
@@ -15,7 +15,7 @@
 //= 1.3 Updated to match official script. [SkittleNugget]
 //============================================================
 
-dicastes01,194,159,5	script	Excited Galten#a	492,{
+dicastes01,194,159,5	script	Excited Galten#a	4_MAN_GALTUN1,{
 	mes "[Excited Galten]";
 	if (isequipped(2782)) {
 		mes "I can't get beautiful";
@@ -34,7 +34,7 @@ dicastes01,194,159,5	script	Excited Galten#a	492,{
 	close;
 }
 
-dicastes01,202,86,3	script	Sentinel#a	492,{
+dicastes01,202,86,3	script	Sentinel#a	4_MAN_GALTUN1,{
 	mes "[Sentinel]";
 	if (isequipped(2782)) {
 		mes "El Dicastes, the";
@@ -61,7 +61,7 @@ dicastes01,202,86,3	script	Sentinel#a	492,{
 	close;	
 }
 
-dicastes01,194,95,5	script	Sentinel#b	450,{
+dicastes01,194,95,5	script	Sentinel#b	4_MAN_GALTUN,{
 	mes "[Sentinel]";
 	if (isequipped(2782)) {
 		mes "I permit your entry.";
@@ -75,7 +75,7 @@ dicastes01,194,95,5	script	Sentinel#b	450,{
 	close;
 }
 
-dicastes01,234,158,0	script	Training Galten#a	450,{
+dicastes01,234,158,0	script	Training Galten#a	4_MAN_GALTUN,{
 	mes "[Training Galten]";
 	if (isequipped(2782)) {
 		mes "I'll be ready for anything";
@@ -89,7 +89,7 @@ dicastes01,234,158,0	script	Training Galten#a	450,{
 	close;
 }
 
-dicastes01,244,166,0	script	Training Galten#b	450,{
+dicastes01,244,166,0	script	Training Galten#b	4_MAN_GALTUN,{
 	mes "[Training Galten]";
 	if (isequipped(2782)) {
 		mes "I wonder if Ahat knows how";
@@ -103,7 +103,7 @@ dicastes01,244,166,0	script	Training Galten#b	450,{
 	close;
 }
 
-dicastes01,272,166,0	script	Training Galten#c	450,{
+dicastes01,272,166,0	script	Training Galten#c	4_MAN_GALTUN,{
 	mes "[Training Galten]";
 	if (isequipped(2782)) {
 		mes "[Training Galten]";
@@ -118,7 +118,7 @@ dicastes01,272,166,0	script	Training Galten#c	450,{
 	close;
 }
 
-dicastes01,248,129,0	script	Training Galten#d	450,{
+dicastes01,248,129,0	script	Training Galten#d	4_MAN_GALTUN,{
 	mes "[Training Galten]";
 	if (isequipped(2782)) {
 		mes "[Training Galten]";
@@ -135,7 +135,7 @@ dicastes01,248,129,0	script	Training Galten#d	450,{
 }
 
 /*
-dicastes01,271,152,0	script	Training Galten#e	450,{
+dicastes01,271,152,0	script	Training Galten#e	4_MAN_GALTUN,{
 	mes "[Training Galten]";
 	if (isequipped(2782)) {
 		mes "I will get great results";
@@ -148,7 +148,7 @@ dicastes01,271,152,0	script	Training Galten#e	450,{
 }
 */
 
-dic_in01,349,282,4	script	Waiting Galten#in_1	492,{
+dic_in01,349,282,4	script	Waiting Galten#in_1	4_MAN_GALTUN1,{
 	if (isequipped(2782)) {
 		mes "[Waiting Galten]";
 		mes "Here is the Battle Station.";
@@ -161,7 +161,7 @@ dic_in01,349,282,4	script	Waiting Galten#in_1	492,{
 	close;
 }
 
-dic_in01,370,261,1	script	Waiting Galten#in_2	492,{
+dic_in01,370,261,1	script	Waiting Galten#in_2	4_MAN_GALTUN1,{
 	if (isequipped(2782)) {
 		mes "[Waiting Galten]";
 		mes "Boring.";
@@ -172,7 +172,7 @@ dic_in01,370,261,1	script	Waiting Galten#in_2	492,{
 	close;
 }
 
-dic_in01,381,261,1	script	Waiting Galten#in_3	492,{
+dic_in01,381,261,1	script	Waiting Galten#in_3	4_MAN_GALTUN1,{
 	if (isequipped(2782)) {
 		mes "[Waiting Galten]";
 		mes "Zzzzz...";
@@ -183,7 +183,7 @@ dic_in01,381,261,1	script	Waiting Galten#in_3	492,{
 	close;
 }
 
-dic_in01,370,282,4	script	Waiting Galten#in_4	492,{
+dic_in01,370,282,4	script	Waiting Galten#in_4	4_MAN_GALTUN1,{
 	if (isequipped(2782)) {
 		mes "[Waiting Galten]";
 		mes "El Dicastes is the most peaceful place in this world as long as I am here.";
@@ -194,7 +194,7 @@ dic_in01,370,282,4	script	Waiting Galten#in_4	492,{
 	close;
 }
 
-dic_in01,354,219,4	script	Resting Galten#in_5	492,{
+dic_in01,354,219,4	script	Resting Galten#in_5	4_MAN_GALTUN1,{
 	if (isequipped(2782)) {
 		mes "[Resting Galten]";
 		mes "Resting is always so sweet.";
@@ -205,7 +205,7 @@ dic_in01,354,219,4	script	Resting Galten#in_5	492,{
 	close;
 }
 
-dic_in01,365,197,1	script	Resting Galten#in_6	492,{
+dic_in01,365,197,1	script	Resting Galten#in_6	4_MAN_GALTUN1,{
 	if (isequipped(2782)) {
 		mes "[Resting Galten]";
 		mes "Galten can also rest while standing up like this.";
@@ -220,11 +220,11 @@ dic_in01,365,197,1	script	Resting Galten#in_6	492,{
 	close;
 }
 
-dic_in01,87,102,5	script	Resting Piom#01	454,{
+dic_in01,87,102,5	script	Resting Piom#01	4_MAN_PIOM,{
 	end;
 }
 
-dic_in01,29,119,4	script	Resting Piom#04	489,{
+dic_in01,29,119,4	script	Resting Piom#04	4_MAN_PIOM6,{
 	if (isequipped(2782)) {
 		mes "[Resting Piom]";
 		mes "Why is it so noisy when I'm trying to get rest?";
@@ -235,7 +235,7 @@ dic_in01,29,119,4	script	Resting Piom#04	489,{
 	close;
 }
 
-dic_in01,91,113,5	script	Suspicious Piom#a	489,{
+dic_in01,91,113,5	script	Suspicious Piom#a	4_MAN_PIOM6,{
 	mes "[Suspicious Piom]";
 	if (isequipped(2782)) {
 		mes "Have you heard of the";
@@ -276,7 +276,7 @@ dic_in01,91,113,5	script	Suspicious Piom#a	489,{
 	close;
 }
 
-dic_in01,168,116,5	script	Tired Piom#c	491,{
+dic_in01,168,116,5	script	Tired Piom#c	4_MAN_PIOM5,{
 	mes "[Tired Piom]";
 	if (isequipped(2782)) {
 		mes "If you need any";
@@ -292,7 +292,7 @@ dic_in01,168,116,5	script	Tired Piom#c	491,{
 	close;
 }
 
-dic_in01,149,104,5	script	Tired Piom#b	455,{
+dic_in01,149,104,5	script	Tired Piom#b	4_MAN_PIOM2,{
 	mes "[Tired Piom]";
 	if (isequipped(2782)) {
 		mes "I feel so stiff...";
@@ -310,7 +310,7 @@ dic_in01,149,104,5	script	Tired Piom#b	455,{
 	close;
 }
 
-dic_in01,341,113,3	script	Tired Piom#a	491,{
+dic_in01,341,113,3	script	Tired Piom#a	4_MAN_PIOM5,{
 	mes "[Tired Piom]";
 	if (isequipped(2782)) {
 		mes "[Tired Piom]";
@@ -341,7 +341,7 @@ dic_in01,341,113,3	script	Tired Piom#a	491,{
 	close;
 }
 
-dic_in01,252,103,3	script	Eating Adventurer#tre	711,{
+dic_in01,252,103,3	script	Eating Adventurer#tre	4_F_05,{
 	mes "[Eating Adventurer]";
 	mes "Hey, do you have any emergency rations on you from Midgard?";
 	next;
@@ -357,7 +357,7 @@ dic_in01,252,103,3	script	Eating Adventurer#tre	711,{
 	close;
 }
 
-dic_in01,32,54,5	script	Venknick#el_01	449,{
+dic_in01,32,54,5	script	Venknick#el_01	4_MAN_BENKUNI,{
 	if (isequipped(2782)) {
 		mes "[Venknick]";
 		mes "Oh feels so refreshed.";
@@ -370,7 +370,7 @@ dic_in01,32,54,5	script	Venknick#el_01	449,{
 	close;
 }
 
-dic_in01,372,116,3	script	Thrilled Piom#a	490,{
+dic_in01,372,116,3	script	Thrilled Piom#a	4_MAN_PIOM4,{
 	mes "[Thrilled Piom]";
 	if (isequipped(2782)) {
 		mes "Ahat is the one";
@@ -400,7 +400,7 @@ dic_in01,372,116,3	script	Thrilled Piom#a	490,{
 	close;
 }
 
-dic_in01,360,125,5	script	Serious Venknicka	449,{
+dic_in01,360,125,5	script	Serious Venknicka	4_MAN_BENKUNI,{
 	mes "[Serious Venknick]";
 	if (isequipped(2782)) {
 		mes "A sudden increase in Bradium production.";
@@ -414,7 +414,7 @@ dic_in01,360,125,5	script	Serious Venknicka	449,{
 	close;
 }
 
-dic_in01,42,250,5	script	Guide#diel_1	489,{
+dic_in01,42,250,5	script	Guide#diel_1	4_MAN_PIOM6,{
 	if (isequipped(2782)) {
 		if (ep13_3_invite > 5) {		
 			mes "[Guide]";
@@ -461,7 +461,7 @@ dic_in01,42,250,5	script	Guide#diel_1	489,{
 	close;
 }
 
-dic_in01,335,34,5	script	Talkative Piom#a	490,{
+dic_in01,335,34,5	script	Talkative Piom#a	4_MAN_PIOM4,{
 	mes "[Talkative Piom]";
 	if (isequipped(2782)) {	
 		mes "At my factory";
@@ -481,7 +481,7 @@ dic_in01,335,34,5	script	Talkative Piom#a	490,{
 	close;
 }
 
-dic_in01,387,30,1	script	Manuk Piom#a	454,{
+dic_in01,387,30,1	script	Manuk Piom#a	4_MAN_PIOM,{
 	mes "[Manuk Piom]";
 	if (isequipped(2782)) {
 		mes "You! We met in Manuk, didn't we?";
@@ -493,7 +493,7 @@ dic_in01,387,30,1	script	Manuk Piom#a	454,{
 	close;
 }
 
-dicastes01,282,210,4	script	Free Knit#a	453,{
+dicastes01,282,210,4	script	Free Knit#a	4_MAN_NITT,{
 	mes "[Free Knit]";
 	if (isequipped(2782)) {
 		mes "As long as we have a steady";
@@ -511,7 +511,7 @@ dicastes01,282,210,4	script	Free Knit#a	453,{
 	close;
 }
 
-dicastes01,246,210,3	script	Free Venknick#a	449,{
+dicastes01,246,210,3	script	Free Venknick#a	4_MAN_BENKUNI,{
 	mes "[Free Venknick]";
 	if (isequipped(2782)) {
 		mes "At least we have plenty of Bradium.";
@@ -541,7 +541,7 @@ dicastes01,246,210,3	script	Free Venknick#a	449,{
 	close;
 }
 
-dicastes01,235,245,4	script	Excited Piom#a	490,{
+dicastes01,235,245,4	script	Excited Piom#a	4_MAN_PIOM4,{
 	if (isequipped(2782)) {
 		mes "[Excited Piom]";
 		mes "Have you seen Ahat?";
@@ -556,7 +556,7 @@ dicastes01,235,245,4	script	Excited Piom#a	490,{
 	close;
 }
 
-dicastes01,284,262,3	script	Favorable Knit#a	453,{
+dicastes01,284,262,3	script	Favorable Knit#a	4_MAN_NITT,{
 	mes "[Favorable Knit]";
 	if (isequipped(2782)) {
 		mes "Unlike the Raphine, we Saphas";
@@ -574,7 +574,7 @@ dicastes01,284,262,3	script	Favorable Knit#a	453,{
 	close;
 }
 
-dicastes01,164,180,4	script	Limpy Piom#a	489,{
+dicastes01,164,180,4	script	Limpy Piom#a	4_MAN_PIOM6,{
 	mes "[Limpy Piom]";
 	if (isequipped(2782)) {
 		mes "They say there is a";
@@ -594,7 +594,7 @@ dicastes01,164,180,4	script	Limpy Piom#a	489,{
 	close;
 }
 
-dicastes01,191,202,4	script	Complaining Galten#fihs	450,{
+dicastes01,191,202,4	script	Complaining Galten#fihs	4_MAN_GALTUN,{
 	if (isequipped(2782)) {
 		mes "[Complaining Galten]";
 		mes "That crazy Vanknick always";
@@ -634,7 +634,7 @@ dicastes01,191,202,4	script	Complaining Galten#fihs	450,{
 	close;
 }
 
-dicastes01,202,197,4	script	Crazy Venknick#fihsing1	449,{
+dicastes01,202,197,4	script	Crazy Venknick#fihsing1	4_MAN_BENKUNI,{
 	if (isequipped(2782)) {
 		mes "[Crazy Venknick]";
 		mes "At only 5000 Zeny";
@@ -684,7 +684,7 @@ dicastes01,202,197,4	script	Crazy Venknick#fihsing1	449,{
 	close;
 }
 
-dic_in01,98,110,5	script	Worried Piom#a	489,{
+dic_in01,98,110,5	script	Worried Piom#a	4_MAN_PIOM6,{
 	if (isequipped(2782)) {
 		mes "[Worried Piom]";
 		mes "I haven't seen my friends for the last few hours.";
@@ -699,7 +699,7 @@ dic_in01,98,110,5	script	Worried Piom#a	489,{
 	close;
 }
 
-dic_in01,98,96,3	script	Lost Galten#a	492,{
+dic_in01,98,96,3	script	Lost Galten#a	4_MAN_GALTUN1,{
 	if (isequipped(2782)) {
 		mes "[Lost Galten]";
 		mes "I've been living as a Piom for too long";
diff --git a/npc/re/cities/eclage.txt b/npc/re/cities/eclage.txt
index 7ae1f292c..009f87ab3 100644
--- a/npc/re/cities/eclage.txt
+++ b/npc/re/cities/eclage.txt
@@ -12,7 +12,7 @@
 
 // Generic Eclage NPCs - Set 1
 //============================================================
-ecl_fild01,92,316,4	script	Tourist#ep14_2f2	545,{
+ecl_fild01,92,316,4	script	Tourist#ep14_2f2	4_CAT_SAILOR2,{
 	mes "[Tourist]";
 	mes "I can't believe I have to wait this long......";
 	mes "When is it going to be my turn?";
@@ -20,7 +20,7 @@ ecl_fild01,92,316,4	script	Tourist#ep14_2f2	545,{
 	close;
 }
 
-ecl_fild01,106,312,4	script	Tourist#ep14_2f3	525,{
+ecl_fild01,106,312,4	script	Tourist#ep14_2f3	4_F_RAFLE_VI,{
 	mes "[Tourist]";
 	mes "I'm actually done with my documentation, but I'm just sticking around to appreciate all of these flowers.";
 	emotion e_lv2;
@@ -31,7 +31,7 @@ ecl_fild01,106,312,4	script	Tourist#ep14_2f3	525,{
 	close;
 }
 
-ecl_fild01,108,320,6	script	Tourist#ep14_2f4	941,{
+ecl_fild01,108,320,6	script	Tourist#ep14_2f4	4_F_DST_CHILD,{
 	mes "[Tourist]";
 	mes "I wonder how beautiful of a city Eclage would be.";
 	mes "It just makes my heart beat thinking about it.";
@@ -39,7 +39,7 @@ ecl_fild01,108,320,6	script	Tourist#ep14_2f4	941,{
 	close;
 }
 
-ecl_fild01,105,320,2	script	Tourist#ep14_2f5	436,{
+ecl_fild01,105,320,2	script	Tourist#ep14_2f5	4_F_FAIRYKID,{
 	mes "[Tourist]";
 	mes "No, I'm not a visitor. I'm an Eclage citizen!";
 	emotion e_an;
@@ -50,7 +50,7 @@ ecl_fild01,105,320,2	script	Tourist#ep14_2f5	436,{
 	close;
 }
 
-ecl_fild01,103,319,4	script	Tourist#ep14_2f6	900,{
+ecl_fild01,103,319,4	script	Tourist#ep14_2f6	4_M_HUMERCHANT,{
 	mes "[Tourist]";
 	mes "I hear their acorns are delicious without a hint of bitterness.";
 	next;
@@ -60,7 +60,7 @@ ecl_fild01,103,319,4	script	Tourist#ep14_2f6	900,{
 	close;
 }
 
-ecl_fild01,110,316,2	script	Tourist#ep14_2f7	896,{
+ecl_fild01,110,316,2	script	Tourist#ep14_2f7	4_M_HUBOY,{
 	mes "[Tourist]";
 	mes "It's important to keep your belongings light when traveling.";
 	next;
@@ -73,13 +73,13 @@ ecl_fild01,110,316,2	script	Tourist#ep14_2f7	896,{
 	close;
 }
 
-ecl_fild01,92,318,4	script	Tourist#ep14_2f8	517,{
+ecl_fild01,92,318,4	script	Tourist#ep14_2f8	4_M_RAFLE_OLD,{
 	mes "[Tourist]";
 	mes "Cool cool.";
 	close;
 }
 
-ecl_fild01,93,318,2	script	Tourist#ep14_2f9	107,{
+ecl_fild01,93,318,2	script	Tourist#ep14_2f9	1_M_PAY_ELDER,{
 	mes "[Tourist]";
 	mes "Snorrrreee....Erhem....";
 	next;
@@ -90,7 +90,7 @@ ecl_fild01,93,318,2	script	Tourist#ep14_2f9	107,{
 	close;
 }
 
-ecl_fild01,94,313,4	script	Tourist#ep14_2f10	715,{
+ecl_fild01,94,313,4	script	Tourist#ep14_2f10	4_M_PIERROT,{
 	mes "[Tourist]";
 	mes "Oh! Are you also from Midgard?";
 	next;
@@ -100,7 +100,7 @@ ecl_fild01,94,313,4	script	Tourist#ep14_2f10	715,{
 	close;
 }
 
-ecl_fild01,101,320,4	script	Tourist#ep14_2f11	522,{
+ecl_fild01,101,320,4	script	Tourist#ep14_2f11	4_M_RAFLE_OR,{
 	mes "[Tourist]";
 	mes "Ow.... My legs...";
 	mes "You're saying I have to wait after all this traveling through Bifrost?!";
@@ -108,7 +108,7 @@ ecl_fild01,101,320,4	script	Tourist#ep14_2f11	522,{
 	close;
 }
 
-ecl_fild01,88,315,4	script	Tourist#ep14_2f12	957,{
+ecl_fild01,88,315,4	script	Tourist#ep14_2f12	4_WHITE_COW,{
 	mes "[Tourist]";
 	mes "Ahh...";
 	mes "Why are there so many people...?";
@@ -121,7 +121,7 @@ ecl_fild01,88,315,4	script	Tourist#ep14_2f12	957,{
 
 // Generic Eclage NPCs - Set 2
 //============================================================
-ecl_fild01,183,190,4	script	Catering#eclbig	447,{
+ecl_fild01,183,190,4	script	Catering#eclbig	4_M_FAIRYSOLDIER,{
 	mes "[Catering]";
 	mes "Wahahaha! How do you do!";
 	mes "It's perfect weather for a picnic, no?";
@@ -152,7 +152,7 @@ ecl_fild01,183,190,4	script	Catering#eclbig	447,{
 	close;
 }
 
-ecl_fild01,134,109,4	script	Warao#eclbig	446,{
+ecl_fild01,134,109,4	script	Warao#eclbig	4_M_FAIRYKID5,{
 	mes "[Warao]";
 	mes "Ah~ I'm so hungry. What should I eat today?";
 	next;
@@ -165,13 +165,13 @@ ecl_fild01,134,109,4	script	Warao#eclbig	446,{
 	close;
 }
 
-ecl_fild01,70,285,4	script	Giranni#eclbig	611,{
+ecl_fild01,70,285,4	script	Giranni#eclbig	4_F_FAIRY2,{
 	mes "[Giranni]";
 	mes "I wonder where he went. It should be around here...";
 	close;
 }
 
-eclage,106,61,4	script	Markoza#eclbig	444,{
+eclage,106,61,4	script	Markoza#eclbig	4_M_FAIRYKID3,{
 	mes "[Markoza]";
 	mes "I also want to visit foreign lands.";
 	next;
@@ -184,7 +184,7 @@ eclage,106,61,4	script	Markoza#eclbig	444,{
 	close;
 }
 
-eclage,101,130,5	script	Wutapoa#eclbig	435,{
+eclage,101,130,5	script	Wutapoa#eclbig	4_F_FAIRY,{
 	mes "[Wutapoa]";
 	mes "I recently moved out of my parent's place!";
 	mes "I am so glad I finally have my own Yai!";
@@ -198,7 +198,7 @@ eclage,101,130,5	script	Wutapoa#eclbig	435,{
 	close;
 }
 
-eclage,200,272,4	script	Masione#eclbig	437,{
+eclage,200,272,4	script	Masione#eclbig	4_F_FAIRYKID2,{
 	mes "[Masione]";
 	mes "Whoa! Hey!";
 	mes "Would you please stop appearing out of nowhere?";
@@ -209,7 +209,7 @@ eclage,200,272,4	script	Masione#eclbig	437,{
 	close;
 }
 
-ecl_in01,55,25,3	script	Mijani#eclbig	520,{
+ecl_in01,55,25,3	script	Mijani#eclbig	4_F_MORAFINE1,{
 	mes "[Mijani]";
 	mes "You are not from around here?";
 	mes "Welcome.";
@@ -219,7 +219,7 @@ ecl_in01,55,25,3	script	Mijani#eclbig	520,{
 	close;
 }
 
-ecl_in01,38,37,4	script	A kneeling boy#eclbig	441,{
+ecl_in01,38,37,4	script	A kneeling boy#eclbig	4_F_FAIRYKID6,{
 	mes "[A kneeling boy]";
 	mes "Why am I kneeling like this?";
 	next;
@@ -233,7 +233,7 @@ ecl_in01,38,37,4	script	A kneeling boy#eclbig	441,{
 	close;
 }
 
-ecl_in02,168,41,2	script	Pambo#eclbig	438,{
+ecl_in02,168,41,2	script	Pambo#eclbig	4_F_FAIRYKID3,{
 	mes "[Pambo]";
 	mes "Do you like things that twinkle?";
 	next;
@@ -261,7 +261,7 @@ ecl_in02,168,41,2	script	Pambo#eclbig	438,{
 	close;
 }
 
-ecl_in01,41,103,1	script	A blushing girl#eclbig	439,{
+ecl_in01,41,103,1	script	A blushing girl#eclbig	4_F_FAIRYKID4,{
 	mes "[A blushing girl]";
 	mes "Do you see this balcony up top?";
 	mes "Mayor Jun appears there everytime there is an important occasion!";
@@ -272,7 +272,7 @@ ecl_in01,41,103,1	script	A blushing girl#eclbig	439,{
 	close;
 }
 
-ecl_in01,53,92,4	script	Lafiki#eclbig	444,{
+ecl_in01,53,92,4	script	Lafiki#eclbig	4_M_FAIRYKID3,{
 	mes "[Lafiki]";
 	mes "My fashion sense today is excellent as usual. Heh-";
 	next;
@@ -287,7 +287,7 @@ ecl_in01,53,92,4	script	Lafiki#eclbig	444,{
 	close;
 }
 
-ecl_in01,54,91,2	script	Dandy#eclbig	443,{
+ecl_in01,54,91,2	script	Dandy#eclbig	4_M_FAIRYKID2,{
 	mes "[Dandy]";
 	mes "Take a look at me! How's this? Am I not so fabulous?";
 	next;
@@ -300,7 +300,7 @@ ecl_in01,54,91,2	script	Dandy#eclbig	443,{
 	close;
 }
 
-ecl_in01,52,102,4	script	Choir Conductor#eclbig	442,{
+ecl_in01,52,102,4	script	Choir Conductor#eclbig	4_M_FAIRYKID,{
 	mes "[Choir conductor]";
 	mes "We are Eclage's Tree Wing Choir~";
 	mes "We bring you heavenly harmonies~";
@@ -362,33 +362,33 @@ ecl_in01,52,102,4	script	Choir Conductor#eclbig	442,{
 	close;
 }
 
-ecl_in01,51,103,4	script	Choir member#eclbig01	442,{
+ecl_in01,51,103,4	script	Choir member#eclbig01	4_M_FAIRYKID,{
 	mes "[Choir member]";
 	mes "Aaa~";
 	emotion e_ho;
 	close;
 }
-ecl_in01,53,103,4	duplicate(Choir member#eclbig01)	Choir member#eclbig02	442
-ecl_in01,50,104,4	duplicate(Choir member#eclbig01)	Choir member#eclbig03	442
-ecl_in01,52,104,4	duplicate(Choir member#eclbig01)	Choir member#eclbig04	442
-ecl_in01,54,104,4	duplicate(Choir member#eclbig01)	Choir member#eclbig05	442
+ecl_in01,53,103,4	duplicate(Choir member#eclbig01)	Choir member#eclbig02	4_M_FAIRYKID
+ecl_in01,50,104,4	duplicate(Choir member#eclbig01)	Choir member#eclbig03	4_M_FAIRYKID
+ecl_in01,52,104,4	duplicate(Choir member#eclbig01)	Choir member#eclbig04	4_M_FAIRYKID
+ecl_in01,54,104,4	duplicate(Choir member#eclbig01)	Choir member#eclbig05	4_M_FAIRYKID
 
 // Generic Eclage NPCs - Set 3
 //============================================================
-ecl_fild01,190,93,4	script	Fili#1	617,{
+ecl_fild01,190,93,4	script	Fili#1	4_M_FAIRYANG,{
 	mes "[Fili]";
 	mes "Looking at this beautiful field, the song sings itself~";
 	emotion e_ho;
 	close;
 }
 
-ecl_fild01,83,263,4	script	Watering Laphine#1	444,{
+ecl_fild01,83,263,4	script	Watering Laphine#1	4_M_FAIRYKID3,{
 	mes "[Watering Laphine]";
 	mes "I think the earth is running dry.";
 	close;
 }
 
-ecl_fild01,163,196,4	script	Dancing Laphine#1	438,{
+ecl_fild01,163,196,4	script	Dancing Laphine#1	4_F_FAIRYKID3,{
 	mes "[Dancing Laphine]";
 	mes "It's important to warm up like this before you start dancing. One, two, three, four....";
 	close;
@@ -396,19 +396,19 @@ ecl_fild01,163,196,4	script	Dancing Laphine#1	438,{
 
 // Eclage Prison & Clinic
 //============================================================
-ecl_in01,8,71,4	script	Eclage Guard#pri_inn	447,{
+ecl_in01,8,71,4	script	Eclage Guard#pri_inn	4_M_FAIRYSOLDIER,{
 	mes "[Eclage Guard]";
 	mes "This path will take you to the lower parts of Eclage. You'll find a prison and a clinic there.";
 	close;
 }
 
-ecl_in02,96,22,2	script	Sign#prison_inn	835,{
+ecl_in02,96,22,2	script	Sign#prison_inn	2_BOARD1,{
 	mes "[North] Prison";
 	mes "[West] Clinic";
 	close;
 }
 
-ecl_in02,164,56,2	script	Receptionist#Laphine	437,{
+ecl_in02,164,56,2	script	Receptionist#Laphine	4_F_FAIRYKID2,{
 	mes "[Receptionist]";
 	mes "Welcome to Eclage Clinic.";
 	next;
@@ -454,7 +454,7 @@ ecl_in02,164,56,2	script	Receptionist#Laphine	437,{
 	}
 }
 
-ecl_in02,137,44,2	script	Doctor Laphine#doctor	442,{
+ecl_in02,137,44,2	script	Doctor Laphine#doctor	4_M_FAIRYKID,{
 	mes "[Injured Laphine]";
 	mes "Ooww...";
 	mes "Where...am...I?";
@@ -482,4 +482,4 @@ ecl_in02,137,44,2	script	Doctor Laphine#doctor	442,{
 	mes "What? No way...please...doctor!! No!!";
 	close;
 }
-ecl_in02,135,45,4	duplicate(Doctor Laphine#doctor)	Injured Laphine	441
+ecl_in02,135,45,4	duplicate(Doctor Laphine#doctor)	Injured Laphine	4_F_FAIRYKID6
diff --git a/npc/re/cities/izlude.txt b/npc/re/cities/izlude.txt
index 0082594cb..7e37f9de2 100644
--- a/npc/re/cities/izlude.txt
+++ b/npc/re/cities/izlude.txt
@@ -15,70 +15,70 @@
 
 // Izlude
 //============================================================
-izlude,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude	100
-izlude_a,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_a	100
-izlude_b,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_b	100
-izlude_c,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_c	100
-izlude_d,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_d	100
+izlude,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude	4W_SAILOR
+izlude_a,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_a	4W_SAILOR
+izlude_b,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_b	4W_SAILOR
+izlude_c,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_c	4W_SAILOR
+izlude_d,197,205,1	duplicate(Sailor_izlude)	Sailor#izlude_d	4W_SAILOR
 
-izlude,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude	90
-izlude_a,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_a	90
-izlude_b,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_b	90
-izlude_c,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_c	90
-izlude_d,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_d	90
+izlude,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude	4_F_01
+izlude_a,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_a	4_F_01
+izlude_b,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_b	4_F_01
+izlude_c,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_c	4_F_01
+izlude_d,71,92,2	duplicate(Bonne_izlude)	Bonne#izlude_d	4_F_01
 
-izlude,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude	91
-izlude_a,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_a	91
-izlude_b,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_b	91
-izlude_c,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_c	91
-izlude_d,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_d	91
+izlude,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude	4_F_02
+izlude_a,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_a	4_F_02
+izlude_b,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_b	4_F_02
+izlude_c,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_c	4_F_02
+izlude_d,172,215,4	duplicate(Charfri_izlude)	Charfri#izlude_d	4_F_02
 
-izlude,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude	124
-izlude_a,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_a	124
-izlude_b,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_b	124
-izlude_c,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_c	124
-izlude_d,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_d	124
+izlude,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude	4_F_TELEPORTER
+izlude_a,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_a	4_F_TELEPORTER
+izlude_b,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_b	4_F_TELEPORTER
+izlude_c,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_c	4_F_TELEPORTER
+izlude_d,174,164,4	duplicate(Cuskoal_izlude)	Cuskoal#izlude_d	4_F_TELEPORTER
 
-izlude,85,103,4	duplicate(Dega_izlude)	Dega#izlude	84
-izlude_a,85,103,4	duplicate(Dega_izlude)	Dega#izlude_a	84
-izlude_b,85,103,4	duplicate(Dega_izlude)	Dega#izlude_b	84
-izlude_c,85,103,4	duplicate(Dega_izlude)	Dega#izlude_c	84
-izlude_d,85,103,4	duplicate(Dega_izlude)	Dega#izlude_d	84
+izlude,85,103,4	duplicate(Dega_izlude)	Dega#izlude	4_M_02
+izlude_a,85,103,4	duplicate(Dega_izlude)	Dega#izlude_a	4_M_02
+izlude_b,85,103,4	duplicate(Dega_izlude)	Dega#izlude_b	4_M_02
+izlude_c,85,103,4	duplicate(Dega_izlude)	Dega#izlude_c	4_M_02
+izlude_d,85,103,4	duplicate(Dega_izlude)	Dega#izlude_d	4_M_02
 
-izlude,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude	97
-izlude_a,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_a	97
-izlude_b,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_b	97
-izlude_c,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_c	97
-izlude_d,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_d	97
+izlude,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude	4W_M_01
+izlude_a,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_a	4W_M_01
+izlude_b,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_b	4W_M_01
+izlude_c,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_c	4W_M_01
+izlude_d,140,186,4	duplicate(Kylick_izlude)	Kylick#izlude_d	4W_M_01
 
-izlude,57,159,2	duplicate(Red_izlude)	Red#izlude	85
-izlude_a,57,159,2	duplicate(Red_izlude)	Red#izlude_a	85
-izlude_b,57,159,2	duplicate(Red_izlude)	Red#izlude_b	85
-izlude_c,57,159,2	duplicate(Red_izlude)	Red#izlude_c	85
-izlude_d,57,159,2	duplicate(Red_izlude)	Red#izlude_d	85
+izlude,57,159,2	duplicate(Red_izlude)	Red#izlude	4_M_03
+izlude_a,57,159,2	duplicate(Red_izlude)	Red#izlude_a	4_M_03
+izlude_b,57,159,2	duplicate(Red_izlude)	Red#izlude_b	4_M_03
+izlude_c,57,159,2	duplicate(Red_izlude)	Red#izlude_c	4_M_03
+izlude_d,57,159,2	duplicate(Red_izlude)	Red#izlude_d	4_M_03
 
-izlude,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude	98
-izlude_a,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_a	98
-izlude_b,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_b	98
-izlude_c,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_c	98
-izlude_d,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_d	98
+izlude,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude	4W_M_02
+izlude_a,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_a	4W_M_02
+izlude_b,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_b	4W_M_02
+izlude_c,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_c	4W_M_02
+izlude_d,55,159,2	duplicate(Cebalis_izlude)	Cebalis#izlude_d	4W_M_02
 
-izlude,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude	105
-izlude_a,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_a	105
-izlude_b,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_b	105
-izlude_c,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_c	105
-izlude_d,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_d	105
+izlude,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude	8W_SOLDIER
+izlude_a,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_a	8W_SOLDIER
+izlude_b,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_b	8W_SOLDIER
+izlude_c,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_c	8W_SOLDIER
+izlude_d,165,156,2	duplicate(Soldier_izlude)	Soldier#izlude_d	8W_SOLDIER
 
 -	script	::Guard_izlude	-1,{
 	mes "[Izlude Guard]";
 	mes "Welcome to Izlude.";
 	close;
 }
-prt_fild08,350,219,4	duplicate(Guard_izlude)	Guard#izlude	105
-prt_fild08a,350,219,4	duplicate(Guard_izlude)	Guard#izlude_a	105
-prt_fild08b,350,219,4	duplicate(Guard_izlude)	Guard#izlude_b	105
-prt_fild08c,350,219,4	duplicate(Guard_izlude)	Guard#izlude_c	105
-prt_fild08d,350,219,4	duplicate(Guard_izlude)	Guard#izlude_d	105
+prt_fild08,350,219,4	duplicate(Guard_izlude)	Guard#izlude	8W_SOLDIER
+prt_fild08a,350,219,4	duplicate(Guard_izlude)	Guard#izlude_a	8W_SOLDIER
+prt_fild08b,350,219,4	duplicate(Guard_izlude)	Guard#izlude_b	8W_SOLDIER
+prt_fild08c,350,219,4	duplicate(Guard_izlude)	Guard#izlude_c	8W_SOLDIER
+prt_fild08d,350,219,4	duplicate(Guard_izlude)	Guard#izlude_d	8W_SOLDIER
 
 // Channel Warper
 //============================================================
@@ -98,8 +98,8 @@ function	script	F_IzludeChannel	{
 	}
 	close;
 }
-izlude,122,105,5	script	Izlude Copy Warper	64,{ callfunc "F_IzludeChannel",":Go to copy 2:Go to copy 3:Go to copy 4:Go to copy 5"; }
-izlude_a,122,105,5	script	Izlude Copy Warper#_a	64,{ callfunc "F_IzludeChannel","Go to copy 1::Go to copy 3:Go to copy 4:Go to copy 5"; }
-izlude_b,122,105,5	script	Izlude Copy Warper#_b	64,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2::Go to copy 4:Go to copy 5"; }
-izlude_c,122,105,5	script	Izlude Copy Warper#_c	64,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2:Go to copy 3::Go to copy 5"; }
-izlude_d,122,105,5	script	Izlude Copy Warper#_d	64,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2:Go to copy 3:Go to copy 4:"; }
+izlude,122,105,5	script	Izlude Copy Warper	1_M_WIZARD,{ callfunc "F_IzludeChannel",":Go to copy 2:Go to copy 3:Go to copy 4:Go to copy 5"; }
+izlude_a,122,105,5	script	Izlude Copy Warper#_a	1_M_WIZARD,{ callfunc "F_IzludeChannel","Go to copy 1::Go to copy 3:Go to copy 4:Go to copy 5"; }
+izlude_b,122,105,5	script	Izlude Copy Warper#_b	1_M_WIZARD,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2::Go to copy 4:Go to copy 5"; }
+izlude_c,122,105,5	script	Izlude Copy Warper#_c	1_M_WIZARD,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2:Go to copy 3::Go to copy 5"; }
+izlude_d,122,105,5	script	Izlude Copy Warper#_d	1_M_WIZARD,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2:Go to copy 3:Go to copy 4:"; }
diff --git a/npc/re/cities/jawaii.txt b/npc/re/cities/jawaii.txt
index de263448c..61f27341c 100644
--- a/npc/re/cities/jawaii.txt
+++ b/npc/re/cities/jawaii.txt
@@ -13,8 +13,8 @@
 //= 1.2 Added Izlude duplicates. [Euphy]
 //============================================================
 
-izlude,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Izlude	71
-izlude_a,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Iz_a	71
-izlude_b,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Iz_b	71
-izlude_c,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Iz_c	71
-izlude_d,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Iz_d	71
+izlude,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Izlude	1_F_LIBRARYGIRL
+izlude_a,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Iz_a	1_F_LIBRARYGIRL
+izlude_b,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Iz_b	1_F_LIBRARYGIRL
+izlude_c,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Iz_c	1_F_LIBRARYGIRL
+izlude_d,180,224,3	duplicate(Honeymoon_Helper_Izlude)	Honeymoon Helper#Iz_d	1_F_LIBRARYGIRL
diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt
index ad9e30279..6e6e8749a 100644
--- a/npc/re/cities/malangdo.txt
+++ b/npc/re/cities/malangdo.txt
@@ -147,15 +147,15 @@
 		close;
 	}
 }
-prontera,114,77,6	duplicate(Dolangmal)	Dolangmal#1	553
-geffen,109,61,6	duplicate(Dolangmal)	Dolangmal#2	553
-payon,200,106,4	duplicate(Dolangmal)	Dolangmal#3	553
-aldebaran,170,104,4	duplicate(Dolangmal)	Dolangmal#4	553
-morocc,168,275,4	duplicate(Dolangmal)	Dolangmal#5	553
-yuno,165,122,4	duplicate(Dolangmal)	Dolangmal#6	553
-rachel,121,126,4	duplicate(Dolangmal)	Dolangmal#7	553
-lighthalzen,254,83,5	duplicate(Dolangmal)	Dolangmal#8	553
-mora,57,150,4	duplicate(Dolangmal)	Dolangmal#9	553
+prontera,114,77,6	duplicate(Dolangmal)	Dolangmal#1	4_CAT_DOWN
+geffen,109,61,6	duplicate(Dolangmal)	Dolangmal#2	4_CAT_DOWN
+payon,200,106,4	duplicate(Dolangmal)	Dolangmal#3	4_CAT_DOWN
+aldebaran,170,104,4	duplicate(Dolangmal)	Dolangmal#4	4_CAT_DOWN
+morocc,168,275,4	duplicate(Dolangmal)	Dolangmal#5	4_CAT_DOWN
+yuno,165,122,4	duplicate(Dolangmal)	Dolangmal#6	4_CAT_DOWN
+rachel,121,126,4	duplicate(Dolangmal)	Dolangmal#7	4_CAT_DOWN
+lighthalzen,254,83,5	duplicate(Dolangmal)	Dolangmal#8	4_CAT_DOWN
+mora,57,150,4	duplicate(Dolangmal)	Dolangmal#9	4_CAT_DOWN
 
 -	script	::Odgnalam	-1,{
 	mes "This cat is sleeping in the warm "+((strnpcinfo(2) == "albe")?"Alberta":"Izlude")+" sun.";
@@ -205,14 +205,14 @@ mora,57,150,4	duplicate(Dolangmal)	Dolangmal#9	553
 	warp "malangdo",217,85;
 	close;
 }
-alberta,200,151,4	duplicate(Odgnalam)	Odgnalam#albe	554
-izlude,182,218,4	duplicate(Odgnalam)	Odgnalam#iz	554	// Old coordinates: (182,192)
-izlude_a,182,218,4	duplicate(Odgnalam)	Odgnalam#iz_a	554
-izlude_b,182,218,4	duplicate(Odgnalam)	Odgnalam#iz_b	554
-izlude_c,182,218,4	duplicate(Odgnalam)	Odgnalam#iz_c	554
-izlude_d,182,218,4	duplicate(Odgnalam)	Odgnalam#iz_d	554
+alberta,200,151,4	duplicate(Odgnalam)	Odgnalam#albe	4_CAT_REST
+izlude,182,218,4	duplicate(Odgnalam)	Odgnalam#iz	4_CAT_REST	// Old coordinates: (182,192)
+izlude_a,182,218,4	duplicate(Odgnalam)	Odgnalam#iz_a	4_CAT_REST
+izlude_b,182,218,4	duplicate(Odgnalam)	Odgnalam#iz_b	4_CAT_REST
+izlude_c,182,218,4	duplicate(Odgnalam)	Odgnalam#iz_c	4_CAT_REST
+izlude_d,182,218,4	duplicate(Odgnalam)	Odgnalam#iz_d	4_CAT_REST
 
-malangdo,219,86,4	script	Kong#malang	545,{
+malangdo,219,86,4	script	Kong#malang	4_CAT_SAILOR2,{
 	mes "[Kong]";
 	mes "Did you have fun in Malangdo?";
 	mes "The fleet has a service to Izlude and Alberta.";
@@ -284,7 +284,7 @@ malangdo,219,86,4	script	Kong#malang	545,{
 
 // Generic Malangdo NPCs :: malang_tre
 //============================================================
-malangdo,147,117,3	script	Innkeeper#malang	554,{
+malangdo,147,117,3	script	Innkeeper#malang	4_CAT_REST,{
 	mes "You see a lazy cat standing on a chair.";
 	mes "You guess that this is the Innkeeper.";
 	next;
@@ -330,7 +330,7 @@ malangdo,147,117,3	script	Innkeeper#malang	554,{
 	close;
 }
 
-malangdo,151,120,3	script	Minstrel#mal	479,{
+malangdo,151,120,3	script	Minstrel#mal	4_M_MINSTREL,{
 	mes "[Minstrel]";
 	mes "Boy, that lazy cat makes me want to just nap all day long.";
 	next;
@@ -339,7 +339,7 @@ malangdo,151,120,3	script	Minstrel#mal	479,{
 	close;
 }
 
-malangdo,149,120,5	script	Wanderer#mal	485,5,1,{
+malangdo,149,120,5	script	Wanderer#mal	4_F_WANDERER,5,1,{
 	mes "[Wanderer]";
 	mes "The cats living in here are so energetic.";
 	mes "Is it weird that they make me want to dance all day?";
@@ -367,7 +367,7 @@ OnTouch:
 	end;
 }
 
-malangdo,216,168,3	script	Cat Trainer#mal1	558,0,8,{
+malangdo,216,168,3	script	Cat Trainer#mal1	4_F_ALCHE_A,0,8,{
 	emotion e_awsm;
 	mes "[Cat Trainer]";
 	mes "Ooo~ their soft puffy tails and soft fur~";
@@ -399,7 +399,7 @@ OnTouch:
 	end;
 }
 
-malangdo,164,203,3	script	Cat Trainer#mal2	853,{
+malangdo,164,203,3	script	Cat Trainer#mal2	4_M_YURI,{
 	emotion e_awsm;
 	mes "[Cat Trainer]";
 	mes "Ooo~ their soft puffy tails and soft fur~";
diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt
index ba2196aa9..ddc261e4f 100644
--- a/npc/re/cities/malaya.txt
+++ b/npc/re/cities/malaya.txt
@@ -17,7 +17,7 @@
 // Port Malaya Transportation
 //============================================================
 // Old coordinates: alberta (237,71)
-alberta,196,202,3	script	Optamara Crew#alberta	100,{
+alberta,196,202,3	script	Optamara Crew#alberta	4W_SAILOR,{
 	mes "[Optamara Crew]";
 	mes "Hey, there!";
 	mes "It's 10,000 Zeny to go to Port Malaya. Interested?";
@@ -60,7 +60,7 @@ alberta,196,202,3	script	Optamara Crew#alberta	100,{
 	}
 }
 
-malaya,276,55,4	script	Optamara Crew#malaya	100,{
+malaya,276,55,4	script	Optamara Crew#malaya	4W_SAILOR,{
 	if (malaya_hi < 10) {
 		mes "[Optamara Crew]";
 		mes "I think the village is still busy. Done with your visit? There is always a ship heading for Alberta.";
@@ -90,7 +90,7 @@ malaya,276,55,4	script	Optamara Crew#malaya	100,{
 
 // Generic Port Malaya NPCs
 //============================================================
-ma_in01,30,94,4	script	Inn Keeper#ma	583,{
+ma_in01,30,94,4	script	Inn Keeper#ma	4_F_MALAYA,{
 	if (malaya_hi < 10) {
 		mes "[Inn Keeper]";
 		mes "Oh my! Visiting?";
@@ -187,9 +187,9 @@ OnTouch:
 	mes "The unidentified creature looks at you and runs away.";
 	close;
 }
-ma_fild01,74,367,6	duplicate(Unidentified Creature#i)	Unidentified Creature#01	572,2,2
-ma_fild02,282,41,4	duplicate(Unidentified Creature#i)	Unidentified Creature#05	572,2,2
-ma_scene01,195,92,4	duplicate(Unidentified Creature#i)	Unidentified Creature#09	572,2,2
+ma_fild01,74,367,6	duplicate(Unidentified Creature#i)	Unidentified Creature#01	4_MAL_BUDIDAI,2,2
+ma_fild02,282,41,4	duplicate(Unidentified Creature#i)	Unidentified Creature#05	4_MAL_BUDIDAI,2,2
+ma_scene01,195,92,4	duplicate(Unidentified Creature#i)	Unidentified Creature#09	4_MAL_BUDIDAI,2,2
 
 -	script	Unidentified Creature#j	-1,{
 	end;
@@ -260,16 +260,16 @@ OnTouch:
 	mes "The unidentified creature looks at you and runs away.";
 	close;
 }
-ma_fild01,109,116,4	duplicate(Unidentified Creature#j)	Unidentified Creature#02	572,2,2
-ma_fild01,280,150,6	duplicate(Unidentified Creature#j)	Unidentified Creature#03	572,2,2
-ma_fild01,309,221,6	duplicate(Unidentified Creature#j)	Unidentified Creature#04	572,2,2
-ma_fild02,246,324,4	duplicate(Unidentified Creature#j)	Unidentified Creature#06	572,2,2
-ma_fild02,71,296,6	duplicate(Unidentified Creature#j)	Unidentified Creature#07	572,2,2
-ma_fild02,32,263,4	duplicate(Unidentified Creature#j)	Unidentified Creature#08	572,2,2
-ma_scene01,158,139,4	duplicate(Unidentified Creature#j)	Unidentified Creature#10	572,2,2
-ma_scene01,167,112,6	duplicate(Unidentified Creature#j)	Unidentified Creature#11	572,2,2
-
-malaya,227,311,4	script	Grandma#ma01	575,{
+ma_fild01,109,116,4	duplicate(Unidentified Creature#j)	Unidentified Creature#02	4_MAL_BUDIDAI,2,2
+ma_fild01,280,150,6	duplicate(Unidentified Creature#j)	Unidentified Creature#03	4_MAL_BUDIDAI,2,2
+ma_fild01,309,221,6	duplicate(Unidentified Creature#j)	Unidentified Creature#04	4_MAL_BUDIDAI,2,2
+ma_fild02,246,324,4	duplicate(Unidentified Creature#j)	Unidentified Creature#06	4_MAL_BUDIDAI,2,2
+ma_fild02,71,296,6	duplicate(Unidentified Creature#j)	Unidentified Creature#07	4_MAL_BUDIDAI,2,2
+ma_fild02,32,263,4	duplicate(Unidentified Creature#j)	Unidentified Creature#08	4_MAL_BUDIDAI,2,2
+ma_scene01,158,139,4	duplicate(Unidentified Creature#j)	Unidentified Creature#10	4_MAL_BUDIDAI,2,2
+ma_scene01,167,112,6	duplicate(Unidentified Creature#j)	Unidentified Creature#11	4_MAL_BUDIDAI,2,2
+
+malaya,227,311,4	script	Grandma#ma01	4_F_BARYO_OLD,{
 	if (malaya_hi < 10) {
 		mes "[Grandma]";
 		mes "You're not from around here? Take care of yourself.";
@@ -321,7 +321,7 @@ malaya,227,311,4	script	Grandma#ma01	575,{
 	close;
 }
 
-malaya,189,263,4	script	Drumming Young Man#ma02	578,{
+malaya,189,263,4	script	Drumming Young Man#ma02	4_M_BARYO_MAN,{
 	if (malaya_hi < 10) {
 		emotion e_omg;
 		mes "[Drumming Young Man]";
@@ -374,7 +374,7 @@ malaya,189,263,4	script	Drumming Young Man#ma02	578,{
 	close;
 }
 
-malaya,270,59,4	script	Port Guard#ma03	570,{
+malaya,270,59,4	script	Port Guard#ma03	4_MAL_SOLDIER,{
 	if (malaya_hi < 10) {
 		emotion e_swt2;
 		mes "[Port Guard]";
@@ -427,7 +427,7 @@ malaya,270,59,4	script	Port Guard#ma03	570,{
 	}
 }
 
-malaya,88,252,4	script	Little Girl#ma04	576,{
+malaya,88,252,4	script	Little Girl#ma04	4_F_BARYO_GIRL,{
 	if (malaya_hi < 10) {
 		mes "[Little Girl]";
 		mes "I'm scared but I have to visit the fairy in the forest.";
@@ -459,7 +459,7 @@ malaya,88,252,4	script	Little Girl#ma04	576,{
 	close;
 }
 
-malaya,219,92,6	script	Little Kid#ma05	577,{
+malaya,219,92,6	script	Little Kid#ma05	4_M_BARYO_BOY,{
 	if (malaya_hi < 10) {
 		mes "[Little Kid]";
 		mes "My mom told me not to play outside because its dangerous. Why?";
@@ -497,7 +497,7 @@ malaya,219,92,6	script	Little Kid#ma05	577,{
 	close;
 }
 
-malaya,363,283,4	script	Local#ma06	582,{
+malaya,363,283,4	script	Local#ma06	4_M_MALAYA,{
 	if (malaya_hi < 10) {
 		mes "[Local]";
 		mes "Hmm... is it time to be careful of the witches' curse?";
@@ -560,7 +560,7 @@ malaya,363,283,4	script	Local#ma06	582,{
 	close;
 }
 
-malaya,41,127,6	script	Old Man #ma07	574,{
+malaya,41,127,6	script	Old Man #ma07	4_M_BARYO_OLD,{
 	if (malaya_hi < 10) {
 		mes "[Old Man]";
 		mes "Foreigners are not welcomed that much when our village is chaotic like these days.";
@@ -600,7 +600,7 @@ malaya,41,127,6	script	Old Man #ma07	574,{
 	close;
 }
 
-malaya,63,185,4	script	Woman#ma08	583,{
+malaya,63,185,4	script	Woman#ma08	4_F_MALAYA,{
 	if (malaya_hi < 10) {
 		mes "[Woman]";
 		mes "I don't have anything to share with you.";
@@ -772,7 +772,7 @@ function	script	F_Malaya_Jeepney	{
 	close;
 }
 
-malaya,237,240,4	script	Jeepney Driver#01	582,{
+malaya,237,240,4	script	Jeepney Driver#01	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif01",
@@ -792,7 +792,7 @@ malaya,237,240,4	script	Jeepney Driver#01	582,{
 	);
 }
 
-malaya,67,44,4	script	Jeepney Driver#02	582,{
+malaya,67,44,4	script	Jeepney Driver#02	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif02",
@@ -810,7 +810,7 @@ malaya,67,44,4	script	Jeepney Driver#02	582,{
 	);
 }
 
-malaya,282,129,4	script	Jeepney Driver#03	582,{
+malaya,282,129,4	script	Jeepney Driver#03	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif03",
@@ -828,7 +828,7 @@ malaya,282,129,4	script	Jeepney Driver#03	582,{
 	);
 }
 
-malaya,134,250,6	script	Jeepney Driver#04	582,{
+malaya,134,250,6	script	Jeepney Driver#04	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif04",
@@ -846,7 +846,7 @@ malaya,134,250,6	script	Jeepney Driver#04	582,{
 	);
 }
 
-malaya,341,153,4	script	Jeepney Driver#05	582,{
+malaya,341,153,4	script	Jeepney Driver#05	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif05",
@@ -864,7 +864,7 @@ malaya,341,153,4	script	Jeepney Driver#05	582,{
 	);
 }
 
-malaya,293,290,6	script	Jeepney Driver#06	582,{
+malaya,293,290,6	script	Jeepney Driver#06	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif06",
@@ -882,7 +882,7 @@ malaya,293,290,6	script	Jeepney Driver#06	582,{
 	);
 }
 
-malaya,242,221,4	script	Jeepney Driver#07	582,{
+malaya,242,221,4	script	Jeepney Driver#07	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif07",
@@ -897,7 +897,7 @@ malaya,242,221,4	script	Jeepney Driver#07	582,{
 	);
 }
 
-malaya,62,245,6	script	Jeepney Driver#08	582,{
+malaya,62,245,6	script	Jeepney Driver#08	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif08",
@@ -913,7 +913,7 @@ malaya,62,245,6	script	Jeepney Driver#08	582,{
 	);
 }
 
-malaya,257,58,6	script	Jeepney Driver#09	582,{
+malaya,257,58,6	script	Jeepney Driver#09	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif09",
diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt
index baa5f90bc..c3c05d6f5 100644
--- a/npc/re/cities/mora.txt
+++ b/npc/re/cities/mora.txt
@@ -18,14 +18,14 @@
 
 // Set 1 :: mora_resident
 //============================================================
-mora,52,138,5	script	Mungmung#p	516,{
+mora,52,138,5	script	Mungmung#p	4_M_RAFLE_GR,{
 	mes "[Mungmung]";
 	mes "I'm not the innkeeper!";
 	mes "Why do people want to pay me when they see me?";
 	close;
 }
 
-mora,160,123,3	script	Nemnem#p	517,{
+mora,160,123,3	script	Nemnem#p	4_M_RAFLE_OLD,{
 	mes "[Nemnem]";
 	mes "My pain is getting worse and worse";
 	mes "since the crevice appeared in Bifrost.";
@@ -45,7 +45,7 @@ mora,160,123,3	script	Nemnem#p	517,{
 	}
 }
 
-mora,105,104,3	script	Boaster#podo	514,{
+mora,105,104,3	script	Boaster#podo	4_M_DOGTRAVELER2,{
 	mes "[Boaster]";
 	mes "So the situation";
 	mes "was at its worst.";
@@ -73,7 +73,7 @@ mora,105,104,3	script	Boaster#podo	514,{
 	close;
 }
 
-mora,105,100,1	script	Rangrang#p	518,{
+mora,105,100,1	script	Rangrang#p	4_F_RAFLE_PK,{
 	mes "[Rangrang]";
 	mes "I've never heard such a boring and sad story.";
 	mes "I feel like crying!";
@@ -83,7 +83,7 @@ mora,105,100,1	script	Rangrang#p	518,{
 /*
 // Disabled due to overlapping with RangRang,
 // and is not clickable on official servers.
-mora,105,100,1	script	Gurgur#p	516,{
+mora,105,100,1	script	Gurgur#p	4_M_RAFLE_GR,{
       mes "[Gurgur]";
       mes "He's been crying, falling asleep,";
       mes "and then waking up for 210 times now.";
@@ -93,7 +93,7 @@ mora,105,100,1	script	Gurgur#p	516,{
 }
 */
 
-mora,99,100,7	script	Decoy#podo	515,{
+mora,99,100,7	script	Decoy#podo	4_F_DOGTRAVELER,{
 	mes "[A Decoy]";
 	mes "Oh~!";
 	mes "That's just so";
@@ -102,7 +102,7 @@ mora,99,100,7	script	Decoy#podo	515,{
 	close;
 }
 
-mora,98,104,5	script	Moved Raffle#podo	516,{
+mora,98,104,5	script	Moved Raffle#podo	4_M_RAFLE_GR,{
 	mes "[Moved Raffle]";
 	mes "This is sad, too sad!";
 	mes "I'm not sure why,";
@@ -111,7 +111,7 @@ mora,98,104,5	script	Moved Raffle#podo	516,{
 	close;
 }
 
-mora,102,107,5	script	Relieved Raffle#podo	517,{
+mora,102,107,5	script	Relieved Raffle#podo	4_M_RAFLE_OLD,{
 	mes "[Relieved Raffle]";
 	mes "Wow~!";
 	mes "This is exciting.";
@@ -124,7 +124,7 @@ mora,102,107,5	script	Relieved Raffle#podo	517,{
 	close;
 }
 
-mora,101,107,5	script	Excited Raffle#podo	518,{
+mora,101,107,5	script	Excited Raffle#podo	4_F_RAFLE_PK,{
 	mes "[Excited Raffle]";
 	mes "Wow~";
 	mes "The story is no fun at all.";
@@ -135,34 +135,34 @@ mora,101,107,5	script	Excited Raffle#podo	518,{
 	close;
 }
 
-mora,103,100,5	script	Impressed Raffle#podo	518,{
+mora,103,100,5	script	Impressed Raffle#podo	4_F_RAFLE_PK,{
 	mes "[Impressed Raffle]";
 	mes "Wow! Wow!";
 	close;
 }
 
-mora,123,94,7	script	Visitor to Mora#podo1	515,{
+mora,123,94,7	script	Visitor to Mora#podo1	4_F_DOGTRAVELER,{
 	mes "[Visitor to Mora]";
 	mes "I'm stuck here because of the crevice, which appeared out of nowhere.";
 	mes "Ha......";
 	close;
 }
 
-mora,155,72,3	script	Visitor to Mora#podo2	513,{
+mora,155,72,3	script	Visitor to Mora#podo2	4_M_DOGTRAVELER,{
 	mes "[Visitor to Mora]";
 	mes "Isn't this one cheerful village?";
 	mes "With Bifrost blocked like that, I'm thinking of settling here permanently.";
 	close;
 }
 
-mora,184,169,5	script	Worker#mo1	516,{
+mora,184,169,5	script	Worker#mo1	4_M_RAFLE_GR,{
 	mes "[Worker]";
 	mes "I heard that somebody made it out of the Labyrinth Forest alive.";
 	mes "Whoever it is, I want to meet this person myself.";
 	close;
 }
 
-mora,179,155,1	script	Novice Worker#mo	516,{
+mora,179,155,1	script	Novice Worker#mo	4_M_RAFLE_GR,{
 	mes "[Novice Worker]";
 	mes "I'll come out of the Labyrinth Forest and become a hero!";
 	next;
@@ -181,7 +181,7 @@ mora,179,155,1	script	Novice Worker#mo	516,{
 	close;
 }
 
-mora,177,157,5	script	Indifferent Worker#mo	518,{
+mora,177,157,5	script	Indifferent Worker#mo	4_F_RAFLE_PK,{
 	mes "[Novice Worker]";
 	mes "I'll come out of the Labyrinth Forest and become a hero!";
 	next;
@@ -200,7 +200,7 @@ mora,177,157,5	script	Indifferent Worker#mo	518,{
 	close;
 }
 
-mora,108,182,5	script	Worker#mo4	516,{
+mora,108,182,5	script	Worker#mo4	4_M_RAFLE_GR,{
 	mes "[Worker]";
 	mes "Stay clear of the Labyrinth Forest.";
 	mes "Don't ever dream of peeking in out of curiosity.";
@@ -210,7 +210,7 @@ mora,108,182,5	script	Worker#mo4	516,{
 
 // Set 2 :: npc
 //============================================================
-mora,122,97,6	script	Relaxing Raffle#ep14_1	517,{
+mora,122,97,6	script	Relaxing Raffle#ep14_1	4_M_RAFLE_OLD,{
 	mes "[Relaxing Rafflesia]";
 	mes "The public bath in the center of the village is a symbol of Mora Village.";
 	next;
@@ -226,7 +226,7 @@ mora,122,97,6	script	Relaxing Raffle#ep14_1	517,{
 	close;
 }
 
-mora,174,171,0	script	Warehouse Worker#mo1	518,{
+mora,174,171,0	script	Warehouse Worker#mo1	4_F_RAFLE_PK,{
 	mes "[Shortffle]";
 	mes "I want to climb the ladder,";
 	mes "but my legs are too short to do that.";
@@ -237,7 +237,7 @@ mora,174,171,0	script	Warehouse Worker#mo1	518,{
 	close;
 }
 
-mora,113,185,4	script	Reading Raffle#ep14_1	516,{
+mora,113,185,4	script	Reading Raffle#ep14_1	4_M_RAFLE_GR,{
 	mes "You see a Rafflesia";
 	mes "lost in reading.";
 	next;
@@ -327,7 +327,7 @@ mora,113,185,4	script	Reading Raffle#ep14_1	516,{
 	}
 }
 
-mora,99,65,6	script	Banana Rafflesia#ep14_1	516,{
+mora,99,65,6	script	Banana Rafflesia#ep14_1	4_M_RAFLE_GR,{
 	mes "[Banana Rafflesia]";
 	mes "You want a banana?";
 	next;
@@ -347,7 +347,7 @@ mora,99,65,6	script	Banana Rafflesia#ep14_1	516,{
 	}
 }
 
-mora,30,128,4	script	Relaxing Traveler#ep14_1	514,{
+mora,30,128,4	script	Relaxing Traveler#ep14_1	4_M_DOGTRAVELER2,{
 	mes "[Traveler]";
 	mes "The Mora Inn is famous";
 	mes "for its unusual pieces of furniture.";
@@ -361,7 +361,7 @@ mora,30,128,4	script	Relaxing Traveler#ep14_1	514,{
 	close;
 }
 
-mora,130,96,4	script	Relaxing Traveler#ep14_2	513,{
+mora,130,96,4	script	Relaxing Traveler#ep14_2	4_M_DOGTRAVELER,{
 	mes "[Traveler]";
 	mes "The Rafflesia in Mora Village all look alike, so it's so confusing.";
 	mes "It's like looking at centuplets...";
@@ -374,7 +374,7 @@ mora,130,96,4	script	Relaxing Traveler#ep14_2	513,{
 	close;
 }
 
-mora,43,113,4	script	Wounded Rafflesia#ep14_1	517,{
+mora,43,113,4	script	Wounded Rafflesia#ep14_1	4_M_RAFLE_OLD,{
 	mes "[Wounded Raffle]";
 	mes "Ugghh... What was it";
 	mes "that was in the bath... Arrrghh...";
@@ -383,7 +383,7 @@ mora,43,113,4	script	Wounded Rafflesia#ep14_1	517,{
 	close;
 }
 
-mora,168,161,4	script	Warehouse Worker#mo2	513,{
+mora,168,161,4	script	Warehouse Worker#mo2	4_M_DOGTRAVELER,{
 	mes "[Lively]";
 	mes "The inn over there~";
 	mes "It should've been mine~";
@@ -404,7 +404,7 @@ mora,168,161,4	script	Warehouse Worker#mo2	513,{
 	close;
 }
 
-mora,175,161,6	script	Warehouse Worker#mo3	518,{
+mora,175,161,6	script	Warehouse Worker#mo3	4_F_RAFLE_PK,{
 	mes "[Kuorita]";
 	mes "Oh... this duck...";
 	next;
@@ -422,7 +422,7 @@ mora,175,161,6	script	Warehouse Worker#mo3	518,{
 	close;
 }
 
-mora,140,186,3	script	Raffle Philosopher	517,{
+mora,140,186,3	script	Raffle Philosopher	4_M_RAFLE_OLD,{
 	mes "[Raffle Philosopher]";
 	mes "With a little token of appreciation, I will tell you a quote that will help you in your life.";
 	next;
@@ -1029,31 +1029,31 @@ mora,140,186,3	script	Raffle Philosopher	517,{
 	warp "mora",31,132;
 	end;
 }
-mora,140,72,4	duplicate(#mora_traveler)	Traveler#ep14_1_1	513	//Upset Traveler
-mora,138,72,6	duplicate(#mora_traveler)	Traveler#ep14_1_2	513	//Traveler That Posed the Question
-mora,139,73,4	duplicate(#mora_traveler)	Traveler#ep14_1_3	513	//Traveler Trying to Stop the Fight
+mora,140,72,4	duplicate(#mora_traveler)	Traveler#ep14_1_1	4_M_DOGTRAVELER	//Upset Traveler
+mora,138,72,6	duplicate(#mora_traveler)	Traveler#ep14_1_2	4_M_DOGTRAVELER	//Traveler That Posed the Question
+mora,139,73,4	duplicate(#mora_traveler)	Traveler#ep14_1_3	4_M_DOGTRAVELER	//Traveler Trying to Stop the Fight
 
 // Set 3 :: tre
 //============================================================
-mora,132,185,5	script	Mora Villager#sleep5	518,{
+mora,132,185,5	script	Mora Villager#sleep5	4_F_RAFLE_PK,{
 	mes "[Mora Villager]";
 	mes "Phew~ Phew~";
 	close;
 }
 
-mora,133,185,5	script	Mora Villager#sleep2	524,{
+mora,133,185,5	script	Mora Villager#sleep2	4_M_RAFLE_VI,{
 	mes "[Mora Villager]";
 	mes "Snore...";
 	close;
 }
 
-mora,134,185,3	script	Mora Villager#sleep1	525,{
+mora,134,185,3	script	Mora Villager#sleep1	4_F_RAFLE_VI,{
 	mes "[Mora Villager]";
 	mes "Snort--";
 	close;
 }
 
-mora,132,184,5	script	Mora Villager#sleep6	522,{
+mora,132,184,5	script	Mora Villager#sleep6	4_M_RAFLE_OR,{
 	mes "[Mora Villager]";
 	mes "Snort--";
 	close;
@@ -1065,31 +1065,31 @@ mora,133,184,1	script	Mora Villager#sleep4	1790,{
 	end;
 }
 
-mora,134,184,1	script	Mora Villager#sleep3	516,{
+mora,134,184,1	script	Mora Villager#sleep3	4_M_RAFLE_GR,{
 	mes "[Mora Villager]";
 	mes "Phew phew pheeew~";
 	close;
 }
 
-mora,132,183,7	script	Mora Villager#sleep7	524,{
+mora,132,183,7	script	Mora Villager#sleep7	4_M_RAFLE_VI,{
 	mes "[Mora Villager]";
 	mes "z Z";
 	close;
 }
 
-mora,133,183,7	script	Mora Villager#sleep8	518,{
+mora,133,183,7	script	Mora Villager#sleep8	4_F_RAFLE_PK,{
 	mes "[Mora Villager]";
 	mes "z Z";
 	end;
 }
 
-mora,134,183,1	script	Mora Villager#sleep9	522,{
+mora,134,183,1	script	Mora Villager#sleep9	4_M_RAFLE_OR,{
 	mes "[Mora Villager]";
 	mes "z Z";
 	close;
 }
 
-mora,43,127,3	script	Innkeeper#mora_inn	522,{
+mora,43,127,3	script	Innkeeper#mora_inn	4_M_RAFLE_OR,{
 	mes "[Innkeeper]";
 	mes "Oh~ looks like we have another adventurer.";
 	mes "Where are you from?";
@@ -1163,7 +1163,7 @@ mora,43,127,3	script	Innkeeper#mora_inn	522,{
 	}
 }
 
-mora,48,128,0	script	Drawer#mora_warehouse	111,{
+mora,48,128,0	script	Drawer#mora_warehouse	HIDDEN_NPC,{
 	if(basicskillcheck() && getskilllv("NV_BASIC") < 6) {
 		mes "- You don't remember how to open the warehouse. -";
 		close;
diff --git a/npc/re/cities/yuno.txt b/npc/re/cities/yuno.txt
index 630969db6..ac2fb25fb 100644
--- a/npc/re/cities/yuno.txt
+++ b/npc/re/cities/yuno.txt
@@ -11,10 +11,10 @@
 //= 1.0 First version.
 //============================================================
 
-yuno,150,283,4	duplicate(JunoSoldier1)	Juno Soldier#juno	852
-yuno,165,283,4	duplicate(JunoSoldier2)	Juno Soldier#2juno	852
-yuno,227,292,4	duplicate(JunoSoldier3)	Juno Soldier#3juno	852
-yuno,165,228,4	duplicate(JunoSoldier4)	Juno Soldier#4juno	852
-yuno,150,228,4	duplicate(JunoSoldier5)	Juno Soldier#5juno	852
-yuno,334,182,4	duplicate(JunoSoldier6)	Juno Soldier#6juno	852
-yuno,263,320,4	duplicate(JunoSoldier7)	Juno Soldier#7juno	852
+yuno,150,283,4	duplicate(JunoSoldier1)	Juno Soldier#juno	4_M_EIN_SOLDIER
+yuno,165,283,4	duplicate(JunoSoldier2)	Juno Soldier#2juno	4_M_EIN_SOLDIER
+yuno,227,292,4	duplicate(JunoSoldier3)	Juno Soldier#3juno	4_M_EIN_SOLDIER
+yuno,165,228,4	duplicate(JunoSoldier4)	Juno Soldier#4juno	4_M_EIN_SOLDIER
+yuno,150,228,4	duplicate(JunoSoldier5)	Juno Soldier#5juno	4_M_EIN_SOLDIER
+yuno,334,182,4	duplicate(JunoSoldier6)	Juno Soldier#6juno	4_M_EIN_SOLDIER
+yuno,263,320,4	duplicate(JunoSoldier7)	Juno Soldier#7juno	4_M_EIN_SOLDIER