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

1 files changed, 32 insertions, 32 deletions

diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt
index ba2196aa9..ddc261e4f 100644
--- a/npc/re/cities/malaya.txt
+++ b/npc/re/cities/malaya.txt
@@ -17,7 +17,7 @@
 // Port Malaya Transportation
 //============================================================
 // Old coordinates: alberta (237,71)
-alberta,196,202,3	script	Optamara Crew#alberta	100,{
+alberta,196,202,3	script	Optamara Crew#alberta	4W_SAILOR,{
 	mes "[Optamara Crew]";
 	mes "Hey, there!";
 	mes "It's 10,000 Zeny to go to Port Malaya. Interested?";
@@ -60,7 +60,7 @@ alberta,196,202,3	script	Optamara Crew#alberta	100,{
 	}
 }
 
-malaya,276,55,4	script	Optamara Crew#malaya	100,{
+malaya,276,55,4	script	Optamara Crew#malaya	4W_SAILOR,{
 	if (malaya_hi < 10) {
 		mes "[Optamara Crew]";
 		mes "I think the village is still busy. Done with your visit? There is always a ship heading for Alberta.";
@@ -90,7 +90,7 @@ malaya,276,55,4	script	Optamara Crew#malaya	100,{
 
 // Generic Port Malaya NPCs
 //============================================================
-ma_in01,30,94,4	script	Inn Keeper#ma	583,{
+ma_in01,30,94,4	script	Inn Keeper#ma	4_F_MALAYA,{
 	if (malaya_hi < 10) {
 		mes "[Inn Keeper]";
 		mes "Oh my! Visiting?";
@@ -187,9 +187,9 @@ OnTouch:
 	mes "The unidentified creature looks at you and runs away.";
 	close;
 }
-ma_fild01,74,367,6	duplicate(Unidentified Creature#i)	Unidentified Creature#01	572,2,2
-ma_fild02,282,41,4	duplicate(Unidentified Creature#i)	Unidentified Creature#05	572,2,2
-ma_scene01,195,92,4	duplicate(Unidentified Creature#i)	Unidentified Creature#09	572,2,2
+ma_fild01,74,367,6	duplicate(Unidentified Creature#i)	Unidentified Creature#01	4_MAL_BUDIDAI,2,2
+ma_fild02,282,41,4	duplicate(Unidentified Creature#i)	Unidentified Creature#05	4_MAL_BUDIDAI,2,2
+ma_scene01,195,92,4	duplicate(Unidentified Creature#i)	Unidentified Creature#09	4_MAL_BUDIDAI,2,2
 
 -	script	Unidentified Creature#j	-1,{
 	end;
@@ -260,16 +260,16 @@ OnTouch:
 	mes "The unidentified creature looks at you and runs away.";
 	close;
 }
-ma_fild01,109,116,4	duplicate(Unidentified Creature#j)	Unidentified Creature#02	572,2,2
-ma_fild01,280,150,6	duplicate(Unidentified Creature#j)	Unidentified Creature#03	572,2,2
-ma_fild01,309,221,6	duplicate(Unidentified Creature#j)	Unidentified Creature#04	572,2,2
-ma_fild02,246,324,4	duplicate(Unidentified Creature#j)	Unidentified Creature#06	572,2,2
-ma_fild02,71,296,6	duplicate(Unidentified Creature#j)	Unidentified Creature#07	572,2,2
-ma_fild02,32,263,4	duplicate(Unidentified Creature#j)	Unidentified Creature#08	572,2,2
-ma_scene01,158,139,4	duplicate(Unidentified Creature#j)	Unidentified Creature#10	572,2,2
-ma_scene01,167,112,6	duplicate(Unidentified Creature#j)	Unidentified Creature#11	572,2,2
-
-malaya,227,311,4	script	Grandma#ma01	575,{
+ma_fild01,109,116,4	duplicate(Unidentified Creature#j)	Unidentified Creature#02	4_MAL_BUDIDAI,2,2
+ma_fild01,280,150,6	duplicate(Unidentified Creature#j)	Unidentified Creature#03	4_MAL_BUDIDAI,2,2
+ma_fild01,309,221,6	duplicate(Unidentified Creature#j)	Unidentified Creature#04	4_MAL_BUDIDAI,2,2
+ma_fild02,246,324,4	duplicate(Unidentified Creature#j)	Unidentified Creature#06	4_MAL_BUDIDAI,2,2
+ma_fild02,71,296,6	duplicate(Unidentified Creature#j)	Unidentified Creature#07	4_MAL_BUDIDAI,2,2
+ma_fild02,32,263,4	duplicate(Unidentified Creature#j)	Unidentified Creature#08	4_MAL_BUDIDAI,2,2
+ma_scene01,158,139,4	duplicate(Unidentified Creature#j)	Unidentified Creature#10	4_MAL_BUDIDAI,2,2
+ma_scene01,167,112,6	duplicate(Unidentified Creature#j)	Unidentified Creature#11	4_MAL_BUDIDAI,2,2
+
+malaya,227,311,4	script	Grandma#ma01	4_F_BARYO_OLD,{
 	if (malaya_hi < 10) {
 		mes "[Grandma]";
 		mes "You're not from around here? Take care of yourself.";
@@ -321,7 +321,7 @@ malaya,227,311,4	script	Grandma#ma01	575,{
 	close;
 }
 
-malaya,189,263,4	script	Drumming Young Man#ma02	578,{
+malaya,189,263,4	script	Drumming Young Man#ma02	4_M_BARYO_MAN,{
 	if (malaya_hi < 10) {
 		emotion e_omg;
 		mes "[Drumming Young Man]";
@@ -374,7 +374,7 @@ malaya,189,263,4	script	Drumming Young Man#ma02	578,{
 	close;
 }
 
-malaya,270,59,4	script	Port Guard#ma03	570,{
+malaya,270,59,4	script	Port Guard#ma03	4_MAL_SOLDIER,{
 	if (malaya_hi < 10) {
 		emotion e_swt2;
 		mes "[Port Guard]";
@@ -427,7 +427,7 @@ malaya,270,59,4	script	Port Guard#ma03	570,{
 	}
 }
 
-malaya,88,252,4	script	Little Girl#ma04	576,{
+malaya,88,252,4	script	Little Girl#ma04	4_F_BARYO_GIRL,{
 	if (malaya_hi < 10) {
 		mes "[Little Girl]";
 		mes "I'm scared but I have to visit the fairy in the forest.";
@@ -459,7 +459,7 @@ malaya,88,252,4	script	Little Girl#ma04	576,{
 	close;
 }
 
-malaya,219,92,6	script	Little Kid#ma05	577,{
+malaya,219,92,6	script	Little Kid#ma05	4_M_BARYO_BOY,{
 	if (malaya_hi < 10) {
 		mes "[Little Kid]";
 		mes "My mom told me not to play outside because its dangerous. Why?";
@@ -497,7 +497,7 @@ malaya,219,92,6	script	Little Kid#ma05	577,{
 	close;
 }
 
-malaya,363,283,4	script	Local#ma06	582,{
+malaya,363,283,4	script	Local#ma06	4_M_MALAYA,{
 	if (malaya_hi < 10) {
 		mes "[Local]";
 		mes "Hmm... is it time to be careful of the witches' curse?";
@@ -560,7 +560,7 @@ malaya,363,283,4	script	Local#ma06	582,{
 	close;
 }
 
-malaya,41,127,6	script	Old Man #ma07	574,{
+malaya,41,127,6	script	Old Man #ma07	4_M_BARYO_OLD,{
 	if (malaya_hi < 10) {
 		mes "[Old Man]";
 		mes "Foreigners are not welcomed that much when our village is chaotic like these days.";
@@ -600,7 +600,7 @@ malaya,41,127,6	script	Old Man #ma07	574,{
 	close;
 }
 
-malaya,63,185,4	script	Woman#ma08	583,{
+malaya,63,185,4	script	Woman#ma08	4_F_MALAYA,{
 	if (malaya_hi < 10) {
 		mes "[Woman]";
 		mes "I don't have anything to share with you.";
@@ -772,7 +772,7 @@ function	script	F_Malaya_Jeepney	{
 	close;
 }
 
-malaya,237,240,4	script	Jeepney Driver#01	582,{
+malaya,237,240,4	script	Jeepney Driver#01	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif01",
@@ -792,7 +792,7 @@ malaya,237,240,4	script	Jeepney Driver#01	582,{
 	);
 }
 
-malaya,67,44,4	script	Jeepney Driver#02	582,{
+malaya,67,44,4	script	Jeepney Driver#02	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif02",
@@ -810,7 +810,7 @@ malaya,67,44,4	script	Jeepney Driver#02	582,{
 	);
 }
 
-malaya,282,129,4	script	Jeepney Driver#03	582,{
+malaya,282,129,4	script	Jeepney Driver#03	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif03",
@@ -828,7 +828,7 @@ malaya,282,129,4	script	Jeepney Driver#03	582,{
 	);
 }
 
-malaya,134,250,6	script	Jeepney Driver#04	582,{
+malaya,134,250,6	script	Jeepney Driver#04	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif04",
@@ -846,7 +846,7 @@ malaya,134,250,6	script	Jeepney Driver#04	582,{
 	);
 }
 
-malaya,341,153,4	script	Jeepney Driver#05	582,{
+malaya,341,153,4	script	Jeepney Driver#05	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif05",
@@ -864,7 +864,7 @@ malaya,341,153,4	script	Jeepney Driver#05	582,{
 	);
 }
 
-malaya,293,290,6	script	Jeepney Driver#06	582,{
+malaya,293,290,6	script	Jeepney Driver#06	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif06",
@@ -882,7 +882,7 @@ malaya,293,290,6	script	Jeepney Driver#06	582,{
 	);
 }
 
-malaya,242,221,4	script	Jeepney Driver#07	582,{
+malaya,242,221,4	script	Jeepney Driver#07	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif07",
@@ -897,7 +897,7 @@ malaya,242,221,4	script	Jeepney Driver#07	582,{
 	);
 }
 
-malaya,62,245,6	script	Jeepney Driver#08	582,{
+malaya,62,245,6	script	Jeepney Driver#08	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif08",
@@ -913,7 +913,7 @@ malaya,62,245,6	script	Jeepney Driver#08	582,{
 	);
 }
 
-malaya,257,58,6	script	Jeepney Driver#09	582,{
+malaya,257,58,6	script	Jeepney Driver#09	4_M_MALAYA,{
 	callfunc(
 		"F_Malaya_Jeepney",
 		"ma_zif09",