Follow up r16430, reverted all the pre-re guides to their pre-renewal version. Disabled a couple of renewal quests from pre-renewal.

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

23 files changed, 2682 insertions, 3186 deletions

diff --git a/npc/pre-re/guides/guides_alberta.txt b/npc/pre-re/guides/guides_alberta.txt
index 7420fbf00..c08894f52 100644
--- a/npc/pre-re/guides/guides_alberta.txt
+++ b/npc/pre-re/guides/guides_alberta.txt
@@ -1,261 +1,159 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Alberta Guides
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
+//===== By: ==================================================
+//= kobra_k88; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.5a
+//===== Compatible With: =====================================
 //= rAthena  SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Guides for the city of Alberta
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guides.
-//============================================================ 
+//===== Additional Comments: =================================
+//= Fully working
+//= 1.1 Fixed Armory coords, thanks to Freya team
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.3 Updated the guide according to how it is on iRO, thanks [MasterOfMuppets]
+//=     to Muad_Dib
+//= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
+//= 1.5 Rescripted to official 10.3 standards. [L0ne_W0lf]
+//= 1.5 Fixed some errors with the loop[Samuray22]
+//	-Thanks to $ephiroth.
+//============================================================
 
-alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
+alberta,23,238,4	script	Guide#alb::AlbGuide	105,{
 	cutin "prt_soldier",2;
 	mes "[Alberta Guide]";
-	mes "Welcome to ^8B4513Alberta^000000,";
-	mes "the Port City.";
-	mes "Do you need help navigating the city?";
-	next;
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:[ Destination Ports ]:Remove Marks from Mini-Map:Cancel")) {
+	mes "Welcome to Alberta,";
+	mes "the Port City. Feel free";
+	mes "to ask me if you're having";
+	mes "trouble finding anything in";
+	mes "town, or if you just need";
+	mes "guidance around the city.";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice:Cancel")) {
 		case 1:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Tool Shop ]:[ Forge ]:[ Weapon & Armor Shop ]:[ Inn ]:[ Beauty Salon ]:[ Merchant Guild ]:Previous Menu")) {
+			mes "[Alberta Guide]";
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes:No") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while (.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+				
+				switch(select("^FF0000Merchant Guild^000000:Weapon Shop:Tool Shop:Inn:Forge:Cancel")) {
 				case 1:
 					mes "[Alberta Guide]";
-					mes "Let me mark the location of the";
-					mes "the ^0000FFTool Shop^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,98,154,0,0x0A82FF;
-					next;
+					mes "The Merchant Guild";
+					mes "handles Job Changes";
+					mes "to the Merchant Class,";
+					mes "and is located in the";
+					mes "southwest corner";
+					mes "of Alberta.";
+					if (.@compass_check)
+						viewpoint 1,33,41,2,0xFF0000;
 					break;
 				case 2:
 					mes "[Alberta Guide]";
-					mes "The ^B9062FForge^000000 is currently";
-					mes "located inside the Merchant Guild building.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,35,41,1,0xFF0000;
-					next;
+					mes "The Weapon Shop";
+					mes "can be found in the";
+					mes "southern end of Alberta.";
+					if (.@compass_check)
+						viewpoint 1,117,37,3,0xFF00FF;
 					break;
 				case 3:
 					mes "[Alberta Guide]";
-					mes "Let me mark the location of the";
-					mes "the ^FF5400Weapon & Armor Shop^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,117,37,2,0xFFB400;
-					next;
+					mes "The Tool Shop";
+					mes "is kind of close";
+					mes "to the center of";
+					mes "Alberta. It shouldn't";
+					mes "be too hard to find.";
+					if (.@compass_check)
+						viewpoint 1,98,154,4,0xFF00FF;
 					break;
 				case 4:
 					mes "[Alberta Guide]";
-					mes "Let me mark the location of the";
-					mes "the ^006400Inn^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,65,233,3,0xAAFF00;
-					next;
+					mes "There's an Inn";
+					mes "at the northern";
+					mes "end of Alberta";
+					mes "where you can rest.";
+					if (.@compass_check)
+						viewpoint 1,65,233,5,0xFF00FF;
 					break;
 				case 5:
 					mes "[Alberta Guide]";
-					mes "Let me mark the location of the";
-					mes "the ^7F3300Beauty Salon^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,48,145,4,0xD2691E;
-					next;
+					mes "The Forge in Alberta";
+					mes "is in the same building";
+					mes "as the Merchant Guild.";
+					mes "It's to the southwest.";
+					if (.@compass_check)
+						viewpoint 1,35,41,6,0xFF00FF;
 					break;
 				case 6:
 					mes "[Alberta Guide]";
-					mes "The Merchant Guild is where";
-					mes "you can change your job to ^800080Merchant.";
-					mes "Let me mark its location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,33,41,5,0xDA70D6;
-					next;
-					break;
-				case 7:
-					set .@loop,0;
-					break;
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
 				}
 			}
 			break;
 		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Cool Event Employee ]:[ Bullet Merchant ]:[ Cooking Ingredient Merchant ]:Previous Menu")) {
-				case 1:
-					mes "[Alberta Guide]";
-					mes "^B9062FEden Teleport Officers^000000 are located in south Alberta";
-					mes "and inside the Merchant Guild building.";
-					mes "Let me mark their locations on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,33,41,6,0xFF0000;
-					viewpoint 1,121,68,7,0xFF0000;
-					next;
-					break;
-				case 2:
-					mes "[Alberta Guide]";
-					mes "Let me mark the location of the";
-					mes "^0000FFKafra Employees^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,33,41,8,0x0A82FF;
-					viewpoint 1,113,60,9,0x0A82FF;
-					next;
-					break;
-				case 3:
-					mes "[Alberta Guide]";
-					mes "When you win event items,";
-					mes "you can claim them through the ^FF5400Cool Event Employee^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,148,57,10,0xFFB400;
-					next;
-					break;
-				case 4:
-					mes "[Alberta Guide]";
-					mes "The ^7F3300Bullet Merchants^000000 for ^7F3300Gunslingers^000000";
-					mes "are located";
-					mes "near the center of the city.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,117,158,11,0xD2691E;
-					next;
-					break;
-				case 5:
-					mes "[Alberta Guide]";
-					mes "The ^006400Chef Assistant^000000 in Alberta";
-					mes "has many regular customers,";
-					mes "especially for his ^006400Delicious Fishes^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,167,135,12,0xAAFF00;
-					next;
-					break;
-				case 6:
-					set .@loop,0;
-					break;
-				}
-			}
+			viewpoint 2,237,41,2,0xFF0000;
+			viewpoint 2,237,41,3,0xFF00FF;
+			viewpoint 2,46,345,4,0xFF00FF;
+			viewpoint 2,175,220,5,0xFF00FF;
+			viewpoint 2,175,220,6,0xFF00FF;
+			set .@compass_check,0;
 			break;
 		case 3:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Port - Northern Dock ]:[ Port - Brasilis ]:[ Port - Amatsu ]:[ Port - Kunlun ]:[ Port - Moscovia ]:[ Port - Louyang ]:[ Port - Ayothaya ]:Previous Menu")) {
-				case 1:
-					mes "[Alberta Guide]";
-					mes "You can use";
-					mes "the ^B9062FNorthern Dock^000000";
-					mes "to go to the ^B9062FSunken Ship^000000 or ^B9062FIzlude Marina^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,192,151,13,0xFF0000;
-					next;
-					break;
-				case 2:
-					mes "[Alberta Guide]";
-					mes "Please talk to the ^800080Crewman^000000 at the Alberta Port";
-					mes "if you'd like to visit ^800080Brasilis^000000,";
-					mes "the City of Passion.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,82,14,0xDA70D6;
-					next;
-					break;
-				case 3:
-					mes "[Alberta Guide]";
-					mes "Please talk to the";
-					mes "the ^0000FFSea Captain^000000 at the Alberta Port";
-					mes "if you'd like to enjoy viewing cherry blossoms";
-					mes "in ^0000FFAmatsu^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,74,15,0x0A82FF;
-					next;
-					break;
-				case 4:
-					mes "[Alberta Guide]";
-					mes "Please talk to the";
-					mes "^B9062FKunlun Envoy^000000 at the Alberta Port";
-					mes "if you'd like to experience the exotic atmosphere of ^B9062FKunlun^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,62,16,0xFF0000;
-					next;
-					break;
-				case 5:
-					mes "[Alberta Guide]";
-					mes "Please talk to the";
-					mes "^FF5400Moscovia P.R. Officer^000000 at the Alberta Port";
-					mes "if you'd like to move to";
-					mes "^FF5400Moscovia^000000,";
-					mes "the Eden on the ocean.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,51,17,0xFFB400;
-					next;
-					break;
-				case 6:
-					mes "[Alberta Guide]";
-					mes "Please talk to the";
-					mes "^7F3300Girl^000000 at the Alberta Port";
-					mes "if you'd like to move to the historical city,";
-					mes "^7F3300Louyang^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,40,18,0xD2691E;
-					next;
-					break;
-				case 7:
-					mes "[Alberta Guide]";
-					mes "Please talk to";
-					mes "^800080Aibakthing^000000 at the Alberta Port";
-					mes "if you'd like to move to";
-					mes "^800080Ayothaya^000000,";
-					mes "the religious city.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,29,19,0xDA70D6;
-					next;
-					break;
-				case 8:
-					set .@loop,0;
-					break;
-				}
-			}
-			break;
-		case 4:
 			mes "[Alberta Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,1,1,0,0xFFFF00;
-			viewpoint 2,1,1,1,0x000000;
-			viewpoint 2,1,1,2,0xFF0000;
-			viewpoint 2,1,1,3,0xFFFF00;
-			viewpoint 2,1,1,4,0xFFFF00;
-			viewpoint 2,1,1,5,0xFFFF00;
-			viewpoint 2,1,1,6,0xFFFF00;
-			viewpoint 2,1,1,7,0xFFFF00;
-			viewpoint 2,1,1,8,0xFFFF00;
-			viewpoint 2,1,1,9,0xFFFF00;
-			viewpoint 2,1,1,10,0xFFFF00;
-			viewpoint 2,1,1,11,0xFFFF00;
-			viewpoint 2,1,1,12,0x000000;
-			viewpoint 2,1,1,13,0xFFFF00;
-			viewpoint 2,1,1,14,0xFFFF00;
-			viewpoint 2,1,1,15,0xFFFF00;
-			viewpoint 2,1,1,16,0xFFFF00;
-			viewpoint 2,1,1,17,0xFFFF00;
-			viewpoint 2,1,1,18,0xFFFF00;
-			viewpoint 2,1,1,19,0xFFFF00;
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
+			next;
+			mes "[Alberta Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
 			next;
+			mes "[Alberta Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in the city of Alberta.";
 			break;
-		case 5:
+		case 4:
 			mes "[Alberta Guide]";
-			mes "Enjoy your stay.";
+			mes "Be safe when you";
+			mes "travel and don't hesitate";
+			mes "to ask me if you have any";
+			mes "questions about Alberta.";
 			close2;
-			cutin "prt_soldier",255;
-			end;
+			set .@loop1,0;
 		}
 	}
+	cutin "prt_soldier",255;
+	end;
 }
 
-alberta,120,60,3	duplicate(AlbertaGuide)	Guide#02alberta	105
-alberta,184,143,4	duplicate(AlbertaGuide)	Guide#03alberta	105
+alberta,120,60,3	duplicate(AlbGuide)	Guide#2alb	105
\ No newline at end of file
diff --git a/npc/pre-re/guides/guides_aldebaran.txt b/npc/pre-re/guides/guides_aldebaran.txt
index c417761fc..ba8fd1636 100644
--- a/npc/pre-re/guides/guides_aldebaran.txt
+++ b/npc/pre-re/guides/guides_aldebaran.txt
@@ -1,163 +1,109 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Al De Baran Guides
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena  SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guides for the city of Al De baran
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//============================================================ 
+//===== By: ==================================================
+//= kobra_k88; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.7
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= [Official conversion]
+//= Guides for the City of Al De Baran
+//===== Additional Comments: =================================
+//= Corrected building locations and descriptions
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.3 Updated the guide according to how it is on iRO, thanks [MasterOfMuppets]
+//=     to Muad_Dib
+//= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
+//= 1.5 Removed Duplicates [Silent]
+//= 1.6 Rescripted to official 10.3 standards. [L0ne_W0lf]
+//= 1.6a Changed some "close"s to "close2"s. (bugreport:1597) [Samuray22]
+//= 1.7 Fixed viewpoint coordinates [Playtester]
+//============================================================
 
-aldebaran,139,63,4	script	Guide#01aldebaran::GuideAldearan	105,{
+aldebaran,139,63,4	script	Soldier#alde	105,{
 	cutin "prt_soldier",2;
-	mes "[Al De Baran Guide]";
-	mes "Welcome to ^8B4513Al De Baran^000000,";
-	mes "the Border City.";
-	mes "Do you need help navigating the city?";
+	mes "[Al De Baran Guard]";
+	mes "I'm just an ordinary guard";
+	mes "that you could find in any other city. I don't think I even have a name...";
 	next;
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
-		case 1:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Kafra Headquarters ]:[ Alchemist Guild ]:[ Clock Tower ]:[ Inn & Tool Shop ]:[ Repair & Buy Equipment ]:[ Tavern ]:Previous Menu")) {
-				case 1:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "^B9062FKafra Headquarters^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,61,229,0,0xFF0000;
-					next;
-					break;
-				case 2:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "the ^0000FFAlchemist Guild^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,60,60,1,0x0A82FF;
-					next;
-					break;
-				case 3:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "the ^FF5400Clock Tower^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,139,133,2,0xFFB400;
-					next;
-					break;
-				case 4:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "the ^006400Inn^000000 and";
-					mes "the ^006400Tool Shop^000000 building";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,197,70,3,0xAAFF00;
-					next;
-					break;
-				case 5:
-					mes "[Al De Baran Guide]";
-					mes "If you'd like to ^7F3300Buy or Repair Equipment^000000,";
-					mes "then this is the place you'll want to visit.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,72,197,4,0xD2691E;
-					next;
-					break;
-				case 6:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "the ^800080Tavern^000000";
-					mes "on your mini-map.";
-					viewpoint 1,231,106,5,0xDA70D6;
-					next;
-					break;
-				case 7:
-					set .@loop,0;
-					break;
-				}
-			}
-			break;
-		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Mr. Claus ]:[ Chef Assistant ]:Previous Menu")) {
-				case 1:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "^B9062FEden Teleport Officer^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,133,119,6,0xFF0000;
-					next;
-					break;
-				case 2:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "^0000FFKafra Employee^000000";
-					mes "on your mini-map.";
-					viewpoint 1,143,119,7,0x0A82FF;
-					next;
-					break;
-				case 3:
-					mes "[Al De Baran Guide]";
-					mes "Mr. Claus can teleport";
-					mes "you to ^006400Lutie^000000.";
-					mes "Let me mark his location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,168,168,8,0xAAFF00;
-					next;
-					break;
-				case 4:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "^7F3300Chef Assistant^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,165,107,9,0xD2691E;
-					next;
-					break;
-				case 5:
-					set .@loop,0;
-					break;
-				}
-			}
-			break;
-		case 3:
-			mes "[Al De Baran Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,1,1,0,0xFFFF00;
-			viewpoint 2,1,1,1,0x000000;
-			viewpoint 2,1,1,2,0xFF0000;
-			viewpoint 2,1,1,3,0xFFFF00;
-			viewpoint 2,1,1,4,0xFFFF00;
-			viewpoint 2,1,1,5,0xFFFF00;
-			viewpoint 2,1,1,6,0xFFFF00;
-			viewpoint 2,1,1,7,0xFFFF00;
-			viewpoint 2,1,1,8,0xFFFF00;
-			viewpoint 2,1,1,9,0xFFFF00;
-			next;
-			break;
-		case 4:
-			mes "[Al De Baran Guide]";
-			mes "Alright then,";
-			mes "enjoy your stay!";
-			close2;
-			cutin "prt_soldier",255;
-			end;
-		}
+	mes "[Al De Baran Guard]";
+	mes "I am in charge of the Service Guides from the Al De Baran Garrison. Let me guide you";
+	mes "through our town!";
+	next;
+	if (select("Get Location Guide.:End conversation.") == 1) {
+		viewpoint 1,61,229,0,0xFF6633;
+		viewpoint 1,72,197,1,0x0000FF;
+		viewpoint 1,223,222,2,0x00FFFF;
+		viewpoint 1,233,105,3,0x515151;
+		viewpoint 1,197,70,4,0x3355FF;
+		viewpoint 1,60,60,5,0xFF5555;
+		mes "^FF6633+^000000 -> Kafra Main Office ";
+		mes "^0000FF+^000000 -> Weapon Shop ";
+		mes "^00FFFF+^000000 -> Sorcerer Guild (Closed)";
+		mes "^515151+^000000 -> Pub";
+		mes "^3355FF+^000000 -> Item Shop";
+		mes "^FF5555+^000000 -> Alchemist Guild";
+		close2;
+		cutin "prt_soldier",255;
+		end;
 	}
+	mes "[Al De Baran Guard]";
+	mes "We are sworn to protect Al De Baran! May the forces of evil always be crushed by the";
+	mes "righteous fist of good!";
+	close2;
+	cutin "prt_soldier",255;
+	end;
 }
 
-aldebaran,243,143,2	duplicate(GuideAldearan)	Guide#02aldebaran	105
-aldebaran,135,243,4	duplicate(GuideAldearan)	Guide#03aldebaran	105
-aldebaran,36,135,6	duplicate(GuideAldearan)	Guide#04aldebaran	105
+aldebaran,133,108,4	script	Soldier#2alde	105,{
+	cutin "prt_soldier",2;
+	mes "[Al De Baran Guard]";
+	mes "I'm just an";
+	mes "ordinary guard,";
+	mes "the kind you can";
+	mes "find in any other city.";
+	next;
+	mes "[Al De Baran Guard]";
+	mes "When I'm not too busy";
+	mes "protecting the Al De Baran";
+	mes "populace, I'm here giving directions to adventurers";
+	mes "like yourself.";
+	next;
+	switch(select("Kafra Main Office :Weapon Shop :Sorcerer Guild :Pub :Item Shop :Alchemist Guild :End Conversation ")) {
+	case 1:
+		viewpoint 1,61,229,0,0xFF6633;
+		mes "^FF6633+^000000 -> Kafra Main Office ";
+		break;
+	case 2:
+		viewpoint 1,72,197,1,0x0000FF;
+		mes "^0000FF+^000000 -> Weapon Shop ";
+		break;
+	case 3:
+		viewpoint 1,223,222,2,0x00FFFF;
+		mes "^00FFFF+^000000 -> Sorcerer Guild (Closed)";
+		break;
+	case 4:
+		viewpoint 1,233,105,3,0x515151;
+		mes "^515151+^000000 -> Pub ";
+		break;
+	case 5:
+		viewpoint 1,197,70,4,0x3355FF;
+		mes "^3355FF+^000000 -> Item Shop ";
+		break;
+	case 6:
+		viewpoint 1,60,60,5,0xFF5555;
+		mes "^FF5555+^000000 -> Alchemist Guild";
+		break;
+	case 7:
+		mes "[Al De Baran Guard]";
+		mes "We are sworn to";
+		mes "protect Al De Baran!";
+		mes "May the forces of good";
+		mes "always prevail over evil~";
+		break;
+	}
+	close2;
+	cutin "prt_soldier",255;
+	end;
+}
diff --git a/npc/pre-re/guides/guides_amatsu.txt b/npc/pre-re/guides/guides_amatsu.txt
index 50ffe3f24..100eb9c6a 100644
--- a/npc/pre-re/guides/guides_amatsu.txt
+++ b/npc/pre-re/guides/guides_amatsu.txt
@@ -1,22 +1,23 @@
-//===== rAthena Script ======================================= 
-//= Amatsu Guide
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
+//===== rAthena Script =======================================
+//= Amatsu Guides
+//===== By: ==================================================
+//= MasterOfMuppets; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
 //= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guide for the city of Amatsu.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//= 1.1 Optimized. [Euphy]
-//============================================================ 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the City of Amatsu
+//===== Additional Comments: =================================
+//= 1.0 First version [MasterOfMuppets]
+//= 1.1 Removed Duplicates [Silent]
+//= 1.3 Rescripted to official 10.3 standards. [L0ne_W0lf]
+//============================================================
 
-amatsu,202,91,3	script	Amatsu Guide#amatsu	758,{
+amatsu,207,89,3	script	Amatsu Guide#ama	758,{
 	mes "[Amachang]";
-	mes "Welcome to ^8B4513Amatsu^000000,";
+	mes "Welcome to Amatsu,";
 	mes "the town of kind towners";
 	mes "and beautiful cherry blossoms.";
 	next;
@@ -27,65 +28,92 @@ amatsu,202,91,3	script	Amatsu Guide#amatsu	758,{
 	mes "as Miss Amatsu.";
 	mes "Please tell me";
 	mes "if you want to know something.";
-	while (1) {
-		next;
-		switch(select("[ Kafra Employee ]:[ Bar ]:[ Weapon Dealer ]:[ Tool Dealer ]:[ Amatsu Palace ]:[ Chef Assistant ]:[ Ninja Guild Building ]:[ Sea Captain ]:Remove Marks from Mini-Map:Cancel")) {
-		case 1:
-			callsub L_Mark,"^0000FFKafra Employee";
-			viewpoint 1,102,149,0,0x0A82FF;
-			break;
-		case 2:
-			callsub L_Mark,"^006400Bar";
-			viewpoint 1,215,116,1,0xAAFF00;
-			break;
-		case 3:
-			callsub L_Mark,"^008080Weapon Dealer";
-			viewpoint 1,129,117,2,0x008080;
-			break;
-		case 4:
-			callsub L_Mark,"^FF1493Tool Dealer";
-			viewpoint 1,97,117,3,0xFF1493;
-			break;
-		case 5:
-			callsub L_Mark,"^8B4513Amatsu Palace";
-			viewpoint 1,87,235,4,0x8B4513;
-			break;
-		case 6:
-			callsub L_Mark,"^8A2BE2Chef Assistant";
-			viewpoint 1,206,150,5,0x8A2BE2;
-			break;
-		case 7:
-			callsub L_Mark,"^4B0082Ninja Guild Building";
-			viewpoint 1,148,137,6,0x4B0082;
-			break;
-		case 8:
-			callsub L_Mark,"^00BFFFSea Captain";
-			viewpoint 1,195,79,7,0x00BFFF;
-			break;
-		case 9:
-			mes "[Amachang]";
-			mes "I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,1,1,0,0xFFFFFF;
-			viewpoint 2,1,1,1,0xFFFFFF;
-			viewpoint 2,1,1,2,0xFFFFFF;
-			viewpoint 2,1,1,3,0xFFFFFF;
-			viewpoint 2,1,1,4,0xFFFFFF;
-			viewpoint 2,1,1,5,0xFFFFFF;
-			viewpoint 2,1,1,6,0xFFFFFF;
-			viewpoint 2,1,1,7,0xFFFFFF;
-			break;
-		case 10:
-			mes "[Amachang]";
-			mes "Enjoy your trip~!!";
-			close;
-		}
+	next;
+	switch(select("Palace:Tool Shop:Weapon Shop:Bar")) {
+	case 1:
+		viewpoint 1,85,235,0,0xFF3355;
+		mes "[Amachang]";
+		mes "On the mini-map,";
+		mes "go to ^FF3355+^000000";
+		mes "to find the Palace.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 2:
+		viewpoint 1,96,118,1,0xCE6300;
+		mes "[Amachang]";
+		mes "On the mini-map,";
+		mes "go to ^CE6300+^000000";
+		mes "to find the Tool Shop.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 3:
+		viewpoint 1,132,117,2,0x55FF33;
+		mes "[Amachang]";
+		mes "On the mini-map,";
+		mes "go to ^55FF33+^000000";
+		mes "to find the Weapon Shop.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 4:
+		viewpoint 1,217,116,3,0x3355FF;
+		mes "[Amachang]";
+		mes "On the mini-map,";
+		mes "go to ^3355FF+^000000";
+		mes "to find the Bar.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	}
+}
+	
+amatsu,251,283,4	script	Guide Man#2ama	767,{
+	mes "[Guide Man]";
+	mes "Welcome, tourist from Rune-Midgard.";
+	mes "I'm the guide of";
+	mes "our beautiful town, Amatsu.";
+	next;
+	mes "[Guide Man]";
+	mes "What are you looking for?";
+	next;
+	switch(select("Palace:Tool Shop:Weapon Shop:Bar")) {
+	case 1:
+		viewpoint 1,85,235,0,0xFF3355;
+		mes "[Guide Man]";
+		mes "On the mini-map,";
+		mes "go to ^FF3355+^000000";
+		mes "to find the Palace.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 2:
+		viewpoint 1,96,118,1,0xCE6300;
+		mes "[Guide Man]";
+		mes "On the mini-map,";
+		mes "go to ^CE6300+^000000";
+		mes "to find the Tool Shop.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 3:
+		viewpoint 1,132,117,2,0x55FF33;
+		mes "[Guide Man]";
+		mes "On the mini-map,";
+		mes "go to ^55FF33+^000000";
+		mes "to find the Weapon Shop.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
+	case 4:
+		viewpoint 1,217,116,3,0x3355FF;
+		mes "[Guide Man]";
+		mes "On the mini-map,";
+		mes "go to ^3355FF+^000000";
+		mes "to find the Bar.";
+		mes "Have a good time";
+		mes "in Amatsu.";
+		close;
 	}
-	end;
-L_Mark:
-	mes "[Amachang]";
-	mes "The "+getarg(0)+"^000000 is";
-	mes "marked on your mini-map.";
-	mes "Is there anything else I can do for you?";
-	return;
 }
diff --git a/npc/pre-re/guides/guides_ayothaya.txt b/npc/pre-re/guides/guides_ayothaya.txt
index cafc85dc9..d153cf8d3 100644
--- a/npc/pre-re/guides/guides_ayothaya.txt
+++ b/npc/pre-re/guides/guides_ayothaya.txt
@@ -1,169 +1,111 @@
-//===== rAthena Script ======================================= 
-//= Ayothaya Guide
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== rAthena Script =======================================
+//= Ayothaya Guides
+//===== By: ==================================================
+//= MasterOfMuppets
+//===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena  SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guide for the city of Ayothaya
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//============================================================ 
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the City of Ayotaya
+//===== Additional Comments: =================================
+//= 1.0 First version [L0ne_W0lf]
+//============================================================
 
-ayothaya,203,169,4	script	Ayothaya Guide Noi#01ay	839,{
+ayothaya,203,169,3	script	Noi#ayo	839,{
 	mes "[Noi]";
-	mes "Hello~";
-	mes "Welcome to ^8B4513Ayothaya^000000.";
-	mes "This town is linked to a river through the wild forest.";
-	mes "It's a really calm country.";
-	mes "Take your time to look around.";
-	while (1) {
+	mes "Welcome to Ayotaya.";
+	mes "Our beautiful village is built";
+	mes "above the water, surrounded";
+	mes "by a dense forest.";
+	next;
+	mes "[Noi]";
+	mes "There are many tourist attractions in this village that you won't be able to find anywhere else. Our fish markets and the the unique architecture of our buildings is enough reason to visit Ayotaya.";
+	next;
+	mes "[Noi]";
+	mes "Please feel free";
+	mes "to take a look around.";
+	next;
+	switch(select("Building Locations.:Remove marks from mini-map.:Cancel.")) {
+	case 1:
+		mes "[Noi]";
+		mes "Where would";
+		mes "you like to visit?";
 		next;
-		switch(select("[ Weapon Shop ]:[ Tool Shop ]:[ Tavern ]:[ Shrine ]:[ Fishing Spot ]:Remove Marks from Mini-Map:Cancel")) {
+		switch(select("Weapon Shop:Tool Shop:Tavern:Shrine:Fishing Spot:Cancel")) {
 		case 1:
 			mes "[Noi]";
-			mes "The ^0000FFWeapon Shop^000000";
-			mes "in Ayothaya has special weapons.";
-			mes "You can find great weapons there.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,163,90,0,0x0A82FF;
-			break;
+			mes "At our Weapon Shop,";
+			mes "you will find great weapons";
+			mes "favored by brave Ayotayan seafarers.";
+			next;
+			mes "[Noi]";
+			mes "Our Weapon Shop";
+			mes "is located at ^55FF33+^000000.";
+			viewpoint 1,165,90,2,0x55FF33;
+			close;
 		case 2:
 			mes "[Noi]";
-			mes "Our citizens purchase many products in the ^006400Tool Shop^000000.";
-			mes "Make sure you get all you need there.";
-			mes "Do you need anything else??";
-			viewpoint 1,131,86,1,0xAAFF00;
-			break;
+			mes "We Ayotayans always make sure we have everything we need before we go traveling. It never hurts to be prepared, doesn't it?";
+			next;
+			mes "[Noi]";
+			mes "Our Tool Shop";
+			mes "is located at ^3355FF+^000000.";
+			viewpoint 1,129,86,3,0x3355FF;
+			close;
 		case 3:
 			mes "[Noi]";
-			mes "Part of adventuring is collecting information.";
-			mes "The ^008080Tavern^000000 is crowded with lots of travelers where you can get useful information.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,229,72,2,0x008080;
-			break;
-		case 4:
+			mes "One of the basics of adventuring is gathering information, or at least that's what they say. You can meet people from all sorts of places in the Tavern. I'm sure you can learn something useful there.";
+			next;
 			mes "[Noi]";
-			mes "To calm your heart, go to the ^FF1493Shrine^000000 and say a prayer.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,208,280,3,0xFF1493;
-			break;
-		case 5:
+			mes "Of course, you must";
+			mes "drop by our Tavern.";
+			mes "It is located at ^00FF00+^000000.";
+			viewpoint 1,232,76,4,0x00FF00;
+			close;
+		case 4:
 			mes "[Noi]";
-			mes "Ayothaya is close to the beach, so most people enjoy fishing.";
-			mes "They really love to fish.";
-			mes "Go ^8B4513fishing^000000 and try to grab a big fish.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,255,99,4,0x8B4513;
-			break;
-		case 6:
+			mes "If you wish to pray to God, or achieve a state of peace in your mind, why don't you visit our Shrine? Even if it's just for sight-seeing, everyone is";
+			mes "welcome there.";
+			next;
 			mes "[Noi]";
-			mes "If you want to return home";
-			mes "find ^00BFFFAibakthing^000000";
-			mes "and ask him to send you back.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,151,68,5,0x00BFFF;
-			break;
-		case 7:
+			mes "Our Shrine";
+			mes "is located at ^00FF00+^000000.";
+			viewpoint 1,208,283,5,0x00FF00;
+			close;
+		case 5:
 			mes "[Noi]";
-			mes "I'll remove all marks from your mini-map.";
-			mes "Do you need anything else??";
-			viewpoint 2,1,1,0,0xFFFFFF;
-			viewpoint 2,1,1,1,0xFFFFFF;
-			viewpoint 2,1,1,2,0xFFFFFF;
-			viewpoint 2,1,1,3,0xFFFFFF;
-			viewpoint 2,1,1,4,0xFFFFFF;
-			viewpoint 2,1,1,5,0xFFFFFF;
-			break;
-		case 8:
+			mes "Since Ayothaya was built above the surface of the water and close to a beach, it's been a favorite spot for fishermen. Why don't you catch some fish for dinner at the Fishing Spot?";
+			next;
 			mes "[Noi]";
-			mes "Enjoy your trip~!";
+			mes "Our famous";
+			mes "Fishing Spot";
+			mes "is located at ^00FF00+^000000";
+			viewpoint 1,253,99,6,0x00FF00;
 			close;
-		}
-	}
-}
-
-ayothaya,146,86,4	script	Ayothaya Guide Noa#01ay	839,{
-	mes "[Noa]";
-	mes "Hello~";
-	mes "Welcome to ^8B4513Ayothaya^000000.";
-	mes "This town is linked to a river through the wild forest.";
-	mes "It's a really calm country.";
-	mes "Take your time to look around.";
-	while (1) {
-		next;
-		switch(select("[ Kafra Employee ]:[ Weapon Shop ]:[ Tool Shop ]:[ Tavern ]:[ Shrine ]:[ Fishing Spot ]:Remove Marks from Mini-Map:Cancel")) {
-		case 1:
-			mes "[Noa]";
-			mes "The ^0000FFKafra Employee^000000 is";
-			mes "marked on your mini-map.";
-			mes "Check your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,212,169,0,0x0A82FF;
-			break;
-		case 2:
-			mes "[Noa]";
-			mes "The ^0000FFWeapon Shop^000000";
-			mes "in Ayothaya has special weapons.";
-			mes "You can find great weapons there.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,163,90,1,0xAAFF00;
-			break;
-		case 3:
-			mes "[Noa]";
-			mes "Our citizens purchase many products in the ^006400Tool Shop^000000.";
-			mes "Make sure you get all you need there.";
-			mes "Do you need anything else??";
-			viewpoint 1,131,86,2,0x008080;
-			break;
-		case 4:
-			mes "[Noa]";
-			mes "Part of adventuring is collecting information.";
-			mes "The ^008080Tavern^000000 is crowded with lots of travelers where you can get useful information.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,229,72,3,0xFF1493;
-			break;
-		case 5:
-			mes "[Noa]";
-			mes "To calm your heart, go to the ^FF1493Shrine^000000 and say a prayer.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,208,280,4,0x8B4513;
-			break;
 		case 6:
-			mes "[Noa]";
-			mes "Ayothaya is close to the beach, so most people enjoy fishing.";
-			mes "They really love to fish.";
-			mes "Go ^8B4513fishing^000000 and try to grab a big fish.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,255,99,5,0x9400D3;
-			break;
-		case 7:
-			mes "[Noa]";
-			mes "If you want to return home";
-			mes "find ^00BFFFAibakthing^000000";
-			mes "and ask him to send you back.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,151,68,6,0x00BFFF;
-			break;
-		case 8:
-			mes "[Noa]";
-			mes "I'll remove all marks from your mini-map.";
-			mes "Do you need anything else??";
-			viewpoint 2,1,1,0,0xFFFFFF;
-			viewpoint 2,1,1,1,0xFFFFFF;
-			viewpoint 2,1,1,2,0xFFFFFF;
-			viewpoint 2,1,1,3,0xFFFFFF;
-			viewpoint 2,1,1,4,0xFFFFFF;
-			viewpoint 2,1,1,5,0xFFFFFF;
-			viewpoint 2,1,1,6,0xFFFFFF;
-			break;
-		case 9:
-			mes "[Noa]";
-			mes "Enjoy your trip~!";
+			mes "[Noi]";
+			mes "If you wish to remove location marks on your mini-map, please select the 'Remove marks from mini-map' command from the menu.";
 			close;
 		}
+	case 2:
+		viewpoint 2,165,90,2,0x55FF33;
+		viewpoint 2,129,86,3,0x3355FF;
+		viewpoint 2,232,76,4,0x00FF00;
+		viewpoint 2,208,283,5,0x00FF00;
+		viewpoint 2,253,99,6,0x00FF00;
+		mes "[Noi]";
+		mes "Alright...";
+		mes "I've removed all the";
+		mes "location marks from";
+		mes "your mini-map.";
+		mes "Thank you.";
+		close;
+	case 3:
+		mes "[Noi]";
+		mes "Please enjoy";
+		mes "your travels.";
+		close;
 	}
 }
diff --git a/npc/pre-re/guides/guides_brasilis.txt b/npc/pre-re/guides/guides_brasilis.txt
deleted file mode 100644
index 3e85540ac..000000000
--- a/npc/pre-re/guides/guides_brasilis.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Brasilis Guide
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= rAthena  SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guide for the city of Brasilis
-//===== Additional Comments: ================================= 
-//= 1.0 First Version, Renewal guide.
-//= 1.1 Added a missing close.
-//============================================================ 
-
-brasilis,219,97,3	script	Brasilis Guide	478,{
-	mes "[Brasilis Guide]";
-	mes "Welcome to ^8B4513Brasilis^000000, a country as passionate as the sun.";
-	mes "If you have any questions, please ask me.";
-	next;
-	mes "[Brasilis Guide]";
-	mes "Where can I guide you?";
-	while (1){
-		next;
-		switch(select("[ Hotel ]:[ Jungle Cable ]:[ Art Museum ]:[ Market ]:[ Verass Monument ]:Remove marks from Mini-Map:Cancel")) {
-		case 1:
-			mes "[Brasilis Guide]";
-			mes "The Brasilis Hotel is located just above, ^FF3355+^000000.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,274,151,2,0xFF3355;
-			next;
-			break;
-		case 2:
-			mes "[Brasilis Guide]";
-			mes "Do you want to go through the rough jungle? You can take a Jungle Cable here ^CE6300+^000000.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,308,335,3,0xCE6300;
-			next;
-			break;
-		case 3:
-			mes "[Brasilis Guide]";
-			mes "The pride of Brasilis, the world scale Art Museum is at ^A5BAAD+^000000.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,137,167,4,0x00FF00;
-			next;
-			break;
-		case 4:
-			mes "[Brasilis Guide]";
-			mes "You can buy items for hunting at the Market here ^55FF33+^000000.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,254,248,5,0x55FF33;
-			next;
-			break;
-		case 5:
-			mes "[Brasilis Guide]";
-			mes "The iconic monument of Brasilis, the Verass Monument stands at ^3355FF+^000000.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,195,235,6,0x3355FF;
-			next;
-			break;
-		case 6:
-			mes "[Brasilis Guide]";
-			mes "I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 0,274,151,2,0x00FF00;
-			viewpoint 0,308,335,3,0x00FF00;
-			viewpoint 0,137,167,4,0x00FF00;
-			viewpoint 0,254,248,5,0x00FF00;
-			viewpoint 0,195,235,6,0x00FF00;
-			next;
-			break;
-		case 7:
-			mes "[Brasilis Guide]";
-			mes "Wandering on your own is always the best way to explore. Anyway, take care.";
-			close;
-		}
-		close;
-		break;
-	}
-}
diff --git a/npc/pre-re/guides/guides_comodo.txt b/npc/pre-re/guides/guides_comodo.txt
index f627235fa..2cebf8740 100644
--- a/npc/pre-re/guides/guides_comodo.txt
+++ b/npc/pre-re/guides/guides_comodo.txt
@@ -1,178 +1,127 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Comodo Guides
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
+//===== By: ==================================================
+//= kobra_k88; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.5
+//===== Compatible With: =====================================
 //= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guides for the city of Comodo.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//= 1.1 Fixed and optimized. [Euphy]
-//============================================================ 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the City of Comodo
+//===== Additional Comments: =================================
+//= Fully working v1.1 Now using duplicate command.
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.3 Updated the guide according to how it is on iRO, thanks
+//=	to Muad_Dib [MasterOfMuppets]
+//= 1.4	Removed 3 guides, and converted to use functions.
+//= 1.5 Rescripted to official 10.3 standards. [L0ne_W0lf]
+//============================================================
 
-comodo,322,178,4	script	Comodo Guide#01comodo::GuideComodo	700,{
-	mes "[Comodo Guide]";
-	mes "Welcome to ^8B4513Comodo^000000,";
-	mes "the Beach Town of the Rune-Midgarts Kingdom.";
-	mes "Do you need help navigating the town?";
+comodo,322,178,4	script	Comodo Guide#cmd::CmdGuide	700,{
+	callfunc "F_CmdGuide","Native Kokomo";
+}
+
+comodo,176,350,4	script	Comodo Guide#2cmd	700,{
+	callfunc "F_CmdGuide","Native Nutcoco";
+}
+
+comodo,37,219,4	script	Guide#2cmd	700,{
+	callfunc "F_CmdGuide","Native Papaya";
+}
+
+function	script	F_CmdGuide	{
+	mes "["+getarg(0)+"]";
+	mes "Welcome to Comodo, the";
+	mes "city of dreams and fantasy,";
+	mes "where the nightlife never ends!";
+	mes "I know this area really well,";
+	mes "so let me know if you need";
+	mes "directions anywhere here.";
 	next;
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel:About ^8B4513Comodo^000000")) {
-		case 1:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Tavern ]:[ Casino ]:[ Weapon & Armor Shop ]:[ Tool Shop ]:[ Campsite ]:[ Souvenir Vendor ]:[ East Cave Mao ]:[ West Cave Karu ]:[ North Cave Ruanda ]:[ Hula Dance Stage ]:[ Kafra Co. Western Branch ]:Previous Menu")) {
-				case 1:
-					callsub L_Mark,"^FF0000Tavern";
-					viewpoint 1,166,298,0,0xFF0000;
-					next;
-					break;
-				case 2:
-					callsub L_Mark,"^FFA500Casino";
-					viewpoint 1,140,98,1,0xFFA500;
-					next;
-					break;
-				case 3:
-					callsub L_Mark,"^FF4500Weapon & Armor Shop";
-					viewpoint 1,266,70,2,0xFF4500;
-					next;
-					break;
-				case 4:
-					callsub L_Mark,"^B8860BTool Shop";
-					viewpoint 1,86,128,3,0xB8860B;
-					next;
-					break;
-				case 5:
-					callsub L_Mark,"^32CD32Campsite";
-					viewpoint 1,210,308,4,0x32CD32;
-					next;
-					break;
-				case 6:
-					callsub L_Mark,"^6B8E23Souvenir Vendor";
-					viewpoint 1,298,124,5,0x6B8E23;
-					next;
-					break;
-				case 7:
-					callsub L_Mark,"^008B8BEast Cave Mao",1;
-					viewpoint 1,333,175,6,0x008B8B;
-					next;
-					break;
-				case 8:
-					callsub L_Mark,"^1E90FFWest Cave Karu",1;
-					viewpoint 1,24,214,7,0x1E90FF;
-					next;
-					break;
-				case 9:
-					callsub L_Mark,"^0000CDNorth Cave Ruanda",1;
-					viewpoint 1,176,358,8,0x0000CD;
-					next;
-					break;
-				case 10:
-					callsub L_Mark,"^C71585Hula Dance Stage";
-					viewpoint 1,188,168,9,0xC71585;
-					next;
-					break;
-				case 11:
-					callsub L_Mark,"^DB7093Kafra Corporation Western Branch";
-					viewpoint 1,136,202,10,0xDB7093;
-					next;
-					break;
-				case 12:
-					set .@loop,0;
-					break;
-				}
-			}
-			break;
-		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Chief's House ]:[ Bor Robin ]:[ Kafra Employee ]:[ Roaming Bard ]:Previous Menu")) {
-				case 1:
-					callsub L_Mark,"^6495EDChief's House";
-					viewpoint 1,114,294,11,0x6495ED;
-					next;
-					break;
-				case 2:
-					mes "[Comodo Guide]";
-					mes "^228B22Bor Robin^000000";
-					mes "helps adventurers to become ^228B22Dancers^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,193,151,12,0x228B22;
-					next;
-					break;
-				case 3:
-					callsub L_Mark,"^1E90FFKafra Employee";
-					viewpoint 1,195,149,13,0x1E90FF;
-					next;
-					break;
-				case 4:
-					mes "[Comodo Guide]";
-					mes "The ^DB7093Roaming Bard^000000";
-					mes "helps adventurers to become ^DB7093Bards^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,211,155,14,0xDB7093;
-					next;
-					break;
-				case 5:
-					set .@loop,0;
-					break;
-				}
-			}
-			break;
-		case 3:
-			mes "[Comodo Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,166,298,0,0xFFFFFF;
-			viewpoint 2,140,98,1,0xFFFFFF;
-			viewpoint 2,266,70,2,0xFFFFFF;
-			viewpoint 2,86,128,3,0xFFFFFF;
-			viewpoint 2,210,308,4,0xFFFFFF;
-			viewpoint 2,298,124,5,0xFFFFFF;
-			viewpoint 2,333,175,6,0xFFFFFF;
-			viewpoint 2,24,214,7,0xFFFFFF;
-			viewpoint 2,176,358,8,0xFFFFFF;
-			viewpoint 2,188,168,9,0xFFFFFF;
-			viewpoint 2,136,202,10,0xFFFFFF;
-			viewpoint 2,114,294,11,0xFFFFFF;
-			viewpoint 2,193,151,12,0xFFFFFF;
-			viewpoint 2,195,149,13,0xFFFFFF;
-			viewpoint 2,211,155,14,0xFFFFFF;
-			next;
-			break;
-		case 4:
-			mes "[Comodo Guide]";
-			mes "Enjoy your stay.";
-			close;
-		case 5:
-			mes "[Comodo Guide]";
-			mes "^8B4513Comodo^000000 is";
-			mes "located inside a cave";
-			mes "and can never be reached by natural sunlight.";
-			next;
-			mes "[Comodo Guide]";
-			mes "The villagers of ^8B4513Comodo^000000";
-			mes "have overcome their poor natural surroundings";
-			mes "to create a popular tourist site.";
-			mes "Is there anything else I can do for you?";
-			next;
-			break;
-		}
+	switch(select("Casino:Hula Dance Stage ^3355FF(Dancer Job Change)^000000:Weapon and Armor Shop:Tool Shop:Tourist Shop:Kafra Co. Western Branch:Chief's House:Pub:Campground:End Conversation")) {
+	case 1:
+		viewpoint 1,140,98,0,0xFF6633;
+		mes "Please refer to the cross mark,";
+		mes "^FF6633+^000000, on your Mini-Map to find the";
+		mes "Casino, a haven for rest for";
+		mes "weary travlers and the heart";
+		mes "of Comodo's nightlife.";
+		close;
+	case 2:
+		viewpoint 1,188,168,1,0x0000FF;
+		mes "Please refer to the cross mark,";
+		mes "^0000FF+^000000, on your Mini-Map to find the";
+		mes "Hula Dance Stage, the place";
+		mes "where female Archers can";
+		mes "change jobs to Dancers.";
+		close;
+	case 3:
+		viewpoint 1,266,70,2,0x00FFFF;
+		mes "Please refer to the cross mark,";
+		mes "^00FFFF+^000000, on your Mini-Map to find the";
+		mes "Weapon and Armor shop. Be";
+		mes "sure to check that shop for";
+		mes "any special items that are";
+		mes "unique to Comodo!";
+		close;
+	case 4:
+		viewpoint 1,86,128,3,0x515151;
+		mes "Please refer to the cross mark,";
+		mes "^515151+^000000, on your Mini-Map to find the";
+		mes "Tool Shop. If you've never been";
+		mes "there before, then I suggest";
+		mes "you check it out and stock up";
+		mes "on tools you might need later.";
+		close;
+	case 5:
+		viewpoint 1,298,124,4,0x3355FF;
+		mes "Please refer to the cross mark,";
+		mes "^3355FF+^000000, on your Mini-Map to find the";
+		mes "Tourist Shop where you can ";
+		mes "buy gifts that can only be found^FFFFFF ^000000 in the Comodo region~";
+		close;
+	case 6:
+		viewpoint 1,136,202,5,0xFF5555;
+		mes "Please refer to the cross mark,";
+		mes "^FF5555+^000000, on your Mini-Map to find the";
+		mes "Western branch of the Kafra";
+		mes "Corporation. They offer some";
+		mes "pretty important services that^FFFFFF ^000000 you may want to check out later.";
+		close;
+	case 7:
+		viewpoint 1,114,294,5,0xFF5555;
+		mes "Please refer to the cross mark,";
+		mes "^FF5555+^000000, on your Mini-Map to find the";
+		mes "Chief's House. You're welcome";
+		mes "to visit him, and he's usually";
+		mes "happy to have visitors.";
+		close;
+	case 8:
+		viewpoint 1,166,298,5,0xFF5555;
+		mes "Please refer to the cross mark,";
+		mes "^FF5555+^000000, on your Mini-Map to find the";
+		mes "Pub. There, you can meet other";
+		mes "tourists, relax, and socialize";
+		mes "in an enjoyable environment~";
+		close;
+	case 9:
+		viewpoint 1,210,308,5,0xFF5555;
+		mes "Please refer to the cross mark,";
+		mes "^FF5555+^000000, on your Mini-Map to find the";
+		mes "Campground. Gather with your";
+		mes "family and friends, and enjoy";
+		mes "the special barbeque of";
+		mes "Comodo's camping grounds~";
+		close;
+	case 10:
+		mes "["+getarg(0)+"]";
+		mes "Actually, it always looks";
+		mes "like nighttime in Comodo";
+		mes "because it's built in a huge";
+		mes "cave. We don't get any sunlight";
+		mes "here, but the darkness here is";
+		mes "more exciting than gloomy~";
+		close;
 	}
-	end;
-L_Mark:
-	mes "[Comodo Guide]";
-	mes "Let me mark the location of";
-	mes ((getarg(1,0))?"":"the ")+getarg(0)+"^000000";
-	mes "on your mini-map.";
-	mes "Would you like to check any other locations?";
-	return;
 }
-
-comodo,181,347,4	duplicate(GuideComodo)	Comodo Guide#02comodo	700
-comodo,197,149,3	duplicate(GuideComodo)	Comodo Guide#03comodo	700
-comodo,37,219,4	duplicate(GuideComodo)	Comodo Guide#04comodo	700
diff --git a/npc/pre-re/guides/guides_einbroch.txt b/npc/pre-re/guides/guides_einbroch.txt
index 180a9bc29..c73b37b74 100644
--- a/npc/pre-re/guides/guides_einbroch.txt
+++ b/npc/pre-re/guides/guides_einbroch.txt
@@ -1,80 +1,99 @@
-//===== rAthena Script ======================================= 
-//= Einbroch, and Einbech Guides
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena  SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guides for the city of Einbroch, and Einbech
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//============================================================ 
+//===== rAthena Script =======================================
+//= Einbroch Guides
+//===== By: ==================================================
+//= Muad_dib; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.5
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the City of Einbroch
+//===== Additional Comments: =================================
+//= 1.0b missing tabs, fixed Guide coords [Lupus]
+//= 1.1 added 1 more Guide NPC, thanx to Justin84 [Lupus]
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.3 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
+//= 1.4 Removed Duplicates [Silent]
+//= 1.5 Rescripted to official 10.3 standards. [L0ne_W0lf]
+//============================================================
 
-einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
+einbroch,72,202,4	script	Guide#ein::EinGuide	852,{
 	cutin "ein_soldier",2;
 	mes "[Einbroch Guide]";
 	mes "Welcome";
-	mes "to ^8B4513Einbroch^000000,";
+	mes "to Einbroch,";
 	mes "the City of Steel.";
 	mes "Please ask me if you";
 	mes "have any questions.";
-	next;
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide.:Remove Marks from Mini-Map.:Notice.:Cancel.")) {
 		case 1:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Airport ]:[ Factory ]:[ Plaza ]:[ Hotel ]:[ Train Station ]:[ Weapon Shop ]:[ Laboratory ]:[ Monument ]:[ Blacksmith Guild ]:[ Gunslinger Guild ]:Previous Menu")) {
+			mes "[Einbroch Guide]";
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes.:No.") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while(.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+				switch(select("^FF0000Airport^000000:Train Station:Factory:Plaza:Hotel:Weapon Shop:Laboratory:Blacksmith Guild:Einbroch Tower:Cancel")) {
 				case 1:
 					mes "[Einbroch Guide]";
 					mes "The ^FF0000Airport^000000 is located";
 					mes "in the northwestern part";
 					mes "of the city. There you can";
 					mes "see our city's pride and joy, the Airship. Remember that you must pay admission to board the Airship.";
-					viewpoint 1,64,204,0,0xFF0000;
-					next;
+					if (.@compass_check)
+						viewpoint 1,63,228,2,0xFF0000;
 					break;
 				case 2:
 					mes "[Einbroch Guide]";
+					mes "The Train Station is";
+					mes "located in the northeast";
+					mes "part of Einbroch. Trains";
+					mes "running between here";
+					mes "and Einbech run all day";
+					mes "long, everyday.";
+					if (.@compass_check)
+						viewpoint 1,236,279,3,0xFF00FF;
+					break;
+				case 3:
+					mes "[Einbroch Guide]";
 					mes "The Factory, perhaps the";
 					mes "most important facility in";
 					mes "Einbroch, is located in the";
 					mes "southern part of the city.";
-					viewpoint 1,129,79,1,0xFF4500;
-					next;
+					if (.@compass_check)
+						viewpoint 1,158,78,4,0xFF00FF;
 					break;
-				case 3:
+				case 4:
 					mes "[Einbroch Guide]";
 					mes "The Plaza, our biggest";
 					mes "shopping district, can be";
 					mes "found just east from the";
 					mes "center of Einbroch.";
-					viewpoint 1,254,199,2,0xDAA520;
-					next;
+					if (.@compass_check)
+						viewpoint 1,232,190,5,0xFF00FF;
 					break;
-				case 4:
+				case 5:
 					mes "[Einbroch Guide]";
 					mes "The Hotel is east of";
 					mes "the Plaza and offers top";
 					mes "caliber accomodations.";
 					mes "There, you can enjoy your";
 					mes "stay in Einbroch in comfort~";
-					viewpoint 1,254,199,3,0x008000;
-					next;
-					break;
-				case 5:
-					mes "[Einbroch Guide]";
-					mes "The Train Station is";
-					mes "located in the northeast";
-					mes "part of Einbroch. Trains";
-					mes "running between here";
-					mes "and Einbech run all day";
-					mes "long, everyday.";
-					viewpoint 1,232,272,4,0x0000FF;
-					next;
+					if (.@compass_check)
+						viewpoint 1,260,201,6,0x00FF00;
 					break;
 				case 6:
 					mes "[Einbroch Guide]";
@@ -83,8 +102,8 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					mes "Plaza. There you can";
 					mes "purchase weapons for";
 					mes "your personal use.";
-					viewpoint 1,216,211,5,0x000080;
-					next;
+					if (.@compass_check)
+						viewpoint 1,215,221,7,0x00FF00;
 					break;
 				case 7:
 					mes "[Einbroch Guide]";
@@ -92,203 +111,241 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					mes "annex of the Factory and";
 					mes "is located in the southwest";
 					mes "sector of Einbroch.";
-					viewpoint 1,55,52,6,0x800080;
-					next;
+					if (.@compass_check)
+						viewpoint 1,36,49,8,0x00FF;
 					break;
 				case 8:
 					mes "[Einbroch Guide]";
-					mes "I will mark the location";
-					mes "of the ^808080Monument^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,178,173,7,0x808080;
-					next;
-					break;
-				case 9:
-					mes "[Einbroch Guide]";
 					mes "The Blacksmith Guild is";
 					mes "located in the southeast";
 					mes "part of Einbroch. You can";
 					mes "upgrade your equipment";
 					mes "by using their services.";
-					viewpoint 1,255,110,8,0x556B2F;
-					next;
+					if (.@compass_check)
+						viewpoint 1,244,90,9,0x00FF00;
 					break;
-				case 10:
+				case 9:
 					mes "[Einbroch Guide]";
-					mes "I will mark the location";
-					mes "of the ^008080Gunslinger Guild^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,130,197,9,0x008080;
-					next;
-					break;
-				case 11:
-					set .@loop,0;
+					mes "The Einbroch Tower is";
+					mes "located in the center of";
+					mes "the city. From the top of";
+					mes "the tower, you can view";
+					mes "all of Einbroch.";
+					if (.@compass_check)
+						viewpoint 1,174,195,10,0xFFFF00;
 					break;
+				case 10:
+					mes "[Einbroch Guide]";
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
 				}
 			}
 			break;
 		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Armsmith ]:[ Kafra Employees ]:[ Eden Teleport Officer ]:Previous Menu")) {
-				case 1:
-					mes "[Einbroch Guide]";
-					mes "You may go to ^FF1493Manthasman^000000,";
-					mes "the ^FF1493Armsmith^000000";
-					mes "on the 1st basement floor in the Blacksmith Guild.";
-					viewpoint 1,255,110,10,0xFF1493;
-					next;
-					mes "[Einbroch Guide]";
-					mes "I will mark the location";
-					mes "of the ^FF1493Armsmith^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					next;
-					break;
-				case 2:
-					mes "[Einbroch Guide]";
-					mes "I will mark the locations";
-					mes "of the ^DA70D6Kafra Employees^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,242,205,11,0xDA70D6;
-					viewpoint 1,59,203,12,0xDA70D6;
-					next;
-					break;
-				case 3:
-					mes "[Einbroch Guide]";
-					mes "You can find";
-					mes "the ^CD1039Eden Teleport Officer^000000";
-					mes "on the 1st floor of the Gunslinger Guild.";
-					viewpoint 1,130,197,13,0xCD1039;
-					next;
-					mes "[Einbroch Guide]";
-					mes "I will mark the location";
-					mes "of the ^CD1039Eden Teleport Officer^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					next;
-					break;
-				case 4:
-					set .@loop,0;
-					break;
-				}
-			}
+			viewpoint 2,63,228,2,0xFF0000;
+			viewpoint 2,236,279,3,0xFF00FF;
+			viewpoint 2,158,78,4,0xFF00FF;
+			viewpoint 2,232,190,5,0xFF00FF;
+			viewpoint 2,260,201,6,0x00FF00;
+			viewpoint 2,215,221,7,0x00FF00;
+			viewpoint 2,36,49,8,0x00FF00;
+			viewpoint 2,244,90,9,0x00FF00;
+			viewpoint 2,174,195,10,0xFFFF00;
+			set .@compass_check,0;
+			mes "[Einbroch Guide]";
+			mes "Okay, the marks from";
+			mes "your Mini-Map have been";
+			mes "removed. If you need any";
+			mes "guidance around Einbroch,";
+			mes "please let me or one of the";
+			mes "other Einbroch Guides know.";
 			break;
 		case 3:
 			mes "[Einbroch Guide]";
-			mes "I'll remove the marks from your mini-map.";
-			mes "Do you need any other help?";
-			viewpoint 2,64,204,0,0xFFFFFF;
-			viewpoint 2,129,79,1,0xFFFFFF;
-			viewpoint 2,254,199,2,0xFFFFFF;
-			viewpoint 2,254,199,3,0xFFFFFF;
-			viewpoint 2,232,272,4,0xFFFFFF;
-			viewpoint 2,216,211,5,0xFFFFFF;
-			viewpoint 2,55,52,6,0xFFFFFF;
-			viewpoint 2,178,173,7,0xFFFFFF;
-			viewpoint 2,255,110,8,0xFFFFFF;
-			viewpoint 2,130,197,9,0xFFFFFF;
-			viewpoint 2,255,110,10,0xFFFFFF;
-			viewpoint 2,242,205,11,0xFFFFFF;
-			viewpoint 2,59,203,12,0xFFFFFF;
-			viewpoint 2,130,197,13,0xDA70D6;
+			mes "Through the technology of";
+			mes "the Schwaltzvalt Republic,";
+			mes "we've upgraded to a digital";
+			mes "information system that allows";
+			mes "us to mark locations on your";
+			mes "Mini-Map for easier navigation.";
 			next;
+			mes "[Einbroch Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
+			next;
+			mes "[Einbroch Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in Einbroch, adventurer.";
 			break;
 		case 4:
 			mes "[Einbroch Guide]";
-			mes "Have a safe journey!";
+			mes "We hope that you";
+			mes "enjoy your travels";
+			mes "here in Einbroch.";
+			mes "Oh, and please be";
+			mes "aware of the Smog Alerts.";
 			close2;
-			cutin "ein_soldier",255;
-			end;
+			set .@loop1,0;
 		}
 	}
+	cutin "ein_soldier",255;
+	end;
 }
 
-einbroch,155,43,4	duplicate(GuideEinbroch)	Einbroch Guide#ein02	852
-einbroch,162,317,4	duplicate(GuideEinbroch)	Einbroch Guide#ein03	852
-einbroch,252,320,3	duplicate(GuideEinbroch)	Einbroch Guide#ein04	852
+einbroch,155,43,4	duplicate(EinGuide)	Guide#2ein	852
+einbroch,162,317,4	duplicate(EinGuide)	Guide#3ein	852
 
-einbech,67,37,4	script	Einbech Guide#einbech01::GuideEinbech	852,{
+einbech,67,37,4	script	Guide#4ein::EinGuide2	852,{
 	cutin "ein_soldier",2;
 	mes "[Einbech Guide]";
-	mes "Welcome to ^8B4513Einbech^000000,";
+	mes "Welcome to Einbech,";
 	mes "the Mining Town. We're";
 	mes "here to assist tourists,";
 	mes "so if you have any questions,";
 	mes "please feel free to ask us.";
-	next;
-	while (1) {
-		switch(select("[ Tavern ]:[ Tool Shop ]:[ Train Station ]:[ Mine ]:[ Kafra Employee ]:Remove Marks from Mini-Map:Cancel")) {
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide.:Remove Marks from Mini-Map.:Notice.:Cancel.")) {
 		case 1:
 			mes "[Einbech Guide]";
-			mes "The Tavern is located";
-			mes "in the southern part of";
-			mes "Einbech. It's a nice place";
-			mes "to relax after a long day.";
-			viewpoint 1,157,106,0,0x497649;
-			next;
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes.:No.") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while (.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+				switch(select("Train Station:Tavern:Tool Shop:Swordman Guild:Mine:Cancel")) {
+				case 1:
+					mes "[Einbech Guide]";
+					mes "The Train Stations are";
+					mes "located in the northwest";
+					mes "and northeast parts of";
+					mes "Einbech. There, you can";
+					mes "take a train to Einbroch.";
+					if (.@compass_check)
+						viewpoint 1,43,213,2,0xFF0000;
+					break;
+				case 2:
+					mes "[Einbech Guide]";
+					mes "The Tavern is located";
+					mes "in the southern part of";
+					mes "Einbech. It's a nice place";
+					mes "to relax after a long day.";
+					if (.@compass_check)
+						viewpoint 1,142,112,3,0xFF00FF;
+					break;
+				case 3:
+					mes "[Einbech Guide]";
+					mes "You can find the Tool";
+					mes "Shop in the center of";
+					mes "Einbech. There, you can";
+					mes "purchase any tools you";
+					mes "might need for your travels.";
+					if (.@compass_check)
+						viewpoint 1,176,136,4,0xFF00FF;
+					break;
+				case 4:
+					mes "[Einbech Guide]";
+					mes "The Swordman Guild";
+					mes "is located in the eastern";
+					mes "outskirts of Einbech. It's";
+					mes "under construction and they";
+					mes "haven't started accepting";
+					mes "applications.";
+					if (.@compass_check)
+						viewpoint 1,250,110,5,0xFF00FF;
+					break;
+				case 5:
+					mes "[Einbech Guide]";
+					mes "The Mine, which is";
+					mes "Einbech's major industry,";
+					mes "is located in the northern";
+					mes "part of this town. It's where";
+					mes "we get all our ores, although monsters get in the miners' way.";
+					if (.@compass_check)
+						viewpoint 1,138,251,6,0x00FF00;
+					break;
+				case 6:
+					mes "[Einbech Guide]";
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
+				}
+			}
 			break;
 		case 2:
+			viewpoint 2,43,213,2,0xFF0000;
+			viewpoint 2,142,112,3,0xFF00FF;
+			viewpoint 2,176,136,4,0xFF00FF;
+			viewpoint 2,250,110,5,0xFF00FF;
+			viewpoint 2,138,251,6,0x00FF00;
+			set .@compass_check,0;
 			mes "[Einbech Guide]";
-			mes "You can find the Tool";
-			mes "Shop in the center of";
-			mes "Einbech. There, you can";
-			mes "purchase any tools you";
-			mes "might need for your travels.";
-			viewpoint 1,177,133,1,0xFA8072;
-			next;
+			mes "Okay, the marks from";
+			mes "your Mini-Map have been";
+			mes "removed. If you need any";
+			mes "guidance around Einbech,";
+			mes "please let me or one of the";
+			mes "other Einbech Guides know.";
 			break;
 		case 3:
 			mes "[Einbech Guide]";
-			mes "The Train Stations are";
-			mes "located in the northwest";
-			mes "and northeast parts of";
-			mes "Einbech. There, you can";
-			mes "take a train to Einbroch.";
-			viewpoint 1,39,215,2,0xCD1039;
+			mes "Through the technology of";
+			mes "the Schwaltzvalt Republic,";
+			mes "we've upgraded to a digital";
+			mes "information system that allows";
+			mes "us to mark locations on your";
+			mes "Mini-Map for easier navigation.";
 			next;
-			break;
-		case 4:
 			mes "[Einbech Guide]";
-			mes "The Mine, which is";
-			mes "Einbech's major industry,";
-			mes "is located in the northern";
-			mes "part of this town. It's where";
-			mes "we get all our ores, although monsters get in the miners' way.";
-			viewpoint 1,137,248,3,0xDA70D6;
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
 			next;
-			break;
-		case 5:
 			mes "[Einbech Guide]";
-			mes "I will mark the location";
-			mes "of the ^FF1493Kafra Employee^000000";
-			mes "on your mini-map.";
-			mes "Would you like to check any other locations?";
-			viewpoint 1,181,132,4,0xFF1493;
-			next;
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in Einbech, adventurer.";
 			break;
-		case 6:
-			mes "[Einbech Guide]";
-			mes "I'll remove the marks from your mini-map.";
-			mes "Do you need any other help?";
-			viewpoint 2,157,106,0,0xFFFFFF;
-			viewpoint 2,177,133,1,0xFFFFFF;
-			viewpoint 2,39,215,2,0xFFFFFF;
-			viewpoint 2,137,248,3,0xFFFFFF;
-			viewpoint 2,181,132,4,0xFFFFFF;
-			next;
-			break;
-		case 7:
+		case 4:
 			mes "[Einbech Guide]";
-			mes "Have a safe journey!";
+			mes "We hope that you";
+			mes "enjoy your travels";
+			mes "here in Einbech.";
 			close2;
-			cutin "ein_soldier",255;
-			end;
+			set .@loop1,0;
 		}
 	}
+	cutin "ein_soldier",255;
+	end;
 }
 
-einbech,48,214,4	duplicate(GuideEinbech)	Einbech Guide#einbech02	852
+einbech,48,214,4	duplicate(EinGuide2)	Guide#5ein	852
diff --git a/npc/pre-re/guides/guides_geffen.txt b/npc/pre-re/guides/guides_geffen.txt
index 1662cdc37..28e7232c4 100644
--- a/npc/pre-re/guides/guides_geffen.txt
+++ b/npc/pre-re/guides/guides_geffen.txt
@@ -1,169 +1,174 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Geffen Guides
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
+//===== By: ==================================================
+//= kobra_k88; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.4a
+//===== Compatible With: =====================================
 //= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guides for the city of Geffen.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//= 1.1 Fixed and optimized. [Euphy]
-//============================================================ 
+//===== Description: =========================================
+//= [Official COnversion]
+//= Guides for the City of Geffen
+//===== Additional Comments: =================================
+//= Fully working.  Added a guide at every exit.
+//= v1.1 Now using duplicate command.
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.2a Small note that the BS guild moved to Einbroch [Poki#3]
+//= 1.3 Removed Duplicates [Silent]
+//= 1.4a Rescripted to official 10.3 standards. [L0ne_W0lf]
+//= 1.4 Fixed some errors with the loop[Samuray22]
+//	-Thanks to $ephiroth.
+//============================================================
 
-geffen,203,116,4	script	Guide#01geffen::GuideGeffen	705,{
+geffen,203,116,0	script	Guide#gef::GefGuide	705,{
 	cutin "gef_soldier",2;
 	mes "[Geffen Guide]";
-	mes "Welcome to ^8B4513Geffen^000000,";
-	mes "the City of Magic.";
-	mes "Do you need help navigating the city?";
-	next;
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
+	mes "Welcome to Geffen,";
+	mes "the City of Magic. If you";
+	mes "need any guidance around";
+	mes "the city, feel free to ask me";
+	mes "and I'll do my best to assist you. ^FFFFFFcobo^000000";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice.:Cancel")) {
 		case 1:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Magic Academy ]:[ Geffen Tower ]:[ Fountain ]:[ Tool Shop ]:[ Buy & Repair Equipment ]:[ Inn ]:[ Tavern ]:[ Christopher's Forge ]:Previous Menu")) {
+			mes "[Geffen Guide]";
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes:No") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while (.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+//				next;
+				switch(select("^FF0000Magic Acedemy^000000:Forge Shop:Weapon Shop:Tool Shop:Pub:Inn:Geffen Tower:Cancel")) {
 				case 1:
 					mes "[Geffen Guide]";
-					mes "The ^B9062FMagic Academy^000000";
-					mes "handles all magic-related affairs,";
-					mes "including job changes.";
-					mes "Let me mark its location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,61,180,0,0xFF0000;
-					next;
+					mes "The Magic Academy in";
+					mes "northwest Geffen handles";
+					mes "Job Changes to the Mage class.";
+					if (.@compass_check)
+						viewpoint 1,61,180,2,0xFF0000;
 					break;
 				case 2:
-					callsub L_Mark,"^0000FFGeffen Tower";
-					viewpoint 1,120,114,1,0x0000FF;
-					next;
+					mes "[Geffen Guide]";
+					mes "The Forge Shop is";
+					mes "located just southeast";
+					mes "from the center of Geffen.";
+					if (.@compass_check)
+						viewpoint 1,182,59,3,0x00FF00;
 					break;
 				case 3:
-					callsub L_Mark,"^FF5400Fountain";
-					viewpoint 1,126,48,2,0xFFB400;
-					next;
+					mes "[Geffen Guide]";
+					mes "The Weapon Shop";
+					mes "can be found northwest";
+					mes "from the center of Geffen.";
+					if (.@compass_check)
+						viewpoint 1,99,140,4,0xFF00FF;
 					break;
 				case 4:
-					callsub L_Mark,"^006400Tool Shop";
-					viewpoint 1,44,86,3,0xAAFF00;
-					next;
+					mes "[Geffen Guide]";
+					mes "You can find the";
+					mes "Tool Shop by heading";
+					mes "southwest from the";
+					mes "center of Geffen.";
+					if (.@compass_check)
+						viewpoint 1,44,86,5,0xFF00FF;
 					break;
 				case 5:
 					mes "[Geffen Guide]";
-					mes "If you'd like to ^7F3300Buy or Repair Equipment^000000";
-					mes "then this is the place you'll want to visit.";
-					mes "Let me mark its location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,99,140,4,0xD2691E;
-					next;
+					mes "The Pub can be";
+					mes "found northeast";
+					mes "from the Geffen Tower.";
+					if (.@compass_check)
+						viewpoint 1,138,138,6,0xFF00FF;
 					break;
 				case 6:
-					callsub L_Mark,"^800080Inn";
-					viewpoint 1,172,174,5,0xDA70D6;
-					next;
+					mes "[Geffen Guide]";
+					mes "The Inn can be";
+					mes "found by traveling";
+					mes "northeast from the";
+					mes "center of Geffen.";
+					if (.@compass_check)
+						viewpoint 1,172,174,7,0xFF00FF;
 					break;
 				case 7:
-					callsub L_Mark,"^B9062FTavern";
-					viewpoint 1,138,138,6,0xFF0000;
-					next;
+					mes "[Geffen Guide]";
+					mes "Geffen Tower is found";
+					mes "in the center of the city.";
+					mes "The Wizard Guild is at the";
+					mes "top, and there's even a dungeon";
+					mes "underneath it. There's many a";
+					mes "mystery surrounding that tower...";
+					if (.@compass_check)
+						viewpoint 1,120,114,8,0x00FF00;
 					break;
 				case 8:
 					mes "[Geffen Guide]";
-					mes "^0000FFChristopher's Forge^000000 is";
-					mes "where you can purchase";
-					mes "Refining materials.";
-					mes "It used to be the old Blacksmith Guild.";
-					viewpoint 1,182,59,6,0x0000FF;
-					next;
-					break;
-				case 9:
-					set .@loop,0;
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
 					break;
 				}
 			}
 			break;
 		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Pet Groomer ]:[ Chef Assistant ]:[ Dimensional Arcanist Guide ]:Previous Menu")) {
-				case 1:
-					callsub L_Mark,"^B9062FEden Teleport Officers";
-					viewpoint 1,61,180,7,0xFF0000;
-					viewpoint 1,132,66,8,0xFF0000;
-					next;
-					break;
-				case 2:
-					callsub L_Mark,"^FF5400Kafra Employees";
-					viewpoint 1,203,123,10,0xFFB400;
-					viewpoint 1,120,62,11,0xFFB400;
-					next;
-					break;
-				case 3:
-					callsub L_Mark,"^006400Pet Groomer";
-					viewpoint 1,193,152,12,0xAAFF00;
-					next;
-					break;
-				case 4:
-					callsub L_Mark,"^7F3300Chef Assistant";
-					viewpoint 1,196,111,13,0xD2691E;
-					next;
-					break;
-				case 5:
-					callsub L_Mark,"^800080Dimensional Arcanist Guide";
-					viewpoint 1,140,196,14,0xDA70D6;
-					next;
-					break;
-				case 6:
-					set .@loop,0;
-					break;
-				}
-			}
+			viewpoint 2,237,41,2,0xFF0000;
+			viewpoint 2,237,41,3,0x00FF00;
+			viewpoint 2,46,345,4,0xFF00FF;
+			viewpoint 2,175,220,5,0xFF00FF;
+			viewpoint 2,134,221,6,0xFF00FF;
+			viewpoint 2,204,214,7,0xFF00FF;
+			viewpoint 2,204,214,8,0x00FF00;
+			set .@compass_check,0;
 			break;
 		case 3:
 			mes "[Geffen Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,1,1,0,0xFFFF00;
-			viewpoint 2,1,1,1,0x000000;
-			viewpoint 2,1,1,2,0xFF0000;
-			viewpoint 2,1,1,3,0xFFFF00;
-			viewpoint 2,1,1,4,0xFFFF00;
-			viewpoint 2,1,1,5,0xFFFF00;
-			viewpoint 2,1,1,6,0xFFFF00;
-			viewpoint 2,1,1,7,0xFFFF00;
-			viewpoint 2,1,1,8,0xFFFF00;
-			viewpoint 2,1,1,9,0xFFFF00;
-			viewpoint 2,1,1,10,0xFFFF00;
-			viewpoint 2,1,1,11,0xFFFF00;
-			viewpoint 2,1,1,12,0xFFFF00;
-			viewpoint 2,1,1,13,0xFFFF00;
-			viewpoint 2,1,1,14,0xFFFF00;
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
+			next;
+			mes "[Geffen Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
 			next;
+			mes "[Geffen Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in the city of Geffen.";
 			break;
 		case 4:
 			mes "[Geffen Guide]";
-			mes "Enjoy your stay.";
+			mes "Alright, adventurer.";
+			mes "I wish you safety on";
+			mes "your journeys through";
+			mes "the lands you may travel...";
 			close2;
-			cutin "gef_soldier",255;
-			end;
+			set .@loop1,0;
 		}
 	}
+	cutin "gef_soldier",255;
 	end;
-L_Mark:
-	mes "[Geffen Guide]";
-	mes "Let me mark the location of the";
-	mes getarg(0)+"^000000";
-	mes "on your mini-map.";
-	mes "Would you like to check any other locations?";
-	return;
 }
 
-geffen,118,62,0	duplicate(GuideGeffen)	Guide#02geffen	705
-geffen,36,123,6	duplicate(GuideGeffen)	Guide#03geffen	705
-geffen,123,203,4	duplicate(GuideGeffen)	Guide#04geffen	705
+geffen,118,62,0	duplicate(GefGuide)	Guide#2gef	705
diff --git a/npc/pre-re/guides/guides_gonryun.txt b/npc/pre-re/guides/guides_gonryun.txt
index b108a3ccb..590bf7bd4 100644
--- a/npc/pre-re/guides/guides_gonryun.txt
+++ b/npc/pre-re/guides/guides_gonryun.txt
@@ -1,23 +1,22 @@
-//===== rAthena Script ======================================= 
-//= Kunlun Guide
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
+//===== rAthena Script =======================================
+//= Kunlun Guides
+//===== By: ==================================================
+//= kobra_k88; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
 //= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guide for the city of Kunlun.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//= 1.1 Optimized. [Euphy]
-//============================================================ 
+//===== Description: =========================================
+//= [Official COnversion]
+//= Guides for the City of Kunlun
+//===== Additional Comments: =================================
+//= 1.0 First version [L0ne_W0lf]
+//============================================================
 
-gonryun,163,60,4	script	Kunlun Guide#01gonryun	780,{
+gonryun,163,60,4	script	Kunlun Guide#gon	780,{
 	mes "[He Yuen Zhe]";
 	mes "Ni Hao!";
-	mes "Welcome to ^8B4513Kunlun^000000~";
+	mes "Welcome to Kunlun~";
 	mes "Take a walk around and experience";
 	mes "the ancient history and tradition";
 	mes "of our breath taking city.";
@@ -26,61 +25,42 @@ gonryun,163,60,4	script	Kunlun Guide#01gonryun	780,{
 	mes "I am responsible for helping you";
 	mes "with any questions you may have.";
 	mes "Please feel free to ask me anything.";
-	while (1) {
-		next;
-		switch(select("[ Kafra Employee ]:[ Chief's Residence ]:[ Tool Dealer ]:[ Weapon Dealer ]:[ Armor Dealer ]:[ Wine Maker ]:[ Kunlun Envoy ]:Remove Marks from Mini-Map:Cancel")) {
-		case 1:
-			callsub L_Mark,"^0000FFKafra Employee";
-			viewpoint 1,159,122,0,0x0A82FF;
-			break;
-		case 2:
-			callsub L_Mark,"^006400Chief's Residence";
-			viewpoint 1,110,131,1,0xAAFF00;
-			break;
-		case 3:
-			callsub L_Mark,"^D8BFD8Tool Dealer";
-			viewpoint 1,147,84,2,0xD8BFD8;
-			break;
-		case 4:
-			callsub L_Mark,"^FF1493Weapon Dealer";
-			viewpoint 1,174,101,3,0xFF1493;
-			break;
-		case 5:
-			callsub L_Mark,"^8B4513Armor Dealer";
-			viewpoint 1,173,84,4,0x8B4513;
-			break;
-		case 6:
-			callsub L_Mark,"^9400DWine Maker";
-			viewpoint 1,213,115,5,0x9400D3;
-			break;
-		case 7:
-			callsub L_Mark,"^00BFFFKunlun Envoy";
-			viewpoint 1,161,11,6,0x00BFFF;
-			break;
-		case 8:
-			mes "[He Yuen Zhe]";
-			mes "I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,1,1,0,0xFFFFFF;
-			viewpoint 2,1,1,1,0xFFFFFF;
-			viewpoint 2,1,1,2,0xFFFFFF;
-			viewpoint 2,1,1,3,0xFFFFFF;
-			viewpoint 2,1,1,4,0xFFFFFF;
-			viewpoint 2,1,1,5,0xFFFFFF;
-			viewpoint 2,1,1,6,0xFFFFFF;
-			break;
-		case 9:
-			mes "[He Yuen Zhe]";
-			mes "Bon voyage!";
-			close;
-		}
+	next;
+	switch(select("Residence of the Chief:Tool Dealer:Weapon Dealer:Armor Dealer:Wine Maker")) {
+	case 1:
+		viewpoint 1,109,131,0,0xFF3355;
+		mes "[He Yuen Zhe]";
+		mes "Please follow your minimap, and head over to the ^FF3355+^000000 mark.";
+		mes "There, you'll get to the residence of the Chief. Enjoy your stay in lovely Kunlun!";
+		mes "Xie Xie!";
+		close;
+	case 2:
+		viewpoint 1,147,82,1,0xCE6300;
+		mes "[He Yuen Zhe]";
+		mes "Please follow your minimap, and head over to the ^CE6300+^000000 mark.";
+		mes "There, you'll get to the Tool Dealer. Enjoy your stay in lovely Kunlun!";
+		mes "Xie Xie!";
+		close;
+	case 3:
+		viewpoint 1,174,104,2,0x55FF33;
+		mes "[He Yuen Zhe]";
+		mes "Please follow your minimap, and head over to the ^55FF33+^000000 mark.";
+		mes "There, you'll get to the Weapon Dealer. Enjoy your stay in lovely Kunlun!";
+		mes "Xie Xie!";
+		close;
+	case 4:
+		viewpoint 1,173,84,3,0x3355FF;
+		mes "[He Yuen Zhe]";
+		mes "Please follow your minimap, and head over to the ^3355FF+^000000 mark.";
+		mes "There, you'll get to the Armor Dealer. Enjoy your stay in lovely Kunlun!";
+		mes "Xie Xie!";
+		close;
+	case 5:
+		viewpoint 1,215,114,3,0xCD69C9;
+		mes "[He Yuen Zhe]";
+		mes "Please follow your minimap, and head over to the ^CD69C9+^000000 mark.";
+		mes "There, you'll get to the Wine Maker. Enjoy your stay in lovely Kunlun!";
+		mes "Xie Xie!";
+		close;
 	}
-	end;
-L_Mark:
-	mes "[He Yuen Zhe]";
-	mes "The "+getarg(0)+"^000000 is";
-	mes "marked on your mini-map.";
-	mes "Check your mini-map.";
-	mes "Is there anything else I can do for you?";
-	return;
 }
diff --git a/npc/pre-re/guides/guides_hugel.txt b/npc/pre-re/guides/guides_hugel.txt
index aa343f9ef..27336fcaa 100644
--- a/npc/pre-re/guides/guides_hugel.txt
+++ b/npc/pre-re/guides/guides_hugel.txt
@@ -1,297 +1,156 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Hugel Guides
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
+//===== By: ==================================================
+//= erKURITA; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
 //= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guides for the city of Hugel.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//= 1.1 Optimized. [Euphy]
-//============================================================ 
+//===== Description: =========================================
+//= [Official COnversion]
+//= Guides for the City of Hugel.
+//===== Additional Comments: =================================
+//= 1.0 Started the script. [erKURITA]
+//= 1.1 Removed Duplicates [Silent]
+//= 1.2 Rescripted to official 10.3 standards. [L0ne_W0lf]
+//============================================================
 
-hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
+hugel,98,56,3	script	Hugel Guide Granny#huge	863,0,0,{
 	mes "[Hugel Guide Granny]";
 	mes "Oh, hello~ you are one energetic adventurer.";
-	mes "Welcome to ^8B4513Hugel^000000. I am honored to guide you in this beautiful village.";
-	mes "If this is the first time for you to use the guide services, you should ask a lot of questions.";
-	next;
-	set .@str$,"Would you like to know more locations?";
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
+	mes "Welcome to Hugel. I was honored to guide you to this beautiful village.";
+	mes "If this is the first time for you to use the guide services, why don't you check the ''Notice'' menu first?";
+	while(1) {
+		next;
+		switch(select("Village Guide:Remove Marks from Mini-Map:Notice:Cancel")) {
 		case 1:
+			mes "[Hugel Guide Granny]";
+			mes "I can tell you any building location as long as it is in Hugel.";
+			mes "So where do you want to go?";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes.:No.") == 1) set .@compass_check,1;
+			}
 			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Church ]:[ Inn ]:[ Pub ]:[ Airport ]:[ Weapon Shop ]:[ Tool Shop ]:[ Bingo Game Room ]:[ ^3131FFHunter Guild^000000 ]:[ Party Supplies Shop ]:[ ^3131FFShrine Expedition^000000 ]:Previous Menu")) {
+			while(.@loop) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+				switch(select("Church:Inn:Pub:Airport:Weapon Shop:Tool Shop:Party Supplies Shop:^3131FFHunter Job Change Place^000000:^3131FFShrine Expedition's Place^000000:Monster Race Arena:Bingo Game Room:Cancel")) {
 				case 1:
 					mes "[Hugel Guide Granny]";
 					mes "Well, to me, this Church is rather like a place for old folks like me, you know...";
-					mes .@str$;
-					viewpoint 1,159,113,0,0xFF0000;
-					next;
+					if (.@compass_check)
+						viewpoint 1,156,116,2,0xFF0000;
 					break;
 				case 2:
 					mes "[Hugel Guide Granny]";
 					mes "Pudding rather than praise.";
-					mes "You'd better unpack your stuff first before you start looking around this village.";
-					mes .@str$;
-					viewpoint 1,101,77,1,0x8B4513;
-					next;
+					mes "You'd better unpack your stuffs first before you start looking around this village.";
+					mes "It is the building right next to me.";
+					if (.@compass_check)
+						viewpoint 1,104,79,3,0xFF00FF;
 					break;
 				case 3:
 					mes "[Hugel Guide Granny]";
-					mes "Yes, when you travel, you want to drop by a Pub and make new friends.";
+					mes "Yes, when you travel, you want to drop by a pub and make new friends.";
 					mes "Go east from here, then you will arrive at the pub.";
-					mes .@str$;
-					viewpoint 1,126,65,2,0xDAA520;
-					next;
+					if (.@compass_check)
+						viewpoint 1,129,66,4,0x99FFFF;
 					break;
 				case 4:
 					mes "[Hugel Guide Granny]";
-					mes "A while ago, strangers came to the village and built that strange Airport kind of thing...";
+					mes "A while ago, strangers came to village and built that strange airport kind of thing...";
 					mes "What do they call it? Airship?";
-					mes .@str$;
-					viewpoint 1,178,146,3,0xD7567F;
-					next;
+					if (.@compass_check)
+						viewpoint 1,178,146,5,0x0000FF;
 					break;
 				case 5:
 					mes "[Hugel Guide Granny]";
-					mes "Well, we have a Weapon Shop in the center of the village.";
+					mes "Well, we have a weapon shop in the center of village.";
 					mes "But I don't know if there is any weapon that you find useful.";
-					mes .@str$;
-					viewpoint 1,88,167,4,0xCD5C5C;
-					next;
+					if (.@compass_check)
+						viewpoint 1,70,158,6,0x00FF00;
 					break;
 				case 6:
 					mes "[Hugel Guide Granny]";
 					mes "Yes, I love Hugel brand Red Potions. I haven't tasted Red Potions from any other brands yet...hohoho. ";
 					mes "The tool shop is located in the center of village.";
-					mes .@str$;
-					viewpoint 1,92,163,5,0x000080;
-					next;
+					if (.@compass_check)
+						viewpoint 1,93,167,7,0x00FF00;
 					break;
 				case 7:
 					mes "[Hugel Guide Granny]";
-					mes "I will mark the location";
-					mes "of the ^800080Bingo Game Room^000000";
-					mes "on your mini-map.";
-					mes .@str$;
-					viewpoint 1,58,206,6,0x800080;
-					next;
+					mes "The party supplies shop is around the center of village.";
+					mes "Make sure that you will not use any firecracker stuffs near other people, because it is dangerous, you know?";
+					if (.@compass_check)
+						viewpoint 1,91,105,8,0xFF99FF;
 					break;
 				case 8:
 					mes "[Hugel Guide Granny]";
 					mes "Oh, are you an aspiring Hunter?";
-					mes "Then head northeast following the beach, then you will find the Hunter Guild.";
-					mes .@str$;
-					viewpoint 1,209,224,7,0xFF1493;
-					next;
+					mes "Then head northeast following the beach, then you will find the Hunter job change place.";
+					if (.@compass_check)
+						viewpoint 1,206,228,9,0xFF9900;
 					break;
 				case 9:
 					mes "[Hugel Guide Granny]";
-					mes "I will mark the location";
-					mes "of the ^483D8BParty Supplies Shop^000000";
-					mes "on your mini-map.";
-					mes .@str$;
-					viewpoint 1,95,103,8,0x483D8B;
-					next;
-					break;
-				case 10:
-					mes "[Hugel Guide Granny]";
-					mes "I heard that the Shrine Expedition is staying in a house at the west.";
+					mes "I heard that the shrine expedition is staying in a house at the west.";
 					mes "They have put some kind of sign in the middle of village, so I guess that they are hiring people for something...";
-					mes "I wonder what they are doing in here... hmmm.";
-					mes .@str$;
-					viewpoint 1,52,95,9,0x834683;
-					next;
+					mes "I wonder what they are doing in here...hmmm.";
+					if (.@compass_check)
+						viewpoint 1,52,91,10,0xFFFFFF;
 					break;
-				case 11:
-					set .@loop,0;
-					break;
-				}
-			}
-			break;
-		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Monster Race Arena ]:[ Cool Event Corp. Staff ]:Previous Menu")) {
-				case 1:
+				case 10:
 					mes "[Hugel Guide Granny]";
 					mes "I also like playing Monster Race games. It is pretty fun, you know?";
 					mes "Oh, you haven't tried it yet? No~ you'd better try. Trust me, you will like it.";
-					mes .@str$;
-					viewpoint 1,60,71,10,0xFF1493;
-					next;
+					if (.@compass_check)
+						viewpoint 1,58,72,11,0xFF9900;
 					break;
-				case 2:
+				case 11:
 					mes "[Hugel Guide Granny]";
-					mes "I will mark the location";
-					mes "of the ^DA70D6Cool Event Corp. Staff^000000";
-					mes "on your mini-map.";
-					mes .@str$;
-					viewpoint 1,88,168,11,0xDA70D6;
-					next;
-					break;
-				case 3:
-					set .@loop,0;
+					mes "Do you like bingo games? If you do, go visit Euklan's Bingo Game Room.";
+					if (.@compass_check)
+						viewpoint 1,55,209,12,0x66FFFF;
 					break;
-				}
-			}
-			break;
-		case 3:
-			mes "[Hugel Guide Granny]";
-			mes "I'll remove the marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,159,113,0,0xFFFFFF;
-			viewpoint 2,101,77,1,0xFFFFFF;
-			viewpoint 2,126,65,2,0xFFFFFF;
-			viewpoint 2,178,146,3,0xFFFFFF;
-			viewpoint 2,88,167,4,0xFFFFFF;
-			viewpoint 2,92,163,5,0xFFFFFF;
-			viewpoint 2,58,206,6,0xFFFFFF;
-			viewpoint 2,209,224,7,0xFFFFFF;
-			viewpoint 2,95,103,8,0xFFFFFF;
-			viewpoint 2,52,95,9,0xFFFFFF;
-			viewpoint 2,60,71,10,0xFFFFFF;
-			viewpoint 2,88,168,11,0xFFFFFF;
-			next;
-			break;
-		case 4:
-			mes "[Hugel Guide Granny]";
-			mes "Ho ho ho ~!";
-			mes "Guiding is very interesting.";
-			close;
-		}
-	}
-}
-
-hugel,187,172,6	script	Guide Rich King#hugel	414,{
-	mes "[Guide Rich King]";
-	mes "What business do you have";
-	mes "in this countryside village?";
-	next;
-	mes "[Rich King]";
-	mes "This is ^8B4513Hugel^000000";
-	mes "in the Schwaltzvalt Republic.";
-	mes "You are very honored to receive guidance from a great person like me.";
-	next;
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
-		case 1:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Church ]:[ Inn ]:[ Pub ]:[ Airport ]:[ Weapon Shop ]:[ Tool Shop ]:[ Bingo Game Room ]:[ Hunter Guild ]:[ Party Supplies Shop ]:[ Shrine Expedition ]:Previous Menu")) {
-				case 1:
-					callsub L_Mark,"^FF0000Church";
-					viewpoint 1,159,113,0,0xFF0000;
-					next;
-					break;
-				case 2:
-					callsub L_Mark,"^8B4513Inn";
-					viewpoint 1,101,77,1,0x8B4513;
-					next;
-					break;
-				case 3:
-					callsub L_Mark,"^DAA520Pub";
-					viewpoint 1,126,65,2,0xDAA520;
-					next;
-					break;
-				case 4:
-					callsub L_Mark,"^D7567FAirport";
-					viewpoint 1,178,146,3,0xD7567F;
-					next;
-					break;
-				case 5:
-					callsub L_Mark,"^CD5C5CWeapon Shop";
-					viewpoint 1,88,167,4,0xCD5C5C;
-					next;
-					break;
-				case 6:
-					callsub L_Mark,"^000080Tool Shop";
-					viewpoint 1,92,163,5,0x000080;
-					next;
-					break;
-				case 7:
-					callsub L_Mark,"^800080Bingo Game Room";
-					viewpoint 1,58,206,6,0x800080;
-					next;
-					break;
-				case 8:
-					callsub L_Mark,"^FF1493Hunter Guild";
-					viewpoint 1,209,224,7,0xFF1493;
-					next;
-					break;
-				case 9:
-					callsub L_Mark,"^483D8BParty Supplies Shop";
-					viewpoint 1,95,103,8,0x483D8B;
-					next;
-					break;
-				case 10:
-					callsub L_Mark,"^834683Shrine Expedition";
-					viewpoint 1,52,95,9,0x834683;
-					next;
-					break;
-				case 11:
+				case 12:
+					mes "[Hugel Guide Granny]";
+					mes "If you like to get rid of all the location marks on your Mini-Map,";
+					mes "just ask me again, and choose ''Remove Marks from Mini-Map'' menu.";
 					set .@loop,0;
-					break;
 				}
 			}
 			break;
 		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Monster Race Arena ]:[ Cool Event Corp. Staff ]:Previous Menu")) {
-				case 1:
-					callsub L_Mark,"^FF1493Monster Race Arena";
-					viewpoint 1,60,71,10,0xFF1493;
-					next;
-					break;
-				case 2:
-					callsub L_Mark,"^DA70D6Cool Event Corp. Staff";
-					viewpoint 1,88,168,11,0xDA70D6;
-					next;
-					break;
-				case 3:
-					set .@loop,0;
-					break;
-				}
-			}
+			viewpoint 2,156,116,2,0xFF0000;
+			viewpoint 2,104,79,3,0xFF00FF;
+			viewpoint 2,129,66,4,0x99FFFF;
+			viewpoint 2,178,146,5,0x0000FF;
+			viewpoint 2,70,158,6,0x00FF00;
+			viewpoint 2,93,167,7,0x00FF00;
+			viewpoint 2,91,105,8,0xFF99FF;
+			viewpoint 2,206,228,9,0xFF9900;
+			viewpoint 2,52,91,10,0xFFFFFF;
+			viewpoint 2,58,72,11,0xFF9900;
+			viewpoint 2,55,209,12,0x66FFFF;
+			set .@compass_check,0;
+			mes "[Hugel Guide Granny]";
+			mes "Okay, they are gone now. If you have more locations to ask, just let me know.";
 			break;
 		case 3:
-			mes "[Rich King]";
-			mes "I'll remove the marks from your mini-map.";
-			mes "I know you're curious but you need to stop bugging me.";
-			viewpoint 2,159,113,0,0xFFFFFF;
-			viewpoint 2,101,77,1,0xFFFFFF;
-			viewpoint 2,126,65,2,0xFFFFFF;
-			viewpoint 2,178,146,3,0xFFFFFF;
-			viewpoint 2,88,167,4,0xFFFFFF;
-			viewpoint 2,92,163,5,0xFFFFFF;
-			viewpoint 2,58,206,6,0xFFFFFF;
-			viewpoint 2,209,224,7,0xFFFFFF;
-			viewpoint 2,95,103,8,0xFFFFFF;
-			viewpoint 2,52,95,9,0xFFFFFF;
-			viewpoint 2,60,71,10,0xFFFFFF;
-			viewpoint 2,88,168,11,0xFFFFFF;
-			next;
+			mes "[Hugel Guide Granny]";
+			mes "When you are using the ''Village Guide'' menu, ";
+			mes "make sure that building locations will be marked on your mini-map at the upper right side of your screen.";
+			mes "If you cannot see your mini-map, use the short cut key ''ctrl+tab'' or press the ''Map'' button on your basic information windows, okay?";
+			mes "And you can also zoom out your mini-map by using the ''-'' button in case you cannot view the entire map of the village.";
 			break;
 		case 4:
-			mes "[Rich King]";
-			mes "I'm getting a little bit hungry after working so hard...";
-			mes "I am eager to eat something!";
+			mes "[Hugel Guide Granny]";
+			mes "This guide job is pretty exciting. Hohoho~";
 			close;
 		}
 	}
-	end;
-L_Mark:
-	mes "[Rich King]";
-	mes "I will mark the location";
-	mes "of the "+getarg(0)+"^000000.";
-	mes "Do you want to know more locations?";
-	mes "Are you going to keep bugging me and make me get upset?";
-	return;
 }
diff --git a/npc/pre-re/guides/guides_izlude.txt b/npc/pre-re/guides/guides_izlude.txt
index 45fe0cd8a..df214fb67 100644
--- a/npc/pre-re/guides/guides_izlude.txt
+++ b/npc/pre-re/guides/guides_izlude.txt
@@ -1,186 +1,161 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Izlude Guides
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena  SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guides for the city of Izlude
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//============================================================ 
+//===== By: ==================================================
+//= kobra_k88; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.5a
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the City of Izlude
+//===== Additional Comments: =================================
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.3 Updated the guide according to how it is on iRO, thanks [MasterOfMuppets]
+//=     to Muad_Dib
+//= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
+//= 1.5 Rescripted to official 10.3 standards. [L0ne_W0lf]
+//= 1.5a Fixed some errors with the loop[Samuray22]
+//	-Thanks to $ephiroth.
+//============================================================
 
-izlude,121,87,6	script	Guide#01izlude::GuideIzlude	105,{
+izlude,121,87,6	script	Guide#iz	105,{
 	cutin "prt_soldier",2;
 	mes "[Izlude Guide]";
-	mes "Welcome to ^8B4513Izlude^000000,";
-	mes "Prontera's satellite town.";
-	mes "Do you need help navigating the town?";
-	next;
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
+	mes "Welcome to Izlude,";
+	mes "Prontera's satellite city.";
+	mes "If you need any guidance";
+	mes "around Izlude, feel free";
+	mes "to ask me at anytime.";
+	set .@loop1,1;
+	while(.@loop1) {
+		next;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice.:Cancel")) {
 		case 1:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Marina ]:[ Airport ]:[ Arena ]:[ Tool Shop ]:[ Weapon & Armor Shop ]:[ Swordsman Guild ]:[ Swordsman Association ]:Previous Menu")) {
+			mes "[Izlude Guide]";
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes:No") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while(.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+				
+				switch(select("^FF0000Swordman Association^000000:Swordman Hall:Arena:Izlude Marina:Weapon Shop:Tool Shop:Cancel")) {
 				case 1:
 					mes "[Izlude Guide]";
-					mes "You can use the northeast ^B9062FMarina^000000";
-					mes "to go to ^8B4513Alberta^000000 or ^8B4513Byalan Island^000000.";
-					mes "Beware of ^8B4513Izlude Dungeon^000000";
-					mes "on Byalan Island since it is";
-					mes "filled with dreadful monsters.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,200,180,0,0xFF0000;
-					next;
+					mes "The Swordman Association";
+					mes "is located on an island that is";
+					mes "in west Izlude. If you're thinking of changing jobs to Swordman,";
+					mes "you should check it out.";
+					if (.@compass_check)
+						viewpoint 1,52,140,0,0xFF0000;
 					break;
 				case 2:
 					mes "[Izlude Guide]";
-					mes "The ^0000FFInternational Airship^000000 to the southeast";
-					mes "goes to ^8B4513Juno^000000 and ^8B4513Rachel^000000.";
-					mes "Let me mark its location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,145,39,1,0x0A82FF;
-					next;
+					mes "The Swordman Hall";
+					mes "is located in the eastern";
+					mes "island connected to Izlude.";
+					if (.@compass_check)
+						viewpoint 1,214,130,1,0x00FF00;
 					break;
 				case 3:
 					mes "[Izlude Guide]";
-					mes "The ^FF5400Arena^000000 at the north";
-					mes "is a perfect place to";
-					mes "test your combat capabilities.";
-					mes "Let me mark its location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,128,255,2,0xFF5400;
-					next;
+					mes "Izlude's famous";
+					mes "Arena is located at the";
+					mes "northern end of Izlude.";
+					if (.@compass_check)
+						viewpoint 1,128,225,2,0x00FF00;
 					break;
 				case 4:
 					mes "[Izlude Guide]";
-					mes "Let me mark the location of the ^006400Tool Shop^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,148,148,3,0xAAFF00;
-					next;
+					mes "You can find the";
+					mes "Marina in the northeast";
+					mes "part of Izlude. There, you can";
+					mes "ride a ship which will take you";
+					mes "to Alberta or Byalan Island.";
+					if (.@compass_check)
+						viewpoint 1,200,180,3,0xFF0000;
 					break;
 				case 5:
 					mes "[Izlude Guide]";
-					mes "Let me mark the location of the ^7F3300Weapon & Armor Shop^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,114,149,4,0xD2691E;
-					next;
+					mes "You can easily";
+					mes "find the Weapon Shop";
+					mes "in northwest Izlude.";
+					if (.@compass_check)
+						viewpoint 1,111,149,4,0xFF00FF;
 					break;
 				case 6:
 					mes "[Izlude Guide]";
-					mes "The Swordsman Guild is where you can ^800080change your job to Swordsman.^000000";
-					mes "Let me mark its location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,52,140,5,0xDA70D6;
-					next;
+					mes "The Tool Shop shouldn't";
+					mes "be too hard to find in the";
+					mes "northeast part of Izlude.";
+					if (.@compass_check)
+						viewpoint 1,148,148,5,0xFF00FF;
 					break;
 				case 7:
 					mes "[Izlude Guide]";
-					mes "Let me mark the location of the ^B9062FSwordsman Association^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,214,130,6,0xFF0000;
-					next;
-					break;
-				case 8:
-					set .@loop,0;
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
 					break;
 				}
 			}
 			break;
 		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Newlywed Helper ]:[ Bullet Merchant ]:[ Mercenary Guildsman ]:Previous Menu")) {
-				case 1:
-					mes "[Izlude Guide]";
-					mes "The ^0000FFEden Teleport Officer^000000";
-					mes "is currently staying inside";
-					mes "the Swordsman Guild building.";
-					mes "Let me mark his location on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,52,140,7,0x0A82FF;
-					next;
-					break;
-				case 2:
-					mes "[Izlude Guide]";
-					mes "Let me mark the location of the";
-					mes "^FF5400Kafra Employee^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,134,88,8,0xFF5400;
-					next;
-					break;
-				case 3:
-					mes "[Izlude Guide]";
-					mes "If you'd like to go on a honeymoon to";
-					mes "^8B4513Jawaii^000000, the paradise of newlyweds,";
-					mes "please speak to the ^B9062FNewlywed Helper^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,171,185,9,0xFF0000;
-					next;
-					break;
-				case 4:
-					mes "[Izlude Guide]";
-					mes "The ^7F3300Bullet Merchants^000000 for ^7F3300Gunslingers^000000";
-					mes "is located to the east.";
-					mes "Let me mark his location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,171,130,10,0xD2691E;
-					next;
-					break;
-				case 5:
-					mes "[Izlude Guide]";
-					mes "Let me mark the location of ^0000FFFencer Mercenary Manager^000000 and";
-					mes "^0000FFMercenary Goods Merchant^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,48,137,11,0xDA70D6;
-					next;
-					break;
-				case 6:
-					set .@loop,0;
-					break;
-				}
-			}
+			viewpoint 2,237,41,0,0x00FF00;
+			viewpoint 2,237,41,1,0x0000FF;
+			viewpoint 2,46,345,2,0x00FF00;
+			viewpoint 2,175,220,3,0xFF0000;
+			viewpoint 2,134,221,4,0xFF0000;
+			viewpoint 2,204,214,5,0xFF0000;
+			set .@compass_check,0;
 			break;
 		case 3:
 			mes "[Izlude Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,1,1,0,0xFFFF00;
-			viewpoint 2,1,1,1,0x000000;
-			viewpoint 2,1,1,2,0xFF0000;
-			viewpoint 2,1,1,3,0xFFFF00;
-			viewpoint 2,1,1,4,0xFFFF00;
-			viewpoint 2,1,1,5,0xFFFF00;
-			viewpoint 2,1,1,6,0xFFFF00;
-			viewpoint 2,1,1,7,0xFFFF00;
-			viewpoint 2,1,1,8,0xFFFF00;
-			viewpoint 2,1,1,9,0xFFFF00;
-			viewpoint 2,1,1,10,0xFFFF00;
-			viewpoint 2,1,1,11,0xFFFF00;
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
+			next;
+			mes "[Izlude Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
 			next;
+			mes "[Izlude Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in the city of Izlude.";
 			break;
 		case 4:
 			mes "[Izlude Guide]";
-			mes "Enjoy your stay.";
-			mes "Bye~!";
+			mes "Okay then, feel";
+			mes "free to come to me";
+			mes "if you ever feel lost";
+			mes "around Izlude, alright?";
 			close2;
-			cutin "prt_soldier",255;
-			end;
+			set .@loop1,0;
+			break;
 		}
 	}
+	cutin "prt_soldier",255;
+	end;
 }
-
-izlude,131,177,4	duplicate(GuideIzlude)	Guide#02izlude	105
diff --git a/npc/pre-re/guides/guides_juno.txt b/npc/pre-re/guides/guides_juno.txt
index dc8d41812..d8c08b31e 100644
--- a/npc/pre-re/guides/guides_juno.txt
+++ b/npc/pre-re/guides/guides_juno.txt
@@ -1,160 +1,118 @@
-//===== rAthena Script ======================================= 
-//= Juno Guides
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
+//===== rAthena Script =======================================
+//= Yuno Guides
+//===== By: ==================================================
+//= KitsuneStarwind, usul, kobra_k88; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.7
+//===== Compatible With: =====================================
 //= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guides for the city of Juno.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//= 1.1 Fixed and optimized. [Euphy]
-//============================================================ 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the City of Juno
+//===== Additional Comments: =================================
+//= Edited Miss Yoon text. Added town soldiers by usul. Edited town soldiers
+//= and added map location option for them. [kobra_k88]
+//= 1.1 Changed sprites and cutins to Schwarzwald Republic ones
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.3 Updated the mini map localization function. [Musashiden]
+//= 1.4 Juno Guides are now up to date according to iRO. [Musashiden]
+//= 1.5 Removed Duplicates [Silent].
+//= 1.6 Changed one of the Juno soldier's sprite. [Musashiden]
+//= 1.7 Rescripted to official 10.3 standards. [L0ne_W0lf]
+//============================================================
 
-yuno,59,212,4	script	Juno Guide#yuno01::GuideJuno	700,{
-	mes "[Juno Guide]";
+yuno,153,47,4	script	Juno Guide#yuno	700,{
+	mes "[Ms. Yoon]";
 	mes "A place that takes the vision of the future, and gives it form in the present. Welcome to";
-	mes "the city of ^8B4513Juno^000000!";
+	mes "the city of Juno!";
 	next;
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove marks from Mini-Map:Cancel")) {
-		case 1:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Tool Shop ]:[ Forge ]:[ Airport ]:[ Government Building ]:[ Street of Book Stores ]:[ Inn & Pub ]:[ Sage Castle ]:[ Monster Academy ]:[ Library of the Republic ]:[ Weapon & Armor Shop ]:[ Juphero Plaze ]:[ Monster Museum ]:[ Schweicherbil Magic Academy ]:Previous Menu")) {
-				case 1:
-					callsub L_Mark,"^FF0000Tool Shop";
-					viewpoint 1,194,140,0,0xFF0000;
-					next;
-					break;
-				case 2:
-					callsub L_Mark,"^FF4500Forge";
-					viewpoint 1,120,137,1,0xFF4500;
-					next;
-					break;
-				case 3:
-					callsub L_Mark,"^DAA520Airport";
-					viewpoint 1,16,261,2,0xDAA520;
-					next;
-					break;
-				case 4:
-					callsub L_Mark,"^008000Government Building";
-					viewpoint 1,157,317,3,0x008000;
-					next;
-					break;
-				case 5:
-					callsub L_Mark,"^0000FFStreet of Book Stores";
-					viewpoint 1,172,100,4,0x0000FF;
-					next;
-					break;
-				case 6:
-					callsub L_Mark,"^000080Inn & Pub";
-					viewpoint 1,51,105,5,0x000080;
-					next;
-					break;
-				case 7:
-					callsub L_Mark,"^800080Sage Castle";
-					viewpoint 1,90,318,6,0x800080;
-					next;
-					break;
-				case 8:
-					callsub L_Mark,"^834683Monster Academy";
-					viewpoint 1,95,184,7,0x834683;
-					next;
-					break;
-				case 9:
-					callsub L_Mark,"^4B0082Juno Library";
-					viewpoint 1,338,203,8,0x4B0082;
-					next;
-					break;
-				case 10:
-					callsub L_Mark,"^008080Weapon & Armor Shop";
-					viewpoint 1,120,137,9,0x008080;
-					next;
-					break;
-				case 11:
-					callsub L_Mark,"^FF1493Juphero Plaza";
-					viewpoint 1,115,157,10,0xFF1493;
-					next;
-					break;
-				case 12:
-					callsub L_Mark,"^DA70D6Monster Museum";
-					viewpoint 1,278,290,11,0xDA70D6;
-					next;
-					break;
-				case 13:
-					callsub L_Mark,"^CD1039Schweicherbil Magic Academy";
-					viewpoint 1,323,280,12,0xCD1039;
-					next;
-					break;
-				case 14:
-					set .@loop,0;
-					break;
-				}
-			}
-			break;
-		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Kafra Employees ]:[ Eden Teleport Officer ]:Previous Menu")) {
-				case 1:
-					callsub L_Mark,"^FA8072Kafra Employees";
-					viewpoint 1,152,187,13,0xFA8072;
-					viewpoint 1,277,221,14,0xFA8072;
-					viewpoint 1,327,108,15,0xFA8072;
-					next;
-					break;
-				case 2:
-					callsub L_Mark,"^803232Eden Teleport Officer";
-					viewpoint 1,144,189,16,0x803232;
-					next;
-					break;
-				case 3:
-					set .@loop,0;
-					break;
-				}
-			}
-			break;
-		case 3:
-			mes "[Juno Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,194,140,0,0xFFFFFF;
-			viewpoint 2,120,137,1,0xFFFFFF;
-			viewpoint 2,16,261,2,0xFFFFFF;
-			viewpoint 2,157,317,3,0xFFFFFF;
-			viewpoint 2,172,100,4,0xFFFFFF;
-			viewpoint 2,51,105,5,0xFFFFFF;
-			viewpoint 2,90,318,6,0xFFFFFF;
-			viewpoint 2,95,184,7,0xFFFFFF;
-			viewpoint 2,338,203,8,0xFFFFFF;
-			viewpoint 2,120,137,9,0xFFFFFF;
-			viewpoint 2,115,157,10,0xFFFFFF;
-			viewpoint 2,278,290,11,0xFFFFFF;
-			viewpoint 2,323,280,12,0xFFFFFF;
-			viewpoint 2,152,187,13,0xFFFFFF;
-			viewpoint 2,277,221,14,0xFFFFFF;
-			viewpoint 2,327,108,15,0xFFFFFF;
-			viewpoint 2,144,189,16,0xFFFFFF;
-			next;
-			break;
-		case 4:
-			mes "[Juno Guide]";
-			mes "Have fun on your adventures!";
-			close;
-		}
+	switch(select("Armory:Tool Shop:Sage Castle (Sage Job Change Place):Street of Book Stores:Juphero Plaza:Library of the Republic:Schweicherbil Magic Academy:Monster Museum:Forge:Airport:End Conversation")) {
+	case 1:
+		viewpoint 1,120,138,0,0xFF3355;
+		mes "[Ms. Yoon]";
+		mes "Please look";
+		mes "at the mini map.";
+		mes "^FF3355+^000000 -> Armory";
+		mes "Thank you,";
+		mes "have a good day.";
+		close;
+	case 2:
+		viewpoint 1,193,142,1,0x3355FF;
+		mes "[Ms. Yoon]";
+		mes "Please look";
+		mes "at the mini map.";
+		mes "^3355FF+^000000 -> Tool Shop";
+		mes "Thank you,";
+		mes "have a good day.";
+		close;
+	case 3:
+		viewpoint 1,90,318,2,0x33FF55;
+		mes "[Ms. Yoon]";
+		mes "Please look";
+		mes "at the mini map.";
+		mes "^33FF55+^000000 -> Sage Castle";
+		mes "( Sage Job Change Place )";
+		mes "Thank you, have a good day.";
+		close;
+	case 4:
+		viewpoint 1,257,102,3,0xFF3355;
+		mes "[Ms. Yoon]";
+		mes "Please look";
+		mes "at the mini map.";
+		mes "^FF3355+^000000 -> Street of Book Stores";
+		mes "Thank you, have a good day.";
+		close;
+	case 5:
+		viewpoint 1,157,170,4,0x3355FF;
+		mes "[Ms. Yoon]";
+		mes "Please look";
+		mes "at the mini map.";
+		mes "^3355FF+^000000 -> Juphero Plaza";
+		mes "Thank you,";
+		mes "have a good day.";
+		close;
+	case 6:
+		viewpoint 1,336,204,5,0x33FF55;
+		mes "[Ms. Yoon]";
+		mes "Please look";
+		mes "at the mini map.";
+		mes "^33FF55+^000000 -> Library of the Republic";
+		mes "Thank you, have a good day.";
+		close;
+	case 7:
+		viewpoint 1,323,281,6,0xFF3355;
+		mes "[Ms. Yoon]";
+		mes "Please look at the mini map.";
+		mes "^FF3355+^000000 -> Schweicherbil Magic Academy";
+		mes "Thank you, have a good day.";
+		close;
+	case 8:
+		viewpoint 1,278,288,7,0x3355FF;
+		mes "[Ms. Yoon]";
+		mes "Please look at the mini map.";
+		mes "^3355FF+^000000 -> Monster Museum";
+		mes "Thank you, have a good day.";
+		close;
+	case 9:
+		viewpoint 1,120,138,8,0xFF3355;
+		mes "[Ms. Yoon]";
+		mes "Please look at the mini map.";
+		mes "^FF3355+^000000 -> Forge";
+		mes "The forge is located underneath Armory.";
+		mes "Thank you, have a good day.";
+		close;
+	case 10:
+		viewpoint 1,53,214,9,0xFF3355;
+		mes "[Ms. Yoon]";
+		mes "Please look at the mini map.";
+		mes "^FF3355+^000000 -> Airport";
+		mes "Thank you, have a good day.";
+		close;
+	case 11:
+		mes "[Ms. Yoon]";
+		mes "A great city of wise men.";
+		mes "A city of Knowledge!";
+		mes "Welcome to Juno.";
+		close;
 	}
-	end;
-L_Mark:
-	mes "[Juno Guide]";
-	mes "I will mark the location";
-	mes "of the "+getarg(0)+"^000000";
-	mes "on your mini-map.";
-	mes "Would you like to check any other locations?";
-	return;
 }
-
-yuno,153,47,4	duplicate(GuideJuno)	Juno Guide#yuno02	700
diff --git a/npc/pre-re/guides/guides_lighthalzen.txt b/npc/pre-re/guides/guides_lighthalzen.txt
index 52ee73902..c9fb40b5b 100644
--- a/npc/pre-re/guides/guides_lighthalzen.txt
+++ b/npc/pre-re/guides/guides_lighthalzen.txt
@@ -1,186 +1,227 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Lighthalzen Guides
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
+//===== By: ==================================================
+//= MasterOfMuppets; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
 //= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guides for the city of Lighthalzen.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//= 1.1 Optimized. [Euphy]
-//============================================================ 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the City of Lighthalzen
+//===== Additional Comments: =================================
+//= 1.0 First Version [MasterOfMuppets]
+//= 1.1 Removed Duplicates [Silent]
+//= 1.2 Rescripted to official 10.3 standards. [L0ne_W0lf]
+//============================================================
 
-lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
+lighthalzen,207,310,5	script	Guide#lhz::LhzGuide	852,{
 	cutin "ein_soldier",2;
 	mes "[Lighthalzen Guide]";
-	mes "Welcome to ^8B4513Lighthalzen^000000,";
+	mes "Welcome to Lighthalzen,";
 	mes "the Corporation City-State.";
 	mes "If you need any guidance";
 	mes "around the city, feel free";
 	mes "to ask me and I'll do my";
 	mes "very best to help you.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "Please be aware that I'm";
-	mes "in charge of providing info";
-	mes "regarding the West District";
-	mes "of ^8B4513Lighthalzen^000000. Now, please";
-	mes "select the location that you'd";
-	mes "like to learn more about.";
-	next;
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice.:Cancel")) {
 		case 1:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Hotel ]:[ Bank ]:[ Airport ]:[ Weapon Shop ]:[ Department Store ]:[ Police Station ]:[ Jewelry Store ]:[ Cool Event Corp. ]:[ Somatology Laboratory ]:[ Alchemist Association ]:Previous Menu")) {
+			mes "[Lighthalzen Guide]";
+			mes "Please be aware that I'm";
+			mes "in charge of providing info";
+			mes "regarding the West District";
+			mes "of Lighthalzen. Now, please";
+			mes "select the location that you'd";
+			mes "like to learn more about.";
+			if (.@compass_check == 0) {
+				next;
+				mes "[Lighthalzen Guide]";
+				mes "But before that,";
+				mes "would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes.:No.") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while(.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+				switch(select("^FF0000Rekenber Corporation^000000:Train Station:Police Station:Bank:Hotel:Airport:Merchant Guild:Jewelry Shop:Weapon Shop:Departement Store:Cancel")) {
 				case 1:
-					callsub L_Mark,"^FF0000Hotel";
-					viewpoint 1,160,217,0,0xFF0000;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "Rekenber Corporation,";
+					mes "the largest company in";
+					mes "the Schwaltzvalt Republic,";
+					mes "in located in northwestern";
+					mes "Lighthalzen. You can't miss";
+					mes "the headquarters building.";
+					if (.@compass_check)
+						viewpoint 1,102,247,2,0xFF0000;
 					break;
 				case 2:
-					callsub L_Mark,"^FF4500Bank";
-					viewpoint 1,203,257,1,0xFF4500;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "The Train Station is";
+					mes "located in the center of";
+					mes "the city, where we have";
+					mes "a direct railroad to Einbroch.";
+					if (.@compass_check)
+						viewpoint 1,233,164,3,0xFF00FF;
 					break;
 				case 3:
-					callsub L_Mark,"^DAA520Airport";
-					viewpoint 1,262,75,2,0xDAA520;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "Our Police Station is just";
+					mes "north of the city's center.";
+					mes "Please don't hesitate to report";
+					mes "any suspicious persons and";
+					mes "activity, or if you have any";
+					mes "problems whatsoever.";
+					if (.@compass_check)
+						viewpoint 1,236,276,4,0x99FFFFF;
 					break;
 				case 4:
-					callsub L_Mark,"^7B68EEWeapon Shop";
-					viewpoint 1,194,35,3,0x7B68EE;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "The Bank is located";
+					mes "just opposite to the";
+					mes "Lighthalzen Police Station,";
+					mes "which is a pretty good idea";
+					mes "when I think about it, actually. ^FFFFFFspacer^000000";
+					if (.@compass_check)
+						viewpoint 1,198,257,5,0x0000FF;
 					break;
 				case 5:
-					callsub L_Mark,"^B91A4DDepartment Store";
-					viewpoint 1,202,106,4,0xB91A4D;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "Our Hotel is located in";
+					mes "the middle of the South Plaza.";
+					mes "Due to its quality services and";
+					mes "luxurious accomodations, this";
+					mes "hotel is extremely popular.";
+					if (.@compass_check)
+						viewpoint 1,159,133,6,0x00FF00;
 					break;
 				case 6:
-					callsub L_Mark,"^008000Police Station";
-					viewpoint 1,234,276,5,0x008000;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "The Airport is to the far";
+					mes "west of the Central Promenade.";
+					mes "You can travel anywhere within";
+					mes "the Schwaltzvalt Republic by";
+					mes "riding on one of the Airships.";
+					if (.@compass_check)
+						viewpoint 1,267,75,7,0x00FF00;
 					break;
 				case 7:
-					callsub L_Mark,"^0000FFJewelry Store";
-					viewpoint 1,96,110,6,0x0000FF;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "The Merchant Guild can be";
+					mes "found in the southwestern";
+					mes "part of Lighthalzen.";
+					if (.@compass_check)
+						viewpoint 1,74,53,8,0xFF99FF;
 					break;
 				case 8:
-					callsub L_Mark,"^000080Cool Event Corp.";
-					viewpoint 1,238,217,7,0x000080;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "The Jewelry Shop is";
+					mes "located just west of";
+					mes "the South Plaza.";
+					if (.@compass_check)
+						viewpoint 1,93,110,9,0xFF9900;
 					break;
 				case 9:
-					callsub L_Mark,"^800080Somatology Laboratory";
-					viewpoint 1,101,243,8,0x800080;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "The Weapon Shop is";
+					mes "located at the end of";
+					mes "the Central Promenade.";
+					mes "It's at least worth a look";
+					mes "if you're serious about";
+					mes "adventuring around here.";
+					if (.@compass_check)
+						viewpoint 1,196,46,10,0x330033;
 					break;
 				case 10:
-					callsub L_Mark,"^0A9696Alchemist Association";
-					viewpoint 1,54,132,9,0x0A9696;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "The Department Store is";
+					mes "located in the middle of";
+					mes "Lighthalzen and is the biggest";
+					mes "and most convenient place for";
+					mes "shopping for almost everything.";
+					if (.@compass_check)
+						viewpoint 1,199,163,11,0xFFFF00;
 					break;
 				case 11:
-					set .@loop,0;
-					break;
+					mes "[Lighthalzen Guide]";
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
 				}
 			}
 			break;
 		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Armsmith ]:[ Seiayablem ]:[ Pet Groomer ]:[ Kafra Employees ]:[ Cool Event Corp. Staff ]:Previous Menu")) {
-				case 1:
-					mes "[Lighthalzen Guide]";
-					mes "You may go to Fulerr,";
-					mes "the ^0A9696Armsmith^000000";
-					mes "on the 1st floor of the Weapon Shop.";
-					viewpoint 1,194,35,10,0x0A9696;
-					next;
-					callsub L_Mark,"^0A9696Armsmith";
-					next;
-					break;
-				case 2:
-					mes "[Lighthalzen Guide]";
-					mes "^4B0082Seiyablem^000000 adds";
-					mes "sockets on your items";
-					mes "on the 1st floor";
-					mes "of the Weapon Shop.";
-					viewpoint 1,194,35,11,0x4B0082;
-					next;
-					callsub L_Mark,"^4B0082Seiyablem",1;
-					next;
-					break;
-				case 3:
-					callsub L_Mark,"^FF4500Pet Groomer";
-					viewpoint 1,222,191,12,0xFF4500;
-					next;
-					break;
-				case 4:
-					callsub L_Mark,"^008080Kafra Employees";
-					viewpoint 1,164,99,13,0x008080;
-					viewpoint 1,164,99,14,0x008080;
-					next;
-					break;
-				case 5:
-					callsub L_Mark,"^FF1493Cool Event Corp. Staff";
-					viewpoint 1,94,247,15,0xFF1493;
-					next;
-					break;
-				case 6:
-					set .@loop,0;
-					break;
-				}
-			}
+			viewpoint 2,102,247,2,0xFF0000;
+			viewpoint 2,233,164,3,0xFF00FF;
+			viewpoint 2,236,276,4,0x99FFFF;
+			viewpoint 2,198,257,5,0x0000FF;
+			viewpoint 2,159,133,6,0x00FF00;
+			viewpoint 2,267,75,7,0x00FF00;
+			viewpoint 2,74,53,8,0xFF99FF;
+			viewpoint 2,93,110,9,0xFF9900;
+			viewpoint 2,196,46,10,0x330033;
+			viewpoint 2,199,163,11,0xFFFF00;
+			set .@compass_check,0;
 			break;
 		case 3:
 			mes "[Lighthalzen Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,160,217,0,0xFFFFFF;
-			viewpoint 2,203,257,1,0xFFFFFF;
-			viewpoint 2,262,75,2,0xFFFFFF;
-			viewpoint 2,194,35,3,0xFFFFFF;
-			viewpoint 2,202,106,4,0xFFFFFF;
-			viewpoint 2,234,276,5,0xFFFFFF;
-			viewpoint 2,96,110,6,0xFFFFFF;
-			viewpoint 2,238,217,7,0xFFFFFF;
-			viewpoint 2,101,243,8,0xFFFFFF;
-			viewpoint 2,54,132,9,0xFFFFFF;
-			viewpoint 2,194,35,10,0xFFFFFF;
-			viewpoint 2,194,35,11,0xFFFFFF;
-			viewpoint 2,222,191,12,0xFFFFFF;
-			viewpoint 2,164,99,13,0xFFFFFF;
-			viewpoint 2,164,99,14,0xFFFFFF;
-			viewpoint 2,94,247,15,0xFFFFFF;
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
+			next;
+			mes "[Lighthalzen Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
 			next;
+			mes "[Lighthalzen Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in Lighthalzen.";
 			break;
 		case 4:
 			mes "[Lighthalzen Guide]";
-			mes "Enjoy your adventures!";
+			mes "Lighthalzen is divided";
+			mes "into the East and West";
+			mes "districts by a railroad that";
+			mes "runs right through the middle.";
+			mes "There are always guards on";
+			mes "watch to protect the peace.";
+			next;
+			mes "[Lighthalzen Guide]";
+			mes "Please don't hesitate";
+			mes "to report any suspicious";
+			mes "activity or persons to us.";
+			mes "We hope that you enjoy";
+			mes "our fair city, adventurer.";
 			close2;
-			cutin "ein_soldier",255;
-			end;
+			set .@loop1,0;
 		}
 	}
+	cutin "ein_soldier",255;
 	end;
-L_Mark:
-	mes "[Lighthalzen Guide]";
-	mes "I will mark the location";
-	mes "of "+((getarg(1,0))?"":"the ")+getarg(0)+"^000000";
-	mes "on your mini-map.";
-	mes "Would you like to check any other locations?";
-	return;
 }
 
-lighthalzen,220,310,3	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz02	852
-lighthalzen,154,100,5	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz03	852
-lighthalzen,307,224,3	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz04	852
+lighthalzen,220,311,3	duplicate(LhzGuide)	Guide#2lhz	852
+
+lighthalzen,154,100,5	duplicate(LhzGuide)	Guide#3lhz	852
+
+lighthalzen,307,224,3	duplicate(LhzGuide)	Guide#4lhz	852
diff --git a/npc/pre-re/guides/guides_louyang.txt b/npc/pre-re/guides/guides_louyang.txt
index a136391d4..52a87ee32 100644
--- a/npc/pre-re/guides/guides_louyang.txt
+++ b/npc/pre-re/guides/guides_louyang.txt
@@ -1,21 +1,135 @@
-//===== rAthena Script ======================================= 
-//= Louyang Guide
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena  SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guide for the city of Louyang
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//============================================================ 
+//===== rAthena Script =======================================
+//= Louyang Guides
+//===== By: ==================================================
+//= jAthena/Tsuyuki; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Guides for the City of Louyang
+//===== Additional Comments: =================================
+//= 0.5 Added first, Japanese version [Tsuyuki]
+//= 1.0 Translated to English from iRO NPC Dialogue (100% Official) [Tsuyuki]
+//= 1.1 Rescripted official 10.3 standards. [L0ne_W0lf]
+//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//============================================================
 
-louyang,224,104,4	script	Louyang Guide#01louyang	818,{
+louyang,213,213,3	script	Soldier#BA::LouGuide	825,{
+	mes "[Soldier]";
+	mes "Welcome to Louyang,";
+	mes "a city with a long";
+	mes "and colorful history.";
+	next;
+	mes "[Soldier]";
+	mes "Recently we've developed";
+	mes "an ocean lane to accomodate";
+	mes "positive exchange with";
+	mes "foreign nations.";
+	next;
+	mes "[Soldier]";
+	mes "Louyang is well-known for various specialties in addition to its rich history. Here you can find many things unique to our land.";
+	next;
+	mes "[Soldier]";
+	mes "Please take your time";
+	mes "and we invite you to enjoy";
+	mes "your trip here in Louyang.";
+	next;
+	switch(select("Ask Building Locations.:Remove all marks from mini-map.:Cancel.")) {
+	case 1:
+		mes "[Soldier]";
+		mes "Where would you like to go?";
+		next;
+		switch(select("Dragon Castle:Doctor's Office:City Hall:Weapon Shop:Tool Shop:Tavern:Cancel")) {
+		case 1:
+			mes "[Soldier]";
+			mes "The Dragon Castle is located at ^FF3355+^000000. It is where all the nobles reside, including our lord.";
+			next;
+			mes "[Soldier]";
+			mes "Since you're an outsider, I guess it would be appropriate for you to visit our lord first.";
+			viewpoint 1,218,255,2,0xFF3355;
+			break;
+		case 2:
+			mes "[Soldier]";
+			mes "We have a very skillful doctor.";
+			mes "You can find her office at ^CE6300+^000000.";
+			next;
+			mes "[Soldier]";
+			mes "It is said that there";
+			mes "is no disease she cannot cure. Well, I can't guarantee if that's true or not.";
+			viewpoint 1,263,94,3,0xCE6300;
+			break;
+		case 3:
+			mes "[Soldier]";
+			mes "We have a City Hall where the federal government operates.";
+			mes "It is located at ^A5BAAD+^000000.";
+			next;
+			mes "[Soldier]";
+			mes "If you have any problems,";
+			mes "you should talk with the";
+			mes "employees in City Hall.";
+			viewpoint 1,309,80,4,0xA5BAAD;
+			break;
+		case 4:
+			mes "[Soldier]";
+			mes "The Weapon Shop is located at ^55FF33+^000000.";
+			next;
+			mes "[Soldier]";
+			mes "You will see";
+			mes "marvelous weapons forged";
+			mes "by the well-experienced";
+			mes "blacksmiths of Louyang.";
+			viewpoint 1,145,174,5,0x55FF33;
+			break;
+		case 5:
+			mes "[Soldier]";
+			mes "The Tool Shop is located at ^3355FF+^000000.";
+			next;
+			mes "[Soldier]";
+			mes "Knowing your enemy";
+			mes "is half the battle!";
+			mes "It's also safer to prepare yourself than to be sorry later. Why don't you go check their supplies?";
+			viewpoint 1,135,98,6,0x3355FF;
+			break;
+		case 6:
+			mes "[Soldier]";
+			mes "When you get tired during your trip, I suggest that you visit the Tavern. It's located at ^00FF00+^000000.";
+			next;
+			mes "[Soldier]";
+			mes "The Tavern is a good place";
+			mes "to meet other tourists, as well as to hear of any news that may be helpful to know.";
+			viewpoint 1,280,167,7,0x00FF00;
+			break;
+		case 7:
+			mes "[Soldier]";
+			mes "If you wish to remove all marks";
+			mes "on your mini-map, please choose 'Remove all marks from mini-map.' from the menu.";
+		}
+		break;
+	case 2:
+		viewpoint 2,218,255,2,0xFF00FF;
+		viewpoint 2,263,94,3,0xFF00FF;
+		viewpoint 2,309,80,4,0xFF00FF;
+		viewpoint 2,145,174,5,0xFF00FF;
+		viewpoint 2,135,98,6,0xFF00FF;
+		viewpoint 2,280,167,7,0xFF00FF;
+		mes "[Soldier]";
+		mes "There, I've erased all the marks on your mini-map. Feel free to ask me about building locations whenever you need to.";
+		break;
+	case 3:
+		mes "[Soldier]";
+		mes "I guess it's fun";
+		mes "sometimes to go exploring";
+		mes "on your own. Take care.";
+	}
+	close;
+}
+
+louyang,160,175,3	duplicate(LouGuide)	Soldier#BB	825
+
+louyang,224,104,3	script	Representative#lou	818,{
 	mes "[Representative]";
-	mes "Welcome to ^8B4513Louyang^000000,";
+	mes "Welcome to Louyang,";
 	mes "an ancient land with";
 	mes "a history full of tales";
 	mes "of bravery.";
@@ -24,36 +138,44 @@ louyang,224,104,4	script	Louyang Guide#01louyang	818,{
 	mes "We now provide an ocean lane to accomodate foreign travelers and intercultural exchange from which all can benefit.";
 	next;
 	mes "[Representative]";
-	mes "^8B4513Louyang^000000 is famous for";
+	mes "Louyang is famous for";
 	mes "its elaborate history, as well as specialties that are unique to this nation. Please take your time and enjoy your stay.";
-	while (1) {
+	next;
+	switch(select("Ask Building Locations.:Remove all marks from mini-map.:Cancel.")) {
+	case 1:
+		set .@compass_check,1;
+		mes "[Representative]";
+		mes "Where would you like to go?";
 		next;
-		switch(select("[ Dragon Castle ]:[ Doctor's Office ]:[ City Hall ]:[ Weapon Shop ]:[ Tool Shop ]:[ Tavern ]:[ Observatory ]:[ Return to Alberta ]:Remove Marks from Mini-Map:Cancel")) {
+		switch(select("Dragon Castle:Doctor's Office:City Hall:Weapon Shop:Tool Shop:Tavern:Cancel")) {
 		case 1:
 			mes "[Representative]";
-			mes "The Dragon Castle is located at ^0A82FF+^000000. It is where all the nobles reside, including our lord.";
+			mes "The Dragon Castle is located at ^FF3355+^000000. It is where all the nobles reside, including our lord.";
+			next;
+			mes "[Representative]";
 			mes "Since you're an outsider, I guess it would be appropriate for you to visit our lord first.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,218,253,0,0x0A82FF;
+			viewpoint 1,218,255,2,0xFFFF33;
 			break;
 		case 2:
 			mes "[Representative]";
-			mes "It's a famous ^AAFF00Doctor's Office^000000";
-			mes "according to rumor it can cure all diseases. But I'm not sure if it's true or not.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,261,93,1,0xAAFF00;
+			mes "We have a very skillful doctor.";
+			mes "You can find her office at ^CE6300+^000000.";
+			next;
+			mes "[Representative]";
+			mes "It is said that there";
+			mes "is no disease she cannot cure. Well, I can't guarantee if that's true or not.";
+			viewpoint 1,263,94,3,0xFFCE63;
 			break;
 		case 3:
 			mes "[Representative]";
 			mes "We have a City Hall where the federal government operates.";
-			mes "It is located at ^008080+^000000.";
+			mes "It is located at ^A5BAAD+^000000.";
 			next;
 			mes "[Representative]";
 			mes "If you have any problems,";
 			mes "you should talk with the";
-			mes "employees there.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,309,78,2,0x20B2AA;
+			mes "employees in City Hall.";
+			viewpoint 1,309,80,4,0xFF00FF;
 			break;
 		case 4:
 			mes "[Representative]";
@@ -63,9 +185,8 @@ louyang,224,104,4	script	Louyang Guide#01louyang	818,{
 			mes "You will see";
 			mes "marvelous weapons forged";
 			mes "by the well-experienced";
-			mes "Blacksmiths of Louyang.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,145,172,3,0xFF1493;
+			mes "blacksmiths of Louyang.";
+			viewpoint 1,145,174,5,0xFF55FF;
 			break;
 		case 5:
 			mes "[Representative]";
@@ -75,8 +196,7 @@ louyang,224,104,4	script	Louyang Guide#01louyang	818,{
 			mes "Knowing your enemy";
 			mes "is half the battle!";
 			mes "It's also safer to prepare yourself than to be sorry later. Why don't you go check their supplies?";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,138,99,4,0xFF0000;
+			viewpoint 1,135,98,6,0xFF3355;
 			break;
 		case 6:
 			mes "[Representative]";
@@ -85,40 +205,29 @@ louyang,224,104,4	script	Louyang Guide#01louyang	818,{
 			mes "[Soldier]";
 			mes "The Tavern is a good place";
 			mes "to meet other tourists, as well as to hear of any news that may be helpful to know.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,280,165,5,0xDAA520;
+			viewpoint 1,280,167,7,0xFF00FF;
 			break;
 		case 7:
 			mes "[Representative]";
-			mes "You won't get a better view of the world than you can at the Observatory.";
-			mes "It's a must see here.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,136,245,6,0xD8BFD8;
-			break;
-		case 8:
-			mes "[Representative]";
-			mes "If you want to return to Alberta,";
-			mes "find the ^00BFFFKGirl^000000 outside town on the docks.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,218,22,7,0x00BFFF;
-			break;
-		case 9:
-			mes "[Representative]";
-			mes "I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,1,1,0,0xFFFFFF;
-			viewpoint 2,1,1,1,0xFFFFFF;
-			viewpoint 2,1,1,2,0xFFFFFF;
-			viewpoint 2,1,1,3,0xFFFFFF;
-			viewpoint 2,1,1,4,0xFFFFFF;
-			viewpoint 2,1,1,5,0xFFFFFF;
-			viewpoint 2,1,1,6,0xFFFFFF;
-			viewpoint 2,1,1,7,0xFFFFFF;
-			break;
-		case 10:
-			mes "[Representative]";
-			mes "Enjoy your trip~!";
-			close;
+			mes "If you wish to remove all marks";
+			mes "on your mini-map, please choose 'Remove all marks from mini-map.' from the menu.";
 		}
+		break;
+	case 2:
+		viewpoint 2,218,255,2,0xFF00FF;
+		viewpoint 2,263,94,3,0xFF00FF;
+		viewpoint 2,309,80,4,0xFF00FF;
+		viewpoint 2,145,174,5,0xFF00FF;
+		viewpoint 2,135,98,6,0xFF00FF;
+		viewpoint 2,280,167,7,0xFF00FF;
+		mes "[Representative]";
+		mes "Done! All the marks on your mini-map are erased. Feel free to ask me about building locations whenever you need to.";
+		break;
+	case 3:
+		mes "[Representative]";
+		mes "I understand that you want to explore Louyang and see the";
+		mes "sights for yourself. Alright then, take care!";
+		break;
 	}
+	close;
 }
diff --git a/npc/pre-re/guides/guides_lutie.txt b/npc/pre-re/guides/guides_lutie.txt
deleted file mode 100644
index 418637ba5..000000000
--- a/npc/pre-re/guides/guides_lutie.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Lutie Guide
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guide for the city of Lutie.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//= 1.1 Fixed and optimized. [Euphy]
-//============================================================ 
-
-xmas,140,137,3	script	Lutie Guide#xmas	717,{
-	mes "[Lutie Guide]";
-	mes "Welcome to ^8B4513Lutie^000000,";
-	mes "the Snow Village.";
-	mes "Do you need help navigating the village?";
-	while (1) {
-		next;
-		switch(select("[ Gift Shop ]:[ Church ]:[ Weapon & Armor Shop ]:[ Tool Shop ]:[ Santa's House ]:[ Toy Factory ]:Remove Marks from Mini-Map:Cancel")) {
-		case 1:
-			callsub L_Mark,"^008080Gift Shop";
-			viewpoint 1,172,131,2,0x008080;
-			break;
-		case 2:
-			callsub L_Mark,"^006400Church";
-			viewpoint 1,104,287,1,0xAAFF00;
-			break;
-		case 3:
-			callsub L_Mark,"^FF1493Weapon & Armor Shop";
-			viewpoint 1,171,158,3,0xFF1493;
-			break;
-		case 4:
-			callsub L_Mark,"^8B4513Tool Shop";
-			viewpoint 1,122,131,4,0x8B4513;
-			break;
-		case 5:
-			callsub L_Mark,"^B9062FSanta's House",1;
-			viewpoint 1,149,237,5,0x9400D3;
-			break;
-		case 6:
-			callsub L_Mark,"^9400D3Toy Factory";
-			viewpoint 1,143,312,6,0xFF0000;
-			break;
-		case 7:
-			mes "[Lutie Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,1,1,0,0xFFFFFF;
-			viewpoint 2,1,1,1,0xFFFFFF;
-			viewpoint 2,1,1,2,0xFFFFFF;
-			viewpoint 2,1,1,3,0xFFFFFF;
-			viewpoint 2,1,1,4,0xFFFFFF;
-			viewpoint 2,1,1,5,0xFFFFFF;
-			viewpoint 2,1,1,6,0xFFFFFF;
-			break;
-		case 8:
-			mes "[Lutie Guide]";
-			mes "Be safe on your travels.";
-			close;
-		}
-	}
-	end;
-L_Mark:
-	mes "[Lutie Guide]";
-	mes "Let me mark the location of "+((getarg(1,0))?"":"the");
-	mes getarg(0)+"^000000";
-	mes "on your mini-map.";
-	mes "Would you like to check any other locations?";
-	return;
-}
diff --git a/npc/pre-re/guides/guides_morroc.txt b/npc/pre-re/guides/guides_morroc.txt
index d12859251..f0b5b343b 100644
--- a/npc/pre-re/guides/guides_morroc.txt
+++ b/npc/pre-re/guides/guides_morroc.txt
@@ -1,305 +1,164 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Morroc Guides
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
+//===== By: ==================================================
+//= kobra_k88; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.4a
+//===== Compatible With: =====================================
 //= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guides for the city of Morroc and Morroc Ruins.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//= 1.1 Fixed and optimized. [Euphy]
-//============================================================ 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the City of Morroc
+//===== Additional Comments: =================================
+//= 1.1 Now using duplicate command.
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.3 Removed Duplicates [Silent]
+//= 1.4 rescripted to official 10.3 standards. [L0ne_W0lf]
+//= 1.4a Fixed some errors with the loop[Samuray22]
+//	-Thanks to $ephiroth.
+//============================================================
 
-morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
+morocc,153,286,6	script	Guide#moc::MocGuide	707,{
 	cutin "moc_soldier",2;
 	mes "[Morroc Guide]";
-	mes "Welcome to ^8B4513Morroc^000000,";
-	mes "the Desert Town.";
-	mes "Do you need help navigating the town?";
-	next;
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
+	mes "Welcome to Morroc,";
+	mes "the frontier town of the";
+	mes "Rune-Midgarts Kingdom.";
+	mes "Please ask me for help if";
+	mes "you're having any trouble";
+	mes "finding anything in town.";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice:Cancel")) {
 		case 1:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Thief Guild ]:[ Sphinx Dungeon ]:[ Oasis Entrance ]:[ Forge ]:[ Weapon & Armor Shop ]:[ Inn ]:[ Tavern ]:Previous Menu")) {
+			mes "[Morroc Guide]";
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes.:No.") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while(.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+				
+				switch(select("^FF0000Thief Guild^000000:Weapon Shop:Inn:Pub:Mercenary Guild:Forge:Cancel")) {
 				case 1:
 					mes "[Morroc Guide]";
-					mes "The ^B9062FThief Guild^000000 is located";
-					mes "inside the ^B9062FPyramids^000000";
-					mes "that is near the ^B9062FOasis^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,26,294,0,0xFF0000;
-					next;
+					mes "The Thief Guild is";
+					mes "in charge of all Job";
+					mes "Changes to the Thief";
+					mes "Class. From what I hear,";
+					mes "you can find them inside";
+					mes "the Pyramids nearby...";
+					if (.@compass_check)
+						viewpoint 1,24,297,2,0xFF0000;
 					break;
 				case 2:
 					mes "[Morroc Guide]";
-					mes "The ^0000FFSphinx Dungeon^000000 is";
-					mes "right outside the western gate.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,26,164,1,0x0A82FF;
-					next;
+					mes "The Weapon Shop";
+					mes "is in the southeast";
+					mes "end of Morroc.";
+					if (.@compass_check)
+						viewpoint 1,253,56,3,0xFF00FF;
 					break;
 				case 3:
 					mes "[Morroc Guide]";
-					mes "Let me mark the entrance to the ^FF5400Oasis^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,26,294,2,0xFFB400;
-					next;
+					mes "There are Inns";
+					mes "where you can rest";
+					mes "at the southeast and";
+					mes "northeast ends of Morroc.";
+					if (.@compass_check) {
+						viewpoint 1,197,66,4,0xFF00FF;
+						viewpoint 1,273,269,5,0xFF00FF;
+					}
 					break;
 				case 4:
-					callsub L_Mark,"^006400Forge";
-					viewpoint 1,47,47,3,0xAAFF00;
-					next;
+					mes "[Morroc Guide]";
+					mes "You can find the";
+					mes "Pub in northeast Morroc.";
+					if (.@compass_check)
+						viewpoint 1,52,259,6,0xFF00FF;
 					break;
 				case 5:
-					callsub L_Mark,"^7F3300Weapon & Armor Shop";
-					viewpoint 1,253,56,4,0xD2691E;
-					next;
+					mes "[Morroc Guide]";
+					mes "The Mercenary";
+					mes "Guild is located";
+					mes "in East Morroc.";
+					if (.@compass_check)
+						viewpoint 1,284,171,7,0x00FF00;
 					break;
 				case 6:
 					mes "[Morroc Guide]";
-					mes "Currently the ^800080Inn^000000";
-					mes "has been shut down until further notice,";
-					mes "but I'll mark its location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,273,269,5,0xDA70D6;
-					next;
+					mes "The Forge is";
+					mes "located just";
+					mes "southwest from";
+					mes "the center of Morroc.";
+					if (.@compass_check)
+						viewpoint 1,47,47,7,0xFF00FF;
 					break;
 				case 7:
-					callsub L_Mark,"^B9062FTavern";
-					viewpoint 1,52,259,6,0xFF0000;
-					next;
-					break;
-				case 8:
-					set .@loop,0;
-					break;
+					mes "[Morroc Guide]";
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
 				}
 			}
 			break;
 		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Kafra Employee ]:[ Poison Herb Salesman ]:[ Dye Maker ]:[ Seiyablem ]:Previous Menu")) {
-				case 1:
-					callsub L_Mark,"^0000FFKafra Employees";
-					viewpoint 1,156,97,7,0x0A82FF;
-					viewpoint 1,160,258,8,0x0A82FF;
-					next;
-					break;
-				case 2:
-					callsub L_Mark,"^006400Poison Herb Salesman";
-					viewpoint 1,190,96,9,0xAAFF00;
-					next;
-					break;
-				case 3:
-					mes "[Morroc Guide]";
-					mes "The ^7F3300Dye Maker^000000 is";
-					mes "currently staying";
-					mes "on the 1st floor of the Inn.";
-					mes "Let me mark his location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,273,269,10,0xD2691E;
-					next;
-					break;
-				case 4:
-					mes "[Morroc Guide]";
-					mes "^800080Seiyablem^000000";
-					mes "is a technician";
-					mes "who can create ^0000FFslots^000000 on weapons and armors,";
-					mes "but not all equipment";
-					mes "can be slotted. Well, that's what he says.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,51,41,11,0xDA70D6;
-					next;
-					break;
-				case 5:
-					set .@loop,0;
-					break;
-				}
-			}
+			viewpoint 2,237,41,2,0x00FF00;
+			viewpoint 2,237,41,3,0x0000FF;
+			viewpoint 2,46,345,4,0x00FF00;
+			viewpoint 2,175,220,5,0xFF0000;
+			viewpoint 2,175,220,6,0xFF0000;
+			viewpoint 2,175,220,7,0xFF0000;
+			set .@compass_check,0;
 			break;
 		case 3:
 			mes "[Morroc Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,1,1,0,0xFFFF00;
-			viewpoint 2,1,1,1,0x000000;
-			viewpoint 2,1,1,2,0xFF0000;
-			viewpoint 2,1,1,3,0xFFFF00;
-			viewpoint 2,1,1,4,0xFFFF00;
-			viewpoint 2,1,1,5,0xFFFF00;
-			viewpoint 2,1,1,6,0xFFFF00;
-			viewpoint 2,1,1,7,0xFFFF00;
-			viewpoint 2,1,1,8,0xFFFF00;
-			viewpoint 2,1,1,9,0xFFFF00;
-			viewpoint 2,1,1,10,0xFFFF00;
-			viewpoint 2,1,1,11,0xFFFF00;
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
 			next;
-			break;
-		case 4:
-			mes "[Morroc Guide]";
-			mes "Be safe on your travels.";
-			close2;
-			cutin "moc_soldier",255;
-			end;
-		}
-	}
-	end;
-L_Mark:
-	mes "[Morroc Guide]";
-	mes "Let me mark the location of the";
-	mes getarg(0)+"^000000";
-	mes "on your mini-map.";
-	mes "Would you like to check any other locations?";
-	return;
-}
-
-morocc,154,38,6	duplicate(GuideMorroc)	Guide#02morocc	707,{
-morocc,296,213,4	duplicate(GuideMorroc)	Guide#03morocc	707,{
-morocc,28,170,5	duplicate(GuideMorroc)	Guide#04morocc	707,{
-
-moc_ruins,159,53,3	script	Guide#01ruins::GuideMocRuins	707,{
-	cutin "moc_soldier",2;
-	mes "[Morroc Guide]";
-	mes "Welcome to ^8B4513Morroc^000000,";
-	mes "the Desert Town.";
-	mes "Do you need help navigating the town?";
-	next;
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
-		case 1:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Thief Guild ]:[ Sphinx Dungeon ]:[ Morroc Entrance ]:Previous Menu")) {
-				case 1:
-					mes "[Morroc Guide]";
-					mes "The ^B9062FThief Guild^000000 is located";
-					mes "inside the ^B9062FPyramids^000000.";
-					mes "Let me mark its location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,56,161,0,0xFF0000;
-					next;
-					break;
-				case 2:
-					mes "[Morroc Guide]";
-					mes "The ^0000FFSphinx Dungeon^000000";
-					mes "is outside the south entrance of this Oasis.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,71,19,1,0x0A82FF;
-					next;
-					break;
-				case 3:
-					mes "[Morroc Guide]";
-					mes "^FF5400Morroc^000000 is";
-					mes "right outside the southeast entrance of this Oasis.";
-					mes "Let me mark its location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,158,40,2,0xFFB400;
-					next;
-					break;
-				case 4:
-					set .@loop,0;
-					break;
-				}
-			}
-			break;
-		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Eden Teleport Officer ]:[ Tool Dealer ]:[ Kafra Employee ]:[ Repairman ]:[ Pet Groomer ]:[ Chef Assistant ]:[ Leablem ]:Previous Menu")) {
-				case 1:
-					callsub L_Mark,"^006400Eden Teleport Officer";
-					viewpoint 1,68,164,3,0xAAFF00;
-					next;
-					break;
-				case 2:
-					callsub L_Mark,"^800080Tool Dealers";
-					viewpoint 1,92,128,5,0xDA70D6;
-					viewpoint 1,114,63,6,0xDA70D6;
-					next;
-					break;
-				case 3:
-					callsub L_Mark,"^B9062FKafra Employee";
-					viewpoint 1,59,157,7,0xFF0000;
-					next;
-					break;
-				case 4:
-					callsub L_Mark,"^0000FFRepairman";
-					viewpoint 1,107,94,8,0x0A82FF;
-					next;
-					break;
-				case 5:
-					callsub L_Mark,"^FF5400Pet Groomer";
-					viewpoint 1,118,170,9,0xFFB400;
-					next;
-					break;
-				case 6:
-					callsub L_Mark,"^006400Chef Assistant";
-					viewpoint 1,115,123,10,0xAAFF00;
-					next;
-					break;
-				case 7:
-					mes "[Morroc Guide]";
-					mes "^7F3300Leablem^000000";
-					mes "is a technician";
-					mes "who can create ^0000FFslots^000000 on weapons and armors,";
-					mes "but not all equipment";
-					mes "can be slotted. Well, that's what he says.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,154,86,11,0xD2691E;
-					next;
-					break;
-				case 8:
-					set .@loop,0;
-					break;
-				}
-			}
-			break;
-		case 3:
 			mes "[Morroc Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,1,1,0,0xFFFF00;
-			viewpoint 2,1,1,1,0x000000;
-			viewpoint 2,1,1,2,0xFF0000;
-			viewpoint 2,1,1,3,0xFFFF00;
-			viewpoint 2,1,1,4,0xFFFF00;
-			viewpoint 2,1,1,5,0xFFFF00;
-			viewpoint 2,1,1,6,0xFFFF00;
-			viewpoint 2,1,1,7,0xFFFF00;
-			viewpoint 2,1,1,8,0xFFFF00;
-			viewpoint 2,1,1,9,0xFFFF00;
-			viewpoint 2,1,1,10,0xFFFF00;
-			viewpoint 2,1,1,11,0xFFFF00;
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
 			next;
+			mes "[Morroc Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in the city of Morroc.";
 			break;
 		case 4:
 			mes "[Morroc Guide]";
-			mes "Be safe on your travels.";
+			mes "Alright then,";
+			mes "try to stay out of";
+			mes "too much trouble";
+			mes "out there, adventurer.";
 			close2;
-			cutin "moc_soldier",255;
-			end;
+			set .@loop1,0;
 		}
 	}
+	cutin "moc_soldier",255;
 	end;
-L_Mark:
-	mes "[Morroc Guide]";
-	mes "Let me mark the location of the";
-	mes getarg(0)+"^000000";
-	mes "on your mini-map.";
-	mes "Would you like to check any other locations?";
-	return;
 }
 
-moc_ruins,70,164,3	duplicate(GuideMocRuins)	Guide#02ruins	707
-moc_ruins,65,44,5	duplicate(GuideMocRuins)	Guide#03ruins	707
+morocc,54,97,0	duplicate(MocGuide)	Guide#2moc	707
diff --git a/npc/pre-re/guides/guides_moscovia.txt b/npc/pre-re/guides/guides_moscovia.txt
index de9f7ddf0..8986c7502 100644
--- a/npc/pre-re/guides/guides_moscovia.txt
+++ b/npc/pre-re/guides/guides_moscovia.txt
@@ -1,91 +1,92 @@
-//===== rAthena Script ======================================= 
-//= Moscovia Guide
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
+//===== rAthena Script =======================================
+//= Moscovia Guides
+//===== By: ==================================================
+//= Kisuka
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
 //= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guide for the city of Moscovia.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//= 1.1 Optimized (a little bit). [Euphy]
-//============================================================ 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the town of Moscovia.
+//===== Additional Comments: =================================
+//= 1.0 First Version. [Kisuka]
+//============================================================
 
-moscovia,226,191,4	script	Moscovia Guide#02mosc	959,{
+moscovia,161,76,4	script	Moscovia Guide#mosk	959,{
 	mes "[Moscovia Guide]";
-	mes "A paradise on the sea";
-	mes "beautiful wave and warm sunshine";
-	mes "^8B4513Moscovia^000000 is waitting for you";
-	mes "welcome to come here.";
-	mes "I'm supporting to offer information about here.";
-	mes "if you want to ask anything just feel free tell me.";
-	set .@str$,"Is there anything else I can do for you?";
-	while (1) {
-		next;
-		switch(select("[ Palace ]:[ Chapel ]:[ Weapon Shop ]:[ Armor Shop ]:[ Tool Shop ]:[ Inn ]:[ Return to Alberta ]:Remove Marks from Mini-Map:Cancel")) {
+	mes "Welcome to Moscovia";
+	mes "Here is the paradise spreading on";
+	mes "the endless seas";
+	mes "You'll be happy with the beautiful";
+	mes "scenery and the sunlight!";
+	next;
+	mes "[Moscovia Guide]";
+	mes "I was sent from Moscovia Palace";
+	mes "to guide tourists and to give them";
+	mes "information on this town.";
+	mes "If you have some questions, please ask me.";
+	next;
+	switch(select("Ask where you can go.:Delete all the marks on the mini-map.:Cancel.")) {
 		case 1:
 			mes "[Moscovia Guide]";
-			mes "In the ^006400Palace^000000 you will find our Lord the Czar and other servants.";
-			mes .@str$;
-			viewpoint 1,255,140,0,0x0A82FF;
-			break;
+			mes "Where would you like to go?";
+			next;
+			switch(select("The Palace:Armor Shop:Tool Shop:An Inn:Cancel")) {
+				case 1:
+					mes "[Moscovia Guide]";
+					mes "The Palace can be found ^ff0000+^000000 at the";
+					mes "end of the North sea from";
+					mes "Rune-Midgarts.";
+					mes "There resides our Lord the Czar of";
+					mes "Moscovia and his retainers.";
+					close2;
+					viewpoint 1,257,138,1,0xFF0000;
+					end;
+				case 2:
+					viewpoint 1,185,187,2,0x00FF00;
+					mes "[Moscovia Guide]";
+					mes "The Armor Shop is located at the";
+					mes "southwest corner of town..";
+					mes "You can buy armor made by the best";
+					mes "craftsmen of Moscovia there.";
+					close;
+				case 3:
+					mes "[Moscovia Guide]";
+					mes "The Tool Shop is located just south";
+					mes "from the center of town.";
+					mes "You can find all sorts of things";
+					mes "you need for your travels.";
+					close2;
+					viewpoint 1,223,174,3,0x00FF00;
+					end;
+				case 4:
+					mes "[Moscovia Guide]";
+					mes "The Inn 'Sticky Herb Tree' is just";
+					mes "north from the center of town.";
+					mes "If you need to rest, there is no";
+					mes "better place to stay.";
+					close2;
+					viewpoint 1,229,208,4,0x3355FF;
+					end;
+				case 5:
+					close;
+			}
 		case 2:
 			mes "[Moscovia Guide]";
-			mes "The ^008080Chapel^000000 is located here.";
-			mes .@str$;
-			viewpoint 1,253,179,1,0xAAFF00;
-			break;
+			mes "I've deleted all marks on the mini-map.";
+			mes "Whenever you'd like to put marks";
+			mes "there, you can ask me.";
+			viewpoint 2,257,138,1,0xFF0000;
+			viewpoint 2,185,187,2,0x00FF00;
+			viewpoint 2,223,174,3,0x00FF00;
+			viewpoint 2,229,208,4,0x3355FF;
+			close;
+		
 		case 3:
 			mes "[Moscovia Guide]";
-			mes "You can buy weapons from the best craftsmen in Moscovia if you go to ^FF1493Weapon Shop^000000.";
-			mes .@str$;
-			viewpoint 1,186,191,2,0x008080;
-			break;
-		case 4:
-			mes "[Moscovia Guide]";
-			mes "You will find only the best gear at the Moscovia ^8B4513Armor Shop^000000.";
-			mes .@str$;
-			viewpoint 1,204,169,3,0xB200FF;
-			break;
-		case 5:
-			mes "[Moscovia Guide]";
-			mes "The ^FF1493Tool Shop^000000 is located just south from the center of town.";
-			mes "You can find all sorts of things you need for your travels.";
-			mes .@str$;
-			viewpoint 1,221,176,4,0xFF1493;
-			break;
-		case 6:
-			mes "[Moscovia Guide]";
-			mes "The Inn 'Sticky Herb Tree' is just north from the center of town.";
-			mes "If you need to rest, there is no better place to stay.";
-			mes .@str$;
-			viewpoint 1,227,206,5,0x8B4513;
-			break;
-		case 7:
-			mes "[Moscovia Guide]";
-			mes "You can go back to Alberta at the docks.";
-			mes .@str$;
-			viewpoint 1,166,53,6,0x00BFFF;
-			break;
-		case 8:
-			mes "[Moscovia Guide]";
-			mes "I'll remove all marks from your mini-map.";
-			mes .@str$;
-			viewpoint 2,1,1,0,0xFFFFFF;
-			viewpoint 2,1,1,1,0xFFFFFF;
-			viewpoint 2,1,1,2,0xFFFFFF;
-			viewpoint 2,1,1,3,0xFFFFFF;
-			viewpoint 2,1,1,4,0xFFFFFF;
-			viewpoint 2,1,1,5,0xFFFFFF;
-			viewpoint 2,1,1,6,0xFFFFFF;
-			break;
-		case 9:
-			mes "[Moscovia Guide]";
-			mes "Enjoy your trip~!";
+			mes "It'd be great to walk about alone.";
+			mes "Take care.";
 			close;
-		}
 	}
-}
+}
\ No newline at end of file
diff --git a/npc/pre-re/guides/guides_niflheim.txt b/npc/pre-re/guides/guides_niflheim.txt
index e698ee954..9a68d10d6 100644
--- a/npc/pre-re/guides/guides_niflheim.txt
+++ b/npc/pre-re/guides/guides_niflheim.txt
@@ -1,64 +1,134 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Niflheim Guide
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
 //= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guide for the city of Niflehim.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//= 1.1 Optimized. [Euphy]
-//============================================================ 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the City of Niflheim
+//===== Additional Comments: =================================
+//= 1.1 Fixed location command format [Lupus]
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.3 Rescripted to official 10.3 standards. [L0ne_W0lf]
+//============================================================
 
-niflheim,201,187,3	script	Niflheim Guide#01nif	849,{
-	mes "[Niflheim Guide]";
-	mes "Welcome to.. ^8B4513Niflheim^000000...";
-	mes "the Realm of the Dead...";
-	mes "Do you need help navigating the realm...?";
-	while (1) {
+niflheim,107,156,6	script	Roaming Man#nif	798,{
+	mes "[Ricael]";
+	mes "You must be lost...";
+	mes "Why would anyone come";
+	mes "to this horrid, dreadful";
+	mes "place on purpose...??";
+	next;
+	mes "[Ricael]";
+	mes "Ever since I stumbled fell down into this giant tree, I've suffered endlessly here. I've wasted years in sadness, being unable to escape Niflheim.";
+	next;
+	mes "[Ricael]";
+	mes "But in searching for an";
+	mes "escape route, I probably know";
+	mes "this town better than anyone";
+	mes "else. I guess knowing the";
+	mes "layout might help you escape";
+	mes "if it weren't so futile.";
+	next;
+	switch(select("Ask building locations.:Remove marks on the mini-map.:Cancel.")) {
+	case 1:
+		mes "[Ricael]";
+		mes "So, um, which place do you want to know about?";
 		next;
-		switch(select("[ Tool Shop ]:[ Pub ]:[ Weapon Shop ]:[ Witch's Castle ]:Remove Marks from Mini-Map:Cancel")) {
+		switch(select("Witch's castle:Tool shop:Weapon shop:Pub:Cancel")) {
 		case 1:
-			callsub L_Mark,"^0000FFTool Shop";
-			viewpoint 1,218,196,0,0x0A82FF;
+			mes "[Ricael]";
+			mes "There. I made a ^FF3355+^000000 mark";
+			mes "on your mini-map so that you can";
+			mes "go to the castle where that";
+			mes "creepy witch lives.";
+			next;
+			mes "[Ricael]";
+			mes "I went there once, but then I";
+			mes "ran away and decided that I";
+			mes "should try to not die as much";
+			mes "as possible. That's pretty";
+			mes "much my life goal here in";
+			mes "Niflheim.";
+			viewpoint 1,253,191,2,0xFF3355;
 			break;
 		case 2:
-			callsub L_Mark,"^006400Pub";
-			viewpoint 1,189,208,1,0xAAFF00;
+			mes "[Ricael]";
+			mes "The Tool shop is located";
+			mes "at the ^CE6300+^000000 mark I made";
+			mes "on your mini-map.";
+			next;
+			mes "[Ricael]";
+			mes "They sell some unique items that";
+			mes "you cannot find outside of this";
+			mes "town. Of course, they weren't so";
+			mes "special once I realized no";
+			mes "Potion can ease the pain I feel.";
+			mes "...I wish I was in prison.";
+			Emotion e_wah;
+			viewpoint 1,217,196,3,0xCE6300;
 			break;
 		case 3:
-			callsub L_Mark,"^800080Weapon Shop";
-			viewpoint 1,218,170,2,0xDA70D6;
+			mes "[Ricael]";
+			mes "The Weapon shop is located";
+			mes "at the ^55FF33+^000000 mark I made";
+			mes "on your mini-map.";
+			next;
+			mes "[Ricael]";
+			mes "They sell some unique items which";
+			mes "you cannot find outside of this";
+			mes "town... Of course, fighting";
+			mes "the monsters here will just";
+			mes "make them angrier. You may as";
+			mes "well let them eat you.";
+			Emotion e_wah;
+			viewpoint 1,216,171,4,0x55FF33;
 			break;
 		case 4:
-			callsub L_Mark,"^FF1493Witch's Castle";
-			viewpoint 1,255,195,3,0xFF1493;
+			mes "[Ricael]";
+			mes "The Pub is located at";
+			mes "the ^3355FF+^000000 mark I've made";
+			mes "on your mini-map.";
+			next;
+			mes "[Ricael]";
+			mes "Sometimes I see dead people in the";
+			mes "Pub enjoying themselves, having a";
+			mes "good time. I used to be able to";
+			mes "have fun once, but now all I feel";
+			mes "is the cold tingle of loneliness";
+			mes "and despair...every waking moment.";
+			viewpoint 1,189,207,5,0x3355FF;
 			break;
 		case 5:
-			mes "[Niflheim Guide]";
-			mes "Sure, I'll remove all marks from your mini-map...";
-			mes "Is there anything else I can do for you...?";
-			viewpoint 2,1,1,0,0xFFFFFF;
-			viewpoint 2,1,1,1,0xFFFFFF;
-			viewpoint 2,1,1,2,0xFFFFFF;
-			viewpoint 2,1,1,3,0xFFFFFF;
-			break;
-		case 6:
-			mes "[Niflheim Guide]";
-			mes "......Bye~!..";
-			close;
+			mes "[Ricael]";
+			mes "If you want to remove the location";
+			mes "marks from your mini-map, please";
+			mes "choose 'Remove marks on the";
+			mes "mini-map' from the menu.";
 		}
+		break;
+	case 2:
+		viewpoint 2,253,191,2,0xFF3355;
+		viewpoint 2,217,196,3,0xCE6300;
+		viewpoint 2,216,171,4,0x55FF33;
+		viewpoint 2,189,207,5,0x3355FF;
+		mes "[Ricael]";
+		mes "I removed the location marks from";
+		mes "your mini-map. Go ahead and ask";
+		mes "me if you want to mark the";
+		mes "building locations again. It";
+		mes "helps me ignore the depression";
+		mes "that gnaws at me constantly.";
+		break;
+	case 3:
+		mes "[Ricael]";
+		mes "It's not a good idea to search";
+		mes "Niflheim by yourself...";
+		mes "At least try to be careful.";
+		break;
 	}
-	end;
-L_Mark:
-	mes "[Niflheim Guide]";
-	mes "Let me mark the location of the";
-	mes getarg(0)+"^000000...";
-	mes "on your mini-map.";
-	mes "Would you like to check any other locations?";
-	return;
+	close;
 }
diff --git a/npc/pre-re/guides/guides_payon.txt b/npc/pre-re/guides/guides_payon.txt
index c703a98c9..11e7cc57b 100644
--- a/npc/pre-re/guides/guides_payon.txt
+++ b/npc/pre-re/guides/guides_payon.txt
@@ -1,292 +1,296 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Payon Guides
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
+//===== By: ==================================================
+//= kobra_k88; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.6
+//===== Compatible With: =====================================
 //= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guides for the city of Payon.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guides.
-//= 1.1 Fixed and optimized. [Euphy]
-//============================================================ 
+//===== Description: =========================================
+//= [Official COnversion]
+//= Guides for the City of Payon
+//===== Additional Comments: =================================
+//= 1.1 Now using duplicate command.New Payon Locations [Darkchild]
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.3 Updated the guide according to how it is on iRO, thanks [MasterOfMuppets]
+//=     to Muad_Dib
+//= 1.3a Fixed some problems with duplicated text, thanks to muad_dib [MasterOfMuppets]
+//= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
+//= 1.4a Tixed Archer Village Guide [Lupus] 
+//= 1.5 Removed Duplicates [Silent]
+//= 1.6 Rescripted to official 10.3 standards. [L0ne_W0lf]
+//============================================================
 
-payon,163,64,3	script	Guide#01payon::GuidePayon	708,{
+payon,162,67,4	script	Guide#pay	708,{
 	cutin "pay_soldier",2;
 	mes "[Payon Guide]";
-	mes "Welcome to ^8B4513Payon^000000,";
-	mes "the Mountain Village.";
-	mes "Do you need help navigating the village?";
-	next;
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
+	mes "Welcome to the";
+	mes "mountain city of Payon.";
+	mes "If you're unfamiliar with this";
+	mes "area, I can help you find what";
+	mes "you're looking for around here.";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice.:Cancel")) {
 		case 1:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Archer Village ]:[ Tool Shop]:[ Weapon & Armor Shop ]:[ Inn & Tavern ]:[ Central Palace ]:[ Palace Court ]:[ Royal Kitchen ]:Previous Menu")) {
-				case 1:
-					mes "[Payon Guide]";
-					mes "^B9062FArcher Village^000000 is where";
-					mes "the Archer Association resides.";
-					mes "Please use the far north gate to enter the village.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,227,328,0,0xFF0000;
-					next;
-					break;
-				case 2:
-					callsub L_Mark,"^0000FFTool Shop";
-					viewpoint 1,144,85,1,0x0A82FF;
-					next;
-					break;
-				case 3:
-					callsub L_Mark,"^FF5400Weapon & Armor Shop";
-					viewpoint 1,139,159,2,0xFFB400;
-					next;
-					break;
-				case 4:
-					callsub L_Mark,"^006400Inn & Tavern";
-					viewpoint 1,220,117,3,0xAAFF00;
-					next;
-					break;
-				case 5:
-					callsub L_Mark,"^7F3300Central Palace";
-					viewpoint 1,155,245,4,0xD2691E;
-					next;
-					break;
-				case 6:
-					callsub L_Mark,"^800080Palace Court";
-					viewpoint 1,107,325,5,0xDA70D6;
-					next;
-					break;
-				case 7:
-					callsub L_Mark,"^B9062FRoyal Kitchen";
-					viewpoint 1,154,325,6,0xFF0000;
-					next;
-					break;
-				case 8:
-					set .@loop,0;
-					break;
-				}
+			mes "[Payon Guide]";
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes.:No.") == 1) set .@compass_check,1;
 			}
-			break;
-		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Eden Teleport Officer ]:[ Kafra Shop ]:[ Repair / Armsmith ]:[ Kafra Employee]:[ Trap Specialist ]:[ Seiayblem ]:[ Leablem ]:[ Jade ]:[ Pet Groomer ]:[ Chef Assistant ]:Previous Menu")) {
+			set .@loop2,1;
+			while(.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+				switch(select("^FF0000Archer Guild^000000:Weapon Shop:Tool Shop:Pub:Central Palace:The Empress:Palace Annex:Royal Kitchen:Forge:Cancel")) {
 				case 1:
-					callsub L_Mark,"^0000FFEden Teleport Officer";
-					viewpoint 1,177,111,7,0x0A82FF;
-					next;
+					mes "[Payon Guide]";
+					mes "The Archer Guild handles";
+					mes "Job Changes to the Archer";
+					mes "Class. You'll need to enter";
+					mes "the Archer Village which is";
+					mes "to the northeast of Payon.";
+					if (.@compass_check)
+						viewpoint 1,227,328,2,0xFF0000;
 					break;
 				case 2:
-					callsub L_Mark,"^FF5400Kafra Shop Girls";
-					viewpoint 1,164,157,8,0xFFB400;
-					next;
+					mes "[Payon Guide]";
+					mes "The Weapon Shop";
+					mes "can be found in the";
+					mes "northwest corner of";
+					mes "the city of Payon.";
+					if (.@compass_check)
+						viewpoint 1,139,159,3,0xFF00FF;
 					break;
 				case 3:
-					callsub L_Mark,"^006400Repairman & Armsmith";
-					viewpoint 1,144,170,9,0xAAFF00;
-					next;
+					mes "[Payon Guide]";
+					mes "The Tool Shop";
+					mes "is located near";
+					mes "the northwest";
+					mes "corner of Payon.";
+					if (.@compass_check)
+						viewpoint 1,144,85,4,0xFF00FF;
 					break;
 				case 4:
-					callsub L_Mark,"^7F3300Kafra Employees";
-					viewpoint 1,181,104,10,0xD2691E;
-					viewpoint 1,175,226,11,0xD2691E;
-					next;
+					mes "[Payon Guide]";
+					mes "The Pub can be";
+					mes "found in the northeast";
+					mes "part of Payon. It's the";
+					mes "best place to relax after";
+					mes "a long day of hunting.";
+					if (.@compass_check)
+						viewpoint 1,220,117,5,0xFF00FF;
 					break;
 				case 5:
-					callsub L_Mark,"^800080Trap Specialist";
-					viewpoint 1,123,109,12,0xDA70D6;
-					next;
+					mes "[Payon Guide]";
+					mes "The Central Palace";
+					mes "is located to the north";
+					mes "within the city of Payon.";
+					if (.@compass_check)
+						viewpoint 1,155,245,6,0x00FF00;
 					break;
 				case 6:
 					mes "[Payon Guide]";
-					mes "^B9062FSeiyablem^000000";
-					mes "is a technician";
-					mes "who can create ^0000FFslots^000000 on weapons and armors,";
-					mes "but not all equipment";
-					mes "can be slotted. Well, that's what he says.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,140,151,13,0xFF0000;
-					next;
+					mes "The Empress";
+					mes "can be found to the";
+					mes "northwest in Payon.";
+					if (.@compass_check)
+						viewpoint 1,107,324,7,0x00FF00;
 					break;
 				case 7:
 					mes "[Payon Guide]";
-					mes "^0000FFLeablem^000000";
-					mes "is a technician";
-					mes "who can create ^0000FFslots^000000 on weapons and armors,";
-					mes "but not all equipment";
-					mes "can be slotted. Well, that's what he says.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,236,199,14,0x0A82FF;
-					next;
+					mes "The Palace Annex";
+					mes "can be found in the";
+					mes "western part of Payon.";
+					if (.@compass_check)
+						viewpoint 1,130,204,8,0x00FF00;
 					break;
 				case 8:
 					mes "[Payon Guide]";
-					mes "^FF5400Jade^000000";
-					mes "can exchange different types of";
-					mes "^FF5400Gemstones^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,173,238,15,0xFFB400;
-					next;
+					mes "The Royal Kitchen";
+					mes "is located near the";
+					mes "northern end of Payon.";
+					if (.@compass_check)
+						viewpoint 1,154,325,9,0x00FF00;
 					break;
 				case 9:
-					callsub L_Mark,"^006400Pet Groomer";
-					viewpoint 1,177,131,16,0xAAFF00;
-					next;
+					mes "[Payon Guide]";
+					mes "The Forge is";
+					mes "situated near";
+					mes "the center of Payon.";
+					if (.@compass_check)
+						viewpoint 1,126,169,10,0xFFFF00;
 					break;
 				case 10:
-					callsub L_Mark,"^7F3300Chef Assistant";
-					viewpoint 1,206,119,17,0xD2691E;
-					next;
-					break;
-				case 11:
-					set .@loop,0;
+					mes "[Payon Guide]";
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
 					break;
 				}
 			}
 			break;
+		case 2:
+			viewpoint 2,237,41,2,0x00FF00;
+			viewpoint 2,237,41,3,0x0000FF;
+			viewpoint 2,46,345,4,0xFF00FF;
+			viewpoint 2,175,220,5,0xFF0000;
+			viewpoint 2,175,220,6,0xFF0000;
+			viewpoint 2,175,220,7,0xFF0000;
+			viewpoint 2,237,41,8,0x0000FF;
+			viewpoint 2,46,345,9,0x00FF00;
+			viewpoint 2,175,220,10,0xFF0000;
+			set .@compass_check,0;
+			break;
 		case 3:
 			mes "[Payon Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,1,1,0,0xFFFF00;
-			viewpoint 2,1,1,1,0x000000;
-			viewpoint 2,1,1,2,0xFF0000;
-			viewpoint 2,1,1,3,0xFFFF00;
-			viewpoint 2,1,1,4,0xFFFF00;
-			viewpoint 2,1,1,5,0xFFFF00;
-			viewpoint 2,1,1,6,0xFFFF00;
-			viewpoint 2,1,1,7,0xFFFF00;
-			viewpoint 2,1,1,8,0xFFFF00;
-			viewpoint 2,1,1,9,0xFFFF00;
-			viewpoint 2,1,1,10,0xFFFF00;
-			viewpoint 2,1,1,11,0xFFFF00;
-			viewpoint 2,1,1,12,0xFFFF00;
-			viewpoint 2,1,1,13,0xFFFF00;
-			viewpoint 2,1,1,14,0xFFFF00;
-			viewpoint 2,1,1,15,0xFFFF00;
-			viewpoint 2,1,1,16,0xFFFF00;
-			viewpoint 2,1,1,17,0xFFFF00;
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
 			next;
+			mes "[Payon Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
+			next;
+			mes "[Payon Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in the city of Payon.";
 			break;
 		case 4:
 			mes "[Payon Guide]";
-			mes "Enjoy your stay.";
-			close;
-			cutin "pay_soldier",255;
-			end;
+			mes "Be safe in";
+			mes "your travels,";
+			mes "brave adventurer.";
+			close2;
+			set .@loop1,0;
+			break;
 		}
 	}
+	cutin "pay_soldier",255;
 	end;
-L_Mark:
-	mes "[Payon Guide]";
-	mes "Let me mark the location of the";
-	mes getarg(0)+"^000000";
-	mes "on your mini-map.";
-	mes "Would you like to check any other locations?";
-	return;
 }
 
-payon,151,182,6	duplicate(GuidePayon)	Guide#02payon	708
-payon,221,85,6	duplicate(GuidePayon)	Guide#03payon	708
-payon,233,324,4	duplicate(GuidePayon)	Guide#04payon	708
-
-pay_arche,86,33,4	script	Guide#05payon	708,{
+pay_arche,85,30,2	script	Guide#2pay	708,{
 	cutin "pay_soldier",2;
 	mes "[Payon Guide]";
-	mes "Welcome to ^8B4513Archer Village^000000,";
-	mes "a subsidiary village of Payon.";
-	mes "Do you need help navigating the village?";
-	next;
-	set .@str$,"Would you like to check any other locations?";
-	while (1) {
-		switch(select("[ Payon Dungeon ]:[ Archer Guild ]:[ Tool Shop ]:[ Kafra Employee ]:[ Mercenary Guildsman ]:[ Alchemist Guildsman ]:[ Eden Teleport Officer ]:Remove Marks from Mini-Map:Cancel")) {
+	mes "Welcome to the";
+	mes "mountain city of Payon.";
+	mes "If you're unfamiliar with this";
+	mes "area, I can help you find what";
+	mes "you're looking for around here.";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice:Cancel")) {
 		case 1:
 			mes "[Payon Guide]";
-			mes "Let me mark the entrance of";
-			mes "the ^B9062FPayon Dungeon^000000";
-			mes "on your mini-map.";
-			mes .@str$;
-			viewpoint 1,38,131,0,0xFF0000;
-			next;
+			mes "Please, select a menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like to leave indicators on the mini-map?";
+				next;
+				if (select("Yes.:No.") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while(.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+				switch(select("^FF0000Archer Guild^000000:Tool Shop:Payon Dungeon:Cancel")) {
+				case 1:
+					mes "[Payon Guide]";
+					mes "The Archer Guild,";
+					mes "found northeast in";
+					mes "the Archer Village,";
+					mes "handles Job Changes";
+					mes "to the Archer Class.";
+					if (.@compass_check)
+						viewpoint 1,144,164,0,0xFFFF00;
+					break;
+				case 2:
+					mes "[Payon Guide]";
+					mes "You can find";
+					mes "a Tool Shop in";
+					mes "the northeast corner";
+					mes "of the Archer Village.";
+					if (.@compass_check)
+						viewpoint 1,71,156,1,0xFFFF00;
+					break;
+				case 3:
+					mes "[Payon Guide]";
+					mes "The entrance to";
+					mes "the Payon Dungeon";
+					mes "is located at the west";
+					mes "end of the village.";
+					if (.@compass_check)
+						viewpoint 1,34,132,2,0xFFFFFF;
+					break;
+				case 4:
+					mes "[Payon Guide]";
+					mes "If you'd like to erase the marks on the mini-map, select menu, 'Wipe all indicators on the mini-map'.";
+					set @loop2,0;
+					break;
+				}
+			}
 			break;
 		case 2:
-			mes "[Payon Guide]";
-			mes "The ^0000FFArcher Guild^000000";
-			mes "is where you can change";
-			mes "your job to Archer.";
-			mes .@str$;
-			viewpoint 1,143,164,1,0x0A82FF;
-			next;
+			viewpoint 2,237,41,0,0xFF00FF;
+			viewpoint 2,237,41,1,0xFF0000;
+			viewpoint 2,46,345,2,0xFF00FF;
+			set .@compass_check,0;
 			break;
 		case 3:
 			mes "[Payon Guide]";
-			mes "Let me mark the location of the";
-			mes "^FF5400Tool Shop^000000";
-			mes "on your mini-map.";
-			mes .@str$;
-			viewpoint 1,72,156,2,0xFFB400;
-			next;
-			break;
-		case 4:
-			mes "[Payon Guide]";
-			mes "Let me mark the location of the ^006400Kafra Employee^000000";
-			mes "on your mini-map.";
-			mes .@str$;
-			viewpoint 1,55,123,3,0xAAFF00;
-			next;
-			break;
-		case 5:
-			mes "[Payon Guide]";
-			mes "Let me mark the location of the";
-			mes "^7F3300Bow Mercenary Manager^000000 and";
-			mes "^7F3300Mercenary Goods Merchant^000000";
-			mes "on your mini-map.";
-			mes .@str$;
-			viewpoint 1,101,166,4,0xD2691E;
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
 			next;
-			break;
-		case 6:
 			mes "[Payon Guide]";
-			mes "Let me mark the location of the";
-			mes "^800080Alchemist Guildsman^000000";
-			mes "on your mini-map.";
-			mes .@str$;
-			viewpoint 1,127,113,5,0xDA70D6;
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
 			next;
-			break;
-		case 7:
 			mes "[Payon Guide]";
-			mes "The ^0000FFEden Teleport Officer^000000";
-			mes "is currently staying inside";
-			mes "the Archer Guild building.";
-			mes .@str$;
-			viewpoint 1,143,164,6,0x0A82FF;
-			next;
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in the city of Payon.";
 			break;
-		case 8:
-			mes "[Payon Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes .@str$;
-			viewpoint 2,1,1,0,0xFFFF00;
-			viewpoint 2,1,1,1,0x000000;
-			viewpoint 2,1,1,2,0xFF0000;
-			viewpoint 2,1,1,3,0xFFFF00;
-			viewpoint 2,1,1,4,0xFFFF00;
-			viewpoint 2,1,1,5,0xFFFF00;
-			viewpoint 2,1,1,6,0xFFFF00;
-			next;
-			break;
-		case 9:
+		case 4:
 			mes "[Payon Guide]";
-			mes "Enjoy your stay.";
+			mes "Be safe in";
+			mes "your travels,";
+			mes "brave adventurer.";
 			close2;
-			cutin "pay_soldier",255;
-			end;
+			set .@loop1,0;
+			break;
 		}
 	}
+	cutin "pay_soldier",255;
+	end;
 }
diff --git a/npc/pre-re/guides/guides_prontera.txt b/npc/pre-re/guides/guides_prontera.txt
index 8e254453c..8a3f87f61 100644
--- a/npc/pre-re/guides/guides_prontera.txt
+++ b/npc/pre-re/guides/guides_prontera.txt
@@ -1,307 +1,242 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Prontera Guides
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena  SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guides for the city of Prontera
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guides.
-//============================================================ 
+//===== By: ==================================================
+//= kobra_k88; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.6a
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the City of Prontera
+//===== Additional Comments: =================================
+//= 1.1 Now using duplicate command.
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.3 Updated the guide according to how it is on iRO, thanks [MasterOfMuppets]
+//=     to Muad_Dib
+//= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
+//= 1.5 Removed Duplicates [Silent]
+//= 1.6 Rescripted to official 10.3 standards. [L0ne_W0lf]
+//= 1.6a Fixed some errors with the loop. [Samuray22]
+//	-Thanks to $ephiroth.
+//= 1.6b Fixed a Problem with Unnecesary RGB Values. [Samuray22]
+//	-Thanks to Brainstorm.
+//============================================================
 
-prontera,154,187,4	script	Guide#01prontera::GuideProntera	105,{
+prontera,154,187,4	script	Guide#prt::PrtGuide	105,{
 	cutin "prt_soldier",2;
 	mes "[Prontera Guide]";
-	mes "Welcome to ^8B4513Prontera^000000,";
+	mes "Welcome to Prontera,";
 	mes "the beautiful capital of the";
-	mes "Rune-Midgarts Kingdom.";
-	mes "Do you need help navigating the city?";
-	next;
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
+	mes "Rune-Midgarts Kingdom. If";
+	mes "you have questions or need help finding something in the city, don't hesitate to ask.";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide.:Remove Marks from Mini-Map:Notice:Cancel")) {
 		case 1:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Tool Shop ]:[ Weapon & Armor Shop ]:[ Forge ]:[ Sanctuary ]:[ Chivalry Office ]:[ Inn ]:[ Tavern ]:[ Library ]:[ Prontera Castle ]:[ Job Agency ]:[ City Hall ]:Previous Menu")) {
+			mes "[Prontera Guide]";
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes:No") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while (.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+
+				switch(select("Swordman Association:^0000FFSanctuary^000000:Prontera Chivalry:Weapon Shop:Tool Shop:Inn:Trading Post:Pub:Library:Job Agency:Prontera Castle:City Hall:Cancel")) {
 				case 1:
 					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^B9062FTool Shop^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,134,221,0,0xFF0000;
-					next;
+					mes "The Swordman Association,";
+					mes "which handles Job Changes";
+					mes "to the Swordman class, has";
+					mes "moved to Izlude. This facility";
+					mes "is just an empty building now.";
+					if (.@compass_check)
+						viewpoint 1,237,41,4,0x00FF00;
 					break;
 				case 2:
 					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^0000FFWeapon & Armor Shop^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,175,220,1,0x0A82FF;
-					next;
+					mes "The Prontera Sanctuary";
+					mes "handles Job Changes to";
+					mes "the Acolyte class, and can";
+					mes "be found in the northeast";
+					mes "corner of Prontera.";
+					if (.@compass_check)
+						viewpoint 1,236,316,5,0xFF0000;
 					break;
 				case 3:
 					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^FF5400Forge^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,179,184,2,0xFFB400;
-					next;
+					mes "The Prontera Chivralry,";
+					mes "which is responsible for";
+					mes "the safety of our capital, is";
+					mes "in Prontera's northwest corner.";
+					if (.@compass_check)
+						viewpoint 1,46,345,6,0x00FF00;
 					break;
 				case 4:
 					mes "[Prontera Guide]";
-					mes "The ^006400Prontera Sanctuary^000000 is";
-					mes "where you can change your job to Acolyte,";
-					mes "its located in the far northeast of Prontera.";
-					mes "Let me mark the location on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,236,316,3,0xAAFF00;
-					next;
+					mes "The Weapon Shop";
+					mes "is located northeast";
+					mes "of the central fountain.";
+					if (.@compass_check)
+						viewpoint 1,175,220,7,0xFF00FF;
 					break;
 				case 5:
 					mes "[Prontera Guide]";
-					mes "The Chivalry Office is";
-					mes "where you can change your job to ^7F3300Knight^000000";
-					mes "or apply for the ^7F3300Culvert^000000 Subjugation Party.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,46,345,4,0xD2691E;
-					next;
+					mes "The Tool Shop";
+					mes "is located northwest";
+					mes "of the central fountain.";
+					if (.@compass_check)
+						viewpoint 1,134,221,8,0xFF00FF;
 					break;
 				case 6:
 					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^800080Inn^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,204,191,5,0xDA70D6;
-					next;
+					mes "The Inns in Prontera are";
+					mes "located both to the east";
+					mes "and west of Prontera's";
+					mes "central fountain area.";
+					if (.@compass_check) {
+						viewpoint 1,204,191,9,0xFF00FF;
+						viewpoint 1,107,192,10,0xFF00FF;
+					}
 					break;
 				case 7:
 					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^B9062FTaverns^000000";
-					mes "on your mini-map.";
-					mes "Only the ^B9062Fnorthern^000000 tavern";
-					mes "is open for now.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,208,154,6,0xFF0000;
-					viewpoint 1,46,67,7,0xFF0000;
-					next;
+					mes "The Trading Post";
+					mes "can be found southeast";
+					mes "from the central fountain.";
+					if (.@compass_check)
+						viewpoint 1,179,184,11,0x00FF00;
 					break;
 				case 8:
 					mes "[Prontera Guide]";
-					mes "The ^0000FFLibrary^000000 is";
-					mes "where you can find useful information, like the Monster Encyclopedia.";
-					mes "There are currently twi libaries available";
-					mes "in the northern area of Prontera.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,120,264,8,0x0A82FF;
-					viewpoint 1,192,264,9,0x0A82FF;
-					next;
+					mes "The Pub is located";
+					mes "southeast of the fountain,";
+					mes "behind the Trading Post.";
+					if (.@compass_check)
+						viewpoint 1,208,154,12,0x00FF00;
 					break;
 				case 9:
 					mes "[Prontera Guide]";
-					mes "The ^FF5400Prontera Castle^000000 is north from here,";
-					mes "and its rear gate is connected to";
-					mes "the northern Prontera Fields.";
-					mes "Let me mark the castle on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,156,360,10,0xFFB400;
-					next;
+					mes "If you head north from";
+					mes "the central fountain, you'll";
+					mes "find an empty area in which";
+					mes "both branches of the Prontera";
+					mes "Library can be accessed if you";
+					mes "head towards the east or west.";
+					if (.@compass_check) {
+						viewpoint 1,120,267,13,0x00FF00;
+						viewpoint 1,192,267,14,0x00FF00;
+					}
 					break;
 				case 10:
 					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^006400Job Agency^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,133,183,11,0xAAFF00;
-					next;
+					mes "The Job Agency is";
+					mes "just southwest of the";
+					mes "central fountain area.";
+					if (.@compass_check)
+						viewpoint 1,133,183,15,0x00FF00;
 					break;
 				case 11:
 					mes "[Prontera Guide]";
-					mes "Let me mark the location of ^7F3300City Hall^000000";
-					mes "on your mini-map.";
-					mes "There's a hairstylist";
-					mes "there that can change your hair color.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,75,91,12,0xD2691E;
-					next;
+					mes "The Prontera Castle is";
+					mes "located at the northern";
+					mes "sector of this city. You can";
+					mes "go to the fields that are north";
+					mes "of Prontera by going through";
+					mes "the castle's rear exit.";
+					if (.@compass_check)
+						viewpoint 1,156,360,16,0x00FF00;
 					break;
 				case 12:
-					set .@loop,0;
-					break;
-				}
-			}
-			break;
-		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Eden Teleport Officer ]:[ Peco Peco Breeder ]:[ Riding Creature Master ]:[ Magic Gear Master ]:[ Peco Peco Remover ]:[ Rune Salesman ]:[ Mercenary Guildsman ]:[ Hypnotist ]:[ Kafra Employee ]:[ Leablem ]:[ Apprentice Craftsman ]:Previous Menu")) {
-				case 1:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the";
-					mes "^800080Eden Teleport Officer^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,124,76,13,0xDA70D6;
-					next;
-					break;
-				case 2:
-					mes "[Prontera Guide]";
-					mes "Two ^0000FFPeco Peco Breeders^000000 are available,";
-					mes "one for ^0000FFKnights^000000 to the ^0000FFnorthwest^000000";
-					mes "and the other for ^0000FFCrusaders^000000 to the ^0000FFnortheast^000000.";
-					viewpoint 1,55,350,15,0x0A82FF;
-					viewpoint 1,232,310,16,0x0A82FF;
-					next;
-					break;
-				case 3:
-					mes "[Prontera Guide]";
-					mes "The ^FF5400Riding Creature Master^000000 provides services for";
-					mes "^FF5400Rune Knights^000000 and ^FF5400Royal Guards^000000.";
-					mes "Let me mark his location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,131,213,17,0xFFB400;
-					next;
-					break;
-				case 4:
-					mes "[Prontera Guide]";
-					mes "The ^006400Magic Gear Master^000000";
-					mes "provides services for";
-					mes "^006400Mechanics^000000.";
-					mes "Let me mark his location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,163,178,18,0xAAFF00;
-					next;
-					break;
-				case 5:
-					mes "[Prontera Guide]";
-					mes "If your beloved Peco Peco refuses";
-					mes "to leave you,";
-					mes "please talk to the ^7F3300Peco Peco Remover^000000";
-					mes "near the central fountain.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,125,208,19,0xD2691E;
-					next;
-					break;
-				case 6:
 					mes "[Prontera Guide]";
-					mes "Let me mark the location of";
-					mes "the ^800080Rune Salesman^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,168,228,20,0xDA70D6;
-					next;
+					mes "The City Hall";
+					mes "is located in the";
+					mes "southwest corner";
+					mes "in our city of Prontera.";
+					if (.@compass_check)
+						viewpoint 1,75,91,17,0x01FF01;
 					break;
-				case 7:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of ^0000FFSpear Mercenary Manager^000000 and";
-					mes "^0000FFMercenary Goods Merchant^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,35,337,21,0x0A82FF;
-					next;
-					break;
-				case 8:
-					mes "[Prontera Guide]";
-					mes "The ^FF5400Hypnotist^000000";
-					mes "helps beginner adventurers";
-					mes "to reset their skills.";
-					mes "Let me mark his location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,146,232,22,0xFFB400;
-					next;
-					break;
-				case 9:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the";
-					mes "^006400Kafra Employees^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,152,326,23,0xAAFF00;
-					viewpoint 1,30,207,24,0xAAFF00;
-					viewpoint 1,282,200,25,0xAAFF00;
-					viewpoint 1,151,29,26,0xAAFF00;
-					viewpoint 1,146,89,27,0xAAFF00;
-					next;
-					break;
-				case 10:
-					mes "[Prontera Guide]";
-					mes "^0000FFLeablem^000000";
-					mes "is a technician";
-					mes "who can create ^0000FFslots^000000 on weapons and armors,";
-					mes "As amazing as it sounds,";
-					mes "not all equipment can be slotted.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,244,169,28,0x0A82FF;
-					next;
-					break;
-				case 11:
+				case 13:
 					mes "[Prontera Guide]";
-					mes "Let me mark the location of the";
-					mes "^800080Apprentice Craftsman^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,165,60,29,0xDA70D6;
-					next;
-					break;
-				case 12:
-					set .@loop,0;
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
 					break;
 				}
 			}
 			break;
+		case 2:
+			viewpoint 2,237,41,4,0x00FF00;
+			viewpoint 2,237,41,5,0x0000FF;
+			viewpoint 2,46,345,6,0x00FF00;
+			viewpoint 2,175,220,7,0xFF0000;
+			viewpoint 2,134,221,8,0xFF0000;
+			viewpoint 2,204,191,9,0xFF0000;
+			viewpoint 2,107,192,10,0xFF0000;
+			viewpoint 2,179,184,11,0x00FF00;
+			viewpoint 2,208,154,12,0x00FF00;
+			viewpoint 2,120,267,13,0x00FF00;
+			viewpoint 2,192,267,14,0x00FF00;
+			viewpoint 2,133,183,15,0x00FF00;
+			viewpoint 2,156,360,16,0x00FF00;
+			viewpoint 2,75,91,17,0x00FF00;
+			set .@compass_check,0;
+			break;
 		case 3:
 			mes "[Prontera Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,1,1,0,0xFFFF00;
-			viewpoint 2,1,1,1,0x000000;
-			viewpoint 2,1,1,2,0xFF0000;
-			viewpoint 2,1,1,3,0xFFFF00;
-			viewpoint 2,1,1,4,0xFFFF00;
-			viewpoint 2,1,1,5,0xFFFF00;
-			viewpoint 2,1,1,6,0xFFFF00;
-			viewpoint 2,1,1,7,0xFFFF00;
-			viewpoint 2,1,1,8,0xFFFF00;
-			viewpoint 2,1,1,9,0xFFFF00;
-			viewpoint 2,1,1,10,0xFFFF00;
-			viewpoint 2,1,1,11,0xFFFF00;
-			viewpoint 2,1,1,12,0xFFFF00;
-			viewpoint 2,1,1,13,0xFFFF00;
-			viewpoint 2,1,1,14,0xFFFF00;
-			viewpoint 2,1,1,15,0xFFFF00;
-			viewpoint 2,1,1,16,0xFFFF00;
-			viewpoint 2,1,1,17,0xFFFF00;
-			viewpoint 2,1,1,18,0xFFFF00;
-			viewpoint 2,1,1,19,0xFFFF00;
-			viewpoint 2,1,1,20,0xFFFF00;
-			viewpoint 2,1,1,21,0xFFFF00;
-			viewpoint 2,1,1,22,0xFFFF00;
-			viewpoint 2,1,1,23,0xFFFF00;
-			viewpoint 2,1,1,24,0xFFFF00;
-			viewpoint 2,1,1,25,0xFFFF00;
-			viewpoint 2,1,1,26,0xFFFF00;
-			viewpoint 2,1,1,27,0xFFFF00;
-			viewpoint 2,1,1,28,0xFFFF00;
-			viewpoint 2,1,1,29,0xFFFF00;
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
+			next;
+			mes "[Prontera Guide]";
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
 			next;
+			mes "[Prontera Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in the city of Prontera.";
 			break;
 		case 4:
 			mes "[Prontera Guide]";
-			mes "Enjoy your stay.";
+			mes "Well, adventurer...";
+			mes "I hope your journeys";
+			mes "through Rune-Midgard";
+			mes "are both fun and safe.";
 			close2;
-			cutin "prt_soldier",255;
-			end;
+			set .@loop1,0;
+			break;
 		}
 	}
+	cutin "prt_soldier",255;
+	end;
 }
 
-prontera,282,208,2	duplicate(GuideProntera)	Guide#02prontera	105
-prontera,29,200,6	duplicate(GuideProntera)	Guide#03prontera	105
-prontera,160,29,0	duplicate(GuideProntera)	Guide#04prontera	105
-prontera,151,330,4	duplicate(GuideProntera)	Guide#05prontera	105
+prontera,282,208,2	duplicate(PrtGuide)	East Gate-Guide	105
+
+prontera,29,200,6	duplicate(PrtGuide)	West Gate-Guide	105
+
+prontera,160,29,0	duplicate(PrtGuide)	South Gate-Guide	105
+
+prontera,151,330,4	duplicate(PrtGuide)	North Gate-Guide	105
diff --git a/npc/pre-re/guides/guides_rachel.txt b/npc/pre-re/guides/guides_rachel.txt
index 665ae6890..d9fc74475 100644
--- a/npc/pre-re/guides/guides_rachel.txt
+++ b/npc/pre-re/guides/guides_rachel.txt
@@ -1,126 +1,116 @@
-//===== rAthena Script ======================================= 
-//= Rachel Guides
-//===== By: ================================================== 
+//===== rAthena Script =======================================
+//= Rachel Guide
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena  SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guide for the city of Rachel
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//============================================================ 
+//===== Current Version: =====================================
+//= 1.2b
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= [Official Conversion]
+//= Rachel City guide
+//===== Additional Comments: =================================
+//= 1.0 First version. [L0ne_W0lf]
+//= 1.1 Change the while loops a bit. [L0ne_W0lf]
+//= 1.2 Deleted an Unnecessary "next;" [Samuray22]
+//	-Thanks to $ephiroth.
+//= 1.2a Fixed some errors with the loop[Samuray22]
+//	-Thanks to $ephiroth.
+//= 1.2b Deleted a unnecessary "end". [Samuray22]
+//============================================================
 
-rachel,138,146,5	script	Rachel Guide#rachel	934,{
+rachel,138,146,5	script	Rachel Guide	934,{
 	mes "[Rachel Guide]";
-	mes "Welcome to the capital of Arunafeltz, ^8B4513Rachel^000000 where the warm breath of the goddess Freya reaches.";
-	mes "If this is the first time for you to use the guide services, I suggest you ask many questions.";
-	next;
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
+	mes "Welcome to the capital of";
+	mes "Arunafeltz, Rachel where a warm";
+	mes "breath of goddess Freya reaches.";
+	mes "If this is the first time for you";
+	mes "to use the guide services, why";
+	mes "don't you check the \"Notice\" menu first?";
+	set .@loop1,1;
+	while(.@loop1) {
+		next;
+		switch(select("Village Guide:Remove Marks from Mini-Map:Notice:Cancel")) {
 		case 1:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Inn ]:[ Weapon Shop ]:[ Tool Shop ]:[ Airport ]:[ Cheshrumnir ]:[ Priest Zed's Mansion ]:Previous Menu")) {
+			mes "[Rachel Guide]";
+			mes "I can tell you any building location as long as it is in Rachel.";
+			mes "So where do you want to go?";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes:No") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while(.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+
+				switch(select("Cheshrumnir:Inn:Weapon Shop:Tool Shop:Airport:Cancel")) {
 				case 1:
 					mes "[Rachel Guide]";
-					mes "You can rest your fatigue of the journey in the Inn. The left building next to me is the Inn of Rachel.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,115,144,0,0xFF0000;
-					next;
+					mes "Cheshrumnir is a holy ground where pope, the incarnation of goddess Freya stays.";
+					mes "Take the road to the norh to find the building.";
+					if (.@compass_check == 1) viewpoint 1,150,249,1,0xFF0000;
 					break;
 				case 2:
 					mes "[Rachel Guide]";
-					mes "Do you want to check out the weapons that are sold in Rachel? The Weapon Shop is located near the west gate.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,42,82,1,0xFF4500;
-					next;
+					mes "You can rest your fatigue off the journey in the Inn.";
+					mes "The left building next to me is the Inn of Rachel.";
+					if (.@compass_check == 1) viewpoint 1,115,149,2,0xFF00FF;
 					break;
 				case 3:
 					mes "[Rachel Guide]";
-					mes "Rachel's Tool Shop sells the best quality potions. It's located near the west gate.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,83,73,2,0xDAA520;
-					next;
+					mes "Do you want to check out the weapons that are sold in Rachel?";
+					mes "The weapon shop is located nearby the western gate.";
+					if (.@compass_check == 1) viewpoint 1,42,87,3,0x99FFFF;
 					break;
 				case 4:
 					mes "[Rachel Guide]";
-					mes "The Airport is located outside of the east gate.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,272,125,3,0x008000;
-					next;
+					mes "Rachel tool shop sells the best quality potions.";
+					mes "It's located nearby the western gate.";
+					if (.@compass_check == 1) viewpoint 1,83,78,4,0x0000FF;
 					break;
 				case 5:
 					mes "[Rachel Guide]";
-					mes "Cheshrumnir is a holy ground where pope, the incarnation of goddess Freya stays.";
-					mes "Take the road to the north to find the building.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,150,243,4,0x0000FF;
-					next;
+					mes "The Airport is located outside the eastern gate.";
+					if (.@compass_check == 1) viewpoint 1,273,125,5,0x00FF00;
 					break;
 				case 6:
 					mes "[Rachel Guide]";
-					mes "I will mark the location";
-					mes "of the ^000080Priest Zed's Mansion^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,98,238,5,0x000080;
-					next;
-					break;
-				case 7:
-					set .@loop,0;
+					mes "If you like to get rid of all the location marks on your Mini-Map,";
+					mes "just ask me again, and choose \"Remove Marks from Mini-Map\" menu.";
+					set .@loop2,0;
 					break;
 				}
 			}
 			break;
+
 		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Cool Event Corp. Staff ]:[ Eden Teleport Officer ]:Previous Menu")) {
-				case 1:
-					mes "[Rachel Guide]";
-					mes "I will mark the location";
-					mes "of the ^803232Cool Event Corp. Staff^000000";
-					mes "on your mini map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,110,138,7,0x803232;
-					next;
-					break;
-				case 2:
-					mes "[Rachel Guide]";
-					mes "I will mark the location";
-					mes "of the ^556B2FEden Teleport Officer^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,125,144,8,0x556B2F;
-					next;
-					break;
-				case 3:
-					set .@loop,0;
-					break;
-				}
-			}
+			viewpoint 2,150,249,1,0xFF0000;
+			viewpoint 2,115,149,2,0xFF00FF;
+			viewpoint 2,42,87,3,0x99FFFF;
+			viewpoint 2,83,78,4,0x0000FF;
+			viewpoint 2,273,125,5,0x00FF00;
+			mes "[Rachel Guide]";
+			mes "Okay, they are gone now. If you have more locations to ask, just let me know.";
 			break;
 		case 3:
 			mes "[Rachel Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,115,144,0,0xFFFFFF;
-			viewpoint 2,42,82,1,0xFFFFFF;
-			viewpoint 2,83,73,2,0xFFFFFF;
-			viewpoint 2,272,125,3,0xFFFFFF;
-			viewpoint 2,150,243,4,0xFFFFFF;
-			viewpoint 2,98,238,5,0xFFFFFF;
-			viewpoint 2,110,138,7,0xFFFFFF;
-			viewpoint 2,125,144,8,0xFFFFFF;
-			next;
+			mes "When you are using the ''Village Guide'' menu,";
+			mes "make sure that building locations will be marked on your mini-map at the upper right side of your screen.";
+			mes "If you cannot see your mini-map, use the short cut key ''ctrl+tab'' or press the ''Map'' button on your basic information windows, okay?";
+			mes "And you can also zoom out your mini-map by using the ''-'' button in case you cannot view the entire map of the village.";
 			break;
 		case 4:
 			mes "[Rachel Guide]";
-			mes "Have a safe journey!";
-			close;
+			mes "Hope you have a wonderfull journey";
+			mes "in Arunafeltz.";
+			close2;
+			set .@loop1,0;
+			break;
 		}
 	}
+	close;
 }
diff --git a/npc/pre-re/guides/guides_umbala.txt b/npc/pre-re/guides/guides_umbala.txt
index b6af2e934..aab2f362d 100644
--- a/npc/pre-re/guides/guides_umbala.txt
+++ b/npc/pre-re/guides/guides_umbala.txt
@@ -1,99 +1,124 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Umbala Guides
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena  SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guides for the city of Umbala
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guides.
-//============================================================ 
+//===== By: ==================================================
+//= Dizzy, Translated by Celest; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.5
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guide for the City of Umbala
+//===== Additional Comments: =================================
+//= 1.1 Fixed location command format [Lupus]
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
+//= 1.5 Rescripted to official 10.3 standards. [L0ne_W0lf]
+//= 1.6 Corrected activating ontouch. [L0ne_W0lf]
+//============================================================
 
-umbala,128,94,3	script	Umbala Guide#01umbala::GuideUmbala	702,{
-	mes "Welcome to ^8B4513Umbala^000000,";
-	mes "the Village of the Utan Tribe.";
+umbala,128,94,4	script	Adventurer#um	702,{
+	mes "[Adventurer]";
+	mes "This is a very strange place...";
+	mes "It's underdeveloped, and there";
+	mes "are a number of complex, winding paths...";
 	next;
-	mes "Since I have been exploring here for several months.";
-	mes "I am familiar with this area's geography and the points of interest in this village.";
-	mes "Do you need help navigating the village?";
-	while (1) {
+	mes "[Adventurer]";
+	mes "However, since I have been here";
+	mes "for months, I am familiar with";
+	mes "this area's geography and points";
+	mes "of interest in this village.";
+	mes "You're welcome to ask me about the";
+	mes "locations of buildings.";
+	next;
+	switch(select("Locations of buildings.:Remove marks on the mini map.:Quit.")) {
+	case 1:
+		mes "[Adventurer]";
+		mes "So, which one do you want to check?";
 		next;
-		switch(select("[ Kafra Employee ]:[ Chief's House ]:[ Shaman's House ]:[ Weapon Shop ]:[ Tool Shop ]:[ Bungee Jump Area ]:[ Tree of Yggdrasil ]:Remove Marks from Mini-Map:Cancel")) {
+		switch(select("Chief's House:Shaman's House:Weapon Shop:Tool Shop:Bungee Jump Place:Cancel")) {
 		case 1:
-			mes "[Umbala Guide]";
-			mes "Let me mark the location of the";
-			mes "^0000FFKafra Employee^000000";
-			mes "on your mini-map.";
-			mes "Would you like to check any other locations?";
-			viewpoint 1,87,160,0,0x0A82FF;
+			mes "[Adventurer]";
+			mes "I have made a ^FF3355+^000000 mark";
+			mes "on your mini map.";
+			next;
+			mes "[Adventurer]";
+			mes "Only the chief knows the language";
+			mes "of the outside world. So you'd";
+			mes "better visit him before anything else.";
+			viewpoint 1,66,250,2,0xFF3355;
 			break;
 		case 2:
-			mes "[Umbala Guide]";
-			mes "Only the ^006400Chief^000000 knows the language of the outside world.";
-			mes "So you'd better visit him before anything else.";
-			mes "Would you like to check any other locations?";
-			viewpoint 1,68,251,1,0xAAFF00;
+			mes "[Adventurer]";
+			mes "I have made a ^CE6300+^000000 mark";
+			mes "on your mini map.";
+			next;
+			mes "[Adventurer]";
+			mes "The Utan Shaman has some";
+			mes "sort of mystic power...";
+			mes "People say she can create rough";
+			mes "enchanted stones, and divide a";
+			mes "pure enchanted stone into rough ones.";
+			viewpoint 1,217,186,3,0xCE6300;
 			break;
 		case 3:
-			mes "[Umbala Guide]";
-			mes "The ^008080Shaman^000000 has some sort of mystic power.";
-			mes "People say she can create rough enchanted stones, and divide a pure enchanted stone into rough ones.";
-			mes "Would you like to check any other locations?";
-			viewpoint 1,219,188,2,0x008080;
+			mes "[Adventurer]";
+			mes "I have made a ^55FF33+^000000 mark";
+			mes "on your mini map.";
+			next;
+			mes "[Adventurer]";
+			mes "The Utans are usually well armed";
+			mes "in preparation for attacks from";
+			mes "their enemies. Apparently, they";
+			mes "have been attacked from the outside many times in the past.";
+			viewpoint 1,126,154,4,0x55FF33;
 			break;
 		case 4:
-			mes "[Umbala Guide]";
-			mes "The ^FF1493Weapon Shop^000000 inside Umbala";
-			mes "supplies the weapons";
-			mes "for defending against their enemies.";
-			mes "Would you like to check any other locations?";
-			viewpoint 1,125,155,3,0xFF1493;
-			break;
-		case 5:
-			mes "[Umbala Guide]";
+			mes "[Adventurer]";
+			mes "I have made a ^3355FF+^000000 mark";
+			mes "on your mini map.";
+			next;
+			mes "[Adventurer]";
 			mes "There are many useful things for";
-			mes "traveling in the ^8B4513Tool Shop^000000 in Umbala.";
-			mes "Would you like to check any other locations?";
-			viewpoint 1,136,127,4,0x8B4513;
+			mes "traveling in the Tool Shop, so why don't you go look around?";
+			viewpoint 1,136,127,5,0x3355FF;
 			break;
-		case 6:
-			mes "[Umbala Guide]";
+		case 5:
+			mes "[Adventurer]";
+			mes "I have made a ^00FF00+^000000 mark";
+			mes "on your mini map.";
+			next;
+			mes "[Adventurer]";
 			mes "Umbala has a unique locale called";
-			mes "the 'Bungee Jump Area'.";
+			mes "the 'Bungee Jump Place'.";
 			mes "If you're interested in testing";
-			mes "your courage, why don't you try it.";
-			mes "Would you like to check any other locations?";
-			viewpoint 1,221,176,5,0x9400D3;
+			mes "your courage, why don't you go";
+			mes "and partake in this Utan";
+			mes "ritual yourself?";
+			viewpoint 1,139,198,6,0x00FF00;
 			break;
-		case 7:
-			mes "[Umbala Guide]";
-			mes "There's the Tree of Yggdrasil in the northern part of town.";
-			mes "You should pay it a visit since that's a place I recommend when you visit Umbala.";
-			mes "Would you like to check any other locations?";
-			viewpoint 1,107,284,6,0xA52A2A;
-			break;
-		case 8:
-			mes "[Umbala Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,1,1,0,0xFFFFFF;
-			viewpoint 2,1,1,1,0xFFFFFF;
-			viewpoint 2,1,1,2,0xFFFFFF;
-			viewpoint 2,1,1,3,0xFFFFFF;
-			viewpoint 2,1,1,4,0xFFFFFF;
-			viewpoint 2,1,1,5,0xFFFFFF;
-			viewpoint 2,1,1,6,0xFFFFFF;
-			break;
-		case 9:
-			mes "[Umbala Guide]";
-			mes "Be safe on your travels.";
-			close;
+		case 6:
+			mes "[Adventurer]";
+			mes "If you want to remove the location";
+			mes "marks on your mini map, please";
+			mes "choose 'Remove marks on the mini map' menu.";
 		}
+		break;
+	case 2:
+		viewpoint 2,66,250,2,0xFF3355;
+		viewpoint 2,217,186,3,0xCE6300;
+		viewpoint 2,126,154,4,0x55FF33;
+		viewpoint 2,136,127,5,0x3355FF;
+		viewpoint 2,139,198,6,0x00FF00;
+		mes "[Adventurer]";
+		mes "I removed all the marks from your";
+		mes "mini map. Feel free to ask me";
+		mes "again if you want me to mark building locations.";
+		break;
+	case 3:
+		mes "[Adventurer]";
+		mes "It's fun to learn Utan culture on your own. Take care.";
+		break;
 	}
+	close;
 }
-
-umbala,99,158,3	duplicate(GuideUmbala)	Umbala Guide#02umbala	702
diff --git a/npc/pre-re/guides/guides_veins.txt b/npc/pre-re/guides/guides_veins.txt
index 12cfb95bf..92c5d9558 100644
--- a/npc/pre-re/guides/guides_veins.txt
+++ b/npc/pre-re/guides/guides_veins.txt
@@ -1,108 +1,129 @@
-//===== rAthena Script ======================================= 
-//= Veins Guides
-//===== By: ================================================== 
+//===== rAthena Script =======================================
+//= Veins Guide
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena  SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guides for the city of Veins
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guides.
-//============================================================ 
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= [Official Conversion]
+//= Veins City guide
+//===== Additional Comments: =================================
+//= 1.0 First version. [L0ne_W0lf]
+//= 1.1 Added second Veins guide NPC. [L0ne_W0lf]
+//= 1.2 Fixed a few small typos. [L0ne_W0lf]
+//============================================================
 
-veins,210,345,5	script	Veins Guide#veins01::GuideVeins	934,{
+veins,210,345,5	script	Veins Guide#1::ve_guide	934,{
 	mes "[Veins Guide]";
-	mes "Thank you for coming through the rough sand storms. Welcome to ^8B4513Veins^000000, the Canyon Village.";
-	mes "If this is the first time for you to use the guide services, why don't you check the \"Notice\" menu first?";
-	next;
-	while (1) {
-		switch(select("[ Temple ]:[ Inn ]:[ Pub ]:[ Weapon Shop ]:[ Tool Shop ]:[ Airport ]:[ Geological Research Institute ]:[ Cool Event Corp. Staff ]:Remove Marks from Mini-Map:Cancel")) {
+	mes "Desert City Veins welcomes adventurers seeking shelter from harsh sandstorms.";
+	mes "If this is the first time for you to use the guide services, why don't you check the...";
+	set .@loop1,1;
+	while(.@loop1) {
+		next;
+		switch(select("Village Guide:Remove Marks from Mini-Map:Notice:Cancel")) {
 		case 1:
 			mes "[Veins Guide]";
-			mes "The Temple is always filled with praying the faithful of the incarnation of goddess Freya.";
-			mes "It's located on the North side of Veins.";
-			mes "Would you like to check any other locations?";
-			viewpoint 1,197,256,0,0xFF0000;
-			next;
+			mes "I can tell you any building location as long as it is in Veins.";
+			mes "So where do you want to go?";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes:No") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while(.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+
+				switch(select("Temple:Inn:Weapon Shop:Tool Shop:Airship:Tavern:Geological Research Institute:Cancel")) {
+				case 1:
+					mes "[Veins Guide]";
+					mes "Our temple is located north,";
+					mes "and always crowded with sincere followers of Goddess Freya.";
+					if (.@compass_check == 1) viewpoint 1,196,258,1,0xFF0000;
+					break;
+				case 2:
+					mes "[Veins Guide]";
+					mes "You can rest your fatigue of the journey in the Inn.";
+					mes "The left building next to me is the Inn of Veins.";
+					if (.@compass_check == 1) viewpoint 1,128,266,2,0xFF00FF;
+					break;
+				case 3:
+					mes "[Veins Guide]";
+					mes "Yes, you should protect yourself from danger on your own.";
+					mes "Purchase high quality weapons at affordable prices.";
+					mes "The Veins Weapon Shop is located to the West.";
+					if (.@compass_check == 1) viewpoint 1,150,175,3,0x99FFFF;
+					break;
+				case 4:
+					mes "[Veins Guide]";
+					mes "Have you packed enough necessities  for your adventure?";
+					mes "If not, I suggest you check what the Veins in the Center can offer you.";
+					if (.@compass_check == 1) viewpoint 1,230,161,4,0x0000FF;
+					break;
+				case 5:
+					mes "[Veins Guide]";
+					mes "Please be aware that Veins only operates cargo airships.";
+					if (.@compass_check == 1) viewpoint 1,273,285,5,0x00FF00;
+					break;
+				case 6:
+					mes "[Veins Guide]";
+					mes "If you'd like to make friends with";
+					mes "the townspeople, I suggest you";
+					mes "go have a drink at the tavern to";
+					mes "the west.";
+					if (.@compass_check == 1) viewpoint 1,150,217,6,0x00FF00;
+					break;
+				case 7:
+					mes "[Veins Guide]";
+					mes "Are you interested in studying geology?";
+					mes "Then you'd better go check out the";
+					mes "Geological Research Institute on";
+					mes "the 2nd floor of the weapon shop.";
+					if (.@compass_check == 1) viewpoint 1,150,175,7,0x00FF00;
+					break;
+				case 8:
+					mes "[Veins Guide]";
+					mes "If you like to get rid of all the location marks on your Mini-Map,";
+					mes "just ask me again, and choose 'Remove Marks from Mini-Map' menu.";
+					set .@loop2,0;
+					break;
+				}
+			}
 			break;
+
 		case 2:
+			viewpoint 2,196,258,1,0xFF0000;
+			viewpoint 2,128,266,2,0xFF00FF;
+			viewpoint 2,150,175,3,0x99FFFF;
+			viewpoint 2,230,161,4,0x0000FF;
+			viewpoint 2,273,285,5,0x00FF00;
+			viewpoint 2,150,217,6,0x00FF00;
+			viewpoint 2,150,175,7,0x00FF00;
 			mes "[Veins Guide]";
-			mes "You can rest your fatigue of the journey in the Inn. The Inn is located on the North-West side of Veins.";
-			mes "Would you like to check any other locations?";
-			viewpoint 1,110,278,1,0xFF4500;
-			next;
+			mes "Okay, they are gone now. If you have more locations to ask, just let me know.";
+			mes "Enjoy your stay in Veins.";
 			break;
 		case 3:
 			mes "[Veins Guide]";
-			mes "If you want to talk to the Veins Towners, visit the Veins Pub.";
-			mes "The pub is located on the west side of Veins.";
-			mes "Would you like to check any other locations?";
-			viewpoint 1,150,215,2,0xDAA520;
-			next;
+			mes "When you are using the ''Village Guide'' menu,";
+			mes "make sure that building locations will be marked on your mini-map at the upper right side of your screen.";
+			mes "If you cannot see your mini-map, use the short cut key ''ctrl+tab'' or press the ''Map'' button on your basic information windows, okay?";
+			mes "And you can also zoom out your mini-map by using the ''-'' button in case you cannot view the entire map of the village.";
 			break;
 		case 4:
 			mes "[Veins Guide]";
-			mes "You have to be able to protect your own body.";
-			mes "The Weapon Shop in Veins is selling the good weapons at a reasonable price..";
-			mes "It is located on the West side of Veins.";
-			mes "Would you like to check any other locations?";
-			viewpoint 1,150,175,3,0x008000;
-			next;
-			break;
-		case 5:
-			mes "[Veins Guide]";
-			mes "The essential items! Check out the Veins Tool Shop in the center of town..";
-			mes "Would you like to check any other locations?";
-			viewpoint 1,230,161,4,0x0000FF;
-			next;
+			mes "Enjoy your stay in Veins.";
+			close2;
+			set .@loop1,0;
 			break;
-		case 6:
-			mes "[Veins Guide]";
-			mes "The Airport of Veins is currently only used for Cargo.";
-			mes "Would you like to check any other locations?";
-			viewpoint 1,273,287,5,0x000080;
-			next;
-			break;
-		case 7:
-			mes "[Veins Guide]";
-			mes "Are you interested in Geology?";
-			mes "If so, please visit the Geological Research Institute at the second floor of Weapon Shop.";
-			mes "Would you like to check any other locations?";
-			viewpoint 1,150,175,6,0x800080;
-			next;
-			break;
-		case 8:
-			mes "[Veins Guide]";
-			mes "I will mark the location";
-			mes "of the ^808080Cool Event Corp. Staff^000000";
-			mes "on your mini map.";
-			mes "Would you like to check any other locations?";
-			viewpoint 1,209,127,7,0x808080;
-			next;
-			break;
-		case 9:
-			mes "[Veins Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,197,256,0,0xFFFFFF;
-			viewpoint 2,110,278,1,0xFFFFFF;
-			viewpoint 2,150,215,2,0xFFFFFF;
-			viewpoint 2,150,175,3,0xFFFFFF;
-			viewpoint 2,230,161,4,0xFFFFFF;
-			viewpoint 2,273,287,5,0xFFFFFF;
-			viewpoint 2,150,175,6,0xFFFFFF;
-			viewpoint 2,209,127,7,0xFFFFFF;
-			next;
-			break;
-		case 10:
-			mes "[Veins Guide]";
-			mes "Have a safe journey!";
-			close;
 		}
 	}
+	close;
 }
 
-veins,189,101,5	duplicate(GuideVeins)	Veins Guide#veins02	934
+veins,189,101,5	duplicate(ve_guide)	Veins Guide#2	934