Added ability to use constants instead of sprite IDs for NPCs. Converted all npcs to use this.

12 files changed, 110 insertions, 110 deletions

diff --git a/npc/re/quests/eden/11-25.txt b/npc/re/quests/eden/11-25.txt
index 361f8fb57..200454e81 100644
--- a/npc/re/quests/eden/11-25.txt
+++ b/npc/re/quests/eden/11-25.txt
@@ -12,7 +12,7 @@
 //= 1.2 Optimized. [Euphy]
 //============================================================
 
-moc_para01,36,38,3	script	Mission [11 - 25]#Tuto	857,{
+moc_para01,36,38,3	script	Mission [11 - 25]#Tuto	4_BOARD3,{
 	if (countitem(6219) < 1) {
 		mes "- You need to have an -";
 		mes "- ^4d4dff'Eden Group Mark'^000000 -";
@@ -97,7 +97,7 @@ L_Quest:
 	close;
 }
 
-moc_para01,32,30,6	script	Spike	914,{
+moc_para01,32,30,6	script	Spike	4_F_CHILD,{
 	for(set .@i,11114; .@i<11124; set .@i,.@i+1) {
 		set .@j, checkquest(.@i,HUNTING);
 		if (.@j == 2) switch(.@i) {
diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt
index fe147f210..a4f0d5637 100644
--- a/npc/re/quests/eden/26-40.txt
+++ b/npc/re/quests/eden/26-40.txt
@@ -12,7 +12,7 @@
 //= 1.2 Optimized. [Euphy]
 //============================================================
 
-moc_para01,38,38,3	script	Mission [26 - 40]	857,{
+moc_para01,38,38,3	script	Mission [26 - 40]	4_BOARD3,{
 	if (countitem(6219) < 1) {
 		mes "You are not a qualified member. You can not use the bulletin board.";
 		close;
@@ -95,7 +95,7 @@ L_Quest:
 	close;
 }
 
-geffen,103,42,5	script	Sponiac	99,{
+geffen,103,42,5	script	Sponiac	4W_M_03,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
 		mes "[Sponiac]";
 		mes "Why are you carrying so many items?";
@@ -175,7 +175,7 @@ L_Quest:
 	close;
 }
 
-moc_ruins,173,55,3	script	Dieshin Man	89,{
+moc_ruins,173,55,3	script	Dieshin Man	4_M_ORIENT02,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
 		mes "[Dieshin Man]";
 		mes "Why are you carrying so many items?";
@@ -259,7 +259,7 @@ L_Quest:
 	close;
 }
 
-pay_fild07,83,89,7	script	Zoologist	89,{
+pay_fild07,83,89,7	script	Zoologist	4_M_ORIENT02,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
 		mes "[Zoologist]";
 		mes "Why are you carrying so many items?";
@@ -324,7 +324,7 @@ pay_fild07,83,89,7	script	Zoologist	89,{
 	close;
 }
 
-prt_fild03,30,254,3	script	Entomologist	83,{
+prt_fild03,30,254,3	script	Entomologist	4_M_01,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
 		mes "[Entomologist]";
 		mes "Why are you carrying so many items?";
@@ -389,7 +389,7 @@ prt_fild03,30,254,3	script	Entomologist	83,{
 	close;
 }
 
-xmas_fild01,92,57,3	script	Biologist	97,{
+xmas_fild01,92,57,3	script	Biologist	4W_M_01,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
 		mes "[Biologist]";
 		mes "Why are you carrying so many items?";
@@ -454,7 +454,7 @@ xmas_fild01,92,57,3	script	Biologist	97,{
 	close;
 }
 
-payon,179,66,3	script	Dashia	931,{
+payon,179,66,3	script	Dashia	4_M_RACHMAN1,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
 		mes "[Dashia]";
 		mes "Why are you carrying so many items?";
diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt
index 57f131f07..45c5ee876 100644
--- a/npc/re/quests/eden/41-55.txt
+++ b/npc/re/quests/eden/41-55.txt
@@ -12,7 +12,7 @@
 //= 1.2 Optimized. [Euphy]
 //============================================================
 
-moc_para01,40,38,3	script	Mission [41 - 55]	857,{
+moc_para01,40,38,3	script	Mission [41 - 55]	4_BOARD3,{
 	if (countitem(6219) < 1) {
 		mes "You are not an Eden group member. You are not qualified to access the bulletin board.";
 		close;
diff --git a/npc/re/quests/eden/56-70.txt b/npc/re/quests/eden/56-70.txt
index c3a99ed3e..c7e5103a8 100644
--- a/npc/re/quests/eden/56-70.txt
+++ b/npc/re/quests/eden/56-70.txt
@@ -15,7 +15,7 @@
 //= 1.5 Optimized, based on code by Zopokx. [Euphy]
 //============================================================
 
-moc_para01,42,38,3	script	Mission [56 - 70]	857,{
+moc_para01,42,38,3	script	Mission [56 - 70]	4_BOARD3,{
 	if (countitem(6219) < 1) {
 		mes "To get these missions, I need to Join the Eden Group first. I must find Secretary Lime Evenor and become a member.";
 		close;
diff --git a/npc/re/quests/eden/71-85.txt b/npc/re/quests/eden/71-85.txt
index db704a3de..57102982c 100644
--- a/npc/re/quests/eden/71-85.txt
+++ b/npc/re/quests/eden/71-85.txt
@@ -13,7 +13,7 @@
 //= 1.3 Updated to match the official scripts. [Euphy]
 //============================================================
 
-moc_para01,44,38,3	script	Mission [71 - 85]	857,{
+moc_para01,44,38,3	script	Mission [71 - 85]	4_BOARD3,{
 	if (countitem(6219) < 1) {
 		mes "- Only members of the -";
 		mes "- Eden Group can read -";
diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt
index 33dcf87ac..60bbac0e2 100644
--- a/npc/re/quests/eden/86-90.txt
+++ b/npc/re/quests/eden/86-90.txt
@@ -13,7 +13,7 @@
 //= 1.3 Updated to match the official script. [Euphy]
 //============================================================
 
-moc_para01,48,175,3	script	86-90 Mission Board	857,{
+moc_para01,48,175,3	script	4_M_04-90 Mission Board	857,{
 	if (countitem(6219) < 1) {
 		mes "Wait a minute!";
 		mes "-You need to have an-";
diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt
index 21ae3cfe1..0c3c6b12f 100644
--- a/npc/re/quests/eden/91-99.txt
+++ b/npc/re/quests/eden/91-99.txt
@@ -13,7 +13,7 @@
 //= 1.3 Updated to match the official script. [Euphy]
 //============================================================
 
-moc_para01,48,177,3	script	91-99 Mission Board	857,{
+moc_para01,48,177,3	script	4_F_02-99 Mission Board	857,{
 	if (countitem(6219) < 1) {
 		mes "Wait a minute!";
 		mes "-You need to have an-";
diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt
index a2d2a624b..7c6be1aa4 100644
--- a/npc/re/quests/eden/eden_common.txt
+++ b/npc/re/quests/eden/eden_common.txt
@@ -19,7 +19,7 @@
 //= 1.8 Updated to match the latest official script. [Euphy]
 //============================================================
 
-moc_para01,27,35,5	script	Secretary Lime Evenor	952,{
+moc_para01,27,35,5	script	Secretary Lime Evenor	4_F_EDEN_OFFICER,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
 		mes "- Wait a minute !! -";
 		mes "- Currently you're carrying -";
@@ -212,44 +212,44 @@ moc_para01,27,35,5	script	Secretary Lime Evenor	952,{
 		close;
 	}
 }
-prontera,124,76,3	duplicate(eto)	Eden Teleport Officer#1	729
-moc_ruins,68,164,3	duplicate(eto)	Eden Teleport Officer#2	729
-geffen,132,66,3	duplicate(eto)	Eden Teleport Officer#3	729
-alberta,124,67,3	duplicate(eto)	Eden Teleport Officer#4	729
-aldebaran,133,119,5	duplicate(eto)	Eden Teleport Officer#5	729
-izlude_in,68,162,1	duplicate(eto)	Eden Teleport Officer#6	729
-prt_church,103,78,3	duplicate(eto)	Eden Teleport Officer#7	729
-geffen_in,160,104,5	duplicate(eto)	Eden Teleport Officer#8	729
-moc_prydb1,53,126,3	duplicate(eto)	Eden Teleport Officer#9	729
-alberta_in,75,39,3	duplicate(eto)	Eden Teleport Officer#10	729
-payon_in02,58,58,1	duplicate(eto)	Eden Teleport Officer#11	729
-payon,177,111,3	duplicate(eto)	Eden Teleport Officer#12	729
-que_ng,33,73,3	duplicate(eto)	Eden Teleport Officer#13	729
-que_ng,144,161,5	duplicate(eto)	Eden Teleport Officer#14	729
-yuno,144,189,5	duplicate(eto)	Eden Teleport Officer#15	729
-rachel,125,144,3	duplicate(eto)	Eden Teleport Officer#16	729
-comodo,202,151,4	duplicate(eto)	Eden Teleport Officer#17	729
-hugel,93,153,4	duplicate(eto)	Eden Teleport Officer#18	729
-veins,220,109,4	duplicate(eto)	Eden Teleport Officer#19	729
-einbroch,250,211,4	duplicate(eto)	Eden Teleport Officer#20	729
-lighthalzen,164,86,4	duplicate(eto)	Eden Teleport Officer#21	729
-amatsu,100,145,5	duplicate(eto)	Eden Teleport Officer#22	729
-ayothaya,221,191,3	duplicate(eto)	Eden Teleport Officer#23	729
-louyang,224,107,3	duplicate(eto)	Eden Teleport Officer#24	729
-gonryun,162,122,5	duplicate(eto)	Eden Teleport Officer#25	729
-moscovia,209,197,5	duplicate(eto)	Eden Teleport Officer#26	729
-brasilis,191,224,3	duplicate(eto)	Eden Teleport Officer#27	729
-dewata,192,193,5	duplicate(eto)	Eden Teleport Officer#28	729
-morocc,161,97,5	duplicate(eto)	Eden Teleport Officer#29	729
-izlude,131,148,4	duplicate(eto)	Eden Teleport Officer#30	729
-izlude_a,131,148,4	duplicate(eto)	Eden Teleport Officer#30::eto_iz_a	729
-izlude_b,131,148,4	duplicate(eto)	Eden Teleport Officer#30::eto_iz_b	729
-izlude_c,131,148,4	duplicate(eto)	Eden Teleport Officer#30::eto_iz_c	729
-izlude_d,131,148,4	duplicate(eto)	Eden Teleport Officer#30::eto_iz_d	729
-umbala,105,158,3	duplicate(eto)	Eden Teleport Officer#31	729
-malaya,238,206,6	duplicate(eto)	Eden Teleport Officer#32	729
+prontera,124,76,3	duplicate(eto)	Eden Teleport Officer#1	4_F_NOVICE
+moc_ruins,68,164,3	duplicate(eto)	Eden Teleport Officer#2	4_F_NOVICE
+geffen,132,66,3	duplicate(eto)	Eden Teleport Officer#3	4_F_NOVICE
+alberta,124,67,3	duplicate(eto)	Eden Teleport Officer#4	4_F_NOVICE
+aldebaran,133,119,5	duplicate(eto)	Eden Teleport Officer#5	4_F_NOVICE
+izlude_in,68,162,1	duplicate(eto)	Eden Teleport Officer#6	4_F_NOVICE
+prt_church,103,78,3	duplicate(eto)	Eden Teleport Officer#7	4_F_NOVICE
+geffen_in,160,104,5	duplicate(eto)	Eden Teleport Officer#8	4_F_NOVICE
+moc_prydb1,53,126,3	duplicate(eto)	Eden Teleport Officer#9	4_F_NOVICE
+alberta_in,75,39,3	duplicate(eto)	Eden Teleport Officer#10	4_F_NOVICE
+payon_in02,58,58,1	duplicate(eto)	Eden Teleport Officer#11	4_F_NOVICE
+payon,177,111,3	duplicate(eto)	Eden Teleport Officer#12	4_F_NOVICE
+que_ng,33,73,3	duplicate(eto)	Eden Teleport Officer#13	4_F_NOVICE
+que_ng,144,161,5	duplicate(eto)	Eden Teleport Officer#14	4_F_NOVICE
+yuno,144,189,5	duplicate(eto)	Eden Teleport Officer#15	4_F_NOVICE
+rachel,125,144,3	duplicate(eto)	Eden Teleport Officer#16	4_F_NOVICE
+comodo,202,151,4	duplicate(eto)	Eden Teleport Officer#17	4_F_NOVICE
+hugel,93,153,4	duplicate(eto)	Eden Teleport Officer#18	4_F_NOVICE
+veins,220,109,4	duplicate(eto)	Eden Teleport Officer#19	4_F_NOVICE
+einbroch,250,211,4	duplicate(eto)	Eden Teleport Officer#20	4_F_NOVICE
+lighthalzen,164,86,4	duplicate(eto)	Eden Teleport Officer#21	4_F_NOVICE
+amatsu,100,145,5	duplicate(eto)	Eden Teleport Officer#22	4_F_NOVICE
+ayothaya,221,191,3	duplicate(eto)	Eden Teleport Officer#23	4_F_NOVICE
+louyang,224,107,3	duplicate(eto)	Eden Teleport Officer#24	4_F_NOVICE
+gonryun,162,122,5	duplicate(eto)	Eden Teleport Officer#25	4_F_NOVICE
+moscovia,209,197,5	duplicate(eto)	Eden Teleport Officer#26	4_F_NOVICE
+brasilis,191,224,3	duplicate(eto)	Eden Teleport Officer#27	4_F_NOVICE
+dewata,192,193,5	duplicate(eto)	Eden Teleport Officer#28	4_F_NOVICE
+morocc,161,97,5	duplicate(eto)	Eden Teleport Officer#29	4_F_NOVICE
+izlude,131,148,4	duplicate(eto)	Eden Teleport Officer#30	4_F_NOVICE
+izlude_a,131,148,4	duplicate(eto)	Eden Teleport Officer#30::eto_iz_a	4_F_NOVICE
+izlude_b,131,148,4	duplicate(eto)	Eden Teleport Officer#30::eto_iz_b	4_F_NOVICE
+izlude_c,131,148,4	duplicate(eto)	Eden Teleport Officer#30::eto_iz_c	4_F_NOVICE
+izlude_d,131,148,4	duplicate(eto)	Eden Teleport Officer#30::eto_iz_d	4_F_NOVICE
+umbala,105,158,3	duplicate(eto)	Eden Teleport Officer#31	4_F_NOVICE
+malaya,238,206,6	duplicate(eto)	Eden Teleport Officer#32	4_F_NOVICE
 
-moc_para01,30,10,0	script	#eden_out	45,1,1,{
+moc_para01,30,10,0	script	#eden_out	WARPNPC,1,1,{
 OnTouch:
 	switch (nak_warp) {
 		case 1: warp "prontera",116,72; end;
@@ -289,7 +289,7 @@ OnTouch:
 	end;
 }
 
-moc_para01,47,39,3	script	#warp_2_pass	111,{
+moc_para01,47,39,3	script	#warp_2_pass	HIDDEN_NPC,{
 	if (countitem(6219) > 0) {
 		mes "[Lime Evenor]";
 		mes "Oh, it is an exclusive place only for Eden's members.";
@@ -313,7 +313,7 @@ moc_para01,47,39,3	script	#warp_2_pass	111,{
 	close;
 }
 
-moc_para01,16,22,7	script	Old Adventurer#eden	900,{
+moc_para01,16,22,7	script	Old Adventurer#eden	4_M_HUMERCHANT,{
 	mes "[Old Adventurer]";
 	mes "Harsh, I am strong enough even if I look old! What is his name? Lime Evenor? He just ignores me like I am a some kind of old senile bastard.";
 	next;
@@ -323,7 +323,7 @@ moc_para01,16,22,7	script	Old Adventurer#eden	900,{
 	close;
 }
 
-moc_para01,182,48,3	script	Eden's Chief#eden	886,{
+moc_para01,182,48,3	script	Eden's Chief#eden	4_COOK,{
 	set .@eggf,rand(1,118);
 	set .@eggf_1,.@eggf + 1;
 	set .@eggf_2,.@eggf + 2;
@@ -346,7 +346,7 @@ moc_para01,182,48,3	script	Eden's Chief#eden	886,{
 	close;
 }
 
-moc_para01,172,28,5	script	Eden's Intern#eden	883,{
+moc_para01,172,28,5	script	Eden's Intern#eden	4_M_ALCHE_D,{
 	mes "[Eden's Intern]";
 	mes "Actually, I realized that.";
 	next;
@@ -361,7 +361,7 @@ moc_para01,172,28,5	script	Eden's Intern#eden	883,{
 	close;
 }
 
-moc_para01,20,35,5	script	Office Assistant Neede	814,{
+moc_para01,20,35,5	script	Office Assistant Neede	4_F_CHNDOCTOR,{
 	mes "[Neede]";
 	mes "I became a Eden's member several years ago, but it feels like it was yesterday.";
 	mes "I have been doing lots of work, so I didn't even notice how many years I spent here.";
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
index b8cd44ce4..8b81b5c4f 100644
--- a/npc/re/quests/eden/eden_iro.txt
+++ b/npc/re/quests/eden/eden_iro.txt
@@ -14,7 +14,7 @@
 
 // Acolyte Warper (part of other/acolyte_warp.txt)
 //============================================================
-moc_para01,14,32,5	script	Aperture#acolytewarp	90,{
+moc_para01,14,32,5	script	Aperture#acolytewarp	4_F_01,{
 	mes "[Aperture]";
 	mes "Hello there, adventurer.";
 	mes "I've been studying magic from all over Rune-Midgard to upgrade what I believe to be one of the greatest skills available to the acolyte class.";
@@ -90,7 +90,7 @@ moc_para01,14,32,5	script	Aperture#acolytewarp	90,{
 
 // Carrot & Red Potion Traders
 //============================================================
-moc_para01,166,51,3	script	Phelix#edco	85,{
+moc_para01,166,51,3	script	Phelix#edco	4_M_03,{
 	mes "[Phelix]";
 	mes "Oh... I see from that look that you want me to work and give you Meat and Carrots...";
 	mes "Well my friend Izaac here has some Red Potions with him, but I only have some Carrots.";
@@ -153,7 +153,7 @@ moc_para01,166,51,3	script	Phelix#edco	85,{
 	end;
 }
 
-moc_para01,163,51,7	script	Izaac#edco	86,{
+moc_para01,163,51,7	script	Izaac#edco	4_M_04,{
 	mes "[Izaac]";
 	mes "Good day!";
 	mes "Have you collected any weird stuff from monsters?";
@@ -259,7 +259,7 @@ moc_para01,163,51,7	script	Izaac#edco	86,{
 
 // Safe to 7 Certificate Exchanger
 //============================================================
-moc_para01,50,39,4	script	Eve Natalia	882,{
+moc_para01,50,39,4	script	Eve Natalia	4_F_SITDOWN,{
 	mes "[Eve Natalia]";
 	mes "So I'm in town for a while to see if I can strike up some commerce with MVP hunters!";
 	mes "I'm willing to take some MVP gear and give you these upgrade Certificates I have in exchange;";
@@ -337,7 +337,7 @@ moc_para01,50,39,4	script	Eve Natalia	882,{
 
 // Bubble Gum & Battle Manual Exchanger
 //============================================================
-moc_para01,48,184,2	script	Gum & Manual Exchanger	562,{
+moc_para01,48,184,2	script	Gum & Manual Exchanger	2_DROP_MACHINE,{
 	if (Weight < MaxWeight / 2) {
 		mes "You're carrying too many items right now.";
 		close;	
@@ -429,7 +429,7 @@ L_Exchange:
 
 // Kafra Stacker
 //============================================================
-moc_para01,41,169,2	script	Kafra Stacker#eden	749,{
+moc_para01,41,169,2	script	Kafra Stacker#eden	4_M_ALCHE_B,{
 	mes "[Toma]";
 	mes "I can take your non-stacking Kafra Consumables";
 	mes "and make them fit neatly into stacks!";
@@ -456,7 +456,7 @@ moc_para01,41,169,2	script	Kafra Stacker#eden	749,{
 
 // Code Redeemer
 //============================================================
-moc_para01,38,162,2	script	Code the Redeemer#Give1	405,{
+moc_para01,38,162,2	script	Code the Redeemer#Give1	4_M_YOUNGKNIGHT,{
 	mes "[Code the Redeemer]";
 	mes "Welcome, "+strcharinfo(0)+"!";
 	mes "I've been expecting you.";
@@ -484,29 +484,29 @@ moc_para01,38,162,2	script	Code the Redeemer#Give1	405,{
 //============================================================
 /* Due to the irregularity of iRO's databases, some of these sprites may not display properly. */
 
-moc_para01,32,171,4	cashshop	Kafra Headgears#eden1	115,14024:500,14098:150,17081:300,14097:500,14094:1000,14017:400,14099:300
-moc_para01,35,174,2	cashshop	Kafra Dye Shop#dyes2	114,6287:150
-moc_para01,36,170,2	cashshop	Kafra Consumables#eden3	112,13810:5,14167:400,16556:100,14111:75,14075:25,16419:30,14107:70,14104:50,14112:25,14082:30,14091:60,14088:30,14085:60,14169:40,14170:40,14172:40,14173:40,14171:40,14174:40,14159:100,14160:100,14161:100,14162:100,14163:100:14164:100,16420:1500
-moc_para01,32,174,2	cashshop	Kafra Rental Items#eden	721,16683:150,16682:50,14126:250,14125:250,16430:250,14137:250,14127:250,14118:250,14119:250,14132:250,16425:250,14124:250,14133:250,14130:250,16424:250,14136:250,14122:250,16426:250,14135:250,14134:250,14138:250,16428:250,16431:250,14139:250,14131:250,16429:250,16427:250
-moc_para01,36,172,2	cashshop	Kafra Costume#eden5	860,16974:300,16972:600,16973:150,16975:150,16977:150,17014:150,17015:150
-moc_para01,35,168,1	cashshop	Kafra Utility Shop#eden	113,16677:25,13990:400,16396:100,16394:100,17106:500,6241:10,6240:10,6225:15,6226:15,14002:5,6294:500,7776:50,7619:30,7620:30,12208:40,14156:400,12210:40,14158:400,14042:50,14044:50,14046:50,14048:50,14114:50,14166:40,16418:500,16381:400,14165:100,14157:100,14178:100
+moc_para01,32,171,4	cashshop	Kafra Headgears#eden1	4_F_KAFRA3,14024:500,14098:150,17081:300,14097:500,14094:1000,14017:400,14099:300
+moc_para01,35,174,2	cashshop	Kafra Dye Shop#dyes2	4_F_KAFRA4,6287:150
+moc_para01,36,170,2	cashshop	Kafra Consumables#eden3	4_F_KAFRA6,13810:5,14167:400,16556:100,14111:75,14075:25,16419:30,14107:70,14104:50,14112:25,14082:30,14091:60,14088:30,14085:60,14169:40,14170:40,14172:40,14173:40,14171:40,14174:40,14159:100,14160:100,14161:100,14162:100,14163:100:14164:100,16420:1500
+moc_para01,32,174,2	cashshop	Kafra Rental Items#eden	4_F_KAFRA7,16683:150,16682:50,14126:250,14125:250,16430:250,14137:250,14127:250,14118:250,14119:250,14132:250,16425:250,14124:250,14133:250,14130:250,16424:250,14136:250,14122:250,16426:250,14135:250,14134:250,14138:250,16428:250,16431:250,14139:250,14131:250,16429:250,16427:250
+moc_para01,36,172,2	cashshop	Kafra Costume#eden5	4_F_KAFRA8,16974:300,16972:600,16973:150,16975:150,16977:150,17014:150,17015:150
+moc_para01,35,168,1	cashshop	Kafra Utility Shop#eden	4_F_KAFRA5,16677:25,13990:400,16396:100,16394:100,17106:500,6241:10,6240:10,6225:15,6226:15,14002:5,6294:500,7776:50,7619:30,7620:30,12208:40,14156:400,12210:40,14158:400,14042:50,14044:50,14046:50,14048:50,14114:50,14166:40,16418:500,16381:400,14165:100,14157:100,14178:100
 
 // Duplicate NPCs
 //============================================================
 /* Technically these NPC names are different, but it's not worth editing the original scripts. */
 
 // Weapon/Armor Refiner "Normalson" (merchants/refine.txt)
-moc_para01,14,185,4	script	Normalson#ed	826,{
+moc_para01,14,185,4	script	Normalson#ed	4_M_DWARF,{
 	callfunc "refinemain","Normalson",0;
 	end;
 }
 
 // Advanced Refiner "Suhnmi" (merchants/advanced_refiner.txt)
-moc_para01,26,185,4	duplicate(Suhnbi#cash)	Suhnmi#eden	85
+moc_para01,26,185,4	duplicate(Suhnbi#cash)	Suhnmi#eden	4_M_03
 
 // HD Refiner "Blacksmith Mighty Hammer" (re/merchants/hd_refiner.txt)
 // A combination of the +7~9 and +10 and up refiner, currently a placeholder.
-moc_para01,38,185,4	duplicate(MightyHammer)	Mighty Hammer#ed	826
+moc_para01,38,185,4	duplicate(MightyHammer)	Mighty Hammer#ed	4_M_DWARF
 
 // Refiner Effect
 -	script	#eden_refine_effect	-1,{
@@ -521,25 +521,25 @@ OnTimer5000:
 }
 
 // Gym Pass Trainer "Ripped Cabus" (other/gympass)
-moc_para01,33,162,4	duplicate(Ripped Cabus#GymPass)	Ripped Callus#ed	899
+moc_para01,33,162,4	duplicate(Ripped Cabus#GymPass)	Ripped Callus#ed	4_M_HUMAN_02
 
 // RWC 2012 Enchanter "Goldenthiefberg" (events/RWC_2012.txt)
 // A combination of the slotter and enchanter, currently a placeholder.
-moc_para01,27,179,4	script	RWC Enchanter#new10	87,{ end; }
+moc_para01,27,179,4	script	RWC Enchanter#new10	4_M_BARBER,{ end; }
 
 // Cash Headgear Dyer "Alora" (merchants/cashheadgear_dye.txt)
 // Also converts some +8 and up headgears into costumes, currently a placeholder.
-moc_para01,21,185,4	duplicate(Alora)	Alora#headgear_dye2	862
+moc_para01,21,185,4	duplicate(Alora)	Alora#headgear_dye2	4_F_LGTGIRL
 
 // Stylist "Dinorah Lacostt" (?)
 // Dyes clothing for an Omni Clothing Dye, currently a placeholder.
-moc_para01,33,185,4	script	Dinorah Lacostt#ed	862,{ end; }
+moc_para01,33,185,4	script	Dinorah Lacostt#ed	4_F_LGTGIRL,{ end; }
 
 // Commonly Updated NPCs
 //============================================================
 /* These scripts change on a regular basis, so they're mostly just placeholders for now. */
 
-moc_para01,29,35,4	script	Gramps#huntquests	866,{
+moc_para01,29,35,4	script	Gramps#huntquests	4_M_LGTGRAND,{
 	mes "[Gramps]";
 	mes "When you get to being my";
 	mes "age, you become bitter.";
@@ -555,7 +555,7 @@ moc_para01,29,35,4	script	Gramps#huntquests	866,{
 	//switch(select("Yes, I'll help.:Reward Me!:^ff0000I want to quit hunting^000000:^0000ffCan you warp me?^000000:Can you erase the timer?:What missions are you giving?:Give me Limited 3 day VIP:Tell me more about the VIP Access:No thanks, pops.")) {
 }
 
-moc_para01,13,22,4	script	Merry Badger#xch	882,{
+moc_para01,13,22,4	script	Merry Badger#xch	4_F_SITDOWN,{
 	mes "[Merry Badger]";
 	mes "Hello there!  I'm Merry Badger and I was hired to exchange the ^00CC00Eden Merit Badges^000000!";
 	next;
@@ -595,4 +595,4 @@ moc_para01,174,33,3	script	Bathory#2012spirits	1102,{
 	}
 }
 
-moc_para01,26,174,4	script	Grandma Boxter#boxx	840,{ end; }
+moc_para01,26,174,4	script	Grandma Boxter#boxx	4_F_THAISHAMAN,{ end; }
diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt
index 222a3f97e..bdd6eb4c2 100644
--- a/npc/re/quests/eden/eden_quests.txt
+++ b/npc/re/quests/eden/eden_quests.txt
@@ -19,7 +19,7 @@
 //= 1.5 Added GM management function. [Euphy]
 //============================================================
 
-moc_para01,25,35,4	script	Instructor Boya#para01	469,{
+moc_para01,25,35,4	script	Instructor Boya#para01	4_M_KNIGHT_GOLD,{
 	if (countitem(6219) > 0) {
 		if (para_suv01 == 0) {
 			mes "[Boya]";
@@ -1089,7 +1089,7 @@ moc_para01,25,35,4	script	Instructor Boya#para01	469,{
 	close;
 }
 
-moc_fild11,180,253,5	script	Talking Dog#para03	972,{
+moc_fild11,180,253,5	script	Talking Dog#para03	4_RUS_DWOLF,{
 	if (para_suv01 == 1) {
 		mes "[Talking Dog]";
 		mes "kkkkuuuuahhh.";
@@ -1323,7 +1323,7 @@ moc_fild11,180,253,5	script	Talking Dog#para03	972,{
 	close;
 }
 
-prt_sewb1,131,262,3	script	Timid Cat#para04	422,{
+prt_sewb1,131,262,3	script	Timid Cat#para04	4_M_BABYCAT,{
 	if (para_suv01 < 6) {
 		mes "[Timid Cat]";
 		mes "Meow...";
@@ -1515,7 +1515,7 @@ prt_sewb1,131,262,3	script	Timid Cat#para04	422,{
 	close;
 }
 
-pay_arche,41,136,3	script	Eden Member Karl#para05	904,{
+pay_arche,41,136,3	script	Eden Member Karl#para05	4_M_KHMAN,{
 	if (para_suv01 < 13) {
 		if (countitem(6219) > 0) {
 			mes "[Karl]";
@@ -1658,7 +1658,7 @@ pay_arche,41,136,3	script	Eden Member Karl#para05	904,{
 	close;
 }
 
-anthell01,29,264,5	script	Eden Member Cloud#para06	899,{
+anthell01,29,264,5	script	Eden Member Cloud#para06	4_M_HUMAN_02,{
 	if (para_suv01 < 17) {
 		if (countitem(6219) > 0) {
 			mes "[Cloud]";
@@ -1848,7 +1848,7 @@ anthell01,29,264,5	script	Eden Member Cloud#para06	899,{
 	close;
 }
 
-in_orcs01,38,175,3	script	Eden Member Hooksha	803,{
+in_orcs01,38,175,3	script	Eden Member Hooksha	1_F_SIGNZISK,{
 	if (para_suv01 < 24) {
 		if (countitem(6219) > 0) {
 			mes "[Hooksha]";
@@ -2117,7 +2117,7 @@ in_orcs01,38,175,3	script	Eden Member Hooksha	803,{
 	}
 }
 
-iz_dun04,43,46,3	script	Eden Member Callandiva	745,{
+iz_dun04,43,46,3	script	Eden Member Callandiva	4_F_CRU,{
 	if (para_suv01 < 33) {
 		if (countitem(6219) > 0) {
 			mes "[Callandiva]";
@@ -2257,7 +2257,7 @@ iz_dun04,43,46,3	script	Eden Member Callandiva	745,{
 	close;
 }
 
-moc_para01,112,96,5	script	Administrator Michael	967,{
+moc_para01,112,96,5	script	Administrator Michael	4_M_RUSMAN1,{
 	mes "[Michael]";
 	mes "Why did you come here?";
 	next;
@@ -3534,7 +3534,7 @@ moc_para01,112,96,5	script	Administrator Michael	967,{
 	}
 }
 
-moc_para01,179,44,3	script	Chef	820,{
+moc_para01,179,44,3	script	Chef	4_M_CHNCOOK,{
 	mes "[Chef]";
 	mes "What's up?";
 	mes "Do you want a Meal? Or do you have other business?";
@@ -3838,7 +3838,7 @@ moc_para01,179,44,3	script	Chef	820,{
 	}
 }
 
-moc_para01,23,35,4	script	Instructor Ur	468,{
+moc_para01,23,35,4	script	Instructor Ur	4_M_KNIGHT_BLACK,{
 	mes "[Instructor Ur]";
 	if (countitem(6219) > 0) {
 		if (BaseLevel < 60) {
@@ -3985,7 +3985,7 @@ L_Level:
 	close;
 }
 
-comodo,173,354,6	script	Romeo#01	55,{
+comodo,173,354,6	script	Romeo#01	1_M_JOBTESTER,{
 	if ((para_suv01 == 39) && (romeo < 1)) {
 		mes "[Romeo]";
 		mes "Ah, there you are.";
@@ -4031,7 +4031,7 @@ comodo,173,354,6	script	Romeo#01	55,{
 	close;
 }
 
-um_fild01,34,280,6	script	Romeo#02	55,{
+um_fild01,34,280,6	script	Romeo#02	1_M_JOBTESTER,{
 	if (romeo == 2) {
 		if (checkquest(7216,HUNTING) == 2) {
 			mes "[Romeo]";
@@ -4083,7 +4083,7 @@ um_fild01,34,280,6	script	Romeo#02	55,{
 	close;
 }
 
-glast_01,195,131,6	script	Johan	95,{
+glast_01,195,131,6	script	Johan	4_F_SISTER,{
 	if ((para_suv01 == 43) && (johan < 1)) {
 		mes "[Johan]";
 		mes "...";
@@ -4148,7 +4148,7 @@ glast_01,195,131,6	script	Johan	95,{
 	close;
 }
 
-ein_fild08,172,359,4	script	Kiren	989,{
+ein_fild08,172,359,4	script	Kiren	4_M_4THPRIN1,{
 	if ((para_suv01 == 46) && (kiren < 1)) {
 		mes "[Kiren]";
 		mes "Hey there.";
@@ -4215,7 +4215,7 @@ ein_fild08,172,359,4	script	Kiren	989,{
 	close;
 }
 
-ice_dun01,154,13,6	script	Naomi	726,{
+ice_dun01,154,13,6	script	Naomi	4_F_JOB_BLACKSMITH,{
 	if ((para_suv01 == 49) && (naomi < 1)) {
 		mes "[Naomi]";
 		mes "It is so cold in here.";
@@ -4283,7 +4283,7 @@ ice_dun01,154,13,6	script	Naomi	726,{
 	close;
 }
 
-mid_camp,212,229,4	script	Margaret	893,{
+mid_camp,212,229,4	script	Margaret	4_F_HUWOMAN,{
 	if ((para_suv01 == 52) && (margaret < 1)) {
 		mes "[Margaret]";
 		mes "Oh, hello there.";
@@ -4334,7 +4334,7 @@ mid_camp,212,229,4	script	Margaret	893,{
 	close;
 }
 
-man_fild01,43,234,2	script	Paradise Dispatch#01	939,{
+man_fild01,43,234,2	script	Paradise Dispatch#01	4_DST_SOLDIER,{
 	if (margaret == 1) {
 		mes "[Paradise Dispatch]";
 		mes "Hey you, can you help me here?";
@@ -4380,7 +4380,7 @@ man_fild01,43,234,2	script	Paradise Dispatch#01	939,{
 	close;
 }
 
-spl_fild02,377,149,4	script	Paradise Dispatch#02	946,{
+spl_fild02,377,149,4	script	Paradise Dispatch#02	4_M_DST_MASTER,{
 	if (margaret == 4) {
 		mes "[Paradise Dispatch]";
 		mes "So Margaret sent you to help me?";
@@ -4426,7 +4426,7 @@ spl_fild02,377,149,4	script	Paradise Dispatch#02	946,{
 	close;
 }
 
-moc_para01,111,83,3	script	Toren	813,{
+moc_para01,111,83,3	script	Toren	2_M_OLDBLSMITH,{
 	if (checkweight(1101,5) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you're carrying";
@@ -4731,7 +4731,7 @@ L_Select:
 	return;
 }
 
-moc_para01,112,79,3	script	Weapons Expert	851,{
+moc_para01,112,79,3	script	Weapons Expert	4_M_REPAIR,{
 	if (checkweight(1101,5) == 0) {
 		mes "^3355FFWait a second!";
 		mes "Right now, you are carrying";
@@ -5120,7 +5120,7 @@ L_GetWeapon:
 	return;
 }
 
-sec_in02,25,33,4	script	Assistant#para_suvquest	422,{
+sec_in02,25,33,4	script	Assistant#para_suvquest	4_M_BABYCAT,{
 	callfunc "F_GM_NPC";
 	mes "Password";
 	next;
diff --git a/npc/re/quests/eden/eden_service.txt b/npc/re/quests/eden/eden_service.txt
index 4bec34777..8335b9fbe 100644
--- a/npc/re/quests/eden/eden_service.txt
+++ b/npc/re/quests/eden/eden_service.txt
@@ -58,5 +58,5 @@
 	close;
 }
 
-moc_para01,173,120,0	duplicate(pggc)	Goods Cabinet#01	111
-moc_para01,170,120,0	duplicate(pggc)	Goods Cabinet#02	111
+moc_para01,173,120,0	duplicate(pggc)	Goods Cabinet#01	HIDDEN_NPC
+moc_para01,170,120,0	duplicate(pggc)	Goods Cabinet#02	HIDDEN_NPC
diff --git a/npc/re/quests/eden/eden_tutorial.txt b/npc/re/quests/eden/eden_tutorial.txt
index 6221ac16f..92cfb26fd 100644
--- a/npc/re/quests/eden/eden_tutorial.txt
+++ b/npc/re/quests/eden/eden_tutorial.txt
@@ -11,7 +11,7 @@
 //= 1.0 First Version. [Euphy]
 //============================================================
 
-moc_para01,34,178,3	script	Tutorial Instructor	904,{
+moc_para01,34,178,3	script	Tutorial Instructor	4_M_KHMAN,{
 	if (Class == Job_Novice) {
 		// Fall through
 	} else if (checkquest(9167) == -1) {
@@ -567,7 +567,7 @@ moc_para01,34,178,3	script	Tutorial Instructor	904,{
 	close;
 }
 
-moc_para01,32,179,4	script	Tutorial Goal	895,{
+moc_para01,32,179,4	script	Tutorial Goal	4_F_KHELLY,{
 	if (checkweight(608,7) == 0) {
 		if (MaxWeight - Weight < getiteminfo(608,7)) {
 			mes "[Tutorial Goal]";
@@ -661,7 +661,7 @@ moc_para01,32,179,4	script	Tutorial Goal	895,{
 	close;
 }
 
-moc_para01,24,175,4	script	Siege Master	734,{
+moc_para01,24,175,4	script	Siege Master	4_M_JOB_KNIGHT2,{
 	set .@checkquest, checkquest(4161);
 	if (.@checkquest == 2) {
 		mes "[Siege Expert]";
@@ -834,7 +834,7 @@ L_Info:
 	return;
 }
 
-moc_para01,21,172,4	script	Party Recruiting Expert	878,{
+moc_para01,21,172,4	script	Party Recruiting Expert	4_M_OILMAN,{
 	set .@checkquest, checkquest(4162);
 	if (.@checkquest == 2) {
 		mes "[Party Recruiting Expert]";
@@ -1016,7 +1016,7 @@ L_Info:
 	return;
 }
 
-moc_para01,12,179,6	script	Battleground Master	419,{
+moc_para01,12,179,6	script	Battleground Master	4_M_KY_HEAD,{
 	set .@checkquest, checkquest(4163);
 	if (.@checkquest == 2) {
 		mes "[Battleground Expert]";
@@ -1196,7 +1196,7 @@ L_Info:
 	return;
 }
 
-moc_para01,28,167,3	script	Memorial Dungeon Expert	868,{
+moc_para01,28,167,3	script	Memorial Dungeon Expert	4_M_LGTGUARD,{
 	set .@checkquest, checkquest(4164);
 	if (.@checkquest == 2) {
 		mes "[Memorial Dungeon Expert]";
@@ -1374,7 +1374,7 @@ L_Info:
 	return;
 }
 
-moc_para01,14,168,6	script	Map Expert	743,{
+moc_para01,14,168,6	script	Map Expert	2_M_SAGE_OLD,{
 	set .@checkquest, checkquest(4165);
 	if (.@checkquest == 2) {
 		mes "[Map Expert]";