Uncommented the ShowWarning and ShowDebug from rev. 11508, and cleaned up the warnings it produced.

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

2 files changed, 12 insertions, 10 deletions

diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt
index c604c1f10..47a6bfc69 100644
--- a/npc/cities/aldebaran.txt
+++ b/npc/cities/aldebaran.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena dev team; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 2.1
+//= 2.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -27,6 +27,7 @@
 //=		Kafra and Clock Tower NPCs pending remake. [DZeroX]
 //= 2.01 removed all .GATs [Lupus]
 //= 2.1 Rescripted most NPCs to Aegis 10.3 standards. [L0ne_W0lf]
+//= 2.2 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf]
 //============================================================
 
 // Al De Baran
@@ -90,7 +91,7 @@ aldebaran,49,93,4	script	Young Man#alde	83,{
 	close;
 }
 
-aldebaran,81,61,4	script	Shell Gathering Lady#alde	101,{
+aldebaran,81,61,4	script	Shell Gathering Lady#ald	101,{
 	mes "[Joanne]";
 	mes "I enjoy gathering shells from the sea. It's really fun and relaxing~";
 	next;
@@ -580,7 +581,7 @@ aldeba_in,232,241,4	script	RS125#alde	48,{
 	close;
 }
 
-aldeba_in,223,121,4	script	Threatening-Looking Man#alde	63,{
+aldeba_in,223,121,4	script	Threatening-Looking Man	63,{
 	mes "[Threatening-Looking Man]";
 	mes "Hey, you don't come inside someone else's house without permission.";
 	mes "This is ridiculous!";
@@ -626,7 +627,7 @@ aldeba_in,223,121,4	script	Threatening-Looking Man#alde	63,{
 	close;
 }
 
-aldeba_in,219,61,4	script	Friendly-Looking Man#alde	109,{
+aldeba_in,219,61,4	script	Friendly-Looking Man#ald	109,{
 	mes "[Friendly-Looking Man]";
 	mes "You don't have to listen to a guy right next to my room.";
 	mes "Two years ago, he was in a mercenary training center and fell off from a tree";
@@ -1376,12 +1377,12 @@ sF_Spin:
 
 // Inside Clock Tower
 //============================================================
-c_tower3,10,249,4	script	Gatekeeper	84,{
+c_tower3,10,249,4	script	Gatekeeper#ct	84,{
 	//Key_Of_Clock_Tower
 	callfunc "F_ClockTowerGate","4th",7026,"c_tower4",185,44; 
 }
 
-alde_dun03,264,16,4	script	Gatekeeper	101,{
+alde_dun03,264,16,4	script	Gatekeeper#ct1	101,{
 	//Underground_Key
 	callfunc "F_ClockTowerGate","B4th",7027,"alde_dun04",79,267; 
 }
diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index c2b09d19a..978c03da1 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //=  erKURITA, Au{R}oN (Translated by Alan), $ephiroth
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: ========================================= 
@@ -25,6 +25,7 @@
 //=	from npc\other\lighthalzen_???.txt [Lupus]
 //= 1.2 Moved some NPCs to Lighthalzen quests. [SinSloth]
 //= 1.3	Moved some other NPCs for quests purposes. [SinSloth]
+//= 1.4 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf]
 //=============================================================
 
 lighthalzen,198,285,5	script	Jiwon	862,{
@@ -1195,7 +1196,7 @@ lhz_in03,26,167,4	script	Shayna	850,{
 
 // ---------------------------------------------------------------------------
 
-lhz_in01,134,45,2	script	Cenku Dekdam#Cenku_Dekdam	869,{
+lhz_in01,134,45,2	script	Cenku Dekdam#Cenku	869,{
 
 	mes "[Cenku Dekdam]";
 	mes "Man, if you were";
@@ -1355,7 +1356,7 @@ lhz_in01,124,28,2	script	Ellette	66,{
 
 // ---------------------------------------------------------------------------
 
-lhz_in01,125,40,2	script	Dowbow Ryuei#Dowbow_Ryuei	843,{
+lhz_in01,125,40,2	script	Dowbow Ryuei#Dowbow	843,{
 
 	mes "[Dowbow Ryuei]";
 	mes "Just out of, oh I dunno,";
@@ -1419,7 +1420,7 @@ lhz_in01,116,53,6	script	Ninjose	841,{
 
 // ---------------------------------------------------------------------------
 
-lhz_in01,116,39,6	script	Kejulle Rekenber#Kejulle_Rekenber	822,{
+lhz_in01,116,39,6	script	Kejulle Rekenber#Kejulle	822,{
 
 	mes "[Kejulle Rekenber]";
 	mes "Hm? Sure, my last name";