6 files changed, 9 insertions, 22 deletions
diff --git a/world/map/npc/001-1/entertainer.txt b/world/map/npc/001-1/entertainer.txt
index b57b97f8..5fe8cbc3 100644
--- a/world/map/npc/001-1/entertainer.txt
+++ b/world/map/npc/001-1/entertainer.txt
@@ -38,10 +38,9 @@ L_Close:
     close;
 
 OnTimer3000:
-    emotion rand(0,11);
+    emotion rand(EMOTE_DISGUST, EMOTE_PERTURBED);
     setnpctimer 0;
 
 OnInit:
     initnpctimer;
-
 }
diff --git a/world/map/npc/001-1/sarah.txt b/world/map/npc/001-1/sarah.txt
index 57793ec9..8a84df47 100644
--- a/world/map/npc/001-1/sarah.txt
+++ b/world/map/npc/001-1/sarah.txt
@@ -60,7 +60,7 @@ L_Progress:
     mes "\"Whee!\"";
     next;
     mes "You brought me Cherry Cake!  Here is your new hat, as promised.\"";
-    emotion 9;
+    emotion EMOTE_TONGUE;
     getinventorylist;
     if ((@inventorylist_count - (countitem("CherryCake") == 1)) > 99) goto L_TooMany;
     delitem "CherryCake", 1;
@@ -76,7 +76,7 @@ L_NotEnough:
 L_Done:
     mes "[Sarah]";
     mes "\"It was so tasty, I can't eat anything more...  Thank you!\"";
-    emotion 9;
+    emotion EMOTE_TONGUE;
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/007-1/voltain.txt b/world/map/npc/007-1/voltain.txt
index 380326b2..ba2418ff 100644
--- a/world/map/npc/007-1/voltain.txt
+++ b/world/map/npc/007-1/voltain.txt
@@ -328,7 +328,7 @@ state13:
     set zeny, zeny + @CHOCOLATECAKE_REWARD_GOLD;    
     set $state, 0;
     mes "\"I love chocolate cakes. I wonder, if I can use my ven- \"";
-    emotion 5;
+    emotion EMOTE_EVIL;
     close;
 
 L_NOHELP:
diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt
index 8a6dbdb2..1fa60134 100644
--- a/world/map/npc/021-2/bakery.txt
+++ b/world/map/npc/021-2/bakery.txt
@@ -27,7 +27,7 @@ L_Begin:
 	mes "\"Would you mind bringing me 6 acorns please? I need them to make flour for the chocolate cakes. I will be so delicious!\"";
 	next;
 	mes "\"Um, I mean, the cakes will be delicious...\"";
-	emotion 8;
+	emotion EMOTE_BLUSH;
 	next;
 
 	set @dq_level, 15;
diff --git a/world/map/npc/031-2/cindyHouse.txt b/world/map/npc/031-2/cindyHouse.txt
index d92da10b..79b8704c 100644
--- a/world/map/npc/031-2/cindyHouse.txt
+++ b/world/map/npc/031-2/cindyHouse.txt
@@ -31,7 +31,8 @@ L_Happy_Random:
     "Did you ever meet Santa? He's very kind! He always gives me some candy when we go to see him.",
     strcharinfo(0) + ", you are sooo strong! Amazing! But my dad is strong too!";
     set @random, rand(9);
-    if (@random != 5) emotion 3;
+    if (@random != 5)
+        emotion EMOTE_HAPPY;
     set @quote$, "\"" + @quote_Cindy$[@random] + "\"";
     mes "[Cindy]";
     mes @quote$;
@@ -49,16 +50,3 @@ S_Update_Mask:
                 | (@rescue_Cindy << @Q_Nivalis_state_SHIFT);
         return;
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt
index 45f6e027..dd4b57ac 100644
--- a/world/map/npc/042-2/tanisha.txt
+++ b/world/map/npc/042-2/tanisha.txt
@@ -15,7 +15,7 @@
 
     mes "[Tanisha]";
     mes "\"Hey! You're up again!\"";
-    emotion 3;
+    emotion EMOTE_HAPPY;
     next;
     mes "\"Are you feeling better?\"";
     next;
@@ -111,7 +111,7 @@ L_Advice:
     next;
     mes "\"When you go to Tulimshar, you should see Bernard. He can make a delicious soup!";
     mes "Good luck!\"";
-    emotion 3;
+    emotion EMOTE_HAPPY;
     if (tanisha == 3)
         set tanisha, 4;
     close;