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

1 files changed, 29 insertions, 29 deletions

diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index 921d00123..53a11d0b8 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -18,7 +18,7 @@
 
 // Momotaro Event :: japan_momo_q
 //============================================================
-amatsu,223,236,3	script	Publisher#ama	763,{
+amatsu,223,236,3	script	Publisher#ama	4_M_JPN,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a moment!! -";
 		mes "- Currently you are carrying -";
@@ -210,7 +210,7 @@ amatsu,223,236,3	script	Publisher#ama	763,{
 	}
 }
 
-ama_test,52,44,3	script	Assistant#ama	109,{
+ama_test,52,44,3	script	Assistant#ama	4_M_MANAGER,{
 	if (event_momo == 0) {
 		mes "[Satoshi]";
 		mes "Welcome to <Momotaro Field Trip>";
@@ -401,7 +401,7 @@ OnTouch:
 	close;
 }
 
-ama_test,49,93,4	script	Grandpa#ama	766,{
+ama_test,49,93,4	script	Grandpa#ama	4_M_JPNOJI,{
 	end;
 
 OnInit:
@@ -409,7 +409,7 @@ OnInit:
 	end;
 }
 
-ama_test,50,93,4	script	Grandma#ama1	761,10,10,{
+ama_test,50,93,4	script	Grandma#ama1	4_F_JPNOBA,10,10,{
 	end;
 
 OnInit:
@@ -562,7 +562,7 @@ OnMyMobDead:
 	end;
 }
 
-ama_test,50,100,3	script	Coach#ama	762,15,15,{
+ama_test,50,100,3	script	Coach#ama	4_M_JPN2,15,15,{
 	mes "[Coach]";
 	mes "Hoho~ Good.";
 	mes "I've been watching you in the VIP room. You were really something.";
@@ -704,7 +704,7 @@ OnMyMobDead:
 	end;
 }
 
-ama_test,50,100,3	script	Coach#after	762,5,5,{
+ama_test,50,100,3	script	Coach#after	4_M_JPN2,5,5,{
 	end;
 
 OnInit:
@@ -789,7 +789,7 @@ OnTouch:
 
 // Sushi Quest :: japan_sushi
 //============================================================
-ama_in01,162,17,1	script	Sushi Master#ama	765,{
+ama_in01,162,17,1	script	Sushi Master#ama	4_M_JPNOJI2,{
 	if (MaxWeight - Weight < 5000) {
 		mes "[Magumagu]";
 		mes "Hey. You look really heavy.";
@@ -1305,7 +1305,7 @@ ama_in01,162,17,1	script	Sushi Master#ama	765,{
 
 // Dungeon Quest :: japan_mono
 //============================================================
-amatsu,112,164,4	script	Gate Soldier#ama1	767,{
+amatsu,112,164,4	script	Gate Soldier#ama1	8_M_JPNSOLDIER,{
 	mes "[Gate Soldier]";
 	mes "This is the great palace,";
 	mes "Toukoujyo.";
@@ -1321,7 +1321,7 @@ amatsu,112,164,4	script	Gate Soldier#ama1	767,{
 	close;
 }
 	
-amatsu,119,164,4	script	Gate Soldier#ama2	767,{
+amatsu,119,164,4	script	Gate Soldier#ama2	8_M_JPNSOLDIER,{
 	mes "[Gate Soldier]";
 	mes "Are you from Rune-Midgard?";
 	mes "Welcome to Amatsu.";
@@ -1336,7 +1336,7 @@ amatsu,119,164,4	script	Gate Soldier#ama2	767,{
 	close;
 }
 	
-ama_in02,207,40,6	script	Gate Soldier#ama3	767,{
+ama_in02,207,40,6	script	Gate Soldier#ama3	8_M_JPNSOLDIER,{
 	mes "[Gate Soldier]";
 	mes "Welcome. The lord of the palace";
 	mes "has specially allowed guests";
@@ -1348,7 +1348,7 @@ ama_in02,207,40,6	script	Gate Soldier#ama3	767,{
 	close;
 }
 	
-ama_in02,207,49,6	script	Gate Soldier#ama4	767,{
+ama_in02,207,49,6	script	Gate Soldier#ama4	8_M_JPNSOLDIER,{
 	mes "[Gate Soldier]";
 	mes "The lord is really nice guy.";
 	mes "Who would know that our town was";
@@ -1363,7 +1363,7 @@ ama_in02,207,49,6	script	Gate Soldier#ama4	767,{
 	close;
 }
 	
-amatsu,164,174,4	script	Gate Soldier#ama5	767,{
+amatsu,164,174,4	script	Gate Soldier#ama5	8_M_JPNSOLDIER,{
 	mes "[Gate Soldier]";
 	if (event_amatsu == 0) {
 		mes "You can't enter here.";
@@ -1401,7 +1401,7 @@ amatsu,164,174,4	script	Gate Soldier#ama5	767,{
 	close;
 }
 	
-amatsu,171,174,4	script	Gate Soldier#ama6	767,{
+amatsu,171,174,4	script	Gate Soldier#ama6	8_M_JPNSOLDIER,{
 	mes "[Gate Soldier]";
 	if (event_amatsu == 0) {
 		mes "You can't enter here.";
@@ -1441,7 +1441,7 @@ amatsu,171,174,4	script	Gate Soldier#ama6	767,{
 	close;
 }
 	
-ama_in02,187,57,2	script	Soldier#ama1	767,{
+ama_in02,187,57,2	script	Soldier#ama1	8_M_JPNSOLDIER,{
 	mes "[Ichiro]";
 	mes "Welcome.";
 	mes "Our lord prepared guest rooms";
@@ -1454,7 +1454,7 @@ ama_in02,187,57,2	script	Soldier#ama1	767,{
 	close;
 }
 	
-ama_in02,170,62,4	script	Soldier#ama2	767,{
+ama_in02,170,62,4	script	Soldier#ama2	8_M_JPNSOLDIER,{
 	mes "[Jiro]";
 	mes "I'm Jiro, the administrator";
 	mes "of this Palace. What can I do for you?";
@@ -1505,7 +1505,7 @@ ama_in02,170,62,4	script	Soldier#ama2	767,{
 	}
 }
 	
-ama_in02,37,157,4	script	Soldier#ama3	767,{
+ama_in02,37,157,4	script	Soldier#ama3	8_M_JPNSOLDIER,{
 	mes "[Saburo]";
 	mes "This is the training ground for improving our battle skills.";
 	mes "Please look around...";
@@ -1531,7 +1531,7 @@ ama_in02,37,157,4	script	Soldier#ama3	767,{
 	close;
 }
 	
-ama_in02,32,51,6	script	Soldier#ama4	767,{
+ama_in02,32,51,6	script	Soldier#ama4	8_M_JPNSOLDIER,{
 	mes "[Shiro]";
 	mes "*Cough, Cough* What...";
 	mes "Don't talk to me...";
@@ -1550,7 +1550,7 @@ ama_in02,32,51,6	script	Soldier#ama4	767,{
 	close;
 }
 	
-ama_in02,40,167,3	script	Soldier#ama5	767,{
+ama_in02,40,167,3	script	Soldier#ama5	8_M_JPNSOLDIER,{
 	mes "[Goro]";
 	mes "*Psst*... Please, be quiet.";
 	mes "I will tell you a story, okay?";
@@ -1578,7 +1578,7 @@ ama_in02,40,167,3	script	Soldier#ama5	767,{
 	close;
 }
 	
-ama_in02,32,167,5	script	Soldier#ama6	767,{
+ama_in02,32,167,5	script	Soldier#ama6	8_M_JPNSOLDIER,{
 	mes "[Rokuro]";
 	mes "He always talks nonsense.";
 	mes "He says that our lord";
@@ -1600,7 +1600,7 @@ ama_in02,32,167,5	script	Soldier#ama6	767,{
 	close;
 }
 	
-ama_in02,42,34,2	script	Soldier#ama7	767,{
+ama_in02,42,34,2	script	Soldier#ama7	8_M_JPNSOLDIER,{
 	mes "[Shichiro]";
 	mes "Have a good time.";
 	mes "My lord prepared some";
@@ -1616,7 +1616,7 @@ ama_in02,42,34,2	script	Soldier#ama7	767,{
 	close;
 }
 	
-ama_in02,203,156,4	script	Soldier#ama8	767,{
+ama_in02,203,156,4	script	Soldier#ama8	8_M_JPNSOLDIER,{
 	mes "[Hachiro]";
 	mes "My lord is inside.";
 	mes "If you'd like to greet him, feel free to enter.";
@@ -1630,7 +1630,7 @@ ama_in02,203,156,4	script	Soldier#ama8	767,{
 	close;
 }
 	
-ama_in02,195,156,4	script	Soldier#ama9	767,{
+ama_in02,195,156,4	script	Soldier#ama9	8_M_JPNSOLDIER,{
 	mes "[Kyuro]";
 	mes "This is not good.";
 	mes "My lord is really kind, but";
@@ -1645,7 +1645,7 @@ ama_in02,195,156,4	script	Soldier#ama9	767,{
 	close;
 }
 	
-ama_in02,115,177,7	script	Soldier#ama10	767,{
+ama_in02,115,177,7	script	Soldier#ama10	8_M_JPNSOLDIER,{
 	mes "[Jyuro]";
 	mes "What are you doing in here?";
 	mes "There is nothing interesting here.";
@@ -1737,7 +1737,7 @@ ama_in02,115,177,7	script	Soldier#ama10	767,{
 	close;
 }
 	
-ama_dun01,229,7,0	script	Soldier#ama11	767,{
+ama_dun01,229,7,0	script	Soldier#ama11	8_M_JPNSOLDIER,{
 	mes "[Jyuro]";
 	mes "Do you want to go back?";
 	next;
@@ -1753,7 +1753,7 @@ ama_dun01,229,7,0	script	Soldier#ama11	767,{
 	close;
 }
 	
-ama_in02,200,176,4	script	Lord of Palace#ama	768,{
+ama_in02,200,176,4	script	Lord of Palace#ama	8_M_JPNMASTER,{
 	if (event_amatsu == 0) {
 		mes "[Ishida Yoshinaga]";
 		mes "What! A foreigner...? *Phew*";
@@ -1908,7 +1908,7 @@ ama_in02,200,176,4	script	Lord of Palace#ama	768,{
 	close;
 }
 	
-ama_in01,22,111,0	script	Grandma#ama2	761,{
+ama_in01,22,111,0	script	Grandma#ama2	4_F_JPNOBA,{
 	if (event_amatsu == 4) {
 		mes "[....]";
 		mes "^FF6060Yelp, Yelp, a foolish human";
@@ -2052,7 +2052,7 @@ ama_in01,22,111,0	script	Grandma#ama2	761,{
 	end;
 }
 	
-amatsu,189,166,5	script	Kouji#ama	764,{
+amatsu,189,166,5	script	Kouji#ama	4_M_JPNCHIBI,{
 	mes "[Kouji]";
 	mes "Ralralrah Ralralrah Ralralrahralralrah~";
 	mes "Ralralrah Ralralrah Ralralrahralralrah~";
@@ -2107,7 +2107,7 @@ amatsu,189,166,5	script	Kouji#ama	764,{
 	close;
 }
 	
-ama_in01,169,173,1	script	Shaman#ama	769,{
+ama_in01,169,173,1	script	Shaman#ama	4_F_JPNMU,{
 	mes "[Tokako]";
 	mes "Er, I'm not really a shaman...";
 	mes "My friend, Takehue-kun brought";
@@ -2128,7 +2128,7 @@ ama_in01,169,173,1	script	Shaman#ama	769,{
 	close;
 }
 	
-ama_in01,180,173,3	script	Kitsune Mask#ama	762,{
+ama_in01,180,173,3	script	Kitsune Mask#ama	4_M_JPN2,{
 	if (event_amatsu == 3) {
 		mes "[Takehue]";
 		mes "Eh, you are a foreigner.";