Remove packet len fields from packets.h

1 files changed, 1140 insertions, 1140 deletions

diff --git a/src/map/packets.h b/src/map/packets.h
index 2a238ff48..036fd4f2a 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -24,916 +24,916 @@
 #define MAP_PACKETS_H
 
 #ifndef packet
-	#define packet(a,b,...)
+	#define packet(a,...)
 #endif
 
 /*
  * packet syntax
- * - packet(packet_id,length)
+ * - packet(packet_id)
  * OR
- * - packet(packet_id,length,function,offset ( specifies the offset of a packet field in bytes from the begin of the packet ),...)
- * - Example: packet(0x0072,19,clif->pWantToConnection,2,6,10,14,18);
+ * - packet(packet_id,function,offset ( specifies the offset of a packet field in bytes from the begin of the packet),...)
+ * - Example: packet(0x0072,clif->pWantToConnection,2,6,10,14,18);
  */
 
-packet(0x0072,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-packet(0x007d,2,clif->pLoadEndAck,0);
-packet(0x007e,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-packet(0x0085,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-packet(0x0089,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-packet(0x008c,-1,clif->pGlobalMessage,2,4);
-packet(0x0090,7,clif->pNpcClicked,2);
-packet(0x0094,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-packet(0x0096,-1,clif->pWisMessage,2,4,28);
-packet(0x0099,-1,clif->pBroadcast,2,4);
-packet(0x009b,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-packet(0x009f,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-packet(0x00a2,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-packet(0x00a7,8,clif->pUseItem,2,4);
-packet(0x00a9,6,clif->pEquipItem,2,4);
-packet(0x00ab,4,clif->pUnequipItem,2);
-packet(0x00b2,3,clif->pRestart,2);
-packet(0x00b8,7,clif->pNpcSelectMenu,2,6);
-packet(0x00b9,6,clif->pNpcNextClicked,2);
-packet(0x00bb,5,clif->pStatusUp,2,4);
-packet(0x00bf,3,clif->pEmotion,2);
-packet(0x00c1,2,clif->pHowManyConnections,0);
-packet(0x00c5,7,clif->pNpcBuySellSelected,2,6);
-packet(0x00c8,-1,clif->pNpcBuyListSend,2,4);
-packet(0x00c9,-1,clif->pNpcSellListSend,2,4);
-packet(0x00cc,6,clif->pGMKick,2);
-packet(0x00ce,2,clif->pGMKickAll,0);
-packet(0x00cf,27,clif->pPMIgnore,2,26);
-packet(0x00d0,3,clif->pPMIgnoreAll,2);
-packet(0x00d3,2,clif->pPMIgnoreList,0);
-packet(0x00d5,-1,clif->pCreateChatRoom,2,4,6,7,15);
-packet(0x00d9,14,clif->pChatAddMember,2,6);
-packet(0x00de,-1,clif->pChatRoomStatusChange,2,4,6,7,15);
-packet(0x00e0,30,clif->pChangeChatOwner,2,6);
-packet(0x00e2,26,clif->pKickFromChat,2);
-packet(0x00e3,2,clif->pChatLeave,0);
-packet(0x00e4,6,clif->pTradeRequest,2);
-packet(0x00e6,3,clif->pTradeAck,2);
-packet(0x00e8,8,clif->pTradeAddItem,2,4);
-packet(0x00eb,2,clif->pTradeOk,0);
-packet(0x00ed,2,clif->pTradeCancel,0);
-packet(0x00ef,2,clif->pTradeCommit,0);
-packet(0x00f3,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-packet(0x00f5,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-packet(0x00f7,2,clif->pCloseKafra,0);
-packet(0x00f9,26,clif->pCreateParty,2);
-packet(0x00fc,6,clif->pPartyInvite,2);
-packet(0x00ff,10,clif->pReplyPartyInvite,2,6);
-packet(0x0100,2,clif->pLeaveParty,0);
-packet(0x0102,6,clif->pPartyChangeOption,2);
-packet(0x0103,30,clif->pRemovePartyMember,2,6);
-packet(0x0108,-1,clif->pPartyMessage,2,4);
-packet(0x0112,4,clif->pSkillUp,2);
-packet(0x0113,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-packet(0x0116,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-packet(0x0118,2,clif->pStopAttack,0);
-packet(0x011b,20,clif->pUseSkillMap,2,4);
-packet(0x011d,2,clif->pRequestMemo,0);
-packet(0x0126,8,clif->pPutItemToCart,2,4);
-packet(0x0127,8,clif->pGetItemFromCart,2,4);
-packet(0x0128,8,clif->pMoveFromKafraToCart,2,4);
-packet(0x0129,8,clif->pMoveToKafraFromCart,2,4);
-packet(0x012a,2,clif->pRemoveOption,0);
-packet(0x012e,2,clif->pCloseVending,0);
-packet(0x0130,6,clif->pVendingListReq,2);
-packet(0x0134,-1,clif->pPurchaseReq,2,4,8);
-packet(0x013f,26,clif->pGM_Monster_Item,2);
-packet(0x0140,22,clif->pMapMove,2,18,20);
-packet(0x0143,10,clif->pNpcAmountInput,2,6);
-packet(0x0146,6,clif->pNpcCloseClicked,2);
-packet(0x0149,9,clif->pGMReqNoChat,2,6,7);
-packet(0x014d,2,clif->pGuildCheckMaster,0);
-packet(0x014f,6,clif->pGuildRequestInfo,2);
-packet(0x0151,6,clif->pGuildRequestEmblem,2);
-packet(0x0153,-1,clif->pGuildChangeEmblem,2,4);
-packet(0x0155,-1,clif->pGuildChangeMemberPosition,2);
-packet(0x0159,54,clif->pGuildLeave,2,6,10,14);
-packet(0x015b,54,clif->pGuildExpulsion,2,6,10,14);
-packet(0x015d,42,clif->pGuildBreak,2);
-packet(0x0161,-1,clif->pGuildChangePositionInfo,2);
-packet(0x0165,30,clif->pCreateGuild,6);
-packet(0x0168,14,clif->pGuildInvite,2);
-packet(0x016b,10,clif->pGuildReplyInvite,2,6);
-packet(0x016e,186,clif->pGuildChangeNotice,2,6,66);
-packet(0x0170,14,clif->pGuildRequestAlliance,2);
-packet(0x0172,10,clif->pGuildReplyAlliance,2,6);
-packet(0x0178,4,clif->pItemIdentify,2);
-packet(0x017a,4,clif->pUseCard,2);
-packet(0x017c,6,clif->pInsertCard,2,4);
-packet(0x017e,-1,clif->pGuildMessage,2,4);
-packet(0x0180,6,clif->pGuildOpposition,2);
-packet(0x0183,10,clif->pGuildDelAlliance,2,6);
-packet(0x018a,4,clif->pQuitGame,0);
-packet(0x018e,10,clif->pProduceMix,2,4,6,8);
-packet(0x0190,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-packet(0x0193,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-packet(0x0197,4,clif->pResetChar,2);
-packet(0x0198,8,clif->pGMChangeMapType,2,4,6);
-packet(0x019c,-1,clif->pLocalBroadcast,2,4);
-packet(0x019d,6,clif->pGMHide,0);
-packet(0x019f,6,clif->pCatchPet,2);
-packet(0x01a1,3,clif->pPetMenu,2);
-packet(0x01a5,26,clif->pChangePetName,2);
-packet(0x01a7,4,clif->pSelectEgg,2);
-packet(0x01a9,6,clif->pSendEmotion,2);
-packet(0x01ae,4,clif->pSelectArrow,2);
-packet(0x01af,4,clif->pChangeCart,2);
-packet(0x01b2,-1,clif->pOpenVending,2,4,84,85);
-packet(0x01ba,26,clif->pGMShift,2);
-packet(0x01bb,26,clif->pGMShift,2);
-packet(0x01bc,26,clif->pGMRecall,2);
-packet(0x01bd,26,clif->pGMRecall,2);
-packet(0x01ce,6,clif->pAutoSpell,2);
-packet(0x01d5,-1,clif->pNpcStringInput,2,4,8);
-packet(0x01df,6,clif->pGMReqAccountName,2);
-packet(0x01e7,2,clif->pNoviceDoriDori,0);
-packet(0x01e8,28,clif->pCreateParty2,2);
-packet(0x01ed,2,clif->pNoviceExplosionSpirits,0);
-packet(0x01f7,14,clif->pAdopt_reply,0);
-packet(0x01f9,6,clif->pAdopt_request,0);
-packet(0x01fd,4,clif->pRepairItem,2);
-packet(0x0202,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-packet(0x0203,10,clif->pFriendsListRemove,2,6);
-packet(0x0208,11,clif->pFriendsListReply,2,6,10);
-packet(0x974,2,clif->cancelmergeitem);
-packet(0x96e,-1,clif->ackmergeitems);
+packet(0x0072,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+packet(0x007d,clif->pLoadEndAck,0);
+packet(0x007e,clif->pTickSend,2);  // CZ_REQUEST_TIME
+packet(0x0085,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+packet(0x0089,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+packet(0x008c,clif->pGlobalMessage,2,4);
+packet(0x0090,clif->pNpcClicked,2);
+packet(0x0094,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+packet(0x0096,clif->pWisMessage,2,4,28);
+packet(0x0099,clif->pBroadcast,2,4);
+packet(0x009b,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+packet(0x009f,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+packet(0x00a2,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+packet(0x00a7,clif->pUseItem,2,4);
+packet(0x00a9,clif->pEquipItem,2,4);
+packet(0x00ab,clif->pUnequipItem,2);
+packet(0x00b2,clif->pRestart,2);
+packet(0x00b8,clif->pNpcSelectMenu,2,6);
+packet(0x00b9,clif->pNpcNextClicked,2);
+packet(0x00bb,clif->pStatusUp,2,4);
+packet(0x00bf,clif->pEmotion,2);
+packet(0x00c1,clif->pHowManyConnections,0);
+packet(0x00c5,clif->pNpcBuySellSelected,2,6);
+packet(0x00c8,clif->pNpcBuyListSend,2,4);
+packet(0x00c9,clif->pNpcSellListSend,2,4);
+packet(0x00cc,clif->pGMKick,2);
+packet(0x00ce,clif->pGMKickAll,0);
+packet(0x00cf,clif->pPMIgnore,2,26);
+packet(0x00d0,clif->pPMIgnoreAll,2);
+packet(0x00d3,clif->pPMIgnoreList,0);
+packet(0x00d5,clif->pCreateChatRoom,2,4,6,7,15);
+packet(0x00d9,clif->pChatAddMember,2,6);
+packet(0x00de,clif->pChatRoomStatusChange,2,4,6,7,15);
+packet(0x00e0,clif->pChangeChatOwner,2,6);
+packet(0x00e2,clif->pKickFromChat,2);
+packet(0x00e3,clif->pChatLeave,0);
+packet(0x00e4,clif->pTradeRequest,2);
+packet(0x00e6,clif->pTradeAck,2);
+packet(0x00e8,clif->pTradeAddItem,2,4);
+packet(0x00eb,clif->pTradeOk,0);
+packet(0x00ed,clif->pTradeCancel,0);
+packet(0x00ef,clif->pTradeCommit,0);
+packet(0x00f3,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+packet(0x00f5,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+packet(0x00f7,clif->pCloseKafra,0);
+packet(0x00f9,clif->pCreateParty,2);
+packet(0x00fc,clif->pPartyInvite,2);
+packet(0x00ff,clif->pReplyPartyInvite,2,6);
+packet(0x0100,clif->pLeaveParty,0);
+packet(0x0102,clif->pPartyChangeOption,2);
+packet(0x0103,clif->pRemovePartyMember,2,6);
+packet(0x0108,clif->pPartyMessage,2,4);
+packet(0x0112,clif->pSkillUp,2);
+packet(0x0113,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+packet(0x0116,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+packet(0x0118,clif->pStopAttack,0);
+packet(0x011b,clif->pUseSkillMap,2,4);
+packet(0x011d,clif->pRequestMemo,0);
+packet(0x0126,clif->pPutItemToCart,2,4);
+packet(0x0127,clif->pGetItemFromCart,2,4);
+packet(0x0128,clif->pMoveFromKafraToCart,2,4);
+packet(0x0129,clif->pMoveToKafraFromCart,2,4);
+packet(0x012a,clif->pRemoveOption,0);
+packet(0x012e,clif->pCloseVending,0);
+packet(0x0130,clif->pVendingListReq,2);
+packet(0x0134,clif->pPurchaseReq,2,4,8);
+packet(0x013f,clif->pGM_Monster_Item,2);
+packet(0x0140,clif->pMapMove,2,18,20);
+packet(0x0143,clif->pNpcAmountInput,2,6);
+packet(0x0146,clif->pNpcCloseClicked,2);
+packet(0x0149,clif->pGMReqNoChat,2,6,7);
+packet(0x014d,clif->pGuildCheckMaster,0);
+packet(0x014f,clif->pGuildRequestInfo,2);
+packet(0x0151,clif->pGuildRequestEmblem,2);
+packet(0x0153,clif->pGuildChangeEmblem,2,4);
+packet(0x0155,clif->pGuildChangeMemberPosition,2);
+packet(0x0159,clif->pGuildLeave,2,6,10,14);
+packet(0x015b,clif->pGuildExpulsion,2,6,10,14);
+packet(0x015d,clif->pGuildBreak,2);
+packet(0x0161,clif->pGuildChangePositionInfo,2);
+packet(0x0165,clif->pCreateGuild,6);
+packet(0x0168,clif->pGuildInvite,2);
+packet(0x016b,clif->pGuildReplyInvite,2,6);
+packet(0x016e,clif->pGuildChangeNotice,2,6,66);
+packet(0x0170,clif->pGuildRequestAlliance,2);
+packet(0x0172,clif->pGuildReplyAlliance,2,6);
+packet(0x0178,clif->pItemIdentify,2);
+packet(0x017a,clif->pUseCard,2);
+packet(0x017c,clif->pInsertCard,2,4);
+packet(0x017e,clif->pGuildMessage,2,4);
+packet(0x0180,clif->pGuildOpposition,2);
+packet(0x0183,clif->pGuildDelAlliance,2,6);
+packet(0x018a,clif->pQuitGame,0);
+packet(0x018e,clif->pProduceMix,2,4,6,8);
+packet(0x0190,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+packet(0x0193,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+packet(0x0197,clif->pResetChar,2);
+packet(0x0198,clif->pGMChangeMapType,2,4,6);
+packet(0x019c,clif->pLocalBroadcast,2,4);
+packet(0x019d,clif->pGMHide,0);
+packet(0x019f,clif->pCatchPet,2);
+packet(0x01a1,clif->pPetMenu,2);
+packet(0x01a5,clif->pChangePetName,2);
+packet(0x01a7,clif->pSelectEgg,2);
+packet(0x01a9,clif->pSendEmotion,2);
+packet(0x01ae,clif->pSelectArrow,2);
+packet(0x01af,clif->pChangeCart,2);
+packet(0x01b2,clif->pOpenVending,2,4,84,85);
+packet(0x01ba,clif->pGMShift,2);
+packet(0x01bb,clif->pGMShift,2);
+packet(0x01bc,clif->pGMRecall,2);
+packet(0x01bd,clif->pGMRecall,2);
+packet(0x01ce,clif->pAutoSpell,2);
+packet(0x01d5,clif->pNpcStringInput,2,4,8);
+packet(0x01df,clif->pGMReqAccountName,2);
+packet(0x01e7,clif->pNoviceDoriDori,0);
+packet(0x01e8,clif->pCreateParty2,2);
+packet(0x01ed,clif->pNoviceExplosionSpirits,0);
+packet(0x01f7,clif->pAdopt_reply,0);
+packet(0x01f9,clif->pAdopt_request,0);
+packet(0x01fd,clif->pRepairItem,2);
+packet(0x0202,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+packet(0x0203,clif->pFriendsListRemove,2,6);
+packet(0x0208,clif->pFriendsListReply,2,6,10);
+packet(0x974,clif->cancelmergeitem);
+packet(0x96e,clif->ackmergeitems);
 
 //2004-07-05aSakexe
 #if PACKETVER >= 20040705
-	packet(0x0072,22,clif->pWantToConnection,5,9,13,17,21);
-	packet(0x0085,8,clif->pWalkToXY,5);
-	packet(0x00a7,13,clif->pUseItem,5,9);
-	packet(0x0113,15,clif->pUseSkillToId,4,9,11);
-	packet(0x0116,15,clif->pUseSkillToPos,4,9,11,13);
-	packet(0x0190,95,clif->pUseSkillToPosMoreInfo,4,9,11,13,15);
-	packet(0x0208,14,clif->pFriendsListReply,2,6,10);
+	packet(0x0072,clif->pWantToConnection,5,9,13,17,21);
+	packet(0x0085,clif->pWalkToXY,5);
+	packet(0x00a7,clif->pUseItem,5,9);
+	packet(0x0113,clif->pUseSkillToId,4,9,11);
+	packet(0x0116,clif->pUseSkillToPos,4,9,11,13);
+	packet(0x0190,clif->pUseSkillToPosMoreInfo,4,9,11,13,15);
+	packet(0x0208,clif->pFriendsListReply,2,6,10);
 #endif
 
 //2004-07-13aSakexe
 #if PACKETVER >= 20040713
-	packet(0x0072,39,clif->pWantToConnection,12,22,30,34,38);
-	packet(0x0085,9,clif->pWalkToXY,6);
-	packet(0x009b,13,clif->pChangeDir,5,12);
-	packet(0x009f,10,clif->pTakeItem,6);
-	packet(0x00a7,17,clif->pUseItem,6,13);
-	packet(0x0113,19,clif->pUseSkillToId,7,9,15);
-	packet(0x0116,19,clif->pUseSkillToPos,7,9,15,17);
-	packet(0x0190,99,clif->pUseSkillToPosMoreInfo,7,9,15,17,19);
+	packet(0x0072,clif->pWantToConnection,12,22,30,34,38);
+	packet(0x0085,clif->pWalkToXY,6);
+	packet(0x009b,clif->pChangeDir,5,12);
+	packet(0x009f,clif->pTakeItem,6);
+	packet(0x00a7,clif->pUseItem,6,13);
+	packet(0x0113,clif->pUseSkillToId,7,9,15);
+	packet(0x0116,clif->pUseSkillToPos,7,9,15,17);
+	packet(0x0190,clif->pUseSkillToPosMoreInfo,7,9,15,17,19);
 #endif
 
 //2004-07-26aSakexe
 #if PACKETVER >= 20040726
-	packet(0x0072,14,clif->pDropItem,5,12);
-	packet(0x007e,33,clif->pWantToConnection,12,18,24,28,32);
-	packet(0x0085,20,clif->pUseSkillToId,7,12,16);
-	packet(0x0089,15,clif->pGetCharNameRequest,11);
-	packet(0x008c,23,clif->pUseSkillToPos,3,6,17,21);
-	packet(0x0094,10,clif->pTakeItem,6);
-	packet(0x009b,6,clif->pWalkToXY,3);
-	packet(0x009f,13,clif->pChangeDir,5,12);
-	packet(0x00a2,103,clif->pUseSkillToPosMoreInfo,3,6,17,21,23);
-	packet(0x00a7,12,clif->pSolveCharName,8);
-	packet(0x00f3,-1,clif->pGlobalMessage,2,4);
-	packet(0x00f5,17,clif->pUseItem,6,12);
-	packet(0x00f7,10,clif->pTickSend,6);
-	packet(0x0113,16,clif->pMoveToKafra,5,12);
-	packet(0x0116,2,clif->pCloseKafra,0);
-	packet(0x0190,26,clif->pMoveFromKafra,10,22);
-	packet(0x0193,9,clif->pActionRequest,3,8);
+	packet(0x0072,clif->pDropItem,5,12);
+	packet(0x007e,clif->pWantToConnection,12,18,24,28,32);
+	packet(0x0085,clif->pUseSkillToId,7,12,16);
+	packet(0x0089,clif->pGetCharNameRequest,11);
+	packet(0x008c,clif->pUseSkillToPos,3,6,17,21);
+	packet(0x0094,clif->pTakeItem,6);
+	packet(0x009b,clif->pWalkToXY,3);
+	packet(0x009f,clif->pChangeDir,5,12);
+	packet(0x00a2,clif->pUseSkillToPosMoreInfo,3,6,17,21,23);
+	packet(0x00a7,clif->pSolveCharName,8);
+	packet(0x00f3,clif->pGlobalMessage,2,4);
+	packet(0x00f5,clif->pUseItem,6,12);
+	packet(0x00f7,clif->pTickSend,6);
+	packet(0x0113,clif->pMoveToKafra,5,12);
+	packet(0x0116,clif->pCloseKafra,0);
+	packet(0x0190,clif->pMoveFromKafra,10,22);
+	packet(0x0193,clif->pActionRequest,3,8);
 #endif
 
 //2004-08-09aSakexe
 #if PACKETVER >= 20040809
-	packet(0x0072,17,clif->pDropItem,8,15);
-	packet(0x007e,37,clif->pWantToConnection,9,21,28,32,36);
-	packet(0x0085,26,clif->pUseSkillToId,11,18,22);
-	packet(0x0089,12,clif->pGetCharNameRequest,8);
-	packet(0x008c,40,clif->pUseSkillToPos,5,15,29,38);
-	packet(0x0094,13,clif->pTakeItem,9);
-	packet(0x009b,15,clif->pWalkToXY,12);
-	packet(0x009f,12,clif->pChangeDir,7,11);
-	packet(0x00a2,120,clif->pUseSkillToPosMoreInfo,5,15,29,38,40);
-	packet(0x00a7,11,clif->pSolveCharName,7);
-	packet(0x00f5,24,clif->pUseItem,9,20);
-	packet(0x00f7,13,clif->pTickSend,9);
-	packet(0x0113,23,clif->pMoveToKafra,5,19);
-	packet(0x0190,26,clif->pMoveFromKafra,11,22);
-	packet(0x0193,18,clif->pActionRequest,7,17);
+	packet(0x0072,clif->pDropItem,8,15);
+	packet(0x007e,clif->pWantToConnection,9,21,28,32,36);
+	packet(0x0085,clif->pUseSkillToId,11,18,22);
+	packet(0x0089,clif->pGetCharNameRequest,8);
+	packet(0x008c,clif->pUseSkillToPos,5,15,29,38);
+	packet(0x0094,clif->pTakeItem,9);
+	packet(0x009b,clif->pWalkToXY,12);
+	packet(0x009f,clif->pChangeDir,7,11);
+	packet(0x00a2,clif->pUseSkillToPosMoreInfo,5,15,29,38,40);
+	packet(0x00a7,clif->pSolveCharName,7);
+	packet(0x00f5,clif->pUseItem,9,20);
+	packet(0x00f7,clif->pTickSend,9);
+	packet(0x0113,clif->pMoveToKafra,5,19);
+	packet(0x0190,clif->pMoveFromKafra,11,22);
+	packet(0x0193,clif->pActionRequest,7,17);
 #endif
 
 //2004-08-16aSakexe
 #if PACKETVER >= 20040816
-	packet(0x0212,26,clif->pGMRc,2);
-	packet(0x0213,26,clif->pCheck,2);
+	packet(0x0212,clif->pGMRc,2);
+	packet(0x0213,clif->pCheck,2);
 #endif
 
 //2004-08-17aSakexe
 #if PACKETVER >= 20040817
-	packet(0x020f,10,clif->pPVPInfo,2,6);
+	packet(0x020f,clif->pPVPInfo,2,6);
 #endif
 
 //2004-09-06aSakexe
 #if PACKETVER >= 20040906
-	packet(0x0072,20,clif->pUseItem,9,20);
-	packet(0x007e,19,clif->pMoveToKafra,3,15);
-	packet(0x0085,23,clif->pActionRequest,9,22);
-	packet(0x0089,9,clif->pWalkToXY,6);
-	packet(0x008c,105,clif->pUseSkillToPosMoreInfo,10,14,18,23,25);
-	packet(0x0094,17,clif->pDropItem,6,15);
-	packet(0x009b,14,clif->pGetCharNameRequest,10);
-	packet(0x009f,-1,clif->pGlobalMessage,2,4);
-	packet(0x00a2,14,clif->pSolveCharName,10);
-	packet(0x00a7,25,clif->pUseSkillToPos,10,14,18,23);
-	packet(0x00f3,10,clif->pChangeDir,4,9);
-	packet(0x00f5,34,clif->pWantToConnection,7,15,25,29,33);
-	packet(0x00f7,2,clif->pCloseKafra,0);
-	packet(0x0113,11,clif->pTakeItem,7);
-	packet(0x0116,11,clif->pTickSend,7);
-	packet(0x0190,22,clif->pUseSkillToId,9,15,18);
-	packet(0x0193,17,clif->pMoveFromKafra,3,13);
+	packet(0x0072,clif->pUseItem,9,20);
+	packet(0x007e,clif->pMoveToKafra,3,15);
+	packet(0x0085,clif->pActionRequest,9,22);
+	packet(0x0089,clif->pWalkToXY,6);
+	packet(0x008c,clif->pUseSkillToPosMoreInfo,10,14,18,23,25);
+	packet(0x0094,clif->pDropItem,6,15);
+	packet(0x009b,clif->pGetCharNameRequest,10);
+	packet(0x009f,clif->pGlobalMessage,2,4);
+	packet(0x00a2,clif->pSolveCharName,10);
+	packet(0x00a7,clif->pUseSkillToPos,10,14,18,23);
+	packet(0x00f3,clif->pChangeDir,4,9);
+	packet(0x00f5,clif->pWantToConnection,7,15,25,29,33);
+	packet(0x00f7,clif->pCloseKafra,0);
+	packet(0x0113,clif->pTakeItem,7);
+	packet(0x0116,clif->pTickSend,7);
+	packet(0x0190,clif->pUseSkillToId,9,15,18);
+	packet(0x0193,clif->pMoveFromKafra,3,13);
 #endif
 
 //2004-09-20aSakexe
 #if PACKETVER >= 20040920
-	packet(0x0072,18,clif->pUseItem,10,14);
-	packet(0x007e,25,clif->pMoveToKafra,6,21);
-	packet(0x0085,9,clif->pActionRequest,3,8);
-	packet(0x0089,14,clif->pWalkToXY,11);
-	packet(0x008c,109,clif->pUseSkillToPosMoreInfo,16,20,23,27,29);
-	packet(0x0094,19,clif->pDropItem,12,17);
-	packet(0x009b,10,clif->pGetCharNameRequest,6);
-	packet(0x00a2,10,clif->pSolveCharName,6);
-	packet(0x00a7,29,clif->pUseSkillToPos,6,20,23,27);
-	packet(0x00f3,18,clif->pChangeDir,8,17);
-	packet(0x00f5,32,clif->pWantToConnection,10,17,23,27,31);
-	packet(0x0113,14,clif->pTakeItem,10);
-	packet(0x0116,14,clif->pTickSend,10);
-	packet(0x0190,14,clif->pUseSkillToId,4,7,10);
-	packet(0x0193,12,clif->pMoveFromKafra,4,8);
+	packet(0x0072,clif->pUseItem,10,14);
+	packet(0x007e,clif->pMoveToKafra,6,21);
+	packet(0x0085,clif->pActionRequest,3,8);
+	packet(0x0089,clif->pWalkToXY,11);
+	packet(0x008c,clif->pUseSkillToPosMoreInfo,16,20,23,27,29);
+	packet(0x0094,clif->pDropItem,12,17);
+	packet(0x009b,clif->pGetCharNameRequest,6);
+	packet(0x00a2,clif->pSolveCharName,6);
+	packet(0x00a7,clif->pUseSkillToPos,6,20,23,27);
+	packet(0x00f3,clif->pChangeDir,8,17);
+	packet(0x00f5,clif->pWantToConnection,10,17,23,27,31);
+	packet(0x0113,clif->pTakeItem,10);
+	packet(0x0116,clif->pTickSend,10);
+	packet(0x0190,clif->pUseSkillToId,4,7,10);
+	packet(0x0193,clif->pMoveFromKafra,4,8);
 #endif
 
 //2004-10-05aSakexe
 #if PACKETVER >= 20041005
-	packet(0x0072,17,clif->pUseItem,6,13);
-	packet(0x007e,16,clif->pMoveToKafra,5,12);
-	packet(0x0089,6,clif->pWalkToXY,3);
-	packet(0x008c,103,clif->pUseSkillToPosMoreInfo,2,6,17,21,23);
-	packet(0x0094,14,clif->pDropItem,5,12);
-	packet(0x009b,15,clif->pGetCharNameRequest,11);
-	packet(0x00a2,12,clif->pSolveCharName,8);
-	packet(0x00a7,23,clif->pUseSkillToPos,3,6,17,21);
-	packet(0x00f3,13,clif->pChangeDir,5,12);
-	packet(0x00f5,33,clif->pWantToConnection,12,18,24,28,32);
-	packet(0x0113,10,clif->pTakeItem,6);
-	packet(0x0116,10,clif->pTickSend,6);
-	packet(0x0190,20,clif->pUseSkillToId,7,12,16);
-	packet(0x0193,26,clif->pMoveFromKafra,10,22);
+	packet(0x0072,clif->pUseItem,6,13);
+	packet(0x007e,clif->pMoveToKafra,5,12);
+	packet(0x0089,clif->pWalkToXY,3);
+	packet(0x008c,clif->pUseSkillToPosMoreInfo,2,6,17,21,23);
+	packet(0x0094,clif->pDropItem,5,12);
+	packet(0x009b,clif->pGetCharNameRequest,11);
+	packet(0x00a2,clif->pSolveCharName,8);
+	packet(0x00a7,clif->pUseSkillToPos,3,6,17,21);
+	packet(0x00f3,clif->pChangeDir,5,12);
+	packet(0x00f5,clif->pWantToConnection,12,18,24,28,32);
+	packet(0x0113,clif->pTakeItem,6);
+	packet(0x0116,clif->pTickSend,6);
+	packet(0x0190,clif->pUseSkillToId,7,12,16);
+	packet(0x0193,clif->pMoveFromKafra,10,22);
 #endif
 
 //2004-10-25aSakexe
 #if PACKETVER >= 20041025
-	packet(0x0072,13,clif->pUseItem,5,9);
-	packet(0x007e,13,clif->pMoveToKafra,6,9);
-	packet(0x0085,15,clif->pActionRequest,4,14);
-	packet(0x008c,108,clif->pUseSkillToPosMoreInfo,6,9,23,26,28);
-	packet(0x0094,12,clif->pDropItem,6,10);
-	packet(0x009b,10,clif->pGetCharNameRequest,6);
-	packet(0x00a2,16,clif->pSolveCharName,12);
-	packet(0x00a7,28,clif->pUseSkillToPos,6,9,23,26);
-	packet(0x00f3,15,clif->pChangeDir,6,14);
-	packet(0x00f5,29,clif->pWantToConnection,5,14,20,24,28);
-	packet(0x0113,9,clif->pTakeItem,5);
-	packet(0x0116,9,clif->pTickSend,5);
-	packet(0x0190,26,clif->pUseSkillToId,4,10,22);
-	packet(0x0193,22,clif->pMoveFromKafra,12,18);
+	packet(0x0072,clif->pUseItem,5,9);
+	packet(0x007e,clif->pMoveToKafra,6,9);
+	packet(0x0085,clif->pActionRequest,4,14);
+	packet(0x008c,clif->pUseSkillToPosMoreInfo,6,9,23,26,28);
+	packet(0x0094,clif->pDropItem,6,10);
+	packet(0x009b,clif->pGetCharNameRequest,6);
+	packet(0x00a2,clif->pSolveCharName,12);
+	packet(0x00a7,clif->pUseSkillToPos,6,9,23,26);
+	packet(0x00f3,clif->pChangeDir,6,14);
+	packet(0x00f5,clif->pWantToConnection,5,14,20,24,28);
+	packet(0x0113,clif->pTakeItem,5);
+	packet(0x0116,clif->pTickSend,5);
+	packet(0x0190,clif->pUseSkillToId,4,10,22);
+	packet(0x0193,clif->pMoveFromKafra,12,18);
 #endif
 
 //2004-11-08aSakexe
 #if PACKETVER >= 20041108
-	packet(0x0217,2,clif->pBlacksmith,0);
-	packet(0x0218,2,clif->pAlchemist,0);
+	packet(0x0217,clif->pBlacksmith,0);
+	packet(0x0218,clif->pAlchemist,0);
 #endif
 
 //2004-11-15aSakexe
 #if PACKETVER >= 20041115
-	packet(0x021d,6,clif->pLessEffect,2);
+	packet(0x021d,clif->pLessEffect,2);
 #endif
 
 //2004-11-29aSakexe
 #if PACKETVER >= 20041129
-	packet(0x0072,22,clif->pUseSkillToId,8,12,18);
-	packet(0x007e,30,clif->pUseSkillToPos,4,9,22,28);
-	packet(0x0085,-1,clif->pGlobalMessage,2,4);
-	packet(0x0089,7,clif->pTickSend,3);
-	packet(0x008c,13,clif->pGetCharNameRequest,9);
-	packet(0x0094,14,clif->pMoveToKafra,4,10);
-	packet(0x009b,2,clif->pCloseKafra,0);
-	packet(0x009f,18,clif->pActionRequest,6,17);
-	packet(0x00a2,7,clif->pTakeItem,3);
-	packet(0x00a7,7,clif->pWalkToXY,4);
-	packet(0x00f3,8,clif->pChangeDir,3,7);
-	packet(0x00f5,29,clif->pWantToConnection,3,10,20,24,28);
-	packet(0x00f7,14,clif->pSolveCharName,10);
-	packet(0x0113,110,clif->pUseSkillToPosMoreInfo,4,9,22,28,30);
-	packet(0x0116,12,clif->pDropItem,4,10);
-	packet(0x0190,15,clif->pUseItem,3,11);
-	packet(0x0193,21,clif->pMoveFromKafra,4,17);
-	packet(0x0222,6,clif->pWeaponRefine,2);
+	packet(0x0072,clif->pUseSkillToId,8,12,18);
+	packet(0x007e,clif->pUseSkillToPos,4,9,22,28);
+	packet(0x0085,clif->pGlobalMessage,2,4);
+	packet(0x0089,clif->pTickSend,3);
+	packet(0x008c,clif->pGetCharNameRequest,9);
+	packet(0x0094,clif->pMoveToKafra,4,10);
+	packet(0x009b,clif->pCloseKafra,0);
+	packet(0x009f,clif->pActionRequest,6,17);
+	packet(0x00a2,clif->pTakeItem,3);
+	packet(0x00a7,clif->pWalkToXY,4);
+	packet(0x00f3,clif->pChangeDir,3,7);
+	packet(0x00f5,clif->pWantToConnection,3,10,20,24,28);
+	packet(0x00f7,clif->pSolveCharName,10);
+	packet(0x0113,clif->pUseSkillToPosMoreInfo,4,9,22,28,30);
+	packet(0x0116,clif->pDropItem,4,10);
+	packet(0x0190,clif->pUseItem,3,11);
+	packet(0x0193,clif->pMoveFromKafra,4,17);
+	packet(0x0222,clif->pWeaponRefine,2);
 #endif
 
 //2005-01-10bSakexe
 #if PACKETVER >= 20050110
-	packet(0x0072,26,clif->pUseSkillToId,8,16,22);
-	packet(0x007e,114,clif->pUseSkillToPosMoreInfo,10,18,22,32,34);
-	packet(0x0085,23,clif->pChangeDir,12,22);
-	packet(0x0089,9,clif->pTickSend,5);
-	packet(0x008c,8,clif->pGetCharNameRequest,4);
-	packet(0x0094,20,clif->pMoveToKafra,10,16);
-	packet(0x009b,32,clif->pWantToConnection,3,12,23,27,31);
-	packet(0x009f,17,clif->pUseItem,5,13);
-	packet(0x00a2,11,clif->pSolveCharName,7);
-	packet(0x00a7,13,clif->pWalkToXY,10);
-	packet(0x00f3,-1,clif->pGlobalMessage,2,4);
-	packet(0x00f5,9,clif->pTakeItem,5);
-	packet(0x00f7,21,clif->pMoveFromKafra,11,17);
-	packet(0x0113,34,clif->pUseSkillToPos,10,18,22,32);
-	packet(0x0116,20,clif->pDropItem,15,18);
-	packet(0x0190,20,clif->pActionRequest,9,19);
-	packet(0x0193,2,clif->pCloseKafra,0);
+	packet(0x0072,clif->pUseSkillToId,8,16,22);
+	packet(0x007e,clif->pUseSkillToPosMoreInfo,10,18,22,32,34);
+	packet(0x0085,clif->pChangeDir,12,22);
+	packet(0x0089,clif->pTickSend,5);
+	packet(0x008c,clif->pGetCharNameRequest,4);
+	packet(0x0094,clif->pMoveToKafra,10,16);
+	packet(0x009b,clif->pWantToConnection,3,12,23,27,31);
+	packet(0x009f,clif->pUseItem,5,13);
+	packet(0x00a2,clif->pSolveCharName,7);
+	packet(0x00a7,clif->pWalkToXY,10);
+	packet(0x00f3,clif->pGlobalMessage,2,4);
+	packet(0x00f5,clif->pTakeItem,5);
+	packet(0x00f7,clif->pMoveFromKafra,11,17);
+	packet(0x0113,clif->pUseSkillToPos,10,18,22,32);
+	packet(0x0116,clif->pDropItem,15,18);
+	packet(0x0190,clif->pActionRequest,9,19);
+	packet(0x0193,clif->pCloseKafra,0);
 #endif
 
 //2005-03-28aSakexe
 #if PACKETVER >= 20050328
-	packet(0x0225,2,clif->pTaekwon,0);
+	packet(0x0225,clif->pTaekwon,0);
 #endif
 
 //2005-04-25aSakexe
 #if PACKETVER >= 20050425
-	packet(0x022d,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x0232,9,clif->pHomMoveTo,2,6);
-	packet(0x0233,11,clif->pHomAttack,2,6,10);
-	packet(0x0234,6,clif->pHomMoveToMaster,2);
+	packet(0x022d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x0232,clif->pHomMoveTo,2,6);
+	packet(0x0233,clif->pHomAttack,2,6,10);
+	packet(0x0234,clif->pHomMoveToMaster,2);
 #endif
 
 //2005-05-09aSakexe
 #if PACKETVER >= 20050509
-	packet(0x0072,25,clif->pUseSkillToId,6,10,21);
-	packet(0x007e,102,clif->pUseSkillToPosMoreInfo,5,9,12,20,22);
-	packet(0x0085,11,clif->pChangeDir,7,10);
-	packet(0x0089,8,clif->pTickSend,4);
-	packet(0x008c,11,clif->pGetCharNameRequest,7);
-	packet(0x0094,14,clif->pMoveToKafra,7,10);
-	packet(0x009b,26,clif->pWantToConnection,4,9,17,21,25);
-	packet(0x009f,14,clif->pUseItem,4,10);
-	packet(0x00a2,15,clif->pSolveCharName,11);
-	packet(0x00a7,8,clif->pWalkToXY,5);
-	packet(0x00f5,8,clif->pTakeItem,4);
-	packet(0x00f7,22,clif->pMoveFromKafra,14,18);
-	packet(0x0113,22,clif->pUseSkillToPos,5,9,12,20);
-	packet(0x0116,10,clif->pDropItem,5,8);
-	packet(0x0190,19,clif->pActionRequest,5,18);
+	packet(0x0072,clif->pUseSkillToId,6,10,21);
+	packet(0x007e,clif->pUseSkillToPosMoreInfo,5,9,12,20,22);
+	packet(0x0085,clif->pChangeDir,7,10);
+	packet(0x0089,clif->pTickSend,4);
+	packet(0x008c,clif->pGetCharNameRequest,7);
+	packet(0x0094,clif->pMoveToKafra,7,10);
+	packet(0x009b,clif->pWantToConnection,4,9,17,21,25);
+	packet(0x009f,clif->pUseItem,4,10);
+	packet(0x00a2,clif->pSolveCharName,11);
+	packet(0x00a7,clif->pWalkToXY,5);
+	packet(0x00f5,clif->pTakeItem,4);
+	packet(0x00f7,clif->pMoveFromKafra,14,18);
+	packet(0x0113,clif->pUseSkillToPos,5,9,12,20);
+	packet(0x0116,clif->pDropItem,5,8);
+	packet(0x0190,clif->pActionRequest,5,18);
 #endif
 
 //2005-05-30aSakexe
 #if PACKETVER >= 20050530
-	packet(0x0237,2,clif->pRankingPk,0);
+	packet(0x0237,clif->pRankingPk,0);
 #endif
 
 //2005-06-08aSakexe
 #if PACKETVER >= 20050608
-	packet(0x0217,2,clif->pBlacksmith,0);
-	packet(0x0231,26,clif->pChangeHomunculusName,0);
-	packet(0x023b,36,clif->pStoragePassword,2,4,20);
+	packet(0x0217,clif->pBlacksmith,0);
+	packet(0x0231,clif->pChangeHomunculusName,0);
+	packet(0x023b,clif->pStoragePassword,2,4,20);
 #endif
 
 //2005-06-28aSakexe
 #if PACKETVER >= 20050628
-	packet(0x0072,34,clif->pUseSkillToId,6,17,30);
-	packet(0x007e,113,clif->pUseSkillToPosMoreInfo,12,15,18,31,33);
-	packet(0x0085,17,clif->pChangeDir,8,16);
-	packet(0x0089,13,clif->pTickSend,9);
-	packet(0x008c,8,clif->pGetCharNameRequest,4);
-	packet(0x0094,31,clif->pMoveToKafra,16,27);
-	packet(0x009b,32,clif->pWantToConnection,9,15,23,27,31);
-	packet(0x009f,19,clif->pUseItem,9,15);
-	packet(0x00a2,9,clif->pSolveCharName,5);
-	packet(0x00a7,11,clif->pWalkToXY,8);
-	packet(0x00f5,13,clif->pTakeItem,9);
-	packet(0x00f7,18,clif->pMoveFromKafra,11,14);
-	packet(0x0113,33,clif->pUseSkillToPos,12,15,18,31);
-	packet(0x0116,12,clif->pDropItem,3,10);
-	packet(0x0190,24,clif->pActionRequest,11,23);
+	packet(0x0072,clif->pUseSkillToId,6,17,30);
+	packet(0x007e,clif->pUseSkillToPosMoreInfo,12,15,18,31,33);
+	packet(0x0085,clif->pChangeDir,8,16);
+	packet(0x0089,clif->pTickSend,9);
+	packet(0x008c,clif->pGetCharNameRequest,4);
+	packet(0x0094,clif->pMoveToKafra,16,27);
+	packet(0x009b,clif->pWantToConnection,9,15,23,27,31);
+	packet(0x009f,clif->pUseItem,9,15);
+	packet(0x00a2,clif->pSolveCharName,5);
+	packet(0x00a7,clif->pWalkToXY,8);
+	packet(0x00f5,clif->pTakeItem,9);
+	packet(0x00f7,clif->pMoveFromKafra,11,14);
+	packet(0x0113,clif->pUseSkillToPos,12,15,18,31);
+	packet(0x0116,clif->pDropItem,3,10);
+	packet(0x0190,clif->pActionRequest,11,23);
 #endif
 
 //2005-07-18aSakexe
 #if PACKETVER >= 20050718
-	packet(0x0072,19,clif->pUseSkillToId,5,11,15);
-	packet(0x007e,110,clif->pUseSkillToPosMoreInfo,9,15,23,28,30);
-	packet(0x0085,11,clif->pChangeDir,6,10);
-	packet(0x0089,7,clif->pTickSend,3);
-	packet(0x008c,11,clif->pGetCharNameRequest,7);
-	packet(0x0094,21,clif->pMoveToKafra,12,17);
-	packet(0x009b,31,clif->pWantToConnection,3,13,22,26,30);
-	packet(0x009f,12,clif->pUseItem,3,8);
-	packet(0x00a2,18,clif->pSolveCharName,14);
-	packet(0x00a7,15,clif->pWalkToXY,12);
-	packet(0x00f5,7,clif->pTakeItem,3);
-	packet(0x00f7,13,clif->pMoveFromKafra,5,9);
-	packet(0x0113,30,clif->pUseSkillToPos,9,15,23,28);
-	packet(0x0116,12,clif->pDropItem,6,10);
-	packet(0x0190,21,clif->pActionRequest,5,20);
-	packet(0x023f,2,clif->pMail_refreshinbox,0);
-	packet(0x0241,6,clif->pMail_read,2);
-	packet(0x0243,6,clif->pMail_delete,2);
-	packet(0x0244,6,clif->pMail_getattach,2);
-	packet(0x0246,4,clif->pMail_winopen,2);
-	packet(0x0247,8,clif->pMail_setattach,2,4);
-	packet(0x024b,4,clif->pAuction_cancelreg,0);
-	packet(0x024c,8,clif->pAuction_setitem,0);
-	packet(0x024e,6,clif->pAuction_cancel,0);
-	packet(0x024f,10,clif->pAuction_bid,0);
+	packet(0x0072,clif->pUseSkillToId,5,11,15);
+	packet(0x007e,clif->pUseSkillToPosMoreInfo,9,15,23,28,30);
+	packet(0x0085,clif->pChangeDir,6,10);
+	packet(0x0089,clif->pTickSend,3);
+	packet(0x008c,clif->pGetCharNameRequest,7);
+	packet(0x0094,clif->pMoveToKafra,12,17);
+	packet(0x009b,clif->pWantToConnection,3,13,22,26,30);
+	packet(0x009f,clif->pUseItem,3,8);
+	packet(0x00a2,clif->pSolveCharName,14);
+	packet(0x00a7,clif->pWalkToXY,12);
+	packet(0x00f5,clif->pTakeItem,3);
+	packet(0x00f7,clif->pMoveFromKafra,5,9);
+	packet(0x0113,clif->pUseSkillToPos,9,15,23,28);
+	packet(0x0116,clif->pDropItem,6,10);
+	packet(0x0190,clif->pActionRequest,5,20);
+	packet(0x023f,clif->pMail_refreshinbox,0);
+	packet(0x0241,clif->pMail_read,2);
+	packet(0x0243,clif->pMail_delete,2);
+	packet(0x0244,clif->pMail_getattach,2);
+	packet(0x0246,clif->pMail_winopen,2);
+	packet(0x0247,clif->pMail_setattach,2,4);
+	packet(0x024b,clif->pAuction_cancelreg,0);
+	packet(0x024c,clif->pAuction_setitem,0);
+	packet(0x024e,clif->pAuction_cancel,0);
+	packet(0x024f,clif->pAuction_bid,0);
 #endif
 
 //2005-07-19bSakexe
 #if PACKETVER >= 20050719
-	packet(0x0072,34,clif->pUseSkillToId,6,17,30);
-	packet(0x007e,113,clif->pUseSkillToPosMoreInfo,12,15,18,31,33);
-	packet(0x0085,17,clif->pChangeDir,8,16);
-	packet(0x0089,13,clif->pTickSend,9);
-	packet(0x008c,8,clif->pGetCharNameRequest,4);
-	packet(0x0094,31,clif->pMoveToKafra,16,27);
-	packet(0x009b,32,clif->pWantToConnection,9,15,23,27,31);
-	packet(0x009f,19,clif->pUseItem,9,15);
-	packet(0x00a2,9,clif->pSolveCharName,5);
-	packet(0x00a7,11,clif->pWalkToXY,8);
-	packet(0x00f5,13,clif->pTakeItem,9);
-	packet(0x00f7,18,clif->pMoveFromKafra,11,14);
-	packet(0x0113,33,clif->pUseSkillToPos,12,15,18,31);
-	packet(0x0116,12,clif->pDropItem,3,10);
-	packet(0x0190,24,clif->pActionRequest,11,23);
+	packet(0x0072,clif->pUseSkillToId,6,17,30);
+	packet(0x007e,clif->pUseSkillToPosMoreInfo,12,15,18,31,33);
+	packet(0x0085,clif->pChangeDir,8,16);
+	packet(0x0089,clif->pTickSend,9);
+	packet(0x008c,clif->pGetCharNameRequest,4);
+	packet(0x0094,clif->pMoveToKafra,16,27);
+	packet(0x009b,clif->pWantToConnection,9,15,23,27,31);
+	packet(0x009f,clif->pUseItem,9,15);
+	packet(0x00a2,clif->pSolveCharName,5);
+	packet(0x00a7,clif->pWalkToXY,8);
+	packet(0x00f5,clif->pTakeItem,9);
+	packet(0x00f7,clif->pMoveFromKafra,11,14);
+	packet(0x0113,clif->pUseSkillToPos,12,15,18,31);
+	packet(0x0116,clif->pDropItem,3,10);
+	packet(0x0190,clif->pActionRequest,11,23);
 #endif
 
 //2005-08-08aSakexe
 #if PACKETVER >= 20050808
-	packet(0x024d,12,clif->pAuction_register,0);
+	packet(0x024d,clif->pAuction_register,0);
 #endif
 
 //2005-08-17aSakexe
 #if PACKETVER >= 20050817
-	packet(0x0254,3,clif->pFeelSaveOk,0);
+	packet(0x0254,clif->pFeelSaveOk,0);
 #endif
 
 //2005-08-29aSakexe
 #if PACKETVER >= 20050829
-	packet(0x0248,-1,clif->pMail_send,2,4,28,68);
+	packet(0x0248,clif->pMail_send,2,4,28,68);
 #endif
 
 //2005-10-10aSakexe
 #if PACKETVER >= 20051010
-	packet(0x025b,6,clif->pCooking,0);
+	packet(0x025b,clif->pCooking,0);
 #endif
 
 //2005-10-13aSakexe
 #if PACKETVER >= 20051013
-	packet(0x025c,4,clif->pAuction_buysell,0);
+	packet(0x025c,clif->pAuction_buysell,0);
 #endif
 
 //2005-10-17aSakexe
 #if PACKETVER >= 20051017
-	packet(0x025d,6,clif->pAuction_close,0);
+	packet(0x025d,clif->pAuction_close,0);
 #endif
 
 //2005-11-07aSakexe
 #if PACKETVER >= 20051107
-	packet(0x024e,6,clif->pAuction_cancel,0);
-	packet(0x0251,34,clif->pAuction_search,0);
+	packet(0x024e,clif->pAuction_cancel,0);
+	packet(0x0251,clif->pAuction_search,0);
 #endif
 
 //2006-03-13aSakexe
 #if PACKETVER >= 20060313
-	packet(0x0273,30,clif->pMail_return,2,6);
+	packet(0x0273,clif->pMail_return,2,6);
 #endif
 
 //2006-03-27aSakexe
 #if PACKETVER >= 20060327
-	packet(0x0072,26,clif->pUseSkillToId,11,18,22);
-	packet(0x007e,120,clif->pUseSkillToPosMoreInfo,5,15,29,38,40);
-	packet(0x0085,12,clif->pChangeDir,7,11);
-	packet(0x008c,12,clif->pGetCharNameRequest,8);
-	packet(0x0094,23,clif->pMoveToKafra,5,19);
-	packet(0x009b,37,clif->pWantToConnection,9,21,28,32,36);
-	packet(0x009f,24,clif->pUseItem,9,20);
-	packet(0x00a2,11,clif->pSolveCharName,7);
-	packet(0x00a7,15,clif->pWalkToXY,12);
-	packet(0x00f5,13,clif->pTakeItem,9);
-	packet(0x00f7,26,clif->pMoveFromKafra,11,22);
-	packet(0x0113,40,clif->pUseSkillToPos,5,15,29,38);
-	packet(0x0116,17,clif->pDropItem,8,15);
-	packet(0x0190,18,clif->pActionRequest,7,17);
+	packet(0x0072,clif->pUseSkillToId,11,18,22);
+	packet(0x007e,clif->pUseSkillToPosMoreInfo,5,15,29,38,40);
+	packet(0x0085,clif->pChangeDir,7,11);
+	packet(0x008c,clif->pGetCharNameRequest,8);
+	packet(0x0094,clif->pMoveToKafra,5,19);
+	packet(0x009b,clif->pWantToConnection,9,21,28,32,36);
+	packet(0x009f,clif->pUseItem,9,20);
+	packet(0x00a2,clif->pSolveCharName,7);
+	packet(0x00a7,clif->pWalkToXY,12);
+	packet(0x00f5,clif->pTakeItem,9);
+	packet(0x00f7,clif->pMoveFromKafra,11,22);
+	packet(0x0113,clif->pUseSkillToPos,5,15,29,38);
+	packet(0x0116,clif->pDropItem,8,15);
+	packet(0x0190,clif->pActionRequest,7,17);
 #endif
 
 //2006-04-24aSakexe to 2007-01-02aSakexe
 #if PACKETVER >= 20060424
-	packet(0x0292,2,clif->pAutoRevive,0);
-	packet(0x029f,3,clif->pmercenary_action,0);
+	packet(0x0292,clif->pAutoRevive,0);
+	packet(0x029f,clif->pmercenary_action,0);
 #endif
 
 //2007-01-08aSakexe
 #if PACKETVER >= 20070108
-	packet(0x0072,30,clif->pUseSkillToId,10,14,26);
-	packet(0x007e,120,clif->pUseSkillToPosMoreInfo,10,19,23,38,40);
-	packet(0x0085,14,clif->pChangeDir,10,13);
-	packet(0x0089,11,clif->pTickSend,7);
-	packet(0x008c,17,clif->pGetCharNameRequest,13);
-	packet(0x0094,17,clif->pMoveToKafra,4,13);
-	packet(0x009b,35,clif->pWantToConnection,7,21,26,30,34);
-	packet(0x009f,21,clif->pUseItem,7,17);
-	packet(0x00a2,10,clif->pSolveCharName,6);
-	packet(0x00a7,8,clif->pWalkToXY,5);
-	packet(0x00f5,11,clif->pTakeItem,7);
-	packet(0x00f7,15,clif->pMoveFromKafra,3,11);
-	packet(0x0113,40,clif->pUseSkillToPos,10,19,23,38);
-	packet(0x0116,19,clif->pDropItem,11,17);
-	packet(0x0190,10,clif->pActionRequest,4,9);
+	packet(0x0072,clif->pUseSkillToId,10,14,26);
+	packet(0x007e,clif->pUseSkillToPosMoreInfo,10,19,23,38,40);
+	packet(0x0085,clif->pChangeDir,10,13);
+	packet(0x0089,clif->pTickSend,7);
+	packet(0x008c,clif->pGetCharNameRequest,13);
+	packet(0x0094,clif->pMoveToKafra,4,13);
+	packet(0x009b,clif->pWantToConnection,7,21,26,30,34);
+	packet(0x009f,clif->pUseItem,7,17);
+	packet(0x00a2,clif->pSolveCharName,6);
+	packet(0x00a7,clif->pWalkToXY,5);
+	packet(0x00f5,clif->pTakeItem,7);
+	packet(0x00f7,clif->pMoveFromKafra,3,11);
+	packet(0x0113,clif->pUseSkillToPos,10,19,23,38);
+	packet(0x0116,clif->pDropItem,11,17);
+	packet(0x0190,clif->pActionRequest,4,9);
 #endif
 
 //2007-02-12aSakexe
 #if PACKETVER >= 20070212
-	packet(0x0072,25,clif->pUseSkillToId,6,10,21);
-	packet(0x007e,102,clif->pUseSkillToPosMoreInfo,5,9,12,20,22);
-	packet(0x0085,11,clif->pChangeDir,7,10);
-	packet(0x0089,8,clif->pTickSend,4);
-	packet(0x008c,11,clif->pGetCharNameRequest,7);
-	packet(0x0094,14,clif->pMoveToKafra,7,10);
-	packet(0x009b,26,clif->pWantToConnection,4,9,17,21,25);
-	packet(0x009f,14,clif->pUseItem,4,10);
-	packet(0x00a2,15,clif->pSolveCharName,11);
-	packet(0x00f5,8,clif->pTakeItem,4);
-	packet(0x00f7,22,clif->pMoveFromKafra,14,18);
-	packet(0x0113,22,clif->pUseSkillToPos,5,9,12,20);
-	packet(0x0116,10,clif->pDropItem,5,8);
-	packet(0x0190,19,clif->pActionRequest,5,18);
+	packet(0x0072,clif->pUseSkillToId,6,10,21);
+	packet(0x007e,clif->pUseSkillToPosMoreInfo,5,9,12,20,22);
+	packet(0x0085,clif->pChangeDir,7,10);
+	packet(0x0089,clif->pTickSend,4);
+	packet(0x008c,clif->pGetCharNameRequest,7);
+	packet(0x0094,clif->pMoveToKafra,7,10);
+	packet(0x009b,clif->pWantToConnection,4,9,17,21,25);
+	packet(0x009f,clif->pUseItem,4,10);
+	packet(0x00a2,clif->pSolveCharName,11);
+	packet(0x00f5,clif->pTakeItem,4);
+	packet(0x00f7,clif->pMoveFromKafra,14,18);
+	packet(0x0113,clif->pUseSkillToPos,5,9,12,20);
+	packet(0x0116,clif->pDropItem,5,8);
+	packet(0x0190,clif->pActionRequest,5,18);
 #endif
 
 //2007-05-07aSakexe
 #if PACKETVER >= 20070507
-	packet(0x01fd,15,clif->pRepairItem,2);
+	packet(0x01fd,clif->pRepairItem,2);
 #endif
 
 //2007-02-27aSakexe to 2007-10-02aSakexe
 #if PACKETVER >= 20070227
-	packet(0x0288,10,clif->pcashshop_buy,2,4,6);
-	packet(0x02b6,7,clif->pquestStateAck,2,6);
-	packet(0x02ba,11,clif->pHotkey,2,4,5,9);
-	packet(0x02c4,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x02c7,7,clif->pReplyPartyInvite2,2,6);
-	packet(0x02c8,3,clif->pPartyTick,2);
-	packet(0x02cf,6,clif->pMemorialDungeonCommand);
-	packet(0x02d6,6,clif->pViewPlayerEquip,2);
-	packet(0x02d8,10,clif->p_cz_config,6);
-	packet(0x02db,-1,clif->pBattleChat,2,4);
+	packet(0x0288,clif->pcashshop_buy,2,4,6);
+	packet(0x02b6,clif->pquestStateAck,2,6);
+	packet(0x02ba,clif->pHotkey,2,4,5,9);
+	packet(0x02c4,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x02c7,clif->pReplyPartyInvite2,2,6);
+	packet(0x02c8,clif->pPartyTick,2);
+	packet(0x02cf,clif->pMemorialDungeonCommand);
+	packet(0x02d6,clif->pViewPlayerEquip,2);
+	packet(0x02d8,clif->p_cz_config,6);
+	packet(0x02db,clif->pBattleChat,2,4);
 #endif
 
 //2008-01-02aSakexe
 #if PACKETVER >= 20080102
-	packet(0x01df,6,clif->pGMReqAccountName,2);
+	packet(0x01df,clif->pGMReqAccountName,2);
 #endif
 
 //2008-03-18aSakexe
 #if PACKETVER >= 20080318
-	packet(0x02f1,2,clif->pProgressbar,0);
+	packet(0x02f1,clif->pProgressbar,0);
 #endif
 
 //2008-09-10aSakexe
 #if PACKETVER >= 20080910
-	packet(0x0436,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0437,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x0438,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x0439,8,clif->pUseItem,2,4);
+	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0437,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x0438,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x0439,clif->pUseItem,2,4);
 #endif
 
 //2008-12-10aSakexe
 #if PACKETVER >= 20081210
-	packet(0x0443,8,clif->pSkillSelectMenu,2,6);
+	packet(0x0443,clif->pSkillSelectMenu,2,6);
 #endif
 
 //2008-08-27aRagexeRE
 #if PACKETVER >= 20080827
-	packet(0x0072,22,clif->pUseSkillToId,9,15,18);
-	packet(0x007e,105,clif->pUseSkillToPosMoreInfo,10,14,18,23,25);
-	packet(0x0085,10,clif->pChangeDir,4,9);
-	packet(0x0089,11,clif->pTickSend,7);
-	packet(0x008c,14,clif->pGetCharNameRequest,10);
-	packet(0x0094,19,clif->pMoveToKafra,3,15);
-	packet(0x009b,34,clif->pWantToConnection,7,15,25,29,33);
-	packet(0x009f,20,clif->pUseItem,7,20);
-	packet(0x00a2,14,clif->pSolveCharName,10);
-	packet(0x00a7,9,clif->pWalkToXY,6);
-	packet(0x00f5,11,clif->pTakeItem,7);
-	packet(0x00f7,17,clif->pMoveFromKafra,3,13);
-	packet(0x0113,25,clif->pUseSkillToPos,10,14,18,23);
-	packet(0x0116,17,clif->pDropItem,6,15);
-	packet(0x0190,23,clif->pActionRequest,9,22);
+	packet(0x0072,clif->pUseSkillToId,9,15,18);
+	packet(0x007e,clif->pUseSkillToPosMoreInfo,10,14,18,23,25);
+	packet(0x0085,clif->pChangeDir,4,9);
+	packet(0x0089,clif->pTickSend,7);
+	packet(0x008c,clif->pGetCharNameRequest,10);
+	packet(0x0094,clif->pMoveToKafra,3,15);
+	packet(0x009b,clif->pWantToConnection,7,15,25,29,33);
+	packet(0x009f,clif->pUseItem,7,20);
+	packet(0x00a2,clif->pSolveCharName,10);
+	packet(0x00a7,clif->pWalkToXY,6);
+	packet(0x00f5,clif->pTakeItem,7);
+	packet(0x00f7,clif->pMoveFromKafra,3,13);
+	packet(0x0113,clif->pUseSkillToPos,10,14,18,23);
+	packet(0x0116,clif->pDropItem,6,15);
+	packet(0x0190,clif->pActionRequest,9,22);
 #endif
 
 //2008-09-10aRagexeRE
 #if PACKETVER >= 20080910
-	packet(0x0436,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0437,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x0438,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x0439,8,clif->pUseItem,2,4);
+	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0437,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x0438,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x0439,clif->pUseItem,2,4);
 #endif
 
 // 2009-05-20aRagexe, 2009-05-20aRagexeRE
 #if PACKETVER >= 20090520
 // new packets
-	packet(0x0447,2,clif->p_cz_blocking_play_cancel); // PACKET_CZ_BLOCKING_PLAY_CANCEL
+	packet(0x0447,clif->p_cz_blocking_play_cancel); // PACKET_CZ_BLOCKING_PLAY_CANCEL
 #endif
 
 //2009-06-03aRagexeRE
 #if PACKETVER >= 20090603
-	packet(0x07d7,8,clif->pPartyChangeOption,2,6,7);
-	packet(0x07da,6,clif->pPartyChangeLeader,2);
+	packet(0x07d7,clif->pPartyChangeOption,2,6,7);
+	packet(0x07da,clif->pPartyChangeLeader,2);
 #endif
 
 //2009-08-18aRagexeRE
 #if PACKETVER >= 20090818
-	packet(0x07e4,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x07e4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
 #endif
 
 //2009-10-27aRagexeRE
 #if PACKETVER >= 20091027
-	packet(0x07f5,6,clif->pGMFullStrip,2);
+	packet(0x07f5,clif->pGMFullStrip,2);
 #endif
 
 //2009-12-22aRagexeRE
 #if PACKETVER >= 20091222
-	packet(0x0802,18,clif->pPartyBookingRegisterReq,2,4,6); // Booking System
-	packet(0x0806,4,clif->pPartyBookingDeleteReq,2);// Booking System
+	packet(0x0802,clif->pPartyBookingRegisterReq,2,4,6); // Booking System
+	packet(0x0806,clif->pPartyBookingDeleteReq,2);// Booking System
 #endif
 
 	//2009-12-29aRagexeRE
 #if PACKETVER >= 20091229
-	packet(0x0804,14,clif->pPartyBookingSearchReq,2,4,6,8,12);// Booking System
-	packet(0x0806,2,clif->pPartyBookingDeleteReq,0);// Booking System
-	packet(0x0808,14,clif->pPartyBookingUpdateReq,2); // Booking System
+	packet(0x0804,clif->pPartyBookingSearchReq,2,4,6,8,12);// Booking System
+	packet(0x0806,clif->pPartyBookingDeleteReq,0);// Booking System
+	packet(0x0808,clif->pPartyBookingUpdateReq,2); // Booking System
 #endif
 
 	//2010-01-05aRagexeRE
 #if PACKETVER >= 20100105
-	packet(0x0801,-1,clif->pPurchaseReq2,2,4,8,12);
+	packet(0x0801,clif->pPurchaseReq2,2,4,8,12);
 #endif
 
 //2010-03-03aRagexeRE
 #if PACKETVER >= 20100303
-	packet(0x0811,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x0811,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
 #endif
 
 	//2010-04-20aRagexeRE
 #if PACKETVER >= 20100420
-	packet(0x0815,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x0817,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x0819,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x0815,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0817,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
 #endif
 
 	//2010-06-01aRagexeRE
 #if PACKETVER >= 20100601
-	packet(0x0835,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
 #endif
 
 	//2010-06-08aRagexeRE
 #if PACKETVER >= 20100608
-	packet(0x0838,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
-	packet(0x083B,2,clif->pCloseSearchStoreInfo,0);
-	packet(0x083C,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x0838,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x083B,clif->pCloseSearchStoreInfo,0);
+	packet(0x083C,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
 #endif
 
 //2010-08-03aRagexeRE
 #if PACKETVER >= 20100803
-	packet(0x0842,6,clif->pGMRecall2,2);
-	packet(0x0843,6,clif->pGMRemove2,2);
+	packet(0x0842,clif->pGMRecall2,2);
+	packet(0x0843,clif->pGMRemove2,2);
 #endif
 
 //2010-11-24aRagexeRE
 #if PACKETVER >= 20101124
-	packet(0x0288,-1,clif->pcashshop_buy,4,8);
-	packet(0x0436,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x035f,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x0360,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x0361,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x0362,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x0363,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x0364,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x0365,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x0366,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x0367,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x0368,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0369,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x0288,clif->pcashshop_buy,4,8);
+	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x035f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x0360,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x0361,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x0362,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x0363,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x0364,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x0365,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0366,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x0368,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0369,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
 #endif
 
 // 2011-01-25aRagexe
 #if PACKETVER >= 20110125
 // shuffle packets not added
 // new packets
-	packet(0x08b5,6,clif->pDull,2); // CZ_TRYCOLLECTION
+	packet(0x08b5,clif->pDull,2); // CZ_TRYCOLLECTION
 #endif
 
 // 2011-01-31aRagexe
 #if PACKETVER >= 20110131
 // shuffle packets not added
 // new packets
-	packet(0x02f3,-1,clif->pDull); // CZ_IRMAIL_SEND
-	packet(0x02f6,7,clif->pDull,2); // CZ_IRMAIL_LIST
+	packet(0x02f3,clif->pDull); // CZ_IRMAIL_SEND
+	packet(0x02f6,clif->pDull,2); // CZ_IRMAIL_LIST
 #endif
 
 // 2011-02-22aRagexe
 #if PACKETVER >= 20110222
 // shuffle packets not added
 // new packets
-	packet(0x08c1,2,clif->pDull); // CZ_MACRO_START
-	packet(0x08c2,2,clif->pDull); // CZ_MACRO_STOP
+	packet(0x08c1,clif->pDull); // CZ_MACRO_START
+	packet(0x08c2,clif->pDull); // CZ_MACRO_STOP
 #endif
 
 // 2011-06-14aRagexe
 #if PACKETVER >= 20110614
 // shuffle packets not added
 // new packets
-	packet(0x08c9,2,clif->pCashShopSchedule,0);
+	packet(0x08c9,clif->pCashShopSchedule,0);
 #endif
 
 //2011-07-18aRagexe (Thanks to Yommy!)
 #if PACKETVER >= 20110718
 // shuffle packets not added
-	packet(0x0844,2,clif->pCashShopOpen,2);/* tell server cashshop window is being open */
-	packet(0x084a,2,clif->pCashShopClose,2);/* tell server cashshop window is being closed */
-	packet(0x0846,4,clif->pCashShopReqTab,2);
-	packet(0x0848,-1,clif->pCashShopBuy,2);
+	packet(0x0844,clif->pCashShopOpen,2);/* tell server cashshop window is being open */
+	packet(0x084a,clif->pCashShopClose,2);/* tell server cashshop window is being closed */
+	packet(0x0846,clif->pCashShopReqTab,2);
+	packet(0x0848,clif->pCashShopBuy,2);
 #endif
 
 //2011-10-05aRagexeRE
 #if PACKETVER >= 20111005
-	packet(0x0364,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x0817,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x0366,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x0815,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x0885,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x0893,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x0897,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x0369,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x08ad,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x088a,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0838,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-	packet(0x0439,8,clif->pUseItem,2,4);
-	packet(0x08d7,28,clif->pBGQueueRegister,2);
-	packet(0x090a,26,clif->pBGQueueCheckState,2);
-	packet(0x08da,26,clif->pBGQueueRevokeReq,2);
-	packet(0x08e0,51,clif->pBGQueueBattleBeginAck,2);
+	packet(0x0364,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x0817,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x0366,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x0815,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x0885,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x0893,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x0897,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0369,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x08ad,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x088a,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0838,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x0439,clif->pUseItem,2,4);
+	packet(0x08d7,clif->pBGQueueRegister,2);
+	packet(0x090a,clif->pBGQueueCheckState,2);
+	packet(0x08da,clif->pBGQueueRevokeReq,2);
+	packet(0x08e0,clif->pBGQueueBattleBeginAck,2);
 #endif
 
 //2011-11-02aRagexe
 #if PACKETVER >= 20111102
-	packet(0x0436,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x0898,5,clif->pHomMenu,4);
-	packet(0x0281,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x088d,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x083c,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x08aa,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x02c4,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x0811,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x08a5,18,clif->pPartyBookingRegisterReq,2,4,6);
-	packet(0x0835,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
-	packet(0x089b,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x08a1,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x089e,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
-	packet(0x08ab,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
-	packet(0x088b,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
-	packet(0x08a2,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x0436,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x0898,clif->pHomMenu,4);
+	packet(0x0281,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x088d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x083c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x08aa,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x02c4,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x0811,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x08a5,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0835,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x089b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x08a1,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x089e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x08ab,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x088b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x08a2,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
 	#ifndef PACKETVER_RE
-		packet(0x0835,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-		packet(0x0892,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-		packet(0x0899,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
+		packet(0x0835,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+		packet(0x0892,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+		packet(0x0899,clif->pTickSend,2);  // CZ_REQUEST_TIME
 	#endif
 #endif
 
 //2012-03-07fRagexeRE
 #if PACKETVER >= 20120307
-	packet(0x086A,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0437,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x0887,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x0890,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x0865,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x02C4,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x093B,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x0963,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x0438,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x0366,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x096A,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0368,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-	packet(0x0369,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x0863,5,clif->pHomMenu,4);
-	packet(0x0861,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x0929,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x0885,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x0889,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x0870,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x0365,18,clif->pPartyBookingRegisterReq,2,4,6);
-	packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
-	packet(0x0817,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x0360,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x0811,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
-	packet(0x0884,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
-	packet(0x0835,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
-	packet(0x0838,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
-	packet(0x0439,8,clif->pUseItem,2,4);
+	packet(0x086A,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x0887,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x0890,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x0865,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x02C4,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x093B,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x0963,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x096A,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x0369,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x0863,clif->pHomMenu,4);
+	packet(0x0861,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x0929,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x0885,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x0889,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x0870,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x0884,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x0439,clif->pUseItem,2,4);
 // changed packet sizes
 #endif
 
 //2012-04-10aRagexeRE
 #if PACKETVER >= 20120410
-	packet(0x01FD,15,clif->pRepairItem,2);
-	packet(0x089C,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x0885,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x0961,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x0288,-1,clif->pcashshop_buy,4,8);
-	packet(0x091C,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x094B,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0369,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x083C,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x0439,8,clif->pUseItem,2,4);
-	packet(0x0945,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
-	packet(0x0817,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x0360,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x0811,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
-	packet(0x0819,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
-	packet(0x0835,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
-	packet(0x0838,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
-	packet(0x0437,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x0886,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x0871,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x0938,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x0891,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x086C,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x08A6,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x0438,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x0366,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x0889,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0884,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x01FD,clif->pRepairItem,2);
+	packet(0x089C,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x0885,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x0961,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x0288,clif->pcashshop_buy,4,8);
+	packet(0x091C,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x094B,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x083C,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x0439,clif->pUseItem,2,4);
+	packet(0x0945,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x0886,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x0871,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x0938,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x0891,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x086C,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x08A6,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x0889,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0884,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
 #ifndef PACKETVER_RE
-	packet(0x091D,18,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x091D,clif->pPartyBookingRegisterReq,2,4,6);
 #else
-	packet(0x08E5,41,clif->pPartyRecruitRegisterReq,2,4);
+	packet(0x08E5,clif->pPartyRecruitRegisterReq,2,4);
 #endif
-	packet(0x08E7,10,clif->pPartyRecruitSearchReq,2);
-	packet(0x08E9,2,clif->pPartyRecruitDeleteReq,2);
-	packet(0x08EB,39,clif->pPartyRecruitUpdateReq,2);
+	packet(0x08E7,clif->pPartyRecruitSearchReq,2);
+	packet(0x08E9,clif->pPartyRecruitDeleteReq,2);
+	packet(0x08EB,clif->pPartyRecruitUpdateReq,2);
 #ifdef PARTY_RECRUIT
-	packet(0x08EF,6,clif->pDull,2); //bookingignorereq
-	packet(0x08F0,6,clif->pDull,2);
-	packet(0x08F1,6,clif->pDull,2); //bookingjoinpartyreq
+	packet(0x08EF,clif->pDull,2); //bookingignorereq
+	packet(0x08F0,clif->pDull,2);
+	packet(0x08F1,clif->pDull,2); //bookingjoinpartyreq
 #endif
-	packet(0x08F5,-1,clif->pDull,2,4); //bookingsummonmember
+	packet(0x08F5,clif->pDull,2,4); //bookingsummonmember
 #ifdef PARTY_RECRUIT
-	packet(0x08F9,6,clif->pDull,2);
+	packet(0x08F9,clif->pDull,2);
 #endif
-	packet(0x08FB,6,clif->pDull,2); //bookingcanceljoinparty
-	packet(0x0907,5,clif->pMoveItem,2,4);
+	packet(0x08FB,clif->pDull,2); //bookingcanceljoinparty
+	packet(0x0907,clif->pMoveItem,2,4);
 #endif
 
 //2012-04-18aRagexeRE [Special Thanks to Judas!]
 #if PACKETVER >= 20120418
-	packet(0x023B,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x0361,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x08A8,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x0802,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x022D,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0281,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x035F,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x0202,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x07E4,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x0362,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x07EC,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x0364,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x096A,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0368,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-	packet(0x08E5,41,clif->pPartyRecruitRegisterReq,2,4);
-	packet(0x0916,26,clif->pGuildInvite2,2);
+	packet(0x023B,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x08A8,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x022D,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x035F,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x07E4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x07EC,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x096A,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x08E5,clif->pPartyRecruitRegisterReq,2,4);
+	packet(0x0916,clif->pGuildInvite2,2);
 #endif
 
 // 2012-05-02aRagexeRE
 #if PACKETVER >= 20120502
 // shuffle packets not added
-	packet(0x0980,7,clif->pSelectCart); // CZ_SELECTCART
+	packet(0x0980,clif->pSelectCart); // CZ_SELECTCART
 #endif
 
 #ifndef PACKETVER_RE
 #if PACKETVER >= 20120604
 // shuffle packets not added
-	packet(0x0861,18,clif->pPartyRecruitRegisterReq,2,4,6);
+	packet(0x0861,clif->pPartyRecruitRegisterReq,2,4,6);
 #endif
 #endif
 
@@ -941,127 +941,127 @@ packet(0x96e,-1,clif->ackmergeitems);
 // - 2012-07-02 is NOT STABLE.
 // - The packets are kept here for reference, DONT USE THEM.
 #if PACKETVER >= 20120702
-	packet(0x0363,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0364,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x085a,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x0861,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x0862,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x0863,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x0886,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-	packet(0x0889,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x089e,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x089f,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x08a0,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x094a,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0953,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x0960,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x0363,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0364,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x085a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x0861,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0862,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x0863,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x0886,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x0889,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x089e,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x089f,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x08a0,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x094a,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0953,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x0960,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
 #endif
 
 //2012-07-10
 #if PACKETVER >= 20120710
-	packet(0x0886,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0886,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
 #endif
 
 //2012-07-16aRagExe (special thanks to Yommy/Frost!)
 #if PACKETVER >= 20120716
-	packet(0x0879,18,clif->pPartyBookingRegisterReq,2,4,6);
-	packet(0x023B,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x0361,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x0819,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x0802,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x022D,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0369,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x083C,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x0439,8,clif->pUseItem,2,4);
-	packet(0x0281,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
-	packet(0x0817,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x0360,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x0940,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
-	packet(0x0811,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
-	packet(0x0835,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
-	packet(0x0838,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
-	packet(0x0437,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x035F,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x0202,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x07E4,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x0362,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x07EC,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x0364,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x0438,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x0366,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x096A,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0368,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-	packet(0x0363,8,clif->pDull); // CZ_JOIN_BATTLE_FIELD
-	packet(0x0436,4,clif->pDull); // CZ_GANGSI_RANK
+	packet(0x0879,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x023B,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x0819,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x022D,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x083C,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x0439,clif->pUseItem,2,4);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x0940,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x0811,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x035F,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x07E4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x07EC,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x096A,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x0363,clif->pDull); // CZ_JOIN_BATTLE_FIELD
+	packet(0x0436,clif->pDull); // CZ_GANGSI_RANK
 #endif
 
 //2012-07-16aRagExe
 #if PACKETVER >= 20120716
 // new packets
-	packet(0x098d,-1,clif->pClanMessage,2,4); // CZ_CLAN_CHAT
+	packet(0x098d,clif->pClanMessage,2,4); // CZ_CLAN_CHAT
 #endif
 
 // 2012-09-25aRagexe
 #if PACKETVER >= 20120925
 // new packets (not all)
-	packet(0x0998,8,clif->pEquipItem,2,4);
+	packet(0x0998,clif->pEquipItem,2,4);
 #endif
 
 // 2013-03-06aRagexe
 #if PACKETVER >= 20130306
 // new packets
-	packet(0x09a7,14,clif->pDull/*,XXX*/); // CZ_REQ_BANKING_DEPOSIT
-	packet(0x09a9,14,clif->pDull/*,XXX*/); // CZ_REQ_BANKING_WITHDRAW
+	packet(0x09a7,clif->pDull/*,XXX*/); // CZ_REQ_BANKING_DEPOSIT
+	packet(0x09a9,clif->pDull/*,XXX*/); // CZ_REQ_BANKING_WITHDRAW
 // changed packet sizes
 #endif
 
 // 2013-03-13aRagexe
 #if PACKETVER >= 20130313
 // new packets
-	packet(0x09ab,-1,clif->pDull/*,XXX*/); // CZ_REQ_BANKING_CHECK
-	packet(0x09ac,20,clif->pDull/*,XXX*/); // CZ_REQ_CASH_BARGAIN_SALE_ITEM_INFO
-	packet(0x09ae,-1,clif->pDull/*,XXX*/); // CZ_REQ_APPLY_BARGAIN_SALE_ITEM
-	packet(0x09b0,8,clif->pDull/*,XXX*/); // CZ_REQ_REMOVE_BARGAIN_SALE_ITEM
+	packet(0x09ab,clif->pDull/*,XXX*/); // CZ_REQ_BANKING_CHECK
+	packet(0x09ac,clif->pDull/*,XXX*/); // CZ_REQ_CASH_BARGAIN_SALE_ITEM_INFO
+	packet(0x09ae,clif->pDull/*,XXX*/); // CZ_REQ_APPLY_BARGAIN_SALE_ITEM
+	packet(0x09b0,clif->pDull/*,XXX*/); // CZ_REQ_REMOVE_BARGAIN_SALE_ITEM
 // changed packet sizes
 #endif
 
 //2013-03-20Ragexe (Judas + Yommy)
 #if PACKETVER >= 20130320
 	// Shuffle Start
-	packet(0x088E,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x089B,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x0881,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x0363,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x0897,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x0933,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x0438,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x08AC,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x0874,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x0959,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x085A,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x0898,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x094C,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-	packet(0x0365,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
-	packet(0x092E,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
-	packet(0x094E,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
-	packet(0x0922,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
-	packet(0x035F,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x0886,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x0938,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x088E,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x089B,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x0881,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x0363,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x0897,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x0933,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x0438,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x08AC,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x0874,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0959,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x085A,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x0898,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x094C,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x0365,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x092E,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x094E,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x0922,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x035F,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x0886,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0938,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
 #ifdef PACKETVER_RE
-	packet(0x085D,41,clif->pPartyRecruitRegisterReq,2,4);
+	packet(0x085D,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
-	packet(0x085D,18,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
+	packet(0x085D,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
 #endif // PACKETVER_RE
-	packet(0x0868,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x0888,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x086D,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x086F,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x093F,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x0947,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x0890,4,clif->pDull); // CZ_GANGSI_RANK
-	packet(0x095a,8,clif->pDull); // CZ_JOIN_BATTLE_FIELD
+	packet(0x0868,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x0888,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x086D,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x086F,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x093F,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x0947,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x0890,clif->pDull); // CZ_GANGSI_RANK
+	packet(0x095a,clif->pDull); // CZ_JOIN_BATTLE_FIELD
 	// Shuffle End
 
 	// New Packets (wrong version or packet not exists)
@@ -1071,392 +1071,392 @@ packet(0x96e,-1,clif->ackmergeitems);
 #if PACKETVER >= 20130320
 // new packets
 // changed packet sizes
-	packet(0x09a7,10,clif->pBankDeposit,2,4,6); // CZ_REQ_BANKING_DEPOSIT
-	packet(0x09a9,10,clif->pBankWithdraw,2,4,6); // CZ_REQ_BANKING_WITHDRAW
-	packet(0x09ab,6,clif->pBankCheck,2,4); // CZ_REQ_BANKING_CHECK
+	packet(0x09a7,clif->pBankDeposit,2,4,6); // CZ_REQ_BANKING_DEPOSIT
+	packet(0x09a9,clif->pBankWithdraw,2,4,6); // CZ_REQ_BANKING_WITHDRAW
+	packet(0x09ab,clif->pBankCheck,2,4); // CZ_REQ_BANKING_CHECK
 #endif
 
 // 2013-03-27bRagexe
 #if PACKETVER >= 20130327
 // new packets
-	packet(0x09ac,-1,clif->pDull/*,XXX*/); // CZ_REQ_CASH_BARGAIN_SALE_ITEM_INFO
-	packet(0x09ae,17,clif->pDull/*,XXX*/); // CZ_REQ_APPLY_BARGAIN_SALE_ITEM
-	packet(0x09b0,8,clif->pDull/*,XXX*/); // CZ_REQ_REMOVE_BARGAIN_SALE_ITEM
+	packet(0x09ac,clif->pDull/*,XXX*/); // CZ_REQ_CASH_BARGAIN_SALE_ITEM_INFO
+	packet(0x09ae,clif->pDull/*,XXX*/); // CZ_REQ_APPLY_BARGAIN_SALE_ITEM
+	packet(0x09b0,clif->pDull/*,XXX*/); // CZ_REQ_REMOVE_BARGAIN_SALE_ITEM
 // changed packet sizes
 #endif
 
 //2013-05-15aRagexe (Shakto)
 #if PACKETVER >= 20130515
 	// Shuffle Start
-	packet(0x0369,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x083C,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x0437,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x035F,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x0362,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x08A1,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x0944,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x0887,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x08AC,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x0438,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x0366,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x096A,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0368,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-	packet(0x0838,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
-	packet(0x0835,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
-	packet(0x0819,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
-	packet(0x0811,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
-	packet(0x0360,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x0817,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x083C,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x035F,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x0362,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x08A1,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x0944,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x0887,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x08AC,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x096A,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
 #ifdef PACKETVER_RE
-	packet(0x092D,41,clif->pPartyRecruitRegisterReq,2,4);
+	packet(0x092D,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
-	packet(0x092D,18,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
+	packet(0x092D,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
 #endif // PACKETVER_RE
-	packet(0x0963,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x0943,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0947,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x0962,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x0931,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x093E,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x0862,4,clif->pDull); // CZ_GANGSI_RANK
-	packet(0x08aa,8,clif->pDull); // CZ_JOIN_BATTLE_FIELD
+	packet(0x0963,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x0943,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0947,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x0962,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x0931,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x093E,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x0862,clif->pDull); // CZ_GANGSI_RANK
+	packet(0x08aa,clif->pDull); // CZ_JOIN_BATTLE_FIELD
 	// Shuffle End
 #endif
 
 //2013-05-22Ragexe (Shakto)
 #if PACKETVER >= 20130522
 	// Shuffle Start
-	packet(0x08A2,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x095C,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x0360,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x07EC,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x0925,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x095E,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x089C,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x08A3,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x087E,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x0811,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x0964,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x08A6,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0369,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-	packet(0x093E,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
-	packet(0x08AA,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
-	packet(0x095B,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
-	packet(0x0952,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
-	packet(0x0368,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x086E,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x0874,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x08A2,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x095C,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x0360,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x07EC,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x0925,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x095E,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x089C,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x08A3,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x087E,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0811,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x0964,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x08A6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0369,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x093E,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x08AA,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x095B,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x0952,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x0368,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x086E,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0874,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
 #ifdef PACKETVER_RE
-	packet(0x089B,41,clif->pPartyRecruitRegisterReq,2,4);
+	packet(0x089B,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
-	packet(0x089B,18,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
+	packet(0x089B,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
 #endif // PACKETVER_RE
-	packet(0x086A,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x08A9,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0950,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x0362,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x0926,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x088E,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x08ac,4,clif->pDull); // CZ_GANGSI_RANK
-	packet(0x0965,8,clif->pDull); // CZ_JOIN_BATTLE_FIELD
+	packet(0x086A,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x08A9,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0950,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x0362,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x0926,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x088E,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x08ac,clif->pDull); // CZ_GANGSI_RANK
+	packet(0x0965,clif->pDull); // CZ_JOIN_BATTLE_FIELD
 	// Shuffle End
 #endif
 
 //2013-05-29Ragexe (Shakto)
 #if PACKETVER >= 20130529
-	packet(0x0890,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x0438,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x0876,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x0897,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x0951,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x0895,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x08A7,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x0938,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x0957,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x0917,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x085E,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x0863,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0937,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-	packet(0x085A,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
-	packet(0x0941,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
-	packet(0x0918,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
-	packet(0x0936,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
-	packet(0x0892,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x0964,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x0869,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x0890,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x0438,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x0876,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x0897,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x0951,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x0895,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x08A7,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x0938,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x0957,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0917,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x085E,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x0863,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0937,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x085A,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x0941,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x0918,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x0936,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x0892,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x0964,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0869,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
 #ifdef PACKETVER_RE
-	packet(0x0874,41,clif->pPartyRecruitRegisterReq,2,4);
+	packet(0x0874,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
-	packet(0x0874,18,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
+	packet(0x0874,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
 #endif // PACKETVER_RE
-	packet(0x0958,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x0919,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x08A8,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x0877,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x023B,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x0956,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x0888,4,clif->pDull); // CZ_GANGSI_RANK
-	packet(0x088e,8,clif->pDull); // CZ_JOIN_BATTLE_FIELD
+	packet(0x0958,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x0919,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x08A8,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x0877,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x023B,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x0956,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x0888,clif->pDull); // CZ_GANGSI_RANK
+	packet(0x088e,clif->pDull); // CZ_JOIN_BATTLE_FIELD
 #endif
 
 //2013-06-05Ragexe (Shakto)
 #if PACKETVER >= 20130605
-	packet(0x0369,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x083C,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x0437,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x035F,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x0202,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x07E4,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x0362,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x07EC,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x0364,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x0438,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x0366,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x096A,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0368,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-	packet(0x0838,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
-	packet(0x0835,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
-	packet(0x0819,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
-	packet(0x0811,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
-	packet(0x0360,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x0817,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x083C,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x035F,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x07E4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x07EC,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x096A,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
 #ifdef PACKETVER_RE
-	packet(0x0365,41,clif->pPartyRecruitRegisterReq,2,4);
+	packet(0x0365,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
-	packet(0x0365,18,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
 #endif // PACKETVER_RE
-	packet(0x0281,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x022D,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0802,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x023B,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x0361,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x0883,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x097C,4,clif->pRanklist);
-	packet(0x0363,8,clif->pDull); // CZ_JOIN_BATTLE_FIELD
-	packet(0x0436,4,clif->pDull); // CZ_GANGSI_RANK
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x022D,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x023B,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x0883,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x097C,clif->pRanklist);
+	packet(0x0363,clif->pDull); // CZ_JOIN_BATTLE_FIELD
+	packet(0x0436,clif->pDull); // CZ_GANGSI_RANK
 #endif
 
 //2013-06-12Ragexe (Shakto)
 #if PACKETVER >= 20130612
 // most shuffle packets used from 20130605
-	packet(0x087E,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x0919,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0940,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x093A,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x0964,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x087E,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x0919,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0940,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x093A,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x0964,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
 #endif
 
 //2013-06-18Ragexe (Shakto)
 #if PACKETVER >= 20130618
-	packet(0x0889,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x0951,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x088E,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x0930,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x08A6,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x0962,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x0917,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x0885,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x0936,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x096A,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x094F,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x0944,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0945,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-	packet(0x0890,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
-	packet(0x0363,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
-	packet(0x0281,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
-	packet(0x0891,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
-	packet(0x0862,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x085A,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x0932,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x0889,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x0951,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x088E,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x0930,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x08A6,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x0962,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x0917,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x0885,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x0936,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x096A,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x094F,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x0944,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0945,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x0890,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x0363,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x0281,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x0891,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x0862,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x085A,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0932,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
 #ifdef PACKETVER_RE
-	packet(0x08A7,41,clif->pPartyRecruitRegisterReq,2,4);
+	packet(0x08A7,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
-	packet(0x08A7,18,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
+	packet(0x08A7,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
 #endif // PACKETVER_RE
-	packet(0x0942,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x095B,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0887,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x0953,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x02C4,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x0864,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x0878,4,clif->pDull); // CZ_GANGSI_RANK
-	packet(0x087a,8,clif->pDull); // CZ_JOIN_BATTLE_FIELD
+	packet(0x0942,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x095B,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0887,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x0953,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x02C4,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x0864,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x0878,clif->pDull); // CZ_GANGSI_RANK
+	packet(0x087a,clif->pDull); // CZ_JOIN_BATTLE_FIELD
 #endif
 
 //2013-06-26Ragexe (Shakto)
 #if PACKETVER >= 20130626
-	packet(0x0369,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x083C,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x0437,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x035F,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x094D,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x088B,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x0952,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x0921,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x0817,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x0438,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x0366,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x096A,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0368,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-	packet(0x0838,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
-	packet(0x0835,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
-	packet(0x0819,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
-	packet(0x0811,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
-	packet(0x0360,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x0365,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x083C,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x035F,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x094D,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x088B,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x0952,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x0921,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x0817,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x096A,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x0365,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
 #ifdef PACKETVER_RE
-	packet(0x0894,41,clif->pPartyRecruitRegisterReq,2,4);
+	packet(0x0894,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
-	packet(0x0894,18,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
+	packet(0x0894,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
 #endif // PACKETVER_RE
-	packet(0x08A5,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x088C,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0895,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x08AB,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x0960,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x0930,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x0860,8,clif->pDull); // CZ_JOIN_BATTLE_FIELD
-	packet(0x088f,4,clif->pDull); // CZ_GANGSI_RANK
+	packet(0x08A5,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x088C,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0895,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x08AB,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x0960,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x0930,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x0860,clif->pDull); // CZ_JOIN_BATTLE_FIELD
+	packet(0x088f,clif->pDull); // CZ_GANGSI_RANK
 #endif
 
 //2013-07-03Ragexe (Shakto)
 #if PACKETVER >= 20130703
-	packet(0x0930,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x07E4,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x0362,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x07EC,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x0364,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x0202,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x0817,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x0930,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x07E4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x07EC,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0202,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
 #ifdef PACKETVER_RE
-	packet(0x0365,41,clif->pPartyRecruitRegisterReq,2,4);
+	packet(0x0365,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
-	packet(0x0365,18,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
 #endif // PACKETVER_RE
-	packet(0x0281,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x022D,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0802,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x0360,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x094A,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x0873,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x0363,8,clif->pDull); // CZ_JOIN_BATTLE_FIELD
-	packet(0x0436,4,clif->pDull); // CZ_GANGSI_RANK
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x022D,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x0360,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x094A,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x0873,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x0363,clif->pDull); // CZ_JOIN_BATTLE_FIELD
+	packet(0x0436,clif->pDull); // CZ_GANGSI_RANK
 #endif
 
 // 2013-04-17aRagexe
 #if PACKETVER >= 20130417
 // new packets
-	packet(0x09b4,6,clif->pDull/*,XXX*/); // CZ_OPEN_BARGAIN_SALE_TOOL
-	packet(0x09b6,6,clif->pBankOpen,2,4); // CZ_REQ_OPEN_BANKING
-	packet(0x09b8,6,clif->pBankClose,2,4); // CZ_REQ_CLOSE_BANKING
+	packet(0x09b4,clif->pDull/*,XXX*/); // CZ_OPEN_BARGAIN_SALE_TOOL
+	packet(0x09b6,clif->pBankOpen,2,4); // CZ_REQ_OPEN_BANKING
+	packet(0x09b8,clif->pBankClose,2,4); // CZ_REQ_CLOSE_BANKING
 // changed packet sizes
 #endif
 
 // 2013-04-24aRagexe
 #if PACKETVER >= 20130424
 // new packets
-	packet(0x09ba,6,clif->pDull/*,XXX*/); // CZ_REQ_OPEN_GUILD_STORAGE
-	packet(0x09bc,6,clif->pDull/*,XXX*/); // CZ_CLOSE_BARGAIN_SALE_TOOL
+	packet(0x09ba,clif->pDull/*,XXX*/); // CZ_REQ_OPEN_GUILD_STORAGE
+	packet(0x09bc,clif->pDull/*,XXX*/); // CZ_CLOSE_BARGAIN_SALE_TOOL
 // changed packet sizes
 #endif
 
 // 2013-05-02aRagexe
 #if PACKETVER >= 20130502
 // new packets
-	packet(0x09be,6,clif->pDull/*,XXX*/); // CZ_REQ_CLOSE_GUILD_STORAGE
+	packet(0x09be,clif->pDull/*,XXX*/); // CZ_REQ_CLOSE_GUILD_STORAGE
 // changed packet sizes
 #endif
 
 // 2013-05-29Ragexe
 #if PACKETVER >= 20130529
 // new packets
-	packet(0x09c3,8,clif->pDull/*,XXX*/); // CZ_REQ_COUNT_BARGAIN_SALE_ITEM
+	packet(0x09c3,clif->pDull/*,XXX*/); // CZ_REQ_COUNT_BARGAIN_SALE_ITEM
 // changed packet sizes
 #endif
 
 //2013-08-07Ragexe (Shakto)
 #if PACKETVER >= 20130807
-	packet(0x0369,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x083C,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x0437,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x035F,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x0202,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x07E4,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x0362,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x07EC,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x0364,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x0438,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x0366,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x096A,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0368,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-	packet(0x0838,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
-	packet(0x0835,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
-	packet(0x0819,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
-	packet(0x0811,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
-	packet(0x0360,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x0817,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x083C,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x035F,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x07E4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x07EC,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x096A,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
 #ifdef PACKETVER_RE
-	packet(0x0365,41,clif->pPartyRecruitRegisterReq,2,4);
+	packet(0x0365,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
-	packet(0x0365,18,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
 #endif // PACKETVER_RE
-	packet(0x0281,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x022D,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0802,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x023B,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x0361,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x0887,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x0363,8,clif->pDull); // CZ_JOIN_BATTLE_FIELD
-	packet(0x0436,4,clif->pDull); // CZ_GANGSI_RANK
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x022D,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x023B,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x0887,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x0363,clif->pDull); // CZ_JOIN_BATTLE_FIELD
+	packet(0x0436,clif->pDull); // CZ_GANGSI_RANK
 #endif
 
 //2013-08-14aRagexe - Themon
 #if PACKETVER >= 20130814
-	packet(0x0874,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x0947,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x093A,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x088A,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x088C,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x0926,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x095F,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x0202,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x0873,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x0887,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x0962,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x0937,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0923,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-	packet(0x0868,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
-	packet(0x0941,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
-	packet(0x0889,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
-	packet(0x0835,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
-	packet(0x0895,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x094E,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x0936,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x0874,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x0947,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x093A,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x088A,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x088C,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x0926,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x095F,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x0202,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x0873,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0887,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x0962,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x0937,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0923,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x0868,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x0941,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x0889,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x0835,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x0895,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x094E,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0936,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
 #ifdef PACKETVER_RE
-	packet(0x0365,41,clif->pPartyRecruitRegisterReq,2,4);
+	packet(0x0365,clif->pPartyRecruitRegisterReq,2,4);
 #else // not PACKETVER_RE
-	packet(0x0959,18,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
+	packet(0x0959,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
 #endif // PACKETVER_RE
-	packet(0x08A4,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x0368,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0927,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x0281,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x0958,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x0885,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x0815,4,clif->pDull); // CZ_GANGSI_RANK
-	packet(0x0896,8,clif->pDull); // CZ_JOIN_BATTLE_FIELD
+	packet(0x08A4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x0368,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0927,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x0281,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x0958,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x0885,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x0815,clif->pDull); // CZ_GANGSI_RANK
+	packet(0x0896,clif->pDull); // CZ_JOIN_BATTLE_FIELD
 #endif
 
 // 2013-08-14aRagexe
 #if PACKETVER >= 20130814
 // new packets
-	packet(0x09ce,102,clif->pGM_Monster_Item,2); // CZ_ITEM_CREATE_EX
-	packet(0x09d0,-1,clif->pDull/*,XXX*/); // CZ_NPROTECTGAMEGUARDCSAUTH
+	packet(0x09ce,clif->pGM_Monster_Item,2); // CZ_ITEM_CREATE_EX
+	packet(0x09d0,clif->pDull/*,XXX*/); // CZ_NPROTECTGAMEGUARDCSAUTH
 // changed packet sizes
 #endif
 
@@ -1464,17 +1464,17 @@ packet(0x96e,-1,clif->ackmergeitems);
 #if PACKETVER >= 20130828
 // new packets
 // changed packet sizes
-	packet(0x09ba,2,clif->pDull/*,XXX*/); // CZ_REQ_OPEN_GUILD_STORAGE
-	packet(0x09be,2,clif->pDull/*,XXX*/); // CZ_REQ_CLOSE_GUILD_STORAGE
+	packet(0x09ba,clif->pDull/*,XXX*/); // CZ_REQ_OPEN_GUILD_STORAGE
+	packet(0x09be,clif->pDull/*,XXX*/); // CZ_REQ_CLOSE_GUILD_STORAGE
 #endif
 
 // 2013-09-11aRagexe
 #if PACKETVER >= 20130911
 // new packets
-	packet(0x09d4,2,clif->pNPCShopClosed); // CZ_NPC_TRADE_QUIT
-	packet(0x09d6,-1,clif->pNPCMarketPurchase); // CZ_NPC_MARKET_PURCHASE
-	packet(0x09d8,2,clif->pNPCMarketClosed); // CZ_NPC_MARKET_CLOSE
-	packet(0x09d9,2,clif->pDull/*,XXX*/); // CZ_REQ_GUILDSTORAGE_LOG
+	packet(0x09d4,clif->pNPCShopClosed); // CZ_NPC_TRADE_QUIT
+	packet(0x09d6,clif->pNPCMarketPurchase); // CZ_NPC_MARKET_PURCHASE
+	packet(0x09d8,clif->pNPCMarketClosed); // CZ_NPC_MARKET_CLOSE
+	packet(0x09d9,clif->pDull/*,XXX*/); // CZ_REQ_GUILDSTORAGE_LOG
 // changed packet sizes
 #endif
 
@@ -1482,163 +1482,163 @@ packet(0x96e,-1,clif->ackmergeitems);
 #if PACKETVER >= 20131002
 // new packets
 // changed packet sizes
-	packet(0x09d9,4,clif->pDull/*,XXX*/); // CZ_REQ_GUILDSTORAGE_LOG
+	packet(0x09d9,clif->pDull/*,XXX*/); // CZ_REQ_GUILDSTORAGE_LOG
 #endif
 
 // 2013-10-16aRagexe
 #if PACKETVER >= 20131016
 // new packets
 // changed packet sizes
-	packet(0x09d9,6,clif->pDull/*,XXX*/); // CZ_REQ_GUILDSTORAGE_LOG
+	packet(0x09d9,clif->pDull/*,XXX*/); // CZ_REQ_GUILDSTORAGE_LOG
 #endif
 
 // 2013-10-23aRagexe
 #if PACKETVER >= 20131023
 // new packets
 // changed packet sizes
-	packet(0x09d9,4,clif->pDull/*,XXX*/); // CZ_REQ_GUILDSTORAGE_LOG
+	packet(0x09d9,clif->pDull/*,XXX*/); // CZ_REQ_GUILDSTORAGE_LOG
 #endif
 
 // 2013-11-06aRagexe
 #if PACKETVER >= 20131106
 // new packets
-	packet(0x09e1,8,clif->pDull/*,XXX*/); // CZ_MOVE_ITEM_FROM_BODY_TO_GUILDSTORAGE
-	packet(0x09e2,8,clif->pDull/*,XXX*/); // CZ_MOVE_ITEM_FROM_GUILDSTORAGE_TO_BODY
-	packet(0x09e3,8,clif->pDull/*,XXX*/); // CZ_MOVE_ITEM_FROM_CART_TO_GUILDSTORAGE
-	packet(0x09e4,8,clif->pDull/*,XXX*/); // CZ_MOVE_ITEM_FROM_GUILDSTORAGE_TO_CART
+	packet(0x09e1,clif->pDull/*,XXX*/); // CZ_MOVE_ITEM_FROM_BODY_TO_GUILDSTORAGE
+	packet(0x09e2,clif->pDull/*,XXX*/); // CZ_MOVE_ITEM_FROM_GUILDSTORAGE_TO_BODY
+	packet(0x09e3,clif->pDull/*,XXX*/); // CZ_MOVE_ITEM_FROM_CART_TO_GUILDSTORAGE
+	packet(0x09e4,clif->pDull/*,XXX*/); // CZ_MOVE_ITEM_FROM_GUILDSTORAGE_TO_CART
 // changed packet sizes
 #endif
 
 // 2013-12-11dRagexe
 #if PACKETVER >= 20131211
 // new packets
-	packet(0x09e8,18,clif->pDull/*,XXX*/); // CZ_OPEN_RODEXBOX
-	packet(0x09e9,2,clif->pRodexCloseMailbox); // CZ_CLOSE_RODEXBOX
-	packet(0x09ee,-1,clif->pDull/*,XXX*/); // CZ_REQ_NEXT_RODEX
+	packet(0x09e8,clif->pDull/*,XXX*/); // CZ_OPEN_RODEXBOX
+	packet(0x09e9,clif->pRodexCloseMailbox); // CZ_CLOSE_RODEXBOX
+	packet(0x09ee,clif->pDull/*,XXX*/); // CZ_REQ_NEXT_RODEX
 // changed packet sizes
 #endif
 
 // 2013-12-18bRagexe - Yommy
 #if PACKETVER >= 20131218
-	packet(0x0369,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x083C,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x0437,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x035F,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x0947,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x07E4,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x0362,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x07EC,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x0364,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x0438,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x0366,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x096A,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0368,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-	packet(0x0838,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
-	packet(0x0835,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
-	packet(0x0819,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
-	packet(0x022D,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
-	packet(0x0360,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x0817,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
-	packet(0x0365,18,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
-	packet(0x0281,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x092F,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0802,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x08AB,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x0811,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x085C,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x0363,8,clif->pDull); // CZ_JOIN_BATTLE_FIELD
-	packet(0x087b,4,clif->pDull); // CZ_GANGSI_RANK
+	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x083C,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x035F,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x0947,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x07E4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x07EC,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x096A,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x022D,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x092F,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x08AB,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x0811,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x085C,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x0363,clif->pDull); // CZ_JOIN_BATTLE_FIELD
+	packet(0x087b,clif->pDull); // CZ_GANGSI_RANK
 #endif
 
 // 2013-12-18bRagexe
 #if PACKETVER >= 20131218
 // new packets
-	packet(0x09ea,10,clif->pDull/*,XXX*/); // CZ_REQ_READ_RODEX
-	packet(0x09ef,11,clif->pRodexRefreshMaillist); // CZ_REQ_REFRESH_RODEX
-	packet(0x09f5,11,clif->pRodexDeleteMail); // CZ_REQ_DELETE_RODEX
+	packet(0x09ea,clif->pDull/*,XXX*/); // CZ_REQ_READ_RODEX
+	packet(0x09ef,clif->pRodexRefreshMaillist); // CZ_REQ_REFRESH_RODEX
+	packet(0x09f5,clif->pRodexDeleteMail); // CZ_REQ_DELETE_RODEX
 // changed packet sizes
-	packet(0x09e8,10,clif->pDull/*,XXX*/); // CZ_OPEN_RODEXBOX
-	packet(0x09ee,11,clif->pRodexNextMaillist); // CZ_REQ_NEXT_RODEX
+	packet(0x09e8,clif->pDull/*,XXX*/); // CZ_OPEN_RODEXBOX
+	packet(0x09ee,clif->pRodexNextMaillist); // CZ_REQ_NEXT_RODEX
 #endif
 
 // 2013-12-23cRagexe - Yommy
 #if PACKETVER >= 20131223
-	packet(0x0369,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x083C,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x0437,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x035F,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x0202,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x07E4,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x0362,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x07EC,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x0364,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x0438,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x0366,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x096A,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0368,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-	packet(0x0838,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
-	packet(0x0835,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
-	packet(0x0819,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
-	packet(0x0811,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
-	packet(0x0360,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x0817,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
-	packet(0x0365,18,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
-	packet(0x0281,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x022d,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x0802,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x023B,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x0361,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x08A4,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x0363,8,clif->pDull); // CZ_JOIN_BATTLE_FIELD
-	packet(0x0436,4,clif->pDull); // CZ_GANGSI_RANK
+	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x083C,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x035F,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x07E4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x07EC,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x096A,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x023B,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x08A4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x0363,clif->pDull); // CZ_JOIN_BATTLE_FIELD
+	packet(0x0436,clif->pDull); // CZ_GANGSI_RANK
 #endif
 
 // 2013-12-23bRagexe
 #if PACKETVER >= 20131223
 // new packets
 // changed packet sizes
-	packet(0x09ea,11,clif->pRodexReadMail); // CZ_REQ_READ_RODEX
+	packet(0x09ea,clif->pRodexReadMail); // CZ_REQ_READ_RODEX
 #endif
 
 // 2013-12-30aRagexe - Yommy
 #if PACKETVER >= 20131230
-	packet(0x0871,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
-	packet(0x02C4,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
-	packet(0x035F,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
-	packet(0x0438,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
-	packet(0x094A,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
-	packet(0x092A,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
-	packet(0x0860,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
-	packet(0x0968,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
-	packet(0x0895,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
-	packet(0x091E,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
-	packet(0x096A,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
-	packet(0x0926,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
-	packet(0x0898,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
-	packet(0x087B,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
-	packet(0x0369,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
-	packet(0x093D,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
-	packet(0x087F,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
-	packet(0x0969,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
-	packet(0x094C,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
-	packet(0x0365,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
-	packet(0x091F,18,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
-	packet(0x022D,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
-	packet(0x089C,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
-	packet(0x08A9,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
-	packet(0x0943,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
-	packet(0x0949,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
-	packet(0x091D,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
-	packet(0x087e,4,clif->pDull); // CZ_GANGSI_RANK
-	packet(0x093e,8,clif->pDull); // CZ_JOIN_BATTLE_FIELD
+	packet(0x0871,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x02C4,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x035F,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x0438,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x094A,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x092A,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x0860,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x0968,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x0895,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x091E,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x096A,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x0926,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0898,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x087B,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x0369,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x093D,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x087F,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x0969,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x094C,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x0365,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x091F,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
+	packet(0x022D,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x089C,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x08A9,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x0943,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x0949,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x091D,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x087e,clif->pDull); // CZ_GANGSI_RANK
+	packet(0x093e,clif->pDull); // CZ_JOIN_BATTLE_FIELD
 #endif
 
 // 2013-12-30aRagexe
 #if PACKETVER >= 20131230
 // new packets
-	packet(0x09ec,-1,clif->pRodexSendMail); // CZ_REQ_SEND_RODEX
+	packet(0x09ec,clif->pRodexSendMail); // CZ_REQ_SEND_RODEX
 // changed packet sizes
 #endif
 
@@ -1647,152 +1647,152 @@ packet(0x96e,-1,clif->ackmergeitems);
 // 2014-01-15cRagexeRE
 #if PACKETVER >= 20140115
 // new packets
-	packet(0x09f1,10,clif->pDull/*,XXX*/); // CZ_REQ_ZENY_FROM_RODEX
-	packet(0x09f3,15,clif->pDull/*,XXX*/); // CZ_REQ_ITEM_FROM_RODEX
+	packet(0x09f1,clif->pDull/*,XXX*/); // CZ_REQ_ZENY_FROM_RODEX
+	packet(0x09f3,clif->pDull/*,XXX*/); // CZ_REQ_ITEM_FROM_RODEX
 // changed packet sizes
 #endif
 
 // 2014-01-22aRagexeRE
 #if PACKETVER >= 20140122
 // new packets
-	packet(0x09fb,-1,clif->pPetEvolution); // CZ_PET_EVOLUTION
+	packet(0x09fb,clif->pPetEvolution); // CZ_PET_EVOLUTION
 // changed packet sizes
 #endif
 
 // 2014-01-29bRagexeRE
 #if PACKETVER >= 20140129
 // new packets
-	packet(0x0a01,3,clif->pHotkeyRowShift,2); // CZ_SHORTCUTKEYBAR_ROTATE
+	packet(0x0a01,clif->pHotkeyRowShift,2); // CZ_SHORTCUTKEYBAR_ROTATE
 #endif
 
 // 2014-02-12aRagexeRE
 #if PACKETVER >= 20140212
 // new packets
 // changed packet sizes
-	packet(0x09e8,11,clif->pRodexOpenMailbox); // CZ_OPEN_RODEXBOX
+	packet(0x09e8,clif->pRodexOpenMailbox); // CZ_OPEN_RODEXBOX
 #endif
 
 // 2014-02-26aRagexeRE
 #if PACKETVER >= 20140226
 // new packets
-	packet(0x0a03,14,clif->pDull/*,XXX*/); // CZ_REQ_CANCEL_WRITE_RODEX
-	packet(0x0a04,11,clif->pDull/*,XXX*/); // CZ_REQ_ADD_ITEM_RODEX
-	packet(0x0a06,5,clif->pDull/*,XXX*/); // CZ_REQ_REMOVE_RODEX_ITEM
+	packet(0x0a03,clif->pDull/*,XXX*/); // CZ_REQ_CANCEL_WRITE_RODEX
+	packet(0x0a04,clif->pDull/*,XXX*/); // CZ_REQ_ADD_ITEM_RODEX
+	packet(0x0a06,clif->pDull/*,XXX*/); // CZ_REQ_REMOVE_RODEX_ITEM
 // changed packet sizes
 #endif
 
 // 2014-03-05aRagexeRE
 #if PACKETVER >= 20140305
 // new packets
-	packet(0x0a08,5,clif->pDull/*,XXX*/); // CZ_REQ_OPEN_WRITE_RODEX
+	packet(0x0a08,clif->pDull/*,XXX*/); // CZ_REQ_OPEN_WRITE_RODEX
 // changed packet sizes
-	packet(0x09f3,10,clif->pDull/*,XXX*/); // CZ_REQ_ITEM_FROM_RODEX
+	packet(0x09f3,clif->pDull/*,XXX*/); // CZ_REQ_ITEM_FROM_RODEX
 #endif
 
 // 2014-03-26cRagexeRE
 #if PACKETVER >= 20140326
 // changed packet sizes
-	packet(0x09f1,11,clif->pRodexRequestZeny); // CZ_REQ_ZENY_FROM_RODEX
-	packet(0x09f3,11,clif->pRodexRequestItems); // CZ_REQ_ITEM_FROM_RODEX
-	packet(0x0a03,2,clif->pRodexCancelWriteMail); // CZ_REQ_CANCEL_WRITE_RODEX
-	packet(0x0a08,7,clif->pDull/*,XXX*/); // CZ_REQ_OPEN_WRITE_RODEX
+	packet(0x09f1,clif->pRodexRequestZeny); // CZ_REQ_ZENY_FROM_RODEX
+	packet(0x09f3,clif->pRodexRequestItems); // CZ_REQ_ITEM_FROM_RODEX
+	packet(0x0a03,clif->pRodexCancelWriteMail); // CZ_REQ_CANCEL_WRITE_RODEX
+	packet(0x0a08,clif->pDull/*,XXX*/); // CZ_REQ_OPEN_WRITE_RODEX
 #endif
 
 // 2014-04-16aRagexeRE
 #if PACKETVER >= 20140416
 // new packets
-	packet(0x0a04,6,clif->pRodexAddItem); // CZ_REQ_ADD_ITEM_RODEX
-	packet(0x0a13,2,clif->pRodexCheckName); // CZ_CHECK_RECEIVE_CHARACTER_NAME
+	packet(0x0a04,clif->pRodexAddItem); // CZ_REQ_ADD_ITEM_RODEX
+	packet(0x0a13,clif->pRodexCheckName); // CZ_CHECK_RECEIVE_CHARACTER_NAME
 // changed packet sizes
-	packet(0x0a06,6,clif->pRodexRemoveItem); // CZ_REQ_REMOVE_RODEX_ITEM
-	packet(0x0a08,26,clif->pRodexOpenWriteMail); // CZ_REQ_OPEN_WRITE_RODEX
+	packet(0x0a06,clif->pRodexRemoveItem); // CZ_REQ_REMOVE_RODEX_ITEM
+	packet(0x0a08,clif->pRodexOpenWriteMail); // CZ_REQ_OPEN_WRITE_RODEX
 #endif
 
 // 2014-04-23aRagexeRE
 #if PACKETVER >= 20140423
 // new packets
 // changed packet sizes
-	packet(0x0a13,26,clif->pRodexCheckName); // CZ_CHECK_RECEIVE_CHARACTER_NAME
+	packet(0x0a13,clif->pRodexCheckName); // CZ_CHECK_RECEIVE_CHARACTER_NAME
 #endif
 
 // 2014-04-30aRagexeRE
 #if PACKETVER >= 20140430
 // new packets
-	packet(0x0a16,26,clif->pDull/*,XXX*/); // CZ_DYNAMICNPC_CREATE_REQUEST
+	packet(0x0a16,clif->pDull/*,XXX*/); // CZ_DYNAMICNPC_CREATE_REQUEST
 #endif
 
 /* Roulette System [Yommy/Hercules] */
 // 2014-06-05aRagexe
 #if PACKETVER >= 20140605
 // new packets
-	packet(0x0a19,-1,clif->pDull/*,XXX*/); // CZ_REQ_OPEN_ROULETTE
-	packet(0x0A1B,2,clif->pRouletteInfo,0);     // HEADER_CZ_REQ_ROULETTE_INFO
-	packet(0x0a1d,14,clif->pDull/*,XXX*/); // CZ_REQ_CLOSE_ROULETTE
+	packet(0x0a19,clif->pDull/*,XXX*/); // CZ_REQ_OPEN_ROULETTE
+	packet(0x0A1B,clif->pRouletteInfo,0);     // HEADER_CZ_REQ_ROULETTE_INFO
+	packet(0x0a1d,clif->pDull/*,XXX*/); // CZ_REQ_CLOSE_ROULETTE
 #endif
 
 /* Roulette System [Yommy/Hercules] */
 // 2014-06-11bRagexe / RE. moved by 4144
 #if PACKETVER >= 20140611
 // new packets
-	packet(0x0a1f,2,clif->pRouletteGenerate,0); // CZ_REQ_GENERATE_ROULETTE
-	packet(0x0a21,6,clif->pDull/*,XXX*/); // CZ_RECV_ROULETTE_ITEM
-	packet(0x0a25,6,clif->pAchievementGetReward,2); // CZ_REQ_ACH_REWARD
+	packet(0x0a1f,clif->pRouletteGenerate,0); // CZ_REQ_GENERATE_ROULETTE
+	packet(0x0a21,clif->pDull/*,XXX*/); // CZ_RECV_ROULETTE_ITEM
+	packet(0x0a25,clif->pAchievementGetReward,2); // CZ_REQ_ACH_REWARD
 // changed packet sizes
-	packet(0x0a19,2,clif->pRouletteOpen,0); // CZ_REQ_OPEN_ROULETTE
-	packet(0x0a1d,2,clif->pRouletteClose,0); // CZ_REQ_CLOSE_ROULETTE
+	packet(0x0a19,clif->pRouletteOpen,0); // CZ_REQ_OPEN_ROULETTE
+	packet(0x0a1d,clif->pRouletteClose,0); // CZ_REQ_CLOSE_ROULETTE
 #endif
 
 // 2014-06-18cRagexeRE
 #if PACKETVER >= 20140618
 // changed packet sizes
-	packet(0x0a21,3,clif->pRouletteRecvItem,2); // CZ_RECV_ROULETTE_ITEM
+	packet(0x0a21,clif->pRouletteRecvItem,2); // CZ_RECV_ROULETTE_ITEM
 #endif
 
 // 2014-07-02aRagexeRE
 #if PACKETVER >= 20140702
 // new packets
-	packet(0x0a2a,6,clif->pDull/*,XXX*/); // CZ_ACK_AU_BOT
+	packet(0x0a2a,clif->pDull/*,XXX*/); // CZ_ACK_AU_BOT
 #endif
 
 // 2014-09-03aRagexeRE
 #if PACKETVER >= 20140903
 // new packets
-	packet(0x0a2e,6,clif->pChangeTitle); // CZ_REQ_CHANGE_TITLE
+	packet(0x0a2e,clif->pChangeTitle); // CZ_REQ_CHANGE_TITLE
 // changed packet sizes
 #endif
 
 // 2014-11-19bRagexeRE
 #if PACKETVER >= 20141119
 // new packets
-	packet(0x0A35,4,clif->pOneClick_ItemIdentify,2);
+	packet(0x0A35,clif->pOneClick_ItemIdentify,2);
 // changed packet sizes
 #endif
 
 // 2015-11-04aRagexeRE
 #if PACKETVER >= 20151104
 // new packets
-	packet(0x0a46,14,clif->pReqStyleChange);
+	packet(0x0a46,clif->pReqStyleChange);
 #endif
 
 // 2016-03-23aRagexeRE
 #if PACKETVER >= 20160323
 // new packets
-	packet(0x0a68,3,clif->pOpenUIRequest);
+	packet(0x0a68,clif->pOpenUIRequest);
 // changed packet sizes
 #endif
 
 // 2016-03-30aRagexeRE
 #if PACKETVER >= 20160330
 // new packets
-	packet(0x0a6e,-1,clif->pRodexSendMail); // CZ_RODEX_SEND_MAIL
+	packet(0x0a6e,clif->pRodexSendMail); // CZ_RODEX_SEND_MAIL
 // changed packet sizes
 #endif
 
 // 2017-02-28aRagexeRE
 #if PACKETVER >= 20170228
 // new packets
-	packet(0x0ac0,26,clif->pRodexOpenMailbox); // CZ_OPEN_RODEXBOX
-	packet(0x0ac1,26,clif->pRodexRefreshMaillist); // CZ_REQ_REFRESH_RODEX
+	packet(0x0ac0,clif->pRodexOpenMailbox); // CZ_OPEN_RODEXBOX
+	packet(0x0ac1,clif->pRodexRefreshMaillist); // CZ_REQ_REFRESH_RODEX
 // changed packet sizes
 #endif
 
@@ -1800,13 +1800,13 @@ packet(0x96e,-1,clif->ackmergeitems);
 #if PACKETVER >= 20170830
 // new packets
 // changed packet sizes
-	packet(0x0a49,20,clif->pPrivateAirshipRequest);
+	packet(0x0a49,clif->pPrivateAirshipRequest);
 #endif
 
 #ifdef PACKETVER_ZERO
 #if PACKETVER >= 20171214
 // new packets
-	packet(0x0ae8,2,clif->pChangeDress);
+	packet(0x0ae8,clif->pChangeDress);
 // changed packet sizes
 #endif
 #endif  // PACKETVER_ZERO
@@ -1814,13 +1814,13 @@ packet(0x96e,-1,clif->ackmergeitems);
 // 2017-12-20aRagexe
 #if PACKETVER >= 20171220
 // new packets
-	packet(0x0ae8,2,clif->pChangeDress);
+	packet(0x0ae8,clif->pChangeDress);
 // changed packet sizes
 #endif
 
 #if PACKETVER >= 20180117
 // new packets
-	packet(0x0aef,2,clif->pAttendanceRewardRequest);
+	packet(0x0aef,clif->pAttendanceRewardRequest);
 // changed packet sizes
 #endif
 
@@ -1828,7 +1828,7 @@ packet(0x96e,-1,clif->ackmergeitems);
 // 2018-01-31dRagexe_zero
 #if PACKETVER >= 20180131
 // new packets
-	packet(0x0af4,11,clif->pUseSkillToPos,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND
+	packet(0x0af4,clif->pUseSkillToPos,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND
 // changed packet sizes
 #endif
 #endif  // PACKETVER_ZERO
@@ -1837,7 +1837,7 @@ packet(0x96e,-1,clif->ackmergeitems);
 // 2018-02-07bRagexeRE, 2018-02-07bRagexe
 #if PACKETVER >= 20180207
 // new packets
-	packet(0x0af4,11,clif->pUseSkillToPos,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND
+	packet(0x0af4,clif->pUseSkillToPos,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND
 // changed packet sizes
 #endif
 #endif  // PACKETVER_ZERO
@@ -1846,7 +1846,7 @@ packet(0x96e,-1,clif->ackmergeitems);
 // 2018-05-16cRagexe, 2018-05-16cRagexeRE
 #if PACKETVER >= 20180516
 // new packets
-	packet(0x0afc,16,clif->pReqStyleChange2);
+	packet(0x0afc,clif->pReqStyleChange2);
 // changed packet sizes
 #endif
 #endif  // PACKETVER_ZERO
@@ -1855,7 +1855,7 @@ packet(0x96e,-1,clif->ackmergeitems);
 // 2018-05-23aRagexe_zero
 #if PACKETVER >= 20180523
 // new packets
-	packet(0x0afc,16,clif->pReqStyleChange2);
+	packet(0x0afc,clif->pReqStyleChange2);
 // changed packet sizes
 #endif
 #endif  // PACKETVER_ZERO
@@ -1864,15 +1864,15 @@ packet(0x96e,-1,clif->ackmergeitems);
 #if PACKETVER_RE_NUM >= 20180704
 // new packets
 // changed packet sizes
-	packet(0x018e,18,clif->pProduceMix); // CZ_REQMAKINGITEM
-	packet(0x01ae,6,clif->pSelectArrow,2); // CZ_REQ_MAKINGARROW
-	packet(0x01fd,25,clif->pRepairItem); // CZ_REQ_ITEMREPAIR
-	packet(0x025b,8,clif->pCooking); // CZ_REQ_MAKINGITEM
-	packet(0x0445,12,clif->pDull/*,XXX*/); // CZ_SIMPLE_BUY_CASH_POINT_ITEM
-	packet(0x09ae,19,clif->pDull/*,XXX*/); // CZ_REQ_APPLY_BARGAIN_SALE_ITEM
-	packet(0x09b0,10,clif->pDull/*,XXX*/); // CZ_REQ_REMOVE_BARGAIN_SALE_ITEM
-	packet(0x09c3,10,clif->pDull/*,XXX*/); // CZ_REQ_COUNT_BARGAIN_SALE_ITEM
-	packet(0x0a49,22,clif->pPrivateAirshipRequest); // CZ_PRIVATE_AIRSHIP_REQUEST
+	packet(0x018e,clif->pProduceMix); // CZ_REQMAKINGITEM
+	packet(0x01ae,clif->pSelectArrow,2); // CZ_REQ_MAKINGARROW
+	packet(0x01fd,clif->pRepairItem); // CZ_REQ_ITEMREPAIR
+	packet(0x025b,clif->pCooking); // CZ_REQ_MAKINGITEM
+	packet(0x0445,clif->pDull/*,XXX*/); // CZ_SIMPLE_BUY_CASH_POINT_ITEM
+	packet(0x09ae,clif->pDull/*,XXX*/); // CZ_REQ_APPLY_BARGAIN_SALE_ITEM
+	packet(0x09b0,clif->pDull/*,XXX*/); // CZ_REQ_REMOVE_BARGAIN_SALE_ITEM
+	packet(0x09c3,clif->pDull/*,XXX*/); // CZ_REQ_COUNT_BARGAIN_SALE_ITEM
+	packet(0x0a49,clif->pPrivateAirshipRequest); // CZ_PRIVATE_AIRSHIP_REQUEST
 #endif
 
 #endif /* MAP_PACKETS_H */