diff --git a/doc/sample/gstorage_test.txt b/doc/sample/gstorage_test.txt
index 850ae0d9ac..4743c63079 100644
--- a/doc/sample/gstorage_test.txt
+++ b/doc/sample/gstorage_test.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Last Updated: ========================================
-//= 20140208
+//= 20180906
 //===== Description: ========================================= 
 //= Contains commands needed for a guild warehouse NPC.
 //============================================================
@@ -22,14 +22,29 @@ prontera,165,188,4	script	Guild Warehouse	112,{
 		close;
 	}
 
-	.@flag = guildopenstorage;
-	if (.@flag == 1) {
-		mes "[Guild Warehouse]";
-		mes "The guild warehouse is being used right now.";
-		mes "Please wait a while, then come back.";
-	} else if (.@flag == 2) {
-		mes "[Guild Warehouse]";
-		mes "You can't use this service if you're not in a guild!";
+	switch(guildopenstorage()){
+		case GSTORAGE_STORAGE_ALREADY_OPEN:
+			mes "[Guild Warehouse]";
+			mes "you are using your storage.";
+			mes "Please wait a while, then come back.";
+			break;
+		case GSTORAGE_ALREADY_OPEN:
+			mes "[Guild Warehouse]";
+			mes "The guild warehouse is being used right now.";
+			mes "Please wait a while, then come back.";
+			break;
+		case GSTORAGE_NO_GUILD:
+			mes "[Guild Warehouse]";
+			mes "You can't use this service if you're not in a guild!";
+			break;
+		case GSTORAGE_NO_STORAGE:
+			mes "[Guild Warehouse]";
+			mes "The guild does not have a guild storage.";
+			break;
+		case GSTORAGE_NO_PERMISSION:
+			mes "[Guild Warehouse]";
+			mes "You don't have permission to use the guild storage!";
+			break;
 	}
 	cutin "kafra_06",255;
 	close;
diff --git a/doc/sample/npc_extend_shop.txt b/doc/sample/npc_extend_shop.txt
index cc441e1c66..0c3449bd88 100644
--- a/doc/sample/npc_extend_shop.txt
+++ b/doc/sample/npc_extend_shop.txt
@@ -3,12 +3,12 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Last Updated: ========================================
-//= 20121003
+//= 20180831
 //===== Description: ========================================= 
 //= An example of shop NPCs.
 //============================================================
 
-prontera,182,213,3	shop	Super Novice Shop	716,1243:-1,2112:-1,2340:-1,2352:-1,2414:-1,2510:-1,2628:-1,5055:-1
+prontera,182,213,3	shop	Super Novice Shop	716,1243:1,2112:-1,2340:-1,2352:-1,2414:-1,2510:-1,2628:-1,5055:-1
 prontera,149,139,5	shop	Whips Merchant	58,1951:-1,1953:-1,1955:-1,1957:-1,1959:-1,1961:-1,1962:-1,1963:-1,1964:-1
 prontera,162,175,3	shop	Headgears Merchant 1	73,2209:-1,2210:-1,2211:-1,2221:-1,2223:-1,2217:-1,2227:-1,2231:-1,2225:-1,2229:-1
 prontera,162,172,3	shop	Headgears Merchant 2	73,2203:-1,2212:-1,2218:-1,2239:-1,2241:-1,2242:-1,2243:-1,2263:-1,2265:-1,2276:-1,2288:-1,2291:-1,2297:-1
@@ -18,7 +18,7 @@ prontera,162,163,3	shop	Boots Merchant	73,2402:-1,2404:-1,2406:-1,2407:-1,2412:-
 prontera,162,160,3	shop	Robes Merchant	73,2502:-1,2504:-1,2506:-1,2507:-1,2508:-1,2509:-1
 prontera,162,157,3	shop	Accessory Merchant	73,2601:-1,2602:-1,2603:-1,2604:-1,2605:-1,2607:-1,2608:-1,2615:-1,2616:-1,2618:-1,2619:-1
 prontera,162,154,3	shop	Arrows Merchant	73,1750:-1,1751:-1,1752:-1,1753:-1,1754:-1,1755:-1,1756:-1,1757:-1,1758:-1,1759:-1,1760:-1,1761:-1,1762:-1,1763:-1,1764:-1,1765:-1,1766:-1,1767:-1,1768:-1,1769:-1
-prontera,162,151,3	shop	Alchemist Shop	73.7127:-1,7128:-1,7129:-1,7130:-1,7131:-1,7132:-1,7133:-1,7144:-1,7134:-1,1093:-1
+prontera,162,151,3	shop	Alchemist Shop	73,7127:-1,7128:-1,7129:-1,7130:-1,7131:-1,7132:-1,7133:-1,7144:-1,7134:-1,1093:-1
 prontera,162,148,3	shop	Taming Merchant	73,619:-1,620:-1,621:-1,623:-1,624:-1,625:-1,626:-1,627:-1,628:-1,629:-1,630:-1,631:-1,632:-1,633:-1,634:-1,635:-1,636:-1,637:-1,638:-1,639:-1,640:-1,641:-1,642:-1,659:-1
 prontera,162,145,3	shop	Pet Equipment	73,10001:-1,10002:-1,10003:-1,10004:-1,10005:-1,10006:-1,10007:-1,10008:-1,10009:-1,10010:-1,10011:-1,10012:-1,10013:-1,10014:-1,10015:-1,10016:-1,10017:-1,10018:-1,10019:-1,10020:-1
 prontera,148,234,5	shop	Weapon Card Merchant	80,4004:100000,4018:100000,4025:100000,4026:100000,4019:100000,4029:100000,4043:100000,4017:100000,4020:100000,4024:100000,4037:100000,4055:100000,4057:100000,4076:100000,4096:100000,4104:100000,4030:100000,4049:100000,4062:100000,4069:100000,4085:100000,4007:100000,4060:100000,4063:100000,4068:100000,4080:100000,4094:100000,4111:100000,4118:100000,4082:20700,4092:100000,4126:100000,4072:100000,4115:100000,4035:100000,4086:100000,4106:100000,4117:100000,4125:100000
diff --git a/doc/sample/npc_live_dialogues.txt b/doc/sample/npc_live_dialogues.txt
index cef959d871..ab01a6f468 100644
--- a/doc/sample/npc_live_dialogues.txt
+++ b/doc/sample/npc_live_dialogues.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Lupus
 //===== Last Updated: ========================================
-//= 20140208
+//= 20180906
 //===== Description: ========================================= 
 //= An example of an NPC with live dialogue.
 //= Note: This relies on Global_Functions.txt to run.
@@ -17,7 +17,7 @@ prontera,167,177,5	script	Luppy	1107,{
 
 	// Say a compliment according to player's gender
 	// 1st string is for FEMALE, 2nd for MALE
-	mes callfunc("F_Sex","What a beautiful lady!","What a handsome man!");
+	mes callfunc("F_SexMes","What a beautiful lady!","What a handsome man!");
 
 	// Add some random greeting and goodbye into the menu
 	if (select(callfunc("F_Hi"), callfunc("F_Bye")) != 1) {
@@ -31,7 +31,7 @@ prontera,167,177,5	script	Luppy	1107,{
 	// Give a random prize from set list of items
 	if (@gotstuff){
 		// Again, say stuff according to player's gender
-		mes "I like "+callfunc("F_Sex","smiling ladies!","bloody pirates!");
+		mes "I like "+callfunc("F_SexMes","smiling ladies!","bloody pirates!");
 
 		// Show one of 3 emotion from the list (we added ,1 to show emotion over PLAYER's head)
 		emotion callfunc("F_Rand",ET_SCISSOR,ET_CHUP,ET_GOODBOY), playerattached();
@@ -45,7 +45,7 @@ prontera,167,177,5	script	Luppy	1107,{
 	.@itemIDfromList = callfunc("F_Rand",512,522,608,620);
 
 	// Again, say stuff according to player's gender
-	mes "Hey, "+callfunc("F_Sex","sister!","brother!")+" I have "+getitemname(.@itemIDfromList)+" for you!";
+	mes "Hey, "+callfunc("F_SexMes","sister!","brother!")+" I have "+getitemname(.@itemIDfromList)+" for you!";
 
 	// Get the item from the list
 	getitem .@itemIDfromList,1;
diff --git a/doc/sample/npc_shop_test.txt b/doc/sample/npc_shop_test.txt
index 6d2585e837..a5f5483508 100644
--- a/doc/sample/npc_shop_test.txt
+++ b/doc/sample/npc_shop_test.txt
@@ -3,38 +3,38 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Last Updated: ========================================
-//= 20090206
+//= 20180831
 //===== Description: ========================================= 
 //= An example of shop NPCs.
 //============================================================
 
 // Near fountain in Prontera
-prontera,156,192,3	shop	Card Shop1	95,4001:100,4002:100,4003:100,4004:100,4005:100,4006:100,4007:100,4008:100,4009:100,4010:100,4011:100,4012:100,4013:100,4014:100,4015:100,4016:100,4017:100,4018:100,4019:100,4020:100,4021:100,4022:100,4023:100,4024:100,4025:100,4026:100,4027:100,4028:100,4029:100,4030:100,4031:100,4032:100,4033:100,4034:100,4035:100,4036:100,4037:100,4038:100,4039:100,4040:100,4041:100,4042:100,4043:100,4044:100,4045:100,4046:100,4047:100,4048:100,4049:100,4050:100
-prontera,154,192,1	shop	Card Shop2	123,4051:100,4052:100,4053:100,4054:100,4055:100,4056:100,4057:100,4058:100,4059:100,4060:100,4061:100,4062:100,4063:100,4064:100,4065:100,4066:100,4067:100,4068:100,4069:100,4070:100,4071:100,4072:100,4073:100,4074:100,4075:100,4076:100,4077:100,4078:100,4079:100,4080:100,4081:100,4082:100,4083:100,4084:100,4085:100,4086:100,4087:100,4088:100,4089:100,4090:100,4091:100,4092:100,4093:100,4094:100,4095:100,4096:100,4097:100,4098:100,4099:100,4100:100
-prontera,158,192,1	shop	Card Shop3	67,4101:100,4102:100,4103:100,4104:100,4105:100,4106:100,4107:100,4108:100,4109:100,4110:100,4111:100,4112:100,4113:100,4114:100,4115:100,4116:100,4117:100,4118:100,4119:100,4120:100,4121:100,4122:100,4123:100,4124:100,4125:100,4126:100,4127:100,4128:100,4129:100,4130:100,4131:100,4132:100,4133:100,4134:100,4135:100,4136:100,4137:100,4138:100,4139:100,4140:100,4141:100,4142:100,4143:100,4144:100,4145:100,4146:100,4147:100,4148:100
-prontera,144,205,1	shop	Headgear Shop1	71,2201:100,2202:100,2203:100,2204:100,2205:100,2206:100,2207:100,2208:100,2209:100,2210:100,2211:100,2212:100,2213:100,2214:100,2215:100,2216:100,2217:100,2218:100,2219:100,2220:100,2221:100,2222:100,2223:100,2224:100,2225:100,2226:100,2227:100,2228:100,2229:100,2230:100,2231:100,2232:100,2233:100,2234:100,2235:100,2236:100,2237:100,2239:100,2240:100,2241:100,2242:100,2243:100,2244:100,2245:100,2246:100,2247:100,2248:100,2249:100,2250:100
-prontera,144,203,3	shop	Headgear Shop2	101,2251:100,2252:100,2253:100,2254:100,2255:100,2256:100,2257:100,2258:100,2259:100,2260:100,2261:100,2262:100,2263:100,2264:100,2265:100,2266:100,2267:100,2268:100,2269:100,2270:100,2271:100,2272:100,2273:100,2274:100,2275:100,2276:100,2277:100,2278:100,2279:100,2280:100,2281:100,2282:100,2283:100,2284:100,2285:100,2286:100,2287:100,2288:100,2289:100,2290:100,2291:100,2292:100,2293:100,2294:100,2295:100,2296:100,2297:100,2298:100,2299:100
-prontera,144,201,3	shop	Headgear Shop3	69,5001:100,5002:100,5003:100,5004:100,5005:100,5006:100,5007:100,5008:100,5009:100,5010:100,5011:100,5012:100,5013:100,5014:100,5015:100,5016:100,5017:100,5018:100,5019:100
-prontera,167,202,5	shop	Accessories Shop	102,2601:100,2602:100,2603:100,2604:100,2605:100,2607:100,2608:100,2609:100,2610:100,2611:100,2612:100,2613:100,2614:100,2615:100,2616:100,2617:100,2618:100,2619:100,2620:100,2621:100,2622:100,2623:100,2624:100,2625:100,2626:100,2627:100,2628:100
-prontera,167,204,6	shop	General Store	96,501:100,502:100,503:100,504:100,505:100,506:100,507:100,508:100,509:100,510:100,511:100,512:100,513:100,514:100,515:100,516:100,517:100,518:100,519:100,520:100,521:100,522:100,523:100,525:100,526:100,528:100,529:100,530:100,531:100,532:100,533:100,534:100,535:100,536:100,537:100,538:100,539:100,601:100,602:100,603:100,604:100,605:100,606:100,607:100,608:100,609:100,610:100
-prontera,167,206,6	shop	Blacksmith Shop	90,714:100,715:100,716:100,717:100,718:100,719:100,720:100,721:100,722:100,723:100,724:100,725:100,726:100,727:100,728:100,729:100,730:100,731:100,732:100,733:100,756:100,757:100,984:100,985:100,990:100,991:100,992:100,993:100,994:100,995:100,996:100,997:100,1010:100,1011:100,998:100,999:100,1000:100,1001:100,1002:100,1003:100,913:100,920:100,718:100,958:100,957:100,922:100,963:100,923:100,968:100,1005:100,612:100,615:100,989:100
-prontera,164,204,5	shop	Japan Store Limited	81,542:100,543:100,1766:100
+prontera,156,192,3	shop	Card Shop1	95,4001:-1,4002:-1,4003:-1,4004:-1,4005:-1,4006:-1,4007:-1,4008:-1,4009:-1,4010:-1,4011:-1,4012:-1,4013:-1,4014:-1,4015:-1,4016:-1,4017:-1,4018:-1,4019:-1,4020:-1,4021:-1,4022:-1,4023:-1,4024:-1,4025:-1,4026:-1,4027:-1,4028:-1,4029:-1,4030:-1,4031:-1,4032:-1,4033:-1,4034:-1,4035:-1,4036:-1,4037:-1,4038:-1,4039:-1,4040:-1,4041:-1,4042:-1,4043:-1,4044:-1,4045:-1,4046:-1,4047:-1,4048:-1,4049:-1,4050:-1
+prontera,154,192,1	shop	Card Shop2	123,4051:-1,4052:-1,4053:-1,4054:-1,4055:-1,4056:-1,4057:-1,4058:-1,4059:-1,4060:-1,4061:-1,4062:-1,4063:-1,4064:-1,4065:-1,4066:-1,4067:-1,4068:-1,4069:-1,4070:-1,4071:-1,4072:-1,4073:-1,4074:-1,4075:-1,4076:-1,4077:-1,4078:-1,4079:-1,4080:-1,4081:-1,4082:-1,4083:-1,4084:-1,4085:-1,4086:-1,4087:-1,4088:-1,4089:-1,4090:-1,4091:-1,4092:-1,4093:-1,4094:-1,4095:-1,4096:-1,4097:-1,4098:-1,4099:-1,4100:-1
+prontera,158,192,1	shop	Card Shop3	67,4101:-1,4102:-1,4103:-1,4104:-1,4105:-1,4106:-1,4107:-1,4108:-1,4109:-1,4110:-1,4111:-1,4112:-1,4113:-1,4114:-1,4115:-1,4116:-1,4117:-1,4118:-1,4119:-1,4120:-1,4121:-1,4122:-1,4123:-1,4124:-1,4125:-1,4126:-1,4127:-1,4128:-1,4129:-1,4130:-1,4131:-1,4132:-1,4133:-1,4134:-1,4135:-1,4136:-1,4137:-1,4138:-1,4139:-1,4140:-1,4141:-1,4142:-1,4143:-1,4144:-1,4145:-1,4146:-1,4147:-1,4148:-1
+prontera,144,205,1	shop	Headgear Shop1	71,2201:-1,2202:-1,2203:-1,2204:-1,2205:-1,2206:-1,2207:-1,2208:-1,2209:-1,2210:-1,2211:-1,2212:-1,2213:-1,2214:-1,2215:-1,2216:-1,2217:-1,2218:-1,2219:-1,2220:-1,2221:-1,2222:-1,2223:-1,2224:-1,2225:-1,2226:-1,2227:-1,2228:-1,2229:-1,2230:-1,2231:-1,2232:-1,2233:-1,2234:-1,2235:-1,2236:-1,2237:-1,2239:-1,2240:-1,2241:-1,2242:-1,2243:-1,2244:-1,2245:-1,2246:-1,2247:-1,2248:-1,2249:-1,2250:-1
+prontera,144,203,3	shop	Headgear Shop2	101,2251:-1,2252:-1,2253:-1,2254:-1,2255:-1,2256:-1,2257:-1,2258:-1,2259:-1,2260:-1,2261:-1,2262:-1,2263:-1,2264:-1,2265:-1,2266:-1,2267:-1,2268:-1,2269:-1,2270:-1,2271:-1,2272:-1,2273:-1,2274:-1,2275:-1,2276:-1,2277:-1,2278:-1,2279:-1,2280:-1,2281:-1,2282:-1,2283:-1,2284:-1,2285:-1,2286:-1,2287:-1,2288:-1,2289:-1,2290:-1,2291:-1,2292:-1,2293:-1,2294:-1,2295:-1,2296:-1,2297:-1,2298:-1,2299:-1
+prontera,144,201,3	shop	Headgear Shop3	69,5001:-1,5002:-1,5003:-1,5004:-1,5005:-1,5006:-1,5007:-1,5008:-1,5009:-1,5010:-1,5011:-1,5012:-1,5013:-1,5014:-1,5015:-1,5016:-1,5017:-1,5018:-1,5019:-1
+prontera,167,202,5	shop	Accessories Shop	102,2601:-1,2602:-1,2603:-1,2604:-1,2605:-1,2607:-1,2608:-1,2609:-1,2610:-1,2611:-1,2612:-1,2613:-1,2614:-1,2615:-1,2616:-1,2617:-1,2618:-1,2619:-1,2620:-1,2621:-1,2622:-1,2623:-1,2624:-1,2625:-1,2626:-1,2627:-1,2628:-1
+prontera,167,204,6	shop	General Store	96,501:-1,502:-1,503:-1,504:-1,505:-1,506:-1,507:-1,508:-1,509:-1,510:-1,511:-1,512:-1,513:-1,514:-1,515:-1,516:-1,517:-1,518:-1,519:-1,520:-1,521:-1,522:-1,523:-1,525:-1,526:-1,528:-1,529:-1,530:-1,531:-1,532:-1,533:-1,534:-1,535:-1,536:-1,537:-1,538:-1,539:-1,601:-1,602:-1,603:-1,604:-1,605:-1,606:-1,607:-1,608:-1,609:-1,610:-1
+prontera,167,206,6	shop	Blacksmith Shop	90,714:-1,715:-1,716:-1,717:-1,718:-1,719:-1,720:-1,721:-1,722:-1,723:-1,724:-1,725:-1,726:-1,727:-1,728:-1,729:-1,730:-1,731:-1,732:-1,733:-1,756:-1,757:-1,984:-1,985:-1,990:-1,991:-1,992:-1,993:-1,994:-1,995:-1,996:-1,997:-1,1010:-1,1011:-1,998:-1,999:-1,1000:-1,1001:-1,1002:-1,1003:-1,913:-1,920:-1,718:-1,958:-1,957:-1,922:-1,963:-1,923:-1,968:-1,1005:-1,612:-1,615:-1,989:-1
+prontera,164,204,5	shop	Japan Store Limited	81,542:-1,543:-1,1766:-1
 
 // South-central Prontera
-prontera,141,175,5	shop	Bow man		102,1705:100,1711:100,1716:100,1719:100,1720:100,1750:1,1751:1,1752:1,1753:1,1754:1,1755:1,1756:1,1766:1,1065:1
-prontera,141,173,5	shop	Sword shop	102,1117:100,1125:100,1155:100,1162:100,1130:100,1131:100,1132:100,1133:100,1134:100,1135:100,1136:100,1137:100,1138:100,1139:100,1140:100,1141:100,1161:100,1162:100,1163:100,1164:100,1165:100,1166:100,1167:100,1168:100,1169:100,1170:100
-prontera,141,171,5	shop	Spear man	102,1408:100,1461:100,1464:100,1413:100,1414:100,1415:100,1416:100,1466:100,1467:100,1468:100,1469:100,1470:100,1471:100
-prontera,141,169,5	shop	Axe man		102,1352:100,1355:100,1361:100,1363:100,1364:100,1365:100,1366:100,1367:100,1368:100,1369:100
-prontera,141,167,5	shop	Dagger man	102,1208:100,1220:100,1223:100,1224:100,1225:100,1226:100,1227:100,1228:100,1229:100,1230:100,1231:100,1232:100,1233:100,1234:100,1235:100,1236:100,1237:100
-prontera,141,165,5	shop	Mace shop	102,1505:100,1520:100,1514:100,1517:100,1522:100,1523:100,1524:100,1525:100,1526:100,1527:100,1528:100
-prontera,141,163,5	shop	Katar shop	102,1251:100,1253:100,1255:100,1256:100,1257:100,1258:100,1259:100,1260:100,1261:100
-prontera,141,161,5	shop	Rod man		102,1602:100,1608:100,1611:100,1613:100,1614:100,1615:100
-prontera,141,159,5	shop	Bookstore	102,1550:100,1551:100,1552:100,1553:100,1554:100,1555:100,1556:100,1557:100,1558:100
-prontera,141,177,5	shop	Armor shop	102,2306:100,2339:100,2311:100,2331:100,2336:100,2337:100,2326:100,2327:100,2315:100,2317:100,2102:100,2104:100,2106:100,2108:100,2402:100,2404:100,2406:100,2407:100,2408:100,2409:100,2502:100,2504:100,2506:100,2507:100,2508:100
+prontera,141,175,5	shop	Bow man		102,1705:-1,1711:-1,1716:-1,1719:-1,1720:-1,1750:1,1751:-1,1752:-1,1753:-1,1754:-1,1755:-1,1756:-1,1766:-1,1065:-1
+prontera,141,173,5	shop	Sword shop	102,1117:-1,1125:-1,1155:-1,1162:-1,1130:-1,1131:-1,1132:-1,1133:-1,1134:-1,1135:-1,1136:-1,1137:-1,1138:-1,1139:-1,1140:-1,1141:-1,1161:-1,1162:-1,1163:-1,1164:-1,1165:-1,1166:-1,1167:-1,1168:-1,1169:-1,1170:-1
+prontera,141,171,5	shop	Spear man	102,1408:-1,1461:-1,1464:-1,1413:-1,1414:-1,1415:-1,1416:-1,1466:-1,1467:-1,1468:-1,1469:-1,1470:-1,1471:-1
+prontera,141,169,5	shop	Axe man		102,1352:-1,1355:-1,1361:-1,1363:-1,1364:-1,1365:-1,1366:-1,1367:-1,1368:-1,1369:-1
+prontera,141,167,5	shop	Dagger man	102,1208:-1,1220:-1,1223:-1,1224:-1,1225:-1,1226:-1,1227:-1,1228:-1,1229:-1,1230:-1,1231:-1,1232:-1,1233:-1,1234:-1,1235:-1,1236:-1,1237:-1
+prontera,141,165,5	shop	Mace shop	102,1505:-1,1520:-1,1514:-1,1517:-1,1522:-1,1523:-1,1524:-1,1525:-1,1526:-1,1527:-1,1528:-1
+prontera,141,163,5	shop	Katar shop	102,1251:-1,1253:-1,1255:-1,1256:-1,1257:-1,1258:-1,1259:-1,1260:-1,1261:-1
+prontera,141,161,5	shop	Rod man		102,1602:-1,1608:-1,1611:-1,1613:-1,1614:-1,1615:-1
+prontera,141,159,5	shop	Bookstore	102,1550:-1,1551:-1,1552:-1,1553:-1,1554:-1,1555:-1,1556:-1,1557:-1,1558:-1
+prontera,141,177,5	shop	Armor shop	102,2306:-1,2339:-1,2311:-1,2331:-1,2336:-1,2337:-1,2326:-1,2327:-1,2315:-1,2317:-1,2102:-1,2104:-1,2106:-1,2108:-1,2402:-1,2404:-1,2406:-1,2407:-1,2408:-1,2409:-1,2502:-1,2504:-1,2506:-1,2507:-1,2508:-1
 
 // Pet Groomer Merchant
-prontera,218,211,4	shop	Pet Groomer	125,537:2500,643:3000,10013:1500,10014:2000
-izlude,164,138,4	shop	Pet Groomer	124,537:2500,643:3000,10013:1500,10014:2000
-morocc,269,167,4	shop	Pet Groomer	125,537:2500,643:3000,10013:1500,10014:2000
-geffen,193,152,4	shop	Pet Groomer	124,537:2500,643:3000,10013:1500,10014:2000
-payon,142,104,4		shop	Pet Groomer	124,537:2500,643:3000,10013:1500,10014:2000
+prontera,218,211,4	shop	Pet Groomer#1	125,537:2500,643:3000,10013:1500,10014:2000
+izlude,164,138,4	shop	Pet Groomer#2	124,537:2500,643:3000,10013:1500,10014:2000
+morocc,269,167,4	shop	Pet Groomer#3	125,537:2500,643:3000,10013:1500,10014:2000
+geffen,193,152,4	shop	Pet Groomer#4	124,537:2500,643:3000,10013:1500,10014:2000
+payon,142,104,4	shop	Pet Groomer#5	124,537:2500,643:3000,10013:1500,10014:2000
diff --git a/doc/sample/npc_test_duplicate.txt b/doc/sample/npc_test_duplicate.txt
index be3db81c8b..2ca9694995 100644
--- a/doc/sample/npc_test_duplicate.txt
+++ b/doc/sample/npc_test_duplicate.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Last Updated: ========================================
-//= 20070915
+//= 20180831
 //===== Description: ========================================= 
 //= An example of how duplicate NPCs are handled:
 //=  NPC variables are shared between all duplicates.
@@ -12,7 +12,7 @@
 //=  'OnInit' loads the middle Poring last, for some reason.
 //============================================================
 
--	script	Test Script	-1,1,1,{
+prontera,150,175,4	script	Duplicate Test Script	909,{
 	mes "Hi.";
 	mes "My coords are "+ .map$ +", "+ .x +"/" +.y ;
 	close;
@@ -27,6 +27,5 @@ OnTouch:
 	end;
 }
 
-prontera,150,175,4	duplicate(Test Script)	Test1	909
-prontera,155,175,4	duplicate(Test Script)	Test2	909,2,2
-prontera,160,175,4	duplicate(Test Script)	Test3	909,3,3
+prontera,155,175,4	duplicate(Duplicate Test Script)	Duplicate Test2	909,2,2
+prontera,160,175,4	duplicate(Duplicate Test Script)	Duplicate Test3	909,3,3
diff --git a/doc/sample/npc_test_npctimer2.txt b/doc/sample/npc_test_npctimer2.txt
index a82fa74c0b..94eb0273cf 100644
--- a/doc/sample/npc_test_npctimer2.txt
+++ b/doc/sample/npc_test_npctimer2.txt
@@ -3,17 +3,17 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Last Updated: ========================================
-//= 20121003
+//= 20180831
 //===== Description: ========================================= 
 //= Demonstrates attached NPC timer commands.
 //============================================================
 
-prontera,156,183,0	script	NPCtimerTest::npctimerX0000	116,{
+prontera,156,186,0	script	NPCtimerTest::npctimer2X0000	116,{
 	mes "What would you like to know?";
 	select("Tell me my level.");
 	mes "I need time to think...";
-	initnpctimer;
 	attachnpctimer;
+	initnpctimer;
 	close;
 
 OnTimer5000:
diff --git a/src/map/script_constants.hpp b/src/map/script_constants.hpp
index 1e81cae1e3..5d5066a4e7 100644
--- a/src/map/script_constants.hpp
+++ b/src/map/script_constants.hpp
@@ -755,6 +755,7 @@
 	export_constant(EQI_SHADOW_SHOES);
 	export_constant(EQI_SHADOW_ACC_R);
 	export_constant(EQI_SHADOW_ACC_L);
+	export_constant(EQI_MAX);
 
 	/* equip positions */
 	export_constant(EQP_ACC_L);