3 files changed, 18 insertions, 29 deletions
diff --git a/npc/other/auction.txt b/npc/other/auction.txt
index 7cc316193..5a02fd70b 100644
--- a/npc/other/auction.txt
+++ b/npc/other/auction.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -11,11 +11,12 @@
 //= Auction house releated NPCs, and warps
 //===== Additional Comments: =================================
 //= 1.0 First version, place holders only. [L0ne_W0lf]
+//= 1.1 Moved Morroc Auction NPCs to Morroc Ruins. [L0ne_W0lf]
 //============================================================
 
 // Auction House warpers
 //============================================================
-morocc,182,95,6	script	Auction Hall Guide#moc	98,{
+moc_ruins,78,173,6	script	Auction Hall Guide#moc	98,{
 	callfunc "F_AuctionWarper",1;
 }
 
@@ -63,7 +64,7 @@ function	script	F_AuctionWarper	{
 
 // Sign posts
 //============================================================
-morocc,180,97,6	script	Information Post#moc::AuctionSign	837,{
+moc_ruins,76,176,6	script	Information Post#moc::AuctionSign	837,{
 	mes "[Information]";
 	mes "Auction Warp Guide";
 	close;
diff --git a/npc/other/bulletin_boards.txt b/npc/other/bulletin_boards.txt
index 553571291..3840bdc91 100644
--- a/npc/other/bulletin_boards.txt
+++ b/npc/other/bulletin_boards.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= MasterOfMuppets
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
@@ -18,6 +18,7 @@
 //= 1.5a Fixed a small screw up with the color codes in the Glastheim BB [MasterOfMuppets]
 //= 1.5b Fixed another small screw up with the color codes in the Glastheim BB [Kayla]
 //= 1.6 Removed Duplicates [Silent]
+//= 1.7 Updated MOrroc NPCs to reflect episode 12.1 changes. [L0ne_W0lf]
 //============================================================
 
 alberta,111,59,5	script	Bulletin Board#1	837,{
@@ -196,32 +197,16 @@ mjolnir_02,76,362,5	script	Bulletin Board#10	837,{
 
 morocc,152,110,5	script	Bulletin Board#11	837,{
 	mes "[Morroc: The Frontier Town]";
-	mes "Welcome to Morroc, the City of the";
-	mes "Desert. Morroc was built on an";
-	mes "on an oasis, so this town can accommodate";
-	mes "its many visitors and travelers.";
+	mes "Welcome to Morroc, the City of the Desert. Morroc was built on an oasis, so this town can accomodate its many visitors and travelers.";
 	next;
 	mes "[Morroc: The Frontier Town]";
-	mes "Morroc Castle lies in the center of";
-	mes "this city. Please feel free to";
-	mes "explore this town, and enjoy its";
-	mes "unique atmosphere. However, watch";
-	mes "your pockets and beware of Rogues";
-	mes "and Thieves.";
+	mes "Morroc Castle lies in the center of this city. Please feel free to explore this town, and enjoy its unique atmosphere. However, watch your pockets and beware of Rogues and Thieves.";
 	next;
 	mes "[Morroc: The Frontier Town]";
-	mes "From Morroc, the ^6B1312Pyramid Dungeon^000000";
-	mes "can be found to the Northwest, and";
-	mes "the ^6B1312Sphinx Dungeon^000000 can be found to";
-	mes "the West. To the southeast, you may";
-	mes "find ^6B1312Ant Hell.";
+	mes "From Morroc, the ^660000Pyramid Dungeon^000000 can be found to the Northwest, and the ^660000Sphinx Dungeon^000000 can be found to the West. To the Southeast, you may find ^660000Ant Hell^000000.";
 	next;
-	mes "[Morroc: The Frontier Town]";
-	mes "The Assassin Guild is rumored to be";
-	mes "located to the Southeast. When you";
-	mes "head East from Morroc, and then";
-	mes "North, you will arrive at";
-	mes "^6D6FE0Prontera^000000.";
+	mes "[Morroc: The Frontier Town";
+	mes "The Assassin Guild is rumored to be located to the Southeast. When you head East from Morroc, and then North, you will arrive at ^3355FFProntera^000000.";
 	close;
 }
 
@@ -567,6 +552,7 @@ niflheim,200,191,5	script	Bulletin Board#25	837,{
 	close;
 }
 
+/*
 moc_fild15,267,264,5	script	Bulletin Board#26	837,{
 
 	mes "[Ant Hell]";
@@ -582,6 +568,7 @@ moc_fild15,267,264,5	script	Bulletin Board#26	837,{
 	mes "a boss monster called ^6B1312Phreeoni^000000 will appear at certain time.";
 	close;
 }
+*/
 
 moc_ruins,61,164,5	script	Bulletin Board#27	837,{
 
diff --git a/npc/other/mail.txt b/npc/other/mail.txt
index 7cf983c66..0ca900727 100644
--- a/npc/other/mail.txt
+++ b/npc/other/mail.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -16,13 +16,14 @@
 //= 1.3 Added Veins mail box. [L0ne_W0lf]
 //= 1.3a Corrected a typo error. (bugreport:798) [Samuray22]
 //= 1.4 Added a Mapflag to prevent mail operations in other maps [Zephyrus]
+//= 1.5 Moved Morroc Mail boxes to Morroc Ruins. [L0ne_W0lf]
 //============================================================
 
 // Allow Mail Inbox reading from
 //============================================================
 prontera	mapflag	town
 izlude	mapflag	town
-morocc	mapflag	town
+moc_ruins	mapflag	town
 geffen	mapflag	town
 payon	mapflag	town
 pay_arche	mapflag	town
@@ -86,8 +87,8 @@ izlude,136,94,0	duplicate(MailBox)	Mailbox#iz	888
 
 // Morroc
 //============================================================
-morocc,166,110,0	duplicate(MailBox)	Mailbox#moc	888
-morocc,168,262,0	duplicate(MailBox)	Mailbox#2moc	888
+moc_ruins,72,166,0	duplicate(MailBox)	Mailbox#1moc	888
+moc_ruins,156,52,0	duplicate(MailBox)	Mailbox#2moc	888
 
 // Geffen
 //============================================================