From 124ab2a1cdb344f24170a4d91f7000ebabf39b40 Mon Sep 17 00:00:00 2001
From: Kisuka <kisuka@kisuka.com>
Date: Mon, 28 Oct 2013 00:42:23 -0700
Subject: Added ability to use constants instead of sprite IDs for NPCs.
 Converted all npcs to use this.

---
 npc/merchants/inn.txt | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'npc/merchants/inn.txt')

diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index 3c5c1874b..0c23555d2 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -48,34 +48,34 @@
 
 //========================Prontera ===================================
 // West Side Inn -------------------
-prt_in,244,135,2	script	Inn Employee#Sammy	53,{
+prt_in,244,135,2	script	Inn Employee#Sammy	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Sammy]","Nenkaras","prt_in",238,130;
 	warp "prt_in",247,104; end;
 }
 // East Side Inn ------------------
-prt_in,61,141,2	script	Inn Employee#Ahlma	53,{
+prt_in,61,141,2	script	Inn Employee#Ahlma	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Ahlma]","Nenkaras","prt_in",64,136;
 	warp "prt_in",60,166; end;
 }
 
 //========================Alberta ====================================
-alberta_in,32,142,3	script	Inn Employee#Jennie	53,{
+alberta_in,32,142,3	script	Inn Employee#Jennie	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Jennie]","'Fisherman Inn'!","alberta_in",26,142;
 	warp "alberta_in",18,188; end;
 }
 
 //======================Geffen ======================================
-geffen_in,70,64,5	script	Inn Employee#Cena	53,{
+geffen_in,70,64,5	script	Inn Employee#Cena	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Cena]","'Ifrit,' the only Inn in the city of Geffen.","geffen_in",70,59;
 	warp "geffen_in",31,31; end;
 }
 
 //=======================Payon ======================================
-payon_in01,132,62,5	script	Inn Employee#Ahee	53,{
+payon_in01,132,62,5	script	Inn Employee#Ahee	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Ahee]","Payon Inn","payon_in01",136,61;
 	warp "payon_in01",132,11; end;
@@ -84,13 +84,13 @@ payon_in01,132,62,5	script	Inn Employee#Ahee	53,{
 //========================Morocc ====================================
 // North East --------------------------
 /*
-morocc_in,147,141,3	script	Inn Employee#Hasna	53,{
+morocc_in,147,141,3	script	Inn Employee#Hasna	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Hasna]","Morroc Inn","morocc_in",142,140;
 	warp "morocc_in",173,135; end;
 }
 // South --------------------------------
-morocc_in,80,100,5	script	Inn Employee#Manar	53,{
+morocc_in,80,100,5	script	Inn Employee#Manar	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Employee Manar]","Morroc Inn","morocc_in",78,95;
 	warp "morocc_in",79,123; end;
@@ -98,21 +98,21 @@ morocc_in,80,100,5	script	Inn Employee#Manar	53,{
 */
 
 //======================Aldebaran ===================================
-aldeba_in,92,58,5	script	Inn Maid#Rilim	53,{
+aldeba_in,92,58,5	script	Inn Maid#Rilim	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Rilim]","Al De Baran Inn","aldeba_in",92,50;
 	warp "aldeba_in",92,112; end;
 }
 
 //========================Rachel ====================================
-ra_in01,376,69,4	script	Inn Keeper#Annie	931,{
+ra_in01,376,69,4	script	Inn Keeper#Annie	4_M_RACHMAN1,{
 
 	callfunc "F_InnMaid","[Annie]","Rachel Inn","ra_in01",375,58;
 	warp "ra_in01",384,128; end;
 }
 
 //======================Lighthalzen =================================
-lhz_in02,230,284,4	script	Hotel Employee#01	86,{
+lhz_in02,230,284,4	script	Hotel Employee#01	4_M_04,{
 	mes "[Hotel Employee]";
 	mes "Welcome to";
 	mes "the Royal Dragon,";
@@ -157,14 +157,14 @@ lhz_in02,230,284,4	script	Hotel Employee#01	86,{
 }
 
 //========================Hugel ====================================
-hu_in01,246,107,3	script	Inn Maid#Receptionist	53,{
+hu_in01,246,107,3	script	Inn Maid#Receptionist	1_M_INNKEEPER,{
 
 	callfunc "F_InnMaid","[Receptionist]","Hugel Inn","hu_in01",263,95;
 	warp "hu_in01",267,5; end;
 }
 
 //========================Veins ====================================
-ve_in,157,219,5	script	Inn Master#Receptionist	709,{
+ve_in,157,219,5	script	Inn Master#Receptionist	4_M_SEAMAN,{
 	mes "[Inn Master]";
 	mes "Good day~";
 	mes "Welcome to the";
-- 
cgit v1.2.3-60-g2f50