PetDB Update:

- Change PetID's to Constants
- On Official Servers, if you don't have Pet Eggs in your inventory, if you use Pet Incubator item, the Pet Entry list will not show.

3 files changed, 207 insertions, 186 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index e836d55fe..7b9c30839 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -1311,7 +1311,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1002; ">
+	Script: <" pet PORING; ">
 },
 {
 	Id: 620
@@ -1324,7 +1324,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1113; ">
+	Script: <" pet DROPS; ">
 },
 {
 	Id: 621
@@ -1337,7 +1337,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1031; ">
+	Script: <" pet POPORING; ">
 },
 {
 	Id: 622
@@ -1350,7 +1350,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1063; ">
+	Script: <" pet LUNATIC; ">
 },
 {
 	Id: 623
@@ -1363,7 +1363,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1049; ">
+	Script: <" pet PICKY; ">
 },
 {
 	Id: 624
@@ -1376,7 +1376,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1011; ">
+	Script: <" pet CHONCHON; ">
 },
 {
 	Id: 625
@@ -1389,7 +1389,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1042; ">
+	Script: <" pet STEEL_CHONCHON; ">
 },
 {
 	Id: 626
@@ -1402,7 +1402,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1035; ">
+	Script: <" pet HUNTER_FLY; ">
 },
 {
 	Id: 627
@@ -1415,7 +1415,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1167; ">
+	Script: <" pet SAVAGE_BABE; ">
 },
 {
 	Id: 628
@@ -1428,7 +1428,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1107; ">
+	Script: <" pet DESERT_WOLF_B; ">
 },
 {
 	Id: 629
@@ -1441,7 +1441,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1052; ">
+	Script: <" pet ROCKER; ">
 },
 {
 	Id: 630
@@ -1454,7 +1454,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1014; ">
+	Script: <" pet SPORE; ">
 },
 {
 	Id: 631
@@ -1467,7 +1467,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1077; ">
+	Script: <" pet POISON_SPORE; ">
 },
 {
 	Id: 632
@@ -1480,7 +1480,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1019; ">
+	Script: <" pet PECOPECO; ">
 },
 {
 	Id: 633
@@ -1493,7 +1493,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1056; ">
+	Script: <" pet SMOKIE; ">
 },
 {
 	Id: 634
@@ -1506,7 +1506,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1057; ">
+	Script: <" pet YOYO; ">
 },
 {
 	Id: 635
@@ -1519,7 +1519,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1023; ">
+	Script: <" pet ORK_WARRIOR; ">
 },
 {
 	Id: 636
@@ -1532,7 +1532,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1026; ">
+	Script: <" pet MUNAK; ">
 },
 {
 	Id: 637
@@ -1545,7 +1545,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1110; ">
+	Script: <" pet DOKEBI; ">
 },
 {
 	Id: 638
@@ -1558,7 +1558,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1170; ">
+	Script: <" pet SOHEE; ">
 },
 {
 	Id: 639
@@ -1571,7 +1571,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1029; ">
+	Script: <" pet ISIS; ">
 },
 {
 	Id: 640
@@ -1584,7 +1584,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1155; ">
+	Script: <" pet PETIT; ">
 },
 {
 	Id: 641
@@ -1597,7 +1597,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1109; ">
+	Script: <" pet DEVIRUCHI; ">
 },
 {
 	Id: 642
@@ -1610,7 +1610,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1101; ">
+	Script: <" pet BAPHOMET_; ">
 },
 {
 	Id: 643
@@ -1687,7 +1687,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1188; ">
+	Script: <" pet BON_GUN; ">
 },
 {
 	Id: 660
@@ -1700,7 +1700,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1200; ">
+	Script: <" pet ZHERLTHSH; ">
 },
 {
 	Id: 661
@@ -1713,7 +1713,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1275; ">
+	Script: <" pet ALICE; ">
 },
 {
 	Id: 662
@@ -64474,7 +64474,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1245; ">
+	Script: <" pet GOBLIN_XMAS; ">
 },
 {
 	Id: 12226
@@ -66139,16 +66139,16 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		nocart: true
 		nostorage: true
-		nogstorage: true
+		nocart: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1815; ">
+	Script: <" pet EVENT_RICECAKE; ">
 },
 {
 	Id: 12341
@@ -66422,7 +66422,7 @@ item_db: (
 	Type: 2
 	Buy: 20
 	Weight: 50
-	Script: <" pet 1630; ">
+	Script: <" pet BACSOJIN_; ">
 },
 {
 	Id: 12358
@@ -66435,7 +66435,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1513; ">
+	Script: <" pet CIVIL_SERVANT; ">
 },
 {
 	Id: 12359
@@ -66448,7 +66448,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1586; ">
+	Script: <" pet LEAF_CAT; ">
 },
 {
 	Id: 12360
@@ -66461,7 +66461,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1505; ">
+	Script: <" pet LOLI_RURI; ">
 },
 {
 	Id: 12361
@@ -66472,17 +66472,17 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
+		nostorage: true
 		noselltonpc: true
 		nocart: true
-		nostorage: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1143; ">
+	Script: <" pet MARIONETTE; ">
 },
 {
 	Id: 12362
@@ -66495,7 +66495,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1401; ">
+	Script: <" pet SHINOBI; ">
 },
 {
 	Id: 12363
@@ -66506,17 +66506,17 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
+		nostorage: true
 		noselltonpc: true
 		nocart: true
-		nostorage: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1179; ">
+	Script: <" pet WHISPER; ">
 },
 {
 	Id: 12364
@@ -66529,7 +66529,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1299; ">
+	Script: <" pet GOBLIN_LEADER; ">
 },
 {
 	Id: 12365
@@ -66542,7 +66542,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1416; ">
+	Script: <" pet WICKED_NYMPH; ">
 },
 {
 	Id: 12366
@@ -66555,7 +66555,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1404; ">
+	Script: <" pet MIYABI_NINGYO; ">
 },
 {
 	Id: 12367
@@ -66568,7 +66568,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1504; ">
+	Script: <" pet DULLAHAN; ">
 },
 {
 	Id: 12368
@@ -66581,7 +66581,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1148; ">
+	Script: <" pet MEDUSA; ">
 },
 {
 	Id: 12369
@@ -66594,7 +66594,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1495; ">
+	Script: <" pet STONE_SHOOTER; ">
 },
 {
 	Id: 12370
@@ -66605,17 +66605,17 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
+		nostorage: true
 		noselltonpc: true
 		nocart: true
-		nostorage: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1374; ">
+	Script: <" pet INCUBUS; ">
 },
 {
 	Id: 12371
@@ -66628,7 +66628,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1040; ">
+	Script: <" pet GOLEM; ">
 },
 {
 	Id: 12372
@@ -66641,7 +66641,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1379; ">
+	Script: <" pet NIGHTMARE_TERROR; ">
 },
 {
 	Id: 12373
@@ -66654,7 +66654,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1370; ">
+	Script: <" pet SUCCUBUS; ">
 },
 {
 	Id: 12374
@@ -66667,7 +66667,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1837; ">
+	Script: <" pet IMP; ">
 },
 {
 	Id: 12375
@@ -67013,7 +67013,7 @@ item_db: (
 	Buy: 20
 	Weight: 50
 	BuyingStore: true
-	Script: <" pet 1519; ">
+	Script: <" pet CHUNG_E; ">
 },
 {
 	Id: 12396
@@ -67213,7 +67213,7 @@ item_db: (
 	Name: "Leaf Cat Ball"
 	Type: 2
 	Buy: 0
-	Script: <" pet 2081; ">
+	Script: <" pet E_HYDRA; ">
 },
 {
 	Id: 12409
@@ -69967,9 +69967,9 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
 	Script: <"
 		getitem Red_Slim_Potion, 100;
@@ -78196,7 +78196,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 14569,10; ">
+	Script: <" getitem Knife_Goblin_Ring, 10; ">
 },
 {
 	Id: 13816
@@ -78210,7 +78210,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 14570,10; ">
+	Script: <" getitem Flail_Goblin_Ring, 10; ">
 },
 {
 	Id: 13817
@@ -78224,7 +78224,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 14571,10; ">
+	Script: <" getitem Hammer_Goblin_Ring, 10; ">
 },
 {
 	Id: 13818
@@ -78238,7 +78238,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 14572,10; ">
+	Script: <" getitem Holy_Marble, 10; ">
 },
 {
 	Id: 13819
@@ -78252,7 +78252,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 14573,10; ">
+	Script: <" getitem Red_Burning_Stone, 10; ">
 },
 {
 	Id: 13820
@@ -78266,7 +78266,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 14574,10; ">
+	Script: <" getitem Skull_Of_Vagabond, 10; ">
 },
 {
 	Id: 13821
@@ -87572,11 +87572,11 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" pet 1122; ">
+	Script: <" pet GOBLIN_1; ">
 },
 {
 	Id: 14570
@@ -87590,11 +87590,11 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" pet 1123; ">
+	Script: <" pet GOBLIN_2; ">
 },
 {
 	Id: 14571
@@ -87608,11 +87608,11 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" pet 1125; ">
+	Script: <" pet GOBLIN_4; ">
 },
 {
 	Id: 14572
@@ -87626,11 +87626,11 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" pet 1385; ">
+	Script: <" pet DELETER_; ">
 },
 {
 	Id: 14573
@@ -87644,11 +87644,11 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" pet 1382; ">
+	Script: <" pet DIABOLIC; ">
 },
 {
 	Id: 14574
@@ -87662,11 +87662,11 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" pet 1208; ">
+	Script: <" pet WANDER_MAN; ">
 },
 {
 	Id: 14575
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index d0339ef46..1a354e683 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1337,7 +1337,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1002; ">
+	Script: <" pet PORING; ">
 },
 {
 	Id: 620
@@ -1350,7 +1350,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1113; ">
+	Script: <" pet DROPS; ">
 },
 {
 	Id: 621
@@ -1363,7 +1363,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1031; ">
+	Script: <" pet POPORING; ">
 },
 {
 	Id: 622
@@ -1376,7 +1376,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1063; ">
+	Script: <" pet LUNATIC; ">
 },
 {
 	Id: 623
@@ -1389,7 +1389,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1049; ">
+	Script: <" pet PICKY; ">
 },
 {
 	Id: 624
@@ -1402,7 +1402,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1011; ">
+	Script: <" pet CHONCHON; ">
 },
 {
 	Id: 625
@@ -1415,7 +1415,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1042; ">
+	Script: <" pet STEEL_CHONCHON; ">
 },
 {
 	Id: 626
@@ -1428,7 +1428,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1035; ">
+	Script: <" pet HUNTER_FLY; ">
 },
 {
 	Id: 627
@@ -1441,7 +1441,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1167; ">
+	Script: <" pet SAVAGE; ">
 },
 {
 	Id: 628
@@ -1454,7 +1454,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1107; ">
+	Script: <" pet DESERT_WOLF_B; ">
 },
 {
 	Id: 629
@@ -1467,7 +1467,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1052; ">
+	Script: <" pet ROCKER; ">
 },
 {
 	Id: 630
@@ -1480,7 +1480,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1014; ">
+	Script: <" pet SPORE; ">
 },
 {
 	Id: 631
@@ -1493,7 +1493,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1077; ">
+	Script: <" pet POISON_SPORE; ">
 },
 {
 	Id: 632
@@ -1506,7 +1506,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1019; ">
+	Script: <" pet PECOPECO; ">
 },
 {
 	Id: 633
@@ -1519,7 +1519,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1056; ">
+	Script: <" pet SMOKIE; ">
 },
 {
 	Id: 634
@@ -1532,7 +1532,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1057; ">
+	Script: <" pet YOYO; ">
 },
 {
 	Id: 635
@@ -1545,7 +1545,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1023; ">
+	Script: <" pet ORK_WARRIOR; ">
 },
 {
 	Id: 636
@@ -1558,7 +1558,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1026; ">
+	Script: <" pet MUNAK; ">
 },
 {
 	Id: 637
@@ -1571,7 +1571,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1110; ">
+	Script: <" pet DOKEBI; ">
 },
 {
 	Id: 638
@@ -1584,7 +1584,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1170; ">
+	Script: <" pet SOHEE; ">
 },
 {
 	Id: 639
@@ -1597,7 +1597,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1029; ">
+	Script: <" pet ISIS; ">
 },
 {
 	Id: 640
@@ -1610,7 +1610,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1155; ">
+	Script: <" pet PETIT; ">
 },
 {
 	Id: 641
@@ -1623,7 +1623,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1109; ">
+	Script: <" pet DEVIRUCHI; ">
 },
 {
 	Id: 642
@@ -1636,7 +1636,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1101; ">
+	Script: <" pet BAPHOMET_; ">
 },
 {
 	Id: 643
@@ -1713,7 +1713,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1188; ">
+	Script: <" pet BONGUN; ">
 },
 {
 	Id: 660
@@ -1726,7 +1726,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1200; ">
+	Script: <" pet ZHERLTHSH; ">
 },
 {
 	Id: 661
@@ -1739,7 +1739,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1275; ">
+	Script: <" pet ALICE; ">
 },
 {
 	Id: 662
@@ -79614,7 +79614,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1245; ">
+	Script: <" pet GOBLIN_XMAS; ">
 },
 {
 	Id: 12226
@@ -81339,16 +81339,16 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		nocart: true
 		nostorage: true
-		nogstorage: true
+		nocart: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1815; ">
+	Script: <" pet EVENT_RICECAKE; ">
 },
 {
 	Id: 12341
@@ -81546,7 +81546,7 @@ item_db: (
 	Type: 2
 	Buy: 20
 	Weight: 50
-	Script: <" pet 1630; ">
+	Script: <" pet BACSOJIN_; ">
 },
 {
 	Id: 12358
@@ -81559,7 +81559,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1513; ">
+	Script: <" pet CIVIL_SERVANT; ">
 },
 {
 	Id: 12359
@@ -81572,7 +81572,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1586; ">
+	Script: <" pet LEAF_CAT; ">
 },
 {
 	Id: 12360
@@ -81585,7 +81585,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1505; ">
+	Script: <" pet LOLI_RURI; ">
 },
 {
 	Id: 12361
@@ -81598,14 +81598,14 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1143; ">
+	Script: <" pet MARIONETTE; ">
 },
 {
 	Id: 12362
@@ -81618,7 +81618,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1401; ">
+	Script: <" pet SHINOBI; ">
 },
 {
 	Id: 12363
@@ -81631,14 +81631,14 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1179; ">
+	Script: <" pet WHISPER; ">
 },
 {
 	Id: 12364
@@ -81651,7 +81651,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1299; ">
+	Script: <" pet GOBLIN_LEADER; ">
 },
 {
 	Id: 12365
@@ -81664,7 +81664,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1416; ">
+	Script: <" pet WICKED_NYMPH; ">
 },
 {
 	Id: 12366
@@ -81677,7 +81677,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1404; ">
+	Script: <" pet MIYABI_NINGYO; ">
 },
 {
 	Id: 12367
@@ -81690,7 +81690,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1504; ">
+	Script: <" pet DULLAHAN; ">
 },
 {
 	Id: 12368
@@ -81703,7 +81703,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1148; ">
+	Script: <" pet MEDUSA; ">
 },
 {
 	Id: 12369
@@ -81716,7 +81716,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1495; ">
+	Script: <" pet STONE_SHOOTER; ">
 },
 {
 	Id: 12370
@@ -81729,14 +81729,14 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1374; ">
+	Script: <" pet INCUBUS; ">
 },
 {
 	Id: 12371
@@ -81749,7 +81749,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1040; ">
+	Script: <" pet GOLEM; ">
 },
 {
 	Id: 12372
@@ -81762,7 +81762,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1379; ">
+	Script: <" pet NIGHTMARE_TERROR; ">
 },
 {
 	Id: 12373
@@ -81775,7 +81775,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1370; ">
+	Script: <" pet SUCCUBUS; ">
 },
 {
 	Id: 12374
@@ -81788,7 +81788,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 1837; ">
+	Script: <" pet IMP; ">
 },
 {
 	Id: 12375
@@ -82122,7 +82122,7 @@ item_db: (
 	Buy: 20
 	Weight: 50
 	BuyingStore: true
-	Script: <" pet 1519; ">
+	Script: <" pet CHUNG_E; ">
 },
 {
 	Id: 12396
@@ -82331,7 +82331,7 @@ item_db: (
 	Name: "Hydra Ball"
 	Type: 2
 	Buy: 0
-	Script: <" pet 2081; ">
+	Script: <" pet E_HYDRA; ">
 },
 {
 	Id: 12409
@@ -85254,11 +85254,14 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" montransform DEVIRUCHI, 1200000, SC_MTF_ASPD, 10, 5; ">
+	Script: <"
+		specialeffect2 EF_CLOAKING;
+		montransform DEVIRUCHI, 1200000, SC_MTF_ASPD, 10, 5;
+	">
 },
 {
 	Id: 12659
@@ -85272,11 +85275,14 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" montransform RAYDRIC_ARCHER, 1200000, SC_MTF_RANGEATK, 25; ">
+	Script: <"
+		specialeffect2 EF_CLOAKING;
+		montransform RAYDRIC_ARCHER, 1200000, SC_MTF_RANGEATK, 25;
+	">
 },
 {
 	Id: 12660
@@ -85290,11 +85296,14 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" montransform MAVKA, 1200000, SC_MTF_RANGEATK, 25; ">
+	Script: <"
+		specialeffect2 EF_CLOAKING;
+		montransform MAVKA, 1200000, SC_MTF_RANGEATK, 25;
+	">
 },
 {
 	Id: 12661
@@ -85308,11 +85317,14 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" montransform MARDUK, 1200000, SC_MTF_MATK, 25; ">
+	Script: <"
+		specialeffect2 EF_CLOAKING;
+		montransform MARDUK, 1200000, SC_MTF_MATK, 25;
+	">
 },
 {
 	Id: 12662
@@ -85326,11 +85338,14 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" montransform BANSHEE, 1200000, SC_MTF_MATK, 25; ">
+	Script: <"
+		specialeffect2 EF_CLOAKING;
+		montransform BANSHEE, 1200000, SC_MTF_MATK, 25;
+	">
 },
 {
 	Id: 12663
@@ -85344,11 +85359,14 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" montransform PORING, 1200000, SC_MTF_CRIDAMAGE, 5; ">
+	Script: <"
+		specialeffect2 EF_CLOAKING;
+		montransform PORING, 1200000, SC_MTF_CRIDAMAGE, 5;
+	">
 },
 {
 	Id: 12664
@@ -85362,11 +85380,14 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" montransform GOLEM, 1200000, SC_MTF_MLEATKED, 2; ">
+	Script: <"
+		specialeffect2 EF_CLOAKING;
+		montransform GOLEM, 1200000, SC_MTF_MLEATKED, 2;
+	">
 },
 {
 	Id: 12665
@@ -85433,11 +85454,11 @@ item_db: (
 	Trade: {
 		nodrop: true
 		notrade: true
-		nocart: true
 		nostorage: true
-		nogstorage: true
+		nocart: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
 	Script: <"
 		getitem Old_Violet_Box, 2;
@@ -85697,7 +85718,7 @@ item_db: (
 	Type: 2
 	Buy: 20
 	Weight: 50
-	Script: <" pet 2313; ">
+	Script: <" pet TIKBALANG; ">
 },
 {
 	Id: 12700
@@ -87131,7 +87152,7 @@ item_db: (
 	Nouse: {
 		sitting: true
 	}
-	Script: <" pet 2398; ">
+	Script: <" pet LITTLE_PORING; ">
 },
 {
 	Id: 12847
@@ -100665,11 +100686,11 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" getitem 14569,10; ">
+	Script: <" getitem Knife_Goblin_Ring, 10; ">
 },
 {
 	Id: 13816
@@ -100683,11 +100704,11 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" getitem 14570,10; ">
+	Script: <" getitem Flail_Goblin_Ring, 10; ">
 },
 {
 	Id: 13817
@@ -100701,11 +100722,11 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" getitem 14571,10; ">
+	Script: <" getitem Hammer_Goblin_Ring, 10; ">
 },
 {
 	Id: 13818
@@ -100719,11 +100740,11 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" getitem 14572,10; ">
+	Script: <" getitem Holy_Marble, 10; ">
 },
 {
 	Id: 13819
@@ -100737,11 +100758,11 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" getitem 14573,10; ">
+	Script: <" getitem Red_Burning_Stone, 10; ">
 },
 {
 	Id: 13820
@@ -100755,11 +100776,11 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" getitem 14574,10; ">
+	Script: <" getitem Skull_Of_Vagabond, 10; ">
 },
 {
 	Id: 13821
@@ -111711,8 +111732,7 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
-		nomail: true
+		nogstorage: true		nomail: true
 		noauction: true
 	}
 	Script: <"
@@ -111732,11 +111752,11 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" pet 1122; ">
+	Script: <" pet GOBLIN_1; ">
 },
 {
 	Id: 14570
@@ -111750,11 +111770,11 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" pet 1123; ">
+	Script: <" pet GOBLIN_2; ">
 },
 {
 	Id: 14571
@@ -111768,11 +111788,11 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" pet 1125; ">
+	Script: <" pet GOBLIN_4; ">
 },
 {
 	Id: 14572
@@ -111786,11 +111806,11 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" pet 1385; ">
+	Script: <" pet DELETER_; ">
 },
 {
 	Id: 14573
@@ -111804,11 +111824,11 @@ item_db: (
 		notrade: true
 		noselltonpc: true
 		nocart: true
-		nogstorage: true
 		nomail: true
 		noauction: true
+		nogstorage: true
 	}
-	Script: <" pet 1382; ">
+	Script: <" pet DIABOLIC; ">
 },
 {
 	Id: 14574
@@ -111817,7 +111837,7 @@ item_db: (
 	Type: 2
 	Buy: 0
 	Weight: 10
-	Script: <" pet 1208; ">
+	Script: <" pet WANDER_MAN; ">
 },
 {
 	Id: 14575
diff --git a/src/map/clif.c b/src/map/clif.c
index 0cf31fccb..687303e38 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -6738,29 +6738,30 @@ void clif_pet_roulette(struct map_session_data *sd,int data)
 
 /// Presents a list of pet eggs that can be hatched (ZC_PETEGG_LIST).
 /// 01a6 <packet len>.W { <index>.W }*
-void clif_sendegg(struct map_session_data *sd)
-{
-	int i,n=0,fd;
+void clif_sendegg(struct map_session_data *sd) {
+	int i, n, fd;
 
 	nullpo_retv(sd);
 
-	fd=sd->fd;
+	fd = sd->fd;
 	if (battle_config.pet_no_gvg && map_flag_gvg2(sd->bl.m)) { //Disable pet hatching in GvG grounds during Guild Wars [Skotlex]
-		clif->message(fd, msg_sd(sd,866)); // "Pets are not allowed in Guild Wars."
+		clif->message(fd, msg_sd(sd, 866)); // "Pets are not allowed in Guild Wars."
 		return;
 	}
+
 	WFIFOHEAD(fd, MAX_INVENTORY * 2 + 4);
-	WFIFOW(fd,0)=0x1a6;
-	for(i=0,n=0;i<MAX_INVENTORY;i++){
-		if(sd->status.inventory[i].nameid<=0 || sd->inventory_data[i] == NULL ||
-		   sd->inventory_data[i]->type!=IT_PETEGG ||
-		   sd->status.inventory[i].amount<=0)
+	WFIFOW(fd,0) = 0x1a6;
+	for (i = n = 0; i < MAX_INVENTORY; i++) {
+		if (sd->status.inventory[i].nameid <= 0 || sd->inventory_data[i] == NULL || sd->inventory_data[i]->type!=IT_PETEGG || sd->status.inventory[i].amount <= 0)
 			continue;
-		WFIFOW(fd,n*2+4)=i+2;
+		WFIFOW(fd, n * 2 + 4) = i + 2;
 		n++;
 	}
-	WFIFOW(fd,2)=4+n*2;
-	WFIFOSET(fd,WFIFOW(fd,2));
+
+	if (!n) return;
+
+	WFIFOW(fd, 2) = 4 + n * 2;
+	WFIFOSET(fd, WFIFOW(fd, 2));
 
 	sd->menuskill_id = SA_TAMINGMONSTER;
 	sd->menuskill_val = -1;