Update the Mercenary item database.

Change Item ID and Mercenary ID to Constants.

3 files changed, 207 insertions, 135 deletions

diff --git a/db/mercenary_db.txt b/db/mercenary_db.txt
index 63c552623..6ed9c6030 100644
--- a/db/mercenary_db.txt
+++ b/db/mercenary_db.txt
@@ -25,16 +25,16 @@
 2217,M_TEDDY_BEAR,Teddy Bear,85,14493,243,1,600,800,100,70,60,20,85,50,75,130,10,12,0,0,60,200,512,780,504
 2325,M_BAPHOMET_,Baphomet,57,7510,204,1,810,955,70,40,52,60,36,17,57,25,10,12,0,6,27,100,868,480,120
 2326,M_GALAPAGO,Galapago,45,7513,201,1,760,915,70,40,30,28,29,18,30,16,10,12,0,2,22,165,1430,1080,1080
-2342,MER_DIABOLIC,MER_DIABOLIC,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
-2344,MER_WISH_MAIDEN,MER_WISH_MAIDEN,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
-2345,MER_ZHERLTHSH,MER_ZHERLTHSH,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
-2346,MER_KTULLANUX,MER_KTULLANUX,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
-2347,MER_EDDGA,MER_EDDGA,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
-2348,MER_CIVIL_SERVANT,MER_CIVIL_SERVANT,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
-2349,MER_LOLI_RURI,MER_LOLI_RURI,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
-2350,MER_SEDORA,MER_SEDORA,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
-2351,MER_CHEPET,MER_CHEPET,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
-2378,MER_ANTLER_SCARABA,MER_ANTLER_SCARABA,136,30000,1,1,1418,1828,155,102,23,99,59,129,137,45,10,12,1,4,42,200,504,624,360
+2342,MER_DIABOLIC,Diabolic,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2344,MER_WISH_MAIDEN,Wish Maiden,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2345,MER_ZHERLTHSH,Zealotus,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2346,MER_KTULLANUX,Ktullanux,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2347,MER_EDDGA,Eddga,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2348,MER_CIVIL_SERVANT,Civil Servant,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2349,MER_LOLI_RURI,Loli Ruri,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2350,MER_SEDORA,Sedora,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2351,MER_CHEPET,Chepet,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
+2378,MER_ANTLER_SCARABA,Antler Scaraba,136,30000,1,1,1418,1828,155,102,23,99,59,129,137,45,10,12,1,4,42,200,504,624,360
 // Normal Mercenaries
 6017,MER_ARCHER01,Mina,20,256,200,10,170,85,7,5,1,16,5,1,28,8,10,0,0,7,20,150,700,432,300
 6018,MER_ARCHER02,Dororu,30,457,70,10,228,114,11,7,1,18,8,1,40,11,10,0,0,7,20,150,700,432,300
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index ac739d5f8..4e2240c31 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -63276,7 +63276,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6017,1800000; ">
+	Script: <" mercenary_create MER_ARCHER01, 1800000; ">
 },
 {
 	Id: 12154
@@ -63294,7 +63294,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6018,1800000; ">
+	Script: <" mercenary_create MER_ARCHER02, 1800000; ">
 },
 {
 	Id: 12155
@@ -63312,7 +63312,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6019,1800000; ">
+	Script: <" mercenary_create MER_ARCHER03, 1800000; ">
 },
 {
 	Id: 12156
@@ -63330,7 +63330,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6020,1800000; ">
+	Script: <" mercenary_create MER_ARCHER04, 1800000; ">
 },
 {
 	Id: 12157
@@ -63348,7 +63348,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6021,1800000; ">
+	Script: <" mercenary_create MER_ARCHER05, 1800000; ">
 },
 {
 	Id: 12158
@@ -63366,7 +63366,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6022,1800000; ">
+	Script: <" mercenary_create MER_ARCHER06, 1800000; ">
 },
 {
 	Id: 12159
@@ -63384,7 +63384,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6023,1800000; ">
+	Script: <" mercenary_create MER_ARCHER07, 1800000; ">
 },
 {
 	Id: 12160
@@ -63402,7 +63402,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6024,1800000; ">
+	Script: <" mercenary_create MER_ARCHER08, 1800000; ">
 },
 {
 	Id: 12161
@@ -63420,7 +63420,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6025,1800000; ">
+	Script: <" mercenary_create MER_ARCHER09, 1800000; ">
 },
 {
 	Id: 12162
@@ -63438,7 +63438,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6026,1800000; ">
+	Script: <" mercenary_create MER_ARCHER10, 1800000; ">
 },
 {
 	Id: 12163
@@ -63456,7 +63456,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6037,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN01, 1800000; ">
 },
 {
 	Id: 12164
@@ -63474,7 +63474,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6038,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN02, 1800000; ">
 },
 {
 	Id: 12165
@@ -63492,7 +63492,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6039,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN03, 1800000; ">
 },
 {
 	Id: 12166
@@ -63510,7 +63510,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6040,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN04, 1800000; ">
 },
 {
 	Id: 12167
@@ -63528,7 +63528,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6041,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN05, 1800000; ">
 },
 {
 	Id: 12168
@@ -63546,7 +63546,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6042,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN06, 1800000; ">
 },
 {
 	Id: 12169
@@ -63564,7 +63564,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6043,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN07, 1800000; ">
 },
 {
 	Id: 12170
@@ -63582,7 +63582,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6044,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN08, 1800000; ">
 },
 {
 	Id: 12171
@@ -63600,7 +63600,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6045,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN09, 1800000; ">
 },
 {
 	Id: 12172
@@ -63618,7 +63618,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6046,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN10, 1800000; ">
 },
 {
 	Id: 12173
@@ -63636,7 +63636,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6027,1800000; ">
+	Script: <" mercenary_create MER_LANCER01, 1800000; ">
 },
 {
 	Id: 12174
@@ -63654,7 +63654,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6028,1800000; ">
+	Script: <" mercenary_create MER_LANCER02, 1800000; ">
 },
 {
 	Id: 12175
@@ -63672,7 +63672,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6029,1800000; ">
+	Script: <" mercenary_create MER_LANCER03, 1800000; ">
 },
 {
 	Id: 12176
@@ -63690,7 +63690,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6030,1800000; ">
+	Script: <" mercenary_create MER_LANCER04, 1800000; ">
 },
 {
 	Id: 12177
@@ -63708,7 +63708,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6031,1800000; ">
+	Script: <" mercenary_create MER_LANCER05, 1800000; ">
 },
 {
 	Id: 12178
@@ -63726,7 +63726,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6032,1800000; ">
+	Script: <" mercenary_create MER_LANCER06, 1800000; ">
 },
 {
 	Id: 12179
@@ -63744,7 +63744,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6033,1800000; ">
+	Script: <" mercenary_create MER_LANCER07, 1800000; ">
 },
 {
 	Id: 12180
@@ -63762,7 +63762,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6034,1800000; ">
+	Script: <" mercenary_create MER_LANCER08, 1800000; ">
 },
 {
 	Id: 12181
@@ -63780,7 +63780,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6035,1800000; ">
+	Script: <" mercenary_create MER_LANCER09, 1800000; ">
 },
 {
 	Id: 12182
@@ -63798,7 +63798,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6036,1800000; ">
+	Script: <" mercenary_create MER_LANCER10, 1800000; ">
 },
 {
 	Id: 12183
@@ -65166,7 +65166,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" mercenary_create 2058,1800000; ">
+	Script: <" mercenary_create M_MIMIC, 1800000; ">
 },
 {
 	Id: 12277
@@ -65180,7 +65180,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" mercenary_create 2059,1800000; ">
+	Script: <" mercenary_create M_DISGUISE, 1800000; ">
 },
 {
 	Id: 12278
@@ -65194,7 +65194,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" mercenary_create 2060,1800000; ">
+	Script: <" mercenary_create M_ALICE, 1800000; ">
 },
 {
 	Id: 12279
@@ -65541,7 +65541,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 1965,1800000; ">
+	Script: <" mercenary_create M_WILD_ROSE, 1800000; ">
 },
 {
 	Id: 12301
@@ -65559,7 +65559,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 1966,1800000; ">
+	Script: <" mercenary_create M_DOPPELGANGER, 1800000; ">
 },
 {
 	Id: 12302
@@ -65577,7 +65577,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 1967,1800000; ">
+	Script: <" mercenary_create M_YGNIZEM, 1800000; ">
 },
 {
 	Id: 12303
@@ -65959,7 +65959,7 @@ item_db: (
 	Buy: 0
 	Weight: 10
 	BuyingStore: true
-	Script: <" mercenary_create 2000,1800000; ">
+	Script: <" mercenary_create M_GAMEMASTER, 1800000; ">
 },
 {
 	Id: 12330
@@ -65969,7 +65969,7 @@ item_db: (
 	Buy: 0
 	Weight: 10
 	BuyingStore: true
-	Script: <" mercenary_create 2001,1800000; ">
+	Script: <" mercenary_create F_GAMEMASTER, 1800000; ">
 },
 {
 	Id: 12331
@@ -66697,7 +66697,7 @@ item_db: (
 	Type: 2
 	Buy: 10
 	Weight: 10
-	Script: <" mercenary_create 2034,1800000; ">
+	Script: <" mercenary_create M_DESERT_WOLF_B, 1800000; ">
 },
 {
 	Id: 12381
@@ -66707,8 +66707,8 @@ item_db: (
 	Buy: 10
 	Weight: 10
 	Script: <"
-		if(strcharinfo(3)=="job3_arch02") {
-			mercenary_create 2037,1800000;
+		if (strcharinfo(3) == "job3_arch02") {
+			mercenary_create VALKYRIE_A, 1800000;
 		}
 
 	">
@@ -66721,8 +66721,8 @@ item_db: (
 	Buy: 10
 	Weight: 10
 	Script: <"
-		if(strcharinfo(3)=="job3_arch02") {
-			mercenary_create 2038,1800000;
+		if (strcharinfo(3) == "job3_arch02") {
+			mercenary_create VALKYRIE_B, 1800000;
 		}
 
 	">
@@ -79296,7 +79296,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 12276,5; ">
+	Script: <" getitem Mimic_Scroll, 5; ">
 },
 {
 	Id: 13897
@@ -79310,7 +79310,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 12277,5; ">
+	Script: <" getitem Disguise_Scroll, 5; ">
 },
 {
 	Id: 13898
@@ -79324,7 +79324,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 12278,5; ">
+	Script: <" getitem Alice_Scroll, 5; ">
 },
 {
 	Id: 13899
@@ -79338,7 +79338,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 12276,10; ">
+	Script: <" getitem Mimic_Scroll, 10; ">
 },
 {
 	Id: 13900
@@ -79352,7 +79352,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 12277,10; ">
+	Script: <" getitem Disguise_Scroll, 10; ">
 },
 {
 	Id: 13901
@@ -79366,7 +79366,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 12278,10; ">
+	Script: <" getitem Alice_Scroll, 10; ">
 },
 {
 	Id: 13902
@@ -81716,7 +81716,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12276,5; ">
+	Script: <" getitem Mimic_Scroll, 5; ">
 },
 {
 	Id: 14031
@@ -81734,7 +81734,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12277,5; ">
+	Script: <" getitem Disguise_Scroll, 5; ">
 },
 {
 	Id: 14032
@@ -81752,7 +81752,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12278,5; ">
+	Script: <" getitem Alice_Scroll, 5; ">
 },
 {
 	Id: 14033
@@ -81770,7 +81770,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12276,10; ">
+	Script: <" getitem Mimic_Scroll, 10; ">
 },
 {
 	Id: 14034
@@ -81788,7 +81788,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12277,10; ">
+	Script: <" getitem Disguise_Scroll, 10; ">
 },
 {
 	Id: 14035
@@ -81806,7 +81806,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12278,10; ">
+	Script: <" getitem Alice_Scroll, 10; ">
 },
 {
 	Id: 14036
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 5184e677b..1b00975bb 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -78201,7 +78201,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6017,1800000; ">
+	Script: <" mercenary_create MER_ARCHER01, 1800000; ">
 },
 {
 	Id: 12154
@@ -78219,7 +78219,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6018,1800000; ">
+	Script: <" mercenary_create MER_ARCHER02, 1800000; ">
 },
 {
 	Id: 12155
@@ -78237,7 +78237,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6019,1800000; ">
+	Script: <" mercenary_create MER_ARCHER03, 1800000; ">
 },
 {
 	Id: 12156
@@ -78255,7 +78255,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6020,1800000; ">
+	Script: <" mercenary_create MER_ARCHER04, 1800000; ">
 },
 {
 	Id: 12157
@@ -78273,7 +78273,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6021,1800000; ">
+	Script: <" mercenary_create MER_ARCHER05, 1800000; ">
 },
 {
 	Id: 12158
@@ -78291,7 +78291,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6022,1800000; ">
+	Script: <" mercenary_create MER_ARCHER06, 1800000; ">
 },
 {
 	Id: 12159
@@ -78309,7 +78309,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6023,1800000; ">
+	Script: <" mercenary_create MER_ARCHER07, 1800000; ">
 },
 {
 	Id: 12160
@@ -78327,7 +78327,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6024,1800000; ">
+	Script: <" mercenary_create MER_ARCHER08, 1800000; ">
 },
 {
 	Id: 12161
@@ -78345,7 +78345,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6025,1800000; ">
+	Script: <" mercenary_create MER_ARCHER09, 1800000; ">
 },
 {
 	Id: 12162
@@ -78363,7 +78363,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6026,1800000; ">
+	Script: <" mercenary_create MER_ARCHER10, 1800000; ">
 },
 {
 	Id: 12163
@@ -78381,7 +78381,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6037,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN01, 1800000; ">
 },
 {
 	Id: 12164
@@ -78399,7 +78399,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6038,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN02, 1800000; ">
 },
 {
 	Id: 12165
@@ -78417,7 +78417,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6039,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN03, 1800000; ">
 },
 {
 	Id: 12166
@@ -78435,7 +78435,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6040,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN04, 1800000; ">
 },
 {
 	Id: 12167
@@ -78453,7 +78453,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6041,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN05, 1800000; ">
 },
 {
 	Id: 12168
@@ -78471,7 +78471,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6042,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN06, 1800000; ">
 },
 {
 	Id: 12169
@@ -78489,7 +78489,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6043,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN07, 1800000; ">
 },
 {
 	Id: 12170
@@ -78507,7 +78507,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6044,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN08, 1800000; ">
 },
 {
 	Id: 12171
@@ -78525,7 +78525,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6045,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN09, 1800000; ">
 },
 {
 	Id: 12172
@@ -78543,7 +78543,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6046,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN10, 1800000; ">
 },
 {
 	Id: 12173
@@ -78561,7 +78561,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6027,1800000; ">
+	Script: <" mercenary_create MER_LANCER01, 1800000; ">
 },
 {
 	Id: 12174
@@ -78579,7 +78579,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6028,1800000; ">
+	Script: <" mercenary_create MER_LANCER02, 1800000; ">
 },
 {
 	Id: 12175
@@ -78597,7 +78597,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6029,1800000; ">
+	Script: <" mercenary_create MER_LANCER03, 1800000; ">
 },
 {
 	Id: 12176
@@ -78615,7 +78615,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6030,1800000; ">
+	Script: <" mercenary_create MER_LANCER04, 1800000; ">
 },
 {
 	Id: 12177
@@ -78633,7 +78633,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6031,1800000; ">
+	Script: <" mercenary_create MER_LANCER05, 1800000; ">
 },
 {
 	Id: 12178
@@ -78651,7 +78651,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6032,1800000; ">
+	Script: <" mercenary_create MER_LANCER06, 1800000; ">
 },
 {
 	Id: 12179
@@ -78669,7 +78669,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6033,1800000; ">
+	Script: <" mercenary_create MER_LANCER07, 1800000; ">
 },
 {
 	Id: 12180
@@ -78687,7 +78687,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6034,1800000; ">
+	Script: <" mercenary_create MER_LANCER08, 1800000; ">
 },
 {
 	Id: 12181
@@ -78705,7 +78705,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6035,1800000; ">
+	Script: <" mercenary_create MER_LANCER09, 1800000; ">
 },
 {
 	Id: 12182
@@ -78723,7 +78723,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6036,1800000; ">
+	Script: <" mercenary_create MER_LANCER10, 1800000; ">
 },
 {
 	Id: 12183
@@ -80106,7 +80106,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 2058,1800000; ">
+	Script: <" mercenary_create M_MIMIC, 1800000; ">
 },
 {
 	Id: 12277
@@ -80124,7 +80124,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 2059,1800000; ">
+	Script: <" mercenary_create M_DISGUISE, 1800000; ">
 },
 {
 	Id: 12278
@@ -80142,7 +80142,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 2060,1800000; ">
+	Script: <" mercenary_create M_ALICE, 1800000; ">
 },
 {
 	Id: 12279
@@ -80489,7 +80489,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 1965,1800000; ">
+	Script: <" mercenary_create M_WILD_ROSE, 1800000; ">
 },
 {
 	Id: 12301
@@ -80507,7 +80507,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 1966,1800000; ">
+	Script: <" mercenary_create M_DOPPELGANGER, 1800000; ">
 },
 {
 	Id: 12302
@@ -80525,7 +80525,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 1967,1800000; ">
+	Script: <" mercenary_create M_YGNIZEM, 1800000; ">
 },
 {
 	Id: 12303
@@ -80947,7 +80947,7 @@ item_db: (
 	Buy: 0
 	Weight: 10
 	BuyingStore: true
-	Script: <" mercenary_create 2000,1800000; ">
+	Script: <" mercenary_create M_GAMEMASTER, 1800000; ">
 },
 {
 	Id: 12330
@@ -80957,7 +80957,7 @@ item_db: (
 	Buy: 0
 	Weight: 10
 	BuyingStore: true
-	Script: <" mercenary_create 2001,1800000; ">
+	Script: <" mercenary_create F_GAMEMASTER, 1800000; ">
 },
 {
 	Id: 12331
@@ -81606,7 +81606,7 @@ item_db: (
 	Type: 2
 	Buy: 10
 	Weight: 10
-	Script: <" mercenary_create 2034,1800000; ">
+	Script: <" mercenary_create M_DESERT_WOLF_B, 1800000; ">
 },
 {
 	Id: 12381
@@ -81616,8 +81616,8 @@ item_db: (
 	Buy: 10
 	Weight: 10
 	Script: <"
-		if(strcharinfo(3)=="job3_arch02") {
-			mercenary_create 2037,1800000;
+		if (strcharinfo(3) == "job3_arch02") {
+			mercenary_create VALKYRIE_A, 1800000;
 		}
 	">
 },
@@ -81629,8 +81629,8 @@ item_db: (
 	Buy: 10
 	Weight: 10
 	Script: <"
-		if(strcharinfo(3)=="job3_arch02") {
-			mercenary_create 2038,1800000;
+		if (strcharinfo(3) == "job3_arch02") {
+			mercenary_create VALKYRIE_B, 1800000;
 		}
 	">
 },
@@ -84539,6 +84539,7 @@ item_db: (
 	Type: 11
 	Buy: 20
 	Weight: 10
+	Script: <" mercenary_create M_WANDER_MAN, 1800000; ">
 },
 {
 	Id: 12627
@@ -84547,6 +84548,7 @@ item_db: (
 	Type: 11
 	Buy: 20
 	Weight: 10
+	Script: <" mercenary_create M_WICKED_NYMPH, 1800000; ">
 },
 {
 	Id: 12628
@@ -84555,6 +84557,7 @@ item_db: (
 	Type: 11
 	Buy: 20
 	Weight: 10
+	Script: <" mercenary_create M_KASA, 1800000; ">
 },
 {
 	Id: 12629
@@ -84563,6 +84566,7 @@ item_db: (
 	Type: 11
 	Buy: 20
 	Weight: 10
+	Script: <" mercenary_create M_SALAMANDER, 1800000; ">
 },
 {
 	Id: 12630
@@ -84571,6 +84575,7 @@ item_db: (
 	Type: 11
 	Buy: 20
 	Weight: 10
+	Script: <" mercenary_create M_TEDDY_BEAR, 1800000; ">
 },
 {
 	Id: 12631
@@ -85157,10 +85162,10 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		getitem Old_Violet_Box,2;
-		getitem Comp_Battle_Manual,2;
-		getitem Recall_MaleGM,3;
-		getitem Recall_FemaleGM,2;
+		getitem Old_Violet_Box, 2;
+		getitem Comp_Battle_Manual, 2;
+		getitem Recall_MaleGM, 3;
+		getitem Recall_FemaleGM, 2;
 	">
 },
 {
@@ -86369,6 +86374,7 @@ item_db: (
 	Type: 11
 	Buy: 20
 	Weight: 10
+	Script: <" mercenary_create M_BAPHOMET, 1800000; ">
 },
 {
 	Id: 12779
@@ -86377,6 +86383,7 @@ item_db: (
 	Type: 11
 	Buy: 20
 	Weight: 10
+	Script: <" mercenary_create M_GALAPAGO, 1800000; ">
 },
 {
 	Id: 12780
@@ -86454,7 +86461,7 @@ item_db: (
 	Type: 2
 	Buy: 20
 	Weight: 10
-	Script: <" mercenary_create 2342,1800000; ">
+	Script: <" mercenary_create MER_DIABOLIC, 1800000; ">
 },
 {
 	Id: 12788
@@ -86563,6 +86570,7 @@ item_db: (
 	Type: 11
 	Buy: 20
 	Weight: 10
+	Script: <" mercenary_create MER_WISH_MAIDEN, 1800000; ">
 },
 {
 	Id: 12798
@@ -86571,6 +86579,34 @@ item_db: (
 	Type: 11
 	Buy: 20
 	Weight: 10
+	Script: <" mercenary_create MER_ZHERLTHSH, 1800000; ">
+},
+{
+	Id: 12800
+	AegisName: "Ktullanux_Scroll"
+	Name: "Ktullanux Scroll"
+	Type: 11
+	Buy: 20
+	Weight: 10
+	Script: <" mercenary_create MER_KTULLANUX, 1800000; ">
+},
+{
+	Id: 12801
+	AegisName: "Eddga_Scroll"
+	Name: "Eddga Scroll"
+	Type: 11
+	Buy: 20
+	Weight: 10
+	Script: <" mercenary_create MER_EDDGA, 1800000; ">
+},
+{
+	Id: 12806
+	AegisName: "Antler_Scaraba_Scroll"
+	Name: "Antler Scaraba Scroll"
+	Type: 11
+	Buy: 20
+	Weight: 10
+	Script: <" mercenary_create MER_ANTLER_SCARABA, 1800000; ">
 },
 {
 	Id: 12807
@@ -86692,6 +86728,42 @@ item_db: (
 	Script: <" getitem Zherlthsh_Ticket,1; ">
 },
 {
+	Id: 12820
+	AegisName: "Mao_Guai_Scroll"
+	Name: "Mao Guai Scroll"
+	Type: 11
+	Buy: 20
+	Weight: 10
+	Script: <" mercenary_create MER_CIVIL_SERVANT, 1800000; ">
+},
+{
+	Id: 12821
+	AegisName: "Loli_Ruri_Scroll"
+	Name: "Loli Ruri Scroll"
+	Type: 11
+	Buy: 20
+	Weight: 10
+	Script: <" mercenary_create MER_LOLI_RURI, 1800000; ">
+},
+{
+	Id: 12823
+	AegisName: "Sedora_Scroll"
+	Name: "Sedora Scroll"
+	Type: 11
+	Buy: 20
+	Weight: 10
+	Script: <" mercenary_create MER_SEDORA, 1800000; ">
+},
+{
+	Id: 12824
+	AegisName: "Chepet_Scroll"
+	Name: "Chepet Scroll"
+	Type: 11
+	Buy: 20
+	Weight: 10
+	Script: <" mercenary_create MER_CHEPET, 1800000; ">
+},
+{
 	Id: 12831
 	AegisName: "Potion_Box"
 	Name: "Potion Box"
@@ -101522,7 +101594,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12276,5; ">
+	Script: <" getitem Mimic_Scroll, 5; ">
 },
 {
 	Id: 13897
@@ -101540,7 +101612,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12277,5; ">
+	Script: <" getitem Disguise_Scroll, 5; ">
 },
 {
 	Id: 13898
@@ -101558,7 +101630,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12278,5; ">
+	Script: <" getitem Alice_Scroll, 5; ">
 },
 {
 	Id: 13899
@@ -101576,7 +101648,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12276,10; ">
+	Script: <" getitem Mimic_Scroll, 10; ">
 },
 {
 	Id: 13900
@@ -101594,7 +101666,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12277,10; ">
+	Script: <" getitem Disguise_Scroll, 10; ">
 },
 {
 	Id: 13901
@@ -101612,7 +101684,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12278,10; ">
+	Script: <" getitem Alice_Scroll, 10; ">
 },
 {
 	Id: 13902
@@ -104005,7 +104077,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12276,5; ">
+	Script: <" getitem Mimic_Scroll, 5; ">
 },
 {
 	Id: 14031
@@ -104023,7 +104095,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12277,5; ">
+	Script: <" getitem Disguise_Scroll, 5; ">
 },
 {
 	Id: 14032
@@ -104041,7 +104113,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12278,5; ">
+	Script: <" getitem Alice_Scroll, 5; ">
 },
 {
 	Id: 14033
@@ -104059,7 +104131,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12276,10; ">
+	Script: <" getitem Mimic_Scroll, 10; ">
 },
 {
 	Id: 14034
@@ -104077,7 +104149,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12277,10; ">
+	Script: <" getitem Disguise_Scroll, 10; ">
 },
 {
 	Id: 14035
@@ -104095,7 +104167,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12278,10; ">
+	Script: <" getitem Alice_Scroll, 10; ">
 },
 {
 	Id: 14036
@@ -116640,7 +116712,7 @@ item_db: (
 	Name: "WanderM. Summon Box(5)"
 	Type: 18
 	Buy: 20
-	Script: <" getitem 12626,5; ">
+	Script: <" getitem Wander_Man_Scroll, 5; ">
 },
 {
 	Id: 17001
@@ -116648,7 +116720,7 @@ item_db: (
 	Name: "WanderM. Summon Box(10)"
 	Type: 18
 	Buy: 20
-	Script: <" getitem 12626,10; ">
+	Script: <" getitem Wander_Man_Scroll, 10; ">
 },
 {
 	Id: 17002
@@ -116656,7 +116728,7 @@ item_db: (
 	Name: "Wicked N. Summon Box(5)"
 	Type: 18
 	Buy: 20
-	Script: <" getitem 12627,5; ">
+	Script: <" getitem Wicked_Nymph_Scrolll, 5; ">
 },
 {
 	Id: 17003
@@ -116664,7 +116736,7 @@ item_db: (
 	Name: "Wicked N. Summon Box(10)"
 	Type: 18
 	Buy: 20
-	Script: <" getitem 12627,10; ">
+	Script: <" getitem Wicked_Nymph_Scrolll, 10; ">
 },
 {
 	Id: 17004
@@ -116672,7 +116744,7 @@ item_db: (
 	Name: "Kasa Summon Box(5)"
 	Type: 18
 	Buy: 20
-	Script: <" getitem 12628,5; ">
+	Script: <" getitem Kasa_Scroll, 5; ">
 },
 {
 	Id: 17005
@@ -116680,7 +116752,7 @@ item_db: (
 	Name: "Kasa Summon Box(10)"
 	Type: 18
 	Buy: 20
-	Script: <" getitem 12628,10; ">
+	Script: <" getitem Kasa_Scroll, 10; ">
 },
 {
 	Id: 17006
@@ -116688,7 +116760,7 @@ item_db: (
 	Name: "Salamander Summon Box(5)"
 	Type: 18
 	Buy: 20
-	Script: <" getitem 12629,5; ">
+	Script: <" getitem Salamander_Scroll, 5; ">
 },
 {
 	Id: 17007
@@ -116696,7 +116768,7 @@ item_db: (
 	Name: "Salamander Summon Box(10)"
 	Type: 18
 	Buy: 20
-	Script: <" getitem 12629,10; ">
+	Script: <" getitem Salamander_Scroll, 10; ">
 },
 {
 	Id: 17008
@@ -116704,7 +116776,7 @@ item_db: (
 	Name: "Teddy Bear Summon Box(5)"
 	Type: 18
 	Buy: 20
-	Script: <" getitem 12630,5; ">
+	Script: <" getitem Teddy_Bear_Scroll, 5; ">
 },
 {
 	Id: 17009
@@ -116712,7 +116784,7 @@ item_db: (
 	Name: "Teddy Bear Summon Box(10)"
 	Type: 18
 	Buy: 20
-	Script: <" getitem 12630,10; ">
+	Script: <" getitem Teddy_Bear_Scroll, 10; ">
 },
 {
 	Id: 17011