* Follow-up r16726, more standardization on docs.

* Replaced and added dividers in many script files with one standard divider.
* Other misc. cleaning...

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

9 files changed, 93 insertions, 155 deletions

diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 8eb6bfbe9..64f38d69d 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -35,11 +35,8 @@
 //= 2.4 Updated 'Doll Quest' to match AEGIS script. [Kisuka]
 //============================================================ 
 
-
-
-//=======================================================================================================//
-//						Doll Quest
-//=======================================================================================================//
+// Doll Quest
+//============================================================
 alberta,117,135,0	script	Elin	96,{
 	if (checkweight(1201,1) == 0) {
 		mes "[Elin]";
@@ -391,10 +388,8 @@ alberta,117,135,0	script	Elin	96,{
 	}
 }
 
-
-//=======================================================================================================//
-//						Boy's Cap' Quest
-//=======================================================================================================//
+// 'Boy's Cap' Quest
+//============================================================
 alberta_in,28,145,4	script	Grampa	120,{
 	mes "[Grampa]";
 	mes "*Gasp*...";
@@ -471,9 +466,8 @@ alberta_in,28,145,4	script	Grampa	120,{
 	}
 }
 
-//=======================================================================================================//
-//						Antlers Quest 
-//=======================================================================================================//
+// 'Antlers' Quest
+//============================================================
 alberta_in,122,53,4	script	Cherokee	47,{
 	mes "[Cherokee]";
 	mes "Hey there~!";
@@ -518,9 +512,8 @@ alberta_in,122,53,4	script	Cherokee	47,{
 	}
 }
 
-//=======================================================================================================//
-//			Bao Bao, Cresent Hairpin, Fashionbale Glasses, Heart Hairpin
-//=======================================================================================================//
+// 'Bao Bao', 'Crescent Hairpin', 'Fashionable Glasses', 'Heart Hairpin' Quest
+//============================================================
 alberta,120,53,1	script	Stylish Merchant#new30	51,{
 	if ((countitem(10007) > 0) && (countitem(968) > 49)) {
 		mes "[Zic]";
@@ -652,9 +645,8 @@ alberta,120,53,1	script	Stylish Merchant#new30	51,{
 	}
 }
 
-//=======================================================================================================//
-//				Hat of Sun God, Sunday Hat, Mage Hat, Magician Hat
-//=======================================================================================================//
+// 'Hat of the Sun God', 'Sunday Hat', 'Mage Hat', 'Magician Hat' Quest
+//============================================================
 alberta,136,79,1	script	Hat store girl#new30	71,{
 	mes "[Tempestra]";
 	mes "Ah, such a cool breeze. It's good to visit the seashore. I think it was the right choice to come here to take a break from my business.";
@@ -954,15 +946,14 @@ alberta,136,79,1	script	Hat store girl#new30	71,{
 	}
 }
 
-//=======================================================================================================//
-//						Turtle Quest
-//=======================================================================================================//
+// Turtle Quest
+//============================================================
 alberta,91,70,4	script	Kinsey#tur	89,{
 	mes "[Kinsey]";
 	mes "What does a man have to do to get a stiff drink around here? I mean, there are absolutely no good bars in Alberta!";
 	next;
 	mes "[Kinsey]";
-	mes " Well, the alcohol in the pub here is second rate, but I gotta admit, it's got a great atmosphere.";
+	mes "Well, the alcohol in the pub here is second rate, but I gotta admit, it's got a great atmosphere.";
 	next;
 	mes "[Kinsey]";
 	mes "In fact, this old man is always there, telling stories about Turtle Island! But we're not sure if he's been there, or if he's just that drunk.";
diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt
index 9a4bde3f1..eb3ef7e38 100644
--- a/npc/quests/quests_aldebaran.txt
+++ b/npc/quests/quests_aldebaran.txt
@@ -15,10 +15,8 @@
 //= 1.3 Updated headgear NPC. [L0ne_W0lf]
 //============================================================ 
 
-
-//=======================================================================================================//
-//			'Doctor Band', 'Feather Bonnet', 'Opera Masque', 'Sakkat Hat' Quest
-//=======================================================================================================//
+// 'Doctor Band', 'Feather Bonnet', 'Opera Masque', 'Sakkat Hat' Quest
+//============================================================
 aldeba_in,152,166,4	script	Trader#01	86,{
 	mes "[Trader]";
 	mes "Who is this mysterious man?";
diff --git a/npc/quests/quests_geffen.txt b/npc/quests/quests_geffen.txt
index 1ac2330b1..b7f4550d7 100644
--- a/npc/quests/quests_geffen.txt
+++ b/npc/quests/quests_geffen.txt
@@ -16,9 +16,8 @@
 //= 1.4 Updated welding mask and headset quests. [L0ne_W0lf]
 //============================================================ 
 
-//==============================================================================================//
-// 					Blacksmith: 'Welding Mask' Quest
-//==============================================================================================//
+// Blacksmith: 'Welding Mask' Quest
+//============================================================
 geffen_in,144,166,4	script	Blacksmith	63,{
 	mes "[Blacksmith]";
 	mes "You've never heard of me? Why, I'm the Veteran Blacksmith of this land. I've spent 30 years in this hot and bloody hellfire, bending steel to my iron will!";
@@ -83,11 +82,8 @@ geffen_in,144,166,4	script	Blacksmith	63,{
 	}
 }
 
-
-
-//=============================================================================================//
-//					Eric: Headset Quest
-//=============================================================================================//
+// Eric: 'Headset' Quest
+//============================================================
 geffen_in,30,71,4	script	Eric	83,{
 	mes "[Eric]";
 	mes "Please listen";
@@ -136,11 +132,11 @@ geffen_in,30,71,4	script	Eric	83,{
 		close;
 	case 3:
 		if ((countitem(999) > 39) && (countitem(984) > 0) && (countitem(970) > 0) && (countitem(1003) > 0)) {
-			delitem 999,40;  //Steel
-			delitem 984,1;  //Oridecon
-			delitem 970,1;  //Alchol
-			delitem 1003,1;  //Coal
-			getitem 5001,1; // Headset
+			delitem 999,40; //Steel
+			delitem 984,1; //Oridecon
+			delitem 970,1; //Alchol
+			delitem 1003,1; //Coal
+			getitem 5001,1; //Headset
 			mes "*Tap! Tap! Tap!*";
 			next;
 			mes "[Eric]";
diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index d81eedd54..f4e7bfa0f 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 2.1
 //===== Compatible With: =====================================
-//= rAthena
+//= rAthena SVN
 //===== Description: =========================================
 //= Quest NPC's related to Hugel
 //===== Additional Comments: =================================
@@ -27,10 +27,8 @@
 //=     - Juno Remedy Quest
 //============================================================
 
-//-------------------------------------------------------------------------
 // Medicine Quest
-//-------------------------------------------------------------------------
-
+//============================================================
 hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 
 	if(BaseLevel > 49)
@@ -799,10 +797,8 @@ OnTimer4500:
 	
 }
 
-//-------------------------------------------------------------------------
 // Biological Weapon Quest
-//-------------------------------------------------------------------------
-
+//============================================================
 ein_in01,16,36,3	script	Morriphen	86,{
 
 	if(hg_bio == 0)
@@ -2057,10 +2053,8 @@ lhz_in03,193,28,3	script	Makkie	83,{
 	
 }
 
-//-------------------------------------------------------------------------
 // Rebellion Quest
-//-------------------------------------------------------------------------
-
+//============================================================
 hugel,70,137,5	script	Shede	879,{
 
 	cutin "siide1.bmp",2;
@@ -3500,14 +3494,14 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "in creating a type of machine called ^FF0000Guardian^000000.";
 					mes "I have a bad feeling about that, so I decided to write a journal";
 					mes "starting from today and keep everything in record.";
-					mes "��";
+					mes " ";
 					mes "\"^FF0000Guardian^000000\" is an android";
 					mes "that was created based on the idea of \"^3131FFGiantes^000000\",";
 					mes "the giant tribe that was said to live in an ancient age.";
 					mes "It is memorized with various commands,";
 					mes "so it is said to handle difficult things for humans as protecting";
 					mes "important facilities and such.";
-					mes "��";
+					mes " ";
 					mes "However, those things are our job, the mercenary soldiers' job.";
 					mes "Mercenary soldier groups in many areas";
 					mes "are already agitated by the news of the Guardian creation.";
@@ -3543,7 +3537,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "hard works. But it doesn't seem to be true.";
 					mes "To me, they are nothing but \"^FF0000weapons of mass destruction^000000\".";
 					mes "Perhaps, they might be intended to be that way from the beginning.";
-					mes "��";
+					mes " ";
 					mes "What is going to be next after we finish testing the machines?";
 					mes "No matter how bad other people criticize us for being greedy toward money,";
 					mes "we always take pride in what we are doing, and we always do our best.";
@@ -3551,7 +3545,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "But, now, we are losing our place to the lifeless machines.";
 					mes "Many people have quit this job after the machines were introduced.";
 					mes "I must admit that I am also being shaken by the thought.";
-					mes "��";
+					mes " ";
 					mes "Bah, god damn you, Rekenber! You just have created the worst invention in history!";
 					next;
 					mes "...............................";
@@ -3579,7 +3573,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "One of the guardians caused an error and brought havoc.";
 					mes "While we were terrified and didn't know what to do, that broken guardian";
 					mes "crushed the commander of 'Blade Canine Mercenary' to death.";
-					mes "��";
+					mes " ";
 					mes "I can't remember how we could regain control over the broken guardian.";
 					mes "My mind is still baffled for the fact that that machine actually killed an innocent guy as I was kind of worried about.";
 					mes "Many people were dispatched from Rekenber to investigate this matter, so hopefully they will figure out";
@@ -3601,17 +3595,17 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "Rekenber must have bribed the upper management of our troops with money.";
 					mes "Otherwise, why would they want us to keep our mouth sealed about a such shocking incident?";
 					mes "We, angry mercenary soldiers burst into rage right after the morning session was over.";
-					mes "��";
+					mes " ";
 					mes "We went ahead and spread the story about the shocking incident to every mercenary troops.";
 					mes "And then we destroyed every guardian which we found in hangars.";
 					mes "The sounds of hammering metal and sirens were echoing everywhere, everywhere you went.";
-					mes "��";
+					mes " ";
 					mes "...We took refuge in a safe place out of our unit because of what happened.";
 					mes "We are planning to assert our social security to the public and inform the public with";
 					mes "the danger of the guardians and the negligence of the government and Rekenber toward the incident.";
 					mes "Our leader told us that he has sent out letters to every mercenary troop";
 					mes "to encourage them to participate in what we are trying to do.";
-					mes "��";
+					mes " ";
 					mes "I feel like...that I have just turn into a no-way-out.";
 					mes "I am facing my future with a deep sense of gloom.";
 					next;
@@ -3648,7 +3642,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "But we were too weak to compete with their invincible guardians. We were literally swept away.";
 					mes "They were quicker than we expected in taking action, and lines and lines of guardians were coming after us.";
 					mes "There was nothing that we could do. We met with a disastrous defeat in the battle with guardians.";
-					mes "��";
+					mes " ";
 					mes "Everybody is still in shock, but we can't give up now.";
 					mes "I think that we are going to visit a house of a sage called \"Varmunt\" early in the morning.";
 					mes "I don't know why, but it seems that the sage is against the use of guardians.";
@@ -3695,13 +3689,13 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "Although I didn't have a time to write a journal that time, the last fight in the Varmunt mansion turned out to be our miserable defeat...as I was worried.";
 					mes "I was told that Sage Varmunt disappeared after the fight, and all of his documents were taken by Rekenber.";
 					mes "I am afraid that they might create a more powerful version of the existing guardian by using his documents.";
-					mes "��";
+					mes " ";
 					mes "I lost one arm during the last fight, and I barely escaped to Hugel.";
 					mes "I feel so lucky to be in Hugel, because when I arrived, I was a total mess with only one arm,";
 					mes "but the people in this town did not ask me anything but welcomed me.";
 					mes " ";
 					mes "I have nowhere to go any longer. I am planning to live my life here as long as nothing happens soon.";
-					mes "��";
+					mes " ";
 					mes "My arm is throbbing with pain again. The history of mercenary soldiers ended, and I need to rest.";
 					mes "I hope that this will be the last page of my journal.";
 					if(hg_tre == 48) set hg_tre,49;
@@ -4607,10 +4601,8 @@ hu_in01,377,106,3	script	Pub Granny	892,{
 	close;
 }
 
-//-------------------------------------------------------------------------
 // Memory Quest
-//-------------------------------------------------------------------------
-
+//============================================================
 hugel,198,169,0	script	#HugelTree	139,2,2,{
 
 	if(BaseLevel > 49)
@@ -5379,10 +5371,8 @@ hugel,196,164,3	script	El Schatt	50,{
 
 }
 
-//-------------------------------------------------------------------------
-// Hide and Seek quest
-//-------------------------------------------------------------------------
-
+// Hide and Seek Quest
+//============================================================
 hugel,107,67,3	script	Torpy	706,{
 
 	if(BaseLevel > 49)
@@ -6033,10 +6023,8 @@ OnTimer60000:
 	
 }
 
-//-------------------------------------------------------------------------
-// Fish cake soup delivery
-//-------------------------------------------------------------------------
-
+// Fish Cake Soup Delivery Quest
+//============================================================
 hu_in01,15,372,3	script	Cellette Lavit	74,{
 
 	if(!hg_odeng)
@@ -6810,10 +6798,8 @@ hugel,102,161,3	script	Erjan	100,{
 	}
 }
 
-//-------------------------------------------------------------------------
 // Juno Remedy Quest
-//-------------------------------------------------------------------------
-
+//============================================================
 yuno,111,156,3	script	Euslan	90,{
 
 	if(BaseLevel < 60)
@@ -7614,10 +7600,8 @@ OnTouch:
 	}
 }
 
-//-------------------------------------------------------------------------
 // Cow Milking Quest
-//-------------------------------------------------------------------------
-
+//============================================================
 hugel,56,104,3	script	Kurupe	709,3,3,{
 
 	if(hg_milk == 1)
@@ -8467,10 +8451,8 @@ function	script	Func_MilkCow	{
 	close;
 }
 
-//-------------------------------------------------------------------------
-// Odin Temple Excavation quest
-//-------------------------------------------------------------------------
-
+// Odin Temple Excavation Quest
+//============================================================
 hugel,91,152,1	script	Sign	837,{
 
 	mes "**Recruitment Notice**";
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 7d686ad92..64d468837 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -79,8 +79,8 @@
 //= 4.7 Fixed missing label. (bugreport:4654) [L0ne_W0lf]
 //============================================================ 
 
-// Gangster Alert [Aegis Conversion]
-//------------------------------------------------------------
+// Gangster Alert [Official Conversion]
+//============================================================
 lighthalzen,1,1,0	script	Law Enforcement	-1,{
 	end;
 
@@ -236,10 +236,8 @@ lighthalzen,294,223,7	script	Guard#lhz02	868,{
 	}
 }
 
+// Cube Room Quest
 //============================================================
-// Cube Room
-//============================================================
-
 lighthalzen,341,224,3	script	Fishbone	868,{
 	// Retain prior position in quest.
 	if (piciburn) {
@@ -1759,10 +1757,8 @@ OnTouch:
 	close;
 }
 
-//============================================================
 // Lighthalzen Pickpocket Mini-Quest
 //============================================================
-
 lighthalzen,240,216,4	script	Suspicious Guy#lhz_01	870,2,2,{
 	end;
 
@@ -2086,10 +2082,8 @@ OnTouch:
 	}
 }
 
-//==============================================================
-// Friendship
-//==============================================================
-
+// Friendship Quest
+//============================================================
 lhz_in02,201,210,5	script	Digotz	869,{
 	if (BaseLevel < 50) {
 		mes "[Digotz]";
@@ -3403,8 +3397,8 @@ yuno_in04,168,117,3	script	Book#lhz	111,{
 	close;
 }
 
-///Cursed Spirit Quest
-
+// Cursed Spirit Quest
+//============================================================
 lhz_dun01,147,106,0	script	#kiz01-1	-1,3,3,{
 OnTouch_:
 	if (countitem(7345) > 0 ) {
@@ -6371,8 +6365,8 @@ lhz_in01,269,114,3	script	A File#li-1	111,{
 	close;
 }
 
-// President Quest aka. Schwartzvalt Trilogy Quest
-
+// President Quest, a.k.a. Schwartzvalt Triology Quest
+//============================================================
 lighthalzen,179,170,4	script	Ordinary Man	98,{
 
 	if(!lhz_boss)
@@ -10339,7 +10333,7 @@ lhz_in02,19,274,2	script	Maintenance Guy	851,{
 }
 
 // Rekenber Job Quest
-
+//============================================================
 lhz_in01,174,258,3	script	Young Man#reken	868,{
 
 	if(lhz_rekenber > 21)
diff --git a/npc/quests/quests_niflheim.txt b/npc/quests/quests_niflheim.txt
index 4dd43840c..c23c5ba31 100644
--- a/npc/quests/quests_niflheim.txt
+++ b/npc/quests/quests_niflheim.txt
@@ -28,9 +28,8 @@
 //=     Clicking will do nothing, you have to still "touch" the npc. 
 //============================================================ 
 
-//=============================================================
-//Piano Quest
-//=============================================================
+// Piano Quest
+//============================================================
 niflheim,224,243,3	script	Alreg#nif	795,{
 	if (nif_piano) set nif_piano,0;
 	mes "[Alreg]";
@@ -114,12 +113,8 @@ nif_in,105,81,3	script	Crayu#nif	794,{
 			mes "favorite guests. Here's a";
 			mes "little reward for you.";
 			next;
-			if (nif_esc == 1) {
-				set nif_esc,3;
-			}
-			else {
-				set nif_esc,6;
-			}
+			if (nif_esc == 1) set nif_esc,3;
+			else set nif_esc,6;
 			getitem 7184,1; //Piano_Keyboard
 			mes "[Crayu]";
 			mes "Lastly, I hope you will show your";
@@ -190,12 +185,10 @@ OnTouch:
 		next;
 		mes "^3355FFWould you like to pick it up?^000000";
 		if (select("Yes:No") == 1) {
-			if (nif_esc < 10) {
+			if (nif_esc < 10)
 				set nif_esc,nif_esc+2;
-			}
-			else if (nif_esc == 10) {
+			else if (nif_esc == 10)
 				set nif_esc,11;
-			}
 			getitem 7184,1; //Piano_Keyboard
 		}
 		close;
@@ -301,9 +294,8 @@ nif_in,188,168,3	script	Witch#nif	792,{
 	end;
 }
 
-//=============================================================
 // Message Delivery Quest
-//=============================================================
+//============================================================
 prt_in,161,20,3	script	Erious#nif	92,{
 	if (MISC_QUEST & 16384) {
 		mes "[Erious]";
@@ -578,12 +570,7 @@ umbala,215,181,3	script	Billik	733,{
 niflheim,153,215,3	script	Feylin	794,{
 	if (nif_revive == 2) {
 		mes "[Feylin]";
-		if (Sex == 1) {
-			mes "Poor guy...";
-		}
-		else {
-			mes "Poor girl...";
-		}
+		mes "Poor "+((Sex)?"guy":"girl")+"...";
 		mes "Dying at such a young age...";
 		mes "I am always sorry to see the";
 		mes "young pass away.";
diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt
index 0e1f7ab66..719e3a543 100644
--- a/npc/quests/quests_payon.txt
+++ b/npc/quests/quests_payon.txt
@@ -9,7 +9,6 @@
 //===== Description: ========================================= 
 //= Pretend Murder, Ear Muffs, Oxygen, Derivuchi Cap, Helm of Angel Quests.
 //===== Additional Comments: ================================= 
-//= Fully working
 //= 1.1 Helm of Angel bug fixed [Lupus]
 //= 1.2 Fixed skirt of virgin [Lupus]
 //= 1.3 Fixed exploits [Lupus]
@@ -20,11 +19,8 @@
 //= 1.7 Updated headgear quests. [L0ne_W0lf]
 //============================================================ 
 
-
-
-//==========================================================================================//
-//				Pretend Murdered quest
-//==========================================================================================//
+// 'Pretend Murdered' Quest
+//============================================================
 payon_in01,99,72,4	script	Granny	103,{
 	if (checkweight(908,1) == 0) {
 		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
@@ -75,9 +71,8 @@ payon_in01,99,72,4	script	Granny	103,{
 	}
 }
 
-//========================================================================================//
-//					Ear Muffs Quest
-//========================================================================================//
+// 'Ear Muffs' Quest
+//============================================================
 payon_in01,18,10,4	script	Mystic Lady	76,{
 	mes "[Mystic Lady]";
 	mes "My family has produced and sold the special Winter product ^3355FFEar Muffs^000000 for many years. We just moved here, but the weather is always warm so we can hardly make a living.";
@@ -124,9 +119,8 @@ payon_in01,18,10,4	script	Mystic Lady	76,{
 	}
 }
 
-//========================================================================================//
-//					Oxygen Mask Quest
-//========================================================================================//
+// 'Oxygen Mask' Quest
+//============================================================
 payon_in02,25,71,4	script	Boy	86,{
 	if (countitem(701) > 4) {
 		mes "[Young Man]";
@@ -220,9 +214,8 @@ payon_in02,25,71,4	script	Boy	86,{
 	}
 }
 
-//========================================================================================//
-//			Derivuchi Cap(Hat of Petite Diablo), Helm of Angel
-//========================================================================================//
+// 'Helm of Angel' and 'Deviruchi Cap' Quest
+//============================================================
 payon_in01,56,12,7	script	Young man#12	89,{
 	mes "[Young man]";
 	mes "...What is it?";
@@ -232,7 +225,7 @@ payon_in01,56,12,7	script	Young man#12	89,{
 		mes "[Young man]";
 		mes "Huh? So you already know what I specialize in, eh? I suppose there's no need for the usual secrecy. Tell me what you want.";
 		next;
-		switch(select("Helm of Angel.:Deviruchi cap.:I will come next time.")) {
+		switch(select("Helm of Angel.:Deviruchi Cap.:I will come next time.")) {
 		case 1:
 			mes "[Young man]";
 			mes "1 Helm (with slot).";
diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt
index e7b632cc2..11a5f1acb 100644
--- a/npc/quests/quests_umbala.txt
+++ b/npc/quests/quests_umbala.txt
@@ -10,18 +10,18 @@
 //= [Aegis Conversion]
 //= Umbalian Language Quest, Umbala Skeletal Gate Quest,
 //= Umbala Event, Create Essence/Dismantle Stone
-//	Phase1.Learning the Language
-//	1	(Elder)First discussion
-//	2	(Elder)Asking about learning the language
-//	3	(Elder)Final step (understanding NPC speech)
+//	Phase 1. Learning the Language
+//	  (Elder) First discussion
+//	  (Elder) Asking about learning the language
+//	  (Elder) Final step (understanding NPC speech)
 //	------------------------------------------
-//	Phase2.Create Essence/Dismantle Stone
-//	4	(Shaman)Get permission to speak with her from the chief
-//	5	(Elder)Ask about conditions needed to be fulfilled to get permission
-//	6	(Elder)Get permission
-//	7	(Shaman)Use the shaman to create essences and dismantle elemental stones.
+//	Phase 2. Create Essence/Dismantle Stone
+//	 (Shaman) Get permission to speak with her from the chief
+//	  (Elder) Ask about conditions needed to be fulfilled to get permission
+//	  (Elder) Get permission
+//	 (Shaman) Use the shaman to create essences and dismantle elemental stones.
 //= Umbala Domestic Dispute?
-//= - This quest is only avaliable if you ahve not done language quest.
+//= - This quest is only avaliable if you have not done language quest.
 //= - Variables in use: um_wind, MISC_QUEST (Bit 32768)
 //===== Additional Comments: ================================= 
 //= fixed by x[tsk], Lupus, PoW
@@ -39,9 +39,8 @@
 //= 2.2a Fixed weight check from previous update. [L0ne_w0lf]
 //============================================================ 
 
-//==============================================================================
-// Umbala Language Quest
-//==============================================================================
+// Umbalian Language Quest
+//============================================================
 um_in,39,122,5	script	Utan Chief	784,{
 	if (event_umbala == 0) {
 		mes "[Karkatan]";
@@ -363,9 +362,8 @@ um_in,39,122,5	script	Utan Chief	784,{
 	}
 }
 
-//=====================================================================
-//                    Create Essence/Dismantle Stone
-//=====================================================================
+// Create Essence/Dismantle Stone Quest
+//============================================================
 um_in,44,71,2	script	Utan Shaman	782,{
 	if (checkweight(908,600) == 0) {
 		mes "^3355FFWait a second!";
@@ -981,9 +979,7 @@ umbala,221,193,1	script	#Skulldoor	111,{
 	}
 }
 
-
-//============================================================ 
-// Umbala Domestic Dispute
+// Umbala Domestic Dispute Quest
 //============================================================ 
 um_in,139,48,5	script	Phrenetan	783,{
 	if (event_umbala >= 3) {
diff --git a/npc/quests/quests_yuno.txt b/npc/quests/quests_yuno.txt
index 9acf3b7fa..69c7d67c1 100644
--- a/npc/quests/quests_yuno.txt
+++ b/npc/quests/quests_yuno.txt
@@ -36,7 +36,7 @@
 //============================================================ 
 
 // Metto Quest
-
+//============================================================
 yuno_in03,26,39,3	script	Metto#juno	709,{
 	mes "[Metto]";
 	if (metto_q == 0) {
@@ -424,7 +424,8 @@ yuno_in03,178,43,0	script	CiCi#juno	121,{
 	}
 }
 
-// Alechmist Brothers
+// Alchemist Brothers Quest
+//============================================================
 yuno_in01,103,157,3	script	Bain#juno	98,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";