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

1 files changed, 22 insertions, 22 deletions

diff --git a/npc/quests/quests_comodo.txt b/npc/quests/quests_comodo.txt
index 5fa68c77e..6faf8f84f 100644
--- a/npc/quests/quests_comodo.txt
+++ b/npc/quests/quests_comodo.txt
@@ -31,7 +31,7 @@
 // Headgear Quests 1
 // Cross Hat, Bulb Hairband, Striped Hairband, Blue Hairband
 //============================================================
-comodo,228,159,3	script	Hair Ornament Girl	700,{
+comodo,228,159,3	script	Hair Ornament Girl	8_F_GIRL,{
 	mes "[Hair Ornament Girl]";
 	if (Sex == 1) {
 		mes "Oh, hello!";
@@ -228,7 +228,7 @@ comodo,228,159,3	script	Hair Ornament Girl	700,{
 // Headgear Quests 2
 // 'Mine Helmet', 'Parcel Hat', 'Money Loser's Grief', 'Phantom of the Opera Mask'
 //============================================================
-comodo,273,137,4	script	Traveler#head	702,{
+comodo,273,137,4	script	Traveler#head	4_F_GON,{
 	mes "[Isac Mari]";
 	mes "I travel around the world, and collect many interesting stories from people. Sometimes they teach me how to make special items.";
 	next;
@@ -471,7 +471,7 @@ comodo,273,137,4	script	Traveler#head	702,{
 
 // Doomed Swords - Comodo Portion. (Continued in Juno)
 //============================================================
-comodo,206,310,4	script	Campground Boy#cmd	704,{
+comodo,206,310,4	script	Campground Boy#cmd	4_M_BIBI,{
 	switch (dmdswrd_Q) {
 	case 0:
 		mes "[Rochito]";
@@ -631,7 +631,7 @@ comodo,206,310,4	script	Campground Boy#cmd	704,{
 	close;
 }
 
-comodo,204,310,4	script	Camping Youth#cmd	65,{
+comodo,204,310,4	script	Camping Youth#cmd	1_M_YOUNGKNIGHT,{
 	switch (dmdswrd_Q) {
 	case 0:
 	case 1:
@@ -736,7 +736,7 @@ comodo,204,310,4	script	Camping Youth#cmd	65,{
 	close;
 }
 
-comodo,209,305,4	script	Camping Maiden#cmd	71,{
+comodo,209,305,4	script	Camping Maiden#cmd	1_F_LIBRARYGIRL,{
 	mes "[Emralhandas]";
 	mes "Rockha, let me pour";
 	mes "you another drink. We";
@@ -804,7 +804,7 @@ comodo,209,305,4	script	Camping Maiden#cmd	71,{
 	close;
 }
 
-comodo,209,314,4	script	Campground Lad#cmd	706,{
+comodo,209,314,4	script	Campground Lad#cmd	4_M_KID1,{
 	switch (dmdswrd_Q) {
 	case 0:
 	case 1:
@@ -853,7 +853,7 @@ comodo,209,314,4	script	Campground Lad#cmd	706,{
 	close;
 }
 
-comodo,221,310,4	script	BBQ Boy#cmd	86,{
+comodo,221,310,4	script	BBQ Boy#cmd	4_M_04,{
 	mes "[Rinta]";
 	mes "I didn't mean to,";
 	mes "but I accidentally";
@@ -871,7 +871,7 @@ comodo,221,310,4	script	BBQ Boy#cmd	86,{
 	close;
 }
 
-comodo,218,309,4	script	BBQ Visitor#cmd	90,{
+comodo,218,309,4	script	BBQ Visitor#cmd	4_F_01,{
 	mes "[Razy]";
 	mes "Those people over there";
 	mes "are friends of the Village";
@@ -890,7 +890,7 @@ comodo,218,309,4	script	BBQ Visitor#cmd	90,{
 	close;
 }
 
-comodo,216,310,4	script	BBQ Papa#cmd::CmdFamily	50,{
+comodo,216,310,4	script	BBQ Papa#cmd::CmdFamily	1_M_04,{
 	mes "[BBQ Boy]";
 	mes "D-daddy! Is what those";
 	mes "people talking about true?";
@@ -937,11 +937,11 @@ comodo,216,310,4	script	BBQ Papa#cmd::CmdFamily	50,{
 	close;
 }
 
-comodo,215,307,4	duplicate(CmdFamily)	BBQ Mama#cmd	74
+comodo,215,307,4	duplicate(CmdFamily)	BBQ Mama#cmd	1_F_MERCHANT_02
 
-comodo,213,310,4	duplicate(CmdFamily)	BBQ Boy#cmd2	706
+comodo,213,310,4	duplicate(CmdFamily)	BBQ Boy#cmd2	4_M_KID1
 
-cmd_in02,32,140,4	script	Chief#cmd	49,{
+cmd_in02,32,140,4	script	Chief#cmd	1_M_03,{
 	if (dmdswrd_Q > 4) {
 		mes "[Tausupa]";
 		mes "Maybe you can't tell because";
@@ -1092,7 +1092,7 @@ cmd_in02,32,140,4	script	Chief#cmd	49,{
 	close;
 }
 
-comodo,88,97,4	script	Toruna#cmd	109,{
+comodo,88,97,4	script	Toruna#cmd	4_M_MANAGER,{
 	mes "[Toruna]";
 	mes "When I think about it,";
 	mes "there are many fascinating";
@@ -1227,7 +1227,7 @@ comodo,88,97,4	script	Toruna#cmd	109,{
 	close;
 }
 
-comodo,164,291,4	script	Rakusa#cmd	73,{
+comodo,164,291,4	script	Rakusa#cmd	1_F_MERCHANT_01,{
 	switch (dmdswrd_Q) {
 	case 6:
 		mes "[Rakusa]";
@@ -1276,7 +1276,7 @@ comodo,164,291,4	script	Rakusa#cmd	73,{
 	close;
 }
 
-comodo,169,284,4	script	Kichiri#cmd	98,{
+comodo,169,284,4	script	Kichiri#cmd	4W_M_02,{
 	switch (dmdswrd_Q) {
 	case 7:
 		mes "[Kichiri]";
@@ -1324,7 +1324,7 @@ comodo,169,284,4	script	Kichiri#cmd	98,{
 	close;
 }
 
-comodo,163,280,4	script	Magatu#cmd	55,{
+comodo,163,280,4	script	Magatu#cmd	1_M_JOBTESTER,{
 	switch (dmdswrd_Q) {
 	case 8:
 		mes "[Magatu]";
@@ -1385,7 +1385,7 @@ comodo,163,280,4	script	Magatu#cmd	55,{
 	close;
 }
 
-cmd_in02,189,99,4	script	Manzi#cmd	85,{
+cmd_in02,189,99,4	script	Manzi#cmd	4_M_03,{
 	switch (dmdswrd_Q) {
 	case 9:
 		mes "["+strcharinfo(0)+"]";
@@ -1472,7 +1472,7 @@ cmd_in02,189,99,4	script	Manzi#cmd	85,{
 	close;
 }
 
-comodo,187,153,4	script	Hullaris#cmd	701,{
+comodo,187,153,4	script	Hullaris#cmd	4_F_GODEMOM,{
 	switch (dmdswrd_Q) {
 	case 10:
 		mes "[Hullaris]";
@@ -1707,7 +1707,7 @@ comodo,187,153,4	script	Hullaris#cmd	701,{
 	close;
 }
 
-beach_dun3,30,220,4	script	Nigirboran#cmd	704,{
+beach_dun3,30,220,4	script	Nigirboran#cmd	4_M_BIBI,{
 	switch (dmdswrd_Q) {
 	case 11:
 		mes "[Nigirboran]";
@@ -1939,7 +1939,7 @@ beach_dun3,30,220,4	script	Nigirboran#cmd	704,{
 	close;
 }
 
-aldebaran,44,53,4	script	Meteurengut#cmd	64,{
+aldebaran,44,53,4	script	Meteurengut#cmd	1_M_WIZARD,{
 	switch (dmdswrd_Q) {
 	case 14:
 		mes "[Meteurengut]";
@@ -2161,7 +2161,7 @@ aldebaran,44,53,4	script	Meteurengut#cmd	64,{
 	close;
 }
 
-morocc,201,30,4	script	Zaka#cmd	99,{
+morocc,201,30,4	script	Zaka#cmd	4W_M_03,{
 	switch (dmdswrd_Q) {
 	case 17:
 		mes "[Zaka]";
@@ -2375,7 +2375,7 @@ morocc,201,30,4	script	Zaka#cmd	99,{
 	close;
 }
 
-comodo,232,87,4	script	Won#cmd	106,{
+comodo,232,87,4	script	Won#cmd	1_M_MOC_LORD,{
 	switch (dmdswrd_Q) {
 	case 22:
 		mes "[Won]";