constant-fied!

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5763 54d463be-8e91-2dee-dedb-b68131a5f0ec

npc/cities/alberta.txt

@@ -47,7 +47,7 @@ alberta.gat,97,51,7	script	Merchant	84,{
 alberta.gat,53,39,8	script	Merchant	74,{
 	mes "[Merchant]";
 	mes "Oh, you look like a stranger.  Welcome to Alberta.";
-	emotion 0;
+	emotion e_gasp;
 	next;
 	mes "[Merchant]";
 	mes "I was just brainstorming on some ideas I have for my business.";
@@ -58,7 +58,7 @@ alberta.gat,53,39,8	script	Merchant	74,{
 	next;
 	mes "[Merchant]";
 	mes "Cha-Ching! (you see dollar signs in her eyes)";
-	emotion 8;
+	emotion e_cash;
 	close;
 }
 
@@ -93,7 +93,7 @@ alberta.gat,62,156,2	script	Phina	102,{
 		next;
 		mes "[Phina]";
 		mes "I was startled and so I backed off a bit.  I then realized that it was not grass but a very small creature.";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Phina]";
 		mes "Even calm monsters can be very dangerous when they feel threatened.  So don't startle them by mistake.";
@@ -107,7 +107,7 @@ alberta.gat,62,156,2	script	Phina	102,{
 		next;
 		mes "[Phina]";
 		mes "I was SOOOO scared!! I quickly jumped to the side to avoid it.  Then BAMB!!! It hit a huge tree and crushed it into pieces.";
-		emotion 16;
+		emotion e_wah;
 		next;
 		mes "[Phina]";
 		mes "I sure learned my lesson that day.  NEVER taught any creature cause if they get angry, you'll be in a world of hurt.";
@@ -168,7 +168,7 @@ alberta.gat,131,139,4	script	Drunken old man	709,{
 		
 			mes "[Drunken old man]";
 			mes "What? Ya never heard of it? Stupid! Everybody knows the notorious pirate ship `Going Mary'! (~hiccup~)";
-			emotion 1;
+			emotion e_what;
 			next;
 		sM_1:
 			mes "[Drunken old man]";
@@ -183,12 +183,12 @@ alberta.gat,131,139,4	script	Drunken old man	709,{
 			next;
 			mes "[Drunken old man]";
 			mes "(~sigh!~) (~sob, sob~)... God I miss everyone... Now I'm depressed.  Just go away and leave me be.....";
-			emotion 28;
+			emotion e_sob;
 			close;
 	M_1:
 		mes "[Drunken old man]";
 		mes "That's right! Go AWAY~";
-		emotion 32;
+		emotion e_pif;
 		close;
 }
 
@@ -196,7 +196,7 @@ alberta.gat,131,139,4	script	Drunken old man	709,{
 alberta.gat,90,71,3	script	Soda Man	89,{
 	mes "[Soda Man]";
 	mes "Ummm.... delicious....";
-	emotion 33;
+	emotion e_ok;
 	next;
 	mes "[Soda Man]";
 	mes "Wait! Don't bother me right now.  Hmm? What am I doing you ask?  Well isn't it obvious what I'm doing?";
@@ -314,7 +314,7 @@ alberta.gat,195,151,3	script	Paul	86,{
 	next;
 	mes "[Paul]";
 	mes "Oh! I better warn you, this event is only suitable for HIGH LEVEL warriors.";
-	emotion 0;
+	emotion e_gasp;
 	next;
 	mes "[Paul]";
 	mes "So what do you say?  It only cost 200 zeny to participate and you'll get a ton of experience, guaranteed.";
@@ -375,7 +375,7 @@ M_Menu:
 		next;
 		mes "[Gotanblue]";
 		mes "TURTLE ISLAND TOOK THE LIVES OF MY CLOSEST FRIENDS!!";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Gotanblue]";
 		mes "Can you POSSIBLY understand??.........";
@@ -410,7 +410,7 @@ M_Menu:
 		mes "[Gotanblue]";
 		mes "Then what we feared most happened.  A huge rock formation pierced through the fog right in front of us!";
 		mes "There was no way to avoid it and we crashed violently into it, severely damaging our ship!!";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Gotanblue]";
 		mes "Amazingly the ship held together and we were able to continue on.";
@@ -452,7 +452,7 @@ M_Menu:
 		next;
 		mes "[Gotanblue]";
 		mes "IT WAS TURTLE ISLAND!!! We had landed on the other side of the island! We had no idea how it happened but we immediately cast off once again.";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Gotanblue]";
 		mes "And as if some foul curse and been placed on our group, we again found ourselves on the shores of Turtle Island.";
@@ -464,19 +464,19 @@ M_Menu:
 		next;
 		mes "[Gotanblue]";
 		mes "CURSED ISLAND!!!!!";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "[Gotanblue]";
 		mes "As you can see only I and Jornadan were able to make it out alive.  By pure luck we made back to Alberta....";
 		next;
 		mes "[Gotanblue]";
 		mes "(~sob~sob~sob)... I apologize. I'm am still very emotional about it after all these years... well that is all I have to say about Turtle Island.";
-		emotion 28;
+		emotion e_sob;
 		goto M_Menu;
 	M_2:
 		mes "[Gotanblue]";
 		mes "What's this? After my terrifying story about Turtle Island you still want to got there? You're not at all scared??";
-		emotion 1;
+		emotion e_what;
 		next;
 		mes "[Gotanblue]";
 		mes "So be it... but you will need me as your guide and that will cost 10,000 zeny!";
@@ -501,7 +501,7 @@ M_Menu:
 		sL_Zeny:
 			mes "[Gotanblue]";
 			mes "What's this? I said 10000 zeny.  I will not guide you for less.  Good day!";
-			emotion 1;
+			emotion e_what;
 			close;
 		sM_End:
 			mes "[Gotanblue]";
@@ -537,16 +537,16 @@ M_End:
 alberta_in.gat,23,104,2	script	Turtle Grandpa	120,{
 	mes "[Turtle Grandpa]";
 	mes "~Buuurrrpp!!!~ Oops...";
-	emotion 4;
+	emotion e_swt;
 	next;
 	mes "[Turtle Grandpa]";
 	mes "It's beyond me why people seem to think that Alberta is the center of world trade.";
 	mes "I mean, this place doesn't even have a decent bar for crying out loud!!";
-	emotion 6;
+	emotion e_an;
 	next;
 	mes "[Turtle Grandpa]";
 	mes "Why is it that I have to resort to drinking in a place like this??";
-	emotion 1;
+	emotion e_what;
 	next;
 	menu "-Tell me about Turtle Island.",-, "-How can I get there?",M_1, "-End conversation.",M_End;
 
@@ -559,7 +559,7 @@ alberta_in.gat,23,104,2	script	Turtle Grandpa	120,{
 		next;
 		mes "[Turtle Grandpa]";
 		mes "I for one believe it does.... it HAS TOO!!......";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Turtle Grandpa]";
 		mes "If you are any sort of seaman, if you have a spirit for adventure, and if you have the heart to become a great treasure hunter....";
@@ -600,15 +600,15 @@ alberta_in.gat,23,104,2	script	Turtle Grandpa	120,{
 		sM_1:
 			mes "[Turtle Grandpa]";
 			mes "No way! I have no interest in speaking with someone with greed in his/her heart!";
-			emotion 0;
+			emotion e_gasp;
 			next;
 			mes "[Turtle Grandpa]";
 			mes "Get OUT of my sight!!! GO HOME!";
-			emotion 6;
+			emotion e_an;
 			next;
 			mes "[Turtle Grandpa]";
 			mes "What's this?? You're still here?..... GO! GO AWAY!!............";
-			emotion 27;
+			emotion e_go;
 			close;
 	M_1:
 		mes "[Turtle Grandpa]";
@@ -616,11 +616,11 @@ alberta_in.gat,23,104,2	script	Turtle Grandpa	120,{
 		next;
 		mes "[Turtle Grandpa]";
 		mes "Actually..... IT'S IMPOSSIBLE!!!!";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Turtle Grandpa]";
 		mes "Yet you still want to go there??";
-		emotion 1;
+		emotion e_what;
 		next;
 		mes "[Turtle Grandpa]";
 		mes "I want to warn you about the dangers of going there.... but.... I feel so dizzy..... wooah..... it must be the Vodka....";

npc/cities/aldebaran.txt

@@ -62,11 +62,11 @@ aldebaran.gat,60,70,4	script	Senorita Sylvia	69,{
 	next;
 	mes "[Senorita Sylvia]";
 	mes "B-B-But... *sob*... It's been 5 hours since I started looking for it.....";
-	emotion 28;
+	emotion e_sob;
 	next;
 	mes "[Senorita Sylvia]";
 	mes "Where the hell is it~~~?!";
-	emotion 6;
+	emotion e_an;
 	next;
 	mes "[Senorita Sylvia]";
 	mes "I may look smart, but I am TERRIBLE with directions.....";
@@ -86,7 +86,7 @@ aldebaran.gat,60,70,4	script	Senorita Sylvia	69,{
 	M_End:
 		mes "[Senorita Sylvia]";
 		mes "Whatever.....";
-		emotion 32;
+		emotion e_pif;
 		close;
 }
 
@@ -140,7 +140,7 @@ M_Menu:
 		next;
 		mes "[Isenberg]";
 		mes "You did a good job to get here.";
-		emotion 21;
+		emotion e_no1;
 		goto M_Menu;
 	M_1:
 		mes "[Isenberg]";
@@ -205,7 +205,7 @@ M_Menu:
 		next;
 		mes "[Bebe]";
 		mes "Anyways, I was walking up this narrow path when... out of nowhere, this GIANT, UGLY, PLANT attacked me and my Savage Babe!";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Bebe]";
 		mes "I was so frightened that I ran as far away from it as I could.  When I stopped running I noticed that it hadn't followed me.";
@@ -215,7 +215,7 @@ M_Menu:
 		next;
 		mes "[Bebe]";
 		mes "I then noticed something else.  The plant had a human looking face!! EEEWWW!!!";
-		emotion 19;
+		emotion e_swt2;
 		next;
 		mes "[Bebe]";
 		mes "If you every see one, don't even think about going near it.  It may just bite you to death!";
@@ -235,7 +235,7 @@ M_Menu:
 	M_End:
 		mes "[Bebe]";
 		mes "Ah?! Where is my Savage Babe..? Savage Babe, where are you!";
-		emotion 20;
+		emotion e_hmm;
 		close;
 }
 
@@ -279,12 +279,12 @@ aldebaran.gat,93,80,4	script	Daniel	48,{
 	next;
 	mes "[Daniel]";
 	mes "B-U-T!.....";
-	emotion 0;
+	emotion e_gasp;
 	next;
 	mes "[Daniel]";
 	mes "Last night on the way to see my girl friend, I fell into one of those waterways and sprang my ankle.";
 	mes "I couldn't enjoy my date with my girl friend which sucked big time!";
-	emotion 7;
+	emotion e_ag;
 	next;
 	menu "Gosh, that's too bad.",-,".....",M_1;
 
@@ -298,7 +298,7 @@ aldebaran.gat,93,80,4	script	Daniel	48,{
 	M_1:
 		mes "[Daniel]";
 		mes "Huh? *~Sob sob~* You think I'm a stupid idiot, right? ";
-		emotion 28;
+		emotion e_sob;
 		close;
 }
 
@@ -430,7 +430,7 @@ aldebaran.gat,146,124,4	script	Anastasia	101,{
 	next;
 	mes "[Nastasia]";
 	mes "But... is that.... legal.....??";
-	emotion 1;
+	emotion e_what;
 	next;
 	mes "[Nastasia]";
 	mes "And do they collect tuition....??";
@@ -490,11 +490,11 @@ aldebaran.gat,180,46,4	script	Joo Jahk	88,{
 	next;
 	mes "[Joo Jahk]";
 	mes "But.... Do you think I could drink the water in these waterways?";
-	emotion 20;
+	emotion e_hmm;
 	next;
 	mes "[Joo Jahk]";
 	mes "Actually I already did, but I am still concerned.....";
-	emotion 4;
+	emotion e_swt;
 	next;
 	menu "Continue.",-,"End conversation.",M_End;
 
@@ -530,7 +530,7 @@ aldebaran.gat,212,122,4	script	Gavin	97,{
 		next;
 		mes "[Gavin]";
 		mes "I swear it!";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Gavin]";
 		mes "It was jumping around with the other ordinary Porings.  Angeling... is that what it was...?";
@@ -546,24 +546,24 @@ aldebaran.gat,212,122,4	script	Gavin	97,{
 aldeba_in.gat,152,47,4	script	Giddy Fellow	97,{
 	mes "[Giddy Fellow]";
 	mes "E..E..E..Emergenc----y!!! I CAN'T find my pet chicken anywhere!!";
-	emotion 23;
+	emotion e_omg;
 	next;
 	menu "What's its name?",-,". . . . .",M_1;
 
 		mes "[Giddy Fellow]";
 		mes "It's 'The Great Picky ' ... SOB SOB SOB... gosh... what am I gonna do?!~ Please find my cutey for meee~~~";
-		emotion 28;
+		emotion e_sob;
 		next;
 		menu "Dude! It's such a common name...",-,". . . . .",M_1;
 
 			mes "[Giddy Fellow]";
 			mes "Wha-What are you talking about!! My 'The Great Picky' is the one and only cutest chicken in this whole wide WORLD for Christ's sake~!";
-			emotion 1;
+			emotion e_what;
 			close;
 	M_1:
 		mes "[Giddy Fellow]";
 		mes "Don't you laugh at me~! I don't have any siblings so my cute chicken is like a younger brother to me! SOB SOB SOB SOB";
-		emotion 28;
+		emotion e_sob;
 		close;
 }
 
@@ -621,7 +621,7 @@ aldeba_in.gat,156,179,4	script	Master	61,{
 		M_01:
 			mes "[Master]";
 			mes "Wake up~! Do you really think you'd have a shot with a girl like that?? Be realistic! She's out of your league....";
-			emotion 0;
+			emotion e_gasp;
 			close;
 		M_02:
 			mes "[Master]";
@@ -633,7 +633,7 @@ aldeba_in.gat,156,179,4	script	Master	61,{
 			next;
 			mes "[Master]";
 			mes "You'd cause a LOT of trouble for the neighbors, if ya know what I mean.... Hahahaha!!";
-			emotion 18;
+			emotion e_heh;
 			close;
 		M_04:
 			mes "[Master]";
@@ -642,11 +642,11 @@ aldeba_in.gat,156,179,4	script	Master	61,{
 		M_05:
 			mes "[Master]";
 			mes "Wha-what!";
-			emotion 0;
+			emotion e_gasp;
 			next;
 			mes "[Master]"; 
 			mes "A thirst for young girls~~! It's a c-c-crime!!!!";
-			emotion 19;
+			emotion e_swt2;
 			close;
 	M_1:
 		mes "[Master]";
@@ -717,11 +717,11 @@ aldeba_in.gat,219,61,4	script	Nice Looking Guy	109,{
 aldeba_in.gat,223,121,2	script	Evil looking Guy	63,{
 	mes "[Evil Looking Guy]";
 	mes "Hey dude! Don't you think it's rude for a stranger to enter someone else's house?";
-	emotion 1;
+	emotion e_what;
 	next;
 	mes "[Evil Looking Guy]";
 	mes "Now I'm upset! What reason do you have to come in here and bother me??";
-	emotion 32;
+	emotion e_pif;
 	next;
 	mes "[Evil Looking Guy]";
 	mes "Ah alright, alright.  No more fooling around... you're here because I'm an NPC and you think I'm supposed to help you right?";
@@ -755,7 +755,7 @@ aldeba_in.gat,223,121,2	script	Evil looking Guy	63,{
 		mes "[Evil Looking Guy]";
 		mes "Whattt!!! Get the heck out of my house!! If you're a cop, show me a search warrant.";
 		mes "If you're a member of my family then pull down your pants so I can look at our family mark!";
-		emotion 0;
+		emotion e_gasp;
 		close;
 }
 
@@ -777,24 +777,24 @@ aldeba_in.gat,24,245,4	script	 Kafra Jasmine	115,{
 		mes "[Kafra Jasmine]";
 		mes "HEY! Just SHUT-UP and LISTEN! It took me a whole week to memorize this!";
 		mes "I've got a poor memory unlike the other Kafra agents!";
-		emotion 6;
+		emotion e_an;
 		next;
 		mes "[Kafra Jasmine]";
 		mes "..... Eh!... heh... heh... um...";
-		emotion 19;
+		emotion e_swt2;
 		next;
 		mes "[Kafra Jasmine]";
 		mes "I'm verrrryyy sorry about that... I didn't mean to startle you... you see....";
 		next;
 		mes "[Kafra Jasmine]";
 		mes "That... that... that was just an act.... YEAH! An act I put on for the customers. Heh.. heh....";
-		emotion 4;
+		emotion e_swt;
 		cutin "kafra_03",255;
 		close;
 	M_1:
 		mes "[Kafra Jasmine]";
 		mes ". . . . .";
-		emotion 6;
+		emotion e_an;
 		next;
 		mes "[Kafra Jasmine]";
 		mes "Just so you know, I was a member of Kafra Garrison before I joined the Kafra Service Team.";
@@ -802,7 +802,7 @@ aldeba_in.gat,24,245,4	script	 Kafra Jasmine	115,{
 		next;
 		mes "[Kafra Jasmine]";
 		mes "So please, DON'T TEMPT ME...!!";
-		emotion 32;
+		emotion e_pif;
 		cutin "kafra_03",255;
 		close;
 	M_2:
@@ -811,7 +811,7 @@ aldeba_in.gat,24,245,4	script	 Kafra Jasmine	115,{
 		next;
 		mes "[Kafra Jasmine]";
 		mes "Just kidding~~ Tehehe";
-		emotion 18;
+		emotion e_heh;
 		cutin "kafra_03",255;
 		close;
 }
@@ -1160,7 +1160,7 @@ aldeba_in.gat,81,166,4	script	Kafra Pavianee	117,{
 		mes "Thank you for using our Kafra Service! Have a Nice Day!";
 		getitem 1084,1;
 		set Zeny, Zeny-2000;
-		emotion 15;
+		emotion e_thx;
 		cutin "kafra_01",255;
 		close;
 
@@ -1184,7 +1184,7 @@ aldeba_in.gat,81,166,4	script	Kafra Pavianee	117,{
 	M_3:
 		mes "[Kafra Pavianne]";
 		mes "Thank you for using Kafra Services! I'm Kafra Pavianne, and it was a pleasure to assist you.";
-		emotion 15;
+		emotion e_thx;
 		cutin "kafra_01",255;
 		close;
 
@@ -1207,7 +1207,7 @@ aldeba_in.gat,83,244,4	script	Kafra Blossom	116,{
 	cutin "kafra_02",2;
 	mes "[Kafra Blossom]";
 	mes "..... Pavianne is soooo old school! She's too stubborn is what it is...";
-	emotion 32;
+	emotion e_pif;
 	next;
 	mes "[Kafra Blossom]";
 	mes "We should be trying to make our customers' experience more unique, with new and creative ideas...";
@@ -1220,17 +1220,17 @@ aldeba_in.gat,83,244,4	script	Kafra Blossom	116,{
 	
 		mes "[Kafra Blossom]";
 		mes "Really! Thank you sooo much!! Here is... my... autograph...";
-		emotion 15;
+		emotion e_thx;
 		next;
 		mes "[Kafra Blossom]";
 		mes "Don't bother to look in your Item Inventory for it.  It won't be there... tehehe... for my autograph will remain within your heart.";
-		emotion 33;
+		emotion e_ok;
 		cutin "kafra_02",255;
 		close;
 	M_1:
 		mes "[Kafra Blossom]";
 		mes "Huh? . . . . . That's all? Phew~ such a dull customer...";
-		emotion 1;
+		emotion e_what;
 		cutin "kafra_02",255;
 		close;
 }
@@ -1251,7 +1251,7 @@ aldeba_in.gat,91,244,4	script	Kafra Curly Sue	112,{
 	
 		mes "[Kafra Curly Sue]";
 		mes ".... Sob~sob~... WHAT?? I'm NOT some KID!!";
-		emotion 28;
+		emotion e_sob;
 		next;
 		cutin "kafra_06",255;
 		close;
@@ -1290,7 +1290,7 @@ aldeba_in.gat,148,244,4	script	Kafra Roxie	114,{
 	next;
 	mes "[Kafra Roxie]";
 	mes "Uh... please ignore what I was talking about earlier. Hahaha.....heh...";
-	emotion 4;
+	emotion e_swt;
 	cutin "kafra_04",255;
 	close;
 }

npc/cities/amatsu.txt

@@ -1316,7 +1316,7 @@ amatsu.gat,269,221,1	script	Proposing Girl	758,{
 	mes "Furthermore, the proposal has to be answered";
 	mes "prior to Sunday night after";
 	next;
-	emotion 3;
+	emotion e_lv;
 	mes "[Hutari Sioko]";
 	mes "If you have a secret admirer...";
 	mes "why not meet under that tree";
@@ -1396,7 +1396,7 @@ amatsu.gat,274,178,0	script	Vet	735,{
 	mes "Anyway, do you believe me or not";
 	mes "want to make a bet...?";
 	next;
-	emotion 9;
+	emotion e_dots;
 	mes "[Sakura Seiichi]";
 	mes "What if I...";
 	mes "............";
@@ -1414,7 +1414,7 @@ L2:
 	mes "be careful, one day that kind of things";
 	mes "Will happen to you as well..";
 	next;
-	Emotion 9;
+	emotion e_dots;
 	mes "[Sakura Seiichi]";
 	mes "Hahaha... Hahahaha.....";
 	mes "...............";
@@ -1429,19 +1429,19 @@ L2:
 }
 
 amatsu.gat,283,203,1	script	PokePoke	738,{
-	Emotion 19;
+	emotion e_swt2;
 	mes "[Pokepoke]";
 	mes "The tree on this hill";
 	mes "has existed for a long time, a deep-rooted";
 	mes "and ever-blooming Sakura Tree King";
 	next;
-	Emotion 19;
+	emotion e_swt2;
 	mes "[Pokepoke]";
 	mes "And I am very thankful of this tree,";
 	mes "whenever I feel any sorrow or sadness";
 	mes "I always go sit under that tree";
 	next;
-	Emotion 19;
+	emotion e_swt2;
 	mes "[Pokepoke]";
 	mes "That way no matter what happened";
 	mes "I can forget it all....";
@@ -1449,7 +1449,7 @@ amatsu.gat,283,203,1	script	PokePoke	738,{
 	mes "and make us forget sad things";
 	mes "a magic tree";
 	next;
-	Emotion 19;
+	emotion e_swt2;
 	mes "[Pokepoke]";
 	mes "If you feel any sadness or sorrow";
 	mes "you can try to sit under this tree";

npc/cities/ayothaya.txt

@@ -234,7 +234,7 @@ s_Take:
 	if(Zeny < 11000) goto s_NoZeny;
 	set Zeny, Zeny - 11000;
 	getitem 567,20;
-	emotion 21;
+	emotion e_no1;
 	mes "[Thongpool]";
 	mes "Good, now you have the freshest Shrimp in this village!";
 	mes "It's time for you to go back and ask Ms. Mali to cook them for you.";
@@ -1005,7 +1005,7 @@ s_EnoughShrimp:
 	next;
 	set ayopause,1;
 	set ayoshrimps,0;
-	emotion 21;
+	emotion e_no1;
 	mes "[Mali the Spicy]";
 	mes "The freshest Shrimp that";
 	mes "I've been looking for!";
@@ -1057,7 +1057,7 @@ s_Lemons:
 	close;
 s_EnoughLemon:
 	delitem 568,10;
-	emotion 0;
+	emotion e_gasp;
 	mes "[Mali the Spicy]";
 	mes "Welcome back!";
 	mes "Wow, you came back";
@@ -1137,7 +1137,7 @@ s_EnoughChilee:
 	mes "^486354chop chop";
 	mes "^BA0010Tup tup tup ^28842FPu pu";
 	next;
-	emotion 23;
+	emotion e_omg;
 	misceffect 99;
 	misceffect 90;
 	mes "Wah^050158ah^241999ahhh^0F48CBhaaaahhh^000000!";
@@ -1150,7 +1150,7 @@ s_EnoughChilee:
 	set tomyumgoong,5;
 	set ayoshrimps,0;
 	getitem 566,10;
-	emotion 21;
+	emotion e_no1;
 	mes "[Mali the Spicy]";
 	mes "Here's your";
 	mes "Tom Yum Goong!";
@@ -1186,7 +1186,7 @@ s_EnoughChilee:
 	mes "take care now~";
 	close;
 s_Busy:
-	emotion 16;
+	emotion e_wah;
 	mes "[Mali the Spicy]";
 	mes "Ah...!";
 	mes "So busy, so busy!";
@@ -1251,7 +1251,7 @@ s_Take:
 
 s_NoZeny:
 //custom dialogues
-	emotion 16;
+	emotion e_wah;
 	mes "[Merchant Thongdum]";
 	mes "Aw, you don't have enough zeny.";
 	mes "Please come back when you do!";
@@ -1268,7 +1268,7 @@ OnTouch:
 	if(tomyumgoong == 3)goto s_Lemon;
 	end;
 s_Lemon:
-	emotion 20;
+	emotion e_hmm;
 	mes "[Mr. Jun]";
 	mes "Hello, there?";
 	mes "Did you need";
@@ -1406,39 +1406,39 @@ s_Play:
 	if(@playervar == 3 && @npcvar == 2)goto s_ScissorsPaper;
 	if(@playervar == 3 && @npcvar == 3)goto s_ScissorsScissors;
 s_RockRock:
-	emotion 11;
+	emotion e_rock;
 	emotion 11,1;
 	goto s_Draw;
 s_RockPaper:
-	emotion 12;
+	emotion e_paper;
 	emotion 11,1;
 	goto s_Lose;
 s_RockScissors:
-	emotion 10;
+	emotion e_scissors;
 	emotion 11,1;
 	goto s_Win;
 s_PaperRock:
-	emotion 11;
+	emotion e_rock;
 	emotion 12,1;
 	goto s_Win;
 s_PaperPaper:
-	emotion 12;
+	emotion e_paper;
 	emotion 12,1;
 	goto s_Draw;
 s_PaperScissors:
-	emotion 10;
+	emotion e_scissors;
 	emotion 12,1;
 	goto s_Lose;
 s_ScissorsRock:
-	emotion 11;
+	emotion e_rock;
 	emotion 10,1;
 	goto s_Lose;
 s_ScissorsPaper:
-	emotion 12;
+	emotion e_paper;
 	emotion 10,1;
 	goto s_Win;
 s_ScissorsScissors:
-	emotion 10;
+	emotion e_scissors;
 	emotion 10,1;
 	goto s_Draw;
 s_Draw:
@@ -1495,7 +1495,7 @@ s_Win2:
 	mes "^3C2EE6You have plucked";
 	mes "^3C2EE610 Lemons from the tree.";
 	next;
-	emotion 9;
+	emotion e_dots;
 	mes "[Mr. Jun]";
 	mes "Hmm...";
 	mes "Looks like you need a lot of them.";

npc/cities/comodo.txt

@@ -67,7 +67,7 @@ comodo.gat,221,310,4	script	Rinta	89,{
 	next;
 	mes "[Rinta]";
 	mes "If this is true, then this means that they can have as much meat and seasoning as they want......";
-	emotion 5;
+	emotion e_ic;
 	close;
 }
 
@@ -130,15 +130,15 @@ cmd_in02.gat,178,92,4	script	Shalone	101,{
 cmd_in02.gat,178,86,4	script	Stonae	98,{
 	mes "[Stonae]";
 	mes "WHAT!! Dang it!! AGAIN!! Arghhhhhhh!!!............";
-	emotion 23;
+	emotion e_omg;
 	next;
 	mes "[Stonae]";
 	mes "Sheesh! I can't quit after losing this badly! I won't quit until I win!";
-	emotion 7;
+	emotion e_ag;
 	next;
 	mes "[Stonae]";
 	mes "Let's go!!";
-	emotion 27;
+	emotion e_go;
 	close;
 }
 
@@ -148,7 +148,7 @@ cmd_in02.gat,174,126,4	script	Loyar	83,{
 	mes "[Loyar]";
 	mes "The Comodo Casino has a very pleasing decor... It's quite clean and simple!";
 	mes "The atmosphere is perfect and makes you really want to play more!";
-	emotion 33;
+	emotion e_ok;
 	next;
 	mes "[Loyar]";
 	mes "Atmosphere is everything when it comes to gaming.";
@@ -168,7 +168,7 @@ cmd_in02.gat,73,81,4	script	Martine	48,{
 	set @temp, 2;
 	mes "[Martine]";
 	mes "Gambling? Oh no, it's NOT gambling! Don't say that the Comodo 'CASINO' houses gambling.....";
-	emotion 0;
+	emotion e_gasp;
 	next;
 	mes "[Martine]";
 	mes "We provide some of the greatest 'GAMES' in the world. It's much more of a sophisticated form of 'GAMING' than it is 'GAMBLING'.....";
@@ -176,11 +176,11 @@ cmd_in02.gat,73,81,4	script	Martine	48,{
 	next;
 	mes "[Martine]";
 	mes "What?......... Don't look at me like that!...";
-	emotion 0;
+	emotion e_gasp;
 	next;
 	mes "[Martine]";
 	mes "..... Ok, FINE! I see how it is.  I don't care what you think.  I've lost all my zeny playing in this casino and I have NO regrets whatsoever!";
-	emotion 7;
+	emotion e_ag;
 	next;
 	mes "[Martine]";
 	mes "Today's competition is over! I'll have to go to the ^5555FFComodo Dungeon^000000 and kill some monsters to earn back the zeny I lost.";
@@ -188,7 +188,7 @@ cmd_in02.gat,73,81,4	script	Martine	48,{
 	next;
 	mes "[Martine]";
 	mes "WOO HOO!! I'm going to have a blast!! HAHAHA!";
-	emotion 29;
+	emotion e_gg;
 	close;
 }
 
@@ -196,11 +196,11 @@ cmd_in02.gat,73,81,4	script	Martine	48,{
 cmd_in02.gat,64,43,4	script	Roberto	709,{
 	mes "[Roberto]";
 	mes "Muhahaha... What a stupid man! Now that's easy money! (~counts his money~)";
-	emotion 29;
+	emotion e_gg;
 	next;
 	mes "[Roberto]";
 	mes "Hey you! What are you looking at!? Get out of here!! What... you've never seen someone count money before??";
-	emotion 1;
+	emotion e_what;
 	close;
 }
 
@@ -208,14 +208,14 @@ cmd_in02.gat,64,43,4	script	Roberto	709,{
 cmd_in02.gat,89,72,4	script	Deniroz	89,{
 	mes "[Deniroz]";
 	mes "If the bead falls in this time, I'll hit the JACKPOT!! All I have to do is put this small bead into that little hole.";
-	emotion 0;
+	emotion e_gasp;
 	next;
 	mes "[Deniroz]";
 	mes "Most people give up after a few tries, but not me..... *whispers*(the can of beer in my hand is actually a powerful magnet)...";
 	next;
 	mes "[Deniroz]";
 	mes "Keee hee hee hee!! I'm going to get rich with my secret plan!!";
-	emotion 29;
+	emotion e_gg;
 	close;
 }
 
@@ -241,14 +241,14 @@ cmd_in02.gat,57,62,4	script	Casino Manager Moo	109,{
 cmd_in02.gat,48,55,4	script	Scoursege	51,{
 	mes "[Scoursege]";
 	mes "Darn it, where is that guy who borrowed my zeny? He better not be hiding from me, he told me he would double my money!";
-	emotion 19;
+	emotion e_swt2;
 	next;
 	mes "[Scoursege]";
 	mes "He was positive that he could double my money and make a little for himself! Where is he!...";
 	next;
 	mes "[Scoursege]";
 	mes "Have I been scammed!?? On no! What should I do?? My zeny..... (~sob~sob~)";
-	emotion 28;
+	emotion e_sob;
 	close;
 }
 
@@ -267,7 +267,7 @@ comodo.gat,206,310,4	script	Rochito	48,{
 L_0:
 	mes "[Rochito]";
 	mes "Meat, meat, meat... I LOVE MEAT!! Eat, eat, eat... ALL I eat is MEAT!! I'm sooo obsessed with meat..... I'm... I.. I... I'm a MEAT MAN!!";
-	emotion 3;
+	emotion e_lv;
 	next;
 	mes "[Rochito]";
 	mes "Comodo is meat heaven!! That's why BBQ camping in Comodo is sooooo AWESOME!!!"; 
@@ -278,11 +278,11 @@ L_0:
 		mes "[Rochito]";
 		mes "The Komodoru, a native animal of Comodo, is famous because of it's delicious meat.  Every part of the animal is tasty.";
 		mes "However the tastiest part of the Komodoru, is the area around the spine.  It's number one!";
-		emotion 21;
+		emotion e_no1;
 		next;
 		mes "[Rochito]";
 		mes "Look at all of this meat in front of me! I don't know what to do with all of this meat! What should I do?? Oh no!...";
-		emotion 19;
+		emotion e_swt2;
 		next;
 		mes "[Rochito]";
 		mes "Oh, I almost forgot!! You must try this Komodoru spine meat with Comodo's authentic BBQ seasoning.";
@@ -324,11 +324,11 @@ L_2:
 	next;
 	mes "[Rochito]";
 	mes "Oh my!! This is the special Comodo seasoning.... Koserahserah!! How did you manage to get this precious delicacy?";
-	emotion 0;
+	emotion e_gasp;
 	next;
 	mes "[Rochito]";
 	mes "Oh... I see, I see.  So it was given to you by my long time friend.  Well, thank you so much.... thank you...";
-	emotion 15;
+	emotion e_thx;
 	next;
 	mes "[Rochito]";
 	mes "Hey everybody! Tausupa has sent us some Koserahserah seasoning!!";
@@ -365,7 +365,7 @@ L_2:
 L_3:
 	mes "[Rochito]";
 	mes "You've returned..... Oh! Thank you for the delivering the wine for us.";
-	emotion 15;
+	emotion e_thx;
 	set dmdswrd_Q, 5;
 	next;
 
@@ -423,7 +423,7 @@ L_1:
 L_2:
 	mes "[Rockha]";
 	mes "Ha ha ha..... aaaahhh.... THIS is FRIENDSHIP!!";
-	emotion 18;
+	emotion e_heh;
 	next;
 	mes "[Rockha]";
 	mes "Let us take a moment to make a toast to our good friend.  Let us eat and drink until we can eat no more!!";
@@ -458,13 +458,13 @@ L_0:
 	next;
 	mes "[Rotute]";
 	mes "...... We MUST SUCCEED!!!!";
-	emotion 27;
+	emotion e_go;
 	close;
 
 L_1:
 	mes "[Rotute]";
 	mes "Wow!! This is Comodo's famous seasoning!! The Captain's friend is truly a good person.  To be this generous is unbelievable!";
-	emotion 0;
+	emotion e_gasp;
 	next;
 	mes "[Rotute]";
 	mes "I can only hope that I find a friend that is as loyal as he on this quest.....";
@@ -479,7 +479,7 @@ L_2:
 	next;
 	mes "[Rotute]";
 	mes "Oh, and thanks so much for helping our captain.";
-	emotion 15;
+	emotion e_thx;
 	close;
 }
 
@@ -491,7 +491,7 @@ comodo.gat,209,305,4	script	Emralhandas	70,{
 	mes "[Emralhandas]";
 	mes "Many years ago, during the War with the Witch, we dreamed of the day when we could live in peace.";
 	mes "Today that dream has come true and it's all because of you my friends!!";
-	emotion 21;
+	emotion e_no1;
 	next;
 	menu "Ask about her friends....",M_0, "End Conversation",M_End;
 
@@ -526,7 +526,7 @@ comodo.gat,209,305,4	script	Emralhandas	70,{
 		mes "[Emralhandas]";
 		mes "Her goal was to take over the world and plunge into a dark chaos!! We had to defend not only ourselves, but the future of humanity!!";
 		mes "So it was here that me made our stand against this terrible evil!";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Emralhandas]";
 		mes "A tremendous battle took place and many of our comrades fell that day... but their efforts were not in vain.";
@@ -642,7 +642,7 @@ L_2:
 	next;
 	mes "[Chief Tausupa]";
 	mes "I have made up my mind!";
-	emotion 5;
+	emotion e_ic;
 	next;
 	mes "[Chief Tausupa]";
 	mes "Mureuchieligu Wine is made as soon as the grapes are picked.  It is then bottled in the very same place and is left there to age.";
@@ -735,11 +735,11 @@ M_Menu:
 			next;
 			mes "[TORUNA]";
 			mes "The world famous..... Comodo ^5533FFCheese^000000!!!";
-			emotion 5;
+			emotion e_ic;
 			next;
 			mes "[TORUNA]";
 			mes "This special Cheese is simply DELICIOUS! You will understand how good the Cheese is once you try it.";
-			emotion 14;
+			emotion e_lv2;
 			set dmdswrd_Q, 7;
 			next;
 		sL_2:
@@ -751,7 +751,7 @@ M_Menu:
 		mes "[TORUNA]";
 		mes "The taste of Comodo Cheese is simply out of this world!!  Just one taste and I guarantee that you won't be able to stop!";
 		mes "It's so good you may even go GRAZY without it!";
-		emotion 3;
+		emotion e_lv;
 		next;
 		mes "[TORUNA]";
 		mes "Oh if I could just have one piece.... I'd be so happy I'd dance all night on that ^5555FFHula Dancing Stage^000000!!";
@@ -805,7 +805,7 @@ comodo.gat,169,284,4	script	Kichiri	99,{
 	close;
 L_1:
 	mes "The guy sitting near me just won't stop talking about Comodo ^5533FFCheese^000000...... It's going to drive me insane!";
-	emotion 32;
+	emotion e_pif;
 	next;
 	mes "[Kichiri]";
 	mes "Yeah, right over there, the guy named ^3355FFMagatu^000000.  Can you do something about it?";
@@ -814,7 +814,7 @@ L_1:
 L_2:
 	mes "I just want to have a quit time and have a few drinks, is this too much to ask for?";
 	mes "Stupid drunk ^3355FF' Magatu '^000000..... always talking about ^5533FFCheese^000000......";
-	emotion 7;
+	emotion e_ag;
 	close;
 }
 
@@ -825,20 +825,20 @@ comodo.gat,163,280,4	script	Magatu	55,{
 	if(dmdswrd_Q == 10) goto L_2;
 
 	mes "Yes! That's it!! The irresistible smell of that amazing ^5533FFCheese^000000!! It's so delicious!.... Oh, I can't wait any longer......";
-	emotion 3;
+	emotion e_lv;
 	next;
 	mes "[Magatu]";
 	mes "No matter what anyone else says..... Comodo Cheese is truly the BEST!!! Kekekeke!!";
-	emotion 21;
+	emotion e_no1;
 	next;
 	mes "[Magatu]";
 	mes "Cheese! CHEESE!! WONDERFULL Comodo CHEESE!!!.... so.... tas... ty.... (~drooools~)";
-	emotion 3;
+	emotion e_lv;
 	close;
 L_1:
 	mes "What? You want to know some information regarding Comodo's special ^5533FFCheese^000000?";
 	mes "I guess I could give you some inside information............";
-	emotion 1;
+	emotion e_what;
 	next;
 	mes "[Magatu]";
 	mes "Okay, go to the ^009500Casino^000000 and look for a guy named ^5533FFManzi^000000.  He should be somewhere on the first floor.";
@@ -855,7 +855,7 @@ L_2:
 	next;
 	mes "[Magatu]";
 	mes "O? I already told you? Bah, I am so drunk....... ^5533FFManzi^000000... He’s in the ^009500Casino^000000, got it?";
-	emotion 20;
+	emotion e_hmm;
 	close;
 }
 
@@ -886,7 +886,7 @@ L_1:
 	mes "[Mazi]";
 	mes "Whoa! This is from my friend Magatu, you must be someone of great importance to him.";
 	mes "Otherwise, he wouldn't have given you the Bottle Cap.";
-	emotion 5;
+	emotion e_ic;
 	next;
 	mes "[Manzi]";
 	mes "I made a promise to Magatu that I'd help anybody who had one of his bottle caps find out more about the ^5533FFCheese^000000.........";
@@ -922,7 +922,7 @@ comodo.gat,187,153,4	script	Hullaris	701,{
 
 	mes "Hula Dance? Who says it's merely a hula dance?? It is much more than just some dance.";
 	mes "To refer to Comodo's unique form of dancing as simply a hula dance, is just insulting!";
-	emotion 6;
+	emotion e_an;
 	next;
 	mes "[Hullaris]";
 	mes "The Comodo Hula Dance was developed long ago.  Legend has it that the dance was used to control the minds and bodies of others!";
@@ -934,7 +934,7 @@ comodo.gat,187,153,4	script	Hullaris	701,{
 	mes "[Hullaris]";
 	mes "Hehehehehe...... If anyone can dance better than me.... LET EM COME OUT!! It is more than just dancing..........";
 	mes "It is a form of 'COMMUNICATION'!!!";
-	emotion 29;
+	emotion e_gg;
 	close;
 
 L_1:
@@ -946,7 +946,7 @@ L_1:
 		next;
 		mes "[Hullaris]";
 		mes "Hmm, that coin.... How did you know to come and look for me? Ah, I got it.  Manzi must have told you about me.";
-		emotion 20;
+		emotion e_hmm;
 		next;
 		mes "[Hullaris]";
 		mes "I presume you are also interested in the famous Comodo ^5533FFCheese^000000.";
@@ -984,7 +984,7 @@ L_1:
 	M_End:
 		mes "[Hullaris]";
 		mes "Hey! Don't look at me like that, get out of here!";
-		emotion 0;
+		emotion e_gasp;
 		close;
 
 L_2:
@@ -1136,7 +1136,7 @@ L_2:
 		next;
 		mes "[Nigirboran]";
 		mes "Hahaha... pink elephants.... reminds me of a bad acid trip I once had... er..... forget what I just said.";
-		emotion 18;
+		emotion e_heh;
 		next;
 		mes "[Nigirboran]";
 		mes "If you cannot handle a little piece of cheese, there is absolutely no way you will be able to handle the Stone of Awakening.";
@@ -1166,7 +1166,7 @@ L_2:
 		mes "[Nigirboran]";
 		mes "Hmm?.... Wow! Now that's rare!! You don't seem to have any ill effects from the posion.";
 		mes "You must be in top shape both mentally and physically.";
-		emotion 5;
+		emotion e_ic;
 		next;
 		mes "[Nigirboran]";
 		mes "You have proved that you are worthy of the ^5533FFStone of Awakening^000000.  Take this.......";

npc/cities/geffen.txt

@@ -116,11 +116,11 @@ geffen_in.gat,70,67,5	script	Waitress	80,{
 	mes "[Waitress]";
 	mes "Ugh!! SO annoying! Why would you drink here when you could drink at the pub!? This is an Inn, not a pub!!";
 	mes "That man!... every time he drinks... he gets like that! Ugh!!";
-	emotion 6;
+	emotion e_an;
 	next;
 	mes "[Waitress]";
 	mes "(~yells to the man~)'Hey mister! I TOLD you... THIS.. IS.. AN INN, NOT A BAR!!'";
-	emotion 32;
+	emotion e_pif;
 	next;
 	mes "[Waitress]";
 	mes "(~sighs~) That old man in the front corner there gives me a headache.";
@@ -128,7 +128,7 @@ geffen_in.gat,70,67,5	script	Waitress	80,{
 	next;
 	mes "[Waitress]";
 	mes "To think that there are 2 of them in one city... It's JUST ABSURD!!";
-	emotion 32;
+	emotion e_pif;
 	next;
 	mes "[Waitress]";
 	mes "(~mumbles~)... I wish they would both just leave this town and be forgotten forever... that would be nice....";
@@ -203,21 +203,21 @@ M_Menu:
 	M_2:
 		mes "[Merchant Daven]";
 		mes "Me?.... Oh I'm the world's PRETTIEST street merchant!!..... the he he...";
-		emotion 30;
+		emotion e_kis;
 		next;
 		menu "..... I'm going to puke....",sM_0, ".... SLAPP him upside his head!!!",sM_1;		
 
 		sM_0:
 			mes "[Merchant Daven]";
 			mes "Hehehe.... it was a joke.... a joke ok..... hehehe....";
-			emotion 18;
+			emotion e_heh;
 			goto M_Menu;
 		sM_1:
 			mes "~^FF8000!!!^FF0000THWAAACCCKKK^FF8000!!!^000000~";
 			next;
 			mes "[Merchant Daven]";
 			mes "OW!! Ok! Ok! I was just kidding.... sheesh....";
-			emotion 16;
+			emotion e_wah;
 			goto M_Menu;
 	M_End:
 		close;
@@ -241,7 +241,7 @@ geffen_in.gat,59,62,2	script	Drunkard	120,{
 		next;
 		mes "[Drunkard]";
 		mes "If you're interested you should go talk to him.  From the looks of it, you two would probably get along really well... HAHAHA!";
-		emotion 18;
+		emotion e_heh;
 		close;
 	M_2:
 		mes "[Drunkard]";
@@ -250,7 +250,7 @@ geffen_in.gat,59,62,2	script	Drunkard	120,{
 		next;
 		mes "[Drunkard]";
 		mes "(~sob~sob~).... oh what happened to my life!!!....(~baaaahhhh~)";
-		emotion 28;
+		emotion e_sob;
 		next;
 		mes "[Waitress]";
 		mes "ARGH!! STOP being so noisy!";
@@ -288,7 +288,7 @@ geffen_in.gat,113,73,4	script	Schubaltzwald Merchant	709,{
 geffen_in.gat,28,134,4	script	Waitress	69,{
 	mes "[Waitress]";
 	mes "Meh! ALWAYS drinking and ALWAYS fighting..... HEY Mister! This is a place of BUSINESS!!";
-	emotion 6;
+	emotion e_an;
 	next;
 	mes "[Waitress]";
 	mes "That man gives me a headache.  My sister at the Inn says that there is another IDIOT just LIKE HIM there!";
@@ -296,7 +296,7 @@ geffen_in.gat,28,134,4	script	Waitress	69,{
 	next;
 	mes "[Waitress]";
 	mes "(~sighs~)";
-	emotion 32;
+	emotion e_pif;
 M_Menu:
 	next;
 	menu "Could I get drink?",M_0, "Anything interesting going on lately?",M_1, "End Conversation",M_End;
@@ -328,7 +328,7 @@ M_Menu:
 geffen_in.gat,21,125,5	script	Drunkard	52,{
 	mes "[Drunkard]";
 	mes "You want to be an idiotic magician? Is that why you came here??";
-	emotion 1;
+	emotion e_what;
 	close;
 }
 
@@ -425,7 +425,7 @@ M_Menu:
 		R0_End:
 			mes "[Friend of Youth]";
 			mes "Now, have the questions about your life been answered? Feel free to ask me again.  I am always on your side friend!";
-			emotion 21;
+			emotion e_no1;
 			goto M_Menu;
 
 	M_1:
@@ -436,14 +436,14 @@ M_Menu:
 		R1_0:
 			mes "[Friend of Youth]";
 			mes "Tsk tsk.... Are you looking for another love?";
-			emotion 1;
+			emotion e_what;
 			next;
 			mes "[Friend of Youth]";
 			mes "So you're not satisfied with the relationship your in now.... you want one that is new, better, more exciting.......";
 			next;
 			mes "[Friend of Youth]";
 			mes "Don't be a fool!! Treasure the love you have now! You never no where a wandering heart will lead you....";
-			emotion 0;
+			emotion e_gasp;
 			next;
 			goto R1_End;
 		R1_1:
@@ -455,7 +455,7 @@ M_Menu:
 			next;
 			mes "[Friend of Youth]";
 			mes "With that confidence and a little bit of luck, you're sure to find love.  Always!!";
-			emotion 21;
+			emotion e_no1;
 			next;
 			goto R1_End;
 		R1_2:
@@ -465,7 +465,7 @@ M_Menu:
 			next;
 			mes "[Friend of Youth]";
 			mes "So BRANDISH your sword in the name of LOVE!!";
-			emotion 21;
+			emotion e_no1;
 			next;
 			goto R1_End;
 		R1_3:
@@ -477,13 +477,13 @@ M_Menu:
 			next;
 			mes "[Friend of Youth]";
 			mes "Now if I could only find someone to love.......";
-			emotion 20;
+			emotion e_hmm;
 			next;
 			goto R1_End;
 		R1_End:
 			mes "[Friend of Youth]";
 			mes "Even in this bleak world, love is all around you! Love can be fun so treasure the heart and come back for another reading!";
-			emotion 22;
+			emotion e_no;
 			goto M_Menu;
 
 	M_2:
@@ -579,7 +579,7 @@ M_Menu:
 			next;
 			mes "[Friend of Youth]";
 			mes "Break free and move towards the future and be prepared to face what lies ahead!";	
-			emotion 21;
+			emotion e_no1;
 			next;
 			goto R4_End;
 		R4_End:
@@ -602,7 +602,7 @@ M_Menu:
 		R5_1:
 			mes "[Friend of Youth]";
 			mes "Wah! A Sakkat hat with that type of outfit is a bad idea!!";
-			emotion 23;
+			emotion e_omg;
 			next;
 			mes "[Friend of Youth]";
 			mes "Wow, now that I think about it, it's unbearable!!";
@@ -615,7 +615,7 @@ M_Menu:
 			next;
 			mes "[Friend of Youth]";
 			mes "Why is that??";
-			emotion 1;
+			emotion e_what;
 			next;
 			goto R5_End;
 		R5_3:
@@ -624,7 +624,7 @@ M_Menu:
 			next;
 			mes "[Friend of Youth]";
 			mes "But wear a pair of Red Sandals with it.... and that becomes just TOOOO much to bear!!";
-			emotion 19;
+			emotion e_swt2;
 			next;
 			goto R5_End;
 		R5_4:

npc/cities/gonryun.txt

@@ -139,7 +139,7 @@ gon_in.gat,165,16,4	script	Drunkard	748,{
 	mes "[Sorubun]";
 	mes "Oh my head! I had too much to drink yesterday and passed out right here on the table.";
 	mes "The manager told me that I shouldn't drink anymore and I should have listened.";
-	emotion 19;
+	emotion e_swt2;
 	next;
 	mes "[Sorubun]";
 	mes "Wow, the drinks here are strong! Much stronger than anything we have back home.";
@@ -155,7 +155,7 @@ gonryun.gat,139,142,6	script	Girl	772,{
 	next;
 	mes "[Sanfayon]";
 	mes "I have been so afraid of the foreigners.....";
-	emotion 16;
+	emotion e_wah;
 	close;
 }
 
@@ -211,7 +211,7 @@ gon_in.gat,18,27,4	script	Elder's Wife	771,{
 
 gon_in.gat,17,93,4	script	Village Elder	775,{
 	mes "[Sayoumun]";
-	emotion 45;
+	emotion e_yawn;
 	mes "Zzzzzzzzzzz.......";
 	next;
 	mes "[Sayoumun]";
@@ -242,7 +242,7 @@ gonryun.gat,119,111,4	script	Chen Wan Sok	89,{
 //===============================================================================
 
 gonryun.gat,100,241,5	script	Unsociable Man	733,{
-	emotion 9;
+	emotion e_dots;
 	mes "[Saunso]";
 	mes "I am too busy to talk, come back later!";
 	close;
@@ -286,7 +286,7 @@ gonryun.gat,237,225,4	script	Hanyon Kyou	776,{
 
 gonryun.gat,51,101,4	script	Gaiysonchoru	778,{
 	mes "[Gaiysonchoru]";
-	emotion 4;
+	emotion e_swt;
 	mes "..............";
 	next;
 	mes "[Gaiysonchoru]";

npc/cities/izlude.txt

@@ -179,7 +179,7 @@ izlude.gat,150,118,3	script	Dega	84,{
 izlude.gat,150,143,4	script	Kylick	97,{
 	mes "[Kylick]";
 	mes "Don't you think Binoculars are really COOL?! YOU can see SUPER FAR AWAY...";
-	emotion 5;
+	emotion e_ic;
 	next;
 	mes "[Kylick]";
 	mes "... Ahem~! We, here at Izlude, are responsible for maintaining peace, not only on land, but also at sea.";
@@ -189,7 +189,7 @@ izlude.gat,150,143,4	script	Kylick	97,{
 	next;
 	mes "[Kylick]";
 	mes "After all, being well prepared is always better than being unprepared.";
-	emotion 33;
+	emotion e_ok;
 	close;
 }
 
@@ -199,7 +199,7 @@ izlude.gat,124,178,4	script	Soldier	105,{
 	mes "HeHeHeHe... HaHaHaHa";
 	mes "Huh? Why am I so happy?";
 	mes "you want to know?";
-	emotion 18;
+	emotion e_heh;
 	next;
 	menu "Sure, why?",-, "Not really, I don't care.",M_1;
 	
@@ -215,7 +215,7 @@ izlude.gat,124,178,4	script	Soldier	105,{
 			next;
 			mes "[Soldier]";
 			mes "We had to work over time every day.  Ah~~~ that was a nightmare!!!...~~~";
-			emotion 16;
+			emotion e_wah;
 			next;
 			mes "[Soldier]";
 			mes "Anyways, the government made a smart move and created the Registration System.";
@@ -233,12 +233,12 @@ izlude.gat,124,178,4	script	Soldier	105,{
 			next;
 			mes "[Soldier]";
 			mes "HaHaHaHaHa!";
-			emotion 18;
+			emotion e_heh;
 			close;
 		sM_1:
 			mes "[Soldier]";
 			mes "What?! What do you mean you didn't know?!";
-			emotion 1;
+			emotion e_what;
 			next;
 			mes "[Soldier]";
 			mes "Hm... well... you know you could get items by killing monsters right?";
@@ -256,11 +256,11 @@ izlude.gat,58,126,1	script	Red	98,{
 	mes "[Red]";
 	mes "The only skill that a Swordsman needs is 'Bash'! 'Bash'! 'Bash'! ONLY 'Bash'!";
 	mes "There's no need to waste any time and effort on other minor skills ~~ unless you're some kind of wuss!";
-	emotion 29;
+	emotion e_gg;
 	next;
 	mes "[Cebalis]";
 	mes "What are you talking about?";
-	emotion 1;
+	emotion e_what;
 	next;
 	mes "[Cebalis]";
 	mes "The mark of a true Swordsman is the ability to bravely stand alone against a mob of enemies and SQUASH them ALL!";
@@ -274,7 +274,7 @@ izlude.gat,58,126,1	script	Red	98,{
 	next;
 	mes "[Red]";
 	mes "That's exactly why you're a dumb, idiot! The mark of a true Swordsman?! I still remember the last time you used 'Magnum Break'....";
-	emotion 32;
+	emotion e_pif;
 	next;
 	mes "[Red]";
 	mes "You were just busy running away from all of those Porings that got hit by that stupid skill! You weakling!";
@@ -289,7 +289,7 @@ izlude.gat,58,126,1	script	Red	98,{
 	next;
 	mes "[Red]";
 	mes "Ooohhh maaaann.....";
-	emotion 9;
+	emotion e_dots;
 	next;
 	mes "[Red]";
 	mes "Hey! You there! which do you think is better? 'Bash', a powerful and precise blow used on a single enemy. ";
@@ -301,12 +301,12 @@ izlude.gat,58,126,1	script	Red	98,{
 		if( baseClass == Job_Swordman ) goto L00;
 		mes "Hahahaha!! See!? Someone who pursues a different job agrees with me~! You really are a great person!";
 		mes "Hahaha!! Undoubtedly only 'Bash' is suitable for a Swordsman.  Please tell that to this BONEHEAD over here!! Hahaha.";
-		emotion 21;
+		emotion e_no1;
 		close;
 		
 		L00:
 			mes "Hahahaha!!! I knew you'd choose 'Bash'!! Without a doubt only 'Bash' suits a Swordsman.  Please tell that to the BONEHEAD over there!! Hahaha.";
-			emotion 21;
+			emotion e_no1;
 			next;
 			mes "[Red]";
 			mes "Hm, Let me give you a bit of advice.  After you achieve level 5 'Bash', the amount of SP the skill consumes doubles, so keep an eye on your SP gauge.";
@@ -333,7 +333,7 @@ izlude.gat,58,126,1	script	Red	98,{
 izlude.gat,56,126,7	script	Cebalis	85,{
 	mes "[Cebalis]";
 	mes "The mark of a true Swordsman is the ability to bravely stand alone against a mob of enemies and SQUASH them ALL!!";
-	emotion 29;
+	emotion e_gg;
 	next;
 	mes "[Cebalis]";
 	mes "AND the only skill that can do that is 'Magnum Break'!!";
@@ -359,7 +359,7 @@ izlude.gat,56,126,7	script	Cebalis	85,{
 	mes "[Cebalis]";
 	mes "Ahem... Why do you always have to bring up insignificant incidents that have long since passed?";
 	mes "I'm TELLING YOU, 'Magnum Break' is the skill for a SWORDSMAN~!!";
-	emotion 4;
+	emotion e_swt;
 	next;
 	mes "[Cebalis]";
 	mes "'Bash' is just a stepping stone to getting 'Magnum Break'.  After all you need 5 levels of 'Bash before you can get level 1 'Magnum Break'.";
@@ -389,12 +389,12 @@ izlude.gat,56,126,7	script	Cebalis	85,{
 		mes "[Cebalis]";
 		if( baseClass == Job_Swordman ) goto L01;
 		mes "Right! 'Magnum Break' is THE BEST!!! You know what you're talking about, huh? I don't know why this bonehead is so stubborn.";
-		emotion 21;
+		emotion e_no1;
 		close;
 
 		L01:
 			mes "Darn Right!! 'Magnum Break' IS the BETTER skill!! You know what your talking about friend. HaHaHa.";
-			emotion 21;
+			emotion e_no1;
 			next;
 			mes "[Cebalis]";
 			mes "You want some useful information? Okay, let me tell ya! 'Magnum Break' has the elemental Property of 'Fire'.";
@@ -409,7 +409,7 @@ izlude.gat,56,126,7	script	Cebalis	85,{
 izlude_in.gat,125,164,5	script	Aaron	65,{
 	mes "[Aaron]";
 	mes "Hm? A Swordsman?..........";
-	emotion 1;
+	emotion e_what;
 	next;
 	mes "[Aaron]";
 	mes "Do you think strong VIT and a highly trained and unique breathing method enabling quick HP recovery, are the greatest advantages of a Swordsman?";
@@ -431,7 +431,7 @@ izlude_in.gat,125,164,5	script	Aaron	65,{
 	next;
 	mes "[Aaron]";
 	mes "Hm... Are you bored? Want me to go on?";
-	emotion 20;
+	emotion e_hmm;
 	next;
 	menu "Tell me more please.",-,"End conversation",LEnd;
 	
@@ -450,7 +450,7 @@ izlude_in.gat,125,164,5	script	Aaron	65,{
 	LEnd:
 		mes "[Aaron]";
 		mes "OK, train hard~~";
-		emotion 21;
+		emotion e_no1;
 		close;
 }
 
@@ -485,7 +485,7 @@ M_Menu:
 		sM_1:
 			mes "[Edgar]";
 			mes "Hmm..., you hate to walk and are low on money, but you want to go there...(sigh)...Oh boy...";
-			emotion 4;
+			emotion e_swt;
 			next;
 			mes "[Edgar]";
 			mes "Well I am the captain of a small ship so I could bring you there at the low price of 250 Zeny.";
@@ -505,7 +505,7 @@ M_Menu:
 			sm_1b:
 				mes "[Edgar]";
 				mes "What!!... ahg... bah... guh... I'm NOT ripping you off!!!...";
-				emotion 23;
+				emotion e_omg;
 				close;
 
 	M_End:

npc/cities/louyang.txt

@@ -505,7 +505,7 @@ lou_fild01.gat,175,174,4	script	Jiu Lian Bu	819,{
 	mes "[Jiu Lian Bu]";
 	mes "So...";
 	mes "Whaddya want to do?";
-	emotion 18;
+	emotion e_heh;
 	next;
 	menu "Shout.",-,"Leave.",M_LEAVE;
 
@@ -938,7 +938,7 @@ lou_in02.gat,58,183,4	script	Chef Assistant	823,{
 	donpcevent "Lounpc::OnEffect";	
 	next;
 	mes "[Jin Wei Ling]";
-	emotion 21;
+	emotion e_no1;
 	mes "Hahahaha! Look at these perfect";
 	mes "vegetable slices! Muhahahaha!!";
 	mes "I will continue to hone my martial";
@@ -1039,7 +1039,7 @@ L_POOR:
 	mes "Good lord,";
 	mes "What are you thinking? What am I, a beggar?! That's a poor excuse for a bribe!";
 	next;
-	emotion 32;
+	emotion e_pif;
 	mes "[Jin Chiyuan]";
 	mes "I mean...";
 	mes "How dare you bribe an officer of the law! I hope other outsiders are not like you! Please leave immediately.";
@@ -1071,7 +1071,7 @@ L_OFFICER:
 	close;
 
 L_BEENTOHIM:
-	emotion 18;
+	emotion e_heh;
 	mes "[Jin Chiyuan]";
 	mes "Ah~";
 	mes "You met him,";
@@ -1129,7 +1129,7 @@ L_BRIBED:
 	mes "Hmmm....";
 	mes "Oh I see, I see...";
 	next;
-	emotion 0;
+	emotion e_gasp;
 	mes "^3131FF*Rummage rummage...*";
 	mes "^3131FF..........";
 	close;	
@@ -1187,7 +1187,7 @@ L_WHAT:
 	close;
 
 L_RANT2:
-	emotion 33;
+	emotion e_ok;
 	mes "[Huang Zhishu]";
 	mes "Hmmm...?";
 	mes "Do you think I need to go outside more often? Well, I guess for some reason, I don't feel well. I guess I really should get some fresh air.";
@@ -1213,7 +1213,7 @@ L_QUEST:
 	mes "I hate this";
 	mes "weather...!";
 	next;
-	emotion 1;
+	emotion e_what;
 	mes "[Wang Chuiyi]";
 	mes "Um? Can I help";
 	mes "you with anything?";
@@ -1269,7 +1269,7 @@ M_HOT:
 
 M_ERRAND:
 	mes "[Jiang Xiayou]";
-	emotion 0;
+	emotion e_gasp;
 	mes "Oh yeah?";
 	mes "Well, why didn't you say so? Let's see.";
 	mes "Hmmm...";
@@ -1560,7 +1560,7 @@ L_QUEST:
 	mes "Hmmm...";
 	mes "I'm in trouble";
 	next;
-	emotion 19;
+	emotion e_swt2;
 	mes "[Hua Tuo]";
 	mes "I cannot do anything without my medicine. But one of my patients needs immediate treatment and I can't leave the office...";
 	next;
@@ -1581,7 +1581,7 @@ L_QUEST:
 	mes "much for saying that.";
 	mes "I feel very uncomfortable asking a favor of someone I have only just met.";
 	next;
-	emotion 15;
+	emotion e_thx;
 	mes "[Hua Tuo]";
 	mes "However, I will ask you if we meet another time. Now, if you'll excuse me...";
 	close;

npc/cities/lutie.txt

@@ -522,7 +522,7 @@ xmas.gat,134,112,4	script	Jack Frost	710,{
 	if(xmas_npc==11) goto Xmas11;
 	mes "*sob*sob*........ I'm so lonely..... I can't go anywhere! I";
 	mes "am stuck here day and night... frozen to this cold earth....";
-	emotion 28;
+	emotion e_sob;
 	next;
 	menu "^0000FFJack Frost?^000000",L0, "A secret Toy Factory?",L1, "...............",LEnd;
 	
@@ -550,7 +550,7 @@ xmas.gat,134,112,4	script	Jack Frost	710,{
 		next;
 		mes "[Jack Frost]";
 		mes "But my friends were not...... I have lost all of my friends.......... I feel so lonely.......";
-		emotion 28;
+		emotion e_sob;
 		close;
 	L1:
 		mes "[Jack Frost]";
@@ -587,7 +587,7 @@ Xmas2:
 	next;
 	mes "[Jack Frost]";
 	mes "I don't have any legs so I can't go anywhere..... ";
-	emotion 28;
+	emotion e_sob;
 	next;
 	mes "[Jack Frost]";
 	mes "How did I get here...? Why can I communicate with humans...?";
@@ -810,7 +810,7 @@ xmas.gat,146,136,4	script	Howie the Clown	715,{
 		next;
 		mes "[Howie]";
 		mes "How could he not like an amazing show like mine??";
-		emotion 20;
+		emotion e_hmm;
 		next;
 		mes "[Howie]";
 		mes "There's something strange about Jack Frost.... anyways...";
@@ -908,7 +908,7 @@ xmas.gat,208,168,4	script	Marsha	703,{
 	mes "Oh by the way..... Have you met ^5533FFSanta Claus^000000 yet? He";
 	mes "carries TONS and tons of gifts is his BIG bag! I heard that the Snowman";
 	mes "also does that.... Isn't that AMAZING!?? So exciting!!";
-	emotion 5;
+	emotion e_ic;
 	next;
 	mes "[Marsha]";
 	mes "I mean he has a big bag full of gifts too.... those how have been";
@@ -917,7 +917,7 @@ xmas.gat,208,168,4	script	Marsha	703,{
 	mes "[Marsha]";
 	mes "..... Well at least that's what people say... but still.... isn't it";
 	mes "AMAZING!!";
-	emotion 20;
+	emotion e_hmm;
 	close;
 
 Xmas9a:

npc/cities/morocc.txt

@@ -48,7 +48,7 @@ morocc.gat,44,180,8	script	Drunk Man	89,{
 	mes "[Drunk Man]";
 	mes "How about you? Why don't you Look for it? It shouldn't be a problem for someone as brave as yourself?";
 	mes "Kekeke keke(Hiccup)! Buy me a drink later if you ever find that dagger.  Promise me, alright?(Hiccup!)";
-	emotion 20;
+	emotion e_hmm;
 	close;
 }
 
@@ -83,7 +83,7 @@ M_Menu:
 		next;
 		mes "[Ant Man Akira]";
 		mes "Attack an ant by mistake, and you'll find yourself surrounded by a swarm of them before you can even use a fly wing!";
-		emotion 0;
+		emotion e_gasp;
 		goto M_Menu;
 	M_Ants:
 		mes "[Ant Man Akira]";
@@ -152,14 +152,14 @@ M_Menu:
 	M_Quit:
 		mes "[Poring Lady Syvia]";
 		mes "OMG!";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "[Poring Lady Syvia]";
 		mes "You dare dismiss a poring expert such as myself? I am proud of my knowledge about all things poring!!";
 		next;
 		mes "[Poring Lady Syvia]";
 		mes "Hmf!";
-		emotion 32;
+		emotion e_pif;
 		close;
 }
 
@@ -266,7 +266,7 @@ morocc.gat,208,85,7	script	Trader Joe	83,{
 	next;
 	mes "[Trader Joe]";
 	mes "ALL OF THE SUDDEN!!! The cactus let out this LOUD SCREAM and started to SHOOT its NEEDLES at me!!";
-	emotion 23;
+	emotion e_omg;
 	next;
 	mes "[Trader Joe]";
 	mes "It was THE WORST experience of my ENTIRE LIFE.";
@@ -283,7 +283,7 @@ morocc.gat,208,85,7	script	Trader Joe	83,{
 morocc.gat,234,273,3	script	Fly Man Armani	54,{
 	mes "[Fly Man Armani]";
 	mes "I SAW IT!! I SAW IT!!!";
-	emotion 5;
+	emotion e_ic;
 	next;
 	mes "[Fly Man Armani]";
 	mes "I saw the rare ^ff0000Dragon Fly^000000 just North of here! It was incredible!!";
@@ -305,16 +305,16 @@ morocc.gat,234,273,3	script	Fly Man Armani	54,{
 		next;
 		mes "[Fly Man Armani]";
 		mes "Say.... why don't YOU challenge the Dragon Fly?";
-		emotion 20;
+		emotion e_hmm;
 		close;
 	M_1:
 		mes "[Fly Man Armani]";
 		mes "SO WHAT!!??";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "[Fly Man Armani]";
 		mes "Do you dare underestimate the Dragon Fly??  Bleh! It may be a fly, but I guarantee you THIS FLY is more than you can handle!";
-		emotion 32;
+		emotion e_pif;
 		next;
 		mes "[Fly Man Armani]";
 		mes "No matter.  If you ARE fortunate enough to run into it, you'll quickly see what I mean.  After all, it IS the FLY of ALL FLIES!!!!";
@@ -350,14 +350,14 @@ M_Menu:
 	M_End:
 		mes "[Uncle Phlanette]";
 		mes "Sand HERE! Sand THERE! Sand EVERYWHERE!!!!";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Uncle Phlanette]";
 		mes "(~Sigh~) I'm SICK and TIRED of this sand and desert...";
 		next;
 		mes "[Uncle Phlantette]";
 		mes "Morroc......!! I HATE YOU!!!!!!";
-		emotion 32;
+		emotion e_pif;
 		close;
 }
 

npc/cities/payon.txt

@@ -23,7 +23,7 @@
 payon.gat,190,115,0	script	Lady	90,{
 	mes "[Lady]";
 	mes "Did you know that in the past Payon was not as prosperous as it is now? Back then we had difficulty making a living for ourselves.";
-	   emotion 0;
+	   emotion e_gasp;
 	next;
 	mes "[Lady]";
 	mes "The towns people were so poor that they could not even afford to properly bury their deceased family members.";
@@ -69,7 +69,7 @@ payon.gat,104,62,5	script	Young Man	88,{
 	next;
 	mes "[Young Man]";
 	mes "Eeeeeeeeekkkkk?! Grampa? I-I-Is-Is t-t-th-that you?? ...";
-	   emotion 16;
+	   emotion e_wah;
 	next;
 	mes "(you notice that his pants have become wet... eeeewwwwwwwwww!!!....)";
 	close;
@@ -79,7 +79,7 @@ payon_in01.gat,180,7,0	script	Waitress	90,{
 	mes "[Waitress]";
 	mes "People in this place seem to be busy all the time, they come and go to be Archers or to buy arrows, I have to stick with this small shop.";
 	mes "I feel so melancholy and bored.";
-	   emotion 28;
+	   emotion e_sob;
  	next;
 	mes "[Waitress]";
 	mes "I am sick and tired of noodle soup. I have to take too many showers to get rid of the smell.";
@@ -100,12 +100,12 @@ L_Start:
 	mes "Grandma the fortuneteller told me that I would meet great luck in the near future!"; 
 	mes "But look at me, what's wrong with me!! I am leaving a manageable life everyday!!";
 	mes "Oh.. boy. What a dumb wishy-washy person I am.";
-	emotion 6;
+	emotion e_an;
 	next;
 	mes "[Waitress]";
 	mes "I am so sorry, I should haven't said this to you. Now I am acting like i'm stupid.";  
  	mes "I am sorry dear, please forgive my misbehavior.";
-	emotion 4;
+	emotion e_swt;
 	next;
 	mes "[Waitress]";
 	mes "So, how may I help you? ";
@@ -128,7 +128,7 @@ L_Menu1:
 L_Menu2:
 	mes "[Waitress]";
 	mes "Oh! I must say she is really an extraordinary person. Well, it could be your luck, she doesn't hang around here much as she used to do.";
-	   emotion 5;
+	   emotion e_ic;
  	next;
 	mes "[Waitress]";
 	mes "On the first place, she stayed here to mind her business, but ever since the chief recognized her talent, she's stayed in the central palace.";
@@ -144,13 +144,13 @@ L_Menu3:
 	next;
 	mes "[Waitress]";
 	mes "Sorry for your inconvenience.";
-	   emotion 17;
+	   emotion e_sry;
 	close;
 L_Menu4:
 	mes "[Waitress]";
 	mes "Have a nice day, dear.";
 	mes "Sob...I wish I could be in bed of roses.";
-	   emotion 28;
+	   emotion e_sob;
  	close;
 }
 
@@ -171,12 +171,12 @@ payon.gat,193,116,1	script	Woman	66,{
 	  if(Sex == 0) goto LStartF;
 	mes "Hmm... you look as strong as a Rocker! How many monsters have you killed?";
 	mes "Let me tell you about a place where you can go train and become even stronger.";
-	   emotion 20;
+	   emotion e_hmm;
 	goto L_Start;
 LStartF:
 	mes "Miss, how many monsters have you killed?";
 	mes "I know a very good place for you to go train and get good monster drops.";
-	   emotion 20;
+	   emotion e_hmm;
 L_Start:
     	next;
     	mes "[Woman]";
@@ -190,7 +190,7 @@ L_Menu1:
 	next;
 	mes "[Woman]";
 	mes "Of course... there are the zombies... and Munaks... and Bonguns... which can be VERY DEADLY.....";
-	   emotion 20;
+	   emotion e_hmm;
 	close;
 L_Menu2:
 	mes "[Woman]";
@@ -198,23 +198,23 @@ L_Menu2:
 	next;
 	mes "[Woman]";
 	mes "I know because he's my husband... oops... I mean an acquaintance of mine... heh heh..";
-	   emotion 4;
+	   emotion e_swt;
 	close;
 L_Menu3:
 	mes "[Woman]";
 	mes "Oh hohohoho! SO you noticed! This is what's in-style in Prontera these days! The women in this town don't know anything about fashion!";
-	   emotion 5;
+	   emotion e_ic;
 	next;
 	mes "[Woman]";
 	mes "My husband buys me these clothes with the money he makes selling overpriced items to foolish young people... oh ho oh hoho...";
-	   emotion 18;
+	   emotion e_heh;
 	close;
 }
 
 payon.gat,190,119,5	script	Woman	66,{
 	mes "[Jim's Mother]";
 	mes "Oh boy there she goes again.  She is a confirmed gossip.  Please don't mistake her for being a typical Payon citizen.";
-	   emotion 9;
+	   emotion e_dots;
 	next;
 	mes "[Jim's Mother]";
 	mes "Believe me, she's an exception.  Not all of us here in Payon have big mouths.  She gets too exited with fortune telling.";
@@ -225,7 +225,7 @@ payon.gat,190,119,5	script	Woman	66,{
 	mes "[Jim's Mother]";
 	if(Sex == 0) goto LStartF;
 	mes "... Oh, you have broad shoulders ... tehehe! Will you go out with me? I'd like to make you a nice dinner...(bats eyelashes)";
-	emotion 30;
+	emotion e_kis;
 	goto L_Menu;
 LStartF:
 	mes "Don't you think your dress is too lousy?";
@@ -243,7 +243,7 @@ L_Menu1:
 	  if(Sex == 0) goto L_2;
  	mes ".......... tehehe. (winks at you)";
 L_2:
-	   emotion 3;
+	   emotion e_lv;
 	close;
 L_Menu2:
 	mes "[Jim's Mother]";
@@ -256,11 +256,11 @@ payon.gat,210,110,4	script	Drunk	120,{
 	mes "[Drunk]";
 	mes "Hey hey! I am wondering how stupid archers who don't know how to aim targets could drink alcohol. Hahaha~!";
 	mes "Do you want to buy me a drink?";
-	   emotion 18;
+	   emotion e_heh;
 L_Menu1_F1:
 	mes "[Drunk]";
 	mes "Yoyo! Archer brother! Salute to your fingers stretching bowstring!";
-	   emotion 2;
+	   emotion e_ho;
 	next;
 	mes "[Drunk]";
 	mes "Do you want to buy me a drink?";
@@ -275,7 +275,7 @@ L1L:
       mes "Thanksh brothaaa!... archerrrzzz are alwayssszz a generoushhh bunch!...(hicup!)";
 	goto L2L;
 L2L:
-	   emotion 15;
+	   emotion e_thx;
 	   if(Zeny < 200) goto L_SUB_1;
 	   set Zeny,Zeny-200;
 	mes "[Drunk]";
@@ -286,7 +286,7 @@ L2L:
 	next;
 	mes "[Drunk]";
 	mes "Gulp~Gulp~Man! This is great! Thank you may man! Thank you! Muhahahahaha!";
-	   emotion 21;
+	   emotion e_no1;
 	close;
 L_SUB_1:
 	mes "[Drunk]";
@@ -296,12 +296,12 @@ L_Menu2:
 	mes "[Drunk]";
 	mes "Blah. Young people don't know how to respect elderly people!";
 	mes "Fine! I won't beg you anymore! I won't...";
-	   emotion 32;
+	   emotion e_pif;
 	close;
 L_Menu3:
 	mes "[Drunk]";
 	mes "Umm, oookay. Fine by me...";
-	   emotion 21;
+	   emotion e_no1;
 	close;
 }
 
@@ -310,7 +310,7 @@ payon_in01.gat,47,59,5	script	Archer Zakk	88,{
 	mes "I am so worried about one of my pals. He speaks about much crap.";
 	mes "Well he is an expert of archery, but I hate his big mouth...";
 	mes "Our chief is also fed up with him.";
-	   emotion 7;
+	   emotion e_ag;
 	next;
 	menu "Archer?",L_Menu1,"Chief?",L_Menu2,"Big Mouth?",L_Menu3;
 L_Menu1:
@@ -366,7 +366,7 @@ L_Menu1:
 	next;
 	mes "[Archer Wolt]";
 	mes "Are you curious about HOW we practice?";
-	   emotion 1;
+	   emotion e_what;
 	next;
 	mes "[Archer Wolt]";
 	mes "From sunrise to sunset the Archers of Payon search the surrounding forest for monsters.";
@@ -382,11 +382,11 @@ L_Menu1:
 L_sub1:
 	mes "[Archer Wolt]";
 	mes "....Well YES!! A well crafted Bow is essential to the success of an archer!";
-	   emotion 5;
+	   emotion e_ic;
 	next;
 	mes "[Archer Wolt]";
 	mes "Bows constructed in Payon are the greatest bows you can find in Rune-Midgard! They are light yet, strong and very durable.";
-	   emotion 21;
+	   emotion e_no1;
 	next;
 	mes "[Archer Wolt]";
 	mes "This is because they are made out of high quality wood found only in the Payon Forest!";
@@ -430,7 +430,7 @@ L_para2:
 	next;
 	mes "[Archer Wolt]";
 	mes "... uh... anyways... back to the Chief...";
-	   emotion 4;
+	   emotion e_swt;
 	next;
 	mes "[Archer Wolt]";
 	mes "In the past he bravely protected Payon with his Gakung Bow.  Now he is elderly, though he still worries about the safety of the town.";
@@ -496,7 +496,7 @@ L_temp3:
 pay_arche.gat,77,131,2	script	Archer Joe	88,{
 	mes "[Archer Joe]";
 	mes "Payon! What a wonderful place! Superb Bows! Excellent Archers!";
-	   emotion 21;
+	   emotion e_no1;
 	next;
 	mes "[Archer Joe]";
 	mes "Hay you! Have you heard of our fame?";
@@ -505,7 +505,7 @@ pay_arche.gat,77,131,2	script	Archer Joe	88,{
 L_Menu1:
 	mes "[Archer Joe]";
 	mes "Oh! You my man buddy! Archers of Payon! You know who we are!";
-	   emotion 33;
+	   emotion e_ok;
 	next;
 	mes "[Archer Joe]";
 	mes "Arrows of Payon Archers never miss the targets! Even it can aim at the heart of the enemy from a long distance!";
@@ -515,7 +515,7 @@ L_Msub1:
 	mes "[Archer Joe]";
 	mes "Yes! I love this place! So now I am researching Payon!";
 	mes "If you have any questions, please ask me!";
-	   emotion 33;
+	   emotion e_ok;
 	next;
 	menu "People are wearing unique costumes in here.",L_Mpara1,"Can you tell me what the building is in the middle of town?",L_Mpara2,"Who is the guy drinking...Over there?",L_Mpara3,"Talk to you later.",L_Mpara4;
 L_Mpara1:
@@ -533,7 +533,7 @@ L_Mpara2:
 L_Mpara3:
 	mes "[Archer Joe]";
 	mes "Oh! He is a notorious guy in this town! Don't treat him to drinks! You will regret that!";
-	   emotion 0;
+	   emotion e_gasp;
 	close;
 L_Mpara4:
 	mes "[Archer Joe]";
@@ -544,7 +544,7 @@ L_Msub2:
 L_Menu2:
 	mes "[Archer Joe]";
 	mes "Oh boy, what a shame! How on earth can't you know there is something about archers of Payon!";
-	   emotion 23;
+	   emotion e_omg;
 	next;
 	mes "[Archer Joe]";
 	mes "Please come back later when you become more skillful! Let's talk about what makes archers of Payon so attractive later!";
@@ -553,7 +553,7 @@ L_Menu3:
 	mes "[Archer Joe]";
 	mes "What makes you zip your mouth? Are you shy?";
 	mes "Ummm... you don't have to be shy before me..";
-	   emotion 20;
+	   emotion e_hmm;
 	close;	
 }
 
@@ -608,7 +608,7 @@ L_Menu3:
 	next;
 	mes "[Monster Scholar Vuicokk]";
 	mes "However NOTHING can stop us!  We will continue to persevere for the benefit of the people of RUNE MIDGARD!!!";
-	   emotion 0;
+	   emotion e_gasp;
 	next;
 	mes "[Monster Scholar Vuicokk]";
 	mes "... Eh em... please excuse my emotional outburst... I am very passionate about this work.....";

npc/cities/prontera.txt

@@ -69,11 +69,11 @@ prontera.gat,106,117,6	script	Merideth	91,{
 	mes "[Merideth]";
 	mes "A HUGE swarm of hornets!! I never saw anything like it! But what was even more surprising was the Queen Bee.";
 	mes "The fact that she could control all of them with such ease....";
-	emotion 23;
+	emotion e_omg;
 	next;
 	mes "[Merideth]";
 	mes "If only a girl like myself had that much power over guys.... NOW THAT, would be really cool!!";
-	emotion 29;
+	emotion e_gg;
 	close;
 }
 
@@ -88,14 +88,14 @@ prontera.gat,146,204,2	script	YuNa	700,{
 	next;
 	mes "[YuNa]";
 	mes "HE DID IT ALL WRONG!!";
-	emotion 7;
+	emotion e_ag;
 	next;
 	mes "[YuNa]";
 	mes "The statue is just totally different from the Odin we all know! He insisted that it was his artistic view or something....";
 	next;
 	mes "[YuNa]";
 	mes "Look~ He doesn't have a broad brimmed hat.... he's not even riding Sleipnir.... this is just totally unacceptable~!";
-	emotion 32;
+	emotion e_pif;
 	close;
 }
 
@@ -157,7 +157,7 @@ prt_in.gat,88,105,2	script	Recruiter	105,{
 		mes "[Recruiter]";
 		mes "Didn't you hear yet? The Culvert is infested with noxious insects. We found bugs, maggots, and other creatures there.";
 		mes "They've become a huge problem... You've Never heard of this?";
-		emotion 1;
+		emotion e_what;
 		next;
 		mes "[Recruiter]";
 		mes "Because of the severity of these 'issues',it is forbidden for the people to use the water supply for the time being.";
@@ -170,7 +170,7 @@ prt_in.gat,88,105,2	script	Recruiter	105,{
 		next;
 		mes "[Recruiter]";
 		mes "Mighty Warrior!! The People NEED YOU!! Let's EXPEL these VILE creatures from our land!!!";
-		emotion 27;
+		emotion e_go;
 		next;
 		mes "[Recruiter]";
 		mes "WILL YOU volunteer????";
@@ -179,7 +179,7 @@ prt_in.gat,88,105,2	script	Recruiter	105,{
 		
 			mes "[Recruiter]";
 			mes "..............";
-			emotion 4;
+			emotion e_swt;
 			close;
 	M_VOL:
 		mes "[Recruiter]";
@@ -381,7 +381,7 @@ prt_in.gat,26,30,1	script	Sir Michael	54,{
 	next;
 	mes "[Sir Michael]";
 	mes "I saw a GIAGANTIC, SHIMMERING, ^FF5555GOLDEN THIEF BUG^000000.";
-	emotion 0;
+	emotion e_gasp;
 	next;
 	mes "[Sir Michael]";
 	mes "I all my years I've never seen a thief bug as LARGE or as SHINY!!! What an amazing sight!";
@@ -412,7 +412,7 @@ prt_in.gat,173,24,2	script	Shevild	85,{
 		next;
 		mes "[Shevild]";
 		mes "Hm... Now... I'm suddenly reminded of a mysterious dungeon and a dangerous forest....";
-		emotion 20;
+		emotion e_hmm;
 		next;
 	L_MENU:
 		menu "The mysterious Dungeon?",-,"The dangerous forest?",M_L01,"End conversation",M_END0;
@@ -433,7 +433,7 @@ prt_in.gat,173,24,2	script	Shevild	85,{
 				mes "[Shevild]";
 				mes "Huh? What? haven't you even wandered around just outside of Prontera yet, man?";
 				mes "Alright, alright. I'll tell you. If you go north from the castle of Prontera, the dungeon is at the edge of the north-west side of the forest.";
-				emotion 1;
+				emotion e_what;
 				next;
 				goto L_MENU;
 
@@ -479,7 +479,7 @@ prt_in.gat,181,21,2	script	Bartender	61,{
 	next;
 	mes "[Bartender]";
 	mes "If things don't change... my special menu of 'Sour Crunches' and 'Tasty Yum-Yum' will disappear from people's memories, sob... sob...";
-	emotion 28;
+	emotion e_sob;
 	next;
 L_MENU:
 	menu "'Sour Crunches'?",-,"'Tasty Yum-Yum?'",L1,"Better let him be....",L_END;
@@ -537,7 +537,7 @@ prt_in.gat,177,20,2	script	TenSue	97,{
 		mes "What? You're sick and tired of killing monsters in fields and dungeons?";
 		mes "Hahaha, it seems like you are very confident in your training. If you think so...";
 		mes "Why don't you visit Izlude, the satellite of Prontera.";
-		emotion 1;
+		emotion e_what;
 		next;
 		mes "[TenSue]";
 		mes "Cool Event Corp. has opened up the arena called Time Limit Fight and Battle Ordeal, to full fill the young people's thirst for more excitement...";

npc/cities/umbala.txt

@@ -38,10 +38,10 @@
 comodo.gat,170,137,7	script	Reid	84,{
 	close;
 On_Emotion20:
-	emotion 20;
+	emotion e_hmm;
 	end;
 On_Emotion29:
-	emotion 29;
+	emotion e_gg;
 	end;
 }
 
@@ -60,7 +60,7 @@ comodo.gat,171,137,1	script	Heath	92,{
 	mes "We'll keep looking as long as it takes!";
 	next;
 	donpcevent "Reid::On_Emotion29";
-	emotion 29;
+	emotion e_gg;
 	mes "[Heath]";
 	mes "Hey, Reid, come on!";
 	next;
@@ -68,7 +68,7 @@ comodo.gat,171,137,1	script	Heath	92,{
 	mes "............";
 	next;
 	donpcevent "Reid::On_Emotion29";
-	emotion 20;
+	emotion e_hmm;
 	mes "[Reid]";
 	mes "Okay, okay...I'm coming.";
 	next;
@@ -78,7 +78,7 @@ comodo.gat,171,137,1	script	Heath	92,{
 		mes "[Reid]";
 		mes "You mean you've never heard of it?!";
 		next;
-		emotion 29;
+		emotion e_gg;
 		mes "[Heath]";
 		mes "Oh, you want to hear the story of the";
 		mes "treasure, huh?  Well, how important";
@@ -86,7 +86,7 @@ comodo.gat,171,137,1	script	Heath	92,{
 		next;
 		mes "[Reid and Heath]";
 		donpcevent "Reid::On_Emotion29";
-		emotion 29;
+		emotion e_gg;
 		mes "Important enough for you to";
 		mes "cough up 1000 zeny?!";
 		next;
@@ -121,7 +121,7 @@ comodo.gat,171,137,1	script	Heath	92,{
 			mes "I'm on a search for that box!";
 			mes "I'm going to find it!";
 			next;
-			emotion 20;
+			emotion e_hmm;
 			mes "[Heath]";
 			mes "There's just one problem.";
 			mes "We don't have the slightest";
@@ -153,7 +153,7 @@ comodo.gat,171,137,1	script	Heath	92,{
 
 		Lzeny_2:
 			donpcevent "Reid::On_Emotion20";
-			emotion 20;
+			emotion e_hmm;
 			mes "[Heath]";
 			mes "Whaaaaat?!  I swear that our marks";
 			mes "aren't as gullible as they used to be.";
@@ -257,14 +257,14 @@ if(event_umbala < 3) goto LumWord;
 	mes "[???]";
 	mes "My name is Hatan!  Nice to";
 	mes "meet you.";
-	emotion 18;
+	emotion e_heh;
 	next;
 	mes "[Hatan]";
 	mes "...I can't play now, because";
 	mes "a recent thunderstorm caused";
 	mes "the roof of our house to become";
 	mes "cracked...";
-	emotion 28;
+	emotion e_sob;
 	next;
 	mes "[Hatan]";
 	mes "...!";
@@ -275,7 +275,7 @@ if(event_umbala < 3) goto LumWord;
 	mes "give us a little zeny";
 	mes "so we can fix the crack?";
 	mes "Please!";
-	emotion 28;
+	emotion e_sob;
 	next;
 	menu "Nod",-,"Shake Head",Lend2;
 
@@ -285,23 +285,23 @@ if(event_umbala < 3) goto LumWord;
 		mes "You're the best!!";
 		set Zeny,Zeny-1000;
 		getitem 517,1;//Items: Meat,
-		emotion 19;
+		emotion e_swt2;
 		next;
 		mes "[Hatan]";
 		mes "Please take this as a token of my gratitude.";
-		emotion 18;
+		emotion e_heh;
 		close;
 
 		LError2:
 			mes "[Hatan]";
 			mes "Well, maybe I underestimated your";
 			mes "wealth, but you shouldn't lie...";
-			emotion 32;
+			emotion e_pif;
 			close;
 	Lend2:
 		mes "[Hatan]";
 		mes "...Awwwww.";
-		emotion 28;
+		emotion e_sob;
 		close;
 
 LumWord:
@@ -312,7 +312,7 @@ LumWord:
 	mes "[???]";
 	mes "Umba!  Umbaumba!";
 	mes "Umbabama Hatan baba.";
-	emotion 18;
+	emotion e_heh;
 	next;
 	mes "[Hatan]";
 	mes "...Umba, Umbaumbaumba.";
@@ -320,7 +320,7 @@ LumWord:
 	mes "Umbabawaumbaumbaba.";
 	mes "Umbaumba.";
 	mes "...Umbaumbamabababumba.";
-	emotion 28;
+	emotion e_sob;
 	next;
 	mes "[Hatan]";
 	mes "...!";
@@ -331,7 +331,7 @@ LumWord:
 	mes "Umbababaumbawabaumba!";
 	mes "Umbaumbaumbababa.";
 	mes "wamfuba!  Umba!";
-	emotion 28;
+	emotion e_sob;
 	next;
 	menu "Nod",-,"Shake Head",Lend;
 
@@ -342,22 +342,22 @@ LumWord:
 		mes "Umba-umba-Umbabawamamaba!";
 		set Zeny,Zeny-1000;
 		getitem 517,1;//Items: Meat,
-		emotion 19;
+		emotion e_swt2;
 		next;
 		mes "[Hatan]";
 		mes "Umbaumba....";
-		emotion 18;
+		emotion e_heh;
 		close;
 
 		LError:
 			mes "[Hatan]";
 			mes "Umba-Umbana!";
-			emotion 32;
+			emotion e_pif;
 			close;
 	Lend:
 		mes "[Hatan]";
 		mes "....Umba....";
-		emotion 28;
+		emotion e_sob;
 		close;
 }
 
@@ -377,7 +377,7 @@ if(event_umbala < 3) goto LumWord;
 		mes "[Kotan]";
 		mes "Hey, thanks!";
 		mes "Take these!";
-		emotion 10;
+		emotion e_scissors;
 		getitem 909,2;//Items: Jellopy,
 		getitem 914,2;//Items: Fluff,
 		getitem 705,2;//Items: Clover,
@@ -387,14 +387,14 @@ if(event_umbala < 3) goto LumWord;
 		mes "......";
 		mes "...I'm hungry!";
 		mes "...Gimme meat!";
-		emotion 28;
+		emotion e_sob;
 		close;
 LError:
 	mes "[Kotan]";
 	mes "Hey!  You said you have";
 	mes "meat!  So you were lying?";
 	mes "I hate you!";
-	emotion 6;
+	emotion e_an;
 	close;
 LumWord:
 	mes "[???]";
@@ -402,7 +402,7 @@ LumWord:
 	mes "....";
 	mes "...Umbaba!";
 	mes "...Famba!";
-	emotion 11;
+	emotion e_rock;
 	next;
 	menu "Umba",-,"Umbabu",Lu2;
 	if(countitem(517) < 1) goto LuError;//Items: Meat,
@@ -410,7 +410,7 @@ LumWord:
 		mes "[???]";
 		mes "Umbaumbaumbababa.";
 		mes "Umbababauma.";
-		emotion 10;
+		emotion e_scissors;
 		getitem 909,2;//Items: Jellopy,
 		getitem 914,2;//Items: Fluff,
 		getitem 705,2;//Items: Clover,
@@ -420,13 +420,13 @@ LumWord:
 		mes "....";
 		mes "......Unguba!";
 		mes "....Umbababa.";
-		emotion 28;
+		emotion e_sob;
 		close;
 LuError:
 	mes "[???]";
 	mes "Umbawamufumabababa!";
 	mes "Umbabababaumbaumbu!";
-	emotion 6;
+	emotion e_an;
 	close;
 }
 
@@ -1218,7 +1218,7 @@ LumWord:
 
 //=====================================================================
 umbala.gat,177,153,3	script	Bast	97,{
-	if (event_umbala>=3) emotion 0;
+	if (event_umbala>=3) emotion e_gasp;
 	mes "[Bast]";
 	mes "Oh!  Another outsider.  It's";
 	mes "great to encounter another one";
@@ -1247,7 +1247,7 @@ umbala.gat,177,153,3	script	Bast	97,{
 	mes "doesn't necessarily mean his";
 	mes "heart is laughing.  Understand?";
 	next;
-	emotion 28;
+	emotion e_sob;
 	mes "[Bast]";
 	mes "Because of that, people in the village";
 	mes "who know our language may have trouble!!";
@@ -1397,7 +1397,7 @@ LumWord:
 	next;
 	mes "[????]";
 	mes "Umbaumbabaungaha.";
-	emotion 28;
+	emotion e_sob;
 	close;
 }
 
@@ -1512,7 +1512,7 @@ um_in.gat,158,71,3	script	Utan Tribesman	787,{
 	mes "It stretches into the sky as far";
 	mes "as the eye can see!";
 	mes "It's supposed to be the tallest tree in the world!";
-	emotion 33;
+	emotion e_ok;
 	next;
 	mes "[Mutakutan]";
 	mes "It's so old and large that";
@@ -1529,12 +1529,12 @@ um_in.gat,158,71,3	script	Utan Tribesman	787,{
 	mes "That said, the fruit I was able";
 	mes "to pick off of some of the higher";
 	mes "branches is yummy!";
-	emotion 21;
+	emotion e_no1;
 	next;
 	mes "[Mutakutan]";
 	mes "It has a slightly sour taste.  Eating";
 	mes "it makes me feel all tingly inside!!";
-	emotion 21;
+	emotion e_no1;
 	next;
 	mes "[Mutakutan]";
 	mes "At the same time, a terrible illness";
@@ -1547,7 +1547,7 @@ um_in.gat,158,71,3	script	Utan Tribesman	787,{
 	mes "fruit, his health improved";
 	mes "dramatically in a short time.  Surely";
 	mes "this fruit was a gift from the forest!";
-	emotion 28;
+	emotion e_sob;
 	next;
 	mes "[Mutakutan]";
 	mes "The tree is north of the village.  Why";
@@ -1594,18 +1594,18 @@ LumWord:
 	mes "Umbaumbaugaga!";
 	mes "Umbaumbabababa!";
 	mes "Umbaumba!";
-	emotion 6;
+	emotion e_an;
 	next;
 	mes "[Purenotan]";
 	mes "Umbaumabaumbaumbaba!";
 	mes "Umbababababaugau!";
 	mes "Uguugaumbabaumbagumba!";
-	emotion 24;
+	emotion e_oh;
 	next;
-	emotion 27;
+	emotion e_go;
 	close;
 On_emo:
-emotion 6;
+emotion e_an;
 end;
 }
 
@@ -1626,7 +1626,7 @@ LumWord:
 	mes "Umbaumbaba.....";
 	mes "Umbaugua!";
 	mes "Umbagumumbabagumbagaga!";
-	emotion 18;
+	emotion e_heh;
 	next;
 	donpcevent "Purenotan::On_emo";
 	close;

npc/cities/valkyrie.txt

@@ -175,7 +175,7 @@ valkyrie.gat,48,86,6	script	Valkyrie	811,{
 L_BABY:
 	mes "A Baby?! How did you get here?";
 	mes "I'm passing you back to your parents.";
-	emotion 1;
+	emotion e_what;
 	next;
 L_Y:
 	warp "yuno_in02.gat",93,204;
@@ -333,10 +333,9 @@ function	script	F_ToHigh	{
 	if(@fjob == Job_Champion) set @fjob,Job_High_Priest;
 	if(@fjob == Job_Professor) set @fjob,Job_High_Wizard;
 
-	set @jobdiff, Job_Novice_High - 24;
-	if(Class == @jobdiff+getarg(0)) goto L_WELCOME; //3rd Job
+	if(Class == getarg(0)) goto L_WELCOME; //3rd Job
 	if(Class >= Job_Lord_Knight && Class <= Job_Paladin2) goto L_ALREADY; //already advanced class
-	if(Class == Job_Novice_High && @fjob == @jobdiff+getarg(2)) goto L_GETHIGH; //High Novice -> High XXXX
+	if(Class == Job_Novice_High && @fjob == getarg(2)) goto L_GETHIGH; //High Novice -> High XXXX
 	if(Class == Job_Novice_High) mes "Hello, Novice High! If you are going to became a "+getarg(1)+", then go visit your very first job teacher.";
 	if(Class == Job_Novice_High) close;
 	return; //this char doesn't want to get HIGH class
@@ -424,11 +423,10 @@ L_ALREADY:
 //getarg(2) - 3rd Job ID
 //getarg(3) - 3rd Job Name
 function	script	F_Rebirth	{
-	set @jobdiff, Job_Novice_High - 24;
 	mes "["+getarg(3)+"]";
 	if(Upper == 2) goto L_BABY; //Baby Class - skip it
 	if(Class >= Job_Lord_Knight && Class <= Job_Paladin2) goto L_ALREADY; //already advanced class
-	if(Class == (@jobdiff+getarg(0)) && ADVJOB == (@jobdiff+getarg(2))) goto L_GET3RD; //Hight XXXX -> 3rd Job
+	if(Class == getarg(0) && ADVJOB == getarg(2)) goto L_GET3RD; //Hight XXXX -> 3rd Job
 	mes "Go talk to either Valhallana or one of my collegues...";
 	emotion e_sry;
 	close;
@@ -492,16 +490,15 @@ L_BABY:
 //getarg(3) - 3rd Job Name
 //getarg(4) - NPC Name
 function	script	F_BlockHigh	{
-	set @jobdiff, Job_Novice_High - 24;
 	if(Upper != 1) return; //This func should interact with Advanced classes only
 	mes "["+getarg(4)+"]";
-	if(Class == (@jobdiff+getarg(0)) && ADVJOB == (@jobdiff+getarg(2))) goto L_RIGHTHIGH;
-	if(Class == (@jobdiff+getarg(2))) goto L_RIGHT3RD;
+	if(Class == getarg(0) && ADVJOB == getarg(2)) goto L_RIGHTHIGH;
+	if(Class == getarg(2)) goto L_RIGHT3RD;
 	if(Class >= Job_Lord_Knight && Class <= Job_Paladin2) goto L_ALREADY3RD; //already advanced class, but from wrong guild
 //this player is a High Novice
 	if(Class == Job_Novice_High) mes "Hello, Novice High! If you are going to became a "+getarg(1)+", then go visit your very first job teacher.";
 //this player has 1st advanced job, but from wrong guild
-	if(Class == (@jobdiff+getarg(0))) mes "A "+getarg(1)+"?";
+	if(Class == getarg(0)) mes "A "+getarg(1)+"?";
 	if(Class != Job_Novice_High) mes "Rumors say only Valhallana knows your way...";
 	emotion e_sry;
 	close;

npc/cities/yuno.txt

@@ -200,12 +200,12 @@ yuno.gat,162,328,4	script	Sage Eskla	735,{
 	next;
 	mes "[Eskla]";
 	mes "Then... without warning.... the piece of paper attacked me!! ME! One of the GREATEST Sages in Yuno!!";
-	emotion 23;
+	emotion e_omg;
 	next;
 	mes "[Eskla]";
 	mes "I said to the piece of paper, 'How dare you attack me you little piece of paper!!' and struck it with my trusty sword.";
 	mes "But that piece of paper was persistent and annoying at that.";
-	emotion 0;
+	emotion e_gasp;
 	next;
 	mes "[Eskla]";
 	mes "Using its paper thin body it dodged my sword simply by turning itself.  The way it was turned I couldn't even tell if it was still there.";
@@ -314,7 +314,7 @@ L_Stang:
 L_Kato:
 	mes "What??!! That fool Stangckle said he doesn't want to help me?? This is not good...... My research will slow down considerably.";
 	mes "......... What will I do now?!?!?";
-	emotion 19;
+	emotion e_swt2;
 	next;
 	mes "[Metto]";
 	mes "Luckily I have a backup plan.  I'm certain that my friend and colleague ^5533FFKato^000000 will lend me a hand.";
@@ -328,15 +328,15 @@ L_Kato:
 	mes "[Metto]";
 	mes "Expect great things from me young friend..... MUHAHAHAHAH!!!!";
 	set metto_q, 4;
-	emotion 29;
+	emotion e_gg;
 	close;
 L_Cici:
 	mes "WHAT!?!? You're telling me that the very thing I need to continue my research with... the Great Z.... has been DESTROYED!?!?";
-	emotion 16;
+	emotion e_wah;
 	next;
 	mes "[Metto]";
 	mes "NOOOOOOO!!! Why?? How?? Why would he do that? Are the Gods cursing me?!?";
-	emotion 6;
+	emotion e_an;
 	next;
 	mes "[Metto]";
 	mes "Wait.... I need to calm down...";
@@ -345,7 +345,7 @@ L_Cici:
 	mes "[Metto]";
 	mes "*sigggghhhh* I still have hope...... YES I DO!! HAHAHA!!!";
 	set metto_q, 6;
-	emotion 29;
+	emotion e_gg;
 	close;
 L_Check:
 	mes "I better get going so I can check this new thing out..... What are you still doing here?";
@@ -357,12 +357,12 @@ L_Ruined:
 	mes "[Metto]";
 	mes "How could something like this happen?? All 3 of my colleagues abandoning me all at once?!?!";
 	mes "It's true....... the Gods HAVE forsaken me..... I'm ruined...... RUINED!!!";
-	emotion 28;
+	emotion e_sob;
 	next;
 	mes "[Metto]";
 	mes "What else can I do now? Has the time really come for me to let go of all of my research?....";
 	mes "Those many, many years of research?........";
-	emotion 28;
+	emotion e_sob;
 	next;
 	mes "[Metto]";
 	mes "You must be disappointed...... but please, forget about all of this... forget about me........";
@@ -404,12 +404,12 @@ L_Start:
 		mes "[Stangckle]";
 		mes "Is this true?? Metto doesn't think of me as a colleague, and is only USING me?";
 		mes "He sees me as a lowly assistant and is going to STEAL all the CREDIT for our discoveries?!!";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "[Stangckle]";
 		mes "I can't believe I trusted him..... the rumors were true.... he IS a selfish mad man!!!.......";
 		mes "And to think I respected a scumbag like that!!";
-		emotion 32;
+		emotion e_pif;
 		next;
 		mes "[Stangckle]";
 		mes "I don't think I can even bear to see his disgusting face anymore.....";
@@ -425,7 +425,7 @@ L_Start:
 	M_End:
 		mes "[Stangckle]";
 		mes "What are you doing here then? Stop wasting my time.";
-		emotion 4;
+		emotion e_swt;
 		close;
 L_Done:
 	mes "So Metto was truly a mad scientist after all...... I guess he will be the one who will ultimately pay for that choice.......";
@@ -449,12 +449,12 @@ L_Start:
 		mes "[Kato]";
 		mes "WHAT!!?? Metto said my Great Z is INFERIOR to Stangckles research!!??";
 		mes "He.... he said I should rename it to 'LAME Z'??.......";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "[Kato]";
 		mes "*Sniff* I... I don't believe it.... *sob* how could he say that?..... If... if my invention is no good.....";
 		mes "Then I guess I should destroy it.... my Great Z.... *sigh*";
-		emotion 28;
+		emotion e_sob;
 		next;
 		mes "[Kato]";
 		mes "How could that Metto be such a heartless bastard?? Thank you for letting me know Metto's TRUE feelings about my work.";
@@ -492,11 +492,11 @@ L_Start:
 
 		mes "[CiCi]";
 		mes "Hmm?? Metto said that he doesn't need my Riding Engine Theory?? Hmphf! How dare he!!!";
-		emotion 32;
+		emotion e_pif;
 		next;
 		mes "[CiCi]";
 		mes "I have half a mind to teach him a little something about TRUE science and INTELLIGENT research!!";
-		emotion 7;
+		emotion e_ag;
 		next;
 		mes "[CiCi]";
 		mes "... Whatever.... I don't have the necessary equipment to help him anyways.";
@@ -511,7 +511,7 @@ L_Start:
 	M_End:
 		mes "[CiCi]";
 		mes "What? That's it? You just wanted to waste some time?...........";
-		emotion 4;
+		emotion e_swt;
 		close;
 
 L_Done:
@@ -536,7 +536,7 @@ yuno_in01.gat,18,30,3	script	Wagan	85,{
 	next;
 	mes "[Wagan]";
 	mes "These people just drive me crazy!";
-	emotion 6;
+	emotion e_an;
 	next;
 	mes "[Wagan]";
 	mes "They think only of themselves and their crazy actions make it much more difficult for everyone else.";
@@ -548,7 +548,7 @@ yuno_in01.gat,18,30,3	script	Wagan	85,{
 	mes "[Wagan]";
 	mes "..... the list goes on and on.  What's worse..... He tries to justify his dreadful actions by calling it 'research'!!!!";
 	mes "He has definitely lost his sanity and has gone too far!!";
-	emotion 7;
+	emotion e_ag;
 	next;
 	mes "[Wagan]";
 	mes "If only there was a way to stop this mad man from destroying our community......";
@@ -559,7 +559,7 @@ yuno_in01.gat,18,30,3	script	Wagan	85,{
 		mes "[Wagan]";
 		mes "Oh?? Are you really going to help us stop Metto? Our city would be very grateful if you could do this.......";
 		mes "But how exactly do you plan on accomplishing this rather difficult task?";
-		emotion 1;
+		emotion e_what;
 		next;
 		menu "Yeah it's pretty hard....",M_End, "Well, I guess I need to think of a plan now.....",-;
 
@@ -589,7 +589,7 @@ L_Check:
 L_Thank:
 	mes "Is this true? You were able to shut down Metto's research? Thank you sooo much for your help.";
 	mes "Without Metto causing trouble we have a lot less to worry about.";
-	emotion 5;
+	emotion e_ic;
 	next;
 	mes "[Wagan]";
 	mes "The people of this city are grateful to you.  Here is a little token of our appreciation......";
@@ -597,11 +597,11 @@ L_Thank:
 	mes "[Wagan]";
 	mes "Thank you once again for your assistance! I wish you the best of luck in all of your future endeavors!!!";
 	getitem 715,10;
-	emotion 15;
+	emotion e_thx;
 	set metto_q, 9;
 	close;
 L_Done:
 	mes "Things have been much more peaceful around here now that Metto has been shut down.  Thank you once again for your help.";
-	emotion 15;
+	emotion e_thx;
 	close;
 }

npc/jobs/1-1/acolyte.txt

@@ -20,7 +20,7 @@
 
 // -- Father Mareusis --
 prt_church.gat,184,41,4	script	Father Mareusis	60,{
-	callfunc "F_ToHigh",28,"Acolyte High",32,"High Priest",156,0,0,0,"Father Mareusis";
+	callfunc "F_ToHigh",Job_Acolyte_High,"Acolyte High",Job_High_Priest,"High Priest",156,0,0,0,"Father Mareusis";
 	mes "[Father Mareusis]";
 	if(BaseJob==Job_Novice && job_acolyte_q > 0) goto L_Check;
 	mes "What is it you are looking for?";
@@ -73,7 +73,7 @@ prt_church.gat,184,41,4	script	Father Mareusis	60,{
 			mes "[Father Mareusis]";
 			mes "Lying is a sin my child!";
 			mes "Please come back when you are ready";
-			emotion 19;
+			emotion e_swt2;
 			close;
 
 	M_1:
@@ -162,7 +162,7 @@ L_Novice:
 	if(job_acolyte_q==4) goto QuestOver;
 	if(job_acolyte_q > 0) goto L_Start;
 	mes "Huh..? What brings you here? This is a Very dangerous place for a Novice like you. Please Go back quickly.";
-	emotion 0;
+	emotion e_gasp;
 	close;
 
 L_Start:
@@ -180,7 +180,7 @@ L_Start:
 	next;
 	mes "[Father Rubalkabara]";
 	mes "Besides, I know your generation doesn't like to be lectured by old men like myself. Hahaha...";
-	emotion 18;
+	emotion e_heh;
 	next;
 	mes "[Father Rubalkabara]";
 	mes "But you might have to learn to endure what your elders say, because God loves to teach his children. You will see.";
@@ -199,7 +199,7 @@ L_Start:
 
 	Goback:
 		mes "Hmmm... I do not think you name is on my list of candidates.";
-		emotion 20;
+		emotion e_hmm;
 		next;
 		mes "[Father Rubalkabara]";
 		mes "...... Why don't you go back to the Santuary and check again.";
@@ -221,7 +221,7 @@ L_Novice:
 	if(job_acolyte_q == 5) goto QuestOver;
 	if(job_acolyte_q > 0) goto L_Start;
 	mes "My!! Aren't you a little far from your town?  A novice like you could get hurt.  Please be safe.";
-	emotion 0;
+	emotion e_gasp;
 	close;
 L_Start:
 	mes "Ah, You are one of the Acolyte Applicants. I sincerely welcome you.";
@@ -250,7 +250,7 @@ L_Start:
 		mes "[Mother Marthilda]";
 		mes "Hmm....let's see....";
 		mes "..Well... I can't find your name on the List ....";
-		emotion 20;
+		emotion e_hmm;
 		next;
 		mes "[Mother Marthilda]";
 		mes "I recommend that you to return to the Santuary and Check again.";
@@ -296,14 +296,14 @@ L_Start:
 	next;
 	mes "[Father Yosuke]";
 	mes "Now go back to the Sanctuary and don't forget to carry God's teachings with you where ever you go!";
-	emotion 27;
+	emotion e_go;
 	set job_acolyte_q,6;
 	close;
 
 	Goback:
 		mes "[Father Yosuke]";
 		mes "Interesting.. I can't find your name on my list..";
-		emotion 20;
+		emotion e_hmm;
 		next;
 		mes "[Father Yosuke]";
 		mes "I think you've come here by mistake.";
@@ -312,11 +312,11 @@ L_Start:
 
 	QuestOver:
 		mes "What ? You Have more Business with me?";
-		emotion 1;
+		emotion e_what;
 		next;
 		mes "[Father Yosuke]";
 		mes "Your Divine Quest is complete.  Go back to the Sanctuary Now!";
-		emotion 27;
+		emotion e_go;
 		close;
 }
 

npc/jobs/1-1/archer.txt

@@ -18,7 +18,7 @@
 
 // -- Archer Guildsman -- 
 payon_in02.gat,64,71,4	script	Archer Guildsman	59,{
-	callfunc "F_ToHigh",27,"High Archer",35,"Sniper",147,148,0,0,"Archer Guildsman";
+	callfunc "F_ToHigh",Job_Archer_High,"High Archer",Job_Sniper,"Sniper",147,148,0,0,"Archer Guildsman";
 	mes "[Archer Guildsman]";
 	if(BaseJob==Job_Novice && job_archer_q == 1) goto L_Check;
 	mes "Good Day. How may I help you?";

npc/jobs/1-1/mage.txt

@@ -19,7 +19,7 @@
 
 // -- Expert Mage -- 
 geffen_in.gat,164,124,4	script	Expert Mage	123,{
-	callfunc "F_ToHigh",26,"High Mage",33,"High Wizard",157,0,0,0,"Expert Mage";
+	callfunc "F_ToHigh",Job_Mage_High,"High Mage",Job_High_Wizard,"High Wizard",157,0,0,0,"Expert Mage";
 	if(BaseJob==Job_Novice && job_magician_q >= 1) goto L_BeMage;
 
 	mes "[Expert Mage]";
@@ -83,7 +83,7 @@ L_BeMage:
 	next;
 	mes "[Expert Mage]";
 	mes "Well it's not perfect but it seems you worked very hard on this so...... alright! I'll let you pass!  You are now officialy qualified to become a mage!";
-	emotion 21;
+	emotion e_no1;
 	next;
 	mes "[Expert Mage]";
 	mes "Abra-kadabra and hocus pocus, turn this young novice into a ^00aa00MAGE^000000!!";
@@ -99,7 +99,7 @@ L_BeMage:
 	callfunc "F_ClearJobVar";		// clears all job variables for the current player
 	mes "[Expert Mage]";
 	mes "'Welcome to My World~ teh hehe.  I've always wanted to say that.  Anyways, congratulations!.  You're one of us now so let's be friends okays!";
-	emotion 18;
+	emotion e_heh;
 	next;
 	mes "[Expert Mage]";
 	mes "Good luck to ya and take care!";
@@ -108,14 +108,14 @@ L_BeMage:
 	L_Retry:
 		mes "I'm sorry but the solution you have is no good.  I'm afraid that you didn't pass the test.  You can try again though.";
 		mes "Let me exlpain the test for you once more okays.";
-		emotion 4;
+		emotion e_swt;
 		next;
 		delitem 1090,1;//Items: Unknown_Test_Tube,
 		goto L_Explain;
 
 	L_NoSol:
 		mes "Where is the solution I asked for?  I'm sorry but I can't check the solution when you don't have it.  Let me remind you what solution you need.";
-		emotion 1;
+		emotion e_what;
 		next;
 		goto L_Explain;
 
@@ -409,7 +409,7 @@ moc_ruins.gat,91,150,5	script	Ponka-Hontas	93,{
 		getitem 1088,1;//Items: Morroc_Solution,
 		mes "Thank you, I think you will be a great mage, you are so generous.";
 		mes "I hope i'll see you soon again here";
-		emotion 21;
+		emotion e_no1;
 		close;
 
 		L0NoT:
@@ -448,7 +448,7 @@ pay_arche.gat,122,100,5	script	Dollshoi	88,{
 		getitem 1089,1;//Items: Payon_Solution,
 		mes "Thank you, I think you will be a great mage, you are so generous.";
 		mes "I hope i'll see you soon again here";
-		emotion 21;
+		emotion e_no1;
 		close;
 
 		L0NoT:

npc/jobs/1-1/merchant.txt

@@ -20,7 +20,7 @@
 // == Guild NPCs == 
 // -- Mahnsoo --
 alberta_in.gat,53,43,6	script	Chief Mahnsoo	86,{
-	callfunc "F_ToHigh",29,"Merchant High",34,"White Smith",153,154,155,0,"Chief Mahnsoo";
+	callfunc "F_ToHigh",Job_Merchant_High,"Merchant High",Job_Whitesmith,"White Smith",153,154,155,0,"Chief Mahnsoo";
 	mes "[Chief Mahnsoo]";
 	if(BaseJob==Job_Novice && job_merchant_q3 == 4) goto L_MakeMerc;
 	if(BaseJob==Job_Novice && job_merchant_q3 == 3) goto L_GiveRecpt;
@@ -55,7 +55,7 @@ M_Menu:
 				sl_Short1k:	
 					mes "Looks like your a little short on zeny.  Why not make a minimal payment of 500 Zeny first?";
 					mes "You can worry about the rest later.";
-					emotion 4;
+					emotion e_swt;
 					goto sM_Menu;
 					close;
 
@@ -69,7 +69,7 @@ M_Menu:
 				
 				sl_Short500z:
 					mes "Looks like your a little short on zeny.  Come back when you have enough.";
-					emotion 4;
+					emotion e_swt;
 					close;
 
 			m_0End:
@@ -245,7 +245,7 @@ L_GiveRecpt:
 
 L_Back:
 	mes "What are you doing back here?";
-	emotion 1;
+	emotion e_what;
 	next;
 	mes "[Chief Mahnsoo]";
 	mes "You didn't leave yet?";
@@ -289,7 +289,7 @@ L_MakeMerc:
 
 	mes "[Chief Mahnsoo]";
 	mes "Congratulations! You are now one of us, A PROUD MERCHANT!!";
-	emotion 21;
+	emotion e_no1;
 	next;
 	mes "[Chief Mahnsoo]";
 	mes "I am very pleased that you decided to join the Merchant Guild and I hope you will play an active role in Rune Midgards' economy!  The best of luck to you!!";
@@ -306,7 +306,7 @@ L_MakeMerc:
 	L_MemFee:
 		mes "[Chief Mahnsoo]";
 		mes "Um... before I go on... there was the little issue of the Membership Fee if you recall.  I will need the rest of it before I can proceed with your initiation.";
-		emotion 20;
+		emotion e_hmm;
 		next;		           			
 		menu "Pay the remaining 500 Zeny",sM_1a,"...(run away!)...",sM_1b;
 
@@ -322,13 +322,13 @@ L_MakeMerc:
 			sL_NotEnough:
 				mes "[Chief Mahnsoo]";
 				mes "Eh em.... you seem to be a little short.  Now that you've come this far, don't let a little fee impede your progress.  Go forth and do something about it!";
-				emotion 4;
+				emotion e_swt;
 				close;
 
 		sM_1b:
 			mes "[Chief Mahnsoo]";
 			mes "WHAT THE??? Hey come back here! YOU STILL HAVE TO PAY THE FEE!!!!!";
-			emotion 19;
+			emotion e_swt2;
 			close;
 
 L_Failed:
@@ -339,7 +339,7 @@ L_Failed:
 	next;
 	mes "[Chief Mahnsoo]";
 	mes "What a shame, what a shame! HOW could you be so CARLESS??!!  I'm sure Wharehouse Manager Kay has already given you an earfull so I will not go on with anymore critizism.";
-	emotion 32;
+	emotion e_pif;
 	next;
 	mes "[Chief Mahnsoo]";
 	mes "^ff0000"+strcharinfo(0) + "^000000, you have failed in the Merchant License Test!  However...... if you are TRUELY interested in becoming a Merchant, and will work EXTREMELY HARD to do so....";
@@ -357,7 +357,7 @@ L_Failed:
 	M_NoThanks:
 		mes "[Chief Mahnsoo]";
 		mes "Remeber these words: In life, failure is NOT an option!!!";
-		emotion 0;
+		emotion e_gasp;
 		set job_merchant_q,0;
 		set job_merchant_q2,0;
 		set job_merchant_q3,0;
@@ -528,7 +528,7 @@ L_Check:
 		mes "[Wharehouse Manager Kay]";
 		mes "Great! Everything went perfectly! I will send my evaluation of your performance to 'Chief Mahnsoo' imiediately.";
 		mes "Go ahead and speak with Chief Mahnsoo so that he can finalize the process to make you a Merchant.";
-		emotion 21;
+		emotion e_no1;
 		set job_merchant_q3,4;
 		close;
 	L_LostRecpt:
@@ -536,17 +536,17 @@ L_Check:
 		next;
 		mes  "[Wharehouse Manager Kay]";
 		mes "YOU HAVE NO RECIEPT?????";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "[Wharehouse Manager Kay]";
 		mes "HOW the HECK am I gonna know that you delievered it then?  This was an ABSOLUTE FAILURE!!";
 		mes "Your evaluation is not going to look good.  I suggest you find some good excuses by the time you speak with Chief Mahnsoo.";
-		emotion 32;
+		emotion e_pif;
 		set job_merchant_q3,5;
 		close;
 	L_WrongProd:
 		mes "You delivered the WRONG PRODUCT??? DO YOU know how much TIME you've WASTED???? UCK! This was a total failure!";
-		emotion 6;
+		emotion e_an;
 		next;
 		mes "[Wharehouse Manager Kay]";
 		mes "Your evaluation is not going to look good.  I suggest you find some good excuses when you go to speak with Chief Mahnsoo.";
@@ -560,14 +560,14 @@ L_Check:
 L_Back:
 	if((countitem(1081) != 1) && (countitem(1082) != 1) && (countitem(1083) != 1)) goto L_LostProd;//Items: Delivery_Box, Delivery_Box_, Delivery_Box__,
 	mes "Huh? Back so soon? Don't tell me you ran into problems already....";
-	emotion 20;
+	emotion e_hmm;
 	next;
 	menu "Please Exchange the Product.",M_Exch,"Nope, never mind.",M_Nvmnd;
 
 	M_Exch:
 		mes "[Wharehouse Manager Kay]";
 		mes "Sigh... this is not a good way to start your test you know.  Make sure you get the RIGHT Product this time!  ";
-		emotion 32;
+		emotion e_pif;
 		if(countitem(1081) ==1) delitem 1081,1;//Items: Delivery_Box,
 		if(countitem(1082) ==1) delitem 1082,1;//Items: Delivery_Box_,
 		if(countitem(1083) ==1) delitem 1083,1;//Items: Delivery_Box__,
@@ -583,15 +583,15 @@ L_Back:
 		next;
 		mes "[Wharehouse Manager Kay]";
 		mes "WHAT???";
-		emotion 1;
+		emotion e_what;
 		next;
 		mes "[Wharehouse Manager Kay]";
 		mes "Holy crap!! YOU LOST the product??!! What have you done, you moron!!!";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "[Wharehouse Manager Kay]";
 		mes "Your evaluation is not going to look good.  I suggest you find some good excuses when you go to speak with Chief Mahnsoo.";
-		emotion 7;
+		emotion e_ag;
 		set job_merchant_q3,5;
 		close;
 
@@ -638,7 +638,7 @@ function	script	F_MercKafra	{
 		if(countitem(1072) == 1) goto L_Msg;//Items: Delivery_Message,
 		mes "[Kafra]";
 		mes "Thanks so much for comming all this way to deliver the product to me.  Take care now.  By bye.";
-		emotion 15;
+		emotion e_thx;
 		cutin "kafra_03",255;
 		close;
 
@@ -646,11 +646,11 @@ function	script	F_MercKafra	{
 			mes "[Kafra]";
      			mes "Oh,My good Lord! Mr. Mansoo wrote me a Letter? Thank you, Thank you~";
      			mes "I though he would send one, one of these days, but I've never expected it would be at a time like this.....";
-			emotion 1;
+			emotion e_what;
 			next;
 			mes "[Kafra]";
 			mes "I really appreciate what you've done for me.  Here is a small gift to show you my thanks.";
-			emotion 15;
+			emotion e_thx;
 			delitem 1072,1;//Items: Delivery_Message,
 			set @TEMP,rand(2);
 			if(@TEMP !=0) goto R1;
@@ -667,20 +667,20 @@ function	script	F_MercKafra	{
 
 L_NoProd:
 	mes ".... I thought we what we ordered was OVERSIZED and HEAVY.... but.... you seem to carry it on without any difficulty.........";
-	emotion 1;
+	emotion e_what;
 	cutin "kafra_03",255;
 	close;
 
 L_WrongProd:
 	mes "......? Excuse me! I think you gave me the wrong item.  Our order should have the serial number 3318702 or 3543625...";
-	emotion 4;
+	emotion e_swt;
 	set job_merchant_q3,2;
 	cutin "kafra_03",255;
 	close;
 
 L_WrongDest:
 	mes "......? Excuse me.... I think you have the wrong person.... our order should have the serial number 3318702 or 3543625...";
-	emotion 4;
+	emotion e_swt;
 	cutin "kafra_03",255;
 	close;
 }
@@ -726,7 +726,7 @@ L_Other:
 	M_End:
 		mes "[Kafra]";
 		mes "Thank you for using Kafra Corp. Services.  We will be with you wherever you go.";
-		emotion 15;
+		emotion e_thx;
 		cutin "kafra_03",255;
 		close;
 
@@ -765,27 +765,27 @@ L_Start:
 	L_3:
 		mes "[Kafra]";
 		mes "Thank you again for the delivery.";
-		emotion 15;
+		emotion e_thx;
 		cutin "kafra_03",255;
 		close;
 
 L_NoProd:
 	mes "Umm......... excuse me... but where is the Product  your supposed to give me....?";
-	emotion 20;
+	emotion e_hmm;
 	cutin "kafra_03",255;
 	close;
 
 L_WrongProd:
 	mes "Oh, Dear... this isn't what I ordered.  It should have a serial number of either ^ff00002485741 or 2328137^000000.";
 	mes "It looks like there was a mix up at the wharehouse and you got the wrong product.  I'd appreciate it if you could sort this out.";
-	emotion 4;
+	emotion e_swt;
 	set job_merchant_q3,2;
 	cutin "kafra_03",255;
 	close;
 
 L_WrongDest:
 	mes "Oh, Dear... this isn't what I ordered.  You see here, it's addressed to someone else.  It looks like this Product is supposed to go to someone else.";
-	emotion 4;
+	emotion e_swt;
 	cutin "kafra_03",255;
 	close;
 }
@@ -841,23 +841,23 @@ L_Start:
 	L_3:
 		mes "[Guild Staff]";
 		mes "Heheh~ Thank you, Bye Bye.";
-		emotion 15;
+		emotion e_thx;
 		close;
 L_NoProd:
 	mes "Huh? Where? Where is the Box?";
-	emotion 1;
+	emotion e_what;
 	close;
 
 L_WrongDest:
 	mes "Hey wait a Minute! This is not what we ordered! The Serial Number should either be 2989396 or 2191737.";
 	mes "It looks like this is addressed to someone else.  I think you got the wrong delivery destination.";
-	emotion 19;
+	emotion e_swt2;
 	close;
 
 L_WrongProd:
 	mes "Hey wait a Minute! This is not what we ordered! The Serial Number should either be 2989396 or 2191737.";
 	mes "I don't know how you could make this mistake but please correct it.  I really need that Product.";
-	emotion 19;
+	emotion e_swt2;
 	set job_merchant_q3,2;
 	close;
 }
@@ -909,31 +909,31 @@ L_Start:
 	L_3:
 		mes "[Dyer's Student]";
 		mes "Thank you, See you next time~";
-		emotion 15;
+		emotion e_thx;
 		close;
 
 L_NoProd:
 	mes "But where's the Product?";
-	emotion 20;
+	emotion e_hmm;
 	close;
 
 L_WrongProd:
 	mes "Um..... excuse me? I don't think this is what we ordered? The Serial Number should be either 3012685 or 3487372.";
-	emotion 20;
+	emotion e_hmm;
 	next;
 	mes "[Dyer's Student]";
 	mes "I see.  There was a mix up at the wharehouse and you got the wrong product.";
 	next;
 	mes "[Dyer's Student]";
 	mes "Well this sucks.  Please come back with the correct Product.";
-	emotion 32;
+	emotion e_pif;
 	set job_merchant_q3,2;
 	close;	
 
 L_WrongDest:
 	mes "Um.... excuse me? I don't think this is what we ordered? The Serial Number should be either 3012685 or 3487372.";
 	mes "I think you have the wrong delivery destination.  Maybe you should try someone else.";
-	emotion 20;
+	emotion e_hmm;
 	close;
 
 

npc/jobs/1-1/swordman.txt

@@ -55,7 +55,7 @@ izlude_in.gat,62,170,0	script	w1039	45,1,1,{
 // == Npcs ==
 // -- Master Swordsman --
 izlude_in.gat,74,172,5	script	Master Swordsman	119,{
-	callfunc "F_ToHigh",25,"Swordman High",31,"Lord Knight",144,145,146,0,"Master Swordsman";
+	callfunc "F_ToHigh",Job_Swordman_High,"Swordman High",Job_Lord_Knight,"Lord Knight",144,145,146,0,"Master Swordsman";
 	mes "[Master Swordsman]";
 	if(BaseJob==Job_Novice && job_sword_q == 2) goto L_Done;
 	mes "Welcome to the Swordsman Association! So.. What business brings you to us?";
@@ -119,7 +119,7 @@ L_Menu:
 		mes "[Master Swordsman]";
 		mes "Aside from this, in my personal opinion, being a 'Swordsman' is greatest job in all the land!";
 		mes "Muhahahah!!!";
-		emotion 18;
+		emotion e_heh;
 		goto L_Menu;
 
 	M_2:
@@ -149,13 +149,13 @@ L_Menu:
 		O_2b:
 			mes "[Master Swordsman]";
 			mes "....but you're already a Swordsman...????";
-			emotion 20;
+			emotion e_hmm;
 			close;
 					
 	M_End:
 		mes "[Master Swordsman]";
 		mes "Enjoy your youth before you lose it~~ Muhahahaha!!!!";
-		emotion 18;
+		emotion e_heh;
 		close;
 
 L_Done:
@@ -197,11 +197,11 @@ OnStart:
 
 L_Other:
 	mes "Who might you be?! Those who are not Novices are not permitted to go in! Please leave.";
-	emotion 1;
+	emotion e_what;
 	close;
 L_Sword:
 	mes "You're already a Swordsman!! You don't need to take this silly test!";
-	emotion 0;
+	emotion e_gasp;
 	close;
 
 L_Novice:
@@ -211,7 +211,7 @@ L_Novice:
 		mes "Halt! Do you want to take the Swordsman Test?";
 		mes "If so, please fill out the swordsman application first.";
 		mes "Speak with the 'Master Swordsman' for more information.";
-		emotion 0;
+		emotion e_gasp;
 		close;
 
 	L_Start:

npc/jobs/1-1/thief.txt

@@ -49,7 +49,7 @@ M_Menu:
 		next;
 		mes "[Thief Guide]";
 		mes "Hahahaha... I can still remember the look on that guy's face...";
-		emotion 18;
+		emotion e_heh;
 		next;
 		mes "[Thief Guide]";
 		mes "But anyways... I assume you're here to become a thief...";
@@ -61,7 +61,7 @@ M_Menu:
 		sM_0b:
 			mes "[Thief Guide]";
 			mes "Wow... thanks... now get the HELL OUTA HERE!!";
-			emotion 6;
+			emotion e_an;
 			close;
 		sM_0c:
 			mes "[Thief Guide]";
@@ -77,7 +77,7 @@ M_Menu:
 	M_End:
 		mes "[Thief Guide]";
 		mes "Must you people keep wasting my time!!?";
-		emotion 32;
+		emotion e_pif;
 		close;
 
 	L_Test:
@@ -129,7 +129,7 @@ M_Menu:
 		next;
 		mes "[Thief Guide]";
 		mes "   If you don't have any questions... then GET moving!";
-		emotion 27;
+		emotion e_go;
 		set job_thief_q,1;
 		close;
 
@@ -145,32 +145,32 @@ M_Menu:
 			mes "[Thief Guide]";
 			mes "..... What are you doing here? You're supposed to be gathering mushrooms remember??";
 			mes "Don't tell me you forget what to do??? Jeeze... do you want me to explain it to you one more time?......";
-			emotion 20;
+			emotion e_hmm;
 			next;
 			menu "Heh.. yeah I guess..",sM_1a, "Nope.",sM_1b;
 
 			sM_1a:
 				mes "[Thief Guide]";
 				mes "(~sigh~) There's always someone who gets left behind.... This is the last time so listen CAREFULLY!!....";
-				emotion 32;
+				emotion e_pif;
 				next;
 				goto L_Explain;
 			sM_1b:
 				mes "[Thief Guide]";
 				mes ".... Then what is it??? Do you have something to tell me? YOUR the one who came TO ME...";
 				mes "What... you wanna a piece of me?? HUH!!??";
-				emotion 7;
+				emotion e_ag;
 				close;
 
 		sL_1:
 			mes "[Thief Guide]";
 			mes "What? You actually went and stole some mushrooms?? Are you some kinda idiot?";
 			mes "Haha... I can't believe you listened to me..... ";
-			emotion 1;
+			emotion e_what;
 			next;
 			mes "[Thief Guide]";
 			mes ".... Psych!! Just kidding... heheheh! Speak with the guy next to me about rating the mushrooms you swiped.";
-			emotion 18;
+			emotion e_heh;
 			close;
 
 	L_1:
@@ -185,7 +185,7 @@ M_Menu:
 			next;
 			mes "[Thief Guide]";
 			mes "...... You won't take my place, will you? If you have any ambition like that, I will kick your ^ff0000'ASS OUT OF YOUR BUTT'^000000!";	//this is just too much lol.
-			emotion 0;
+			emotion e_gasp;
 			next;
 			mes "[Thief Guide]";
 			mes "   Still, in order to pass the test you need to go get some mushrooms.";
@@ -196,21 +196,21 @@ M_Menu:
 			next;
 			mes "[Thief Guide]";
 			mes "   Eeewww! Yuuuckk! Still, in order to pass the test you need to go get some mushrooms.";
-			emotion 16;
+			emotion e_wah;
 			close;
 }
 
 
 // -- Test Grader --
 moc_prydb1.gat,42,133,2	script	Comrade Brad	118,{
-	callfunc "F_ToHigh",30,"Thief High",36,"Assassin Cross",149,150,151,152,"Brad";
+	callfunc "F_ToHigh",Job_Thief_High,"Thief High",Job_Assassin_Cross,"Assassin Cross",149,150,151,152,"Brad";
 	if(BaseJob == 0) goto L_Novice;
 	if(BaseJob == 6) goto L_Thief;
 
 L_Other:
 	mes "[Brad]";
 	mes "Hey~ Hey~!! You don't look like a Thief.  What the heck? You'd BETTER NOT be trying to start someting on THIEF TERRITORY!!";
-	emotion 23;
+	emotion e_omg;
 	close;
 L_Thief:
 	mes "[Brad]";
@@ -263,7 +263,7 @@ L_4:
 	L_Final:
 		mes "[Comrade Brad]";
 		mes "Congratulations ^ff0000"+strcharinfo(0)+"^000000, you passed the official Thief Test!  You can now become a Thief!!";
-		emotion 21;
+		emotion e_no1;
 		next;
 		if(SkillPoint > 0) goto sL_SkPoint;
 		delitem 1069, countitem(1069);//Items: Orange_Net_Mushroom,
@@ -283,7 +283,7 @@ L_4:
 		mes "[Comrade Brad]";
 		mes "However, If you bring disgrace to our Guild, or ever betray us, we will not hesitate to have you......";
 		mes "how shall I say..... ^ff0000'REMOVED'^000000 from the Thief Guild.";
-		emotion 29;
+		emotion e_gg;
 		next;
 		mes "[Comrade Brad]";
 		mes "Good luck and always remeber the ^0000cc'Thief Motto'^000000: ^ff0000DON'T Get Caught^000000l!";
@@ -333,18 +333,18 @@ L_Other:
 		mes "[Irrelevent Man]";
 		mes "Hey!! DON'T LOOK AT ME like that! I'M NOT some WACKO okay!!!";
 		set @s_flag, @s_flag+1;
-		emotion 6;
+		emotion e_an;
 		close;
 	L_1e:
 		mes "[Irrelevant Man]";
 		mes "Dude! I got nothin to say with you!  Mind your own business!  Sheesh!!";
-		emotion 32;
+		emotion e_pif;
 		close;
 
 L_Thief:
 	mes "[Irrelevant Man]";
 	mes "Yah Hoo! Look at you! You became a Kool Thief!";
-	emotion 21;
+	emotion e_no1;
 	next;
 	mes "[Irrelevant Man]";
 	mes "Don't worry about Shibu's Farm.  Let the newbies handle that.  Why don't ya go out and kill some stronger monsters.";
@@ -396,7 +396,7 @@ L_2:
 L_3:
 	mes "[Irrelevant Man]";
 	mes "Muhahahaha~~ WHAT???~~ You HAVEN'T PASSED the Test yet? Are you some sort of Idiot!! Kakakaka!!";
-	emotion 18;
+	emotion e_heh;
 	next;
 	mes "[Irrelevant Man]";
 	mes "Just kidding..... NOT!!.  Anywho I'll let ya back in!";

npc/jobs/1-1e/taekwon.txt

@@ -42,7 +42,7 @@ payon.gat,146,87,7	script	Taekwon	764,{
 		
 	}
 	mes "Good day. I'm a Taekwon Guild Master.";
-	emotion 1;
+	emotion e_what;
 	close;
 
 L_Check:

npc/jobs/2-1/assassin.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 1.6
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena RC4
 //===== Description: ========================================= 
@@ -25,6 +25,7 @@
 //= 1.6 Added a func which prevent advanced classes passing
 //= 2nd Job Quests again. It also guides adv classes where
 //= to go. [Lupus]
+//= 2.0 Changed numbers to constants. [Vicious]
 //============================================================ 
 
 
@@ -34,7 +35,7 @@
 //****************************************************************************//
 
 in_moc_16.gat,19,33,4	script	Guildsman	55,{
-	callfunc "F_BlockHigh",30,"Thief High",36,"Assassin Cross","Assassin Huey";
+	callfunc "F_BlockHigh",Job_Thief_High,"Thief High",Job_Assassin_Cross,"Assassin Cross","Assassin Huey";
 
 	if(BaseJob==Job_Thief) goto L_Thief;
 	callfunc "Ass_check";
@@ -42,7 +43,7 @@ in_moc_16.gat,19,33,4	script	Guildsman	55,{
 L_Thief:
 	if(JobLevel >= 40) goto L_Start;
 	mes "Hmm? What brings you here?.... I don't think I like the way you're looking at me....?!";
-	emotion 1;
+	emotion e_what;
 	next;
 	mes "[Angry looking man]";
 	mes ".... Hmm.... You're not qualified yet.  To become an Assassin you will have to meet our expectations.";
@@ -56,7 +57,7 @@ L_Start:
 	if(ASSIN_Q == 2) goto L_Failed2;
 	if(ASSIN_Q == 4) goto L_Change;
 	mes ".... A Thief huh?..... And a well trained one at that, cause I can't seem to find my wallet!";
-	emotion 18;
+	emotion e_heh;
 	next;
 	mes "[Angry looking man]";
 	mes "We need people like you, you know........ So how about taking the next step in the world of crime, and become an Assassin?";
@@ -111,7 +112,7 @@ L_Change:
 	next;
 	mes "[Assassin Huey]";
 	mes "Congratulations! After all of your hard work, you can finally become an Assassin!";
-	emotion 21;
+	emotion e_no1;
 	next;
 	mes "[Assassin Huey]";
 	mes "Very well done, you are now offically an Assassin.  Although you are free to visit us at anytime..............";
@@ -228,7 +229,7 @@ OnTouch:
 	M_No:
 		mes "[Assassin Kai]";
 		mes "Huh?? You don't?........";
-		emotion 1;
+		emotion e_what;
 		next;
 		mes "[Assassin Kai]";
 		mes "Are you trying to play games with me??";
@@ -251,22 +252,22 @@ OnTouch:
 
 L_Failed:
 	mes "Ehhh? Weren't you just here a minute ago?";
-	emotion 1;
+	emotion e_what;
 	next;
 	mes "[Assassin Kai]";
 	mes "What's this?..... You failed the first test?";
 	next;
 	mes "[Assassin Kai]";
 	mes "HAHAHAHAAHAHAHAHA!!!!";
-	emotion 18;
+	emotion e_heh;
 	next;
 	mes "[Assassin Kai]";
 	mes "Hehe...HAHA...~cough~..Damn.... It's been a long time since I've met a looser like you..... Ha Ha....";
-	emotion 18;
+	emotion e_heh;
 	next;
 	mes "[Assassin Kai]";
 	mes "Oh...sorry for laughing in your face like this.... but it's just too funny... hahahehehe....";
-	emotion 18;
+	emotion e_heh;
 	next;
 	mes "[Assassin Kai]";
 	mes "So..... do you need me to give you any hints?";
@@ -276,14 +277,14 @@ L_Failed:
 		mes "[Assassin Kai]";
 		mes "Hahaahhaha!!! Well at least you're honest.....";
 		mes "Haha....My stomach...ouch... my stomach hurts!! You're killing me! Hahahaha!!!";
-		emotion 18;
+		emotion e_heh;
 		next;
 		mes "[Nameless One]";
 		mes ".....Hahaha.";
 		next;
 		mes "[Assasin Kai]";
 		mes "HAHAHAHA!! Nameless One, you think its funny too?";
-		emotion 18;
+		emotion e_heh;
 		next;
 		mes "[Nameless One]";
 		mes "Hehehe..... yes very.....";
@@ -311,7 +312,7 @@ L_Failed:
 		next;
 		mes "[Assassin Kai]";
 		mes "Hahaha.... I can't beleive this..... hahaha.....";
-		emotion 18;
+		emotion e_heh;
 		close2;
 		warp "in_moc_16.gat", 19, 141;
 		end;
@@ -381,18 +382,18 @@ L_Failed:
 		sM_End:
 			mes "[Assassin Kai]";
 			mes ".... Hmf... how can you be such an idiot??? You couldn't understand what I was talking about??";
-			emotion 23;
+			emotion e_omg;
 			next;
 			mes "[Assassin Kai]";
 			mes "Is an Assassin's honor that hard to comprehend?!";
 			next;
 			mes "[Assassin Kai]";
 			mes "Grrrrr!!! You're probably going to be a moron all of your life...........";
-			emotion 6;
+			emotion e_an;
 			next;
 			mes "[Assassin Kai]";
 			mes "GET OUT! Get out of here right now!! You're not fit to become an Assassin!!!";
-			emotion 32;
+			emotion e_pif;
 			close2;
 			warp "c_tower4.gat", 64, 76;
 			close;
@@ -1028,7 +1029,7 @@ in_moc_16.gat,21,165,4	script	Barcardi	725,{
 		next;
 		mes "[Barcardi]";
 		mes "....... Oh, and don't forget to bring some courage with you loser!";
-		emotion 32;
+		emotion e_pif;
 		next;
 		warp "moc_fild16.gat", 206, 241;
 		close;

npc/jobs/2-1/blacksmith.txt

@@ -7,7 +7,7 @@
 //= Optimized and further edited by kobra_k88.
 //= Further bugfixed and tested by Lupus
 //===== Current Version: =====================================
-//= 1.8b
+//= 2.0
 //===== Compatible With: =====================================
 //= eAthena  1.0+
 //===== Description: =========================================
@@ -24,13 +24,14 @@
 //= to go. [Lupus]
 //= 1.7 item quantity/ids typos fix
 //= 1.8 Moved the Quest to Einbroch [Poki#3]
+//= 2.0 Changed numbers to constants. [Vicious]
 ==============================================================
 
 
 
 //<==================================================== Blacksmith Altiregen (Job changer)==================================================>\\
 ein_in01.gat,18,28,4	script	Guildsman Altiregen	731,{
-	callfunc "F_BlockHigh",29,"Merchant High",34,"White Smith","Blacksmith Altiregen";
+	callfunc "F_BlockHigh",Job_Merchant_High,"Merchant High",Job_Whitesmith,"White Smith","Blacksmith Altiregen";
 
 	if (BaseJob == 5) goto L_Merc;
 	mes "[Blacksmith Altiregen]";
@@ -87,7 +88,7 @@ L_Merc:
 		sL_HighLvl:
 			mes "[Blacksmith Altiregen]";
 			mes "Wow! I'm impressed! You've done a lot of training there.  You know what they say, with hard work comes great rewards.";
-			emotion 1;
+			emotion e_what;
 			next;
 			mes "[Blacksmith Altiregen]";
 			mes "Well, first things first..... The guildsman ^5533FFGeshupenschte in Einbech^000000, is a bit short on help.";
@@ -114,7 +115,7 @@ L_Merc:
 
 L_Test1:
 	mes "You didn't leave yet? I told you to go see Geshupenschte in Einbech. See you then.";
-	emotion 1;
+	emotion e_what;
 	close;
 
 L_Test2and3:
@@ -141,16 +142,16 @@ L_Test4:
 	M_dontgo:
 		mes "[Blacksmith Altiregen]";
 		mes "What!? You're giving up!?!.........";
-		emotion 1;
+		emotion e_what;
 		next;
 		mes "[Blacksmith Altiregen]";
 		mes "HOW DARE YOU INSULT OUR GUILD LIKE THAT!";
 		mes "Leave now! Don't you dare even DREAM about becoming a blacksmith!";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "[Blacksmith Altiregen]";
 		mes "Can't endure ANYTHING can you!? How do you plan to become a blacksmith if you can't do these simple tasks!?";
-		emotion 6;
+		emotion e_an;
 		close;
 
 	L_NotDone:	
@@ -175,7 +176,7 @@ L_Change:
 	if(JBLVL != 50) getitem 999,5;
 	if(JBLVL == 50) getitem 999,10;
 	callfunc "F_ClearJobVar";		// clears all job variables for the current player
-	emotion 21;
+	emotion e_no1;
 	close;
 
 	L_NoHam:
@@ -188,7 +189,7 @@ L_Change:
 
 			mes "[Blacksmith Altiregen]";
 			mes "....... grrrrrrr.......";
-			emotion 7;
+			emotion e_ag;
 			close;
 		sM_What:
 			mes "[Blacksmith Altiregen]";
@@ -198,7 +199,7 @@ L_Change:
 			mes "YOU GET TO START ALL OVER!!!!";
 			set BSMITH_Q, 0;
 			set BSMITH_Q2, 0;
-			emotion 32;
+			emotion e_pif;
 		close;
 }
 
@@ -212,7 +213,7 @@ ein_in01.gat,201,27,4	script	Geshupenschte	63,{
 	next;
 	mes "[Geshupenschte]";
 	mes "Blacksmith is such a great job!! Don't you think so? Hahahahahahah!";
-	emotion 18;
+	emotion e_heh;
 	close;
 
 L_merchant:
@@ -232,7 +233,7 @@ L_merchant:
 	next;
 	mes "[Geshupenschte]";
 	mes "What? Why are you still here?";
-	emotion 1;
+	emotion e_what;
 	close;
 
 // Test 1-----------------------------------------------------------------
@@ -834,7 +835,7 @@ L_Test3:
 
 	L_LostItem:
 		mes "WHAT!!! YOU LOST THE ITEM I GAVE YOU TO DELIVER!!!!";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "[Geshupenschte]";
 		mes "........... Well then.... I gues you'll just have too.....";
@@ -843,7 +844,7 @@ L_Test3:
 		mes "START ALL OVER!! Now get out of my sight!!";
 		set BSMITH_Q, 0;
 		set BSMITH_Q2, 0;
-		emotion 7;
+		emotion e_ag;
 		close;
 
 L_CheckTest3:
@@ -868,7 +869,7 @@ L_CheckTest3:
 			next;
 			mes "[Geshupenschte]";
 			mes "WHAT'S THIS?! YOU LOST IT!? DId you SELL it or something!?";
-			emotion 23;
+			emotion e_omg;
 			next;
 			mes "[Geshupenschte]";
 			mes "The receipt is the soul of merchants! The life line of blacksmiths!";
@@ -876,7 +877,7 @@ L_CheckTest3:
 			set BSMITH_Q, 0;
 			set BSMITH_Q2, 0;
 			set BSMITH_Q3, 0;
-			emotion 32;
+			emotion e_pif;
 			close;
 	M_Wait:
 		mes "[Geshupenschte]";
@@ -907,7 +908,7 @@ geffen.gat,46,164,4	script	Baisulitst	69,{
 	next;
 	mes "[Baisulitst]";
 	mes "Hmmm....., I wonder when I will recieve my special order ^5555FFArc Wand^000000.....";
-	emotion 20;
+	emotion e_hmm;
 	close;
 
 L_Start:
@@ -940,11 +941,11 @@ L_Start:
 	L_NoItem:
 		mes "[Baisulitst]";
 		mes "..... Hmm?.... What's this?..... You here to deliver something to me but you don't have the actual item??";
-		emotion 32;
+		emotion e_pif;
 	L_Wrong:
 		mes "[Baisulitst]";
 		mes "..... Hmm?.... What's this?..... This is not what I ordered.....";
-		emotion 32;
+		emotion e_pif;
 	L_Done:
 		mes "[Baisulitst]";
 		mes "Thanks again for the delivery.  I really appreciate it!";
@@ -958,11 +959,11 @@ morocc.gat,27,112,4	script	Wickebine	725,{
 	mes "[Wickebine]";
 	mes "..........";
 	mes ".....When will my order be here?";
-	emotion 20;
+	emotion e_hmm;
 	next;
 	mes "[Wickebine]";
 	mes "The Geffen Blacksmith Guild and Geshupenschte are both CHRONICALLY LATE!";
-	emotion 32;
+	emotion e_pif;
 	next;
 	mes "[Wickebine]";
 	mes "This is very upsetting......";
@@ -998,12 +999,12 @@ L_Start:
 	L_NoItem:
 		mes "[Wickebine]";
 		mes "Ung! You came all this way to deliver my item and you lost it??!!";
-		emotion 6;
+		emotion e_an;
 		close;
 	L_Wrong:
 		mes "[Wickebine]";
 		mes "I think you're supposed to deliver this somewhere else.....";
-		emotion 4;
+		emotion e_swt;
 		close;
 	L_Done:	
 		mes "[Wickebine]";
@@ -1058,7 +1059,7 @@ L_Start:
 	L_NoItem:
 		mes "[Gromgast]";
 		mes "Hmm... I don't understand.... where is the item I ordered???....";
-		emotion 20;
+		emotion e_hmm;
 	L_Wrong:
 		mes "[Gromgast]";
 		mes "Sorry, but you've got the wrong person.";
@@ -1115,16 +1116,16 @@ L_Start:
 	L_NoItem:
 		mes "[Tilpitz]";
 		mes "Oooh! The delivery is here? What?..... You don't have anything???.....";
-		emotion 1;
+		emotion e_what;
 		next;
 		mes "[Tilpitz]";
 		mes "Don't play bad jokes on people!";
-		emotion 7;
+		emotion e_ag;
 		close;
 	L_Wrong:
 		mes "[Tilpitz]";
 		mes "What's this? You have a delivery.... for someone else..... Then why not deliver it to that person instead???........";
-		emotion 4;
+		emotion e_swt;
 		close;
 	L_Done:
 		mes "[Tilpitz]";
@@ -1182,12 +1183,12 @@ L_Start:
 	L_NoItem:
 		mes "[Bismarck]";
 		mes "ARE YOU TRYING TO TOY WITH ME!!?? How.... ~cough~... could....~ung~.... you....~ack~.....";
-		emotion 23;
+		emotion e_omg;
 		close;
 	L_Wrong:
 		mes "[Bismarck]";
 		mes "I NEED AN ANTIDOTE DAMMIT!! Not this stuff ~ack~........";
-		emotion 23;
+		emotion e_omg;
 		close;
 	L_Done:
 		mes "[Bismarck]";
@@ -1203,7 +1204,7 @@ ein_in01.gat,24,41,4	script	Mitmayer	726,{
 	if (BSMITH_Q == 5) goto L_Done;
 	mes "[Mitmayer]";
 	mes "Whew.... the sun in Morroc is just too strong.... I guess it will gie me tougher skin... Oh well......";
-	emotion 19;
+	emotion e_swt2;
 	next;
 	mes "[Mitmayer]";
 	mes "Afteralll, we Blacksmiths are used to high temperatures since we work with fire everyday!";
@@ -1395,7 +1396,7 @@ L_Result:
 
 	L_Pass:
 		mes "Great! Congrats! You pass!";
-		emotion 21;
+		emotion e_no1;
 		next;
 		mes "[Mitmayer]";
 		mes "You'll need to return to the guild.  Here is proof that you passed the test.... the ^5533FFHammer of Blacksmiths^000000.";
@@ -1405,7 +1406,7 @@ L_Result:
 		next;
 		mes "[Mitmayer]";
 		mes "DON'T LOOSE THIS!!";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Mitmayer]";
 		mes "Well, good luck!!!!";

npc/jobs/2-1/hunter.txt

@@ -5,7 +5,7 @@
 //= Converted by kobra_k88
 //= Further bugfixed and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.7
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: ========================================= 
@@ -26,11 +26,12 @@
 //= 1.6a Infinite Arrows exploit fix (thanx to Lorky, that
 //= reported the bug) [Lupus]
 //= 1.7 Moved the Job QUest to Hugel [Poki#3]
+//= 2.0 Changed numbers to constants. [Vicious]
 //============================================================ 
 
 //<====================================== Job Changer ========================================>\\
 hu_in01.gat,386,374,4	script	Hunter Sharon	727,{
-	callfunc "F_BlockHigh",27,"High Archer",35,"Sniper","Hunter Sharon";
+	callfunc "F_BlockHigh",Job_Archer_High,"High Archer",Job_Sniper,"Sniper","Hunter Sharon";
 
 	if(BaseJob==Job_Archer) goto L_Start;
 	callfunc "Hun_check";
@@ -74,7 +75,7 @@ L_Start:
 			close;
 		sL_HighLvl:
 			mes "Well, well now!  A high level archer.... very nice!  You must have trained really hard.";
-			emotion 5;
+			emotion e_ic;
 			next;
 			mes "[Hunter Sharon]";
 			mes "My name is Sharon, nice to meet you.  Before I explain the process of becoming a Hunter, I'd like to do a short interview with you.";
@@ -225,7 +226,7 @@ L_Start:
 		sL_100:
 			mes "[Hunter Sharon]";
 			mes "Great! Based on the answers you gave, you seem to be just the type of person we're looking for.";
-			emotion 21;
+			emotion e_no1;
 			next;
 			mes "[Hunter Sharon]";
 			mes "With your kind of additude and values, you should have no problems becoming a Hunter.";
@@ -242,7 +243,7 @@ L_Start:
 		sL_Failed:
 			mes "[Hunter Sharon]";
 			mes "I.......don't think I can pass you..... The way you live your life is...... well... unexecptable for a Hunter candidate.";
-			emotion 4;
+			emotion e_swt;
 			next;
 			mes "[Hunter Sharon]";
 			mes "Think carefully about my questions and your answers.  Working well with people is just as important as loving nature.";
@@ -260,7 +261,7 @@ L_Test2:
 
 L_Test3:
 	mes "Hmmm? The guild master? Oh, he's out right now.";
-	emotion 20;
+	emotion e_hmm;
 	next;
 	mes "[Hunter Sharon]";
 	mes "If I remember correctly, he should be somewhere in Archer Village.  I think he had to talk with someone in the ^5533FFArcher Guild^000000.";
@@ -273,7 +274,7 @@ L_Change:
 	next;
 	mes "[Hunter Sharon]";
 	mes "Congratulations!!";
-	emotion 21;
+	emotion e_no1;
 	next;
 	mes "[Hunter Sharon]";
 	mes "Now I can change you into a Hunter!";
@@ -282,7 +283,7 @@ L_Change:
 	mes "There you go! You look great in the hunter outfit";
 
 	callfunc "Job_Change",Job_Hunter;
-	emotion 21;
+	emotion e_no1;
 	next;
 	mes "[Hunter Sharon]";
 	mes "Now, for working so hard, the guild has a small reward for you.";
@@ -301,7 +302,7 @@ L_Change:
 	sL_NotRdy:
 		mes "[Hunter Sharon]";
 	       	mes "Hmmm, I received news of your success.... But you don't seem to have the ^5533FFNecklace of Wisdom^000000 as proof.";
-		emotion 20;
+		emotion e_hmm;
 		next;
 		mes "[Hunter Sharon]";
 	       	mes "You will need the Necklace of Wisdom to become a Hunter.  If you don't have it you will have to start the test over.";
@@ -310,12 +311,12 @@ L_Change:
 
 			mes "[Hunter Sharon]";
 			mes "Well then go get it!";
-			emotion 6;
+			emotion e_an;
 			close;
 		sM_ReStart:
 			mes "[Hunter Sharon]";
 			mes "..... That's just pathetic....... Have fun re-doing the ENTIRE TEST!";
-			emotion 32;
+			emotion e_pif;
 			set HNTR_Q, 0;
 			set HNTR_Q2, 0;
 	       		close;
@@ -336,13 +337,13 @@ L_Other:
 	next;
 	mes "[Demon Hunter]";
 	mes "For your safety... it's best that you DON'T find out.....";
-	emotion 29;
+	emotion e_gg;
 	close;
 
 L_Hnt:
 	mes "[Demon Hunter]";
 	mes "Look at you! Nice and spiffy in that Hunter's outfit.  How does it feel?  Good I bet.  Well good luck to you.";
-	emotion 0;
+	emotion e_gasp;
 	close;
 
 L_Arc:
@@ -364,7 +365,7 @@ L_Start:
 		next;
 		mes "[Demon Hunter]";
 		mes "If you haven't noticed already, our guild is NOT as wealthy as some of the others.  I mean we're in the middle of the freaking forest for pete sake....";
-		emotion 7;
+		emotion e_ag;
 		next;
 		mes "[Demon Hunter]";
 		mes "Ehem... Like I was saying earlier we need certain materials to make our arrows.  That is where Hunter wanna be's like you come in handy.";
@@ -423,7 +424,7 @@ L_Start:
 		sM_End:
 			mes "[Demon Hunter]";
 			mes "DON'T you mess around with me! If you're gonna fool around then LEAVE!";
-			emotion 32;
+			emotion e_pif;
 			warp "hugel.gat", 207, 222;
 			end;
 
@@ -476,7 +477,7 @@ L_Check:
 
 L_Test3:
 	mes "Huh? Can't you find the guild master? He should be in the ^5533FFArcher Guild in Archer village^000000. Go find him.";
-	emotion 20;
+	emotion e_hmm;
 	close;
 
 L_Done:
@@ -494,7 +495,7 @@ payon_in02.gat,21,31,1	script	Guild Master	59,{
 L_Other:
 	mes "[Hunter]";
 	mes "Is there something you want of me? I'm have some buisiness to take care of, so please be quiet.";
-	emotion 20;
+	emotion e_hmm;
 	close;
 
 L_Hnt:
@@ -580,7 +581,7 @@ L_ReTest:
 
 L_Passed:
 	mes "I see you suceeded. Great job! Now I will give you the proof of your success, the ^5533FFNecklace of Wisdom^000000.";
-	emotion 21;
+	emotion e_no1;
 	next;
 	mes "[Guild Master]";
 	mes "Here you go.  Make sure you show this to Hunter Sharon or you WON'T be able to become a Hunter.";

npc/jobs/2-1/knight.txt

@@ -5,7 +5,7 @@
 //= Converted by kobra_k88
 //= Further bugfixed and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.6
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: ========================================= 
@@ -24,13 +24,14 @@
 //= 1.6 Added a func which prevent advanced classes passing
 //= 2nd Job Quests again. It also guides adv classes where
 //= to go. [Lupus]
+//= 2.0 Changed numbers to constants. [Vicious]
 //============================================================ 
 
 
 
 //<------------------------------------------------------------------------------------ Chivalry Captain Herman------------------------------------------------------------------------------------------>\\
 prt_in.gat,88,101,3	script	Chivalry Captain Herman	56,{
-	callfunc "F_BlockHigh",25,"Swordman High",31,"Lord Knight","Chivalry Captain Herman";
+	callfunc "F_BlockHigh",Job_Swordman_High,"Swordman High",Job_Lord_Knight,"Lord Knight","Chivalry Captain Herman";
 
 	if (BaseJob == Job_Swordman && KNIGHT_Q > 0) goto L_Check;
 
@@ -185,12 +186,12 @@ L_Check:
 		callfunc "F_ClearJobVar";		// clears all job variables for the current player
 		mes "[Chivalry Captain Herman]";
 		mes "Congratulations!! You are now a fellow Knight and protector of Rune-Midgard! Now go forth and make Rune-Midgard a better place to live!";
-		emotion 21;
+		emotion e_no1;
 		close;
 
 		sL_SKpoint:
 			mes "Please use up all of your skill points so that I can make you a Knight.";
-			emotion 5;
+			emotion e_ic;
 			close;
 }
 
@@ -340,7 +341,7 @@ L_Check:
 	L_NotDone:
 		mes "[Sir Andrew Syloc]";
 		mes "What? You don't have everything I asked for?";
-		emotion 4;
+		emotion e_swt;
 		next;
 		mes "[Sir Andrew Syloc]";
 		mes "This is what you were SUPPOSED to collect....";
@@ -713,7 +714,7 @@ L_Novice:
 	close;
 L_Knight:
 	mes "Don't talk to me......";
-	emotion 9;
+	emotion e_dots;
 	close;
 
 
@@ -1010,7 +1011,7 @@ L_Other:
 	close;
 L_Novice:
 	mes "Wow... A cute novice... soooo cute...";
-	emotion 14;
+	emotion e_lv2;
 	next;
 	mes "[Lady Amy Beatris]";
 	mes "Do you want to become a Knight?";
@@ -1026,7 +1027,7 @@ L_Knight:
 	
 	L_Female:
 		mes "Oh my! Aren't you just the prettiest Knight.  I love how your sword matches with your shoes.";
-		emotion 14;
+		emotion e_lv2;
 		next;
 		mes "[Lady Amy Beatris]";
 		mes "Anyway, I'm glad you came back to see me.  I'm always curious about how a Knight turns out.";
@@ -1035,7 +1036,7 @@ L_Knight:
 
 	L_Male:
 		mes "Well hello handsome.  There's just something about men in armor....";
-		emotion 3;
+		emotion e_lv;
 		next;
 		mes "[Lady Amy Beatris]";
 		mes "So, did you come back for some fun...?";
@@ -1044,7 +1045,7 @@ L_Knight:
 
 		M_Yes:
 			mes "^FF0000(SLAPP!! SMACK!! BASH!!)^000000";
-			emotion 6;
+			emotion e_an;
 			percentheal (-10),0;
 			next;
 			mes "[Lady Amy Beatris]";
@@ -1053,18 +1054,18 @@ L_Knight:
 			mes "[Lady Amy Beatris]";
 			mes "Allways remember that a Knight's a Knight, no matter what gender they are.";
 			mes "Also remember to be respectfull to women at all times!";
-			emotion 32;
+			emotion e_pif;
 			close;
  
 		M_No:
 			mes "[Lady Amy Beatris]";
 			mes "Teh he he.  Silly, I'm just playing with you.  You may be good looking, but I'm NOT that kind of girl.";
-			emotion 18;
+			emotion e_heh;
 			next;
 			mes "[Lady Amy Beatris]";
 			mes "Anyway, I'm glad you came back to see me.  I'm always curious about how a Knight turns out.";
 			mes "You look like you're doing fine so continue the good work okay?";
-			emotion 21;
+			emotion e_no1;
 			close;
 
 
@@ -1485,7 +1486,7 @@ L_Novice:
 	next;
 	mes "[Sir Grey]";
 	mes "And somehow after all these years, I ended up becoming one.  Imagine that.... Hahaha.";
-	emotion 18;
+	emotion e_heh;
 	close;
 L_Knight:
 	mes "I don't know if I can even properly describe the ^00aa00Claymore^000000, but I know this... it's the greatest weapon a Knight can wield!!";

npc/jobs/2-1/priest.txt

@@ -5,7 +5,7 @@
 //= Converted by: kobra_k88.
 //= Further bugfixed and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.6
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena  1.0
 //===== Description: ========================================= 
@@ -18,6 +18,7 @@
 //= 1.6 Added a func which prevent advanced classes passing
 //= 2nd Job Quests again. It also guides adv classes where
 //= to go. [Lupus]
+//= 2.0 Changed numbers to constants. [Vicious]
 ==========================================================
 
 
@@ -25,7 +26,7 @@
 //============================================ Father Thomas: Job changer, Test 1 =============================================\\
 //*********************************************************************************************************************************************************************************\\
 prt_church.gat,16,41,4	script	Father Thomas	60,{
-	callfunc "F_BlockHigh",28,"Acolyte High",32,"High Priest","Father Thomas";
+	callfunc "F_BlockHigh",Job_Acolyte_High,"Acolyte High",Job_High_Priest,"High Priest","Father Thomas";
 
 	mes "[Father Thomas]";
 	if (BaseJob == Job_Acolyte) goto L_Start;
@@ -83,7 +84,7 @@ L_Start:
 
 		sL_HighLvl:
 			mes "Wow, your already at job lvl 50.  I'm amazed at your dedication and hard work!";
-			emotion 0;
+			emotion e_gasp;
 			next;
 			mes "[Father Thomas]";
 			mes "Because of this I will allow you to skip the first task.  How about we start the second task instead?";
@@ -172,7 +173,7 @@ L_Test1:
 			close;
 	L_NotDone1b:
 		mes "Hmmm??";
-		emotion 1;
+		emotion e_what;
 		next;
 		mes "[Father Thomas]";
 		mes "Have you gone to see ^5533FFMother Marthilda^000000 yet?  She can be found near Morroc in the Sogart Desert.";
@@ -246,7 +247,7 @@ L_Change:
 	if (SkillPoint > 0) mes "Wait.  You must use up your skill points in order to become a Priest.";
 	if (SkillPoint > 0) close;
 	mes "Congratulations! You have just completed all of the tests.  I can now turn you into a Priest.";
-	emotion 21;
+	emotion e_no1;
 	next;
 	mes "[Father Thomas]";
 	mes "God, please endow "+strcharinfo(0)+" with the strength and courage to fight evil and help mankind.";
@@ -283,13 +284,13 @@ L_Test:
 	next;
 	mes "[Father Rubalkabara]";
 	mes "What's this? You're here because you wish to serve God in an even greater capacity?";
-	emotion 1;
+	emotion e_what;
 	next;
 	menu "Yes, I believe Priesthood is the right path.",-, "No, not really.... just came to say hi.",M_No;
 
 		mes "[Father Rubalkabara]";
 		mes "Haha! Very good.  We need more people like yourself in order for this world to survive the evils that haunt it.";
-		emotion 21;
+		emotion e_no1;
 		next;
 		mes "[Father Rubalkabara]";
 		mes "Because of your pure heart I will give you my blessing child.  Please meet with ^5533FFMother Marthilda^000000 next.";
@@ -301,7 +302,7 @@ L_Test:
 	M_No:
 		mes "[Father Rubalkabara]";
 		mes "Oh... well then... hello to you too.  Although it is nice to see a servant of God such as yourself, I'm a little busy right now so if you don't mind.....";
-		emotion 4;
+		emotion e_swt;
 		close;
 
 L_Done:
@@ -344,7 +345,7 @@ function	script	F_FatherYos	{
 
 L_Test:
 	mes "Hmm...? Did you need something? Oh the Priest test..... are you sure you're up for that?";
-	emotion 1;
+	emotion e_what;
 	next;
 	mes "[Father Yosuke]";
 	mes "Meh, very well.  I will let you pass.  Go back to the church and speak with Father Thomas.  Your duty here as been fulfilled";
@@ -353,7 +354,7 @@ L_Test:
 
 L_Done:
 	mes "Ugh? What are you still doing here...? I said to go back to the church.... I'm very busy right now....";
-	emotion 1;
+	emotion e_what;
 	close;
 }
 

npc/jobs/2-1/wizard.txt

@@ -5,7 +5,7 @@
 //= converted by kobra_k88
 //= Further bugfixed and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.8
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: ========================================= 
@@ -26,12 +26,13 @@
 //= to go. [Lupus]
 //= 1.7 Replaced 2 Hodes with 2 Horong's (according to the official guide) [Lupus]
 //= 1.8 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
+//= 2.0 Changed numbers to constants. [Vicious]
 //============================================================ 
 
 
 //<=================== Some dog =========================>
 gef_tower.gat,107,35,5	script	Some Dog	81,{
-	callfunc "F_BlockHigh",26,"High Mage",33,"High Wizard","Dog";
+	callfunc "F_BlockHigh",Job_Mage_High,"High Mage",Job_High_Wizard,"High Wizard","Dog";
 	if(BaseJob == Job_Mage) goto L_JobMage;
 	callfunc "Wiz1_check";
 
@@ -50,13 +51,13 @@ L_JobMage:
 	M_0:
 		mes "[Dog]";
 		mes "~Woof~ What is it? Why are you looking at me like that?? Is this the first time you've seen a dog talk?";
-		emotion 1;
+		emotion e_what;
 		mes "[Dog]";
 		mes "~Woof~ I suppose it's not that common to see a talking dog..... ~Woof~..... Yeah, it is a rare site actually.....";
 		next;
 		mes "[Dog]";
 		mes "~GRRRR!!~.... Hey! Stop GAWKING at me for goodness sake!! ~WOOOF~";
-		emotion 6;
+		emotion e_an;
 		next;
 
 		L_Cont:
@@ -72,7 +73,7 @@ L_JobMage:
 		next;
 		mes "[Maria]";
 		mes "Uh, anyways..... where were we?";
-		emotion 20;
+		emotion e_hmm;
 		next;
 		mes "[Maria]";
 		mes "Like I said before, if you want to become a Wizard you must first speak with Catherine.";
@@ -118,18 +119,18 @@ L_JobMage:
 		sM_2:
 			mes "[Maria]";
 			mes "I'M NOT A DOG!!! ~ ARROOOOOOOOOWWWWW!!!! ~";
-			emotion 6;
+			emotion e_an;
 			next;
 			mes "[Maria]";
 			mes "Dang it! I hope you FAIL!! Now go get lost!";
-			emotion 27;
+			emotion e_go;
 			next;
 			warp "gef_dun00.gat",54,23;
 			end;
 	M_1:
 		mes "[Dog]";
 		mes "~WOOF~Woof~woof~ You DON'T have to state the obvious! I KNOW I'm a dog!";
-		emotion 32;
+		emotion e_pif;
 		next;
 		goto L_Cont;
 
@@ -249,7 +250,7 @@ L_Mage:
 	M_0End:
 		mes "[Catherine Medichi]";
 		mes "What? You came up here for nothing!?";
-		emotion 1;
+		emotion e_what;
 		close;
 
 
@@ -282,7 +283,7 @@ L_Mage:
 				mes "[Catherine Medichi]";
 				mes "Congrats, you passed the first test.";
 				mes "Don't relax yet, you still got 2 tests left.";
-				emotion 21;
+				emotion e_no1;
 				next;
 				mes "[Catherine Medichi]";
 				mes "Now talk to the man in the corner for the tests.";
@@ -313,11 +314,11 @@ L_Mage:
 
 		sL_Failed2:
 			mes "Huh?? You failed the Q&A test!?";
-			emotion 1;
+			emotion e_what;
 			next;
 			mes "[Catherine Medichi]";
 			mes "You want to be a wizard and you can't answer a couple of questions?? Sheesh.";
-			emotion 4;
+			emotion e_swt;
 			next;
 			mes "[Catherine Medichi]";
 			mes "Well, do you want big sis to give you a hint? If you do, go buy me ^0099001 apple juice^000000.  I'm a bit thirsty. =P";
@@ -424,7 +425,7 @@ L_Mage:
 		if(SkillPoint > 0) close;
 
 		mes "Great! You finished all of the tests! Congrats, congrats, congrats!!";
-		emotion 21;
+		emotion e_no1;
 		next;
 		mes "[Catherine Medichi]";
 		mes "Ack, I'm wasting time, I better change you!";
@@ -470,11 +471,11 @@ L_Other:
 	next;
 	mes "[Raul Expagarus]";
 	mes "Who're you?! Leave!";
-	emotion 0;
+	emotion e_gasp;
 	close;
 L_Novice:
 	mes "What's a little kid like you doing here? Get out!!";
-	emotion 0;
+	emotion e_gasp;
 	next;
 	warp "geffen.gat",120,110;
 	close;
@@ -532,7 +533,7 @@ L_Mage:
 
 	L_Done:
 		mes "Congratulations on finishing the final test!  You have now finished all of the Wizards tests and are ready to become a Wizard!";
-		emotion 21;
+		emotion e_no1;
 		next;
 		mes "[Raul Expagarus]";
 		mes "Go speak to Catherine to become a Wizard.  But be careful! Magic is a powerfull force and can easily destroy you!!";
@@ -559,7 +560,7 @@ L_Mage:
 			next;
 			mes "[Raul Expagarus]";
 			mes "Be that way! If you miss one question, you fail! What do you say!?";
-			emotion 32;
+			emotion e_pif;
 			next;
 			menu "I want to live in peace..........",M_0a, "I want to try again.",M_0b;
 
@@ -577,7 +578,7 @@ L_Mage:
 			next;
 			mes "[Raul Expagarus]";
 			mes "Lets start the test! If you miss one question, you're screwed! HA!";
-			emotion 29;
+			emotion e_gg;
 			next;
 			mes "[Raul Expagarus]";
 			mes "10 questions, get them right! I won't tell you the correct answer for the ones you miss.";
@@ -949,7 +950,7 @@ L_Mage:
 		M_1a:
 			mes "[Raul Expagarus]";
 			mes "Ignorant fool! Fine, go die if you wish! Your corpse will be left as food for the monsters.";
-			emotion 23;
+			emotion e_omg;
 			next;
 			mes "[Raul Expagarus]";
 			mes "I'll send you now... By the way, have fun getting slaughtered!";
@@ -998,7 +999,7 @@ L_Mage:
 
 		sL_ReTest3:
 			mes "You want to take the test AGAIN!? You love magic THAT much!?";
-			emotion 1;
+			emotion e_what;
 			next;
 			mes "[Raul Expagarus]";
 			mes "You failed last time, so it's time for a quiz! If you don't want to take it, TOO BAD!.";

npc/jobs/2-1a/AssassinCross.txt

@@ -4,16 +4,17 @@
 //= Nana
 //= finished, optimized and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
 //= Advance Class jobchanger after kRO Normals.
 //===== Additional Comments: ================================= 
 //= v1.1 Made all into functions, additional checks, etc. [Lupus]
+//= v1.2 Made numbers into constants. [Vicious]
 //============================================================ 
 
 // -== Assassin Cross ==-
 valkyrie.gat,44,58,6	script	Assassin Cross	725,{
-	callfunc "F_Rebirth",30,"Thief High",36,"Assassin Cross",149,150,151,152;
+	callfunc "F_Rebirth",Job_Thief_High,"Thief High",Job_Assassin_Cross,"Assassin Cross",149,150,151,152;
 }

npc/jobs/2-1a/HighPriest.txt

@@ -4,16 +4,17 @@
 //= Nana
 //= finished, optimized and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
 //= Advance Class jobchanger after kRO Normals.
 //===== Additional Comments: ================================= 
 //= v1.1 Made all into functions, additional checks, etc. [Lupus]
+//= v1.2 Made numbers into constants. [Vicious]
 //============================================================ 
 
 // -== High Priest ==-
 valkyrie.gat,44,42,6	script	High Priest	60,{
-	callfunc "F_Rebirth",28,"Acolyte High",32,"High Priest",156,0,0,0;
+	callfunc "F_Rebirth",Job_Acolyte_High,"Acolyte High",Job_High_Priest,"High Priest",156,0,0,0;
 }

npc/jobs/2-1a/HighWizard.txt

@@ -4,16 +4,17 @@
 //= Nana
 //= finished, optimized and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
 //= Advance Class jobchanger after kRO Normals.
 //===== Additional Comments: ================================= 
 //= v1.1 Made all into functions, additional checks, etc. [Lupus]
+//= v1.2 Made numbers into constants. [Vicious]
 //============================================================ 
 
 // -== High Wizard ==-
 valkyrie.gat,44,47,6	script	High Wizard	735,{
-	callfunc "F_Rebirth",26,"High Mage",33,"High Wizard",157,0,0,0;
+	callfunc "F_Rebirth",Job_Mage_High,"High Mage",Job_High_Wizard,"High Wizard",157,0,0,0;
 }

npc/jobs/2-1a/LordKnight.txt

@@ -4,16 +4,17 @@
 //= Nana
 //= finished, optimized and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
 //= Advance Class jobchanger after kRO Normals.
 //===== Additional Comments: ================================= 
 //= v1.1 Made all into functions, additional checks, etc. [Lupus]
+//= v1.2 Made numbers into constants. [Vicious]
 //============================================================ 
 
 // -== Lord Knight ==-
 valkyrie.gat,44,39,6	script	Lord Knight	56,{
-	callfunc "F_Rebirth",25,"Swordman High",31,"Lord Knight",144,145,146,0;
+	callfunc "F_Rebirth",Job_Swordman_High,"Swordman High",Job_Lord_Knight,"Lord Knight",144,145,146,0;
 }

npc/jobs/2-1a/Sniper.txt

@@ -4,16 +4,17 @@
 //= Nana
 //= finished, optimized and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
 //= Advance Class jobchanger after kRO Normals.
 //===== Additional Comments: ================================= 
 //= v1.1 Made all into functions, additional checks, etc. [Lupus]
+//= v1.2 Made numbers into constants. [Vicious]
 //============================================================ 
 
 // -== Sniper ==-
 valkyrie.gat,44,55,6	script	Sniper	727,{
-	callfunc "F_Rebirth",27,"High Archer",35,"Sniper",147,148,0,0;
+	callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Sniper,"Sniper",147,148,0,0;
 }

npc/jobs/2-1a/WhiteSmith.txt

@@ -4,16 +4,17 @@
 //= Nana
 //= finished, optimized and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
 //= Advance Class jobchanger after kRO Normals.
 //===== Additional Comments: ================================= 
 //= v1.1 Made all into functions, additional checks, etc. [Lupus]
+//= v1.2 Made numbers into constants. [Vicious]
 //============================================================ 
 
 // -== White Smith ==-
 valkyrie.gat,44,51,6	script	White Smith	726,{
-	callfunc "F_Rebirth",29,"Merchant High",34,"White Smith",153,154,155,0;
+	callfunc "F_Rebirth",Job_Merchant_High,"Merchant High",Job_Whitesmith,"White Smith",153,154,155,0;
 }

npc/jobs/2-1e/StarGladiator.txt

@@ -24,7 +24,7 @@ job_star.gat,166,37,2	script	Star Gladiator	764,{
 		close;
 	}
 	mes "Are you a Taekwon? No?! Get lost.";
-	emotion 1;
+	emotion e_what;
 	close;
 
 L_Check:

npc/jobs/2-2/alchemist.txt

@@ -4,7 +4,7 @@
 //= nestor_zulueta (Fusion)
 //= converted by Darkchild
 //===== Current Version: ===================================== 
-//= 1.6a
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
@@ -22,6 +22,7 @@
 //= 2nd Job Quests again. It also guides adv classes where
 //= to go. [Lupus]
 //= 1.6a fixed some wrong answers, thanks to zlider for info [Lupus]
+//= 2.0 Changed numbers to constants. [Vicious]
 //============================================================ 
 
 
@@ -29,7 +30,7 @@
 //					Registration and First Test
 //==================================================================================================//
 alde_alche.gat,27,185,4	script	Parmry Gianino	744,{
-	callfunc "F_BlockHigh",29,"Merchant High",42,"Creator","Parmry Gianino";
+	callfunc "F_BlockHigh",Job_Merchant_High,"Merchant High",Job_Creator,"Creator","Parmry Gianino";
 
 	mes "[Parmry Gianino]";
 	if(BaseJob == 5) goto L_Merc;
@@ -1058,7 +1059,7 @@ L_Change:
 	mes "Ooh, Ok. You joined and learned the basics, too. Well done.";
 	next;
 	callfunc "Job_Change",Job_Alchem;
-	emotion 46;
+	emotion e_grat;
 	mes "[Vincent Carsciallo]";
 	mes "From now on, you are also a member of the Union as an Alchemist.";
 	mes "I hope you learn a lot...";

npc/jobs/2-2/bard.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Muad_Dib(The Prometheus Project), Lupus
 //===== Current Version: ===================================== 
-//= 1.4
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena Final
 //===== Description: ========================================= 
@@ -19,11 +19,12 @@
 // 1.3 Updated flower sub-quest according to official [Lupus]
 // 1.4 Changed priority for the gifts. Now you can win the 1st
 // prize, too. Added Izidor flower [Lupus]
+//= 2.0 Changed numbers to constants. [Vicious]
 //============================================================
 
 
 comodo.gat,226,123,5	script	Wandering Bard	741,{
-	callfunc "F_BlockHigh",27,"High Archer",43,"Clown","Wandering Bard";
+	callfunc "F_BlockHigh",Job_Archer_High,"High Archer",Job_Clown,"Clown","Wandering Bard";
 	
 	if (BARD_Q == 1) goto L_BQ1;
 	if (BARD_Q == 2) goto L_BQ2;
@@ -190,7 +191,7 @@ L_UGLYFLOWER:
 	mes "What is it?! Please, back off and put it away from my face.";
 	mes "I do really hate maneater blossoms!!!";
 	mes "THEY ARE SO UGLY!";
-	emotion 23;
+	emotion e_omg;
 	close;
 
 M_NOTHAVE:

npc/jobs/2-2/crusader.txt

@@ -5,7 +5,7 @@
 //= Converted by: Shin
 //=
 //===== Current Version: ===================================== 
-//= 1.7a
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena  0.5.2 +
 //===== Description: ========================================= 
@@ -26,11 +26,12 @@
 //=     to go. [Lupus]
 //= 1.7 Updated names and required items, Chivalry Emblem +
 //=     Hand of God allow to skip item gathering [DracoRPG]
+//= 2.0 Changed numbers to constants. [Vicious]
 //============================================================
 
 
 prt_castle.gat,45,169,4	script	Senior Crusader	752,{
-	callfunc "F_BlockHigh",25,"Swordman High",38,"Paladin","^000080Michael Halig^000000";
+	callfunc "F_BlockHigh",Job_Swordman_High,"Swordman High",Job_Paladin,"Paladin","^000080Michael Halig^000000";
 
 	mes "[^000080Michael Halig^000000]";
 	if (BaseJob > 0) goto NEXT_0;

npc/jobs/2-2/dancer.txt

@@ -4,7 +4,7 @@
 //= Kalen - Original jAthena
 //= Fredzilla - Converted
 //===== Current Version: ===================================== 
-//= 1.6
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena Final
 //===== Description: ========================================= 
@@ -21,6 +21,7 @@
 //= 1.6 Added a func which prevent advanced classes passing
 //= 2nd Job Quests again. It also guides adv classes where
 //= to go. [Lupus]
+//= 2.0 Changed numbers to constants. [Vicious]
 //============================================================
 
 //= Warning Warp to escape the quest if need be
@@ -35,7 +36,7 @@ L_Can:
 }
 //= Warp man, takes you to the quest map (Comodo Theater)
 comodo.gat,193,151,4	script	Bor Robin	86,{
-	callfunc "F_BlockHigh",27,"High Archer",44,"Gypsy","Bor Robin";
+	callfunc "F_BlockHigh",Job_Archer_High,"High Archer",Job_Gypsy,"Gypsy","Bor Robin";
 
 	mes "[Bor Robin]";
 	mes "Well...... alot of people seem to be coming here lately.";
@@ -311,7 +312,7 @@ LUpper1:
 	mes "[Aire]";
 	mes "It's such a big honor to salute envoys of Valhalla.";
 	mes "Come again.";
-	emotion 2;
+	emotion e_ho;
 	close;
 
 }
@@ -864,7 +865,7 @@ OnDE1:
 	emotion	21;
 	end;
 OnDE2:
-	emotion 23;
+	emotion e_omg;
 	end;
 }
 job_duncer.gat,66,113,4	script	Back dancer #2::jdt2	724,{
@@ -880,7 +881,7 @@ OnDE1:
 	emotion	21;
 	end;
 OnDE2:
-	emotion 23;
+	emotion e_omg;
 	end;
 }
 job_duncer.gat,72,113,4	script	Back dancer #3::jdt3	724,{
@@ -896,7 +897,7 @@ OnDE1:
 	emotion	21;
 	end;
 OnDE2:
-	emotion 23;
+	emotion e_omg;
 	end;
 }
 job_duncer.gat,75,110,4	script	Back dancer #4::jdt4	724,{
@@ -912,7 +913,7 @@ OnDE1:
 	emotion	21;
 	end;
 OnDE2:
-	emotion 23;
+	emotion e_omg;
 	end;
 }
 job_duncer.gat,75,110,4	script	jdt5	139,{

npc/jobs/2-2/monk.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Dino9021, Edited / Translated by Celest
 //===== Current Version: ===================================== 
-//= 1.9
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
@@ -20,6 +20,7 @@
 //= 1.8 Fixed bugs. Fixed Green Potion exploit. Getting rid of Jfunc mess [Lupus]
 //= 1.9 Added a missing check in Fuhai and fixed a LOT of Engrish. [Zephiris]
 //= 1.9b Fixed another bug in Fuhai. [Zephiris]
+//= 2.0 Changed numbers to constants. [Vicious]
 //============================================================ 
 
 
@@ -33,7 +34,7 @@ prt_monk.gat,55,249,4	script	Tohobu the Guarding Monk	139,0,5,{
 	close;
 }
 prt_monk.gat,59,247,4	script	Master	120,{
-	callfunc "F_BlockHigh",28,"Acolyte High",39,"Champion","Tohobu";
+	callfunc "F_BlockHigh",Job_Acolyte_High,"Acolyte High",Job_Champion,"Champion","Tohobu";
 
 	if(MONK_Q == 1 ) goto Part1;
 	if(MONK_Q == 2 ) goto Part2;

npc/jobs/2-2/rogue.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 1.6
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
@@ -17,6 +17,7 @@
 //= 1.6 Added a func which prevent advanced classes passing
 //= 2nd Job Quests again. It also guides adv classes where
 //= to go. [Lupus]
+//= 2.0 Changed numbers to constants. [Vicious]
 //============================================================ 
 
 
@@ -24,7 +25,7 @@
 //					Markie: Test 1 and Jobchange						//
 //***********************************************************************************************************************************************************//
 in_rogue.gat,363,123,3	script	Markie	747,{
-	callfunc "F_BlockHigh",30,"Thief High",41,"Stalker","Markie";
+	callfunc "F_BlockHigh",Job_Thief_High,"Thief High",Job_Stalker,"Stalker","Markie";
 
 	mes "[Markie]";
 	if(BaseJob == Job_Thief) goto L_Thief;
@@ -114,7 +115,7 @@ L_Test1:
 		sL_Failed:
 			mes "*sigh*..... this is not the type of score I was expecting......";
 			mes "What can I say excecpt, with a score like this you're definitely not cut out to be a Rogue..........";
-			emotion 4;
+			emotion e_swt;
 			next;
 			mes "[Markie]";
 			mes "Why don't you go do some more training shuga..... you need it..... *mumbles ( what a waste of my time...)*";
@@ -134,7 +135,7 @@ L_Test3:
 	close;
 L_Test4:
 	mes "What are you doing here? I hope your not trying to skip the last test?.........";
-	emotion 1;
+	emotion e_what;
 	next;
 	mes "[Markie]";
 	mes "Your almost finished so just keep trying.  I know you can do it.";
@@ -146,14 +147,14 @@ L_Change:
 //===========
 	mes "Oh, you're back and your in one piece! It looks like you've passed all of the tests sweetie.";
 	mes "You have proven that you are ready to become a Rogue!";
-	emotion 5;
+	emotion e_ic;
 	next;
 	if(SkillPoint != 0) goto L_SkillP;
 	mes "[Markie]";
 	mes "Tada! Congratulations on becoming a Rogue.  You showed a lot of effort and deserve a reward for it......";
 	setlook 7,0;
 	callfunc "Job_Change",Job_Rogue;
-	emotion 46;
+	emotion e_grat;
 	next;
 	mes "[Markie]";
 	mes "Now that you are a Rogue you are free to go where ever you want to and do what ever you want.";
@@ -208,7 +209,7 @@ L_Thief:
 	next;
 	mes "[Mr. Smith]";
 	mes "...... CRAP! I forgot what I was counting!!";
-	emotion 16;
+	emotion e_wah;
 	close;
 
 //----------------------------------------------------------------------------------------------------
@@ -300,7 +301,7 @@ L_Check2:
 
 	L_NotEnuf:
 		mes ".... What the f@&#!?!? You don't have all of the items? Then why did you come back?? Don't tell me you forgot what to get.....";
-		emotion 1;
+		emotion e_what;
 		next;
 		mes "[Mr. Smith]";
 		mes "Write this down! You need ^5533FF10,000^000000 zeny and:";
@@ -310,7 +311,7 @@ L_Check2:
 		next;
 		mes "[Mr. Smith]";
 		mes "Got it? DON'T come back until you have everything.........";
-		emotion 32;
+		emotion e_pif;
 		close;
 
 
@@ -319,11 +320,11 @@ L_Test3:
 //---------------
 	if(ROGUE_Q2 > 0) goto L_Check3;
 	mes "Let me see..... Who should I have you go find........ hmm.........";
-	emotion 20;
+	emotion e_hmm;
 	next;
 	mes "[Mr. Smith]";
 	mes "Ah I know! Alright, in the previous test I had you go find some items.  For this test you will need to find a specific person.";
-	emotion 5;
+	emotion e_ic;
 	next;
 	mes "[Mr. Smith]";
 	set ROGUE_Q2, rand(1,3);
@@ -396,11 +397,11 @@ L_Test3:
 
 L_Check3:
 	mes "What!?! Did you just say you forgot where to go?........";
-	emotion 1;
+	emotion e_what;
 	next;
 	mes "[Mr. Smith]";
 	mes "GRRRR!!! That's why you need to WRITE down important things! Geez......";
-	emotion 6;
+	emotion e_an;
 	next;
 	mes "[Mr. Smith]";
 	if(ROGUE_Q2 == 1) callsub sF3_R1;
@@ -424,15 +425,15 @@ L_Done:
 in_rogue.gat,272,136,3	script	Hermanthorn Jr.	85,{
 	mes "[Hermanthorn Jr.]";
 	mes "Huh? Wha.... who are you?! You're not from the Rogue guild!! Get out of here!";
-	emotion 1;
+	emotion e_what;
 	next;
 	mes "[Hermanthorn Jr.]";
 	mes "You're..... I see! You're one of them!!! You've come here to kill me haven't you??!! No... NO!! I'm not ready to die yet!";
-	emotion 0;
+	emotion e_gasp;
 	next;
 	mes "[Hermanthorn Jr.]";
 	mes "Aaaaaaaaaaaaaahhhh!! Go away! Get lost! Otherwise I am gonna KILL YOU!!!";
-	emotion 16;
+	emotion e_wah;
 	close;
 }
 
@@ -584,7 +585,7 @@ function	script	F_RogueTest4	{
 	next;
 	mes "[" + getarg(0) + "]";
 	mes "Aww who am I kidding...... Let's cut the crap.  So are you ready to become a rogue?";
-	emotion 4;
+	emotion e_swt;
 	next;
 	mes "[" + getarg(0) + "]";
 	mes "You see, the Rogue motto is...... ^5533FF'Avoid the strong! Be malicious to the weak!'^000000";
@@ -624,7 +625,7 @@ function	script	F_RogueTest4	{
 L_Restart:
 	mes "[" + getarg(0) + "]";
 	mes "....... Looks like you got creamed.......";
-	emotion 4;
+	emotion e_swt;
 	next;
 	mes "[" + getarg(0) + "]";
 	mes "If you're up for it, I'll send you back in.  Failure has a way of teaching success.... yada yada yada....";

npc/jobs/2-2/sage.txt

@@ -5,7 +5,7 @@
 //= Unknown Translator (1.0)
 //= Darkchild (1.2)
 //===== Current Version: ===================================== 
-//= 1.7a
+//= 2.0
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
@@ -21,6 +21,7 @@
 //= 2nd Job Quests again. It also guides adv classes where to go. [Lupus]
 //= 1.7 Fixed tuition fee. Fixed some answers, names & typos, added missing labels [Lupus]
 //= 1.7a Moved JFunc back in the main file, fixed typos [Lupus]
+//= 2.0 Changed numbers to constants. [Vicious]
 //============================================================ 
 
 
@@ -28,7 +29,7 @@
 //Sage Castle
 //==================================
 yuno_in02.gat,38,61,4	script	Magic Academy Headmaster 	743,{
-	callfunc "F_BlockHigh",26,"High Mage",40,"Professor","Keiron";
+	callfunc "F_BlockHigh",Job_Mage_High,"High Mage",Job_Professor,"Professor","Keiron";
 	if(BaseJob == 16) goto L_Menu3_3;
 	if(BaseJob != 2) goto L_Menu2_1;
 	if(SAGE_Q == 11) goto L_Menu3_1;

npc/jobs/2-2a/Champion.txt

@@ -4,16 +4,17 @@
 //= Nana
 //= finished, optimized and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
 //= Advance Class jobchanger after kRO Normals.
 //===== Additional Comments: ================================= 
 //= v1.1 Made all into functions, additional checks, etc. [Lupus]
+//= v1.2 Made numbers into constants. [Vicious]
 //============================================================ 
 
 // -== Champion ==-
 valkyrie.gat,53,42,4	script	Champion	52,{
-	callfunc "F_Rebirth",28,"Acolyte High",39,"Champion",156,0,0,0;
+	callfunc "F_Rebirth",Job_Acolyte_High,"Acolyte High",Job_Champion,"Champion",156,0,0,0;
 }

npc/jobs/2-2a/Clown.txt

@@ -4,16 +4,17 @@
 //= Nana
 //= finished, optimized and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
 //= Advance Class jobchanger after kRO Normals.
 //===== Additional Comments: ================================= 
 //= v1.1 Made all into functions, additional checks, etc. [Lupus]
+//= v1.2 Made numbers into constants. [Vicious]
 //============================================================ 
 
 // -== Clown ==-
 valkyrie.gat,53,54,4z	script	Clown	741,{
-	callfunc "F_Rebirth",27,"High Archer",43,"Clown",147,148,0,0;
+	callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Clown,"Clown",147,148,0,0;
 }

npc/jobs/2-2a/Creator.txt

@@ -4,16 +4,17 @@
 //= Nana
 //= finished, optimized and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
 //= Advance Class jobchanger after kRO Normals.
 //===== Additional Comments: ================================= 
 //= v1.1 Made all into functions, additional checks, etc. [Lupus]
+//= v1.2 Made numbers into constants. [Vicious]
 //============================================================ 
 
 // -== Creator ==-
 valkyrie.gat,53,50,6	script	Creator	122,{
-	callfunc "F_Rebirth",29,"Merchant High",42,"Creator",153,154,155,0;
+	callfunc "F_Rebirth",Job_Merchant_High,"Merchant High",Job_Creator,"Creator",153,154,155,0;
 }

npc/jobs/2-2a/Gypsy.txt

@@ -4,16 +4,17 @@
 //= Nana
 //= finished, optimized and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
 //= Advance Class jobchanger after kRO Normals.
 //===== Additional Comments: ================================= 
 //= v1.1 Made all into functions, additional checks, etc. [Lupus]
+//= v1.2 Made numbers into constants. [Vicious]
 //============================================================ 
 
 // -== Gypsy ==-
 valkyrie.gat,53,56,4	script	Gypsy	101,{
-	callfunc "F_Rebirth",27,"High Archer",44,"Gypsy",147,148,0,0;
+	callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Gypsy,"Gypsy",147,148,0,0;
 }

npc/jobs/2-2a/Paladin.txt

@@ -4,16 +4,17 @@
 //= Nana
 //= finished, optimized and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
 //= Advance Class jobchanger after kRO Normals.
 //===== Additional Comments: ================================= 
 //= v1.1 Made all into functions, additional checks, etc. [Lupus]
+//= v1.2 Made numbers into constants. [Vicious]
 //============================================================ 
 
 // -== Paladin ==-
 valkyrie.gat,53,39,4	script	Paladin	752,{
-	callfunc "F_Rebirth",25,"Swordman High",38,"Paladin",144,145,146,0;
+	callfunc "F_Rebirth",Job_Swordman_High,"Swordman High",Job_Paladin,"Paladin",144,145,146,0;
 }

npc/jobs/2-2a/Professor.txt

@@ -4,16 +4,17 @@
 //= Nana
 //= finished, optimized and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
 //= Advance Class jobchanger after kRO Normals.
 //===== Additional Comments: ================================= 
 //= v1.1 Made all into functions, additional checks, etc. [Lupus]
+//= v1.2 Made numbers into constants. [Vicious]
 //============================================================ 
 
 // -== Professor ==-
 valkyrie.gat,53,47,4	script	Professor	743,{
-	callfunc "F_Rebirth",26,"High Mage",40,"Professor",157,0,0,0;
+	callfunc "F_Rebirth",Job_Mage_High,"High Mage",Job_Professor,"Professor",157,0,0,0;
 }

npc/jobs/2-2a/Stalker.txt

@@ -4,16 +4,17 @@
 //= Nana
 //= finished, optimized and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
 //= Advance Class jobchanger after kRO Normals.
 //===== Additional Comments: ================================= 
 //= v1.1 Made all into functions, additional checks, etc. [Lupus]
+//= v1.2 Made numbers into constants. [Vicious]
 //============================================================ 
 
 // -== Stalker ==-
 valkyrie.gat,53,58,4	script	Stalker	747,{
-	callfunc "F_Rebirth",30,"Thief High",41,"Stalker",149,150,151,152;
+	callfunc "F_Rebirth",Job_Thief_High,"Thief High",Job_Stalker,"Stalker",149,150,151,152;
 }

npc/jobs/2-2e/SoulLinker.txt

@@ -24,7 +24,7 @@ job_star.gat,99,33,2	script	Soul Linker	764,{
 		close;
 	}
 	mes "I speak to Taekwons only...";
-	emotion 1;
+	emotion e_what;
 	close;
 
 L_Check:

npc/jobs/Jfunc/Jfunc1-1.txt

@@ -23,7 +23,7 @@ function	script	Aco_check	{
 
 		JobAco:
 			mes "Are you feeling okay?....";
-			emotion 20;
+			emotion e_hmm;
 			next;
 			mes "[Father Mareusis]";
 			mes "...your attire...";
@@ -33,7 +33,7 @@ function	script	Aco_check	{
 			next;
 			mes "[Father Mareusis]";
 			mes "You are not joking with me, are you? Hoho!!..kids these days.";
-			emotion 18;
+			emotion e_heh;
 			close;
 			
 
@@ -70,7 +70,7 @@ function	script	Arc_check	{
 
 		sL_Archer:
 			mes "Your free spirited nature tells me that you're already an archer....that and the bow and arrow in your hands...Haha";
-			emotion 18;
+			emotion e_heh;
 			close;
 			
 
@@ -105,21 +105,21 @@ function	script	Mag_check	{
 		L_JobMage:
 			mes "You should really get yourself a mirror.  Then you could see that you are ^ff0000already a Mage^000000.";
 			mes "It may even help you fix up your hair do.";
-			emotion 4;
+			emotion e_swt;
 			close;
 			
 
 		L_JobOther:
 			mes "Oh...I'm sorry.  I know they say 2 is always better than 1, but when it comes to Jobs, it's a No No.";
 			mes "Try to stay positive.  Your current job can't be that bad.";
-			emotion 22;
+			emotion e_no;
 			close;
 			
 
 		L_JobLvl:
 			mes "Oh...I'm sorry.  You need ^ff0000Job level 9^000000 and all of the ^0000ffBasic Skills^000000 before you can become a Mage.";
 			mes "Go out and kill some more Fabres okays.";
-			emotion 22;
+			emotion e_no;
 			close;
 			
 
@@ -145,8 +145,8 @@ function	script	Mer_check	{
 		L_JobMer:
 			mes "[Chief Mahnsoo]";
 			mes "Huh? What did you say? You noodle head! Take a good look at yourself.  Your ALREADY A MERCHANT!  Good lord!";
-			emotion 1;
-			emotion 0;
+			emotion e_what;
+			emotion e_gasp;
 			close;
 			
 
@@ -181,7 +181,7 @@ function	script	Swo_check	{
 
 		O_1b:
 			mes "Muhahaha! You must be kidding me! You're already a swordsman.";
-			emotion 18;
+			emotion e_heh;
 			close;
 
 		O_1c:
@@ -189,7 +189,7 @@ function	script	Swo_check	{
 			next;
 			mes "[Master Swordsman]";
 			mes "Try picking up a hobby to make use of your spare time. Muhahahahah!!";
-			emotion 18;
+			emotion e_heh;
 			close;
 
 		O_1d:
@@ -210,7 +210,7 @@ function	script	Thi_check	{
 	if(BaseClass == Job_Merchant) goto L_Merchant;
 
 		mes "You already have a job.  Stop bothering me and go help out some newbies or something.";
-		emotion 21;
+		emotion e_no1;
 		close;
 
 	L_Acolyte:
@@ -220,28 +220,28 @@ function	script	Thi_check	{
 
 	L_Archer:
 		mes "What the heck...? Hahahaha~are you a 'Kill Stealing' Archer...?";
-		emotion 18;
+		emotion e_heh;
 		close;
 
 	L_Mage:
 		mes "What the heck...? Ehhh??? A Circus Sideshow? Make a fire without a Matchstick, will ya?";
-		emotion 19;
+		emotion e_swt2;
 		close;
 
 	L_Merchant:
 		mes "What the heck...? Eeeeeek~Merchant Scammer here...!!!! I am gonna report you to the GM!!!";
-		emotion 0;
+		emotion e_gasp;
 		close;
 
 	L_Swordman:
 		mes "What the heck...? Meh!~Here's another 'Bash' head.  Do me a favor... why don't you go 'BASH', yourself in the head.  Ha!";
-		emotion 29;
+		emotion e_gg;
 		close;
 
 L_JobThief:
 	mes "[Thief Guide]";
 	mes "You're already a thief.....  What do you want from me... go away!";
-	emotion 4;
+	emotion e_swt;
 	close;
 
 }

npc/jobs/Jfunc/Jfunc2-1.txt

@@ -27,36 +27,36 @@ function	script	Ass_check	{
 
 L_JobNov:
 	mes "....HEY Novice!!! GET out of here now!! I won't be held responsible if anything bad happens to you.......";
-	emotion 0;
+	emotion e_gasp;
 	close;
 L_JobSwo:
 	mes "....What are you doing here???";
-	emotion 1;
+	emotion e_what;
 	next;
 	mes "[Angry looking man]";
 	mes "Doing what you're ordered to do eh?........ You guys are nothing more than dogs that listen to their owners.............";
-	emotion 32;
+	emotion e_pif;
 	close;
 L_JobMag:
 	mes "...What's a mage like you doing here? You should be paying more attention to your training.....";
-	emotion 20;
+	emotion e_hmm;
 	close;
 L_JobArch:
 	mes "Uh.... you're one of those people with bows right? Sorry but there are no cute pets here for u to kill..........";
-	emotion 4;
+	emotion e_swt;
 	next;
 	mes "[Angry looking man]";
 	mes "Wait...... You're not here to create trouble eh!!? ....LEAVE AT ONCE!!";
-	emotion 0;
+	emotion e_gasp;
 	close;
 L_JobAco:
 	mes "...Oh God's little helper..... What are you doing down in a dreadful place like this?";
 	mes "Trust me, you're not going to find any salvation here........ why don't you just run along ok?........";
-	emotion 20;
+	emotion e_hmm;
 	close;
 L_JobMerc:
 	mes ".... What the??? Do you have any idea where you are??...... GREEDY SCAMMERS like you are not welcome here!!";
-	emotion 29;
+	emotion e_gg;
 	close;
 L_JobOther:
 	mes ".... Hmm.... although you're not an Assassin or Thief... I have to say I like your sense of style.";
@@ -123,7 +123,7 @@ function	script	Hun_check	{
 L_Nov:
 	mes "[Hunter Sharon]";
 	mes "What's a novice like you doing here? Leave, we have nothing for you.";
-	emotion 1;
+	emotion e_what;
 	close;
 L_Swo:
 	mes "[Hunter Sharon]";
@@ -144,12 +144,12 @@ L_Merc:
 L_Thf:
 	mes "[Hunter Sharon]";
 	mes "Eeep! There's nothing to steal here!! Leave us alone..... go rob an old lady or something......";
-	emotion 23;
+	emotion e_omg;
 	close;
 L_Hunt:
 	mes "[Hunter Sharon]";
 	mes "What up! "+strcharinfo(0)+" Why did you come back? Falcon run away or something? Te hehe.";
-	emotion 18;
+	emotion e_heh;
 	next;
 	mes "[Hunter Sharon]";
 	mes "I hope you didn't think you could get free stuff from us just because your part of our guild now......";
@@ -157,7 +157,7 @@ L_Hunt:
 L_Other:
 	mes "[Hunter Sharon]";
 	mes "What are YOU doing here? Did you come to do a little song and dance... ke.. keke....kekekeHahahahhaha!!!";
-	emotion 18;
+	emotion e_heh;
 	close;
 
 }
@@ -190,12 +190,12 @@ function	script	Kni_check	{
 
 			sL_JobKni:
 				mes "...(sighs)...what are you doing here WASTING my time??  GO FORTH!!, and continue protecting Rune Midgard my young Knight.";
-				emotion 32;
+				emotion e_pif;
 				close;
 
 			sL_JobNov:
 				mes "Hahahaha!!  You have no job experience what so ever and yet you stumble in here asking to be a knight.  Hahahaha!!";
-				emotion 18;
+				emotion e_heh;
 				next;
 				mes "[Chivalry Captain Herman]";
 				mes "You must first become a Swordsman before even thinking about becoming a Knight.  Now scurry along little novice.  Hahahahaha!!!";
@@ -263,7 +263,7 @@ L_Priest:
 	M_1b:
 		mes "[Father Thomas]";
 		mes "Oh...thats a great idea! Since you're a priest, you can't forget that you have to help the Acolytes when they need it.";
-		emotion 5;
+		emotion e_ic;
 		next;
 		mes "[Father Thomas]";
 		mes "Even so, you must be carefull not to do everyting for them.  It is important that they gain their own experiences through training ";
@@ -335,11 +335,11 @@ L_Other:
 	next;
 	mes "[Dog]";
 	mes "If you're that bored, do the world a favor and climb to the top of this building from the outside, then do some acrobatics....";
-	emotion 32;
+	emotion e_pif;
 	next;
 	mes "[Dog]";
 	mes "~WOOF~ Get lost! I don't have time for people like you!!";
-	emotion 27;
+	emotion e_go;
 	close;
 L_Holy:
 	mes "[Dog]";
@@ -368,7 +368,7 @@ L_Other:
 	close;
 L_Novice:
 	mes "Awwww, a little novice!  How cute! This place is for Wizards only though.";
-	emotion 14;
+	emotion e_lv2;
 	next;
 	mes "[Catherine Medichi]";
 	mes "If you're interested in magic, the ^0000FFMagician's Guild^000000 is the place for you.";
@@ -379,7 +379,7 @@ L_Wizard:
 	mes "[Catherine Medichi]";
 	if(sex==1) mes "... Of course, if your here to ask me out... (*giggles*)....";
 	if(sex==0) mes "If you get yourself a boyfriend, feel free to drop by and show him off. XD";
-	emotion 3;
+	emotion e_lv;
 	close;
 
 }

npc/jobs/novice/novice.txt

@@ -409,7 +409,7 @@ new_1-2.gat,99,105,4	script	Interfaces Instructor	751,{
 			close2;
 			warp "new_1-2.gat",28,178;
 			end;
-		case 3:	emotion 19;
+		case 3:	emotion e_swt2;
 			close;
 		}
 	}
@@ -444,7 +444,7 @@ new_1-2.gat,99,105,4	script	Interfaces Instructor	751,{
 				warp "new_1-2.gat",28,178;
 				end;
 			}
-		case 3:	emotion 19;
+		case 3:	emotion e_swt2;
 			close;
 		}
 	}
@@ -480,7 +480,7 @@ new_1-2.gat,99,105,4	script	Interfaces Instructor	751,{
 				warp "new_1-2.gat",28,178;
 				end;
 			}
-		case 3:	emotion 19;
+		case 3:	emotion e_swt2;
 			close;
 		}
 	}
@@ -612,11 +612,11 @@ new_1-2.gat,83,111,4	script	Skill Instructor	753,{
 				mes "Cheer Up!";
 				close;
 			case 2:	goto L_battle;
-			case 3:	emotion 23;
+			case 3:	emotion e_omg;
 			}
 			close;
 		case 2:	goto L_battle;
-		case 3:	emotion 23;
+		case 3:	emotion e_omg;
 		}
 		close;
 	}
@@ -637,7 +637,7 @@ new_1-2.gat,83,111,4	script	Skill Instructor	753,{
 			mes "It is easy to find him.";
 			close;
 		case 2:	goto L_battle;
-		case 3:	emotion 23;
+		case 3:	emotion e_omg;
 		}
 		close;
 	}
@@ -659,7 +659,7 @@ new_1-2.gat,83,111,4	script	Skill Instructor	753,{
 			warp "new_1-2.gat",115,107;
 			break;
 		case 2:	goto L_battle;
-		case 3:	emotion 23;
+		case 3:	emotion e_omg;
 		}
 		close;
 	}
@@ -1569,7 +1569,7 @@ new_1-2.gat,184,172,4	script	Skill Assistant	47,{
 	mes "your performance,";
 	mes "I will be teaching you with my";
 	mes "best effort.";
-	emotion 30;
+	emotion e_kis;
 L_loop:
 	next;
 	switch( select("Passive and Active Skills.","Passive, Basic Skills.","Use of Emoticons","Cancel") ) {
@@ -1781,7 +1781,7 @@ L_loop1:
 			mes "Anyhow, I really thank to God.";
 			mes "Let's shout";
 			mes "'Praise the Creator!'";
-			emotion 30;
+			emotion e_kis;
 			break;
 		case 3:	mes "[Pitch Judas]";
 			mes "You can ^4d4dffopen a chat room^000000";
@@ -1923,7 +1923,7 @@ L_loop1:
 		mes "commands by typing ^4d4dff/emotion^000000 on your";
 		mes "chat windows.";
 		mes "............HuHu";
-		emotion 3;
+		emotion e_lv;
 		break;
 	case 4:	mes "[Pitch Judas]";
 		mes "Don't you need anything else?";

npc/quests/The_Sign_Quest(unfinished).txt

@@ -411,7 +411,7 @@ s_5W:
 	else if(ariantest < 8)
 {
 
-	emotion 19;
+	emotion e_swt2;
 	mes "[Gaanan]";
 	mes "The weather here in";
 	mes "Morroc is too hot for me.";
@@ -440,7 +440,7 @@ morocc_in.gat,115,154,5	script	Rogue	810,{
 
 	else if(signquest < 3 || signquest > 5)
 {
-	emotion 9;
+	emotion e_dots;
 	end;
 }
 	else if(signquest == 3)
@@ -860,7 +860,7 @@ payon_in03.gat,11,31,4	script	Daewoon	808,{
 	mes "you and reveal it to";
 	mes "Daewoon's roving eyes.";
 	next;
-	emotion 0;
+	emotion e_gasp;
 	mes "[Daewoon]";
 	mes "Eh? Why that's...";
 	mes "I see now, Arian must";
@@ -893,7 +893,7 @@ payon_in03.gat,11,31,4	script	Daewoon	808,{
 	next;
 	menu "It's handy.",-,"I actually don't know...",s_Honest;
 
-	emotion 9;
+	emotion e_dots;
 	mes "[Daewoon]";
 	mes "Mmm...?";
 	mes "Handy? If you truly";
@@ -903,7 +903,7 @@ payon_in03.gat,11,31,4	script	Daewoon	808,{
 	next;
 	goto s_Cont;
 s_Honest:
-	emotion 32;
+	emotion e_pif;
 	mes "[Daewoon]";
 	mes "Really?";
 	mes "Mm. At least you";
@@ -911,7 +911,7 @@ s_Honest:
 	next;
 	goto s_Cont;
 s_How:
-	emotion 9;
+	emotion e_dots;
 	mes "[Daewoon]";
 	mes "...";
 	mes "A rather crass way";
@@ -964,7 +964,7 @@ s_Cont:
 	goto s_Question;
 
 s_Best:
-	emotion 33;
+	emotion e_ok;
 	mes "[Daewoon]";
 	mes "Mwah ah hah";
 	mes "That's exactly what";
@@ -991,7 +991,7 @@ s_Rude:
 	goto s_Question;
 
 s_GetOver:
-	emotion 9;
+	emotion e_dots;
 	mes "[Daewoon]";
 	mes "Hmm. That kind of half-hearted";
 	mes "attitude won't get you very far on";
@@ -1001,7 +1001,7 @@ s_GetOver:
 	mes "surviving your challenges.";
 	next;
 s_Question:
-	emotion 20;
+	emotion e_hmm;
 	set @DaewoonTest,0;
 	mes "[Daewoon]";
 	mes "Now, metz expects me to ask";
@@ -1020,7 +1020,7 @@ s_Question:
 	menu "Yes, I do",-,"I prefer soloing.",s_Solo,"I am lonely.",s_Lonely;
 
 	set @DaewoonTest,1;
-	emotion 23;
+	emotion e_omg;
 	mes "[Daewoon]";
 	mes "Oh, that's great~!";
 	mes "To have many friends";
@@ -1076,7 +1076,7 @@ s_Mobtrain:
 	next;
 	menu "Awesome~!",-,"I hate people who do that.",s_Hate,"I do it sometime...",s_Sometimes;
 	
-	emotion 32;
+	emotion e_pif;
 	mes "[Daewoon]";
 	mes "But...";
 	mes "Wouldn't that be really";
@@ -1115,7 +1115,7 @@ s_Hate:
 	mes "myself irked when encountering";
 	mes "such troublemakers.";
 	next;
-	emotion 21;
+	emotion e_no1;
 	mes "[Daewoon]";
 	mes "When you face obstacles";
 	mes "in your own training, never give in";
@@ -1295,7 +1295,7 @@ s_Life:
 	menu "Yes",-,"No",s_No;
 
 	set @DaewoonTest,@DaewoonTest + 1;
-	emotion 18;
+	emotion e_heh;
 	mes "[Daewoon]";
 	mes "I'm glad.";
 	mes "When you don't live";
@@ -1338,7 +1338,7 @@ s_No:
 	mes "why I think it's good to experience";
 	mes "new things as well as reflect.";
 	next;
-	emotion 21;
+	emotion e_no1;
 	mes "[Daewoon]";
 	mes "Now, what's precious to me?";
 	mes "Three things, actually...";
@@ -1453,7 +1453,7 @@ OnTouch:
 	
 aldeba_in.gat,156,118,4	script	Piru Piru	700,{
 
-	emotion 28;
+	emotion e_sob;
 	mes "[Piru Piru]";
 	mes "Oh, I'm sooo tired~";
 	mes "But we can't sleep yet.";
@@ -1554,7 +1554,7 @@ aldeba_in.gat,155,101,2	script	Jore#SignAldeNpc	805,{
 	delitem 511,10;
 	delitem 610,2;
 	set signquest,7;
-	emotion 15;
+	emotion e_thx;
 	mes "[Sir Jore]";
 	mes "Ah! Th-thank you for";
 	mes "bringing what I need.";
@@ -1593,7 +1593,7 @@ aldeba_in.gat,155,101,2	script	Jore#SignAldeNpc	805,{
 	mes "[" + strcharinfo(0) + "]";
 	mes "Excuse me...";
 	next;
-	emotion 23;
+	emotion e_omg;
 	mes "^3131FF*Clink*";
 	next;
 	mes "[Sir Jore]";
@@ -1607,7 +1607,7 @@ aldeba_in.gat,155,101,2	script	Jore#SignAldeNpc	805,{
 	mes "Look what you";
 	mes "made me do!";
 	next;
-	emotion 28;
+	emotion e_sob;
 	mes "[Sir Jore]";
 	mes "I've been fiddling";
 	mes "with this sample for";
@@ -1634,7 +1634,7 @@ aldeba_in.gat,155,101,2	script	Jore#SignAldeNpc	805,{
 	close;
 
 s_Daewoon:
-	emotion 4;
+	emotion e_swt;
 	mes "[Sir Jore]";
 	mes "O-oh!";
 	mes "That's right.";
@@ -1700,7 +1700,7 @@ s_Daewoon:
 	mes "Yggdrasil. They can be used";
 	mes "to revive the dead, after all.";
 	next;
-	emotion 4;
+	emotion e_swt;
 	mes "[Sir Jore]";
 	mes "Oh, and make sure to";
 	mes "bring those things to me";
@@ -1775,12 +1775,12 @@ s_Again:
 OnPotion:
 	if(rand(0,1) == 1)
 {
-	emotion 5;
+	emotion e_ic;
 	misceffect 305;
 }
 else
 {
-	emotion 23;
+	emotion e_omg;
 	misceffect 306;
 }
 	end;
@@ -1846,16 +1846,16 @@ else
 	end;
 }
 OnHo:
-	emotion 2;
+	emotion e_ho;
 	end;
 OnKis2:
-	emotion 31;
+	emotion e_kis2;
 	end;
 OnExclamation:
-	emotion 0;
+	emotion e_gasp;
 	end;
 OnOmg:
-	emotion 23;
+	emotion e_omg;
 	end;
 }
 
@@ -1874,7 +1874,7 @@ prt_maze02.gat,14,183,3	script	Gordon	51,{
 	mes "with a white bear and a";
 	mes "blue bear, father.";
 	next;
-	emotion 2;
+	emotion e_ho;
 	mes "[Gordon]";
 	mes "Darling...";
 	mes "Aren't you tired";
@@ -1890,7 +1890,7 @@ prt_maze02.gat,14,183,3	script	Gordon	51,{
 	mes "in peace. I think we deserve to rest";
 	mes "after accomplishing our goals...";
 	next;
-	emotion 28;
+	emotion e_sob;
 	mes "[Gordon]";
 	mes "Thank you, Pluer.";
 	mes "I have no regrets about";
@@ -1901,7 +1901,7 @@ prt_maze02.gat,14,183,3	script	Gordon	51,{
 	menu "Roar~!",-,"Excuse me.",s_Excuse;
 
 	callfunc "Sign_Alch_Summon";
-	emotion 23;
+	emotion e_omg;
 	donpcevent "Pleur::OnOmg";
 	set ScareAlchSign,1;
 	mes "[Pleur]";
@@ -1914,7 +1914,7 @@ prt_maze02.gat,14,183,3	script	Gordon	51,{
 	close;
 	
 s_Excuse:
-	emotion 0;
+	emotion e_gasp;
 	donpcevent "Pleur::OnExclamation";
 	mes "[Gordon]";
 	mes "Eh?! Don't you know";

npc/quests/bunnyband.txt

@@ -65,7 +65,7 @@ alberta.gat,23,232,1	script	Kafra Corp. Rep.#1::KCRep	83,{
 		delitem 722,1;
 		delitem 2213,1;
 		mes "Wow! Well-done, well-done! You've got every single item! I will make the Bunny Band for you right away...";
-		emotion 21;
+		emotion e_no1;
 		next;
 		mes "[Kafra Corp. Rep.]";
 		mes "Tah dah!!! Here is your ^FF0000Bunny Band^000000... Please take it!";

npc/quests/counteragent_mixture.txt

@@ -71,11 +71,11 @@ M_Menu2:
 geffen.gat,181,114,4	script	Aure Dupon	55,{
 	mes "[Aure Dupon]";
 	mes "TIME never WAITS for you!! Even MAGIC cannot SLOW it down!  I can feel it passing me by even as we speak!!....";
-	emotion 0;
+	emotion e_gasp;
 	next;
 	mes "[Aure Dupon]";
 	mes "So... why did you stop me??";
-	emotion 20;
+	emotion e_hmm;
 	if(MORGEN >= 1) goto M_Menu2;
 M_Menu:
 	next;
@@ -120,7 +120,7 @@ geffen_in.gat,141,140,2	script	Morgenstein	121,{
 	mes "[Chemist Morgenstein]";
 	mes "Heheheheheh... Sniff Sniff... I can smell something appetizing here.";
 	mes "It is a Human Being... living one... umm yummy... Heheheheheh";
-	emotion 38;
+	emotion e_awsm;
 	close;
 
 L_0:
@@ -134,7 +134,7 @@ M_Menu:
 		mes "[Chemist Morgenstein]";
 		mes "Heheheheheh... You probably already heard about what I do ...";
 		mes "Okay.. I will tell you everything... there is nothing left for me to hide.... Heheheheheh...";
-		emotion 29;
+		emotion e_gg;
 		next;
 		mes "[Chemist Morgenstein]";
 		mes "As far as I'm concerned my research has already been completed.....";
@@ -142,7 +142,7 @@ M_Menu:
 		next;
 		mes "[Chemist Morgenstein]";
 		mes "You know what I mean..... time?.... Hehehehehehehya....";
-		emotion 29;
+		emotion e_gg;
 		next;
 		mes "[Chemist Morgenstein]";
 		mes "Um.... did you say you want to know about my Research?... Oh it's all very simple.... I'm just trying to find ways to combine different materials...";
@@ -153,7 +153,7 @@ M_Menu:
 		next;
 		mes "[Chemist Morgenstein]";
 		mes "~~~~ !! Hehe!!!...Heheheheheh!!!...squash squash!!!..Kekekekekelll!!!!";
-		emotion 43;
+		emotion e_slur;
 		next;
 		mes "[Chemist Morgenstein]";
 		mes "Ack!~cough~cough~ Ahem.... Though it is not yet possible, I did figure out something else incredible.";
@@ -176,7 +176,7 @@ M_Menu2:
 		mes "[Chemist Morgenstein]";
 		mes "Heheheheheheh.... So I see you are interested in my creations?..... Who woudn't.... Kekekekekekeke!!!";
 		mes "So what do you want me to make for you?? Huh? Heheheheheh.............";
-		emotion 29;
+		emotion e_gg;
 		next;
 		menu "-Counteragent",-, "-Mixture",sM_Mixture, "-Forget it",M_End;
 		

npc/quests/juice_maker.txt

@@ -28,7 +28,7 @@ prt_in.gat,47,173,2	script	Morrison	97,{
 
 	mes "Wahhhhh!!! Wahh... NO more! NO more!";
 	mes "I won't... eat anymore stupid ^0000ffFruit^000000 things!!";
-	emotion 28;
+	emotion e_sob;
 	next;
 	menu "Talk",M_Talk,"Cancel",M_End;
 
@@ -39,7 +39,7 @@ prt_in.gat,47,173,2	script	Morrison	97,{
 		mes "Arhhggg!! I'VE HAD ENOUGH!!! I can't eat anymore ^0000ffFruits^000000! They";
 		mes "taste so SOUR..... I have to PEEL them before I can eat them.....";
 		mes "they feel sticky and squishy...... it's really ANNOYING!!!!";
-		emotion 16;
+		emotion e_wah;
 		next;
 		mes "[LIttle Morrison]";
 		mes "I just HATE FRUIT! I can't even get full off of the stuff.(~sigh~)";
@@ -49,16 +49,16 @@ prt_in.gat,47,173,2	script	Morrison	97,{
 		L_Meat:
 		mes "[Little Morrison]";
 		mes "...(sniff)....(sniff)(sniff).... Oh! Is that ^ff0000Meat^000000???";
-		emotion 5;
+		emotion e_ic;
 		next;
 		mes "[Little Morrison]";
 		mes "Do you have some ^ff0000Meat^000000?!!!~(drools)~";
 		mes "Umm... that yummy smell is making me SOOO HUNGRYYYY!!!l";
-		emotion 37;
+		emotion e_rice;
 		next;
 		mes "[Little Morrison]";
 		mes "... Umm... excuse me..... could you give me some of that meat PLEEAASSSE?";
-		emotion 28;
+		emotion e_sob;
 		next;
 		menu "Give him some",sM_Give,"Ignore him",sM_Ignore;
 		
@@ -71,7 +71,7 @@ prt_in.gat,47,173,2	script	Morrison	97,{
 			mes "Whoah~!!! It's real Meat, Meat!";
 			mes "Mmmm! It makes my mouth water.";
 			mes "Oh thank you. Now I feel happy. Yum Yum...";
-			emotion 38;
+			emotion e_awsm;
 			close;
 
 		sM_Ignore:
@@ -79,19 +79,19 @@ prt_in.gat,47,173,2	script	Morrison	97,{
 			mes "[Little Morrison]";
 			mes "Boo...";
 			mes "Boo... Fine... Alright, Alright~!!! Selfish meanie!";
-			emotion 36;
+			emotion e_bzz;
 			close;
 	M_End:
 		mes "[Little Morrison]";
 		mes "Wahhhh!!! No matter how hard I try, I just can't eat Vegetables";
 		mes "or ^0000ffFruit^000000! They're plain disgusting!!";
-		emotion 28;
+		emotion e_sob;
 		close;
 
 L_GoAway:
 	mes "Pffff... Leave me alone! You DON'T CARE about me! I'm gonna DIE";
 	mes "because of these stupid Veggies and Fuits so MIND your own business!";
-	emotion 32;
+	emotion e_pif;
 	close;
 
 L_Candy:
@@ -119,7 +119,7 @@ prt_in.gat,49,172,2	script	Housewife Marianne	53,{
 
 	mes "Morrison!! Please eat some fruit will ya? Fruit~!";
 	mes "*Sob*~!! Like father like son...";
-	emotion 28;
+	emotion e_sob;
 	next;
 	menu "Talk",M_Talk,"Cancel",M_Cancel;
 	close;	
@@ -129,7 +129,7 @@ prt_in.gat,49,172,2	script	Housewife Marianne	53,{
 		mes "(~Sigh~)...This is Morrison... My one and only son. He's going";
 		mes "through some kinda faze and doesn't want to eat any ^0000ffFruits^000000 or";
 		mes "vegetables.";
-		emotion 40;
+		emotion e_shy;
 		next;
 		mes "[Housewife Marianne]";
 		mes "Look at his face..., it turns sour just hearing about ^0000ffFruit^000000...";
@@ -142,20 +142,20 @@ prt_in.gat,49,172,2	script	Housewife Marianne	53,{
 	M_Cancel:
 		mes "[Housewife Marianne]";
 		mes "Morrison!! I will get mad at you if you keep doing this!";
-		emotion 36;
+		emotion e_bzz;
 		close;
 	
 L_GaveMeat:
 	set MORRISON,0;
 	mes "Oh MY GOD!!... Oh lord...";
-	emotion 23;
+	emotion e_omg;
 	next;
 	mes "[Housewife Marianne]";
 	mes "WHAT ARE YOU DOING!! HOW DARE YOU feed my son!! And ^ff0000MEAT^000000 of all things!!!";
 	next;
 	mes "[Housewife Marianne]";
 	mes "Arrrgh~~!! Get Lost right now!!!!!!";
-	emotion 32;
+	emotion e_pif;
 	close;
 
 L_Juice:
@@ -168,16 +168,16 @@ L_Juice:
 	mes "[Housewife Marianne]";
 	mes "What if I could turn ^0000ffFruits^000000 into a ^0000ffJuice^000000... for example...Orange";
 	mes "juice... Would my child like it?";
-	emotion 20;
+	emotion e_hmm;
 	next;
 	mes "[Housewife Marianne]";
 	mes "Ah! Now I remember..There is a town where you can get a variety of";
 	mes "^0000ffFruit^000000 turned into ^0000ffFruit Juices^000000.";
-	emotion 5;
+	emotion e_ic;
 	next;
 	mes "[Housewife Marianne]";
 	mes "... Was is it...^ff0000Payon^000000...or ^ff0000Morroc^000000...?";
-	emotion 20;
+	emotion e_hmm;
 	next;
 	close;
 
@@ -264,7 +264,7 @@ sF_Make:
 		if(@amount > 0) goto L_Make;
 		mes "[Juicer Marx Hansen]";
 		mes "Doh! You don't have enough ingredients for a single bottle of juice.";
-		emotion 0;
+		emotion e_gasp;
 		close;
 
 	M_Tell:

npc/quests/newgears/new_hats_0625.txt

@@ -117,14 +117,14 @@ lighthalzen.gat,180,88,4	script	Rich Girl	818,{
 	next;
 	mes "[Rich Girl]";
 	mes "Do you have a grandma?";
-	emotion 20;
+	emotion e_hmm;
 	next;
 	mes "[Rich Girl]";
 	mes "Really? I'm sorry. Do you like wolves?";
 	next;
 	mes "[Rich Girl]";
 	mes "Ha! I knew it! And... my last question. Would you like to put on something reddish?";
-	emotion 1;
+	emotion e_what;
 	next;
 	mes "[Rich Girl]";
 	mes "Just kidding, Have you ever read 'Red-Hood'? I can make to you the very same ^FF3300Red Bonnet^000000.";
@@ -166,7 +166,7 @@ L_EXIT:
 lighthalzen.gat,360,310,4	script	Boy	818,{  
 	mes "[Boy]";
 	mes "...MA...Ma..ma...";
-	emotion 43;
+	emotion e_slur;
 	next;
 	menu "Wow! Give me a Baby Pacifier!",-,"Nice Boy!",L_EXIT;
 
@@ -184,14 +184,14 @@ lighthalzen.gat,360,310,4	script	Boy	818,{
 	delitem 941,1;	// Nose Ring
 	mes "[Boy]";
 	mes "Th-anke...";
-	emotion 43;
+	emotion e_slur;
 	getitem 5110,1;	// Baby Pacifier
 	next;
 
 L_EXIT:
 	mes "[Boy]";
 	mes "...B...Bye...";
-	emotion 28;
+	emotion e_sob;
 	close;
 	
 }

npc/quests/newgears/orc_hero_helm.txt

@@ -18,7 +18,7 @@ gef_fild10.gat,131,274,4	script	Orc Warrior	1023,{
 	if(ORC_HERO_HELM_Q==2) goto Q2;
 	if(ORC_HERO_HELM_Q==3) goto Q3;
 	if(ORC_HERO_HELM_Q==4) goto Q4;
-	emotion 6;
+	emotion e_an;
 	mes "[Orc Warrior]";
 	mes "What does an human here? Cheeit!";
 	mes "Here are only true Orc Warriors! Get out of our village!";
@@ -57,7 +57,7 @@ Q1_allitem:
 	set ORC_HERO_HELM_Q2,0;
 	close;
 Q1_noitem:
-	emotion 6;
+	emotion e_an;
 	mes "Cheeit! I told ya to bring me back 10,000 Jellopies, and you don't have even one!";
 	close;
 Q2:
@@ -70,7 +70,7 @@ Q2:
 	set ORC_HERO_HELM_Q2,0;
 	close;
 Q2_noitem:
-	emotion 6;
+	emotion e_an;
 	mes "Ya couldn't win against my brother warriors ? Stay away until ya find those 100 Orcish Vouchers! Cheeit!";
 	close;
 Q3:
@@ -95,7 +95,7 @@ Q3_allitem:
 	mes "Now, ya'll have to fight our best warlords and heroes! Bring me 100 Heroic Emblems and I'll give ya your helm.";
 	close;
 Q3_noitem:
-	emotion 6;
+	emotion e_an;
 	mes "Bringing me back at least one of those 10,000 Orcish Vouchers is too hard for ya, poor human? Go out of there, then! Cheeit!";
 	close;
 Q4:
@@ -117,7 +117,7 @@ Q4:
 	mes "Here ya are! Wear it and be proud to be one of the mightiest Orc Heroes! Cheeit!";
 	close;
 Q4_noitem:
-	emotion 6;
+	emotion e_an;
 	mes "No? Ya miss items... I was sure that ya weren't really a hero!";
 	close;
 }

npc/quests/obb_quest.txt

@@ -119,7 +119,7 @@ L_YES:
 	if(countitem(636)<2) goto L_NOITM;//Items: No_Recipient,
 	delitem 636,2;//Items: No_Recipient,
 	mes "Thank you, that's all I need.";
-	emotion 15;
+	emotion e_thx;
 	next;
 	mes "[Jacob]";
 	set obb_quest, 2;
@@ -130,7 +130,7 @@ L_DONE:
 
 L_NOITM:
 	mes "Pardon, but I do really need these two ^0000FFNo Recipients^000000.";
-	emotion 20;
+	emotion e_hmm;
 	close;
 
 L_END:
@@ -181,7 +181,7 @@ L_CREATE2:
 	getitem 603,1;//Items: Old_Blue_Box,
 	mes "[Old Greek]";
 	mes "Here's your Box!";
-	emotion 21;
+	emotion e_no1;
 	next;
 	menu "Make another!",L_CREATE2, "It's enough.",-;
 

npc/quests/quests_alberta.txt

@@ -31,7 +31,7 @@ alberta.gat,117,134,8	script	Elin	96,{
 	next;
 	mes "[Elin]";
 	mes "I LOVE dolls!!";
-	emotion 14;
+	emotion e_lv2;
 	next;
 	mes "[Elin]";
 	mes "Ya know..... I REALLY, REALLY, want a new doll.  I hope daddy is going to buy me one for my birthday.....";
@@ -40,13 +40,13 @@ alberta.gat,117,134,8	script	Elin	96,{
 
 		mes "[Elin]";
 		mes "Yeah, this time I'm hoping for a Yoyo doll.  Hehe, they're so cute! They're my FAVORITE!";
-		emotion 33;
+		emotion e_ok;
 		close;
 	M_2:
 		mes "[Elin]";
 		mes "Oh my goodness! Really?? You're such a sweetie.... gimme, gimme!!";
 		mes "What kinda doll are you going to give me? Are you really gonna give me one?";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		menu "Puppet",-,"Poring doll",sM_2,"Chonchon doll",sM_3,"Rocker doll",sM_4, "Spore doll",sM_5,
 		           "Osiris doll",sM_6,"Baphomet doll",sM_7,"Racoon doll",sM_8,"Yoyo doll",sM_9, "I am as adorable as a doll!",sM_10;
@@ -55,7 +55,7 @@ alberta.gat,117,134,8	script	Elin	96,{
 			delitem 740,1;
 			mes "[Elin]";
 			mes "Wow--! It's a rabbit! It's SOOOO cute!! Thank you SOOO much!";
-			emotion 14;
+			emotion e_lv2;
 			next;
 			mes "[Elin]";
 			mes "It's SOOO fluffy... Oh yeah! Let me give you a present too!";
@@ -71,7 +71,7 @@ alberta.gat,117,134,8	script	Elin	96,{
 			next;
 			mes "[Elin]";
 			mes "Thanks again for the rabbit doll! I'm gonna HUG this to sleep EVERY night~";
-			emotion 15;
+			emotion e_thx;
 			close;
 
 		sM_2:
@@ -79,12 +79,12 @@ alberta.gat,117,134,8	script	Elin	96,{
 			delitem 741,1;
 			mes "[Elin]";
 			mes "Yay! It's a poring doll! It's SOOOO cute! Since you gave me a doll I'll give you this....";
-			emotion 14;
+			emotion e_lv2;
 			next;
 			getitem 529,1;
 			mes "[Elin]";
 			mes "Thank you for the doll!";
-			emotion 15;
+			emotion e_thx;
 			close;
 
 		sM_3:
@@ -92,7 +92,7 @@ alberta.gat,117,134,8	script	Elin	96,{
 			delitem 742,1;
 			mes "[Elin]";
 			mes "Ew whats this?.... a Chonchon ... doll? ...";
-			emotion 16;
+			emotion e_wah;
 			next;
 			mes "[Elin]";
 			mes "Oh well, since you're giving it to me, I guess it's ok ....";
@@ -103,7 +103,7 @@ alberta.gat,117,134,8	script	Elin	96,{
 			next;
 			mes "[Elin]";
 			mes ".... chonchon.... (~grumble, grumble~)";
-			emotion 7;
+			emotion e_ag;
 			close;
 
 		sM_4:
@@ -124,7 +124,7 @@ alberta.gat,117,134,8	script	Elin	96,{
 			next;
 			mes "[Elin]";
 			mes "Thanks again for the doll!";
-			emotion 15;
+			emotion e_thx;
 			close;
 
 		sM_5:
@@ -132,7 +132,7 @@ alberta.gat,117,134,8	script	Elin	96,{
 			delitem 743,1;
 			mes "[Elin]";
 			mes "Blehh .... It's a mushroom... Mom's always scolding me for not eating mushrooms ...";
-			emotion 4;
+			emotion e_swt;
 			next;
 			mes "[Elin]";
 			mes "I'll take it anyway, since the doll looks cute.  But I still won't eat mushrooms though ...";
@@ -146,7 +146,7 @@ alberta.gat,117,134,8	script	Elin	96,{
 			next;
 			mes "[Litte Kid]";
 			mes "Thank you for the doll~";
-			emotion 15;
+			emotion e_thx;
 			close;
 
 		sM_6:
@@ -173,7 +173,7 @@ alberta.gat,117,134,8	script	Elin	96,{
 			getitem 525,5;
 			mes "[Elin]";
 			mes "Thank you for the doll!";
-			emotion 15;
+			emotion e_thx;
 			close;
 
 		sM_8:
@@ -181,7 +181,7 @@ alberta.gat,117,134,8	script	Elin	96,{
 			delitem 754,1;
 			mes "[Elin]";
 			mes "Ah, it's a Smokie doll.  I hate Smokies, but the doll's really cute! Thank you!";
-			emotion 33;
+			emotion e_ok;
 			next;
 			mes "[Elin]";
 			mes "Let me give you some of Grandma's home-made cake!";
@@ -192,7 +192,7 @@ alberta.gat,117,134,8	script	Elin	96,{
 			next;
 			mes "[Elin]";
 			mes "Thanks again for this cute doll!";
-			emotion 15;
+			emotion e_thx;
 			close;
 
 		sM_9:
@@ -200,7 +200,7 @@ alberta.gat,117,134,8	script	Elin	96,{
 			delitem 753,1;
 			mes "[Elin]";
 			mes "WOW--!!! OH MY GOSH! It's a Yoyo doll! This is what I REALLY wanted!! It's SOOOO cute......";
-			emotion 14;
+			emotion e_lv2;
 			next;
 			mes "[Elin]";
 			mes "As a thank you, I'll give you this.";
@@ -212,13 +212,13 @@ alberta.gat,117,134,8	script	Elin	96,{
 			next;
 			mes "[Elin]";
 			mes "Anyway, thank you SOOO MUCH for the Yoyo doll!!!!";
-			emotion 15;
+			emotion e_thx;
 			close;
 
 		sM_10:
 			mes "[Elin]";
 			mes "BLAAAAAAAAHHH!! Don't make fun of me cuz I'm young!";
-			emotion 32;
+			emotion e_pif;
 			next;
 			mes "[Elin]";
 			mes "(mumbles) .....'stupid'.....";
@@ -227,11 +227,11 @@ alberta.gat,117,134,8	script	Elin	96,{
 		L_Liar:
 			mes "[Elin]";
 			mes "HEY!! You don't have any dolls... I can't believe you would lie to a little kid!!!";
-			emotion 0;
+			emotion e_gasp;
 			next;
 			mes "[Elin]";
 			mes "You're a MEANIE!! I HATE YOU!!!..... sniff... sniff.... Waaaaaaaaaaaaaaaaaaaahhhhhh!!";
-			emotion 28;
+			emotion e_sob;
 			close;
 }
 
@@ -268,11 +268,11 @@ alberta_in.gat,28,145,4	script	Grampa	120,{
 		next;
 		mes "[Grampa]";
 		mes "It is the ^3355FFTiger's Footskin^000000, the legendary king of rejuvination!!"; 
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Grampa]";
 		mes "Have you heard of the Tiger's Footskin???.....";
-		emotion 1;
+		emotion e_what;
 		next;
 		mes "[Grampa]";
 		mes "Just by LOOKING at it, your white hair turns Black again! By SMELLING it, your reflexes become 10x faster!";
@@ -303,7 +303,7 @@ alberta_in.gat,28,145,4	script	Grampa	120,{
 			delitem 1030,10;
 			getitem 5016,1;
 			mes "T-Thank YOU!! Thank you SO VERY MUCH!!";
-			emotion 15;
+			emotion e_thx;
 			next;
 			mes "[Grampa]";
 			mes "Now my body can be reinvigorated!!! I will eat it right away!";
@@ -356,11 +356,11 @@ alberta_in.gat,122,53,4	script	Cherokee	47,{
 		if(countitem(923) < 20) goto L_NotEnuf;
 		delitem 923,20;
 		mes "Whoah~! This is the first time I've ever seen a real ^3355FF'Evil Horn'^000000!!";
-		emotion 5;
+		emotion e_ic;
 		next;
 		mes "[Cherokee]";
 		mes "Thank you! Here are the Antlers just as I promised you!";
-		emotion 15;
+		emotion e_thx;
 		getitem 2284,1;
 		next;
 		mes "[Cherokee]";
@@ -384,11 +384,11 @@ alberta_in.gat,122,53,4	script	Cherokee	47,{
 alberta.gat,120,53,3	script	Zic	51,{
 	mes "[Zic]";
 	mes "Yay! A cool breeze! That's why I love the sea!!";
-	emotion 2;
+	emotion e_ho;
 	next;
 	mes "[Zic]";
 	mes "Huh?... Do you have any business with me? You came to me because I'm a merchant right?";
-	emotion 20;
+	emotion e_hmm;
 	next;
 	mes "[Zic]";
 	mes "~Sigh!~ I get tired of my reputation.... I can't get any peace or quite around here.....";
@@ -464,7 +464,7 @@ alberta.gat,120,53,3	script	Zic	51,{
 		mes "[Zic]";
 		mes "Are you sure you want a simple item like this? Oh well... To make a Heart Hairpin I will need:";	//5041
 		mes "- ^5555FF1200 Coral Reefs^000000.";	//7013
-		emotion 20;
+		emotion e_hmm;
 		next;
 		mes "[Zic]";
 		mes "Would you like me to make you one?";
@@ -499,7 +499,7 @@ alberta.gat,120,53,3	script	Zic	51,{
 alberta.gat,135,79,3	script	Tempestra	71,{
 	mes "[Tempestra]";
 	mes "Ah...... Such a cool breeze.  It's good to be next to the sea.  I think it was the right choice for me to take a break from my business and come here.";
-	emotion 2;
+	emotion e_ho;
 	if(TEMPESTRA == 1) goto sM_Menu;
 	next;
 	mes "[Tempestra]";
@@ -515,7 +515,7 @@ alberta.gat,135,79,3	script	Tempestra	71,{
 		set TEMPESTRA, 1;
 		mes "[Tempestra]";
 		mes "Oooh! Thank you so much.  I'm so glad to meet such a friendly person here....";
-		emotion 15;
+		emotion e_thx;
 		next;
 		mes "[Tempestra]";
 		mes "(~gulp~gulp~)";
@@ -563,7 +563,7 @@ alberta.gat,135,79,3	script	Tempestra	71,{
 					getitem 5032, 1;
 					mes "[Tempestra]";
 					mes "All done... one Sunday Hat just for you.  Thank you and come back any time.";
-					emotion 15;
+					emotion e_thx;
 					close;
 			ssM_0b:
 				mes "[Tempestra]";
@@ -587,7 +587,7 @@ alberta.gat,135,79,3	script	Tempestra	71,{
 					getitem 5027, 1;
 					mes "[Tempestra]";
 					mes "All done... one Mage Hat just for you.  Thank you and come back any time.";
-					emotion 15;
+					emotion e_thx;
 					close;
 			ssM_0c:
 				mes "[Tempestra]";
@@ -609,7 +609,7 @@ alberta.gat,135,79,3	script	Tempestra	71,{
 					getitem 5045, 1;
 					mes "[Tempestra]";
 					mes "All done... one Magician just for you.  Thank you and come back any time.";
-					emotion 15;
+					emotion e_thx;
 					close;
 			ssM_End:
 				close;
@@ -646,13 +646,13 @@ alberta.gat,135,79,3	script	Tempestra	71,{
 				getitem 5022, 1;
 				mes "[Tempestra]";
 				mes "All done... one Hat of the Sun God just for you.  Thank you again for the potion, and please come back any time.";
-				emotion 15;
+				emotion e_thx;
 				close;
 
 				ssL_NotEnuf:
 					mes "[Tempestra]";
 					mes "Um.... where are those items exactly???";
-					emotion 20;
+					emotion e_hmm;
 					close;
 			ssM_1b:
 				mes "[Tempestra]";
@@ -662,12 +662,12 @@ alberta.gat,135,79,3	script	Tempestra	71,{
 		L_NoPot:
 			mes "[Tempestra]";
 			mes "Umm... excuse me but.... where is the potion??";
-			emotion 20;
+			emotion e_hmm;
 			close;
 
 	M_1:
 		mes "[Tempestra]";
 		mes "..... How RUDE!!";
-		emotion 0;
+		emotion e_gasp;
 		close;
 }

npc/quests/quests_aldebaran.txt

@@ -40,7 +40,7 @@ aldeba_in.gat,152,166,4	script	Trader	86,{
 		delitem 733,1;//Items: Cracked deamond
 		set Zeny,Zeny - 3500;
 		mes "Hmm.... Do you have a.... MEDICAL LICENSE?!";
-		emotion 1;
+		emotion e_what;
 		next;
 		mes "[Trader]";
 		mes "I've heard about a well-known unlicensed physician 'Cuwaki'... I hope you don't get caught....";
@@ -54,7 +54,7 @@ aldeba_in.gat,152,166,4	script	Trader	86,{
 		delitem 916,300;//Items: Feather of Birds,
 		set Zeny,Zeny - 500;
 		mes "Umhahaha. You have good fashion sense.  I know you had a hard time collecting these items, but this bonnet is definately worth it.  Take it.";
-		emotion 18;
+		emotion e_heh;
 		getitem 5018,1;//Items: Feather Bonnet,
 		close;
 	M_2:
@@ -87,6 +87,6 @@ aldeba_in.gat,152,166,4	script	Trader	86,{
 
 	L_CantMake:
 		mes "You, fool! Check the requirements again..... you're not some kinda idiot are you? C'mon..... give me a break.";
-		emotion 6;
+		emotion e_an;
 		close;
 }

npc/quests/quests_geffen.txt

@@ -20,12 +20,12 @@
 geffen_in.gat,144,166,4	script	Blacksmith	63,{
 	mes "[Blacksmith]";
 	mes "Who am I?!........";
-	emotion 0;
+	emotion e_gasp;
 	next;
 	mes "[Blacksmith]";
 	mes "Iam the one and only Veteran Blacksmith here!! Haven't you heard???";
 	mes "I've been working for 30 years in this hot, bloody, Hellfire!";
-	emotion 21;
+	emotion e_no1;
 	next;
 	mes "[Blacksmith]";
 	mes "Since I became a Blacksmith, I invented something really incredible..... wanna hear about it?";
@@ -35,11 +35,11 @@ geffen_in.gat,144,166,4	script	Blacksmith	63,{
 		mes "[Blacksmith]";
 		mes "Blacksmiths are always welding metals under the HOTEST and must grueling conditions!";
 		mes "The tremendous heat from the metals is so intense that it almost feels as if your face is going to burn off....";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "[Blacksmith]";
 		mes "But with my great invention, Blacksmiths no longer have to fear their faces catching on fire! I call it the ^3355FF' Welding Mask'^000000!!";
-		emotion 5;
+		emotion e_ic;
 		next;
 		mes "[Blacksmith]";
 		mes "By wearing this over ones face, one will be fully protected from scorching heat and flying debirs.";
@@ -64,7 +64,7 @@ geffen_in.gat,144,166,4	script	Blacksmith	63,{
 
 			sL_NotEnuf:
 				mes "Listen here.... I said I needed ^4455FF'50 Steels'^000000 and ^4455FF2000 Zeny^000000 to make you a Welding Mask.";
-				emotion 4;
+				emotion e_swt;
 				close;
 
 		sM_No:
@@ -76,7 +76,7 @@ geffen_in.gat,144,166,4	script	Blacksmith	63,{
 	M_No:
 		mes "[Blacksmith]";
 		mes "Well then, stop wasting my time!";
-		emotion 32;
+		emotion e_pif;
 		close;
 }
 
@@ -87,7 +87,7 @@ geffen_in.gat,144,166,4	script	Blacksmith	63,{
 geffen_in.gat,30,71,4	script	Eric	83,{
 	mes "[Eric]";
 	mes "Please listen to the story of my blessed grand father...";
-	emotion 28;
+	emotion e_sob;
 	next;
 	menu "Listen.",-, "Ask about Items needed.",M_Ask, "Make.",M_Make, "End Conversation.",M_End;
 
@@ -132,11 +132,11 @@ geffen_in.gat,30,71,4	script	Eric	83,{
 		next;
 		mes "[Eric]";
 		mes "My only goal in life is to realize my grand fathers ideas and pay tribute to the man I hold so dear to my heart.......";
-		emotion 28;
+		emotion e_sob;
 		next;
 		mes "[Eric]";
 		mes "If only I had those materials.... Hmm... would you be iterested in this project? All I ask is that you gather the right items for me....";
-		emotion 20;
+		emotion e_hmm;
 		close;
 
 	M_Ask:
@@ -156,7 +156,7 @@ geffen_in.gat,30,71,4	script	Eric	83,{
 		delitem 970,1;
 		delitem 1003,1;
 		mes "Oh this is GREAT!! You have all of the materials I need to make my grandfather's Headset!";
-		emotion 5;
+		emotion e_ic;
 		next;
 		mes "[Eric]";
 		mes "Give me a few minutes to assemble it...............";
@@ -164,20 +164,20 @@ geffen_in.gat,30,71,4	script	Eric	83,{
 		getitem 5001,1;
 		mes "[Eric]";
 		mes "FINALLY!! It's complete! My grand father's Headset! Please take them... without your help this wouldn't have been possible.";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Eric]";
 		mes "Thank so very much! Because of you, I could fullfill my grand father's wish.  I just know he's smiling down on me from Heaven.....";
-		emotion 15;
+		emotion e_thx;
 		close;
 
 		L_NotEnuf:
 			mes "Thank you for trying to help me but..... you don't seem to have all of the items I need.....";
-			emotion 4;
+			emotion e_swt;
 			close;
 	M_End:
 		mes "[Eric]";
 		mes "Farewell..... boo hoo....";
-		emotion 28;
+		emotion e_sob;
 		close;
 }

npc/quests/quests_lighthalzen.txt

@@ -1140,7 +1140,7 @@ L_4:
 L4_1:
 	mes "There is a small card inside of it.";
 	next;
-	mes "You acquired the 'Laboratory Passport'.";
+	mes "You acquired the 'Laboratory Permit'.";
 	set @gotkey,1;
 	getitem 2657,1;
 	close;
@@ -1186,12 +1186,12 @@ L_3:
 	next;
 	input @answer$;
 
-	if (@answer$ == "Laboratory Passport" || @answer$ == "laboratory passport" || @answer$ == "passport") goto L_4;
+	if (@answer$ == "Laboratory Permit" || @answer$ == "permit") goto L_4;
 	mes "Nothing happened.";
 	close;
 
 L_4:
-	mes "You inserted the 'Laboratory Passport' in the hole,";
+	mes "You inserted the 'Laboratory Keycard' in the hole,";
 	mes "and the stair leading down appeared on the floor.";
 	next;
 	menu "Go down.",L4_1,"Do not go down.",-;

npc/quests/quests_morocc.txt

@@ -52,7 +52,7 @@ morocc_in.gat,142,100,4	script	William	89,{
 			mes "[William]";
 			mes "Here you are! A hand made, one of a kind, ^3355FF'Stop Post '^000000! Thank you for your patronage!";
 			getitem 2272,1;
-			emotion 15;
+			emotion e_thx;
 			close;
 
 	M_End:
@@ -79,7 +79,7 @@ morocc_in.gat,76,163,4	script	Alchemist	64,{
 		next;
 		mes "[Marius]";
 		mes "............... What's this? You don't seem interested in what I have to say?? I don't think you realize what I'm talking about!";
-		emotion 20;
+		emotion e_hmm;
 		next;
 		mes "[Marius]";
 		mes "For us to make you a ^3355FF'Binoculars'^000000, we will need:";
@@ -112,12 +112,12 @@ morocc_in.gat,76,163,4	script	Alchemist	64,{
 		sL_NotEnuf:
 			mes "Argggghhhhhhh !! You didn't bring enough items!! You need:";
 			mes "^3355FF1 pair of Geek Glasses, 50,000 Zeny and 100 Steel^000000.";
-			emotion 6;
+			emotion e_an;
 			close;
 
 	M_End:
 		mes "[Marius]";
 		mes "Hey you! You DARE IGNORE ME!! I am MARIUS the alchemist of ALCHEMISTS!!!!!";
-		emotion 23;
+		emotion e_omg;
 		close;
 }

npc/quests/quests_payon.txt

@@ -36,7 +36,7 @@ payon.gat,154,170,4	script	Granny	78,{
 	mes "[Granny]";
 	mes "What was I saying before? Oh yes! I need some special cloth to make clothes for my family.";
 	mes "If you happen to come across some ^5555FF'Skirt of Virgin'^000000, please let me know.";
-	emotion 20;
+	emotion e_hmm;
 	next;
 	mes "[Granny]";
 	mes "I need ^5555FF'4 Skirt of Virgin'^000000 to make the clothes.  I will be very greatfull if you could bring me some.";
@@ -50,7 +50,7 @@ L_Get:
 		if(countitem(1049) < 4) goto M_No;
 		mes "[Granny]";
 		mes "Bless your kind heart.  Now I can make some special clothes for my family.  Let me give you a reward for being so genrous dear.";
-		emotion 14;
+		emotion e_lv2;
 		next;
 		getitem 2293,1;
 		delitem 1049,4;
@@ -65,7 +65,7 @@ L_Get:
 	M_No:
 		mes "[Granny]";
 		mes "Well I never!!! Kids these days just have no respect or compasion for their elders!";
-		emotion 32;
+		emotion e_pif;
 		close;
 
 }
@@ -135,7 +135,7 @@ payon_in02.gat,25,71,4	script	Young Man	86,{
 	mes "[Young Man]";
 	if(countitem(701) >= 5) goto L_GotOra;
 	mes "Blahhhhhh! I... I... I JUST CAN'T take it anymore!! You little stinky, filthy, BASTARDS!!!";
-	emotion 6;
+	emotion e_an;
 	next;
 	menu "Continue.",M_Cont, "End Conversation.",M_End;
 	
@@ -152,7 +152,7 @@ payon_in02.gat,25,71,4	script	Young Man	86,{
 		next;
 		mes "[Young Man]";
 		mes "Jeez was that a mistake...... The house turned out to be a HAVEN for THIEF BUGS!!!";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "[Young Man]";
 		mes "I tried EVERYTHING to get rid of them! I sprayed them, I smashed them, I lured them out with food.........";
@@ -160,7 +160,7 @@ payon_in02.gat,25,71,4	script	Young Man	86,{
 		next;
 		mes "[Young Man]";
 		mes "Grrr! What will it take to get rid of these vile creatures???";
-		emotion 32;
+		emotion e_pif;
 		next;
 		mes "[Young Man]";
 		mes "I've heard there is something called ^3355FF'Ora Ora'^000000, that people in other countries use to fight bugs.....";
@@ -174,12 +174,12 @@ payon_in02.gat,25,71,4	script	Young Man	86,{
 	M_End:
 		mes "[Young Man]";
 		mes "I'm just so tired of fighting this never ending battle against these bugs...... those dirty scumbags!!";
-		emotion 32;
+		emotion e_pif;
 		close;
 
 L_GotOra:
 		mes "ArrrGgghhh!! No!... It can't be!..... I think I'm going mad... they're starting to look so cute... ArrrGgghhh!!... Nooooooo!!";
-		emotion 23;
+		emotion e_omg;
 	M_Menu:
 		next;
 		menu "Continue",M_Cont, "Show Ora Ora",-, "Give Ora Ora",M_Give, "Cancel",M_End2;
@@ -194,11 +194,11 @@ L_GotOra:
 		delitem 701,5;
 		mes "[Young Man]";
 		mes "Muhahahahah!!! Finally, I have it.... Ora Ora! Stupid and distgusting Thief Bugs.... you'll pay for invading MY HOME!!!";
-		emotion 29;
+		emotion e_gg;
 		next;
 		mes "[Young Man]";
 		mes "..... Eh em... sorry.  I was a little outa control there.... Ah, let me give you my valuable treasure......";	
-		emotion 4;
+		emotion e_swt;
 		next;
 		getitem 5004,1;
 		mes "[Young Man]";
@@ -216,7 +216,7 @@ L_GotOra:
 	M_End2:
 		mes "[Young Man]";
 		mes "What if I CAN'T get rid of these thief bugs???... I guess the only other thing I could do is fall in love with them...... heh... heh... heh....";
-		emotion 4;
+		emotion e_swt;
 		close;
 
 }

npc/quests/quests_prontera.txt

@@ -80,7 +80,7 @@ L_Start:
 		delitem 708,1;//Items: Ment,
 		mes "[Teacher]";
 		mes "I really, really appreciate what you've done for me!! I trully am grateful! I will give you a very special item as I promised.";
-		emotion 15;
+		emotion e_thx;
 		next;
 		mes "[Teacher]";
 		mes "This is the hat I wore at my Graduation Ceremony.  It is a reminder of my joyfull school days at the University.";

npc/quests/quests_umbala.txt

@@ -162,7 +162,7 @@ M_DONE:
 	close;
 
 L_AGAIN:
-	emotion 15;
+	emotion e_thx;
 	mes "Yay, I found her! Thank you very much for you help!";
 	close;
 
@@ -182,7 +182,7 @@ aldebaran.gat,153,212,1	script	Mojo	740,{
 	if(umb_lang==1) set umb_mojo,1;
 	close;
 L_NOT_GOT_QUEST:
-	emotion 1;
+	emotion e_what;
 	mes "I lost my teacher's book!  What am I going to do...";
 	close;
 }
@@ -198,14 +198,14 @@ amatsu.gat,267,189,4	script	Marie	744,{
 
 	mes "[Marie]";
 	mes "What does he want from me?";
-	emotion 1;
+	emotion e_what;
 	next;
 	mes "[Marie]";
 	mes "Oh wait, I see... he wants his reference scroll back am I right? Well, I'm kinda still using it buuut... I'll give it back if you can gimme a poring egg and an incubator. Those things are so cute!";
 	close;
 
 L_NOT_GOT_QUEST:
-	emotion 1;
+	emotion e_what;
 	mes "Hi! What do you want from me?";
 	close;
 
@@ -232,7 +232,7 @@ M_DOH:
 	close;
 
 L_AGAIN:
-	emotion 15;
+	emotion e_thx;
 	mes "Yay! I love Porings!";
 	close;
 }
@@ -248,7 +248,7 @@ L_QUEST:
 	delitem 1006,1;	//Items: Old Magic Book,
 	delitem 7118,1;	//Items: Torn Scroll,
 	delitem 7117,1;//Items: Torn Spell Book,
-	emotion 15;
+	emotion e_thx;
 	mes "Ah, you've done well in retrieving my references. These artifacts holds information about ruins around the world, from the burning hell of the Magma Dungeon, to the strange eerie Hidden Forest of Yggsadril.";
 	next;
 	mes "[Fabius]";

npc/quests/skills/acolyte_skills.txt

@@ -104,7 +104,7 @@ L_Check:
 	set HOLYLIGHT, 0;
 	mes "[Priest]";
 	mes "You have done well.  May God bless you!";
-	emotion 21;
+	emotion e_no1;
 	close;
 
 	L_LowLvl:

npc/quests/skills/archer_skills.txt

@@ -30,7 +30,7 @@ L_Other:
 	mes "Eh?... First time seeing an archer of something? Why don't you just";
 	mes "go about your business and leave me be.  I only talk to high level";
 	mes "Archer types........";
-	emotion 1;
+	emotion e_what;
 	close;
 L_Start:
 	if (BaseJob==Job_Archer && JobLevel<35) goto L_LowLvl;
@@ -74,17 +74,17 @@ L_Start:
 		mes "13 Trunks,";
 		mes "1 Red potion^000000";
 		set ARWCRFT, 1;
-		emotion 5;
+		emotion e_ic;
 		close;
 	M_1:
 		mes "[Roberto]";
 		mes "................................................................";
-		emotion 7;
+		emotion e_ag;
 		next;
 		mes "[Roberto]";
 		mes "Let me teach you this special skill.... It's called, my boot up";
 		mes "your A........";
-		emotion 32;
+		emotion e_pif;
 		next;
 		mes "!!!!SMACK!!!!";
 		percentheal -5,0;
@@ -134,7 +134,7 @@ L_GotSkill:
 L_LowLvl:
 	mes "Hmm?... Do you have something to say to me? Unfortunately I have";
 	mes "nothing to say to you.....";
-	emotion 1;
+	emotion e_what;
 	next;
 	mes "[Roberto]";
 	mes "It's sad but conversations with people who have ^5533FFlow job levels^000000 such";

npc/quests/skills/blacksmith_skills.txt

@@ -51,7 +51,7 @@ L_nosmith:
 	mes "Geffen is such a great town.";
 	mes "Don't you think so too?";
 	next;
-	emotion 23;
+	emotion e_omg;
 	mes "[Goodday]";
 	mes "WHAT...";
 	mes "You don't!";	

npc/quests/skills/crusader_skills.txt

@@ -61,7 +61,7 @@ geffen.gat,110,118,3	script	Ford	752,{
 	mes "Time to roll my lucky dice.";
 	mes "Good luck, I almost never lose.";
 //TODO: add DICE emotions? 8)
-	emotion 29;
+	emotion e_gg;
 	next;
 	if(rand(1,6)!=3) goto L_lose;
 	emotion 58;
@@ -71,7 +71,7 @@ geffen.gat,110,118,3	script	Ford	752,{
 	mes "[Ford]";
 	mes "I can't believe I lost!";
 	mes "I NEVER lose...";
-	emotion 28;
+	emotion e_sob;
 	close;
 	
 L_noitems:

npc/quests/skills/mage_skills.txt

@@ -24,7 +24,7 @@ geffen_in.gat,151,119,4	script	BLIZZARDRISS	71,{
 
 L_Other:
 	mes "What new magic spells will I discover today......??";
-	emotion 20;
+	emotion e_hmm;
 	close;
 
 L_Start:
@@ -70,7 +70,7 @@ L_Start:
 		sM_End:
 			mes "[BLIZZARDRISS]";
 			mes "Hmf! Suit yourself.  Don't come complaining to me when get beat up by a bunch of spores!!";
-			emotion 6;
+			emotion e_an;
 			close;
 
 	M_End:
@@ -93,12 +93,12 @@ L_GetSkill:
 	set ENRGYCOAT,0;
  	mes "[BLIZZARDRISS]";
  	mes "You can now use the spell, 'Energy Coat'!! Use it wisely my friend!";
-	emotion 21;
+	emotion e_no1;
  	close;
 
 	L_JobLvl:
 		mes "Didn't you listen to my explanation? You need a job level of at least 35 to learn 'Energy Coat'.";
-		emotion 1;
+		emotion e_what;
 		close;
 
 	L_Items:
@@ -107,7 +107,7 @@ L_GetSkill:
 		mes " 1 One Carat Diamond,";
 		mes " 5 Shells,^000000";
 		mes " and ^5533FF1 Solid shell^000000.";
-		emotion 1;
+		emotion e_what;
 		close;
 
 L_GotSkill:

npc/quests/skills/merchant_skills.txt

@@ -41,7 +41,7 @@ L_Start:
 	if (CRAZYROAR == 1) goto L_GetSkill;
 	mes "Oh! Did you come here because you were intrigued by my boisterous voice? My voice is quite loud, isn't it?";
 	mes "Afterall you did hear it from a far off distance.";
-	emotion 1;
+	emotion e_what;
 	next;
 	mes "[Necko]";
 	mes "I'll let you in on something....... My voice is more than just loud..... it's actually quite unique......";
@@ -49,7 +49,7 @@ L_Start:
 	mes "[Necko]";
 	if(BaseJob==Job_Merchant && JobLevel < 15) goto L_JobLvl;
 	mes "You see, I know a skill that lets me shout in a way that actually helps me.... It is the ^3355FFCrazy Uproar^000000 skill!!!";
-	emotion 5;
+	emotion e_ic;
 	next;
 	mes "[Necko]";
 	mes "Crazy Uproar uses your loud voice to boost your battle spirit!";
@@ -101,7 +101,7 @@ L_GetSkill:
 	mes "Raaaaaawwwwrrrrrrrrrrr!....... Ha ha!! Execellent.  Your voice is now finely tuned for ^3355FFCrazy Uproar^000000.  Good job.";
 	skill 155,1,0;
 	set CRAZYROAR, 0;
-	emotion 21;
+	emotion e_no1;
 	close;
 
 	L_Items:
@@ -192,7 +192,7 @@ L_Start:
 	if (CARTREVO == 1) goto L_GetSkill;
 	mes "[Gershaun]";
 	mes "Hmm... a young merchant.  You must use carts too right? Since to have to do all of that vending.....  But is that all you use your cart for?";
-	emotion 20;
+	emotion e_hmm;
 	next;
 	mes "[Gershaun]";
 	mes "I researched some ways of using the cart differently.  One way involved cooking ramen and another involved jump-roping (don't ask).";
@@ -203,7 +203,7 @@ L_Start:
 	M_0:
 		mes "[Gershuan]";
 		mes "You KNOW what I MEAN!! HOW the HECK would YOU KNOW what I MEAN????";
-		emotion 23;
+		emotion e_omg;
 		close;
 	M_1:
 		mes "[Gershuan]";
@@ -212,15 +212,15 @@ L_Start:
 		mes "[Gershuan]";
 		mes "Then I crossed paths with a very strong monster! I knew immediately that my life was in danger!";
 		mes "I thought to myself, 'Why me! A weaponless, amorless merchant!?'";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Gershuan]";
 		mes "I was scared to death... hoping that this would not be the end of me.  With what strength I had left, I tried a desperation move.....";
-		emotion 19;
+		emotion e_swt2;
 		next;
 		mes "[Gershuan]";
 		mes "I used my cart to attack the monster!!";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Gershuan]";
 		mes "Just like that the monster was defeated!! Finally I had found another exellent use for the cart! A WEAPON!!!";
@@ -228,7 +228,7 @@ L_Start:
 		mes "[Gershuan]";
 		mes "I called my new found discovery ^3355FF'Cart Revolution'^000000!";
 		mes "By using ^FF553312 sp^000000 you can spin your cart around your body doing major damage to an enemy!";
-		emotion 5;
+		emotion e_ic;
 		next;
 		mes "[Gershuan]";
 		mes "The heavier your cart is, the more damage it will do.  Would you like to learn this skill?";
@@ -259,7 +259,7 @@ L_Start:
 		sM_1:
 			mes "[Sushi King Gershuan]";
 			mes "Stupid!! You're waaay to young to even try your hand at sushi!!";
-			emotion 6;
+			emotion e_an;
 			close;
 
 L_GetSkill:
@@ -280,20 +280,20 @@ L_GetSkill:
 	next;
 	mes "[Gershuan]";
 	mes "Eh....... that was terrible.... Okay, lets try again.....";
-	emotion 4;
+	emotion e_swt;
 	next;
 	mes "~many hours later~";
 	next;
 	mes "[Gershuan]";
 	mes "YES!!! FINALLY! I could REALLY FEEL the power in that swing!";
 	mes "Give yourself a good pat on the back becuase you have just mastered Cart Revolution!";
-	emotion 21;
+	emotion e_no1;
 	next;
 	skill 153,1,0;
 	set CARTREVO, 0;
 	mes "[Gershuan]";
 	mes "Take care of yourself and remember to fill that cart up so that it can do some major damage.";
-	emotion 29;
+	emotion e_gg;
 	close;
 
 L_GotSkill:

npc/quests/skills/novice_skills.txt

@@ -46,7 +46,7 @@ prt_in.gat,235,133,4	script	Nurse Aid	90,{
 		next;
 		mes "[Nurse Aid]";
 		mes "That's why I've decided to teach people how to heal themselves!  Would you like me to teach you?";
-		emotion 5;
+		emotion e_ic;
 		next;
 		menu "Would you??",sM_Yes, "(...she's nuts!...run!!!)",sM_No;
 
@@ -66,7 +66,7 @@ prt_in.gat,235,133,4	script	Nurse Aid	90,{
 		sM_No:
 			mes "[Nurse Aid]";
 			mes "Hey!...Where are you running too??...";
-			emotion 4;
+			emotion e_swt;
 			close;
 
 L_GetAid:
@@ -83,7 +83,7 @@ L_GetAid:
 	set got_bandage,0;
 	mes "[Nurse Aid]";
 	mes "YES! You finally got it.  Now you can heal yourself and continue fighting those bad monsters.  Well, take care.";
-	emotion 21;
+	emotion e_no1;
 	close;
 
 L_GotAid:
@@ -100,11 +100,11 @@ prt_in.gat,73,87,2	script	Bulma	98,{
 
 L_Other:
 	mes "Yeah... I look great.... Afterall, I'm a Knight of the Prontera Chivalry.  Kuhahahaha!";
-	emotion 18;
+	emotion e_heh;
 	next;
 	mes "[Bulma]";
 	mes "It hasn't been that long since I became a Knight, but I still look good as one right? What do you think???";
-	emotion 20;
+	emotion e_hmm;
 	close;
 
 L_Novice:
@@ -129,7 +129,7 @@ L_Start:
 	next;
 	mes "[Bulma]";
 	mes "Hmm..... actually I might be able to help you out........";
-	emotion 20;
+	emotion e_hmm;
 	next;
 	mes "[Bulma]";
 	mes "What's this? Ha ha, don't look so surprised.  What I have to offer will be very useful to you.";
@@ -163,11 +163,11 @@ L_Start:
 	next;
 	mes "[Bulma]";
 	mes "Kekekeke..... Just kidding!  The pill actually helps you stay calm, nothing more.";
-	emotion 18;
+	emotion e_heh;
 	next;
 	mes "[Bulma]";
 	mes "Well get going... GO! GO! GO! RUN!!!";
-	emotion 27;
+	emotion e_go;
 	set PLAYDEAD, 1;
 	close;
 
@@ -194,11 +194,11 @@ L_GetSkill:
 	mes "[Bulma]";
 	mes "Ok, lights, camera, ACTION! Yes... yes... YES!! That's it!! As I watch you laying there I TRULLY believe that you are dead.";
 	mes "What a wonderful performance! BRAVO! BRAVO!";
-	emotion 0;
+	emotion e_gasp;
 	next;
 	mes "[Bulma]";
 	mes "With the right motivation and focus you will be able to play dead anywhere at any given moment.  Congratulations on mastering this skill.";
-	emotion 21;
+	emotion e_no1;
 	skill 143,1,0;
 	set PLAYDEAD, 0;
 	set got_novnametag,0;
@@ -206,11 +206,11 @@ L_GetSkill:
 
 	sL_NotRdy:
 		mes "HEY! What are you doing here?  It's irresponsible of you to still be here while your time is running out.........";
-		emotion 0;
+		emotion e_gasp;
 		next;
 		mes "[Bulma]";
 		mes "Now GO! Run! Run! RUN!!";
-		emotion 27;
+		emotion e_go;
 		close;
 
 L_GotSkill:
@@ -230,7 +230,7 @@ prt_castle.gat,174,147,2	script	Newbie Assistant	84,{
 
 L_NonNov:
 	mes "What am I doing here?  I'm just trying to help out young newbies.  You remember how it was to be a newbie... confused.... lost.... heh heh.";
-	emotion 1;
+	emotion e_what;
 	close;
 L_Start:
 	if(FIRSTAID==1 && countitem(930)==0 && got_bandage!=1) goto L_Aid;
@@ -250,7 +250,7 @@ L_Aid:
 	next;
 	mes "[Newbie Assistant]";
 	mes "Her beauty, her grace, sometimes I wish........ (blushes).......... um.... well...err... tell her I said hello.";
-	emotion 3;
+	emotion e_lv;
 	close;
 L_Play:
 	mes "So Bulma sent you uh.... okay here you go.";

npc/quests/skills/swordman_skills.txt

@@ -31,7 +31,7 @@ prt_in.gat,75,88,5	script	Leon	85,{
 	next;
 	mes "[Leon]";
 	mes "Are you here to learn more about the Chivalry, or are you hear to bask in the glory of us Knights? Hahahaha!";
-	emotion 18;
+	emotion e_heh;
 	close;
 
 L_Novice:
@@ -52,7 +52,7 @@ L_Start:
 	next;
 	mes "[Leon]";
 	mes "You must enjoy using ^0000ff'Bash'^000000, huh? Hahaha!";
-	emotion 18;
+	emotion e_heh;
 	next;
 	mes "[Leon]";
 	if(sex==1)mes "I like a Swordsman who isn't afraid to use a powerfull skill such as that.";
@@ -109,7 +109,7 @@ L_Start:
 		next;
 		mes "[*Sushi King* Leon]";
 		mes "Mmmmm..... I love sushi!!!";
-		emotion 33;
+		emotion e_ok;
 		close;
 
 L_Check:
@@ -134,7 +134,7 @@ L_Check:
 	next;
 	mes "[Leon]";
 	mes "Yes! That's it! You have just mastered Fatal Blow!";
-	emotion 21;
+	emotion e_no1;
 	next;
 	skill 145,1,0;
 	set FATALBLOW,0;
@@ -155,7 +155,7 @@ L_Done:
 	next;
 	mes "[Leon]";
 	mes "Go on and Bash the heck out of those monsters! Hahaha.";
-	emotion 18;
+	emotion e_heh;
 	close;
 
 }
@@ -175,7 +175,7 @@ L_Start:
 	if (getskilllv(144)>0) goto L_GotSkill;
 	mes "Oh no! You must have been hurt in battle! Are you ok?";
 	mes "It must have been a hard fought battle for you to recieve such serious injuries....";
-	emotion 19;
+	emotion e_swt2;
 	next;
 	mes "[Knight De Thomas]";
 	mes "Being a Swordsman or Knight comes with a lot of responsiblity and requires a great deal of self sacrifice.";
@@ -208,17 +208,17 @@ L_Start:
 		mes "[Knight De Thomas]";
 		mes "Don't you think it's sad that I have to stay in once place everyday without even being able to go outside??";
 		mes "Please.... find a pair of Moth Wings for my niece?.... (~sniff~sniff~)....";
-		emotion 28;
+		emotion e_sob;
 		next;
 		mes "[Knight De Thomas]";
 		mes "If you don't..... I won't teach you anything!! Muahahahaha!!";
-		emotion 29;
+		emotion e_gg;
 		set MOVHPREC, 1;
 		close;
 	M_End:
 		mes "[Knight De Thomas]";
 		mes "What?? What did you say?.....";
-		emotion 1;
+		emotion e_what;
 		close;
 
 L_Check:
@@ -243,7 +243,7 @@ L_Check:
 	next;
 	mes "[Knight De Thomas]";
 	mes "Congratulations on learning the new skill and thank you for the Moth Wings! ^_^";
-	emotion 21;
+	emotion e_no1;
 	close;
 
 	L_NoItems:
@@ -273,7 +273,7 @@ L_Other:
 	next;
 	mes "[Juan]";
 	mes "Who am I? Oh, I'm just a kind knight named Juan.  Don't mind me.  Hahahaha....";
-	emotion 18;
+	emotion e_heh;
 	close;
 
 L_Start:
@@ -320,7 +320,7 @@ L_Start:
 	M_1:
 		mes "[Juan]";
 		mes "Bleh! Have you been a fool all of your life?? Go away and don't talk to me.";
-		emotion 32;
+		emotion e_pif;
 		close;
 	M_3:
 		mes "[Juan]";
@@ -334,7 +334,7 @@ L_Start:
 		next;
 		mes "[Juan]";
 		mes "You can go on your way now.";
-		emotion 33;
+		emotion e_ok;
 		close;
 
 L_Check:
@@ -353,7 +353,7 @@ L_Check:
 	next;
 	mes "[Juan]";
 	mes "Muhahahaha!! Don't hold back young warrior, fight without any fears or regrets!!";
-	emotion 29;
+	emotion e_gg;
 	close;
 
 	L_NoItems:
@@ -368,6 +368,6 @@ L_GotSkill:
 
 	mes "You have the eyes of a person who has seen death first hand!!";
 	mes "But, because of Berserk, I'm sure you have been able to escape it many times as well.";
-	emotion 0;
+	emotion e_gasp;
 	close;
 }

npc/quests/skills/thief_skills.txt

@@ -187,18 +187,18 @@ L_Sand:
 	next;
 	mes "[Alcouskou]";
 	mes "THROW IT AT ME!!!";
-	emotion 27;
+	emotion e_go;
 	next;
 	mes "[Alcouskou]";
 	mes "(AHHH!! My EYES!!! Son of a)......... ya see how effective that was........ (JEEZE that STINGS!!).......";
-	emotion 23;
+	emotion e_omg;
 	next;
 	mes "[Alcouskou]";
 	mes "Anyways that's all there is too it....... (CRAP that's a lot of sand!!).... So yeah, Sand Attack, use it as a last resort...... (AWW MAN!!)";
 	next;
 	mes "[Alcouskou]";
 	mes "Oh and it does Earth Property damage....... (I gota finda better way to teach this).........";
-	emotion 4;
+	emotion e_swt;
 	skill 149,1,0;
 	set SANDATTACK, 0;
 	set BAGNFNTY, 0;
@@ -216,7 +216,7 @@ L_Sand:
 		close;
 	L_GotSand:
 		mes "Oh your back... hopefully not to throw anymore sand in my eyes, heh heh.... heh........ heh..............";
-		emotion 4;
+		emotion e_swt;
 		close;
 
 L_Back:
@@ -271,7 +271,7 @@ L_Find:
 	next;
 	mes "[Alcouskou]";
 	mes "Very good.  You have chosen some fine stones.  This tells me that you have now perfected the Find Stone skill.";
-	emotion 21;
+	emotion e_no1;
 	skill 151,1,0;
 	set FINDSTONE, 0;
 	next;
@@ -306,13 +306,13 @@ L_Fling:
 	next;
 	mes "[Alcouskou]";
 	mes "Open your eyes! SEE THE TARGET!! Throw the stone at the target as if you were hurrling yourself towards it! DO IT NOW!!";
-	emotion 27;
+	emotion e_go;
 	next;
 	mes "!!Whooooossshh!!................. !!Thwack!!";
 	next;
 	mes "[Alcouskou]";
 	mes "Haha! Excellent! It's a bullseye.  You have now masterd Stone Fling, congratulations.";
-	emotion 21;
+	emotion e_no1;
 	skill 152,1,0;
 	set STONEFLING, 0;
 	next;