Added ability to use constants instead of sprite IDs for NPCs. Converted all npcs to use this.

1 files changed, 16 insertions, 16 deletions

diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt
index 961fea7fb..88bbcb36f 100644
--- a/npc/cities/umbala.txt
+++ b/npc/cities/umbala.txt
@@ -22,11 +22,11 @@
 //= 2.1 Updated to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================
 
-comodo,170,137,7	script	La Ed#um	84,{
+comodo,170,137,7	script	La Ed#um	4_M_02,{
 	end;
 }
 
-comodo,171,137,1	script	Haith#um	92,{
+comodo,171,137,1	script	Haith#um	4_F_03,{
 	mes "[La Ed]";
 	mes "There MUST be a treasure hidden in that place!";
 	next;
@@ -136,7 +136,7 @@ comodo,171,137,1	script	Haith#um	92,{
 	close;
 }
 
-cmd_in01,175,120,3	script	Iriya#um	69,{
+cmd_in01,175,120,3	script	Iriya#um	1_F_04,{
 	mes "[Iriya]";
 	mes "Mr. Niels is at the table in the";
 	mes "corner. He has many interesting";
@@ -156,7 +156,7 @@ cmd_in01,175,120,3	script	Iriya#um	69,{
 	close;
 }
 
-cmd_in01,164,115,1	script	Niels#um	731,{
+cmd_in01,164,115,1	script	Niels#um	4_M_JOB_BLACKSMITH,{
 	mes "[Niels]";
 	mes "Hmm? What's that look for?";
 	mes "Ah~ You must of heard the rumors";
@@ -236,7 +236,7 @@ cmd_in01,164,115,1	script	Niels#um	731,{
 	close;
 }
 
-umbala,70,106,3	script	Utan Kid#um	781,{
+umbala,70,106,3	script	Utan Kid#um	4_F_UMGIRL,{
 	if (event_umbala >= 3) {
 		mes "[???]";
 		mes "Huh?";
@@ -361,7 +361,7 @@ umbala,70,106,3	script	Utan Kid#um	781,{
 	close;
 }
 
-umbala,59,243,5	script	Utan Kid#1	787,{
+umbala,59,243,5	script	Utan Kid#1	4_M_UMKID,{
 	if (event_umbala >= 3) {
 		mes "[Kotan]";
 		mes "............";
@@ -437,7 +437,7 @@ umbala,59,243,5	script	Utan Kid#1	787,{
 	}
 }
 
-umbala,177,153,3	script	Pasto#um	97,{
+umbala,177,153,3	script	Pasto#um	4W_M_01,{
 	mes "[Pasto]";
 	emotion e_gasp;
 	mes "Oh my god~! Finally,";
@@ -488,7 +488,7 @@ umbala,177,153,3	script	Pasto#um	97,{
 	close;
 }
 
-umbala,80,146,4	script	Yuwooki#um	753,{
+umbala,80,146,4	script	Yuwooki#um	4_M_MONK,{
 	mes "[Yuwooki]";
 	mes "Umbah umbah woogawoo...";
 	mes "oops, sorry! I'm so used";
@@ -542,7 +542,7 @@ umbala,80,146,4	script	Yuwooki#um	753,{
 	close;
 }
 
-umbala,140,157,6	script	Utan Man#1	785,{
+umbala,140,157,6	script	Utan Man#1	4_M_UMDANCEKID2,{
 	if (event_umbala >= 3) {
 		mes "[Jertan]";
 		mes "Bungee jumping can be dangerous,";
@@ -562,7 +562,7 @@ umbala,140,157,6	script	Utan Man#1	785,{
 	}
 }
 
-umbala,146,157,4	script	Utan Man#2	786,{
+umbala,146,157,4	script	Utan Man#2	4_M_UMDANCEKID,{
 	if (event_umbala >= 3) {
 		mes "[Arotan]";
 		mes "Completing the bungee jump";
@@ -580,7 +580,7 @@ umbala,146,157,4	script	Utan Man#2	786,{
 	}
 }
 
-umbala,149,165,4	script	Utan Kid#3	781,{
+umbala,149,165,4	script	Utan Kid#3	4_F_UMGIRL,{
 	if (event_umbala >= 3) {
 		mes "[Klumatan]";
 		mes "It's really scary, falling from";
@@ -606,7 +606,7 @@ umbala,149,165,4	script	Utan Kid#3	781,{
 	}
 }
 
-umbala,92,159,4	script	Bertan#um	785,{
+umbala,92,159,4	script	Bertan#um	4_M_UMDANCEKID2,{
 	if (event_umbala >= 3) {
 		mes "[Bertan]";
 		mes "What up, loser!";
@@ -802,7 +802,7 @@ umbala,92,159,4	script	Bertan#um	785,{
 	close;
 }
 
-umbala,194,104,4	script	Utan Kid#2	787,{
+umbala,194,104,4	script	Utan Kid#2	4_M_UMKID,{
 	if (event_umbala >= 3) {
 		mes "[Boorkatan]";
 		mes "Huh? You're from Rune-Midgard,";
@@ -845,7 +845,7 @@ umbala,194,104,4	script	Utan Kid#2	787,{
 	}
 }
 
-umbala,193,208,6	script	Utan Man#3	789,{
+umbala,193,208,6	script	Utan Man#3	4_M_UMSOLDIER,{
 	if (event_umbala >= 3) {
 		mes "[Weitan]";
 		mes "I too did the bungee jump when I";
@@ -873,7 +873,7 @@ umbala,193,208,6	script	Utan Man#3	789,{
 	}
 }
 
-umbala,139,205,4	script	Utan Man#5	785,{
+umbala,139,205,4	script	Utan Man#5	4_M_UMDANCEKID2,{
 	if (event_umbala >= 3) {
 		mes "[Jooltan]";
 		mes "It's been a long time since I last";
@@ -928,7 +928,7 @@ umbala,139,205,4	script	Utan Man#5	785,{
 	}
 }
 
-um_in,158,71,3	script	Utan villager#um	787,{
+um_in,158,71,3	script	Utan villager#um	4_M_UMKID,{
 	if (event_umbala >= 3) {
 		mes "[Mutakutan]";
 		mes "Umbala has many many trees!";