Applied patch from Dani to change NPC emotion events to use the updated emotion command. (bugreport:4318)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14347 54d463be-8e91-2dee-dedb-b68131a5f0ec

14 files changed, 136 insertions, 380 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 79675ed8a..eea18fb3e 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
 Date		Added
 ======
+2010/06/18
+	* Rev. 14347 Applied patch from Dani to change NPC emotion events to use the updated emotion command. (bugreport:4318) [L0ne_W0lf]
 2010/06/11
 	* Rev. 14340 Disabled the Peco Peco repeatable quest, see comment in conf as to why. [L0ne_W0lf]
 	* Rev. 14339 Implemented repeatable EXP quests (with kill count and item gathering options) removed iRO_Exp.txt. [L0ne_W0lf]
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index a80fb4adc..5ad12b4ab 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -1237,7 +1237,7 @@ prt_in,173,13,4	script	Customer#SoloHan	86,{
 		next;
 		mes "[Bachewcca]";
 		mes "...!";
-		donpcevent "Customer#Bachewcca::OnEmote";
+		emotion e_no1,0,"Customer#Bachewcca";
 		next;
 		mes "[SoloHan]";
 		mes "It's doesn't really matter whether you're married";
@@ -1390,15 +1390,13 @@ prt_in,170,14,0	script	Customer#Bachewcca	89,{
 	mes "..............";
 	mes "^666666*Gulp....gulp...*^000000";
 	mes "Grrrrr!! That hit the spot!";
-	Emotion e_sob;
+	emotion e_sob;
 	close;
 
-OnEmote:
-	emotion e_no1;
-	end;
 OnEffect1:
 	specialeffect 296; //EF_TALK_SCREAM
 	end;
+
 OnEffect2:
 	specialeffect 291; //EF_THROWITEM
 	end;
diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt
index a6da88fd0..72c946509 100644
--- a/npc/cities/umbala.txt
+++ b/npc/cities/umbala.txt
@@ -27,13 +27,6 @@
 comodo,170,137,7	script	La Ed#um	84,{
 	end;
 
-OnEmoteHmm:
-	emotion e_hmm;
-	end;
-
-OnEmoteGG:
-	emotion e_gg;
-	end;
 }
 
 comodo,171,137,1	script	Haith#um	92,{
@@ -61,7 +54,7 @@ comodo,171,137,1	script	Haith#um	92,{
 	mes "would tell us about such a";
 	mes "great treasure so easily?";
 	emotion e_hmm;
-	donpcevent "La Ed#um::OnEmoteHmm";
+	emotion e_hmm,0,"La Ed#um";
 	next;
 	select("Hm? What treasure?");
 	mes "[La Ed]";
@@ -82,7 +75,7 @@ comodo,171,137,1	script	Haith#um	92,{
 	mes "[La Ed, Haith]";
 	mes "If you pay us 1,000 zeny, we will tell you!";
 	emotion e_gg;
-	donpcevent "La Ed#um::OnEmoteGG";
+	emotion e_gg,0,"La Ed#um";
 	next;
 	if (select("Pay 1,000 zeny:Refuse to pay") == 1) {
 		if (Zeny > 999) {
diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt
index a5c5b9d6e..b1ab97450 100644
--- a/npc/other/marriage.txt
+++ b/npc/other/marriage.txt
@@ -389,39 +389,39 @@ prt_church,97,100,4	script	Wedding Staff#w	71,{
 		mes "^CC9933You have to refine";
 		mes "items on your own to";
 		mes "make great equipment!^000000";
-		donpcevent "Single Army#Prontera::OnEmote";
+		emotion e_rock,0,"Single Army#Prontera";
 		next;
 		mes "[Single Army]";
 		mes "^330099It's a waste to";
 		mes "form parties in";
 		mes "dungeons! I can";
 		mes "make it on my own!^000000";
-		donpcevent "Single Army#Geffen::OnEmote";
+		emotion e_rock,0,"Single Army#Geffen";
 		next;
 		mes "[Single Army]";
 		mes "^666666Hell, I've trained";
 		mes "all by myself since";
 		mes "birth, all the way";
 		mes "to my job change!^000000";
-		donpcevent "Single Army#Morocc::OnEmote";
+		emotion e_rock,0,"Single Army#Morocc";
 		next;
 		mes "[Single Army]";
 		mes "^666600I CHOOSE to spend";
 		mes "Christmas alone...";
 		mes "playing Solitaire and";
 		mes "doing crossword puzzles!^000000";
-		donpcevent "Single Army#Payon::OnEmote";
+		emotion e_rock,0,"Single Army#Payon";
 		next;
 		mes "[Single Army]";
 		mes "^CC9966Women may break my";
 		mes "spirit, but they'll never";
 		mes "take... my FREEDOM!^000000";
-		donpcevent "Single Army#Amatsu::OnEmote";
+		emotion e_rock,0,"Single Army#Amatsu";
 		next;
 		mes "[Single Army]";
 		mes "^669900...We're the free! We're";
 		mes "the Invincible Single Army!^000000";
-		donpcevent "Single Army#Gonryun::OnEmote";
+		emotion e_rock,0,"Single Army#Gonryun";
 		close2;
 		cutin "wedding_marry01",255;
 		Emotion e_swt;
@@ -456,11 +456,7 @@ OnInit:
 
 OnEnable:
 	hideoffnpc "Single Army#Prontera";
-	Emotion e_go;
-	end;
-
-OnEmote:
-	emotion e_rock;
+	emotion e_go;
 	end;
 }
 
@@ -478,11 +474,7 @@ OnInit:
 
 OnEnable:
 	hideoffnpc "Single Army#Geffen";
-	Emotion e_go;
-	end;
-
-OnEmote:
-	emotion e_rock;
+	emotion e_go;
 	end;
 }
 
@@ -500,11 +492,7 @@ OnInit:
 
 OnEnable:
 	hideoffnpc "Single Army#Morocc";
-	Emotion e_go;
-	end;
-
-OnEmote:
-	emotion e_rock;
+	emotion e_go;
 	end;
 }
 
@@ -522,11 +510,7 @@ OnInit:
 
 OnEnable:
 	hideoffnpc "Single Army#Payon";
-	Emotion e_go;
-	end;
-
-OnEmote:
-	emotion e_rock;
+	emotion e_go;
 	end;
 }
 
@@ -543,11 +527,7 @@ OnInit:
 
 OnEnable:
 	hideoffnpc "Single Army#Amatsu";
-	Emotion e_go;
-	end;
-
-OnEmote:
-	emotion e_rock;
+	emotion e_go;
 	end;
 }
 
@@ -563,11 +543,7 @@ OnInit:
 
 OnEnable:
 	hideoffnpc "Single Army#Gonryun";
-	Emotion e_go;
-	end;
-
-OnEmote:
-	emotion e_rock;
+	emotion e_go;
 	end;
 }
 
diff --git a/npc/quests/Dandelion_Request.txt b/npc/quests/Dandelion_Request.txt
index 43505e237..a1ded141d 100644
--- a/npc/quests/Dandelion_Request.txt
+++ b/npc/quests/Dandelion_Request.txt
@@ -3096,7 +3096,7 @@ que_job01,16,21,5	script	Valdes#1	55,{
 				mes "Hey there~";
 				mes "I'm Kidd.";
 				mes "Nice to meet you.";
-				donpcevent "Kidd#1::OnEmotion";
+				emotion e_ok,0,"Kidd#1";
 				cutin "mocseal_kid01.bmp",2;
 				next;
 				mes "[Valdes]";
@@ -3131,7 +3131,7 @@ que_job01,16,21,5	script	Valdes#1	55,{
 				mes "I'm lookin' forward";
 				mes "to working together";
 				mes "with you. Heh heh~";
-				donpcevent "Lin#1::OnEmotion";
+				emotion e_ok,0,"Lin#1";
 				cutin "mocseal_rin01.bmp",2;
 				next;
 				mes "[Valdes]";
@@ -3588,10 +3588,6 @@ OnInit:
 OnEnter:
 	enablenpc "Lin#1";
 	end;
-	
-OnEmotion:
-	emotion e_ok,0;
-	end;
 }
 
 que_job01,13,9,7	script	Lin#2	885,{
@@ -4668,10 +4664,6 @@ OnInit:
 OnEnter:
 	enablenpc "Kidd#1";
 	end;
-	
-OnEmotion:
-	emotion e_ok,0;
-	end;
 }
 
 que_job01,12,8,7	script	Kidd#2	884,{
@@ -8290,39 +8282,39 @@ OnStop:
 OnEnter:
 	enablenpc "#maogate1_battle";
 	end;
-	
+
 OnStop2:
 	stopnpctimer;
 	killmonster "que_job02","#maogate1_battle::OnMyMobDead";
 	end;
-	
+
 OnTouch:
 	initnpctimer;
 	emotion e_wah,1;
 	disablenpc "#maogate1_battle";
 	end;
-	
+
 OnTimer500:
 	monster "que_job02",71,85,"Mummy",1041,1,"#maogate1_battle::OnMyMobDead";
 	monster "que_job02",79,85,"Mummy",1041,1,"#maogate1_battle::OnMyMobDead";
 	monster "que_job02",71,80,"Mummy",1041,1,"#maogate1_battle::OnMyMobDead";
 	monster "que_job02",79,80,"Mummy",1041,1,"#maogate1_battle::OnMyMobDead";
 	end;
-	
+
 OnTimer5000:
 	mapannounce "que_job02","Watch out!",1,0x90EE90;
 	donpcevent "Dandelion Member#1_bt::OnEnter";
 	end;
-	
+
 OnTimer6000:
 	specialeffect EF_LORD;
 	end;
-	
+
 OnTimer6500:
 	killmonster "que_job02","#maogate1_battle::OnMyMobDead";
 	stopnpctimer;
 	end;
-	
+
 OnMyMobDead:
 	end;
 }
@@ -8383,7 +8375,7 @@ que_job02,66,85,5	script	Dandelion Member#1_bt	880,{
 OnInit:
 	disablenpc "Dandelion Member#1_bt";
 	end;
-	
+
 OnEnter:
 	enablenpc "Dandelion Member#1_bt";
 	end;
@@ -8394,11 +8386,11 @@ que_job02,87,83,1	script	#maogate1_setting	139,2,2,{
 OnStop:
 	disablenpc "#maogate1_setting";
 	end;
-	
+
 OnEnter:
 	enablenpc "#maogate1_setting";
 	end;
-	
+
 OnTouch:
 	if (mao_request == 27)
 	{
@@ -8417,20 +8409,20 @@ que_job02,117,101,1	script	#maogate1_end	139,3,3,{
 OnInit:
 	disablenpc "#maogate1_end";
 	end;
-	
+
 OnReset:
 	killmonster "que_job02","#maogate1_end::OnMyMobDead";
 	end;
-	
+
 OnStop:
 	killmonster "que_job02","#maogate1_end::OnMyMobDead";
 	stopnpctimer;
 	end;
-	
+
 OnEnter:
 	enablenpc "#maogate1_end";
 	end;
-	
+
 OnTouch:
 	donpcevent "#maogate1_setting::OnStop";
 	mes "[" + strcharinfo(0) + "]";
@@ -8457,7 +8449,7 @@ OnTouch:
 	mes "working for, the Dandelion";
 	mes "Organization, have been";
 	mes "hunting Mr. Moore down...";
-	donpcevent "Lin#maogate1_1::OnEmotion";
+	emotion e_wah,0,"Lin#maogate1_1";
 	next;
 	cutin "mocseal_kid01.bmp",0;
 	mes "[Kidd]";
@@ -8480,7 +8472,7 @@ OnTouch:
 	mes "me everything you know";
 	mes "about your own client,";
 	mes "the Dandelion Organization...";
-	donpcevent "R#maogate1::OnEmotion";
+	emotion e_hmm,0,"R#maogate1";
 	next;
 	cutin "mocseal_rin01.bmp",255;
 	cutin "mocseal_kid01.bmp",255;
@@ -8497,7 +8489,7 @@ OnTouch:
 	mes "Your blood will be used";
 	mes "to revive Morroc Satan!";
 	donpcevent "R#maogate1::OnSpell";
-	donpcevent "Kidd#maogate1_1::OnEmotion";
+	emotion e_gasp,0,"Kidd#maogate1_1";
 	emotion e_gasp,1;
 	next;
 	mes "[Kidd]";
@@ -8528,7 +8520,7 @@ OnTouch:
 	mes "Fine, you leave me";
 	mes "no choice. Feel the";
 	mes "power of Morroc Satan!";
-	donpcevent "R#maogate1::OnEmotion2";
+	emotion e_gg,0,"R#maogate1";
 	next;
 	donpcevent "R#maogate1::OnInit";
 	initnpctimer;
@@ -8561,10 +8553,10 @@ OnTimer500:
 	mapannounce "que_job02","I'll back you up!",1,0x90EE90;
 	donpcevent "Dandelion#maogate1_3::OnEnter";
 	donpcevent "Dandelion#maogate1_4::OnEnter";
-	donpcevent "Dandelion#maogate1_1::OnEmotion";
-	donpcevent "Dandelion#maogate1_2::OnEmotion";
-	donpcevent "Dandelion#maogate1_3::OnEmotion";
-	donpcevent "Dandelion#maogate1_4::OnEmotion";
+	emotion e_go,0,"Dandelion#maogate1_1";
+	emotion e_go,0,"Dandelion#maogate1_2";
+	emotion e_go,0,"Dandelion#maogate1_3";
+	emotion e_go,0,"Dandelion#maogate1_4";
 	end;
 
 OnTimer3000:
@@ -8610,14 +8602,10 @@ que_job02,116,108,5	script	Kidd#maogate1_1	884,{
 OnInit:
 	disablenpc "Kidd#maogate1_1";
 	end;
-	
+
 OnEnter:
 	enablenpc "Kidd#maogate1_1";
 	end;
-	
-OnEmotion:
-	emotion e_gasp,0;
-	end;
 }
 
 que_job02,126,103,5	script	Kidd#maogate1_2	884,{
@@ -8627,11 +8615,11 @@ que_job02,126,103,5	script	Kidd#maogate1_2	884,{
 OnInit:
 	disablenpc "Kidd#maogate1_2";
 	end;
-	
+
 OnEnter:
 	enablenpc "Kidd#maogate1_2";
 	end;
-	
+
 OnMyMobDead:
 	set $@maogate1mobs,$@maogate1mobs -1;
 	if($@maogate1mobs < 1) donpcevent "#maogate1_end2::OnEnter";
@@ -8643,14 +8631,10 @@ que_job02,121,106,1	script	Lin#maogate1_1	885,{
 OnInit:
 	disablenpc "Lin#maogate1_1";
 	end;
-	
+
 OnEnter:
 	enablenpc "Lin#maogate1_1";
 	end;
-	
-OnEmotion:
-	emotion e_wah,0;
-	end;
 }
 
 que_job02,127,101,1	script	Lin#maogate1_2	885,{
@@ -8658,7 +8642,7 @@ que_job02,127,101,1	script	Lin#maogate1_2	885,{
 OnInit:
 	disablenpc "Lin#maogate1_2";
 	end;
-	
+
 OnEnter:
 	enablenpc "Lin#maogate1_2";
 	end;
@@ -8669,19 +8653,11 @@ que_job02,124,109,3	script	R#maogate1	880,{
 OnInit:
 	disablenpc "R#maogate1";
 	end;
-	
+
 OnEnter:
 	enablenpc "R#maogate1";
 	end;
-	
-OnEmotion:
-	emotion e_hmm,0;
-	end;
-	
-OnEmotion2:
-	emotion e_gg,0;
-	end;
-	
+
 OnSpell:
 	specialeffect EF_BEGINSPELL2;
 	end;
@@ -8692,14 +8668,10 @@ que_job02,113,107,5	script	Dandelion#maogate1_1	880,{
 OnInit:
 	disablenpc "Dandelion#maogate1_1";
 	end;
-	
+
 OnEnter:
 	enablenpc "Dandelion#maogate1_1";
 	end;
-	
-OnEmotion:
-	emotion e_go,0;
-	end;
 }
 
 que_job02,121,100,7	script	Dandelion#maogate1_2	880,{
@@ -8707,19 +8679,15 @@ que_job02,121,100,7	script	Dandelion#maogate1_2	880,{
 OnInit:
 	disablenpc "Dandelion#maogate1_2";
 	end;
-	
+
 OnEnter:
 	enablenpc "Dandelion#maogate1_2";
 	end;
-	
-OnEmotion:
-	emotion e_go,0;
-	end;
-	
+
 OnSpell:
 	specialeffect EF_BEGINSPELL2;
 	end;
-	
+
 OnSpell2:
 	specialeffect EF_LORD;
 	end;
@@ -8730,15 +8698,11 @@ que_job02,122,98,1	script	Dandelion#maogate1_3	880,{
 OnInit:
 	disablenpc "Dandelion#maogate1_3";
 	end;
-	
+
 OnEnter:
 	enablenpc "Dandelion#maogate1_3";
 	end;
-	
-OnEmotion:
-	emotion e_go,0;
-	end;
-	
+
 OnSpell:
 	specialeffect EF_BEGINSPELL2;
 	end;
@@ -8749,15 +8713,11 @@ que_job02,122,111,5	script	Dandelion#maogate1_4	880,{
 OnInit:
 	disablenpc "Dandelion#maogate1_4";
 	end;
-	
+
 OnEnter:
 	enablenpc "Dandelion#maogate1_4";
 	end;
-	
-OnEmotion:
-	emotion e_go,0;
-	end;
-	
+
 OnSpell:
 	specialeffect EF_LORD;
 	end;
@@ -8768,7 +8728,7 @@ que_job02,122,106,1	script	#maogate1_end2	139,15,15,{
 OnInit:
 	disablenpc "#maogate1_end2";
 	end;
-	
+
 OnEnter:
 	enablenpc "#maogate1_end2";
 	end;
@@ -9482,7 +9442,7 @@ OnTouch:
 	mes "working for, the Dandelion";
 	mes "Organization, have been";
 	mes "hunting Mr. Moore down...";
-	donpcevent "Lin#maogate2_1::OnEmotion";
+	emotion e_wah,0,"Lin#maogate2_1";
 	next;
 	cutin "mocseal_kid01.bmp",0;
 	mes "[Kidd]";
@@ -9505,7 +9465,7 @@ OnTouch:
 	mes "me everything you know";
 	mes "about your own client,";
 	mes "the Dandelion Organization...";
-	donpcevent "R#maogate2::OnEmotion";
+	emotion e_hmm,0,"R#maogate2";
 	next;
 	cutin "mocseal_rin01.bmp",255;
 	cutin "mocseal_kid01.bmp",255;
@@ -9522,7 +9482,7 @@ OnTouch:
 	mes "Your blood will be used";
 	mes "to revive Morroc Satan!";
 	donpcevent "R#maogate2::OnSpell";
-	donpcevent "Kidd#maogate2_1::OnEmotion";
+	emotion e_gasp,0,"Kidd#maogate2_1";
 	emotion e_gasp,1;
 	next;
 	mes "[Kidd]";
@@ -9553,7 +9513,7 @@ OnTouch:
 	mes "Fine, you leave me";
 	mes "no choice. Feel the";
 	mes "power of Morroc Satan!";
-	donpcevent "R#maogate2::OnEmotion2";
+	emotion e_gg,0,"R#maogate2";
 	next;
 	donpcevent "R#maogate2::OnInit";
 	initnpctimer;
@@ -9587,10 +9547,10 @@ OnTimer500:
 	mapannounce "que_job03","I'll back you up!",1,0x90EE90;
 	donpcevent "Dandelion#maogate2_3::OnEnter";
 	donpcevent "Dandelion#maogate2_4::OnEnter";
-	donpcevent "Dandelion#maogate2_1::OnEmotion";
-	donpcevent "Dandelion#maogate2_2::OnEmotion";
-	donpcevent "Dandelion#maogate2_3::OnEmotion";
-	donpcevent "Dandelion#maogate2_4::OnEmotion";
+	emotion e_go,0,"Dandelion#maogate2_1";
+	emotion e_go,0,"Dandelion#maogate2_2";
+	emotion e_go,0,"Dandelion#maogate2_3";
+	emotion e_go,0,"Dandelion#maogate2_4";
 	end;
 
 OnTimer3000:
@@ -9626,7 +9586,7 @@ OnTimer10000:
 	donpcevent "Dandelion#maogate2_1::OnInit";
 	stopnpctimer;
 	end;
-	
+
 OnMyMobDead:
 	end;
 }
@@ -9636,14 +9596,10 @@ que_job03,116,108,5	script	Kidd#maogate2_1	884,{
 OnInit:
 	disablenpc "Kidd#maogate2_1";
 	end;
-	
+
 OnEnter:
 	enablenpc "Kidd#maogate2_1";
 	end;
-	
-OnEmotion:
-	emotion e_gasp,0;
-	end;
 }
 
 que_job03,126,103,5	script	Kidd#maogate2_2	884,{
@@ -9653,11 +9609,11 @@ que_job03,126,103,5	script	Kidd#maogate2_2	884,{
 OnInit:
 	disablenpc "Kidd#maogate2_2";
 	end;
-	
+
 OnEnter:
 	enablenpc "Kidd#maogate2_2";
 	end;
-	
+
 OnMyMobDead:
 	set $@maogate2mobs,$@maogate2mobs -1;
 	if($@maogate2mobs < 1) donpcevent "#maogate2_end2::OnEnter";
@@ -9669,14 +9625,10 @@ que_job03,121,106,1	script	Lin#maogate2_1	885,{
 OnInit:
 	disablenpc "Lin#maogate2_1";
 	end;
-	
+
 OnEnter:
 	enablenpc "Lin#maogate2_1";
 	end;
-	
-OnEmotion:
-	emotion e_wah,0;
-	end;
 }
 
 que_job03,127,101,1	script	Lin#maogate2_2	885,{
@@ -9684,7 +9636,7 @@ que_job03,127,101,1	script	Lin#maogate2_2	885,{
 OnInit:
 	disablenpc "Lin#maogate2_2";
 	end;
-	
+
 OnEnter:
 	enablenpc "Lin#maogate2_2";
 	end;
@@ -9695,19 +9647,11 @@ que_job03,124,109,3	script	R#maogate2	880,{
 OnInit:
 	disablenpc "R#maogate2";
 	end;
-	
+
 OnEnter:
 	enablenpc "R#maogate2";
 	end;
-	
-OnEmotion:
-	emotion e_hmm,0;
-	end;
-	
-OnEmotion2:
-	emotion e_gg,0;
-	end;
-	
+
 OnSpell:
 	specialeffect EF_BEGINSPELL2;
 	end;
@@ -9718,14 +9662,10 @@ que_job03,113,107,5	script	Dandelion#maogate2_1	880,{
 OnInit:
 	disablenpc "Dandelion#maogate2_1";
 	end;
-	
+
 OnEnter:
 	enablenpc "Dandelion#maogate2_1";
 	end;
-	
-OnEmotion:
-	emotion e_go,0;
-	end;
 }
 
 que_job03,121,100,7	script	Dandelion#maogate2_2	880,{
@@ -9733,19 +9673,15 @@ que_job03,121,100,7	script	Dandelion#maogate2_2	880,{
 OnInit:
 	disablenpc "Dandelion#maogate2_2";
 	end;
-	
+
 OnEnter:
 	enablenpc "Dandelion#maogate2_2";
 	end;
-	
-OnEmotion:
-	emotion e_go,0;
-	end;
-	
+
 OnSpell:
 	specialeffect EF_BEGINSPELL2;
 	end;
-	
+
 OnSpell2:
 	specialeffect EF_LORD;
 	end;
@@ -9756,15 +9692,11 @@ que_job03,122,98,1	script	Dandelion#maogate2_3	880,{
 OnInit:
 	disablenpc "Dandelion#maogate2_3";
 	end;
-	
+
 OnEnter:
 	enablenpc "Dandelion#maogate2_3";
 	end;
-	
-OnEmotion:
-	emotion e_go,0;
-	end;
-	
+
 OnSpell:
 	specialeffect EF_BEGINSPELL2;
 	end;
@@ -9775,15 +9707,11 @@ que_job03,122,111,5	script	Dandelion#maogate2_4	880,{
 OnInit:
 	disablenpc "Dandelion#maogate2_4";
 	end;
-	
+
 OnEnter:
 	enablenpc "Dandelion#maogate2_4";
 	end;
-	
-OnEmotion:
-	emotion e_go,0;
-	end;
-	
+
 OnSpell:
 	specialeffect EF_LORD;
 	end;
@@ -10241,13 +10169,13 @@ que_job01,68,88,5	script	Simon#mao	881,{
 	mes "...No. How many";
 	mes "times must I tell you?";
 	mes "I'm not going back.";
-	donpcevent "Simon#mao::OnEmotion1";
+	emotion e_swt,0,"Simon#mao";
 	next;
 	mes "[Kimmie]";
 	mes "Please...";
 	mes "We really need";
 	mes "you back home...";
-	donpcevent "Kimmie::OnEmotion2";
+	emotion e_sob,0,"Kimmie";
 	next;
 	mes "[Simon]";
 	mes "I'm sorry, Kimmie.";
@@ -10263,7 +10191,7 @@ que_job01,68,88,5	script	Simon#mao	881,{
 	mes "I d-didn't want to tell you";
 	mes "this, but Jimmy's been getting";
 	mes "in trouble with the law and...";
-	donpcevent "Kimmie::OnEmotion3";
+	emotion e_wah,0,"Kimmie";
 	next;
 	mes "[Simon]";
 	mes "Then it's his own";
@@ -10284,18 +10212,6 @@ que_job01,68,88,5	script	Simon#mao	881,{
 	mes "good not to get involved";
 	mes "with other people's problems.";
 	close;
-	
-OnEmotion1:
-	emotion e_swt,0;
-	end;
-	
-OnEmotion2:
-	emotion e_sob,0;
-	end;
-	
-OnEmotion3:
-	emotion e_wah,0;
-	end;
 }
 
 que_job01,70,84,1	duplicate(Simon#mao)	Kimmie	882,0,0
diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt
index 6fcc4c0ab..28146f879 100644
--- a/npc/quests/The_Sign_Quest.txt
+++ b/npc/quests/The_Sign_Quest.txt
@@ -8990,10 +8990,6 @@ OnDisable:
 OnEnable:
 	enablenpc "Dark Lord#serin";
 	end;
-
-Onemo:
-	emotion e_gg;
-	end;
 }
 
 que_sign01,196,39,4	script	Serin#serin	90,{
@@ -9124,7 +9120,7 @@ que_sign01,196,39,4	script	Serin#serin	90,{
 			mes "I really don't want to fight you,";
 			mes "but I've come too far to give up now. If you insist on interfering, then you leave me no choice...";
 			next;
-			donpcevent "Dark Lord#serin::Onemo";
+			emotion e_gg,0,"Dark Lord#serin";
 			mes "[Dark Lord]";
 			mes "^330033Insolent mortal!";
 			mes "Do you really think";
diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt
index 51ddcf656..9445086d2 100644
--- a/npc/quests/quests_airship.txt
+++ b/npc/quests/quests_airship.txt
@@ -2924,10 +2924,6 @@ OnEnter:
 	enablenpc "Ferlock#lab";
 	initnpctimer;
 	end;
-	
-OnEmote:
-	emotion e_omg,0;
-	end;
 
 OnTimer120000:
 	donpcevent "Ferlock#lab::OnInit";
@@ -3052,7 +3048,7 @@ L_Input:
 			mes "Airship. Wait, wait...";
 			mes "You look familiar...";
 			next;
-			donpcevent "Ferlock#lab::OnEmote";
+			emotion e_omg,0,"Ferlock#lab";
 			mes "[Ferlock]";
 			mes "That's right, aren't you the";
 			mes "one who brought me my";
diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index f25aebcd5..a2f503e80 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -8721,7 +8721,7 @@ hu_in01,19,161,0	script	Alex	803,{
 				mes "when you're done and";
 				mes "don't waste my time!";
 				next;
-				donpcevent "Julian::OnEmote";
+				emotion e_ho,0,"Julian";
 				mes "[Julian]";
 				mes "Hey, you know what,";
 				mes "Alex? You can't push";
@@ -8955,7 +8955,7 @@ hu_in01,14,11,4	script	Laura	70,{
 		mes "Milton, is right over";
 		mes "there. Say, 'Hello,' Ashe.";
 		next;
-		donpcevent "Ashe::OnEmote";
+		emotion e_heh,0,"Ashe";
 		mes "[Ashe]";
 		mes "Hello!";
 		next;
@@ -9097,7 +9097,7 @@ hu_in01,14,11,4	script	Laura	70,{
 				mes "expedition for the Rune Midgarts^FFFFFF ^000000 Kingdom. Ashe Milton is my";
 				mes "assistant for this excavation.";
 				next;
-				donpcevent "Ashe::OnEmote";
+				emotion e_heh,0,"Ashe";
 				mes "[Ashe]";
 				mes "Hello!";
 				next;
@@ -9273,7 +9273,7 @@ hu_in01,14,11,4	script	Laura	70,{
 				mes "greets me with a fake";
 				mes "smile. I hate her!";
 				next;
-				donpcevent "Ashe::OnEmote2"; //ET_PROFUSELY_SWAT
+				emotion e_swt2,0,"Ashe";
 				mes "[Ashe]";
 				mes "Ms. Laurence...!";
 				mes "Stop it, please!";
@@ -9657,7 +9657,7 @@ hu_in01,14,11,4	script	Laura	70,{
 				mes "Well, have you";
 				mes "ever heard of Ymir's...";
 				next;
-				donpcevent "Ashe::OnEmote3"; //ET_SURPRISE
+				emotion e_gasp,0,"Ashe";
 				mes "[Ashe]";
 				mes "...Heart?";
 				mes "Ymir's Heart, right?";
@@ -9699,7 +9699,7 @@ hu_in01,14,11,4	script	Laura	70,{
 						next;
 						break;
 				}
-				donpcevent "Ashe::OnEmote4"; //ET_OK
+				emotion e_ok,0,"Ashe";
 				mes "[Ashe]";
 				mes "Ymir's Heart?";
 				mes "That's a clothing";
@@ -9853,10 +9853,6 @@ hu_in01,18,167,4	script	Julian	86,{
 		mes "Don't tell them I said that!";
 		close;
 	}
-	
-OnEmote:
-	emotion e_ho,0;
-	end;
 }
 
 hu_in01,16,21,0	script	Ashe#5	139,2,2,{
@@ -10024,22 +10020,6 @@ hu_in01,16,20,4	script	Ashe	95,{
 			mes "you no harm~";
 			close;
 	}
-	
-OnEmote:
-	emotion e_heh,0;
-	end;
-	
-OnEmote2:
-	emotion e_swt2,0;
-	end;
-
-OnEmote3:
-	emotion e_gasp,0;
-	end;
-	
-OnEmote4:
-	emotion e_ok,0;
-	end;
 }
 
 hu_in01,174,90,0	script	Entrance	139,2,2,{
@@ -10060,7 +10040,7 @@ hu_in01,159,84,3	script	Laura#2	70,{
 	if(hg_odin == 22 || hg_odin == 23)
 	{
 		cutin "hu_laura03.bmp",2;
-		donpcevent "Laura#2::OnEmote";
+		emotion e_an,0,"Laura#2";
 		mes "[Laura]";
 		mes "Wh-what...?!";
 		mes "Does this mean";
@@ -10070,7 +10050,7 @@ hu_in01,159,84,3	script	Laura#2	70,{
 		mes "complete lunacy!";
 		next;
 		cutin "hu_alex04.bmp",0;
-		donpcevent "Alex#2::OnEmote";
+		emotion e_an,0,"Alex#2";
 		mes "[Alex]";
 		mes "What are you talking";
 		mes "about, you crazy wench?";
@@ -10127,12 +10107,12 @@ hu_in01,159,84,3	script	Laura#2	70,{
 		mes "waves a thick file";
 		mes "clasped in her hands.^000000";
 		next;
-		donpcevent "Julian#2::OnEmote";
+		emotion e_omg,0,"Julian#2";
 		mes "[Julian]";
 		mes "What...?";
 		mes "Argh, that's--!";
 		next;
-		donpcevent "Laura#2::OnEmote2";
+		emotion e_ag,0,"Laura#2";
 		mes "[Laura]";
 		mes "That's right.";
 		mes "Now tell me, what the";
@@ -10143,7 +10123,7 @@ hu_in01,159,84,3	script	Laura#2	70,{
 		mes "......";
 		mes "Julian!";
 		next;
-		donpcevent "Julian#2::OnEmote2";
+		emotion e_swt2,0,"Julian#2";
 		mes "[Julian]";
 		mes "Uh, this isn't my fault!";
 		mes "Sh-she doesn't have any";
@@ -10167,7 +10147,7 @@ hu_in01,159,84,3	script	Laura#2	70,{
 		mes "what are your true goals?!";
 		next;
 		cutin "hu_alex03.bmp",0;
-		donpcevent "Alex#2::OnEmote3";
+		emotion e_swt2,0,"Alex#2";
 		mes "[Alex]";
 		mes "I-I don't know what you're";
 		mes "talking about! J-Julian must";
@@ -10185,18 +10165,18 @@ hu_in01,159,84,3	script	Laura#2	70,{
 		mes "away, and threateningly";
 		mes "rolled up her sleeves.^000000";
 		next;
-		donpcevent "Ashe#2::OnEmote";
+		emotion e_sob,0,"Ashe#2";
 		mes "[Ashe]";
 		mes "S-stop!";
 		mes "Both of you!";
 		next;
-		donpcevent "Laura#2::OnEmote3";
+		emotion e_swt2,0,"Laura#2";
 		mes "[Laura]";
 		mes "Stay out of";
 		mes "this, Ashe!";
 		next;
 		cutin "hu_alex04.bmp",0;
-		donpcevent "Alex#2::OnEmote";
+		emotion e_an,0,"Alex#2";
 		mes "[Alex]";
 		mes "Yeah, this is none";
 		mes "of your business!";
@@ -10211,31 +10191,20 @@ hu_in01,159,84,3	script	Laura#2	70,{
 	else if(hg_odin > 23)
 	{
 		cutin "hu_laura03.bmp",2;
-		donpcevent "Laura#2::OnEmote";
+		emotion e_an,0,"Laura#2";
 		mes "[Laura]";
 		mes "Hah...!";
 		mes "Did you...";
 		mes "Just hit me?";
 		next;
 		cutin "hu_alex04.bmp",0;
-		donpcevent "Alex#2::OnEmote";
+		emotion e_an,0,"Alex#2";
 		mes "[Alex]";
 		mes "You crazy...!";
 		close2;
 		cutin "hu_alex04.bmp",255;
 		end;
 	}
-OnEmote:
-	emotion e_an,0;
-	end;
-	
-OnEmote2:
-	emotion e_ag,0;
-	end;
-	
-OnEmote3:
-	emotion e_swt2,0;
-	end;
 }
 
 hu_in01,158,84,5	duplicate(Laura#2)	Alex#2	803,0,0
@@ -10289,10 +10258,6 @@ hu_in01,162,85,4	script	Ashe#2	95,{
 		mes "find him as soon as you can!";
 		close;
 	}
-
-OnEmote:
-	emotion e_sob,0;
-	end;
 }
 
 hu_in01,171,90,0	script	Ashe#3	139,2,2,{
@@ -10346,14 +10311,6 @@ hu_in01,155,82,4	script	Julian#2	86,{
 	mes "involved. If you want,";
 	mes "you can try to stop them...";
 	close;
-	
-OnEmote:
-	emotion e_omg,0;
-	end;
-	
-OnEmote2:
-	emotion e_swt2,0;
-	end;
 }
 
 moc_fild12,160,372,0	script	Hit	139,{
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index 593f59cad..b11abc8c5 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -1820,25 +1820,6 @@ lou_in02,201,166,4	script	Storage Keeper#lou	819,{
 	mes "take care of these things";
 	mes "as soon as I can...";
 	close;
-
-OnEmotion1:
-	emotion e_an;
-	end;
-
-OnEmotion2:
-	emotion e_pif;
-	end;
-
-OnEmotion3:
-	emotion e_gg;
-	end;
-
-OnEmotion4:
-	emotion e_wah;
-	end;
-
-OnEmotion5:
-	emotion e_rock;
 }
 
 lou_in02,210,47,0	script	City Hall Officer#lou	825,{
@@ -2194,7 +2175,7 @@ lou_in02,204,169,0	script	Supply Stack#1lou	111,{
 			mes "[Jiang Xiayou]";
 			mes "Hey, hey...";
 			mes "I told you! It's not too late, why don't you do me the favor I asked? I'm only asking you once!";
-			donpcevent "Storage Keeper#lou::OnEmotion1";
+			emotion e_an,0,"Storage Keeper#lou";
 			close;
 		}
 		mes "^3355FF*Rummage rummage*";
@@ -2256,7 +2237,7 @@ lou_in02,207,168,0	script	Supply Stack#5lou	111,{
 	next;
 	mes "[Jiang Xiayou]";
 	mes "Hey, don't touch anything! If you mess anything up, you've gotta pile it up again, got it? If you don't want to clean up after yourself, don't make a mess!";
-	donpcevent "Storage Keeper#lou::OnEmotion5";
+	emotion e_rock,0,"Storage Keeper#lou";
 	close;
 }
 
@@ -2285,7 +2266,7 @@ lou_in02,206,163,0	script	Supply Stack#4lou	111,{
 				mes "You found it...?!";
 				mes "I can't believe it!";
 				mes "You just lucked out.";
-				donpcevent "Storage Keeper#lou::OnEmotion4";
+				emotion e_wah,0,"Storage Keeper#lou";
 				close;
 			}
 			mes "^3355FF*Rummage rummage*";
@@ -2350,7 +2331,7 @@ lou_in02,198,170,0	script	Supply Stack#3lou	111,{
 			mes "It's not too late for you";
 			mes "to do the favor I asked.";
 			mes "I'm only asking you once!";
-			donpcevent "Storage Keeper#lou::OnEmotion3";
+			emotion e_gg,0,"Storage Keeper#lou";
 			close;
 		}
 		mes "^3355FF*Rummage rummage*";
@@ -2398,7 +2379,7 @@ lou_in02,192,170,0	script	Supply Stack#2	111,{
 			next;
 			mes "[Jiang Xiayou]";
 			mes "I told you! Now stop bugging me and leave now! I don't wanna deal with someone who won't trust me.";
-			donpcevent "Storage Keeper#lou::OnEmotion2";
+			emotion e_pif,0,"Storage Keeper#lou";
 			close;
 		}
 		mes "^3355FF*Rummage rummage*";
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index 80401a779..f62e8beb2 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -4529,8 +4529,8 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 					mes "Good, play it right away!";
 					next;
 					soundeffect "mos_gusli2.wav",0;
-					donpcevent "Csar Alexsay III#npc::OnEmoteAg";
-					donpcevent "Prime Minister Dmitree#m::OnEmoteAg";
+					emotion e_ag,0,"Csar Alexsay III#npc";
+					emotion e_ag,0,"Prime Minister Dmitree#m";
 					mes "[Csar Alexsay III]";
 					mes "Um... What is this? Do you mock me?";
 					mes "You are so impudent... You...!";
@@ -4646,8 +4646,8 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 				mes "played, all the people in the";
 				mes "Csar's Palace fall in with the tune.-";
 				next;
-				donpcevent "Csar Alexsay III#npc::OnEmoteSob";
-				donpcevent "Prime Minister Dmitree#m::OnEmoteSob";
+				emotion e_sob,0,"Csar Alexsay III#npc";
+				emotion e_sob,0,"Prime Minister Dmitree#m";
 				mes "[Csar Alexsay III]";
 				mes "Oh! I can't hear without tears.";
 				mes "That's a sad tune.";
@@ -4721,14 +4721,6 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 			close;
 		}
 	}
-	
-	OnEmoteAg:
-		emotion e_ag;
-		end;
-		
-	OnEmoteSob:
-		emotion e_sob;
-		end;
 }
 
 //----------------------------------------------------------------------------
@@ -5164,7 +5156,7 @@ mosk_in,144,279,5	script	Gallina#mos	959,{
 		mes "[Gallina]";
 		mes "It's because you didn't look after your brother. So you clean the house, Anna?";
 		next;
-		donpcevent "Anna#mos::OnEmoteSob";
+		emotion e_sob,0,"Anna#mos";
 		mes "[Anna]";
 		mes "Oh, my................";
 		next;
@@ -5282,10 +5274,6 @@ mosk_in,144,279,5	script	Gallina#mos	959,{
 		mes "I think that will be great!";
 		close;
 	}
-	
-	OnEmoteSob:
-		emotion e_sob;
-		end;
 }
 
 //----------------------------------------------------------------------------
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index 648451e7f..a8094ffcf 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -3911,7 +3911,7 @@ OnTouch:
 			mes "entrance is locked.^000000";
 			next;
 			select("Kick Door.:Smash Door with Weapon.");
-			donpcevent "Nemma#ra_temple::OnEmotion";
+			emotion e_omg,0,"Nemma#ra_temple";
 			mes "[Priestess Nemma]";
 			mes "Please don't do that!";
 			close;
@@ -4317,10 +4317,6 @@ L_End:
 	cutin "",255;
 	end;
 
-OnEmotion:
-	emotion e_omg;
-	end;
-
 S_Donate:
 	cutin "ra_nemma01",2;
 	mes "[Priestess Nemma]";
diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt
index 9d53a4b5e..805950f40 100644
--- a/npc/quests/quests_umbala.txt
+++ b/npc/quests/quests_umbala.txt
@@ -1034,14 +1034,6 @@ um_in,139,48,5	script	Phrenetan	783,{
 		close;
 	}
 	end;
-
-OnEmoteOmg:
-	emotion e_omg;
-	end;
-
-OnEmoteRock:
-	emotion e_rock;
-	end;
 }
 
 um_in,144,45,5	script	Umpokoriohtan	789,{
@@ -1077,7 +1069,7 @@ um_in,144,45,5	script	Umpokoriohtan	789,{
 			mes "...........";
 			mes "My back--!";
 			mes "Simmer down, baby, your turn is comin' in a minute~";
-			donpcevent "Phrenetan::OnEmoteRock";
+			emotion e_rock,0,"Phrenetan";
 			emotion e_swt;
 			close;
 		}
@@ -1106,7 +1098,7 @@ um_in,144,45,5	script	Umpokoriohtan	789,{
 			mes "Baby, why you gotta be rough?";
 			mes "Hit me gently, ya dig??";
 			mes "I don't mean to hurt you~";
-			donpcevent "Phrenetan::OnEmoteOmg";
+			emotion e_omg,0,"Phrenetan";
 			emotion e_wah;
 			close;
 		}
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index 5309292c7..855bdceae 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -5653,8 +5653,8 @@ ve_in,233,116,3	script	Drunken Man#vol	901,{
 		mes "Hahahaha! Guess I look";
 		mes "pretty tough, don't I?";
 		next;
-		donpcevent "Drunken Lady#1::OnEmote";
-		donpcevent "Drunken Lady#2::OnEmote";
+		emotion e_lv,0,"Drunken Lady#1";
+		emotion e_lv,0,"Drunken Lady#2";
 		mes "[Ladies]";
 		mes "Oh, my God!";
 		mes "You're so cool~!";
@@ -5683,8 +5683,8 @@ ve_in,233,116,3	script	Drunken Man#vol	901,{
 		mes "Hahahaha! Guess I look";
 		mes "pretty tough, don't I?";
 		next;
-		donpcevent "Drunken Lady#1::OnEmote";
-		donpcevent "Drunken Lady#2::OnEmote";
+		emotion e_lv,0,"Drunken Lady#1";
+		emotion e_lv,0,"Drunken Lady#2";
 		mes "[Ladies]";
 		mes "Oh, my God!";
 		mes "You're so cool~!";
@@ -5751,8 +5751,8 @@ ve_in,233,116,3	script	Drunken Man#vol	901,{
 		mes "but duty calls.";
 		mes "Hahahahahahha~";
 		next;
-		donpcevent "Drunken Lady#1::OnEmote";
-		donpcevent "Drunken Lady#2::OnEmote";
+		emotion e_lv,0,"Drunken Lady#1";
+		emotion e_lv,0,"Drunken Lady#2";
 		mes "[Ladies]";
 		mes "Please don't go~";
 		next;
@@ -5836,8 +5836,8 @@ ve_in,233,116,3	script	Drunken Man#vol	901,{
 		mes "I should stay here and";
 		mes "entreat them to a lecture.";
 		next;
-		donpcevent "Drunken Lady#1::OnEmote";
-		donpcevent "Drunken Lady#2::OnEmote";
+		emotion e_lv,0,"Drunken Lady#1";
+		emotion e_lv,0,"Drunken Lady#2";
 		mes "[Ladies]";
 		mes "Oh~! You'll really";
 		mes "teach us geology?";
@@ -6007,8 +6007,8 @@ ve_in,233,116,3	script	Drunken Man#vol	901,{
 	mes "Hahahaha! Guess I look";
 	mes "pretty tough, don't I?";
 	next;
-	donpcevent "Drunken Lady#1::OnEmote";
-	donpcevent "Drunken Lady#2::OnEmote";
+	emotion e_lv,0,"Drunken Lady#1";
+	emotion e_lv,0,"Drunken Lady#2";
 	mes "[Ladies]";
 	mes "Oh, my God!";
 	mes "You're so cool~!";
@@ -6028,10 +6028,6 @@ ve_in,232,117,5	script	Drunken Lady#1	940,{
 	mes "I get free drinks if";
 	mes "I can put up with him~";
 	close;
-
-OnEmote:
-	emotion e_lv;
-	end;
 }
 
 ve_in,234,115,3	script	Drunken Lady#2	940,{
@@ -6042,10 +6038,6 @@ ve_in,234,115,3	script	Drunken Lady#2	940,{
 	mes "I can mix better drinks";
 	mes "at home, no sweat at all~";
 	close;
-
-OnEmote:
-	emotion e_lv;
-	end;
 }
 
 ve_in,277,229,3	script	Wall Closet#vol	111,{
diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt
index ed014dd64..9c3117c53 100644
--- a/npc/quests/seals/brisingamen_seal.txt
+++ b/npc/quests/seals/brisingamen_seal.txt
@@ -3156,9 +3156,6 @@ OnReset:
 }
 
 que_god02,173,58,4	script	#doppelganger1	739,{
-
-OnEmoGasp:
-	emotion e_gasp;
 	end;
 }
 
@@ -3170,9 +3167,6 @@ OnCast:
 }
 
 que_god02,175,54,1	script	#lowen	745,{
-
-OnEmoGasp:
-	emotion e_gasp;
 	end;
 
 OnCast:
@@ -3181,35 +3175,14 @@ OnCast:
 }
 
 que_god02,178,49,1	script	#knight1	751,{
-
-OnEmoGasp:
-	emotion e_gasp;
-	end;
-
-OnEmoGo:
-	emotion e_go;
 	end;
 }
 
 que_god02,168,53,7	script	#knight2	734,{
-
-OnEmoGasp:
-	emotion e_gasp;
-	end;
-
-OnEmoGo:
-	emotion e_go;
 	end;
 }
 
 que_god02,167,58,4	script	#knight3	752,{
-
-OnEmoGasp:
-	emotion e_gasp;
-	end;
-
-OnEmoGo:
-	emotion e_go;
 	end;
 }
 
@@ -3256,10 +3229,10 @@ OnTouch:
 	mapannounce "que_god02","Everyone, stay calm! Get into your positions!",0,0x9CFF00;
 	mes "^4E2F2F[Crusader Commander]";
 	mes "Everyone, get into your positions! Front line, block its movement! Rear line, support the defense!^000000";
-	donpcevent "#knight1::OnEmoGo";
-	donpcevent "#knight2::OnEmoGo";
-	donpcevent "#knight3::OnEmoGo";
-	donpcevent "#doppelganger1::OnEmoGasp";
+	emotion e_go,0,"#knight1";
+	emotion e_go,0,"#knight2";
+	emotion e_go,0,"#knight3";
+	emotion e_gasp,0,"#doppelganger1";
 	next;
 	mes "[Lowen Ellenen]";
 	mes "N-no!";
@@ -3275,10 +3248,10 @@ OnTouch:
 	mapannounce "que_god02","Mwahaha! Mortals are such fools...",0,0xA8A8A8;
 	donpcevent "#brisinsummon::OnDoppel1Off";
 	donpcevent "#brisinsummon::OnDoppel2On";
-	donpcevent "#knight1::OnEmoGasp";
-	donpcevent "#knight2::OnEmoGasp";
-	donpcevent "#knight3::OnEmoGasp";
-	donpcevent "#lowen::OnEmoGasp";
+	emotion e_gasp,0,"#knight1";
+	emotion e_gasp,0,"#knight2";
+	emotion e_gasp,0,"#knight3";
+	emotion e_gasp,0,"#lowen";
 	mes "[" + strcharinfo(0) + "]";
 	mes " ??!!!";
 	next;