Re-generated HPMHooking definitions

Follow-up to c5c3381b0b8b0b59c669d474acf749db82d7edb1

Signed-off-by: Haru <haru@dotalux.com>

3 files changed, 2067 insertions, 1797 deletions

diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
index ea5e2405f..2981e1977 100644
--- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
@@ -1271,6 +1271,10 @@ struct {
 	struct HPMHookPoint *HP_clif_chsys_gjoin_post;
 	struct HPMHookPoint *HP_clif_chsys_gleave_pre;
 	struct HPMHookPoint *HP_clif_chsys_gleave_post;
+	struct HPMHookPoint *HP_clif_bank_deposit_pre;
+	struct HPMHookPoint *HP_clif_bank_deposit_post;
+	struct HPMHookPoint *HP_clif_bank_withdraw_pre;
+	struct HPMHookPoint *HP_clif_bank_withdraw_post;
 	struct HPMHookPoint *HP_clif_pWantToConnection_pre;
 	struct HPMHookPoint *HP_clif_pWantToConnection_post;
 	struct HPMHookPoint *HP_clif_pLoadEndAck_pre;
@@ -1699,6 +1703,16 @@ struct {
 	struct HPMHookPoint *HP_clif_pPartyBookingRefuseVolunteer_post;
 	struct HPMHookPoint *HP_clif_pPartyBookingCancelVolunteer_pre;
 	struct HPMHookPoint *HP_clif_pPartyBookingCancelVolunteer_post;
+	struct HPMHookPoint *HP_clif_pBankDeposit_pre;
+	struct HPMHookPoint *HP_clif_pBankDeposit_post;
+	struct HPMHookPoint *HP_clif_pBankWithdraw_pre;
+	struct HPMHookPoint *HP_clif_pBankWithdraw_post;
+	struct HPMHookPoint *HP_clif_pBankCheck_pre;
+	struct HPMHookPoint *HP_clif_pBankCheck_post;
+	struct HPMHookPoint *HP_clif_pBankOpen_pre;
+	struct HPMHookPoint *HP_clif_pBankOpen_post;
+	struct HPMHookPoint *HP_clif_pBankClose_pre;
+	struct HPMHookPoint *HP_clif_pBankClose_post;
 	struct HPMHookPoint *HP_duel_create_pre;
 	struct HPMHookPoint *HP_duel_create_post;
 	struct HPMHookPoint *HP_duel_invite_pre;
@@ -3765,6 +3779,10 @@ struct {
 	struct HPMHookPoint *HP_pc_calcweapontype_post;
 	struct HPMHookPoint *HP_pc_removecombo_pre;
 	struct HPMHookPoint *HP_pc_removecombo_post;
+	struct HPMHookPoint *HP_pc_bank_deposit_pre;
+	struct HPMHookPoint *HP_pc_bank_deposit_post;
+	struct HPMHookPoint *HP_pc_bank_withdraw_pre;
+	struct HPMHookPoint *HP_pc_bank_withdraw_post;
 	struct HPMHookPoint *HP_pet_init_pre;
 	struct HPMHookPoint *HP_pet_init_post;
 	struct HPMHookPoint *HP_pet_final_pre;
@@ -6128,6 +6146,10 @@ struct {
 	int HP_clif_chsys_gjoin_post;
 	int HP_clif_chsys_gleave_pre;
 	int HP_clif_chsys_gleave_post;
+	int HP_clif_bank_deposit_pre;
+	int HP_clif_bank_deposit_post;
+	int HP_clif_bank_withdraw_pre;
+	int HP_clif_bank_withdraw_post;
 	int HP_clif_pWantToConnection_pre;
 	int HP_clif_pWantToConnection_post;
 	int HP_clif_pLoadEndAck_pre;
@@ -6556,6 +6578,16 @@ struct {
 	int HP_clif_pPartyBookingRefuseVolunteer_post;
 	int HP_clif_pPartyBookingCancelVolunteer_pre;
 	int HP_clif_pPartyBookingCancelVolunteer_post;
+	int HP_clif_pBankDeposit_pre;
+	int HP_clif_pBankDeposit_post;
+	int HP_clif_pBankWithdraw_pre;
+	int HP_clif_pBankWithdraw_post;
+	int HP_clif_pBankCheck_pre;
+	int HP_clif_pBankCheck_post;
+	int HP_clif_pBankOpen_pre;
+	int HP_clif_pBankOpen_post;
+	int HP_clif_pBankClose_pre;
+	int HP_clif_pBankClose_post;
 	int HP_duel_create_pre;
 	int HP_duel_create_post;
 	int HP_duel_invite_pre;
@@ -8622,6 +8654,10 @@ struct {
 	int HP_pc_calcweapontype_post;
 	int HP_pc_removecombo_pre;
 	int HP_pc_removecombo_post;
+	int HP_pc_bank_deposit_pre;
+	int HP_pc_bank_deposit_post;
+	int HP_pc_bank_withdraw_pre;
+	int HP_pc_bank_withdraw_post;
 	int HP_pet_init_pre;
 	int HP_pet_init_post;
 	int HP_pet_final_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
index 0eaaf4b93..34afbdabf 100644
--- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
@@ -645,1830 +645,1839 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->chsys_quitg), HP_POP2(HP_clif_chsys_quitg), 1260 },
 	{ HP_POP(clif->chsys_gjoin), HP_POP2(HP_clif_chsys_gjoin), 1262 },
 	{ HP_POP(clif->chsys_gleave), HP_POP2(HP_clif_chsys_gleave), 1264 },
-	{ HP_POP(clif->pWantToConnection), HP_POP2(HP_clif_pWantToConnection), 1266 },
-	{ HP_POP(clif->pLoadEndAck), HP_POP2(HP_clif_pLoadEndAck), 1268 },
-	{ HP_POP(clif->pTickSend), HP_POP2(HP_clif_pTickSend), 1270 },
-	{ HP_POP(clif->pHotkey), HP_POP2(HP_clif_pHotkey), 1272 },
-	{ HP_POP(clif->pProgressbar), HP_POP2(HP_clif_pProgressbar), 1274 },
-	{ HP_POP(clif->pWalkToXY), HP_POP2(HP_clif_pWalkToXY), 1276 },
-	{ HP_POP(clif->pQuitGame), HP_POP2(HP_clif_pQuitGame), 1278 },
-	{ HP_POP(clif->pGetCharNameRequest), HP_POP2(HP_clif_pGetCharNameRequest), 1280 },
-	{ HP_POP(clif->pGlobalMessage), HP_POP2(HP_clif_pGlobalMessage), 1282 },
-	{ HP_POP(clif->pMapMove), HP_POP2(HP_clif_pMapMove), 1284 },
-	{ HP_POP(clif->pChangeDir), HP_POP2(HP_clif_pChangeDir), 1286 },
-	{ HP_POP(clif->pEmotion), HP_POP2(HP_clif_pEmotion), 1288 },
-	{ HP_POP(clif->pHowManyConnections), HP_POP2(HP_clif_pHowManyConnections), 1290 },
-	{ HP_POP(clif->pActionRequest), HP_POP2(HP_clif_pActionRequest), 1292 },
-	{ HP_POP(clif->pActionRequest_sub), HP_POP2(HP_clif_pActionRequest_sub), 1294 },
-	{ HP_POP(clif->pRestart), HP_POP2(HP_clif_pRestart), 1296 },
-	{ HP_POP(clif->pWisMessage), HP_POP2(HP_clif_pWisMessage), 1298 },
-	{ HP_POP(clif->pBroadcast), HP_POP2(HP_clif_pBroadcast), 1300 },
-	{ HP_POP(clif->pTakeItem), HP_POP2(HP_clif_pTakeItem), 1302 },
-	{ HP_POP(clif->pDropItem), HP_POP2(HP_clif_pDropItem), 1304 },
-	{ HP_POP(clif->pUseItem), HP_POP2(HP_clif_pUseItem), 1306 },
-	{ HP_POP(clif->pEquipItem), HP_POP2(HP_clif_pEquipItem), 1308 },
-	{ HP_POP(clif->pUnequipItem), HP_POP2(HP_clif_pUnequipItem), 1310 },
-	{ HP_POP(clif->pNpcClicked), HP_POP2(HP_clif_pNpcClicked), 1312 },
-	{ HP_POP(clif->pNpcBuySellSelected), HP_POP2(HP_clif_pNpcBuySellSelected), 1314 },
-	{ HP_POP(clif->pNpcBuyListSend), HP_POP2(HP_clif_pNpcBuyListSend), 1316 },
-	{ HP_POP(clif->pNpcSellListSend), HP_POP2(HP_clif_pNpcSellListSend), 1318 },
-	{ HP_POP(clif->pCreateChatRoom), HP_POP2(HP_clif_pCreateChatRoom), 1320 },
-	{ HP_POP(clif->pChatAddMember), HP_POP2(HP_clif_pChatAddMember), 1322 },
-	{ HP_POP(clif->pChatRoomStatusChange), HP_POP2(HP_clif_pChatRoomStatusChange), 1324 },
-	{ HP_POP(clif->pChangeChatOwner), HP_POP2(HP_clif_pChangeChatOwner), 1326 },
-	{ HP_POP(clif->pKickFromChat), HP_POP2(HP_clif_pKickFromChat), 1328 },
-	{ HP_POP(clif->pChatLeave), HP_POP2(HP_clif_pChatLeave), 1330 },
-	{ HP_POP(clif->pTradeRequest), HP_POP2(HP_clif_pTradeRequest), 1332 },
-	{ HP_POP(clif->chann_config_read), HP_POP2(HP_clif_chann_config_read), 1334 },
-	{ HP_POP(clif->pTradeAck), HP_POP2(HP_clif_pTradeAck), 1336 },
-	{ HP_POP(clif->pTradeAddItem), HP_POP2(HP_clif_pTradeAddItem), 1338 },
-	{ HP_POP(clif->pTradeOk), HP_POP2(HP_clif_pTradeOk), 1340 },
-	{ HP_POP(clif->pTradeCancel), HP_POP2(HP_clif_pTradeCancel), 1342 },
-	{ HP_POP(clif->pTradeCommit), HP_POP2(HP_clif_pTradeCommit), 1344 },
-	{ HP_POP(clif->pStopAttack), HP_POP2(HP_clif_pStopAttack), 1346 },
-	{ HP_POP(clif->pPutItemToCart), HP_POP2(HP_clif_pPutItemToCart), 1348 },
-	{ HP_POP(clif->pGetItemFromCart), HP_POP2(HP_clif_pGetItemFromCart), 1350 },
-	{ HP_POP(clif->pRemoveOption), HP_POP2(HP_clif_pRemoveOption), 1352 },
-	{ HP_POP(clif->pChangeCart), HP_POP2(HP_clif_pChangeCart), 1354 },
-	{ HP_POP(clif->pStatusUp), HP_POP2(HP_clif_pStatusUp), 1356 },
-	{ HP_POP(clif->pSkillUp), HP_POP2(HP_clif_pSkillUp), 1358 },
-	{ HP_POP(clif->pUseSkillToId), HP_POP2(HP_clif_pUseSkillToId), 1360 },
-	{ HP_POP(clif->pUseSkillToId_homun), HP_POP2(HP_clif_pUseSkillToId_homun), 1362 },
-	{ HP_POP(clif->pUseSkillToId_mercenary), HP_POP2(HP_clif_pUseSkillToId_mercenary), 1364 },
-	{ HP_POP(clif->pUseSkillToPos), HP_POP2(HP_clif_pUseSkillToPos), 1366 },
-	{ HP_POP(clif->pUseSkillToPosSub), HP_POP2(HP_clif_pUseSkillToPosSub), 1368 },
-	{ HP_POP(clif->pUseSkillToPos_homun), HP_POP2(HP_clif_pUseSkillToPos_homun), 1370 },
-	{ HP_POP(clif->pUseSkillToPos_mercenary), HP_POP2(HP_clif_pUseSkillToPos_mercenary), 1372 },
-	{ HP_POP(clif->pUseSkillToPosMoreInfo), HP_POP2(HP_clif_pUseSkillToPosMoreInfo), 1374 },
-	{ HP_POP(clif->pUseSkillMap), HP_POP2(HP_clif_pUseSkillMap), 1376 },
-	{ HP_POP(clif->pRequestMemo), HP_POP2(HP_clif_pRequestMemo), 1378 },
-	{ HP_POP(clif->pProduceMix), HP_POP2(HP_clif_pProduceMix), 1380 },
-	{ HP_POP(clif->pCooking), HP_POP2(HP_clif_pCooking), 1382 },
-	{ HP_POP(clif->pRepairItem), HP_POP2(HP_clif_pRepairItem), 1384 },
-	{ HP_POP(clif->pWeaponRefine), HP_POP2(HP_clif_pWeaponRefine), 1386 },
-	{ HP_POP(clif->pNpcSelectMenu), HP_POP2(HP_clif_pNpcSelectMenu), 1388 },
-	{ HP_POP(clif->pNpcNextClicked), HP_POP2(HP_clif_pNpcNextClicked), 1390 },
-	{ HP_POP(clif->pNpcAmountInput), HP_POP2(HP_clif_pNpcAmountInput), 1392 },
-	{ HP_POP(clif->pNpcStringInput), HP_POP2(HP_clif_pNpcStringInput), 1394 },
-	{ HP_POP(clif->pNpcCloseClicked), HP_POP2(HP_clif_pNpcCloseClicked), 1396 },
-	{ HP_POP(clif->pItemIdentify), HP_POP2(HP_clif_pItemIdentify), 1398 },
-	{ HP_POP(clif->pSelectArrow), HP_POP2(HP_clif_pSelectArrow), 1400 },
-	{ HP_POP(clif->pAutoSpell), HP_POP2(HP_clif_pAutoSpell), 1402 },
-	{ HP_POP(clif->pUseCard), HP_POP2(HP_clif_pUseCard), 1404 },
-	{ HP_POP(clif->pInsertCard), HP_POP2(HP_clif_pInsertCard), 1406 },
-	{ HP_POP(clif->pSolveCharName), HP_POP2(HP_clif_pSolveCharName), 1408 },
-	{ HP_POP(clif->pResetChar), HP_POP2(HP_clif_pResetChar), 1410 },
-	{ HP_POP(clif->pLocalBroadcast), HP_POP2(HP_clif_pLocalBroadcast), 1412 },
-	{ HP_POP(clif->pMoveToKafra), HP_POP2(HP_clif_pMoveToKafra), 1414 },
-	{ HP_POP(clif->pMoveFromKafra), HP_POP2(HP_clif_pMoveFromKafra), 1416 },
-	{ HP_POP(clif->pMoveToKafraFromCart), HP_POP2(HP_clif_pMoveToKafraFromCart), 1418 },
-	{ HP_POP(clif->pMoveFromKafraToCart), HP_POP2(HP_clif_pMoveFromKafraToCart), 1420 },
-	{ HP_POP(clif->pCloseKafra), HP_POP2(HP_clif_pCloseKafra), 1422 },
-	{ HP_POP(clif->pStoragePassword), HP_POP2(HP_clif_pStoragePassword), 1424 },
-	{ HP_POP(clif->pCreateParty), HP_POP2(HP_clif_pCreateParty), 1426 },
-	{ HP_POP(clif->pCreateParty2), HP_POP2(HP_clif_pCreateParty2), 1428 },
-	{ HP_POP(clif->pPartyInvite), HP_POP2(HP_clif_pPartyInvite), 1430 },
-	{ HP_POP(clif->pPartyInvite2), HP_POP2(HP_clif_pPartyInvite2), 1432 },
-	{ HP_POP(clif->pReplyPartyInvite), HP_POP2(HP_clif_pReplyPartyInvite), 1434 },
-	{ HP_POP(clif->pReplyPartyInvite2), HP_POP2(HP_clif_pReplyPartyInvite2), 1436 },
-	{ HP_POP(clif->pLeaveParty), HP_POP2(HP_clif_pLeaveParty), 1438 },
-	{ HP_POP(clif->pRemovePartyMember), HP_POP2(HP_clif_pRemovePartyMember), 1440 },
-	{ HP_POP(clif->pPartyChangeOption), HP_POP2(HP_clif_pPartyChangeOption), 1442 },
-	{ HP_POP(clif->pPartyMessage), HP_POP2(HP_clif_pPartyMessage), 1444 },
-	{ HP_POP(clif->pPartyChangeLeader), HP_POP2(HP_clif_pPartyChangeLeader), 1446 },
-	{ HP_POP(clif->pPartyBookingRegisterReq), HP_POP2(HP_clif_pPartyBookingRegisterReq), 1448 },
-	{ HP_POP(clif->pPartyBookingSearchReq), HP_POP2(HP_clif_pPartyBookingSearchReq), 1450 },
-	{ HP_POP(clif->pPartyBookingDeleteReq), HP_POP2(HP_clif_pPartyBookingDeleteReq), 1452 },
-	{ HP_POP(clif->pPartyBookingUpdateReq), HP_POP2(HP_clif_pPartyBookingUpdateReq), 1454 },
-	{ HP_POP(clif->pPartyRecruitRegisterReq), HP_POP2(HP_clif_pPartyRecruitRegisterReq), 1456 },
-	{ HP_POP(clif->pPartyRecruitSearchReq), HP_POP2(HP_clif_pPartyRecruitSearchReq), 1458 },
-	{ HP_POP(clif->pPartyRecruitDeleteReq), HP_POP2(HP_clif_pPartyRecruitDeleteReq), 1460 },
-	{ HP_POP(clif->pPartyRecruitUpdateReq), HP_POP2(HP_clif_pPartyRecruitUpdateReq), 1462 },
-	{ HP_POP(clif->pCloseVending), HP_POP2(HP_clif_pCloseVending), 1464 },
-	{ HP_POP(clif->pVendingListReq), HP_POP2(HP_clif_pVendingListReq), 1466 },
-	{ HP_POP(clif->pPurchaseReq), HP_POP2(HP_clif_pPurchaseReq), 1468 },
-	{ HP_POP(clif->pPurchaseReq2), HP_POP2(HP_clif_pPurchaseReq2), 1470 },
-	{ HP_POP(clif->pOpenVending), HP_POP2(HP_clif_pOpenVending), 1472 },
-	{ HP_POP(clif->pCreateGuild), HP_POP2(HP_clif_pCreateGuild), 1474 },
-	{ HP_POP(clif->pGuildCheckMaster), HP_POP2(HP_clif_pGuildCheckMaster), 1476 },
-	{ HP_POP(clif->pGuildRequestInfo), HP_POP2(HP_clif_pGuildRequestInfo), 1478 },
-	{ HP_POP(clif->pGuildChangePositionInfo), HP_POP2(HP_clif_pGuildChangePositionInfo), 1480 },
-	{ HP_POP(clif->pGuildChangeMemberPosition), HP_POP2(HP_clif_pGuildChangeMemberPosition), 1482 },
-	{ HP_POP(clif->pGuildRequestEmblem), HP_POP2(HP_clif_pGuildRequestEmblem), 1484 },
-	{ HP_POP(clif->pGuildChangeEmblem), HP_POP2(HP_clif_pGuildChangeEmblem), 1486 },
-	{ HP_POP(clif->pGuildChangeNotice), HP_POP2(HP_clif_pGuildChangeNotice), 1488 },
-	{ HP_POP(clif->pGuildInvite), HP_POP2(HP_clif_pGuildInvite), 1490 },
-	{ HP_POP(clif->pGuildReplyInvite), HP_POP2(HP_clif_pGuildReplyInvite), 1492 },
-	{ HP_POP(clif->pGuildLeave), HP_POP2(HP_clif_pGuildLeave), 1494 },
-	{ HP_POP(clif->pGuildExpulsion), HP_POP2(HP_clif_pGuildExpulsion), 1496 },
-	{ HP_POP(clif->pGuildMessage), HP_POP2(HP_clif_pGuildMessage), 1498 },
-	{ HP_POP(clif->pGuildRequestAlliance), HP_POP2(HP_clif_pGuildRequestAlliance), 1500 },
-	{ HP_POP(clif->pGuildReplyAlliance), HP_POP2(HP_clif_pGuildReplyAlliance), 1502 },
-	{ HP_POP(clif->pGuildDelAlliance), HP_POP2(HP_clif_pGuildDelAlliance), 1504 },
-	{ HP_POP(clif->pGuildOpposition), HP_POP2(HP_clif_pGuildOpposition), 1506 },
-	{ HP_POP(clif->pGuildBreak), HP_POP2(HP_clif_pGuildBreak), 1508 },
-	{ HP_POP(clif->pPetMenu), HP_POP2(HP_clif_pPetMenu), 1510 },
-	{ HP_POP(clif->pCatchPet), HP_POP2(HP_clif_pCatchPet), 1512 },
-	{ HP_POP(clif->pSelectEgg), HP_POP2(HP_clif_pSelectEgg), 1514 },
-	{ HP_POP(clif->pSendEmotion), HP_POP2(HP_clif_pSendEmotion), 1516 },
-	{ HP_POP(clif->pChangePetName), HP_POP2(HP_clif_pChangePetName), 1518 },
-	{ HP_POP(clif->pGMKick), HP_POP2(HP_clif_pGMKick), 1520 },
-	{ HP_POP(clif->pGMKickAll), HP_POP2(HP_clif_pGMKickAll), 1522 },
-	{ HP_POP(clif->pGMShift), HP_POP2(HP_clif_pGMShift), 1524 },
-	{ HP_POP(clif->pGMRemove2), HP_POP2(HP_clif_pGMRemove2), 1526 },
-	{ HP_POP(clif->pGMRecall), HP_POP2(HP_clif_pGMRecall), 1528 },
-	{ HP_POP(clif->pGMRecall2), HP_POP2(HP_clif_pGMRecall2), 1530 },
-	{ HP_POP(clif->pGM_Monster_Item), HP_POP2(HP_clif_pGM_Monster_Item), 1532 },
-	{ HP_POP(clif->pGMHide), HP_POP2(HP_clif_pGMHide), 1534 },
-	{ HP_POP(clif->pGMReqNoChat), HP_POP2(HP_clif_pGMReqNoChat), 1536 },
-	{ HP_POP(clif->pGMRc), HP_POP2(HP_clif_pGMRc), 1538 },
-	{ HP_POP(clif->pGMReqAccountName), HP_POP2(HP_clif_pGMReqAccountName), 1540 },
-	{ HP_POP(clif->pGMChangeMapType), HP_POP2(HP_clif_pGMChangeMapType), 1542 },
-	{ HP_POP(clif->pPMIgnore), HP_POP2(HP_clif_pPMIgnore), 1544 },
-	{ HP_POP(clif->pPMIgnoreAll), HP_POP2(HP_clif_pPMIgnoreAll), 1546 },
-	{ HP_POP(clif->pPMIgnoreList), HP_POP2(HP_clif_pPMIgnoreList), 1548 },
-	{ HP_POP(clif->pNoviceDoriDori), HP_POP2(HP_clif_pNoviceDoriDori), 1550 },
-	{ HP_POP(clif->pNoviceExplosionSpirits), HP_POP2(HP_clif_pNoviceExplosionSpirits), 1552 },
-	{ HP_POP(clif->pFriendsListAdd), HP_POP2(HP_clif_pFriendsListAdd), 1554 },
-	{ HP_POP(clif->pFriendsListReply), HP_POP2(HP_clif_pFriendsListReply), 1556 },
-	{ HP_POP(clif->pFriendsListRemove), HP_POP2(HP_clif_pFriendsListRemove), 1558 },
-	{ HP_POP(clif->pPVPInfo), HP_POP2(HP_clif_pPVPInfo), 1560 },
-	{ HP_POP(clif->pBlacksmith), HP_POP2(HP_clif_pBlacksmith), 1562 },
-	{ HP_POP(clif->pAlchemist), HP_POP2(HP_clif_pAlchemist), 1564 },
-	{ HP_POP(clif->pTaekwon), HP_POP2(HP_clif_pTaekwon), 1566 },
-	{ HP_POP(clif->pRankingPk), HP_POP2(HP_clif_pRankingPk), 1568 },
-	{ HP_POP(clif->pFeelSaveOk), HP_POP2(HP_clif_pFeelSaveOk), 1570 },
-	{ HP_POP(clif->pChangeHomunculusName), HP_POP2(HP_clif_pChangeHomunculusName), 1572 },
-	{ HP_POP(clif->pHomMoveToMaster), HP_POP2(HP_clif_pHomMoveToMaster), 1574 },
-	{ HP_POP(clif->pHomMoveTo), HP_POP2(HP_clif_pHomMoveTo), 1576 },
-	{ HP_POP(clif->pHomAttack), HP_POP2(HP_clif_pHomAttack), 1578 },
-	{ HP_POP(clif->pHomMenu), HP_POP2(HP_clif_pHomMenu), 1580 },
-	{ HP_POP(clif->pAutoRevive), HP_POP2(HP_clif_pAutoRevive), 1582 },
-	{ HP_POP(clif->pCheck), HP_POP2(HP_clif_pCheck), 1584 },
-	{ HP_POP(clif->pMail_refreshinbox), HP_POP2(HP_clif_pMail_refreshinbox), 1586 },
-	{ HP_POP(clif->pMail_read), HP_POP2(HP_clif_pMail_read), 1588 },
-	{ HP_POP(clif->pMail_getattach), HP_POP2(HP_clif_pMail_getattach), 1590 },
-	{ HP_POP(clif->pMail_delete), HP_POP2(HP_clif_pMail_delete), 1592 },
-	{ HP_POP(clif->pMail_return), HP_POP2(HP_clif_pMail_return), 1594 },
-	{ HP_POP(clif->pMail_setattach), HP_POP2(HP_clif_pMail_setattach), 1596 },
-	{ HP_POP(clif->pMail_winopen), HP_POP2(HP_clif_pMail_winopen), 1598 },
-	{ HP_POP(clif->pMail_send), HP_POP2(HP_clif_pMail_send), 1600 },
-	{ HP_POP(clif->pAuction_cancelreg), HP_POP2(HP_clif_pAuction_cancelreg), 1602 },
-	{ HP_POP(clif->pAuction_setitem), HP_POP2(HP_clif_pAuction_setitem), 1604 },
-	{ HP_POP(clif->pAuction_register), HP_POP2(HP_clif_pAuction_register), 1606 },
-	{ HP_POP(clif->pAuction_cancel), HP_POP2(HP_clif_pAuction_cancel), 1608 },
-	{ HP_POP(clif->pAuction_close), HP_POP2(HP_clif_pAuction_close), 1610 },
-	{ HP_POP(clif->pAuction_bid), HP_POP2(HP_clif_pAuction_bid), 1612 },
-	{ HP_POP(clif->pAuction_search), HP_POP2(HP_clif_pAuction_search), 1614 },
-	{ HP_POP(clif->pAuction_buysell), HP_POP2(HP_clif_pAuction_buysell), 1616 },
-	{ HP_POP(clif->pcashshop_buy), HP_POP2(HP_clif_pcashshop_buy), 1618 },
-	{ HP_POP(clif->pAdopt_request), HP_POP2(HP_clif_pAdopt_request), 1620 },
-	{ HP_POP(clif->pAdopt_reply), HP_POP2(HP_clif_pAdopt_reply), 1622 },
-	{ HP_POP(clif->pViewPlayerEquip), HP_POP2(HP_clif_pViewPlayerEquip), 1624 },
-	{ HP_POP(clif->pEquipTick), HP_POP2(HP_clif_pEquipTick), 1626 },
-	{ HP_POP(clif->pquestStateAck), HP_POP2(HP_clif_pquestStateAck), 1628 },
-	{ HP_POP(clif->pmercenary_action), HP_POP2(HP_clif_pmercenary_action), 1630 },
-	{ HP_POP(clif->pBattleChat), HP_POP2(HP_clif_pBattleChat), 1632 },
-	{ HP_POP(clif->pLessEffect), HP_POP2(HP_clif_pLessEffect), 1634 },
-	{ HP_POP(clif->pItemListWindowSelected), HP_POP2(HP_clif_pItemListWindowSelected), 1636 },
-	{ HP_POP(clif->pReqOpenBuyingStore), HP_POP2(HP_clif_pReqOpenBuyingStore), 1638 },
-	{ HP_POP(clif->pReqCloseBuyingStore), HP_POP2(HP_clif_pReqCloseBuyingStore), 1640 },
-	{ HP_POP(clif->pReqClickBuyingStore), HP_POP2(HP_clif_pReqClickBuyingStore), 1642 },
-	{ HP_POP(clif->pReqTradeBuyingStore), HP_POP2(HP_clif_pReqTradeBuyingStore), 1644 },
-	{ HP_POP(clif->pSearchStoreInfo), HP_POP2(HP_clif_pSearchStoreInfo), 1646 },
-	{ HP_POP(clif->pSearchStoreInfoNextPage), HP_POP2(HP_clif_pSearchStoreInfoNextPage), 1648 },
-	{ HP_POP(clif->pCloseSearchStoreInfo), HP_POP2(HP_clif_pCloseSearchStoreInfo), 1650 },
-	{ HP_POP(clif->pSearchStoreInfoListItemClick), HP_POP2(HP_clif_pSearchStoreInfoListItemClick), 1652 },
-	{ HP_POP(clif->pDebug), HP_POP2(HP_clif_pDebug), 1654 },
-	{ HP_POP(clif->pSkillSelectMenu), HP_POP2(HP_clif_pSkillSelectMenu), 1656 },
-	{ HP_POP(clif->pMoveItem), HP_POP2(HP_clif_pMoveItem), 1658 },
-	{ HP_POP(clif->pDull), HP_POP2(HP_clif_pDull), 1660 },
-	{ HP_POP(clif->pBGQueueRegister), HP_POP2(HP_clif_pBGQueueRegister), 1662 },
-	{ HP_POP(clif->pBGQueueCheckState), HP_POP2(HP_clif_pBGQueueCheckState), 1664 },
-	{ HP_POP(clif->pBGQueueRevokeReq), HP_POP2(HP_clif_pBGQueueRevokeReq), 1666 },
-	{ HP_POP(clif->pBGQueueBattleBeginAck), HP_POP2(HP_clif_pBGQueueBattleBeginAck), 1668 },
-	{ HP_POP(clif->pCashShopOpen), HP_POP2(HP_clif_pCashShopOpen), 1670 },
-	{ HP_POP(clif->pCashShopClose), HP_POP2(HP_clif_pCashShopClose), 1672 },
-	{ HP_POP(clif->pCashShopReqTab), HP_POP2(HP_clif_pCashShopReqTab), 1674 },
-	{ HP_POP(clif->pCashShopSchedule), HP_POP2(HP_clif_pCashShopSchedule), 1676 },
-	{ HP_POP(clif->pCashShopBuy), HP_POP2(HP_clif_pCashShopBuy), 1678 },
-	{ HP_POP(clif->pPartyTick), HP_POP2(HP_clif_pPartyTick), 1680 },
-	{ HP_POP(clif->pGuildInvite2), HP_POP2(HP_clif_pGuildInvite2), 1682 },
-	{ HP_POP(clif->pPartyBookingAddFilter), HP_POP2(HP_clif_pPartyBookingAddFilter), 1684 },
-	{ HP_POP(clif->pPartyBookingSubFilter), HP_POP2(HP_clif_pPartyBookingSubFilter), 1686 },
-	{ HP_POP(clif->pPartyBookingReqVolunteer), HP_POP2(HP_clif_pPartyBookingReqVolunteer), 1688 },
-	{ HP_POP(clif->pPartyBookingRefuseVolunteer), HP_POP2(HP_clif_pPartyBookingRefuseVolunteer), 1690 },
-	{ HP_POP(clif->pPartyBookingCancelVolunteer), HP_POP2(HP_clif_pPartyBookingCancelVolunteer), 1692 },
+	{ HP_POP(clif->bank_deposit), HP_POP2(HP_clif_bank_deposit), 1266 },
+	{ HP_POP(clif->bank_withdraw), HP_POP2(HP_clif_bank_withdraw), 1268 },
+	{ HP_POP(clif->pWantToConnection), HP_POP2(HP_clif_pWantToConnection), 1270 },
+	{ HP_POP(clif->pLoadEndAck), HP_POP2(HP_clif_pLoadEndAck), 1272 },
+	{ HP_POP(clif->pTickSend), HP_POP2(HP_clif_pTickSend), 1274 },
+	{ HP_POP(clif->pHotkey), HP_POP2(HP_clif_pHotkey), 1276 },
+	{ HP_POP(clif->pProgressbar), HP_POP2(HP_clif_pProgressbar), 1278 },
+	{ HP_POP(clif->pWalkToXY), HP_POP2(HP_clif_pWalkToXY), 1280 },
+	{ HP_POP(clif->pQuitGame), HP_POP2(HP_clif_pQuitGame), 1282 },
+	{ HP_POP(clif->pGetCharNameRequest), HP_POP2(HP_clif_pGetCharNameRequest), 1284 },
+	{ HP_POP(clif->pGlobalMessage), HP_POP2(HP_clif_pGlobalMessage), 1286 },
+	{ HP_POP(clif->pMapMove), HP_POP2(HP_clif_pMapMove), 1288 },
+	{ HP_POP(clif->pChangeDir), HP_POP2(HP_clif_pChangeDir), 1290 },
+	{ HP_POP(clif->pEmotion), HP_POP2(HP_clif_pEmotion), 1292 },
+	{ HP_POP(clif->pHowManyConnections), HP_POP2(HP_clif_pHowManyConnections), 1294 },
+	{ HP_POP(clif->pActionRequest), HP_POP2(HP_clif_pActionRequest), 1296 },
+	{ HP_POP(clif->pActionRequest_sub), HP_POP2(HP_clif_pActionRequest_sub), 1298 },
+	{ HP_POP(clif->pRestart), HP_POP2(HP_clif_pRestart), 1300 },
+	{ HP_POP(clif->pWisMessage), HP_POP2(HP_clif_pWisMessage), 1302 },
+	{ HP_POP(clif->pBroadcast), HP_POP2(HP_clif_pBroadcast), 1304 },
+	{ HP_POP(clif->pTakeItem), HP_POP2(HP_clif_pTakeItem), 1306 },
+	{ HP_POP(clif->pDropItem), HP_POP2(HP_clif_pDropItem), 1308 },
+	{ HP_POP(clif->pUseItem), HP_POP2(HP_clif_pUseItem), 1310 },
+	{ HP_POP(clif->pEquipItem), HP_POP2(HP_clif_pEquipItem), 1312 },
+	{ HP_POP(clif->pUnequipItem), HP_POP2(HP_clif_pUnequipItem), 1314 },
+	{ HP_POP(clif->pNpcClicked), HP_POP2(HP_clif_pNpcClicked), 1316 },
+	{ HP_POP(clif->pNpcBuySellSelected), HP_POP2(HP_clif_pNpcBuySellSelected), 1318 },
+	{ HP_POP(clif->pNpcBuyListSend), HP_POP2(HP_clif_pNpcBuyListSend), 1320 },
+	{ HP_POP(clif->pNpcSellListSend), HP_POP2(HP_clif_pNpcSellListSend), 1322 },
+	{ HP_POP(clif->pCreateChatRoom), HP_POP2(HP_clif_pCreateChatRoom), 1324 },
+	{ HP_POP(clif->pChatAddMember), HP_POP2(HP_clif_pChatAddMember), 1326 },
+	{ HP_POP(clif->pChatRoomStatusChange), HP_POP2(HP_clif_pChatRoomStatusChange), 1328 },
+	{ HP_POP(clif->pChangeChatOwner), HP_POP2(HP_clif_pChangeChatOwner), 1330 },
+	{ HP_POP(clif->pKickFromChat), HP_POP2(HP_clif_pKickFromChat), 1332 },
+	{ HP_POP(clif->pChatLeave), HP_POP2(HP_clif_pChatLeave), 1334 },
+	{ HP_POP(clif->pTradeRequest), HP_POP2(HP_clif_pTradeRequest), 1336 },
+	{ HP_POP(clif->chann_config_read), HP_POP2(HP_clif_chann_config_read), 1338 },
+	{ HP_POP(clif->pTradeAck), HP_POP2(HP_clif_pTradeAck), 1340 },
+	{ HP_POP(clif->pTradeAddItem), HP_POP2(HP_clif_pTradeAddItem), 1342 },
+	{ HP_POP(clif->pTradeOk), HP_POP2(HP_clif_pTradeOk), 1344 },
+	{ HP_POP(clif->pTradeCancel), HP_POP2(HP_clif_pTradeCancel), 1346 },
+	{ HP_POP(clif->pTradeCommit), HP_POP2(HP_clif_pTradeCommit), 1348 },
+	{ HP_POP(clif->pStopAttack), HP_POP2(HP_clif_pStopAttack), 1350 },
+	{ HP_POP(clif->pPutItemToCart), HP_POP2(HP_clif_pPutItemToCart), 1352 },
+	{ HP_POP(clif->pGetItemFromCart), HP_POP2(HP_clif_pGetItemFromCart), 1354 },
+	{ HP_POP(clif->pRemoveOption), HP_POP2(HP_clif_pRemoveOption), 1356 },
+	{ HP_POP(clif->pChangeCart), HP_POP2(HP_clif_pChangeCart), 1358 },
+	{ HP_POP(clif->pStatusUp), HP_POP2(HP_clif_pStatusUp), 1360 },
+	{ HP_POP(clif->pSkillUp), HP_POP2(HP_clif_pSkillUp), 1362 },
+	{ HP_POP(clif->pUseSkillToId), HP_POP2(HP_clif_pUseSkillToId), 1364 },
+	{ HP_POP(clif->pUseSkillToId_homun), HP_POP2(HP_clif_pUseSkillToId_homun), 1366 },
+	{ HP_POP(clif->pUseSkillToId_mercenary), HP_POP2(HP_clif_pUseSkillToId_mercenary), 1368 },
+	{ HP_POP(clif->pUseSkillToPos), HP_POP2(HP_clif_pUseSkillToPos), 1370 },
+	{ HP_POP(clif->pUseSkillToPosSub), HP_POP2(HP_clif_pUseSkillToPosSub), 1372 },
+	{ HP_POP(clif->pUseSkillToPos_homun), HP_POP2(HP_clif_pUseSkillToPos_homun), 1374 },
+	{ HP_POP(clif->pUseSkillToPos_mercenary), HP_POP2(HP_clif_pUseSkillToPos_mercenary), 1376 },
+	{ HP_POP(clif->pUseSkillToPosMoreInfo), HP_POP2(HP_clif_pUseSkillToPosMoreInfo), 1378 },
+	{ HP_POP(clif->pUseSkillMap), HP_POP2(HP_clif_pUseSkillMap), 1380 },
+	{ HP_POP(clif->pRequestMemo), HP_POP2(HP_clif_pRequestMemo), 1382 },
+	{ HP_POP(clif->pProduceMix), HP_POP2(HP_clif_pProduceMix), 1384 },
+	{ HP_POP(clif->pCooking), HP_POP2(HP_clif_pCooking), 1386 },
+	{ HP_POP(clif->pRepairItem), HP_POP2(HP_clif_pRepairItem), 1388 },
+	{ HP_POP(clif->pWeaponRefine), HP_POP2(HP_clif_pWeaponRefine), 1390 },
+	{ HP_POP(clif->pNpcSelectMenu), HP_POP2(HP_clif_pNpcSelectMenu), 1392 },
+	{ HP_POP(clif->pNpcNextClicked), HP_POP2(HP_clif_pNpcNextClicked), 1394 },
+	{ HP_POP(clif->pNpcAmountInput), HP_POP2(HP_clif_pNpcAmountInput), 1396 },
+	{ HP_POP(clif->pNpcStringInput), HP_POP2(HP_clif_pNpcStringInput), 1398 },
+	{ HP_POP(clif->pNpcCloseClicked), HP_POP2(HP_clif_pNpcCloseClicked), 1400 },
+	{ HP_POP(clif->pItemIdentify), HP_POP2(HP_clif_pItemIdentify), 1402 },
+	{ HP_POP(clif->pSelectArrow), HP_POP2(HP_clif_pSelectArrow), 1404 },
+	{ HP_POP(clif->pAutoSpell), HP_POP2(HP_clif_pAutoSpell), 1406 },
+	{ HP_POP(clif->pUseCard), HP_POP2(HP_clif_pUseCard), 1408 },
+	{ HP_POP(clif->pInsertCard), HP_POP2(HP_clif_pInsertCard), 1410 },
+	{ HP_POP(clif->pSolveCharName), HP_POP2(HP_clif_pSolveCharName), 1412 },
+	{ HP_POP(clif->pResetChar), HP_POP2(HP_clif_pResetChar), 1414 },
+	{ HP_POP(clif->pLocalBroadcast), HP_POP2(HP_clif_pLocalBroadcast), 1416 },
+	{ HP_POP(clif->pMoveToKafra), HP_POP2(HP_clif_pMoveToKafra), 1418 },
+	{ HP_POP(clif->pMoveFromKafra), HP_POP2(HP_clif_pMoveFromKafra), 1420 },
+	{ HP_POP(clif->pMoveToKafraFromCart), HP_POP2(HP_clif_pMoveToKafraFromCart), 1422 },
+	{ HP_POP(clif->pMoveFromKafraToCart), HP_POP2(HP_clif_pMoveFromKafraToCart), 1424 },
+	{ HP_POP(clif->pCloseKafra), HP_POP2(HP_clif_pCloseKafra), 1426 },
+	{ HP_POP(clif->pStoragePassword), HP_POP2(HP_clif_pStoragePassword), 1428 },
+	{ HP_POP(clif->pCreateParty), HP_POP2(HP_clif_pCreateParty), 1430 },
+	{ HP_POP(clif->pCreateParty2), HP_POP2(HP_clif_pCreateParty2), 1432 },
+	{ HP_POP(clif->pPartyInvite), HP_POP2(HP_clif_pPartyInvite), 1434 },
+	{ HP_POP(clif->pPartyInvite2), HP_POP2(HP_clif_pPartyInvite2), 1436 },
+	{ HP_POP(clif->pReplyPartyInvite), HP_POP2(HP_clif_pReplyPartyInvite), 1438 },
+	{ HP_POP(clif->pReplyPartyInvite2), HP_POP2(HP_clif_pReplyPartyInvite2), 1440 },
+	{ HP_POP(clif->pLeaveParty), HP_POP2(HP_clif_pLeaveParty), 1442 },
+	{ HP_POP(clif->pRemovePartyMember), HP_POP2(HP_clif_pRemovePartyMember), 1444 },
+	{ HP_POP(clif->pPartyChangeOption), HP_POP2(HP_clif_pPartyChangeOption), 1446 },
+	{ HP_POP(clif->pPartyMessage), HP_POP2(HP_clif_pPartyMessage), 1448 },
+	{ HP_POP(clif->pPartyChangeLeader), HP_POP2(HP_clif_pPartyChangeLeader), 1450 },
+	{ HP_POP(clif->pPartyBookingRegisterReq), HP_POP2(HP_clif_pPartyBookingRegisterReq), 1452 },
+	{ HP_POP(clif->pPartyBookingSearchReq), HP_POP2(HP_clif_pPartyBookingSearchReq), 1454 },
+	{ HP_POP(clif->pPartyBookingDeleteReq), HP_POP2(HP_clif_pPartyBookingDeleteReq), 1456 },
+	{ HP_POP(clif->pPartyBookingUpdateReq), HP_POP2(HP_clif_pPartyBookingUpdateReq), 1458 },
+	{ HP_POP(clif->pPartyRecruitRegisterReq), HP_POP2(HP_clif_pPartyRecruitRegisterReq), 1460 },
+	{ HP_POP(clif->pPartyRecruitSearchReq), HP_POP2(HP_clif_pPartyRecruitSearchReq), 1462 },
+	{ HP_POP(clif->pPartyRecruitDeleteReq), HP_POP2(HP_clif_pPartyRecruitDeleteReq), 1464 },
+	{ HP_POP(clif->pPartyRecruitUpdateReq), HP_POP2(HP_clif_pPartyRecruitUpdateReq), 1466 },
+	{ HP_POP(clif->pCloseVending), HP_POP2(HP_clif_pCloseVending), 1468 },
+	{ HP_POP(clif->pVendingListReq), HP_POP2(HP_clif_pVendingListReq), 1470 },
+	{ HP_POP(clif->pPurchaseReq), HP_POP2(HP_clif_pPurchaseReq), 1472 },
+	{ HP_POP(clif->pPurchaseReq2), HP_POP2(HP_clif_pPurchaseReq2), 1474 },
+	{ HP_POP(clif->pOpenVending), HP_POP2(HP_clif_pOpenVending), 1476 },
+	{ HP_POP(clif->pCreateGuild), HP_POP2(HP_clif_pCreateGuild), 1478 },
+	{ HP_POP(clif->pGuildCheckMaster), HP_POP2(HP_clif_pGuildCheckMaster), 1480 },
+	{ HP_POP(clif->pGuildRequestInfo), HP_POP2(HP_clif_pGuildRequestInfo), 1482 },
+	{ HP_POP(clif->pGuildChangePositionInfo), HP_POP2(HP_clif_pGuildChangePositionInfo), 1484 },
+	{ HP_POP(clif->pGuildChangeMemberPosition), HP_POP2(HP_clif_pGuildChangeMemberPosition), 1486 },
+	{ HP_POP(clif->pGuildRequestEmblem), HP_POP2(HP_clif_pGuildRequestEmblem), 1488 },
+	{ HP_POP(clif->pGuildChangeEmblem), HP_POP2(HP_clif_pGuildChangeEmblem), 1490 },
+	{ HP_POP(clif->pGuildChangeNotice), HP_POP2(HP_clif_pGuildChangeNotice), 1492 },
+	{ HP_POP(clif->pGuildInvite), HP_POP2(HP_clif_pGuildInvite), 1494 },
+	{ HP_POP(clif->pGuildReplyInvite), HP_POP2(HP_clif_pGuildReplyInvite), 1496 },
+	{ HP_POP(clif->pGuildLeave), HP_POP2(HP_clif_pGuildLeave), 1498 },
+	{ HP_POP(clif->pGuildExpulsion), HP_POP2(HP_clif_pGuildExpulsion), 1500 },
+	{ HP_POP(clif->pGuildMessage), HP_POP2(HP_clif_pGuildMessage), 1502 },
+	{ HP_POP(clif->pGuildRequestAlliance), HP_POP2(HP_clif_pGuildRequestAlliance), 1504 },
+	{ HP_POP(clif->pGuildReplyAlliance), HP_POP2(HP_clif_pGuildReplyAlliance), 1506 },
+	{ HP_POP(clif->pGuildDelAlliance), HP_POP2(HP_clif_pGuildDelAlliance), 1508 },
+	{ HP_POP(clif->pGuildOpposition), HP_POP2(HP_clif_pGuildOpposition), 1510 },
+	{ HP_POP(clif->pGuildBreak), HP_POP2(HP_clif_pGuildBreak), 1512 },
+	{ HP_POP(clif->pPetMenu), HP_POP2(HP_clif_pPetMenu), 1514 },
+	{ HP_POP(clif->pCatchPet), HP_POP2(HP_clif_pCatchPet), 1516 },
+	{ HP_POP(clif->pSelectEgg), HP_POP2(HP_clif_pSelectEgg), 1518 },
+	{ HP_POP(clif->pSendEmotion), HP_POP2(HP_clif_pSendEmotion), 1520 },
+	{ HP_POP(clif->pChangePetName), HP_POP2(HP_clif_pChangePetName), 1522 },
+	{ HP_POP(clif->pGMKick), HP_POP2(HP_clif_pGMKick), 1524 },
+	{ HP_POP(clif->pGMKickAll), HP_POP2(HP_clif_pGMKickAll), 1526 },
+	{ HP_POP(clif->pGMShift), HP_POP2(HP_clif_pGMShift), 1528 },
+	{ HP_POP(clif->pGMRemove2), HP_POP2(HP_clif_pGMRemove2), 1530 },
+	{ HP_POP(clif->pGMRecall), HP_POP2(HP_clif_pGMRecall), 1532 },
+	{ HP_POP(clif->pGMRecall2), HP_POP2(HP_clif_pGMRecall2), 1534 },
+	{ HP_POP(clif->pGM_Monster_Item), HP_POP2(HP_clif_pGM_Monster_Item), 1536 },
+	{ HP_POP(clif->pGMHide), HP_POP2(HP_clif_pGMHide), 1538 },
+	{ HP_POP(clif->pGMReqNoChat), HP_POP2(HP_clif_pGMReqNoChat), 1540 },
+	{ HP_POP(clif->pGMRc), HP_POP2(HP_clif_pGMRc), 1542 },
+	{ HP_POP(clif->pGMReqAccountName), HP_POP2(HP_clif_pGMReqAccountName), 1544 },
+	{ HP_POP(clif->pGMChangeMapType), HP_POP2(HP_clif_pGMChangeMapType), 1546 },
+	{ HP_POP(clif->pPMIgnore), HP_POP2(HP_clif_pPMIgnore), 1548 },
+	{ HP_POP(clif->pPMIgnoreAll), HP_POP2(HP_clif_pPMIgnoreAll), 1550 },
+	{ HP_POP(clif->pPMIgnoreList), HP_POP2(HP_clif_pPMIgnoreList), 1552 },
+	{ HP_POP(clif->pNoviceDoriDori), HP_POP2(HP_clif_pNoviceDoriDori), 1554 },
+	{ HP_POP(clif->pNoviceExplosionSpirits), HP_POP2(HP_clif_pNoviceExplosionSpirits), 1556 },
+	{ HP_POP(clif->pFriendsListAdd), HP_POP2(HP_clif_pFriendsListAdd), 1558 },
+	{ HP_POP(clif->pFriendsListReply), HP_POP2(HP_clif_pFriendsListReply), 1560 },
+	{ HP_POP(clif->pFriendsListRemove), HP_POP2(HP_clif_pFriendsListRemove), 1562 },
+	{ HP_POP(clif->pPVPInfo), HP_POP2(HP_clif_pPVPInfo), 1564 },
+	{ HP_POP(clif->pBlacksmith), HP_POP2(HP_clif_pBlacksmith), 1566 },
+	{ HP_POP(clif->pAlchemist), HP_POP2(HP_clif_pAlchemist), 1568 },
+	{ HP_POP(clif->pTaekwon), HP_POP2(HP_clif_pTaekwon), 1570 },
+	{ HP_POP(clif->pRankingPk), HP_POP2(HP_clif_pRankingPk), 1572 },
+	{ HP_POP(clif->pFeelSaveOk), HP_POP2(HP_clif_pFeelSaveOk), 1574 },
+	{ HP_POP(clif->pChangeHomunculusName), HP_POP2(HP_clif_pChangeHomunculusName), 1576 },
+	{ HP_POP(clif->pHomMoveToMaster), HP_POP2(HP_clif_pHomMoveToMaster), 1578 },
+	{ HP_POP(clif->pHomMoveTo), HP_POP2(HP_clif_pHomMoveTo), 1580 },
+	{ HP_POP(clif->pHomAttack), HP_POP2(HP_clif_pHomAttack), 1582 },
+	{ HP_POP(clif->pHomMenu), HP_POP2(HP_clif_pHomMenu), 1584 },
+	{ HP_POP(clif->pAutoRevive), HP_POP2(HP_clif_pAutoRevive), 1586 },
+	{ HP_POP(clif->pCheck), HP_POP2(HP_clif_pCheck), 1588 },
+	{ HP_POP(clif->pMail_refreshinbox), HP_POP2(HP_clif_pMail_refreshinbox), 1590 },
+	{ HP_POP(clif->pMail_read), HP_POP2(HP_clif_pMail_read), 1592 },
+	{ HP_POP(clif->pMail_getattach), HP_POP2(HP_clif_pMail_getattach), 1594 },
+	{ HP_POP(clif->pMail_delete), HP_POP2(HP_clif_pMail_delete), 1596 },
+	{ HP_POP(clif->pMail_return), HP_POP2(HP_clif_pMail_return), 1598 },
+	{ HP_POP(clif->pMail_setattach), HP_POP2(HP_clif_pMail_setattach), 1600 },
+	{ HP_POP(clif->pMail_winopen), HP_POP2(HP_clif_pMail_winopen), 1602 },
+	{ HP_POP(clif->pMail_send), HP_POP2(HP_clif_pMail_send), 1604 },
+	{ HP_POP(clif->pAuction_cancelreg), HP_POP2(HP_clif_pAuction_cancelreg), 1606 },
+	{ HP_POP(clif->pAuction_setitem), HP_POP2(HP_clif_pAuction_setitem), 1608 },
+	{ HP_POP(clif->pAuction_register), HP_POP2(HP_clif_pAuction_register), 1610 },
+	{ HP_POP(clif->pAuction_cancel), HP_POP2(HP_clif_pAuction_cancel), 1612 },
+	{ HP_POP(clif->pAuction_close), HP_POP2(HP_clif_pAuction_close), 1614 },
+	{ HP_POP(clif->pAuction_bid), HP_POP2(HP_clif_pAuction_bid), 1616 },
+	{ HP_POP(clif->pAuction_search), HP_POP2(HP_clif_pAuction_search), 1618 },
+	{ HP_POP(clif->pAuction_buysell), HP_POP2(HP_clif_pAuction_buysell), 1620 },
+	{ HP_POP(clif->pcashshop_buy), HP_POP2(HP_clif_pcashshop_buy), 1622 },
+	{ HP_POP(clif->pAdopt_request), HP_POP2(HP_clif_pAdopt_request), 1624 },
+	{ HP_POP(clif->pAdopt_reply), HP_POP2(HP_clif_pAdopt_reply), 1626 },
+	{ HP_POP(clif->pViewPlayerEquip), HP_POP2(HP_clif_pViewPlayerEquip), 1628 },
+	{ HP_POP(clif->pEquipTick), HP_POP2(HP_clif_pEquipTick), 1630 },
+	{ HP_POP(clif->pquestStateAck), HP_POP2(HP_clif_pquestStateAck), 1632 },
+	{ HP_POP(clif->pmercenary_action), HP_POP2(HP_clif_pmercenary_action), 1634 },
+	{ HP_POP(clif->pBattleChat), HP_POP2(HP_clif_pBattleChat), 1636 },
+	{ HP_POP(clif->pLessEffect), HP_POP2(HP_clif_pLessEffect), 1638 },
+	{ HP_POP(clif->pItemListWindowSelected), HP_POP2(HP_clif_pItemListWindowSelected), 1640 },
+	{ HP_POP(clif->pReqOpenBuyingStore), HP_POP2(HP_clif_pReqOpenBuyingStore), 1642 },
+	{ HP_POP(clif->pReqCloseBuyingStore), HP_POP2(HP_clif_pReqCloseBuyingStore), 1644 },
+	{ HP_POP(clif->pReqClickBuyingStore), HP_POP2(HP_clif_pReqClickBuyingStore), 1646 },
+	{ HP_POP(clif->pReqTradeBuyingStore), HP_POP2(HP_clif_pReqTradeBuyingStore), 1648 },
+	{ HP_POP(clif->pSearchStoreInfo), HP_POP2(HP_clif_pSearchStoreInfo), 1650 },
+	{ HP_POP(clif->pSearchStoreInfoNextPage), HP_POP2(HP_clif_pSearchStoreInfoNextPage), 1652 },
+	{ HP_POP(clif->pCloseSearchStoreInfo), HP_POP2(HP_clif_pCloseSearchStoreInfo), 1654 },
+	{ HP_POP(clif->pSearchStoreInfoListItemClick), HP_POP2(HP_clif_pSearchStoreInfoListItemClick), 1656 },
+	{ HP_POP(clif->pDebug), HP_POP2(HP_clif_pDebug), 1658 },
+	{ HP_POP(clif->pSkillSelectMenu), HP_POP2(HP_clif_pSkillSelectMenu), 1660 },
+	{ HP_POP(clif->pMoveItem), HP_POP2(HP_clif_pMoveItem), 1662 },
+	{ HP_POP(clif->pDull), HP_POP2(HP_clif_pDull), 1664 },
+	{ HP_POP(clif->pBGQueueRegister), HP_POP2(HP_clif_pBGQueueRegister), 1666 },
+	{ HP_POP(clif->pBGQueueCheckState), HP_POP2(HP_clif_pBGQueueCheckState), 1668 },
+	{ HP_POP(clif->pBGQueueRevokeReq), HP_POP2(HP_clif_pBGQueueRevokeReq), 1670 },
+	{ HP_POP(clif->pBGQueueBattleBeginAck), HP_POP2(HP_clif_pBGQueueBattleBeginAck), 1672 },
+	{ HP_POP(clif->pCashShopOpen), HP_POP2(HP_clif_pCashShopOpen), 1674 },
+	{ HP_POP(clif->pCashShopClose), HP_POP2(HP_clif_pCashShopClose), 1676 },
+	{ HP_POP(clif->pCashShopReqTab), HP_POP2(HP_clif_pCashShopReqTab), 1678 },
+	{ HP_POP(clif->pCashShopSchedule), HP_POP2(HP_clif_pCashShopSchedule), 1680 },
+	{ HP_POP(clif->pCashShopBuy), HP_POP2(HP_clif_pCashShopBuy), 1682 },
+	{ HP_POP(clif->pPartyTick), HP_POP2(HP_clif_pPartyTick), 1684 },
+	{ HP_POP(clif->pGuildInvite2), HP_POP2(HP_clif_pGuildInvite2), 1686 },
+	{ HP_POP(clif->pPartyBookingAddFilter), HP_POP2(HP_clif_pPartyBookingAddFilter), 1688 },
+	{ HP_POP(clif->pPartyBookingSubFilter), HP_POP2(HP_clif_pPartyBookingSubFilter), 1690 },
+	{ HP_POP(clif->pPartyBookingReqVolunteer), HP_POP2(HP_clif_pPartyBookingReqVolunteer), 1692 },
+	{ HP_POP(clif->pPartyBookingRefuseVolunteer), HP_POP2(HP_clif_pPartyBookingRefuseVolunteer), 1694 },
+	{ HP_POP(clif->pPartyBookingCancelVolunteer), HP_POP2(HP_clif_pPartyBookingCancelVolunteer), 1696 },
+	{ HP_POP(clif->pBankDeposit), HP_POP2(HP_clif_pBankDeposit), 1698 },
+	{ HP_POP(clif->pBankWithdraw), HP_POP2(HP_clif_pBankWithdraw), 1700 },
+	{ HP_POP(clif->pBankCheck), HP_POP2(HP_clif_pBankCheck), 1702 },
+	{ HP_POP(clif->pBankOpen), HP_POP2(HP_clif_pBankOpen), 1704 },
+	{ HP_POP(clif->pBankClose), HP_POP2(HP_clif_pBankClose), 1706 },
 /* duel */
-	{ HP_POP(duel->create), HP_POP2(HP_duel_create), 1694 },
-	{ HP_POP(duel->invite), HP_POP2(HP_duel_invite), 1696 },
-	{ HP_POP(duel->accept), HP_POP2(HP_duel_accept), 1698 },
-	{ HP_POP(duel->reject), HP_POP2(HP_duel_reject), 1700 },
-	{ HP_POP(duel->leave), HP_POP2(HP_duel_leave), 1702 },
-	{ HP_POP(duel->showinfo), HP_POP2(HP_duel_showinfo), 1704 },
-	{ HP_POP(duel->checktime), HP_POP2(HP_duel_checktime), 1706 },
-	{ HP_POP(duel->init), HP_POP2(HP_duel_init), 1708 },
-	{ HP_POP(duel->final), HP_POP2(HP_duel_final), 1710 },
+	{ HP_POP(duel->create), HP_POP2(HP_duel_create), 1708 },
+	{ HP_POP(duel->invite), HP_POP2(HP_duel_invite), 1710 },
+	{ HP_POP(duel->accept), HP_POP2(HP_duel_accept), 1712 },
+	{ HP_POP(duel->reject), HP_POP2(HP_duel_reject), 1714 },
+	{ HP_POP(duel->leave), HP_POP2(HP_duel_leave), 1716 },
+	{ HP_POP(duel->showinfo), HP_POP2(HP_duel_showinfo), 1718 },
+	{ HP_POP(duel->checktime), HP_POP2(HP_duel_checktime), 1720 },
+	{ HP_POP(duel->init), HP_POP2(HP_duel_init), 1722 },
+	{ HP_POP(duel->final), HP_POP2(HP_duel_final), 1724 },
 /* elemental */
-	{ HP_POP(elemental->init), HP_POP2(HP_elemental_init), 1712 },
-	{ HP_POP(elemental->final), HP_POP2(HP_elemental_final), 1714 },
-	{ HP_POP(elemental->class), HP_POP2(HP_elemental_class), 1716 },
-	{ HP_POP(elemental->get_viewdata), HP_POP2(HP_elemental_get_viewdata), 1718 },
-	{ HP_POP(elemental->create), HP_POP2(HP_elemental_create), 1720 },
-	{ HP_POP(elemental->data_received), HP_POP2(HP_elemental_data_received), 1722 },
-	{ HP_POP(elemental->save), HP_POP2(HP_elemental_save), 1724 },
-	{ HP_POP(elemental->change_mode_ack), HP_POP2(HP_elemental_change_mode_ack), 1726 },
-	{ HP_POP(elemental->change_mode), HP_POP2(HP_elemental_change_mode), 1728 },
-	{ HP_POP(elemental->heal), HP_POP2(HP_elemental_heal), 1730 },
-	{ HP_POP(elemental->dead), HP_POP2(HP_elemental_dead), 1732 },
-	{ HP_POP(elemental->delete), HP_POP2(HP_elemental_delete), 1734 },
-	{ HP_POP(elemental->summon_stop), HP_POP2(HP_elemental_summon_stop), 1736 },
-	{ HP_POP(elemental->get_lifetime), HP_POP2(HP_elemental_get_lifetime), 1738 },
-	{ HP_POP(elemental->unlocktarget), HP_POP2(HP_elemental_unlocktarget), 1740 },
-	{ HP_POP(elemental->skillnotok), HP_POP2(HP_elemental_skillnotok), 1742 },
-	{ HP_POP(elemental->set_target), HP_POP2(HP_elemental_set_target), 1744 },
-	{ HP_POP(elemental->clean_single_effect), HP_POP2(HP_elemental_clean_single_effect), 1746 },
-	{ HP_POP(elemental->clean_effect), HP_POP2(HP_elemental_clean_effect), 1748 },
-	{ HP_POP(elemental->action), HP_POP2(HP_elemental_action), 1750 },
-	{ HP_POP(elemental->skill_get_requirements), HP_POP2(HP_elemental_skill_get_requirements), 1752 },
-	{ HP_POP(elemental->read_skilldb), HP_POP2(HP_elemental_read_skilldb), 1754 },
-	{ HP_POP(elemental->reload_db), HP_POP2(HP_elemental_reload_db), 1756 },
-	{ HP_POP(elemental->reload_skilldb), HP_POP2(HP_elemental_reload_skilldb), 1758 },
-	{ HP_POP(elemental->search_index), HP_POP2(HP_elemental_search_index), 1760 },
-	{ HP_POP(elemental->summon_init), HP_POP2(HP_elemental_summon_init), 1762 },
-	{ HP_POP(elemental->summon_end_timer), HP_POP2(HP_elemental_summon_end_timer), 1764 },
-	{ HP_POP(elemental->ai_sub_timer_activesearch), HP_POP2(HP_elemental_ai_sub_timer_activesearch), 1766 },
-	{ HP_POP(elemental->ai_sub_timer), HP_POP2(HP_elemental_ai_sub_timer), 1768 },
-	{ HP_POP(elemental->ai_sub_foreachclient), HP_POP2(HP_elemental_ai_sub_foreachclient), 1770 },
-	{ HP_POP(elemental->ai_timer), HP_POP2(HP_elemental_ai_timer), 1772 },
-	{ HP_POP(elemental->read_db), HP_POP2(HP_elemental_read_db), 1774 },
+	{ HP_POP(elemental->init), HP_POP2(HP_elemental_init), 1726 },
+	{ HP_POP(elemental->final), HP_POP2(HP_elemental_final), 1728 },
+	{ HP_POP(elemental->class), HP_POP2(HP_elemental_class), 1730 },
+	{ HP_POP(elemental->get_viewdata), HP_POP2(HP_elemental_get_viewdata), 1732 },
+	{ HP_POP(elemental->create), HP_POP2(HP_elemental_create), 1734 },
+	{ HP_POP(elemental->data_received), HP_POP2(HP_elemental_data_received), 1736 },
+	{ HP_POP(elemental->save), HP_POP2(HP_elemental_save), 1738 },
+	{ HP_POP(elemental->change_mode_ack), HP_POP2(HP_elemental_change_mode_ack), 1740 },
+	{ HP_POP(elemental->change_mode), HP_POP2(HP_elemental_change_mode), 1742 },
+	{ HP_POP(elemental->heal), HP_POP2(HP_elemental_heal), 1744 },
+	{ HP_POP(elemental->dead), HP_POP2(HP_elemental_dead), 1746 },
+	{ HP_POP(elemental->delete), HP_POP2(HP_elemental_delete), 1748 },
+	{ HP_POP(elemental->summon_stop), HP_POP2(HP_elemental_summon_stop), 1750 },
+	{ HP_POP(elemental->get_lifetime), HP_POP2(HP_elemental_get_lifetime), 1752 },
+	{ HP_POP(elemental->unlocktarget), HP_POP2(HP_elemental_unlocktarget), 1754 },
+	{ HP_POP(elemental->skillnotok), HP_POP2(HP_elemental_skillnotok), 1756 },
+	{ HP_POP(elemental->set_target), HP_POP2(HP_elemental_set_target), 1758 },
+	{ HP_POP(elemental->clean_single_effect), HP_POP2(HP_elemental_clean_single_effect), 1760 },
+	{ HP_POP(elemental->clean_effect), HP_POP2(HP_elemental_clean_effect), 1762 },
+	{ HP_POP(elemental->action), HP_POP2(HP_elemental_action), 1764 },
+	{ HP_POP(elemental->skill_get_requirements), HP_POP2(HP_elemental_skill_get_requirements), 1766 },
+	{ HP_POP(elemental->read_skilldb), HP_POP2(HP_elemental_read_skilldb), 1768 },
+	{ HP_POP(elemental->reload_db), HP_POP2(HP_elemental_reload_db), 1770 },
+	{ HP_POP(elemental->reload_skilldb), HP_POP2(HP_elemental_reload_skilldb), 1772 },
+	{ HP_POP(elemental->search_index), HP_POP2(HP_elemental_search_index), 1774 },
+	{ HP_POP(elemental->summon_init), HP_POP2(HP_elemental_summon_init), 1776 },
+	{ HP_POP(elemental->summon_end_timer), HP_POP2(HP_elemental_summon_end_timer), 1778 },
+	{ HP_POP(elemental->ai_sub_timer_activesearch), HP_POP2(HP_elemental_ai_sub_timer_activesearch), 1780 },
+	{ HP_POP(elemental->ai_sub_timer), HP_POP2(HP_elemental_ai_sub_timer), 1782 },
+	{ HP_POP(elemental->ai_sub_foreachclient), HP_POP2(HP_elemental_ai_sub_foreachclient), 1784 },
+	{ HP_POP(elemental->ai_timer), HP_POP2(HP_elemental_ai_timer), 1786 },
+	{ HP_POP(elemental->read_db), HP_POP2(HP_elemental_read_db), 1788 },
 /* guild */
-	{ HP_POP(guild->init), HP_POP2(HP_guild_init), 1776 },
-	{ HP_POP(guild->final), HP_POP2(HP_guild_final), 1778 },
-	{ HP_POP(guild->skill_get_max), HP_POP2(HP_guild_skill_get_max), 1780 },
-	{ HP_POP(guild->checkskill), HP_POP2(HP_guild_checkskill), 1782 },
-	{ HP_POP(guild->check_skill_require), HP_POP2(HP_guild_check_skill_require), 1784 },
-	{ HP_POP(guild->checkcastles), HP_POP2(HP_guild_checkcastles), 1786 },
-	{ HP_POP(guild->isallied), HP_POP2(HP_guild_isallied), 1788 },
-	{ HP_POP(guild->search), HP_POP2(HP_guild_search), 1790 },
-	{ HP_POP(guild->searchname), HP_POP2(HP_guild_searchname), 1792 },
-	{ HP_POP(guild->castle_search), HP_POP2(HP_guild_castle_search), 1794 },
-	{ HP_POP(guild->mapname2gc), HP_POP2(HP_guild_mapname2gc), 1796 },
-	{ HP_POP(guild->mapindex2gc), HP_POP2(HP_guild_mapindex2gc), 1798 },
-	{ HP_POP(guild->getavailablesd), HP_POP2(HP_guild_getavailablesd), 1800 },
-	{ HP_POP(guild->getindex), HP_POP2(HP_guild_getindex), 1802 },
-	{ HP_POP(guild->getposition), HP_POP2(HP_guild_getposition), 1804 },
-	{ HP_POP(guild->payexp), HP_POP2(HP_guild_payexp), 1806 },
-	{ HP_POP(guild->getexp), HP_POP2(HP_guild_getexp), 1808 },
-	{ HP_POP(guild->create), HP_POP2(HP_guild_create), 1810 },
-	{ HP_POP(guild->created), HP_POP2(HP_guild_created), 1812 },
-	{ HP_POP(guild->request_info), HP_POP2(HP_guild_request_info), 1814 },
-	{ HP_POP(guild->recv_noinfo), HP_POP2(HP_guild_recv_noinfo), 1816 },
-	{ HP_POP(guild->recv_info), HP_POP2(HP_guild_recv_info), 1818 },
-	{ HP_POP(guild->npc_request_info), HP_POP2(HP_guild_npc_request_info), 1820 },
-	{ HP_POP(guild->invite), HP_POP2(HP_guild_invite), 1822 },
-	{ HP_POP(guild->reply_invite), HP_POP2(HP_guild_reply_invite), 1824 },
-	{ HP_POP(guild->member_joined), HP_POP2(HP_guild_member_joined), 1826 },
-	{ HP_POP(guild->member_added), HP_POP2(HP_guild_member_added), 1828 },
-	{ HP_POP(guild->leave), HP_POP2(HP_guild_leave), 1830 },
-	{ HP_POP(guild->member_withdraw), HP_POP2(HP_guild_member_withdraw), 1832 },
-	{ HP_POP(guild->expulsion), HP_POP2(HP_guild_expulsion), 1834 },
-	{ HP_POP(guild->skillup), HP_POP2(HP_guild_skillup), 1836 },
-	{ HP_POP(guild->block_skill), HP_POP2(HP_guild_block_skill), 1838 },
-	{ HP_POP(guild->reqalliance), HP_POP2(HP_guild_reqalliance), 1840 },
-	{ HP_POP(guild->reply_reqalliance), HP_POP2(HP_guild_reply_reqalliance), 1842 },
-	{ HP_POP(guild->allianceack), HP_POP2(HP_guild_allianceack), 1844 },
-	{ HP_POP(guild->delalliance), HP_POP2(HP_guild_delalliance), 1846 },
-	{ HP_POP(guild->opposition), HP_POP2(HP_guild_opposition), 1848 },
-	{ HP_POP(guild->check_alliance), HP_POP2(HP_guild_check_alliance), 1850 },
-	{ HP_POP(guild->send_memberinfoshort), HP_POP2(HP_guild_send_memberinfoshort), 1852 },
-	{ HP_POP(guild->recv_memberinfoshort), HP_POP2(HP_guild_recv_memberinfoshort), 1854 },
-	{ HP_POP(guild->change_memberposition), HP_POP2(HP_guild_change_memberposition), 1856 },
-	{ HP_POP(guild->memberposition_changed), HP_POP2(HP_guild_memberposition_changed), 1858 },
-	{ HP_POP(guild->change_position), HP_POP2(HP_guild_change_position), 1860 },
-	{ HP_POP(guild->position_changed), HP_POP2(HP_guild_position_changed), 1862 },
-	{ HP_POP(guild->change_notice), HP_POP2(HP_guild_change_notice), 1864 },
-	{ HP_POP(guild->notice_changed), HP_POP2(HP_guild_notice_changed), 1866 },
-	{ HP_POP(guild->change_emblem), HP_POP2(HP_guild_change_emblem), 1868 },
-	{ HP_POP(guild->emblem_changed), HP_POP2(HP_guild_emblem_changed), 1870 },
-	{ HP_POP(guild->send_message), HP_POP2(HP_guild_send_message), 1872 },
-	{ HP_POP(guild->recv_message), HP_POP2(HP_guild_recv_message), 1874 },
-	{ HP_POP(guild->send_dot_remove), HP_POP2(HP_guild_send_dot_remove), 1876 },
-	{ HP_POP(guild->skillupack), HP_POP2(HP_guild_skillupack), 1878 },
-	{ HP_POP(guild->dobreak), HP_POP2(HP_guild_dobreak), 1880 },
-	{ HP_POP(guild->broken), HP_POP2(HP_guild_broken), 1882 },
-	{ HP_POP(guild->gm_change), HP_POP2(HP_guild_gm_change), 1884 },
-	{ HP_POP(guild->gm_changed), HP_POP2(HP_guild_gm_changed), 1886 },
-	{ HP_POP(guild->castle_map_init), HP_POP2(HP_guild_castle_map_init), 1888 },
-	{ HP_POP(guild->castledatasave), HP_POP2(HP_guild_castledatasave), 1890 },
-	{ HP_POP(guild->castledataloadack), HP_POP2(HP_guild_castledataloadack), 1892 },
-	{ HP_POP(guild->castle_reconnect), HP_POP2(HP_guild_castle_reconnect), 1894 },
-	{ HP_POP(guild->agit_start), HP_POP2(HP_guild_agit_start), 1896 },
-	{ HP_POP(guild->agit_end), HP_POP2(HP_guild_agit_end), 1898 },
-	{ HP_POP(guild->agit2_start), HP_POP2(HP_guild_agit2_start), 1900 },
-	{ HP_POP(guild->agit2_end), HP_POP2(HP_guild_agit2_end), 1902 },
-	{ HP_POP(guild->flag_add), HP_POP2(HP_guild_flag_add), 1904 },
-	{ HP_POP(guild->flag_remove), HP_POP2(HP_guild_flag_remove), 1906 },
-	{ HP_POP(guild->flags_clear), HP_POP2(HP_guild_flags_clear), 1908 },
-	{ HP_POP(guild->aura_refresh), HP_POP2(HP_guild_aura_refresh), 1910 },
-	{ HP_POP(guild->payexp_timer), HP_POP2(HP_guild_payexp_timer), 1912 },
-	{ HP_POP(guild->sd_check), HP_POP2(HP_guild_sd_check), 1914 },
-	{ HP_POP(guild->read_guildskill_tree_db), HP_POP2(HP_guild_read_guildskill_tree_db), 1916 },
-	{ HP_POP(guild->read_castledb), HP_POP2(HP_guild_read_castledb), 1918 },
-	{ HP_POP(guild->payexp_timer_sub), HP_POP2(HP_guild_payexp_timer_sub), 1920 },
-	{ HP_POP(guild->send_xy_timer_sub), HP_POP2(HP_guild_send_xy_timer_sub), 1922 },
-	{ HP_POP(guild->send_xy_timer), HP_POP2(HP_guild_send_xy_timer), 1924 },
-	{ HP_POP(guild->create_expcache), HP_POP2(HP_guild_create_expcache), 1926 },
-	{ HP_POP(guild->eventlist_db_final), HP_POP2(HP_guild_eventlist_db_final), 1928 },
-	{ HP_POP(guild->expcache_db_final), HP_POP2(HP_guild_expcache_db_final), 1930 },
-	{ HP_POP(guild->castle_db_final), HP_POP2(HP_guild_castle_db_final), 1932 },
-	{ HP_POP(guild->broken_sub), HP_POP2(HP_guild_broken_sub), 1934 },
-	{ HP_POP(guild->castle_broken_sub), HP_POP2(HP_guild_castle_broken_sub), 1936 },
-	{ HP_POP(guild->makemember), HP_POP2(HP_guild_makemember), 1938 },
-	{ HP_POP(guild->check_member), HP_POP2(HP_guild_check_member), 1940 },
-	{ HP_POP(guild->get_alliance_count), HP_POP2(HP_guild_get_alliance_count), 1942 },
-	{ HP_POP(guild->castle_reconnect_sub), HP_POP2(HP_guild_castle_reconnect_sub), 1944 },
+	{ HP_POP(guild->init), HP_POP2(HP_guild_init), 1790 },
+	{ HP_POP(guild->final), HP_POP2(HP_guild_final), 1792 },
+	{ HP_POP(guild->skill_get_max), HP_POP2(HP_guild_skill_get_max), 1794 },
+	{ HP_POP(guild->checkskill), HP_POP2(HP_guild_checkskill), 1796 },
+	{ HP_POP(guild->check_skill_require), HP_POP2(HP_guild_check_skill_require), 1798 },
+	{ HP_POP(guild->checkcastles), HP_POP2(HP_guild_checkcastles), 1800 },
+	{ HP_POP(guild->isallied), HP_POP2(HP_guild_isallied), 1802 },
+	{ HP_POP(guild->search), HP_POP2(HP_guild_search), 1804 },
+	{ HP_POP(guild->searchname), HP_POP2(HP_guild_searchname), 1806 },
+	{ HP_POP(guild->castle_search), HP_POP2(HP_guild_castle_search), 1808 },
+	{ HP_POP(guild->mapname2gc), HP_POP2(HP_guild_mapname2gc), 1810 },
+	{ HP_POP(guild->mapindex2gc), HP_POP2(HP_guild_mapindex2gc), 1812 },
+	{ HP_POP(guild->getavailablesd), HP_POP2(HP_guild_getavailablesd), 1814 },
+	{ HP_POP(guild->getindex), HP_POP2(HP_guild_getindex), 1816 },
+	{ HP_POP(guild->getposition), HP_POP2(HP_guild_getposition), 1818 },
+	{ HP_POP(guild->payexp), HP_POP2(HP_guild_payexp), 1820 },
+	{ HP_POP(guild->getexp), HP_POP2(HP_guild_getexp), 1822 },
+	{ HP_POP(guild->create), HP_POP2(HP_guild_create), 1824 },
+	{ HP_POP(guild->created), HP_POP2(HP_guild_created), 1826 },
+	{ HP_POP(guild->request_info), HP_POP2(HP_guild_request_info), 1828 },
+	{ HP_POP(guild->recv_noinfo), HP_POP2(HP_guild_recv_noinfo), 1830 },
+	{ HP_POP(guild->recv_info), HP_POP2(HP_guild_recv_info), 1832 },
+	{ HP_POP(guild->npc_request_info), HP_POP2(HP_guild_npc_request_info), 1834 },
+	{ HP_POP(guild->invite), HP_POP2(HP_guild_invite), 1836 },
+	{ HP_POP(guild->reply_invite), HP_POP2(HP_guild_reply_invite), 1838 },
+	{ HP_POP(guild->member_joined), HP_POP2(HP_guild_member_joined), 1840 },
+	{ HP_POP(guild->member_added), HP_POP2(HP_guild_member_added), 1842 },
+	{ HP_POP(guild->leave), HP_POP2(HP_guild_leave), 1844 },
+	{ HP_POP(guild->member_withdraw), HP_POP2(HP_guild_member_withdraw), 1846 },
+	{ HP_POP(guild->expulsion), HP_POP2(HP_guild_expulsion), 1848 },
+	{ HP_POP(guild->skillup), HP_POP2(HP_guild_skillup), 1850 },
+	{ HP_POP(guild->block_skill), HP_POP2(HP_guild_block_skill), 1852 },
+	{ HP_POP(guild->reqalliance), HP_POP2(HP_guild_reqalliance), 1854 },
+	{ HP_POP(guild->reply_reqalliance), HP_POP2(HP_guild_reply_reqalliance), 1856 },
+	{ HP_POP(guild->allianceack), HP_POP2(HP_guild_allianceack), 1858 },
+	{ HP_POP(guild->delalliance), HP_POP2(HP_guild_delalliance), 1860 },
+	{ HP_POP(guild->opposition), HP_POP2(HP_guild_opposition), 1862 },
+	{ HP_POP(guild->check_alliance), HP_POP2(HP_guild_check_alliance), 1864 },
+	{ HP_POP(guild->send_memberinfoshort), HP_POP2(HP_guild_send_memberinfoshort), 1866 },
+	{ HP_POP(guild->recv_memberinfoshort), HP_POP2(HP_guild_recv_memberinfoshort), 1868 },
+	{ HP_POP(guild->change_memberposition), HP_POP2(HP_guild_change_memberposition), 1870 },
+	{ HP_POP(guild->memberposition_changed), HP_POP2(HP_guild_memberposition_changed), 1872 },
+	{ HP_POP(guild->change_position), HP_POP2(HP_guild_change_position), 1874 },
+	{ HP_POP(guild->position_changed), HP_POP2(HP_guild_position_changed), 1876 },
+	{ HP_POP(guild->change_notice), HP_POP2(HP_guild_change_notice), 1878 },
+	{ HP_POP(guild->notice_changed), HP_POP2(HP_guild_notice_changed), 1880 },
+	{ HP_POP(guild->change_emblem), HP_POP2(HP_guild_change_emblem), 1882 },
+	{ HP_POP(guild->emblem_changed), HP_POP2(HP_guild_emblem_changed), 1884 },
+	{ HP_POP(guild->send_message), HP_POP2(HP_guild_send_message), 1886 },
+	{ HP_POP(guild->recv_message), HP_POP2(HP_guild_recv_message), 1888 },
+	{ HP_POP(guild->send_dot_remove), HP_POP2(HP_guild_send_dot_remove), 1890 },
+	{ HP_POP(guild->skillupack), HP_POP2(HP_guild_skillupack), 1892 },
+	{ HP_POP(guild->dobreak), HP_POP2(HP_guild_dobreak), 1894 },
+	{ HP_POP(guild->broken), HP_POP2(HP_guild_broken), 1896 },
+	{ HP_POP(guild->gm_change), HP_POP2(HP_guild_gm_change), 1898 },
+	{ HP_POP(guild->gm_changed), HP_POP2(HP_guild_gm_changed), 1900 },
+	{ HP_POP(guild->castle_map_init), HP_POP2(HP_guild_castle_map_init), 1902 },
+	{ HP_POP(guild->castledatasave), HP_POP2(HP_guild_castledatasave), 1904 },
+	{ HP_POP(guild->castledataloadack), HP_POP2(HP_guild_castledataloadack), 1906 },
+	{ HP_POP(guild->castle_reconnect), HP_POP2(HP_guild_castle_reconnect), 1908 },
+	{ HP_POP(guild->agit_start), HP_POP2(HP_guild_agit_start), 1910 },
+	{ HP_POP(guild->agit_end), HP_POP2(HP_guild_agit_end), 1912 },
+	{ HP_POP(guild->agit2_start), HP_POP2(HP_guild_agit2_start), 1914 },
+	{ HP_POP(guild->agit2_end), HP_POP2(HP_guild_agit2_end), 1916 },
+	{ HP_POP(guild->flag_add), HP_POP2(HP_guild_flag_add), 1918 },
+	{ HP_POP(guild->flag_remove), HP_POP2(HP_guild_flag_remove), 1920 },
+	{ HP_POP(guild->flags_clear), HP_POP2(HP_guild_flags_clear), 1922 },
+	{ HP_POP(guild->aura_refresh), HP_POP2(HP_guild_aura_refresh), 1924 },
+	{ HP_POP(guild->payexp_timer), HP_POP2(HP_guild_payexp_timer), 1926 },
+	{ HP_POP(guild->sd_check), HP_POP2(HP_guild_sd_check), 1928 },
+	{ HP_POP(guild->read_guildskill_tree_db), HP_POP2(HP_guild_read_guildskill_tree_db), 1930 },
+	{ HP_POP(guild->read_castledb), HP_POP2(HP_guild_read_castledb), 1932 },
+	{ HP_POP(guild->payexp_timer_sub), HP_POP2(HP_guild_payexp_timer_sub), 1934 },
+	{ HP_POP(guild->send_xy_timer_sub), HP_POP2(HP_guild_send_xy_timer_sub), 1936 },
+	{ HP_POP(guild->send_xy_timer), HP_POP2(HP_guild_send_xy_timer), 1938 },
+	{ HP_POP(guild->create_expcache), HP_POP2(HP_guild_create_expcache), 1940 },
+	{ HP_POP(guild->eventlist_db_final), HP_POP2(HP_guild_eventlist_db_final), 1942 },
+	{ HP_POP(guild->expcache_db_final), HP_POP2(HP_guild_expcache_db_final), 1944 },
+	{ HP_POP(guild->castle_db_final), HP_POP2(HP_guild_castle_db_final), 1946 },
+	{ HP_POP(guild->broken_sub), HP_POP2(HP_guild_broken_sub), 1948 },
+	{ HP_POP(guild->castle_broken_sub), HP_POP2(HP_guild_castle_broken_sub), 1950 },
+	{ HP_POP(guild->makemember), HP_POP2(HP_guild_makemember), 1952 },
+	{ HP_POP(guild->check_member), HP_POP2(HP_guild_check_member), 1954 },
+	{ HP_POP(guild->get_alliance_count), HP_POP2(HP_guild_get_alliance_count), 1956 },
+	{ HP_POP(guild->castle_reconnect_sub), HP_POP2(HP_guild_castle_reconnect_sub), 1958 },
 /* gstorage */
-	{ HP_POP(gstorage->id2storage), HP_POP2(HP_gstorage_id2storage), 1946 },
-	{ HP_POP(gstorage->id2storage2), HP_POP2(HP_gstorage_id2storage2), 1948 },
-	{ HP_POP(gstorage->init), HP_POP2(HP_gstorage_init), 1950 },
-	{ HP_POP(gstorage->final), HP_POP2(HP_gstorage_final), 1952 },
-	{ HP_POP(gstorage->delete), HP_POP2(HP_gstorage_delete), 1954 },
-	{ HP_POP(gstorage->open), HP_POP2(HP_gstorage_open), 1956 },
-	{ HP_POP(gstorage->additem), HP_POP2(HP_gstorage_additem), 1958 },
-	{ HP_POP(gstorage->delitem), HP_POP2(HP_gstorage_delitem), 1960 },
-	{ HP_POP(gstorage->add), HP_POP2(HP_gstorage_add), 1962 },
-	{ HP_POP(gstorage->get), HP_POP2(HP_gstorage_get), 1964 },
-	{ HP_POP(gstorage->addfromcart), HP_POP2(HP_gstorage_addfromcart), 1966 },
-	{ HP_POP(gstorage->gettocart), HP_POP2(HP_gstorage_gettocart), 1968 },
-	{ HP_POP(gstorage->close), HP_POP2(HP_gstorage_close), 1970 },
-	{ HP_POP(gstorage->pc_quit), HP_POP2(HP_gstorage_pc_quit), 1972 },
-	{ HP_POP(gstorage->save), HP_POP2(HP_gstorage_save), 1974 },
-	{ HP_POP(gstorage->saved), HP_POP2(HP_gstorage_saved), 1976 },
-	{ HP_POP(gstorage->create), HP_POP2(HP_gstorage_create), 1978 },
+	{ HP_POP(gstorage->id2storage), HP_POP2(HP_gstorage_id2storage), 1960 },
+	{ HP_POP(gstorage->id2storage2), HP_POP2(HP_gstorage_id2storage2), 1962 },
+	{ HP_POP(gstorage->init), HP_POP2(HP_gstorage_init), 1964 },
+	{ HP_POP(gstorage->final), HP_POP2(HP_gstorage_final), 1966 },
+	{ HP_POP(gstorage->delete), HP_POP2(HP_gstorage_delete), 1968 },
+	{ HP_POP(gstorage->open), HP_POP2(HP_gstorage_open), 1970 },
+	{ HP_POP(gstorage->additem), HP_POP2(HP_gstorage_additem), 1972 },
+	{ HP_POP(gstorage->delitem), HP_POP2(HP_gstorage_delitem), 1974 },
+	{ HP_POP(gstorage->add), HP_POP2(HP_gstorage_add), 1976 },
+	{ HP_POP(gstorage->get), HP_POP2(HP_gstorage_get), 1978 },
+	{ HP_POP(gstorage->addfromcart), HP_POP2(HP_gstorage_addfromcart), 1980 },
+	{ HP_POP(gstorage->gettocart), HP_POP2(HP_gstorage_gettocart), 1982 },
+	{ HP_POP(gstorage->close), HP_POP2(HP_gstorage_close), 1984 },
+	{ HP_POP(gstorage->pc_quit), HP_POP2(HP_gstorage_pc_quit), 1986 },
+	{ HP_POP(gstorage->save), HP_POP2(HP_gstorage_save), 1988 },
+	{ HP_POP(gstorage->saved), HP_POP2(HP_gstorage_saved), 1990 },
+	{ HP_POP(gstorage->create), HP_POP2(HP_gstorage_create), 1992 },
 /* homun */
-	{ HP_POP(homun->init), HP_POP2(HP_homun_init), 1980 },
-	{ HP_POP(homun->final), HP_POP2(HP_homun_final), 1982 },
-	{ HP_POP(homun->reload), HP_POP2(HP_homun_reload), 1984 },
-	{ HP_POP(homun->reload_skill), HP_POP2(HP_homun_reload_skill), 1986 },
-	{ HP_POP(homun->get_viewdata), HP_POP2(HP_homun_get_viewdata), 1988 },
-	{ HP_POP(homun->class2type), HP_POP2(HP_homun_class2type), 1990 },
-	{ HP_POP(homun->damaged), HP_POP2(HP_homun_damaged), 1992 },
-	{ HP_POP(homun->dead), HP_POP2(HP_homun_dead), 1994 },
-	{ HP_POP(homun->vaporize), HP_POP2(HP_homun_vaporize), 1996 },
-	{ HP_POP(homun->delete), HP_POP2(HP_homun_delete), 1998 },
-	{ HP_POP(homun->checkskill), HP_POP2(HP_homun_checkskill), 2000 },
-	{ HP_POP(homun->calc_skilltree), HP_POP2(HP_homun_calc_skilltree), 2002 },
-	{ HP_POP(homun->skill_tree_get_max), HP_POP2(HP_homun_skill_tree_get_max), 2004 },
-	{ HP_POP(homun->skillup), HP_POP2(HP_homun_skillup), 2006 },
-	{ HP_POP(homun->levelup), HP_POP2(HP_homun_levelup), 2008 },
-	{ HP_POP(homun->change_class), HP_POP2(HP_homun_change_class), 2010 },
-	{ HP_POP(homun->evolve), HP_POP2(HP_homun_evolve), 2012 },
-	{ HP_POP(homun->mutate), HP_POP2(HP_homun_mutate), 2014 },
-	{ HP_POP(homun->gainexp), HP_POP2(HP_homun_gainexp), 2016 },
-	{ HP_POP(homun->add_intimacy), HP_POP2(HP_homun_add_intimacy), 2018 },
-	{ HP_POP(homun->consume_intimacy), HP_POP2(HP_homun_consume_intimacy), 2020 },
-	{ HP_POP(homun->healed), HP_POP2(HP_homun_healed), 2022 },
-	{ HP_POP(homun->save), HP_POP2(HP_homun_save), 2024 },
-	{ HP_POP(homun->menu), HP_POP2(HP_homun_menu), 2026 },
-	{ HP_POP(homun->feed), HP_POP2(HP_homun_feed), 2028 },
-	{ HP_POP(homun->hunger_timer), HP_POP2(HP_homun_hunger_timer), 2030 },
-	{ HP_POP(homun->hunger_timer_delete), HP_POP2(HP_homun_hunger_timer_delete), 2032 },
-	{ HP_POP(homun->change_name), HP_POP2(HP_homun_change_name), 2034 },
-	{ HP_POP(homun->change_name_ack), HP_POP2(HP_homun_change_name_ack), 2036 },
-	{ HP_POP(homun->db_search), HP_POP2(HP_homun_db_search), 2038 },
-	{ HP_POP(homun->create), HP_POP2(HP_homun_create), 2040 },
-	{ HP_POP(homun->init_timers), HP_POP2(HP_homun_init_timers), 2042 },
-	{ HP_POP(homun->call), HP_POP2(HP_homun_call), 2044 },
-	{ HP_POP(homun->recv_data), HP_POP2(HP_homun_recv_data), 2046 },
-	{ HP_POP(homun->creation_request), HP_POP2(HP_homun_creation_request), 2048 },
-	{ HP_POP(homun->ressurect), HP_POP2(HP_homun_ressurect), 2050 },
-	{ HP_POP(homun->revive), HP_POP2(HP_homun_revive), 2052 },
-	{ HP_POP(homun->stat_reset), HP_POP2(HP_homun_stat_reset), 2054 },
-	{ HP_POP(homun->shuffle), HP_POP2(HP_homun_shuffle), 2056 },
-	{ HP_POP(homun->read_db_sub), HP_POP2(HP_homun_read_db_sub), 2058 },
-	{ HP_POP(homun->read_db), HP_POP2(HP_homun_read_db), 2060 },
-	{ HP_POP(homun->read_skill_db_sub), HP_POP2(HP_homun_read_skill_db_sub), 2062 },
-	{ HP_POP(homun->skill_db_read), HP_POP2(HP_homun_skill_db_read), 2064 },
-	{ HP_POP(homun->exp_db_read), HP_POP2(HP_homun_exp_db_read), 2066 },
-	{ HP_POP(homun->addspiritball), HP_POP2(HP_homun_addspiritball), 2068 },
-	{ HP_POP(homun->delspiritball), HP_POP2(HP_homun_delspiritball), 2070 },
+	{ HP_POP(homun->init), HP_POP2(HP_homun_init), 1994 },
+	{ HP_POP(homun->final), HP_POP2(HP_homun_final), 1996 },
+	{ HP_POP(homun->reload), HP_POP2(HP_homun_reload), 1998 },
+	{ HP_POP(homun->reload_skill), HP_POP2(HP_homun_reload_skill), 2000 },
+	{ HP_POP(homun->get_viewdata), HP_POP2(HP_homun_get_viewdata), 2002 },
+	{ HP_POP(homun->class2type), HP_POP2(HP_homun_class2type), 2004 },
+	{ HP_POP(homun->damaged), HP_POP2(HP_homun_damaged), 2006 },
+	{ HP_POP(homun->dead), HP_POP2(HP_homun_dead), 2008 },
+	{ HP_POP(homun->vaporize), HP_POP2(HP_homun_vaporize), 2010 },
+	{ HP_POP(homun->delete), HP_POP2(HP_homun_delete), 2012 },
+	{ HP_POP(homun->checkskill), HP_POP2(HP_homun_checkskill), 2014 },
+	{ HP_POP(homun->calc_skilltree), HP_POP2(HP_homun_calc_skilltree), 2016 },
+	{ HP_POP(homun->skill_tree_get_max), HP_POP2(HP_homun_skill_tree_get_max), 2018 },
+	{ HP_POP(homun->skillup), HP_POP2(HP_homun_skillup), 2020 },
+	{ HP_POP(homun->levelup), HP_POP2(HP_homun_levelup), 2022 },
+	{ HP_POP(homun->change_class), HP_POP2(HP_homun_change_class), 2024 },
+	{ HP_POP(homun->evolve), HP_POP2(HP_homun_evolve), 2026 },
+	{ HP_POP(homun->mutate), HP_POP2(HP_homun_mutate), 2028 },
+	{ HP_POP(homun->gainexp), HP_POP2(HP_homun_gainexp), 2030 },
+	{ HP_POP(homun->add_intimacy), HP_POP2(HP_homun_add_intimacy), 2032 },
+	{ HP_POP(homun->consume_intimacy), HP_POP2(HP_homun_consume_intimacy), 2034 },
+	{ HP_POP(homun->healed), HP_POP2(HP_homun_healed), 2036 },
+	{ HP_POP(homun->save), HP_POP2(HP_homun_save), 2038 },
+	{ HP_POP(homun->menu), HP_POP2(HP_homun_menu), 2040 },
+	{ HP_POP(homun->feed), HP_POP2(HP_homun_feed), 2042 },
+	{ HP_POP(homun->hunger_timer), HP_POP2(HP_homun_hunger_timer), 2044 },
+	{ HP_POP(homun->hunger_timer_delete), HP_POP2(HP_homun_hunger_timer_delete), 2046 },
+	{ HP_POP(homun->change_name), HP_POP2(HP_homun_change_name), 2048 },
+	{ HP_POP(homun->change_name_ack), HP_POP2(HP_homun_change_name_ack), 2050 },
+	{ HP_POP(homun->db_search), HP_POP2(HP_homun_db_search), 2052 },
+	{ HP_POP(homun->create), HP_POP2(HP_homun_create), 2054 },
+	{ HP_POP(homun->init_timers), HP_POP2(HP_homun_init_timers), 2056 },
+	{ HP_POP(homun->call), HP_POP2(HP_homun_call), 2058 },
+	{ HP_POP(homun->recv_data), HP_POP2(HP_homun_recv_data), 2060 },
+	{ HP_POP(homun->creation_request), HP_POP2(HP_homun_creation_request), 2062 },
+	{ HP_POP(homun->ressurect), HP_POP2(HP_homun_ressurect), 2064 },
+	{ HP_POP(homun->revive), HP_POP2(HP_homun_revive), 2066 },
+	{ HP_POP(homun->stat_reset), HP_POP2(HP_homun_stat_reset), 2068 },
+	{ HP_POP(homun->shuffle), HP_POP2(HP_homun_shuffle), 2070 },
+	{ HP_POP(homun->read_db_sub), HP_POP2(HP_homun_read_db_sub), 2072 },
+	{ HP_POP(homun->read_db), HP_POP2(HP_homun_read_db), 2074 },
+	{ HP_POP(homun->read_skill_db_sub), HP_POP2(HP_homun_read_skill_db_sub), 2076 },
+	{ HP_POP(homun->skill_db_read), HP_POP2(HP_homun_skill_db_read), 2078 },
+	{ HP_POP(homun->exp_db_read), HP_POP2(HP_homun_exp_db_read), 2080 },
+	{ HP_POP(homun->addspiritball), HP_POP2(HP_homun_addspiritball), 2082 },
+	{ HP_POP(homun->delspiritball), HP_POP2(HP_homun_delspiritball), 2084 },
 /* instance */
-	{ HP_POP(instance->init), HP_POP2(HP_instance_init), 2072 },
-	{ HP_POP(instance->final), HP_POP2(HP_instance_final), 2074 },
-	{ HP_POP(instance->create), HP_POP2(HP_instance_create), 2076 },
-	{ HP_POP(instance->add_map), HP_POP2(HP_instance_add_map), 2078 },
-	{ HP_POP(instance->del_map), HP_POP2(HP_instance_del_map), 2080 },
-	{ HP_POP(instance->map2imap), HP_POP2(HP_instance_map2imap), 2082 },
-	{ HP_POP(instance->mapid2imapid), HP_POP2(HP_instance_mapid2imapid), 2084 },
-	{ HP_POP(instance->destroy), HP_POP2(HP_instance_destroy), 2086 },
-	{ HP_POP(instance->start), HP_POP2(HP_instance_start), 2088 },
-	{ HP_POP(instance->check_idle), HP_POP2(HP_instance_check_idle), 2090 },
-	{ HP_POP(instance->check_kick), HP_POP2(HP_instance_check_kick), 2092 },
-	{ HP_POP(instance->set_timeout), HP_POP2(HP_instance_set_timeout), 2094 },
-	{ HP_POP(instance->valid), HP_POP2(HP_instance_valid), 2096 },
-	{ HP_POP(instance->destroy_timer), HP_POP2(HP_instance_destroy_timer), 2098 },
+	{ HP_POP(instance->init), HP_POP2(HP_instance_init), 2086 },
+	{ HP_POP(instance->final), HP_POP2(HP_instance_final), 2088 },
+	{ HP_POP(instance->create), HP_POP2(HP_instance_create), 2090 },
+	{ HP_POP(instance->add_map), HP_POP2(HP_instance_add_map), 2092 },
+	{ HP_POP(instance->del_map), HP_POP2(HP_instance_del_map), 2094 },
+	{ HP_POP(instance->map2imap), HP_POP2(HP_instance_map2imap), 2096 },
+	{ HP_POP(instance->mapid2imapid), HP_POP2(HP_instance_mapid2imapid), 2098 },
+	{ HP_POP(instance->destroy), HP_POP2(HP_instance_destroy), 2100 },
+	{ HP_POP(instance->start), HP_POP2(HP_instance_start), 2102 },
+	{ HP_POP(instance->check_idle), HP_POP2(HP_instance_check_idle), 2104 },
+	{ HP_POP(instance->check_kick), HP_POP2(HP_instance_check_kick), 2106 },
+	{ HP_POP(instance->set_timeout), HP_POP2(HP_instance_set_timeout), 2108 },
+	{ HP_POP(instance->valid), HP_POP2(HP_instance_valid), 2110 },
+	{ HP_POP(instance->destroy_timer), HP_POP2(HP_instance_destroy_timer), 2112 },
 /* intif */
-	{ HP_POP(intif->parse), HP_POP2(HP_intif_parse), 2100 },
-	{ HP_POP(intif->create_pet), HP_POP2(HP_intif_create_pet), 2102 },
-	{ HP_POP(intif->broadcast), HP_POP2(HP_intif_broadcast), 2104 },
-	{ HP_POP(intif->broadcast2), HP_POP2(HP_intif_broadcast2), 2106 },
-	{ HP_POP(intif->main_message), HP_POP2(HP_intif_main_message), 2108 },
-	{ HP_POP(intif->wis_message), HP_POP2(HP_intif_wis_message), 2110 },
-	{ HP_POP(intif->wis_message_to_gm), HP_POP2(HP_intif_wis_message_to_gm), 2112 },
-	{ HP_POP(intif->saveregistry), HP_POP2(HP_intif_saveregistry), 2114 },
-	{ HP_POP(intif->request_registry), HP_POP2(HP_intif_request_registry), 2116 },
-	{ HP_POP(intif->request_guild_storage), HP_POP2(HP_intif_request_guild_storage), 2118 },
-	{ HP_POP(intif->send_guild_storage), HP_POP2(HP_intif_send_guild_storage), 2120 },
-	{ HP_POP(intif->create_party), HP_POP2(HP_intif_create_party), 2122 },
-	{ HP_POP(intif->request_partyinfo), HP_POP2(HP_intif_request_partyinfo), 2124 },
-	{ HP_POP(intif->party_addmember), HP_POP2(HP_intif_party_addmember), 2126 },
-	{ HP_POP(intif->party_changeoption), HP_POP2(HP_intif_party_changeoption), 2128 },
-	{ HP_POP(intif->party_leave), HP_POP2(HP_intif_party_leave), 2130 },
-	{ HP_POP(intif->party_changemap), HP_POP2(HP_intif_party_changemap), 2132 },
-	{ HP_POP(intif->break_party), HP_POP2(HP_intif_break_party), 2134 },
-	{ HP_POP(intif->party_message), HP_POP2(HP_intif_party_message), 2136 },
-	{ HP_POP(intif->party_leaderchange), HP_POP2(HP_intif_party_leaderchange), 2138 },
-	{ HP_POP(intif->guild_create), HP_POP2(HP_intif_guild_create), 2140 },
-	{ HP_POP(intif->guild_request_info), HP_POP2(HP_intif_guild_request_info), 2142 },
-	{ HP_POP(intif->guild_addmember), HP_POP2(HP_intif_guild_addmember), 2144 },
-	{ HP_POP(intif->guild_leave), HP_POP2(HP_intif_guild_leave), 2146 },
-	{ HP_POP(intif->guild_memberinfoshort), HP_POP2(HP_intif_guild_memberinfoshort), 2148 },
-	{ HP_POP(intif->guild_break), HP_POP2(HP_intif_guild_break), 2150 },
-	{ HP_POP(intif->guild_message), HP_POP2(HP_intif_guild_message), 2152 },
-	{ HP_POP(intif->guild_change_gm), HP_POP2(HP_intif_guild_change_gm), 2154 },
-	{ HP_POP(intif->guild_change_basicinfo), HP_POP2(HP_intif_guild_change_basicinfo), 2156 },
-	{ HP_POP(intif->guild_change_memberinfo), HP_POP2(HP_intif_guild_change_memberinfo), 2158 },
-	{ HP_POP(intif->guild_position), HP_POP2(HP_intif_guild_position), 2160 },
-	{ HP_POP(intif->guild_skillup), HP_POP2(HP_intif_guild_skillup), 2162 },
-	{ HP_POP(intif->guild_alliance), HP_POP2(HP_intif_guild_alliance), 2164 },
-	{ HP_POP(intif->guild_notice), HP_POP2(HP_intif_guild_notice), 2166 },
-	{ HP_POP(intif->guild_emblem), HP_POP2(HP_intif_guild_emblem), 2168 },
-	{ HP_POP(intif->guild_castle_dataload), HP_POP2(HP_intif_guild_castle_dataload), 2170 },
-	{ HP_POP(intif->guild_castle_datasave), HP_POP2(HP_intif_guild_castle_datasave), 2172 },
-	{ HP_POP(intif->request_petdata), HP_POP2(HP_intif_request_petdata), 2174 },
-	{ HP_POP(intif->save_petdata), HP_POP2(HP_intif_save_petdata), 2176 },
-	{ HP_POP(intif->delete_petdata), HP_POP2(HP_intif_delete_petdata), 2178 },
-	{ HP_POP(intif->rename), HP_POP2(HP_intif_rename), 2180 },
-	{ HP_POP(intif->homunculus_create), HP_POP2(HP_intif_homunculus_create), 2182 },
-	{ HP_POP(intif->homunculus_requestload), HP_POP2(HP_intif_homunculus_requestload), 2184 },
-	{ HP_POP(intif->homunculus_requestsave), HP_POP2(HP_intif_homunculus_requestsave), 2186 },
-	{ HP_POP(intif->homunculus_requestdelete), HP_POP2(HP_intif_homunculus_requestdelete), 2188 },
-	{ HP_POP(intif->request_questlog), HP_POP2(HP_intif_request_questlog), 2190 },
-	{ HP_POP(intif->quest_save), HP_POP2(HP_intif_quest_save), 2192 },
-	{ HP_POP(intif->mercenary_create), HP_POP2(HP_intif_mercenary_create), 2194 },
-	{ HP_POP(intif->mercenary_request), HP_POP2(HP_intif_mercenary_request), 2196 },
-	{ HP_POP(intif->mercenary_delete), HP_POP2(HP_intif_mercenary_delete), 2198 },
-	{ HP_POP(intif->mercenary_save), HP_POP2(HP_intif_mercenary_save), 2200 },
-	{ HP_POP(intif->Mail_requestinbox), HP_POP2(HP_intif_Mail_requestinbox), 2202 },
-	{ HP_POP(intif->Mail_read), HP_POP2(HP_intif_Mail_read), 2204 },
-	{ HP_POP(intif->Mail_getattach), HP_POP2(HP_intif_Mail_getattach), 2206 },
-	{ HP_POP(intif->Mail_delete), HP_POP2(HP_intif_Mail_delete), 2208 },
-	{ HP_POP(intif->Mail_return), HP_POP2(HP_intif_Mail_return), 2210 },
-	{ HP_POP(intif->Mail_send), HP_POP2(HP_intif_Mail_send), 2212 },
-	{ HP_POP(intif->Auction_requestlist), HP_POP2(HP_intif_Auction_requestlist), 2214 },
-	{ HP_POP(intif->Auction_register), HP_POP2(HP_intif_Auction_register), 2216 },
-	{ HP_POP(intif->Auction_cancel), HP_POP2(HP_intif_Auction_cancel), 2218 },
-	{ HP_POP(intif->Auction_close), HP_POP2(HP_intif_Auction_close), 2220 },
-	{ HP_POP(intif->Auction_bid), HP_POP2(HP_intif_Auction_bid), 2222 },
-	{ HP_POP(intif->elemental_create), HP_POP2(HP_intif_elemental_create), 2224 },
-	{ HP_POP(intif->elemental_request), HP_POP2(HP_intif_elemental_request), 2226 },
-	{ HP_POP(intif->elemental_delete), HP_POP2(HP_intif_elemental_delete), 2228 },
-	{ HP_POP(intif->elemental_save), HP_POP2(HP_intif_elemental_save), 2230 },
-	{ HP_POP(intif->request_accinfo), HP_POP2(HP_intif_request_accinfo), 2232 },
-	{ HP_POP(intif->CheckForCharServer), HP_POP2(HP_intif_CheckForCharServer), 2234 },
-	{ HP_POP(intif->pWisMessage), HP_POP2(HP_intif_pWisMessage), 2236 },
-	{ HP_POP(intif->pWisEnd), HP_POP2(HP_intif_pWisEnd), 2238 },
-	{ HP_POP(intif->pWisToGM_sub), HP_POP2(HP_intif_pWisToGM_sub), 2240 },
-	{ HP_POP(intif->pWisToGM), HP_POP2(HP_intif_pWisToGM), 2242 },
-	{ HP_POP(intif->pRegisters), HP_POP2(HP_intif_pRegisters), 2244 },
-	{ HP_POP(intif->pChangeNameOk), HP_POP2(HP_intif_pChangeNameOk), 2246 },
-	{ HP_POP(intif->pMessageToFD), HP_POP2(HP_intif_pMessageToFD), 2248 },
-	{ HP_POP(intif->pLoadGuildStorage), HP_POP2(HP_intif_pLoadGuildStorage), 2250 },
-	{ HP_POP(intif->pSaveGuildStorage), HP_POP2(HP_intif_pSaveGuildStorage), 2252 },
-	{ HP_POP(intif->pPartyCreated), HP_POP2(HP_intif_pPartyCreated), 2254 },
-	{ HP_POP(intif->pPartyInfo), HP_POP2(HP_intif_pPartyInfo), 2256 },
-	{ HP_POP(intif->pPartyMemberAdded), HP_POP2(HP_intif_pPartyMemberAdded), 2258 },
-	{ HP_POP(intif->pPartyOptionChanged), HP_POP2(HP_intif_pPartyOptionChanged), 2260 },
-	{ HP_POP(intif->pPartyMemberWithdraw), HP_POP2(HP_intif_pPartyMemberWithdraw), 2262 },
-	{ HP_POP(intif->pPartyMove), HP_POP2(HP_intif_pPartyMove), 2264 },
-	{ HP_POP(intif->pPartyBroken), HP_POP2(HP_intif_pPartyBroken), 2266 },
-	{ HP_POP(intif->pPartyMessage), HP_POP2(HP_intif_pPartyMessage), 2268 },
-	{ HP_POP(intif->pGuildCreated), HP_POP2(HP_intif_pGuildCreated), 2270 },
-	{ HP_POP(intif->pGuildInfo), HP_POP2(HP_intif_pGuildInfo), 2272 },
-	{ HP_POP(intif->pGuildMemberAdded), HP_POP2(HP_intif_pGuildMemberAdded), 2274 },
-	{ HP_POP(intif->pGuildMemberWithdraw), HP_POP2(HP_intif_pGuildMemberWithdraw), 2276 },
-	{ HP_POP(intif->pGuildMemberInfoShort), HP_POP2(HP_intif_pGuildMemberInfoShort), 2278 },
-	{ HP_POP(intif->pGuildBroken), HP_POP2(HP_intif_pGuildBroken), 2280 },
-	{ HP_POP(intif->pGuildMessage), HP_POP2(HP_intif_pGuildMessage), 2282 },
-	{ HP_POP(intif->pGuildBasicInfoChanged), HP_POP2(HP_intif_pGuildBasicInfoChanged), 2284 },
-	{ HP_POP(intif->pGuildMemberInfoChanged), HP_POP2(HP_intif_pGuildMemberInfoChanged), 2286 },
-	{ HP_POP(intif->pGuildPosition), HP_POP2(HP_intif_pGuildPosition), 2288 },
-	{ HP_POP(intif->pGuildSkillUp), HP_POP2(HP_intif_pGuildSkillUp), 2290 },
-	{ HP_POP(intif->pGuildAlliance), HP_POP2(HP_intif_pGuildAlliance), 2292 },
-	{ HP_POP(intif->pGuildNotice), HP_POP2(HP_intif_pGuildNotice), 2294 },
-	{ HP_POP(intif->pGuildEmblem), HP_POP2(HP_intif_pGuildEmblem), 2296 },
-	{ HP_POP(intif->pGuildCastleDataLoad), HP_POP2(HP_intif_pGuildCastleDataLoad), 2298 },
-	{ HP_POP(intif->pGuildMasterChanged), HP_POP2(HP_intif_pGuildMasterChanged), 2300 },
-	{ HP_POP(intif->pQuestLog), HP_POP2(HP_intif_pQuestLog), 2302 },
-	{ HP_POP(intif->pQuestSave), HP_POP2(HP_intif_pQuestSave), 2304 },
-	{ HP_POP(intif->pMailInboxReceived), HP_POP2(HP_intif_pMailInboxReceived), 2306 },
-	{ HP_POP(intif->pMailNew), HP_POP2(HP_intif_pMailNew), 2308 },
-	{ HP_POP(intif->pMailGetAttach), HP_POP2(HP_intif_pMailGetAttach), 2310 },
-	{ HP_POP(intif->pMailDelete), HP_POP2(HP_intif_pMailDelete), 2312 },
-	{ HP_POP(intif->pMailReturn), HP_POP2(HP_intif_pMailReturn), 2314 },
-	{ HP_POP(intif->pMailSend), HP_POP2(HP_intif_pMailSend), 2316 },
-	{ HP_POP(intif->pAuctionResults), HP_POP2(HP_intif_pAuctionResults), 2318 },
-	{ HP_POP(intif->pAuctionRegister), HP_POP2(HP_intif_pAuctionRegister), 2320 },
-	{ HP_POP(intif->pAuctionCancel), HP_POP2(HP_intif_pAuctionCancel), 2322 },
-	{ HP_POP(intif->pAuctionClose), HP_POP2(HP_intif_pAuctionClose), 2324 },
-	{ HP_POP(intif->pAuctionMessage), HP_POP2(HP_intif_pAuctionMessage), 2326 },
-	{ HP_POP(intif->pAuctionBid), HP_POP2(HP_intif_pAuctionBid), 2328 },
-	{ HP_POP(intif->pMercenaryReceived), HP_POP2(HP_intif_pMercenaryReceived), 2330 },
-	{ HP_POP(intif->pMercenaryDeleted), HP_POP2(HP_intif_pMercenaryDeleted), 2332 },
-	{ HP_POP(intif->pMercenarySaved), HP_POP2(HP_intif_pMercenarySaved), 2334 },
-	{ HP_POP(intif->pElementalReceived), HP_POP2(HP_intif_pElementalReceived), 2336 },
-	{ HP_POP(intif->pElementalDeleted), HP_POP2(HP_intif_pElementalDeleted), 2338 },
-	{ HP_POP(intif->pElementalSaved), HP_POP2(HP_intif_pElementalSaved), 2340 },
-	{ HP_POP(intif->pCreatePet), HP_POP2(HP_intif_pCreatePet), 2342 },
-	{ HP_POP(intif->pRecvPetData), HP_POP2(HP_intif_pRecvPetData), 2344 },
-	{ HP_POP(intif->pSavePetOk), HP_POP2(HP_intif_pSavePetOk), 2346 },
-	{ HP_POP(intif->pDeletePetOk), HP_POP2(HP_intif_pDeletePetOk), 2348 },
-	{ HP_POP(intif->pCreateHomunculus), HP_POP2(HP_intif_pCreateHomunculus), 2350 },
-	{ HP_POP(intif->pRecvHomunculusData), HP_POP2(HP_intif_pRecvHomunculusData), 2352 },
-	{ HP_POP(intif->pSaveHomunculusOk), HP_POP2(HP_intif_pSaveHomunculusOk), 2354 },
-	{ HP_POP(intif->pDeleteHomunculusOk), HP_POP2(HP_intif_pDeleteHomunculusOk), 2356 },
+	{ HP_POP(intif->parse), HP_POP2(HP_intif_parse), 2114 },
+	{ HP_POP(intif->create_pet), HP_POP2(HP_intif_create_pet), 2116 },
+	{ HP_POP(intif->broadcast), HP_POP2(HP_intif_broadcast), 2118 },
+	{ HP_POP(intif->broadcast2), HP_POP2(HP_intif_broadcast2), 2120 },
+	{ HP_POP(intif->main_message), HP_POP2(HP_intif_main_message), 2122 },
+	{ HP_POP(intif->wis_message), HP_POP2(HP_intif_wis_message), 2124 },
+	{ HP_POP(intif->wis_message_to_gm), HP_POP2(HP_intif_wis_message_to_gm), 2126 },
+	{ HP_POP(intif->saveregistry), HP_POP2(HP_intif_saveregistry), 2128 },
+	{ HP_POP(intif->request_registry), HP_POP2(HP_intif_request_registry), 2130 },
+	{ HP_POP(intif->request_guild_storage), HP_POP2(HP_intif_request_guild_storage), 2132 },
+	{ HP_POP(intif->send_guild_storage), HP_POP2(HP_intif_send_guild_storage), 2134 },
+	{ HP_POP(intif->create_party), HP_POP2(HP_intif_create_party), 2136 },
+	{ HP_POP(intif->request_partyinfo), HP_POP2(HP_intif_request_partyinfo), 2138 },
+	{ HP_POP(intif->party_addmember), HP_POP2(HP_intif_party_addmember), 2140 },
+	{ HP_POP(intif->party_changeoption), HP_POP2(HP_intif_party_changeoption), 2142 },
+	{ HP_POP(intif->party_leave), HP_POP2(HP_intif_party_leave), 2144 },
+	{ HP_POP(intif->party_changemap), HP_POP2(HP_intif_party_changemap), 2146 },
+	{ HP_POP(intif->break_party), HP_POP2(HP_intif_break_party), 2148 },
+	{ HP_POP(intif->party_message), HP_POP2(HP_intif_party_message), 2150 },
+	{ HP_POP(intif->party_leaderchange), HP_POP2(HP_intif_party_leaderchange), 2152 },
+	{ HP_POP(intif->guild_create), HP_POP2(HP_intif_guild_create), 2154 },
+	{ HP_POP(intif->guild_request_info), HP_POP2(HP_intif_guild_request_info), 2156 },
+	{ HP_POP(intif->guild_addmember), HP_POP2(HP_intif_guild_addmember), 2158 },
+	{ HP_POP(intif->guild_leave), HP_POP2(HP_intif_guild_leave), 2160 },
+	{ HP_POP(intif->guild_memberinfoshort), HP_POP2(HP_intif_guild_memberinfoshort), 2162 },
+	{ HP_POP(intif->guild_break), HP_POP2(HP_intif_guild_break), 2164 },
+	{ HP_POP(intif->guild_message), HP_POP2(HP_intif_guild_message), 2166 },
+	{ HP_POP(intif->guild_change_gm), HP_POP2(HP_intif_guild_change_gm), 2168 },
+	{ HP_POP(intif->guild_change_basicinfo), HP_POP2(HP_intif_guild_change_basicinfo), 2170 },
+	{ HP_POP(intif->guild_change_memberinfo), HP_POP2(HP_intif_guild_change_memberinfo), 2172 },
+	{ HP_POP(intif->guild_position), HP_POP2(HP_intif_guild_position), 2174 },
+	{ HP_POP(intif->guild_skillup), HP_POP2(HP_intif_guild_skillup), 2176 },
+	{ HP_POP(intif->guild_alliance), HP_POP2(HP_intif_guild_alliance), 2178 },
+	{ HP_POP(intif->guild_notice), HP_POP2(HP_intif_guild_notice), 2180 },
+	{ HP_POP(intif->guild_emblem), HP_POP2(HP_intif_guild_emblem), 2182 },
+	{ HP_POP(intif->guild_castle_dataload), HP_POP2(HP_intif_guild_castle_dataload), 2184 },
+	{ HP_POP(intif->guild_castle_datasave), HP_POP2(HP_intif_guild_castle_datasave), 2186 },
+	{ HP_POP(intif->request_petdata), HP_POP2(HP_intif_request_petdata), 2188 },
+	{ HP_POP(intif->save_petdata), HP_POP2(HP_intif_save_petdata), 2190 },
+	{ HP_POP(intif->delete_petdata), HP_POP2(HP_intif_delete_petdata), 2192 },
+	{ HP_POP(intif->rename), HP_POP2(HP_intif_rename), 2194 },
+	{ HP_POP(intif->homunculus_create), HP_POP2(HP_intif_homunculus_create), 2196 },
+	{ HP_POP(intif->homunculus_requestload), HP_POP2(HP_intif_homunculus_requestload), 2198 },
+	{ HP_POP(intif->homunculus_requestsave), HP_POP2(HP_intif_homunculus_requestsave), 2200 },
+	{ HP_POP(intif->homunculus_requestdelete), HP_POP2(HP_intif_homunculus_requestdelete), 2202 },
+	{ HP_POP(intif->request_questlog), HP_POP2(HP_intif_request_questlog), 2204 },
+	{ HP_POP(intif->quest_save), HP_POP2(HP_intif_quest_save), 2206 },
+	{ HP_POP(intif->mercenary_create), HP_POP2(HP_intif_mercenary_create), 2208 },
+	{ HP_POP(intif->mercenary_request), HP_POP2(HP_intif_mercenary_request), 2210 },
+	{ HP_POP(intif->mercenary_delete), HP_POP2(HP_intif_mercenary_delete), 2212 },
+	{ HP_POP(intif->mercenary_save), HP_POP2(HP_intif_mercenary_save), 2214 },
+	{ HP_POP(intif->Mail_requestinbox), HP_POP2(HP_intif_Mail_requestinbox), 2216 },
+	{ HP_POP(intif->Mail_read), HP_POP2(HP_intif_Mail_read), 2218 },
+	{ HP_POP(intif->Mail_getattach), HP_POP2(HP_intif_Mail_getattach), 2220 },
+	{ HP_POP(intif->Mail_delete), HP_POP2(HP_intif_Mail_delete), 2222 },
+	{ HP_POP(intif->Mail_return), HP_POP2(HP_intif_Mail_return), 2224 },
+	{ HP_POP(intif->Mail_send), HP_POP2(HP_intif_Mail_send), 2226 },
+	{ HP_POP(intif->Auction_requestlist), HP_POP2(HP_intif_Auction_requestlist), 2228 },
+	{ HP_POP(intif->Auction_register), HP_POP2(HP_intif_Auction_register), 2230 },
+	{ HP_POP(intif->Auction_cancel), HP_POP2(HP_intif_Auction_cancel), 2232 },
+	{ HP_POP(intif->Auction_close), HP_POP2(HP_intif_Auction_close), 2234 },
+	{ HP_POP(intif->Auction_bid), HP_POP2(HP_intif_Auction_bid), 2236 },
+	{ HP_POP(intif->elemental_create), HP_POP2(HP_intif_elemental_create), 2238 },
+	{ HP_POP(intif->elemental_request), HP_POP2(HP_intif_elemental_request), 2240 },
+	{ HP_POP(intif->elemental_delete), HP_POP2(HP_intif_elemental_delete), 2242 },
+	{ HP_POP(intif->elemental_save), HP_POP2(HP_intif_elemental_save), 2244 },
+	{ HP_POP(intif->request_accinfo), HP_POP2(HP_intif_request_accinfo), 2246 },
+	{ HP_POP(intif->CheckForCharServer), HP_POP2(HP_intif_CheckForCharServer), 2248 },
+	{ HP_POP(intif->pWisMessage), HP_POP2(HP_intif_pWisMessage), 2250 },
+	{ HP_POP(intif->pWisEnd), HP_POP2(HP_intif_pWisEnd), 2252 },
+	{ HP_POP(intif->pWisToGM_sub), HP_POP2(HP_intif_pWisToGM_sub), 2254 },
+	{ HP_POP(intif->pWisToGM), HP_POP2(HP_intif_pWisToGM), 2256 },
+	{ HP_POP(intif->pRegisters), HP_POP2(HP_intif_pRegisters), 2258 },
+	{ HP_POP(intif->pChangeNameOk), HP_POP2(HP_intif_pChangeNameOk), 2260 },
+	{ HP_POP(intif->pMessageToFD), HP_POP2(HP_intif_pMessageToFD), 2262 },
+	{ HP_POP(intif->pLoadGuildStorage), HP_POP2(HP_intif_pLoadGuildStorage), 2264 },
+	{ HP_POP(intif->pSaveGuildStorage), HP_POP2(HP_intif_pSaveGuildStorage), 2266 },
+	{ HP_POP(intif->pPartyCreated), HP_POP2(HP_intif_pPartyCreated), 2268 },
+	{ HP_POP(intif->pPartyInfo), HP_POP2(HP_intif_pPartyInfo), 2270 },
+	{ HP_POP(intif->pPartyMemberAdded), HP_POP2(HP_intif_pPartyMemberAdded), 2272 },
+	{ HP_POP(intif->pPartyOptionChanged), HP_POP2(HP_intif_pPartyOptionChanged), 2274 },
+	{ HP_POP(intif->pPartyMemberWithdraw), HP_POP2(HP_intif_pPartyMemberWithdraw), 2276 },
+	{ HP_POP(intif->pPartyMove), HP_POP2(HP_intif_pPartyMove), 2278 },
+	{ HP_POP(intif->pPartyBroken), HP_POP2(HP_intif_pPartyBroken), 2280 },
+	{ HP_POP(intif->pPartyMessage), HP_POP2(HP_intif_pPartyMessage), 2282 },
+	{ HP_POP(intif->pGuildCreated), HP_POP2(HP_intif_pGuildCreated), 2284 },
+	{ HP_POP(intif->pGuildInfo), HP_POP2(HP_intif_pGuildInfo), 2286 },
+	{ HP_POP(intif->pGuildMemberAdded), HP_POP2(HP_intif_pGuildMemberAdded), 2288 },
+	{ HP_POP(intif->pGuildMemberWithdraw), HP_POP2(HP_intif_pGuildMemberWithdraw), 2290 },
+	{ HP_POP(intif->pGuildMemberInfoShort), HP_POP2(HP_intif_pGuildMemberInfoShort), 2292 },
+	{ HP_POP(intif->pGuildBroken), HP_POP2(HP_intif_pGuildBroken), 2294 },
+	{ HP_POP(intif->pGuildMessage), HP_POP2(HP_intif_pGuildMessage), 2296 },
+	{ HP_POP(intif->pGuildBasicInfoChanged), HP_POP2(HP_intif_pGuildBasicInfoChanged), 2298 },
+	{ HP_POP(intif->pGuildMemberInfoChanged), HP_POP2(HP_intif_pGuildMemberInfoChanged), 2300 },
+	{ HP_POP(intif->pGuildPosition), HP_POP2(HP_intif_pGuildPosition), 2302 },
+	{ HP_POP(intif->pGuildSkillUp), HP_POP2(HP_intif_pGuildSkillUp), 2304 },
+	{ HP_POP(intif->pGuildAlliance), HP_POP2(HP_intif_pGuildAlliance), 2306 },
+	{ HP_POP(intif->pGuildNotice), HP_POP2(HP_intif_pGuildNotice), 2308 },
+	{ HP_POP(intif->pGuildEmblem), HP_POP2(HP_intif_pGuildEmblem), 2310 },
+	{ HP_POP(intif->pGuildCastleDataLoad), HP_POP2(HP_intif_pGuildCastleDataLoad), 2312 },
+	{ HP_POP(intif->pGuildMasterChanged), HP_POP2(HP_intif_pGuildMasterChanged), 2314 },
+	{ HP_POP(intif->pQuestLog), HP_POP2(HP_intif_pQuestLog), 2316 },
+	{ HP_POP(intif->pQuestSave), HP_POP2(HP_intif_pQuestSave), 2318 },
+	{ HP_POP(intif->pMailInboxReceived), HP_POP2(HP_intif_pMailInboxReceived), 2320 },
+	{ HP_POP(intif->pMailNew), HP_POP2(HP_intif_pMailNew), 2322 },
+	{ HP_POP(intif->pMailGetAttach), HP_POP2(HP_intif_pMailGetAttach), 2324 },
+	{ HP_POP(intif->pMailDelete), HP_POP2(HP_intif_pMailDelete), 2326 },
+	{ HP_POP(intif->pMailReturn), HP_POP2(HP_intif_pMailReturn), 2328 },
+	{ HP_POP(intif->pMailSend), HP_POP2(HP_intif_pMailSend), 2330 },
+	{ HP_POP(intif->pAuctionResults), HP_POP2(HP_intif_pAuctionResults), 2332 },
+	{ HP_POP(intif->pAuctionRegister), HP_POP2(HP_intif_pAuctionRegister), 2334 },
+	{ HP_POP(intif->pAuctionCancel), HP_POP2(HP_intif_pAuctionCancel), 2336 },
+	{ HP_POP(intif->pAuctionClose), HP_POP2(HP_intif_pAuctionClose), 2338 },
+	{ HP_POP(intif->pAuctionMessage), HP_POP2(HP_intif_pAuctionMessage), 2340 },
+	{ HP_POP(intif->pAuctionBid), HP_POP2(HP_intif_pAuctionBid), 2342 },
+	{ HP_POP(intif->pMercenaryReceived), HP_POP2(HP_intif_pMercenaryReceived), 2344 },
+	{ HP_POP(intif->pMercenaryDeleted), HP_POP2(HP_intif_pMercenaryDeleted), 2346 },
+	{ HP_POP(intif->pMercenarySaved), HP_POP2(HP_intif_pMercenarySaved), 2348 },
+	{ HP_POP(intif->pElementalReceived), HP_POP2(HP_intif_pElementalReceived), 2350 },
+	{ HP_POP(intif->pElementalDeleted), HP_POP2(HP_intif_pElementalDeleted), 2352 },
+	{ HP_POP(intif->pElementalSaved), HP_POP2(HP_intif_pElementalSaved), 2354 },
+	{ HP_POP(intif->pCreatePet), HP_POP2(HP_intif_pCreatePet), 2356 },
+	{ HP_POP(intif->pRecvPetData), HP_POP2(HP_intif_pRecvPetData), 2358 },
+	{ HP_POP(intif->pSavePetOk), HP_POP2(HP_intif_pSavePetOk), 2360 },
+	{ HP_POP(intif->pDeletePetOk), HP_POP2(HP_intif_pDeletePetOk), 2362 },
+	{ HP_POP(intif->pCreateHomunculus), HP_POP2(HP_intif_pCreateHomunculus), 2364 },
+	{ HP_POP(intif->pRecvHomunculusData), HP_POP2(HP_intif_pRecvHomunculusData), 2366 },
+	{ HP_POP(intif->pSaveHomunculusOk), HP_POP2(HP_intif_pSaveHomunculusOk), 2368 },
+	{ HP_POP(intif->pDeleteHomunculusOk), HP_POP2(HP_intif_pDeleteHomunculusOk), 2370 },
 /* ircbot */
-	{ HP_POP(ircbot->init), HP_POP2(HP_ircbot_init), 2358 },
-	{ HP_POP(ircbot->final), HP_POP2(HP_ircbot_final), 2360 },
-	{ HP_POP(ircbot->parse), HP_POP2(HP_ircbot_parse), 2362 },
-	{ HP_POP(ircbot->parse_sub), HP_POP2(HP_ircbot_parse_sub), 2364 },
-	{ HP_POP(ircbot->parse_source), HP_POP2(HP_ircbot_parse_source), 2366 },
-	{ HP_POP(ircbot->func_search), HP_POP2(HP_ircbot_func_search), 2368 },
-	{ HP_POP(ircbot->connect_timer), HP_POP2(HP_ircbot_connect_timer), 2370 },
-	{ HP_POP(ircbot->identify_timer), HP_POP2(HP_ircbot_identify_timer), 2372 },
-	{ HP_POP(ircbot->join_timer), HP_POP2(HP_ircbot_join_timer), 2374 },
-	{ HP_POP(ircbot->send), HP_POP2(HP_ircbot_send), 2376 },
-	{ HP_POP(ircbot->relay), HP_POP2(HP_ircbot_relay), 2378 },
-	{ HP_POP(ircbot->pong), HP_POP2(HP_ircbot_pong), 2380 },
-	{ HP_POP(ircbot->privmsg), HP_POP2(HP_ircbot_privmsg), 2382 },
-	{ HP_POP(ircbot->userjoin), HP_POP2(HP_ircbot_userjoin), 2384 },
-	{ HP_POP(ircbot->userleave), HP_POP2(HP_ircbot_userleave), 2386 },
-	{ HP_POP(ircbot->usernick), HP_POP2(HP_ircbot_usernick), 2388 },
+	{ HP_POP(ircbot->init), HP_POP2(HP_ircbot_init), 2372 },
+	{ HP_POP(ircbot->final), HP_POP2(HP_ircbot_final), 2374 },
+	{ HP_POP(ircbot->parse), HP_POP2(HP_ircbot_parse), 2376 },
+	{ HP_POP(ircbot->parse_sub), HP_POP2(HP_ircbot_parse_sub), 2378 },
+	{ HP_POP(ircbot->parse_source), HP_POP2(HP_ircbot_parse_source), 2380 },
+	{ HP_POP(ircbot->func_search), HP_POP2(HP_ircbot_func_search), 2382 },
+	{ HP_POP(ircbot->connect_timer), HP_POP2(HP_ircbot_connect_timer), 2384 },
+	{ HP_POP(ircbot->identify_timer), HP_POP2(HP_ircbot_identify_timer), 2386 },
+	{ HP_POP(ircbot->join_timer), HP_POP2(HP_ircbot_join_timer), 2388 },
+	{ HP_POP(ircbot->send), HP_POP2(HP_ircbot_send), 2390 },
+	{ HP_POP(ircbot->relay), HP_POP2(HP_ircbot_relay), 2392 },
+	{ HP_POP(ircbot->pong), HP_POP2(HP_ircbot_pong), 2394 },
+	{ HP_POP(ircbot->privmsg), HP_POP2(HP_ircbot_privmsg), 2396 },
+	{ HP_POP(ircbot->userjoin), HP_POP2(HP_ircbot_userjoin), 2398 },
+	{ HP_POP(ircbot->userleave), HP_POP2(HP_ircbot_userleave), 2400 },
+	{ HP_POP(ircbot->usernick), HP_POP2(HP_ircbot_usernick), 2402 },
 /* itemdb */
-	{ HP_POP(itemdb->init), HP_POP2(HP_itemdb_init), 2390 },
-	{ HP_POP(itemdb->final), HP_POP2(HP_itemdb_final), 2392 },
-	{ HP_POP(itemdb->reload), HP_POP2(HP_itemdb_reload), 2394 },
-	{ HP_POP(itemdb->name_constants), HP_POP2(HP_itemdb_name_constants), 2396 },
-	{ HP_POP(itemdb->force_name_constants), HP_POP2(HP_itemdb_force_name_constants), 2398 },
-	{ HP_POP(itemdb->read_groups), HP_POP2(HP_itemdb_read_groups), 2400 },
-	{ HP_POP(itemdb->read_chains), HP_POP2(HP_itemdb_read_chains), 2402 },
-	{ HP_POP(itemdb->read_packages), HP_POP2(HP_itemdb_read_packages), 2404 },
-	{ HP_POP(itemdb->write_cached_packages), HP_POP2(HP_itemdb_write_cached_packages), 2406 },
-	{ HP_POP(itemdb->read_cached_packages), HP_POP2(HP_itemdb_read_cached_packages), 2408 },
-	{ HP_POP(itemdb->name2id), HP_POP2(HP_itemdb_name2id), 2410 },
-	{ HP_POP(itemdb->search_name), HP_POP2(HP_itemdb_search_name), 2412 },
-	{ HP_POP(itemdb->search_name_array), HP_POP2(HP_itemdb_search_name_array), 2414 },
-	{ HP_POP(itemdb->load), HP_POP2(HP_itemdb_load), 2416 },
-	{ HP_POP(itemdb->search), HP_POP2(HP_itemdb_search), 2418 },
-	{ HP_POP(itemdb->parse_dbrow), HP_POP2(HP_itemdb_parse_dbrow), 2420 },
-	{ HP_POP(itemdb->exists), HP_POP2(HP_itemdb_exists), 2422 },
-	{ HP_POP(itemdb->in_group), HP_POP2(HP_itemdb_in_group), 2424 },
-	{ HP_POP(itemdb->group_item), HP_POP2(HP_itemdb_group_item), 2426 },
-	{ HP_POP(itemdb->chain_item), HP_POP2(HP_itemdb_chain_item), 2428 },
-	{ HP_POP(itemdb->package_item), HP_POP2(HP_itemdb_package_item), 2430 },
-	{ HP_POP(itemdb->searchname_sub), HP_POP2(HP_itemdb_searchname_sub), 2432 },
-	{ HP_POP(itemdb->searchname_array_sub), HP_POP2(HP_itemdb_searchname_array_sub), 2434 },
-	{ HP_POP(itemdb->searchrandomid), HP_POP2(HP_itemdb_searchrandomid), 2436 },
-	{ HP_POP(itemdb->typename), HP_POP2(HP_itemdb_typename), 2438 },
-	{ HP_POP(itemdb->jobid2mapid), HP_POP2(HP_itemdb_jobid2mapid), 2440 },
-	{ HP_POP(itemdb->create_dummy_data), HP_POP2(HP_itemdb_create_dummy_data), 2442 },
-	{ HP_POP(itemdb->create_item_data), HP_POP2(HP_itemdb_create_item_data), 2444 },
-	{ HP_POP(itemdb->isequip), HP_POP2(HP_itemdb_isequip), 2446 },
-	{ HP_POP(itemdb->isequip2), HP_POP2(HP_itemdb_isequip2), 2448 },
-	{ HP_POP(itemdb->isstackable), HP_POP2(HP_itemdb_isstackable), 2450 },
-	{ HP_POP(itemdb->isstackable2), HP_POP2(HP_itemdb_isstackable2), 2452 },
-	{ HP_POP(itemdb->isdropable_sub), HP_POP2(HP_itemdb_isdropable_sub), 2454 },
-	{ HP_POP(itemdb->cantrade_sub), HP_POP2(HP_itemdb_cantrade_sub), 2456 },
-	{ HP_POP(itemdb->canpartnertrade_sub), HP_POP2(HP_itemdb_canpartnertrade_sub), 2458 },
-	{ HP_POP(itemdb->cansell_sub), HP_POP2(HP_itemdb_cansell_sub), 2460 },
-	{ HP_POP(itemdb->cancartstore_sub), HP_POP2(HP_itemdb_cancartstore_sub), 2462 },
-	{ HP_POP(itemdb->canstore_sub), HP_POP2(HP_itemdb_canstore_sub), 2464 },
-	{ HP_POP(itemdb->canguildstore_sub), HP_POP2(HP_itemdb_canguildstore_sub), 2466 },
-	{ HP_POP(itemdb->canmail_sub), HP_POP2(HP_itemdb_canmail_sub), 2468 },
-	{ HP_POP(itemdb->canauction_sub), HP_POP2(HP_itemdb_canauction_sub), 2470 },
-	{ HP_POP(itemdb->isrestricted), HP_POP2(HP_itemdb_isrestricted), 2472 },
-	{ HP_POP(itemdb->isidentified), HP_POP2(HP_itemdb_isidentified), 2474 },
-	{ HP_POP(itemdb->isidentified2), HP_POP2(HP_itemdb_isidentified2), 2476 },
-	{ HP_POP(itemdb->read_itemavail), HP_POP2(HP_itemdb_read_itemavail), 2478 },
-	{ HP_POP(itemdb->read_itemtrade), HP_POP2(HP_itemdb_read_itemtrade), 2480 },
-	{ HP_POP(itemdb->read_itemdelay), HP_POP2(HP_itemdb_read_itemdelay), 2482 },
-	{ HP_POP(itemdb->read_stack), HP_POP2(HP_itemdb_read_stack), 2484 },
-	{ HP_POP(itemdb->read_buyingstore), HP_POP2(HP_itemdb_read_buyingstore), 2486 },
-	{ HP_POP(itemdb->read_nouse), HP_POP2(HP_itemdb_read_nouse), 2488 },
-	{ HP_POP(itemdb->combo_split_atoi), HP_POP2(HP_itemdb_combo_split_atoi), 2490 },
-	{ HP_POP(itemdb->read_combos), HP_POP2(HP_itemdb_read_combos), 2492 },
-	{ HP_POP(itemdb->gendercheck), HP_POP2(HP_itemdb_gendercheck), 2494 },
-	{ HP_POP(itemdb->re_split_atoi), HP_POP2(HP_itemdb_re_split_atoi), 2496 },
-	{ HP_POP(itemdb->readdb), HP_POP2(HP_itemdb_readdb), 2498 },
-	{ HP_POP(itemdb->read_sqldb), HP_POP2(HP_itemdb_read_sqldb), 2500 },
-	{ HP_POP(itemdb->unique_id), HP_POP2(HP_itemdb_unique_id), 2502 },
-	{ HP_POP(itemdb->uid_load), HP_POP2(HP_itemdb_uid_load), 2504 },
-	{ HP_POP(itemdb->read), HP_POP2(HP_itemdb_read), 2506 },
-	{ HP_POP(itemdb->destroy_item_data), HP_POP2(HP_itemdb_destroy_item_data), 2508 },
-	{ HP_POP(itemdb->final_sub), HP_POP2(HP_itemdb_final_sub), 2510 },
+	{ HP_POP(itemdb->init), HP_POP2(HP_itemdb_init), 2404 },
+	{ HP_POP(itemdb->final), HP_POP2(HP_itemdb_final), 2406 },
+	{ HP_POP(itemdb->reload), HP_POP2(HP_itemdb_reload), 2408 },
+	{ HP_POP(itemdb->name_constants), HP_POP2(HP_itemdb_name_constants), 2410 },
+	{ HP_POP(itemdb->force_name_constants), HP_POP2(HP_itemdb_force_name_constants), 2412 },
+	{ HP_POP(itemdb->read_groups), HP_POP2(HP_itemdb_read_groups), 2414 },
+	{ HP_POP(itemdb->read_chains), HP_POP2(HP_itemdb_read_chains), 2416 },
+	{ HP_POP(itemdb->read_packages), HP_POP2(HP_itemdb_read_packages), 2418 },
+	{ HP_POP(itemdb->write_cached_packages), HP_POP2(HP_itemdb_write_cached_packages), 2420 },
+	{ HP_POP(itemdb->read_cached_packages), HP_POP2(HP_itemdb_read_cached_packages), 2422 },
+	{ HP_POP(itemdb->name2id), HP_POP2(HP_itemdb_name2id), 2424 },
+	{ HP_POP(itemdb->search_name), HP_POP2(HP_itemdb_search_name), 2426 },
+	{ HP_POP(itemdb->search_name_array), HP_POP2(HP_itemdb_search_name_array), 2428 },
+	{ HP_POP(itemdb->load), HP_POP2(HP_itemdb_load), 2430 },
+	{ HP_POP(itemdb->search), HP_POP2(HP_itemdb_search), 2432 },
+	{ HP_POP(itemdb->parse_dbrow), HP_POP2(HP_itemdb_parse_dbrow), 2434 },
+	{ HP_POP(itemdb->exists), HP_POP2(HP_itemdb_exists), 2436 },
+	{ HP_POP(itemdb->in_group), HP_POP2(HP_itemdb_in_group), 2438 },
+	{ HP_POP(itemdb->group_item), HP_POP2(HP_itemdb_group_item), 2440 },
+	{ HP_POP(itemdb->chain_item), HP_POP2(HP_itemdb_chain_item), 2442 },
+	{ HP_POP(itemdb->package_item), HP_POP2(HP_itemdb_package_item), 2444 },
+	{ HP_POP(itemdb->searchname_sub), HP_POP2(HP_itemdb_searchname_sub), 2446 },
+	{ HP_POP(itemdb->searchname_array_sub), HP_POP2(HP_itemdb_searchname_array_sub), 2448 },
+	{ HP_POP(itemdb->searchrandomid), HP_POP2(HP_itemdb_searchrandomid), 2450 },
+	{ HP_POP(itemdb->typename), HP_POP2(HP_itemdb_typename), 2452 },
+	{ HP_POP(itemdb->jobid2mapid), HP_POP2(HP_itemdb_jobid2mapid), 2454 },
+	{ HP_POP(itemdb->create_dummy_data), HP_POP2(HP_itemdb_create_dummy_data), 2456 },
+	{ HP_POP(itemdb->create_item_data), HP_POP2(HP_itemdb_create_item_data), 2458 },
+	{ HP_POP(itemdb->isequip), HP_POP2(HP_itemdb_isequip), 2460 },
+	{ HP_POP(itemdb->isequip2), HP_POP2(HP_itemdb_isequip2), 2462 },
+	{ HP_POP(itemdb->isstackable), HP_POP2(HP_itemdb_isstackable), 2464 },
+	{ HP_POP(itemdb->isstackable2), HP_POP2(HP_itemdb_isstackable2), 2466 },
+	{ HP_POP(itemdb->isdropable_sub), HP_POP2(HP_itemdb_isdropable_sub), 2468 },
+	{ HP_POP(itemdb->cantrade_sub), HP_POP2(HP_itemdb_cantrade_sub), 2470 },
+	{ HP_POP(itemdb->canpartnertrade_sub), HP_POP2(HP_itemdb_canpartnertrade_sub), 2472 },
+	{ HP_POP(itemdb->cansell_sub), HP_POP2(HP_itemdb_cansell_sub), 2474 },
+	{ HP_POP(itemdb->cancartstore_sub), HP_POP2(HP_itemdb_cancartstore_sub), 2476 },
+	{ HP_POP(itemdb->canstore_sub), HP_POP2(HP_itemdb_canstore_sub), 2478 },
+	{ HP_POP(itemdb->canguildstore_sub), HP_POP2(HP_itemdb_canguildstore_sub), 2480 },
+	{ HP_POP(itemdb->canmail_sub), HP_POP2(HP_itemdb_canmail_sub), 2482 },
+	{ HP_POP(itemdb->canauction_sub), HP_POP2(HP_itemdb_canauction_sub), 2484 },
+	{ HP_POP(itemdb->isrestricted), HP_POP2(HP_itemdb_isrestricted), 2486 },
+	{ HP_POP(itemdb->isidentified), HP_POP2(HP_itemdb_isidentified), 2488 },
+	{ HP_POP(itemdb->isidentified2), HP_POP2(HP_itemdb_isidentified2), 2490 },
+	{ HP_POP(itemdb->read_itemavail), HP_POP2(HP_itemdb_read_itemavail), 2492 },
+	{ HP_POP(itemdb->read_itemtrade), HP_POP2(HP_itemdb_read_itemtrade), 2494 },
+	{ HP_POP(itemdb->read_itemdelay), HP_POP2(HP_itemdb_read_itemdelay), 2496 },
+	{ HP_POP(itemdb->read_stack), HP_POP2(HP_itemdb_read_stack), 2498 },
+	{ HP_POP(itemdb->read_buyingstore), HP_POP2(HP_itemdb_read_buyingstore), 2500 },
+	{ HP_POP(itemdb->read_nouse), HP_POP2(HP_itemdb_read_nouse), 2502 },
+	{ HP_POP(itemdb->combo_split_atoi), HP_POP2(HP_itemdb_combo_split_atoi), 2504 },
+	{ HP_POP(itemdb->read_combos), HP_POP2(HP_itemdb_read_combos), 2506 },
+	{ HP_POP(itemdb->gendercheck), HP_POP2(HP_itemdb_gendercheck), 2508 },
+	{ HP_POP(itemdb->re_split_atoi), HP_POP2(HP_itemdb_re_split_atoi), 2510 },
+	{ HP_POP(itemdb->readdb), HP_POP2(HP_itemdb_readdb), 2512 },
+	{ HP_POP(itemdb->read_sqldb), HP_POP2(HP_itemdb_read_sqldb), 2514 },
+	{ HP_POP(itemdb->unique_id), HP_POP2(HP_itemdb_unique_id), 2516 },
+	{ HP_POP(itemdb->uid_load), HP_POP2(HP_itemdb_uid_load), 2518 },
+	{ HP_POP(itemdb->read), HP_POP2(HP_itemdb_read), 2520 },
+	{ HP_POP(itemdb->destroy_item_data), HP_POP2(HP_itemdb_destroy_item_data), 2522 },
+	{ HP_POP(itemdb->final_sub), HP_POP2(HP_itemdb_final_sub), 2524 },
 /* logs */
-	{ HP_POP(logs->pick_pc), HP_POP2(HP_logs_pick_pc), 2512 },
-	{ HP_POP(logs->pick_mob), HP_POP2(HP_logs_pick_mob), 2514 },
-	{ HP_POP(logs->zeny), HP_POP2(HP_logs_zeny), 2516 },
-	{ HP_POP(logs->npc), HP_POP2(HP_logs_npc), 2518 },
-	{ HP_POP(logs->chat), HP_POP2(HP_logs_chat), 2520 },
-	{ HP_POP(logs->atcommand), HP_POP2(HP_logs_atcommand), 2522 },
-	{ HP_POP(logs->branch), HP_POP2(HP_logs_branch), 2524 },
-	{ HP_POP(logs->mvpdrop), HP_POP2(HP_logs_mvpdrop), 2526 },
-	{ HP_POP(logs->pick_sub), HP_POP2(HP_logs_pick_sub), 2528 },
-	{ HP_POP(logs->zeny_sub), HP_POP2(HP_logs_zeny_sub), 2530 },
-	{ HP_POP(logs->npc_sub), HP_POP2(HP_logs_npc_sub), 2532 },
-	{ HP_POP(logs->chat_sub), HP_POP2(HP_logs_chat_sub), 2534 },
-	{ HP_POP(logs->atcommand_sub), HP_POP2(HP_logs_atcommand_sub), 2536 },
-	{ HP_POP(logs->branch_sub), HP_POP2(HP_logs_branch_sub), 2538 },
-	{ HP_POP(logs->mvpdrop_sub), HP_POP2(HP_logs_mvpdrop_sub), 2540 },
-	{ HP_POP(logs->config_read), HP_POP2(HP_logs_config_read), 2542 },
-	{ HP_POP(logs->config_done), HP_POP2(HP_logs_config_done), 2544 },
-	{ HP_POP(logs->sql_init), HP_POP2(HP_logs_sql_init), 2546 },
-	{ HP_POP(logs->sql_final), HP_POP2(HP_logs_sql_final), 2548 },
-	{ HP_POP(logs->picktype2char), HP_POP2(HP_logs_picktype2char), 2550 },
-	{ HP_POP(logs->chattype2char), HP_POP2(HP_logs_chattype2char), 2552 },
-	{ HP_POP(logs->should_log_item), HP_POP2(HP_logs_should_log_item), 2554 },
+	{ HP_POP(logs->pick_pc), HP_POP2(HP_logs_pick_pc), 2526 },
+	{ HP_POP(logs->pick_mob), HP_POP2(HP_logs_pick_mob), 2528 },
+	{ HP_POP(logs->zeny), HP_POP2(HP_logs_zeny), 2530 },
+	{ HP_POP(logs->npc), HP_POP2(HP_logs_npc), 2532 },
+	{ HP_POP(logs->chat), HP_POP2(HP_logs_chat), 2534 },
+	{ HP_POP(logs->atcommand), HP_POP2(HP_logs_atcommand), 2536 },
+	{ HP_POP(logs->branch), HP_POP2(HP_logs_branch), 2538 },
+	{ HP_POP(logs->mvpdrop), HP_POP2(HP_logs_mvpdrop), 2540 },
+	{ HP_POP(logs->pick_sub), HP_POP2(HP_logs_pick_sub), 2542 },
+	{ HP_POP(logs->zeny_sub), HP_POP2(HP_logs_zeny_sub), 2544 },
+	{ HP_POP(logs->npc_sub), HP_POP2(HP_logs_npc_sub), 2546 },
+	{ HP_POP(logs->chat_sub), HP_POP2(HP_logs_chat_sub), 2548 },
+	{ HP_POP(logs->atcommand_sub), HP_POP2(HP_logs_atcommand_sub), 2550 },
+	{ HP_POP(logs->branch_sub), HP_POP2(HP_logs_branch_sub), 2552 },
+	{ HP_POP(logs->mvpdrop_sub), HP_POP2(HP_logs_mvpdrop_sub), 2554 },
+	{ HP_POP(logs->config_read), HP_POP2(HP_logs_config_read), 2556 },
+	{ HP_POP(logs->config_done), HP_POP2(HP_logs_config_done), 2558 },
+	{ HP_POP(logs->sql_init), HP_POP2(HP_logs_sql_init), 2560 },
+	{ HP_POP(logs->sql_final), HP_POP2(HP_logs_sql_final), 2562 },
+	{ HP_POP(logs->picktype2char), HP_POP2(HP_logs_picktype2char), 2564 },
+	{ HP_POP(logs->chattype2char), HP_POP2(HP_logs_chattype2char), 2566 },
+	{ HP_POP(logs->should_log_item), HP_POP2(HP_logs_should_log_item), 2568 },
 /* mail */
-	{ HP_POP(mail->clear), HP_POP2(HP_mail_clear), 2556 },
-	{ HP_POP(mail->removeitem), HP_POP2(HP_mail_removeitem), 2558 },
-	{ HP_POP(mail->removezeny), HP_POP2(HP_mail_removezeny), 2560 },
-	{ HP_POP(mail->setitem), HP_POP2(HP_mail_setitem), 2562 },
-	{ HP_POP(mail->setattachment), HP_POP2(HP_mail_setattachment), 2564 },
-	{ HP_POP(mail->getattachment), HP_POP2(HP_mail_getattachment), 2566 },
-	{ HP_POP(mail->openmail), HP_POP2(HP_mail_openmail), 2568 },
-	{ HP_POP(mail->deliveryfail), HP_POP2(HP_mail_deliveryfail), 2570 },
-	{ HP_POP(mail->invalid_operation), HP_POP2(HP_mail_invalid_operation), 2572 },
+	{ HP_POP(mail->clear), HP_POP2(HP_mail_clear), 2570 },
+	{ HP_POP(mail->removeitem), HP_POP2(HP_mail_removeitem), 2572 },
+	{ HP_POP(mail->removezeny), HP_POP2(HP_mail_removezeny), 2574 },
+	{ HP_POP(mail->setitem), HP_POP2(HP_mail_setitem), 2576 },
+	{ HP_POP(mail->setattachment), HP_POP2(HP_mail_setattachment), 2578 },
+	{ HP_POP(mail->getattachment), HP_POP2(HP_mail_getattachment), 2580 },
+	{ HP_POP(mail->openmail), HP_POP2(HP_mail_openmail), 2582 },
+	{ HP_POP(mail->deliveryfail), HP_POP2(HP_mail_deliveryfail), 2584 },
+	{ HP_POP(mail->invalid_operation), HP_POP2(HP_mail_invalid_operation), 2586 },
 /* map */
-	{ HP_POP(map->zone_init), HP_POP2(HP_map_zone_init), 2574 },
-	{ HP_POP(map->zone_remove), HP_POP2(HP_map_zone_remove), 2576 },
-	{ HP_POP(map->zone_apply), HP_POP2(HP_map_zone_apply), 2578 },
-	{ HP_POP(map->zone_change), HP_POP2(HP_map_zone_change), 2580 },
-	{ HP_POP(map->zone_change2), HP_POP2(HP_map_zone_change2), 2582 },
-	{ HP_POP(map->getcell), HP_POP2(HP_map_getcell), 2584 },
-	{ HP_POP(map->setgatcell), HP_POP2(HP_map_setgatcell), 2586 },
-	{ HP_POP(map->cellfromcache), HP_POP2(HP_map_cellfromcache), 2588 },
-	{ HP_POP(map->setusers), HP_POP2(HP_map_setusers), 2590 },
-	{ HP_POP(map->getusers), HP_POP2(HP_map_getusers), 2592 },
-	{ HP_POP(map->usercount), HP_POP2(HP_map_usercount), 2594 },
-	{ HP_POP(map->freeblock), HP_POP2(HP_map_freeblock), 2596 },
-	{ HP_POP(map->freeblock_lock), HP_POP2(HP_map_freeblock_lock), 2598 },
-	{ HP_POP(map->freeblock_unlock), HP_POP2(HP_map_freeblock_unlock), 2600 },
-	{ HP_POP(map->addblock), HP_POP2(HP_map_addblock), 2602 },
-	{ HP_POP(map->delblock), HP_POP2(HP_map_delblock), 2604 },
-	{ HP_POP(map->moveblock), HP_POP2(HP_map_moveblock), 2606 },
-	{ HP_POP(map->count_oncell), HP_POP2(HP_map_count_oncell), 2608 },
-	{ HP_POP(map->find_skill_unit_oncell), HP_POP2(HP_map_find_skill_unit_oncell), 2610 },
-	{ HP_POP(map->get_new_object_id), HP_POP2(HP_map_get_new_object_id), 2612 },
-	{ HP_POP(map->search_freecell), HP_POP2(HP_map_search_freecell), 2614 },
-	{ HP_POP(map->quit), HP_POP2(HP_map_quit), 2616 },
-	{ HP_POP(map->addnpc), HP_POP2(HP_map_addnpc), 2618 },
-	{ HP_POP(map->clearflooritem_timer), HP_POP2(HP_map_clearflooritem_timer), 2620 },
-	{ HP_POP(map->removemobs_timer), HP_POP2(HP_map_removemobs_timer), 2622 },
-	{ HP_POP(map->clearflooritem), HP_POP2(HP_map_clearflooritem), 2624 },
-	{ HP_POP(map->addflooritem), HP_POP2(HP_map_addflooritem), 2626 },
-	{ HP_POP(map->addnickdb), HP_POP2(HP_map_addnickdb), 2628 },
-	{ HP_POP(map->delnickdb), HP_POP2(HP_map_delnickdb), 2630 },
-	{ HP_POP(map->reqnickdb), HP_POP2(HP_map_reqnickdb), 2632 },
-	{ HP_POP(map->charid2nick), HP_POP2(HP_map_charid2nick), 2634 },
-	{ HP_POP(map->charid2sd), HP_POP2(HP_map_charid2sd), 2636 },
-	{ HP_POP(map->vforeachpc), HP_POP2(HP_map_vforeachpc), 2638 },
-	{ HP_POP(map->vforeachmob), HP_POP2(HP_map_vforeachmob), 2640 },
-	{ HP_POP(map->vforeachnpc), HP_POP2(HP_map_vforeachnpc), 2642 },
-	{ HP_POP(map->vforeachregen), HP_POP2(HP_map_vforeachregen), 2644 },
-	{ HP_POP(map->vforeachiddb), HP_POP2(HP_map_vforeachiddb), 2646 },
-	{ HP_POP(map->vforeachinrange), HP_POP2(HP_map_vforeachinrange), 2648 },
-	{ HP_POP(map->vforeachinshootrange), HP_POP2(HP_map_vforeachinshootrange), 2650 },
-	{ HP_POP(map->vforeachinarea), HP_POP2(HP_map_vforeachinarea), 2652 },
-	{ HP_POP(map->vforcountinrange), HP_POP2(HP_map_vforcountinrange), 2654 },
-	{ HP_POP(map->vforcountinarea), HP_POP2(HP_map_vforcountinarea), 2656 },
-	{ HP_POP(map->vforeachinmovearea), HP_POP2(HP_map_vforeachinmovearea), 2658 },
-	{ HP_POP(map->vforeachincell), HP_POP2(HP_map_vforeachincell), 2660 },
-	{ HP_POP(map->vforeachinpath), HP_POP2(HP_map_vforeachinpath), 2662 },
-	{ HP_POP(map->vforeachinmap), HP_POP2(HP_map_vforeachinmap), 2664 },
-	{ HP_POP(map->vforeachininstance), HP_POP2(HP_map_vforeachininstance), 2666 },
-	{ HP_POP(map->id2sd), HP_POP2(HP_map_id2sd), 2668 },
-	{ HP_POP(map->id2md), HP_POP2(HP_map_id2md), 2670 },
-	{ HP_POP(map->id2nd), HP_POP2(HP_map_id2nd), 2672 },
-	{ HP_POP(map->id2hd), HP_POP2(HP_map_id2hd), 2674 },
-	{ HP_POP(map->id2mc), HP_POP2(HP_map_id2mc), 2676 },
-	{ HP_POP(map->id2cd), HP_POP2(HP_map_id2cd), 2678 },
-	{ HP_POP(map->id2bl), HP_POP2(HP_map_id2bl), 2680 },
-	{ HP_POP(map->blid_exists), HP_POP2(HP_map_blid_exists), 2682 },
-	{ HP_POP(map->mapindex2mapid), HP_POP2(HP_map_mapindex2mapid), 2684 },
-	{ HP_POP(map->mapname2mapid), HP_POP2(HP_map_mapname2mapid), 2686 },
-	{ HP_POP(map->mapname2ipport), HP_POP2(HP_map_mapname2ipport), 2688 },
-	{ HP_POP(map->setipport), HP_POP2(HP_map_setipport), 2690 },
-	{ HP_POP(map->eraseipport), HP_POP2(HP_map_eraseipport), 2692 },
-	{ HP_POP(map->eraseallipport), HP_POP2(HP_map_eraseallipport), 2694 },
-	{ HP_POP(map->addiddb), HP_POP2(HP_map_addiddb), 2696 },
-	{ HP_POP(map->deliddb), HP_POP2(HP_map_deliddb), 2698 },
-	{ HP_POP(map->nick2sd), HP_POP2(HP_map_nick2sd), 2700 },
-	{ HP_POP(map->getmob_boss), HP_POP2(HP_map_getmob_boss), 2702 },
-	{ HP_POP(map->id2boss), HP_POP2(HP_map_id2boss), 2704 },
-	{ HP_POP(map->reloadnpc), HP_POP2(HP_map_reloadnpc), 2706 },
-	{ HP_POP(map->check_dir), HP_POP2(HP_map_check_dir), 2708 },
-	{ HP_POP(map->calc_dir), HP_POP2(HP_map_calc_dir), 2710 },
-	{ HP_POP(map->random_dir), HP_POP2(HP_map_random_dir), 2712 },
-	{ HP_POP(map->cleanup_sub), HP_POP2(HP_map_cleanup_sub), 2714 },
-	{ HP_POP(map->delmap), HP_POP2(HP_map_delmap), 2716 },
-	{ HP_POP(map->flags_init), HP_POP2(HP_map_flags_init), 2718 },
-	{ HP_POP(map->iwall_set), HP_POP2(HP_map_iwall_set), 2720 },
-	{ HP_POP(map->iwall_get), HP_POP2(HP_map_iwall_get), 2722 },
-	{ HP_POP(map->iwall_remove), HP_POP2(HP_map_iwall_remove), 2724 },
-	{ HP_POP(map->addmobtolist), HP_POP2(HP_map_addmobtolist), 2726 },
-	{ HP_POP(map->spawnmobs), HP_POP2(HP_map_spawnmobs), 2728 },
-	{ HP_POP(map->removemobs), HP_POP2(HP_map_removemobs), 2730 },
-	{ HP_POP(map->addmap2db), HP_POP2(HP_map_addmap2db), 2732 },
-	{ HP_POP(map->removemapdb), HP_POP2(HP_map_removemapdb), 2734 },
-	{ HP_POP(map->clean), HP_POP2(HP_map_clean), 2736 },
-	{ HP_POP(map->do_shutdown), HP_POP2(HP_map_do_shutdown), 2738 },
-	{ HP_POP(map->freeblock_timer), HP_POP2(HP_map_freeblock_timer), 2740 },
-	{ HP_POP(map->searchrandfreecell), HP_POP2(HP_map_searchrandfreecell), 2742 },
-	{ HP_POP(map->count_sub), HP_POP2(HP_map_count_sub), 2744 },
-	{ HP_POP(map->create_charid2nick), HP_POP2(HP_map_create_charid2nick), 2746 },
-	{ HP_POP(map->removemobs_sub), HP_POP2(HP_map_removemobs_sub), 2748 },
-	{ HP_POP(map->gat2cell), HP_POP2(HP_map_gat2cell), 2750 },
-	{ HP_POP(map->cell2gat), HP_POP2(HP_map_cell2gat), 2752 },
-	{ HP_POP(map->getcellp), HP_POP2(HP_map_getcellp), 2754 },
-	{ HP_POP(map->setcell), HP_POP2(HP_map_setcell), 2756 },
-	{ HP_POP(map->sub_getcellp), HP_POP2(HP_map_sub_getcellp), 2758 },
-	{ HP_POP(map->sub_setcell), HP_POP2(HP_map_sub_setcell), 2760 },
-	{ HP_POP(map->iwall_nextxy), HP_POP2(HP_map_iwall_nextxy), 2762 },
-	{ HP_POP(map->create_map_data_other_server), HP_POP2(HP_map_create_map_data_other_server), 2764 },
-	{ HP_POP(map->eraseallipport_sub), HP_POP2(HP_map_eraseallipport_sub), 2766 },
-	{ HP_POP(map->init_mapcache), HP_POP2(HP_map_init_mapcache), 2768 },
-	{ HP_POP(map->readfromcache), HP_POP2(HP_map_readfromcache), 2770 },
-	{ HP_POP(map->addmap), HP_POP2(HP_map_addmap), 2772 },
-	{ HP_POP(map->delmapid), HP_POP2(HP_map_delmapid), 2774 },
-	{ HP_POP(map->zone_db_clear), HP_POP2(HP_map_zone_db_clear), 2776 },
-	{ HP_POP(map->list_final), HP_POP2(HP_map_list_final), 2778 },
-	{ HP_POP(map->waterheight), HP_POP2(HP_map_waterheight), 2780 },
-	{ HP_POP(map->readgat), HP_POP2(HP_map_readgat), 2782 },
-	{ HP_POP(map->readallmaps), HP_POP2(HP_map_readallmaps), 2784 },
-	{ HP_POP(map->config_read), HP_POP2(HP_map_config_read), 2786 },
-	{ HP_POP(map->config_read_sub), HP_POP2(HP_map_config_read_sub), 2788 },
-	{ HP_POP(map->reloadnpc_sub), HP_POP2(HP_map_reloadnpc_sub), 2790 },
-	{ HP_POP(map->inter_config_read), HP_POP2(HP_map_inter_config_read), 2792 },
-	{ HP_POP(map->sql_init), HP_POP2(HP_map_sql_init), 2794 },
-	{ HP_POP(map->sql_close), HP_POP2(HP_map_sql_close), 2796 },
-	{ HP_POP(map->zone_mf_cache), HP_POP2(HP_map_zone_mf_cache), 2798 },
-	{ HP_POP(map->zone_str2itemid), HP_POP2(HP_map_zone_str2itemid), 2800 },
-	{ HP_POP(map->zone_str2skillid), HP_POP2(HP_map_zone_str2skillid), 2802 },
-	{ HP_POP(map->zone_bl_type), HP_POP2(HP_map_zone_bl_type), 2804 },
-	{ HP_POP(map->read_zone_db), HP_POP2(HP_map_read_zone_db), 2806 },
-	{ HP_POP(map->db_final), HP_POP2(HP_map_db_final), 2808 },
-	{ HP_POP(map->nick_db_final), HP_POP2(HP_map_nick_db_final), 2810 },
-	{ HP_POP(map->cleanup_db_sub), HP_POP2(HP_map_cleanup_db_sub), 2812 },
-	{ HP_POP(map->abort_sub), HP_POP2(HP_map_abort_sub), 2814 },
-	{ HP_POP(map->helpscreen), HP_POP2(HP_map_helpscreen), 2816 },
-	{ HP_POP(map->versionscreen), HP_POP2(HP_map_versionscreen), 2818 },
-	{ HP_POP(map->arg_next_value), HP_POP2(HP_map_arg_next_value), 2820 },
-	{ HP_POP(map->addblcell), HP_POP2(HP_map_addblcell), 2822 },
-	{ HP_POP(map->delblcell), HP_POP2(HP_map_delblcell), 2824 },
+	{ HP_POP(map->zone_init), HP_POP2(HP_map_zone_init), 2588 },
+	{ HP_POP(map->zone_remove), HP_POP2(HP_map_zone_remove), 2590 },
+	{ HP_POP(map->zone_apply), HP_POP2(HP_map_zone_apply), 2592 },
+	{ HP_POP(map->zone_change), HP_POP2(HP_map_zone_change), 2594 },
+	{ HP_POP(map->zone_change2), HP_POP2(HP_map_zone_change2), 2596 },
+	{ HP_POP(map->getcell), HP_POP2(HP_map_getcell), 2598 },
+	{ HP_POP(map->setgatcell), HP_POP2(HP_map_setgatcell), 2600 },
+	{ HP_POP(map->cellfromcache), HP_POP2(HP_map_cellfromcache), 2602 },
+	{ HP_POP(map->setusers), HP_POP2(HP_map_setusers), 2604 },
+	{ HP_POP(map->getusers), HP_POP2(HP_map_getusers), 2606 },
+	{ HP_POP(map->usercount), HP_POP2(HP_map_usercount), 2608 },
+	{ HP_POP(map->freeblock), HP_POP2(HP_map_freeblock), 2610 },
+	{ HP_POP(map->freeblock_lock), HP_POP2(HP_map_freeblock_lock), 2612 },
+	{ HP_POP(map->freeblock_unlock), HP_POP2(HP_map_freeblock_unlock), 2614 },
+	{ HP_POP(map->addblock), HP_POP2(HP_map_addblock), 2616 },
+	{ HP_POP(map->delblock), HP_POP2(HP_map_delblock), 2618 },
+	{ HP_POP(map->moveblock), HP_POP2(HP_map_moveblock), 2620 },
+	{ HP_POP(map->count_oncell), HP_POP2(HP_map_count_oncell), 2622 },
+	{ HP_POP(map->find_skill_unit_oncell), HP_POP2(HP_map_find_skill_unit_oncell), 2624 },
+	{ HP_POP(map->get_new_object_id), HP_POP2(HP_map_get_new_object_id), 2626 },
+	{ HP_POP(map->search_freecell), HP_POP2(HP_map_search_freecell), 2628 },
+	{ HP_POP(map->quit), HP_POP2(HP_map_quit), 2630 },
+	{ HP_POP(map->addnpc), HP_POP2(HP_map_addnpc), 2632 },
+	{ HP_POP(map->clearflooritem_timer), HP_POP2(HP_map_clearflooritem_timer), 2634 },
+	{ HP_POP(map->removemobs_timer), HP_POP2(HP_map_removemobs_timer), 2636 },
+	{ HP_POP(map->clearflooritem), HP_POP2(HP_map_clearflooritem), 2638 },
+	{ HP_POP(map->addflooritem), HP_POP2(HP_map_addflooritem), 2640 },
+	{ HP_POP(map->addnickdb), HP_POP2(HP_map_addnickdb), 2642 },
+	{ HP_POP(map->delnickdb), HP_POP2(HP_map_delnickdb), 2644 },
+	{ HP_POP(map->reqnickdb), HP_POP2(HP_map_reqnickdb), 2646 },
+	{ HP_POP(map->charid2nick), HP_POP2(HP_map_charid2nick), 2648 },
+	{ HP_POP(map->charid2sd), HP_POP2(HP_map_charid2sd), 2650 },
+	{ HP_POP(map->vforeachpc), HP_POP2(HP_map_vforeachpc), 2652 },
+	{ HP_POP(map->vforeachmob), HP_POP2(HP_map_vforeachmob), 2654 },
+	{ HP_POP(map->vforeachnpc), HP_POP2(HP_map_vforeachnpc), 2656 },
+	{ HP_POP(map->vforeachregen), HP_POP2(HP_map_vforeachregen), 2658 },
+	{ HP_POP(map->vforeachiddb), HP_POP2(HP_map_vforeachiddb), 2660 },
+	{ HP_POP(map->vforeachinrange), HP_POP2(HP_map_vforeachinrange), 2662 },
+	{ HP_POP(map->vforeachinshootrange), HP_POP2(HP_map_vforeachinshootrange), 2664 },
+	{ HP_POP(map->vforeachinarea), HP_POP2(HP_map_vforeachinarea), 2666 },
+	{ HP_POP(map->vforcountinrange), HP_POP2(HP_map_vforcountinrange), 2668 },
+	{ HP_POP(map->vforcountinarea), HP_POP2(HP_map_vforcountinarea), 2670 },
+	{ HP_POP(map->vforeachinmovearea), HP_POP2(HP_map_vforeachinmovearea), 2672 },
+	{ HP_POP(map->vforeachincell), HP_POP2(HP_map_vforeachincell), 2674 },
+	{ HP_POP(map->vforeachinpath), HP_POP2(HP_map_vforeachinpath), 2676 },
+	{ HP_POP(map->vforeachinmap), HP_POP2(HP_map_vforeachinmap), 2678 },
+	{ HP_POP(map->vforeachininstance), HP_POP2(HP_map_vforeachininstance), 2680 },
+	{ HP_POP(map->id2sd), HP_POP2(HP_map_id2sd), 2682 },
+	{ HP_POP(map->id2md), HP_POP2(HP_map_id2md), 2684 },
+	{ HP_POP(map->id2nd), HP_POP2(HP_map_id2nd), 2686 },
+	{ HP_POP(map->id2hd), HP_POP2(HP_map_id2hd), 2688 },
+	{ HP_POP(map->id2mc), HP_POP2(HP_map_id2mc), 2690 },
+	{ HP_POP(map->id2cd), HP_POP2(HP_map_id2cd), 2692 },
+	{ HP_POP(map->id2bl), HP_POP2(HP_map_id2bl), 2694 },
+	{ HP_POP(map->blid_exists), HP_POP2(HP_map_blid_exists), 2696 },
+	{ HP_POP(map->mapindex2mapid), HP_POP2(HP_map_mapindex2mapid), 2698 },
+	{ HP_POP(map->mapname2mapid), HP_POP2(HP_map_mapname2mapid), 2700 },
+	{ HP_POP(map->mapname2ipport), HP_POP2(HP_map_mapname2ipport), 2702 },
+	{ HP_POP(map->setipport), HP_POP2(HP_map_setipport), 2704 },
+	{ HP_POP(map->eraseipport), HP_POP2(HP_map_eraseipport), 2706 },
+	{ HP_POP(map->eraseallipport), HP_POP2(HP_map_eraseallipport), 2708 },
+	{ HP_POP(map->addiddb), HP_POP2(HP_map_addiddb), 2710 },
+	{ HP_POP(map->deliddb), HP_POP2(HP_map_deliddb), 2712 },
+	{ HP_POP(map->nick2sd), HP_POP2(HP_map_nick2sd), 2714 },
+	{ HP_POP(map->getmob_boss), HP_POP2(HP_map_getmob_boss), 2716 },
+	{ HP_POP(map->id2boss), HP_POP2(HP_map_id2boss), 2718 },
+	{ HP_POP(map->reloadnpc), HP_POP2(HP_map_reloadnpc), 2720 },
+	{ HP_POP(map->check_dir), HP_POP2(HP_map_check_dir), 2722 },
+	{ HP_POP(map->calc_dir), HP_POP2(HP_map_calc_dir), 2724 },
+	{ HP_POP(map->random_dir), HP_POP2(HP_map_random_dir), 2726 },
+	{ HP_POP(map->cleanup_sub), HP_POP2(HP_map_cleanup_sub), 2728 },
+	{ HP_POP(map->delmap), HP_POP2(HP_map_delmap), 2730 },
+	{ HP_POP(map->flags_init), HP_POP2(HP_map_flags_init), 2732 },
+	{ HP_POP(map->iwall_set), HP_POP2(HP_map_iwall_set), 2734 },
+	{ HP_POP(map->iwall_get), HP_POP2(HP_map_iwall_get), 2736 },
+	{ HP_POP(map->iwall_remove), HP_POP2(HP_map_iwall_remove), 2738 },
+	{ HP_POP(map->addmobtolist), HP_POP2(HP_map_addmobtolist), 2740 },
+	{ HP_POP(map->spawnmobs), HP_POP2(HP_map_spawnmobs), 2742 },
+	{ HP_POP(map->removemobs), HP_POP2(HP_map_removemobs), 2744 },
+	{ HP_POP(map->addmap2db), HP_POP2(HP_map_addmap2db), 2746 },
+	{ HP_POP(map->removemapdb), HP_POP2(HP_map_removemapdb), 2748 },
+	{ HP_POP(map->clean), HP_POP2(HP_map_clean), 2750 },
+	{ HP_POP(map->do_shutdown), HP_POP2(HP_map_do_shutdown), 2752 },
+	{ HP_POP(map->freeblock_timer), HP_POP2(HP_map_freeblock_timer), 2754 },
+	{ HP_POP(map->searchrandfreecell), HP_POP2(HP_map_searchrandfreecell), 2756 },
+	{ HP_POP(map->count_sub), HP_POP2(HP_map_count_sub), 2758 },
+	{ HP_POP(map->create_charid2nick), HP_POP2(HP_map_create_charid2nick), 2760 },
+	{ HP_POP(map->removemobs_sub), HP_POP2(HP_map_removemobs_sub), 2762 },
+	{ HP_POP(map->gat2cell), HP_POP2(HP_map_gat2cell), 2764 },
+	{ HP_POP(map->cell2gat), HP_POP2(HP_map_cell2gat), 2766 },
+	{ HP_POP(map->getcellp), HP_POP2(HP_map_getcellp), 2768 },
+	{ HP_POP(map->setcell), HP_POP2(HP_map_setcell), 2770 },
+	{ HP_POP(map->sub_getcellp), HP_POP2(HP_map_sub_getcellp), 2772 },
+	{ HP_POP(map->sub_setcell), HP_POP2(HP_map_sub_setcell), 2774 },
+	{ HP_POP(map->iwall_nextxy), HP_POP2(HP_map_iwall_nextxy), 2776 },
+	{ HP_POP(map->create_map_data_other_server), HP_POP2(HP_map_create_map_data_other_server), 2778 },
+	{ HP_POP(map->eraseallipport_sub), HP_POP2(HP_map_eraseallipport_sub), 2780 },
+	{ HP_POP(map->init_mapcache), HP_POP2(HP_map_init_mapcache), 2782 },
+	{ HP_POP(map->readfromcache), HP_POP2(HP_map_readfromcache), 2784 },
+	{ HP_POP(map->addmap), HP_POP2(HP_map_addmap), 2786 },
+	{ HP_POP(map->delmapid), HP_POP2(HP_map_delmapid), 2788 },
+	{ HP_POP(map->zone_db_clear), HP_POP2(HP_map_zone_db_clear), 2790 },
+	{ HP_POP(map->list_final), HP_POP2(HP_map_list_final), 2792 },
+	{ HP_POP(map->waterheight), HP_POP2(HP_map_waterheight), 2794 },
+	{ HP_POP(map->readgat), HP_POP2(HP_map_readgat), 2796 },
+	{ HP_POP(map->readallmaps), HP_POP2(HP_map_readallmaps), 2798 },
+	{ HP_POP(map->config_read), HP_POP2(HP_map_config_read), 2800 },
+	{ HP_POP(map->config_read_sub), HP_POP2(HP_map_config_read_sub), 2802 },
+	{ HP_POP(map->reloadnpc_sub), HP_POP2(HP_map_reloadnpc_sub), 2804 },
+	{ HP_POP(map->inter_config_read), HP_POP2(HP_map_inter_config_read), 2806 },
+	{ HP_POP(map->sql_init), HP_POP2(HP_map_sql_init), 2808 },
+	{ HP_POP(map->sql_close), HP_POP2(HP_map_sql_close), 2810 },
+	{ HP_POP(map->zone_mf_cache), HP_POP2(HP_map_zone_mf_cache), 2812 },
+	{ HP_POP(map->zone_str2itemid), HP_POP2(HP_map_zone_str2itemid), 2814 },
+	{ HP_POP(map->zone_str2skillid), HP_POP2(HP_map_zone_str2skillid), 2816 },
+	{ HP_POP(map->zone_bl_type), HP_POP2(HP_map_zone_bl_type), 2818 },
+	{ HP_POP(map->read_zone_db), HP_POP2(HP_map_read_zone_db), 2820 },
+	{ HP_POP(map->db_final), HP_POP2(HP_map_db_final), 2822 },
+	{ HP_POP(map->nick_db_final), HP_POP2(HP_map_nick_db_final), 2824 },
+	{ HP_POP(map->cleanup_db_sub), HP_POP2(HP_map_cleanup_db_sub), 2826 },
+	{ HP_POP(map->abort_sub), HP_POP2(HP_map_abort_sub), 2828 },
+	{ HP_POP(map->helpscreen), HP_POP2(HP_map_helpscreen), 2830 },
+	{ HP_POP(map->versionscreen), HP_POP2(HP_map_versionscreen), 2832 },
+	{ HP_POP(map->arg_next_value), HP_POP2(HP_map_arg_next_value), 2834 },
+	{ HP_POP(map->addblcell), HP_POP2(HP_map_addblcell), 2836 },
+	{ HP_POP(map->delblcell), HP_POP2(HP_map_delblcell), 2838 },
 /* mapit */
-	{ HP_POP(mapit->alloc), HP_POP2(HP_mapit_alloc), 2826 },
-	{ HP_POP(mapit->free), HP_POP2(HP_mapit_free), 2828 },
-	{ HP_POP(mapit->first), HP_POP2(HP_mapit_first), 2830 },
-	{ HP_POP(mapit->last), HP_POP2(HP_mapit_last), 2832 },
-	{ HP_POP(mapit->next), HP_POP2(HP_mapit_next), 2834 },
-	{ HP_POP(mapit->prev), HP_POP2(HP_mapit_prev), 2836 },
-	{ HP_POP(mapit->exists), HP_POP2(HP_mapit_exists), 2838 },
+	{ HP_POP(mapit->alloc), HP_POP2(HP_mapit_alloc), 2840 },
+	{ HP_POP(mapit->free), HP_POP2(HP_mapit_free), 2842 },
+	{ HP_POP(mapit->first), HP_POP2(HP_mapit_first), 2844 },
+	{ HP_POP(mapit->last), HP_POP2(HP_mapit_last), 2846 },
+	{ HP_POP(mapit->next), HP_POP2(HP_mapit_next), 2848 },
+	{ HP_POP(mapit->prev), HP_POP2(HP_mapit_prev), 2850 },
+	{ HP_POP(mapit->exists), HP_POP2(HP_mapit_exists), 2852 },
 /* mapreg */
-	{ HP_POP(mapreg->init), HP_POP2(HP_mapreg_init), 2840 },
-	{ HP_POP(mapreg->final), HP_POP2(HP_mapreg_final), 2842 },
-	{ HP_POP(mapreg->readreg), HP_POP2(HP_mapreg_readreg), 2844 },
-	{ HP_POP(mapreg->readregstr), HP_POP2(HP_mapreg_readregstr), 2846 },
-	{ HP_POP(mapreg->setreg), HP_POP2(HP_mapreg_setreg), 2848 },
-	{ HP_POP(mapreg->setregstr), HP_POP2(HP_mapreg_setregstr), 2850 },
-	{ HP_POP(mapreg->load), HP_POP2(HP_mapreg_load), 2852 },
-	{ HP_POP(mapreg->save), HP_POP2(HP_mapreg_save), 2854 },
-	{ HP_POP(mapreg->save_timer), HP_POP2(HP_mapreg_save_timer), 2856 },
-	{ HP_POP(mapreg->reload), HP_POP2(HP_mapreg_reload), 2858 },
-	{ HP_POP(mapreg->config_read), HP_POP2(HP_mapreg_config_read), 2860 },
+	{ HP_POP(mapreg->init), HP_POP2(HP_mapreg_init), 2854 },
+	{ HP_POP(mapreg->final), HP_POP2(HP_mapreg_final), 2856 },
+	{ HP_POP(mapreg->readreg), HP_POP2(HP_mapreg_readreg), 2858 },
+	{ HP_POP(mapreg->readregstr), HP_POP2(HP_mapreg_readregstr), 2860 },
+	{ HP_POP(mapreg->setreg), HP_POP2(HP_mapreg_setreg), 2862 },
+	{ HP_POP(mapreg->setregstr), HP_POP2(HP_mapreg_setregstr), 2864 },
+	{ HP_POP(mapreg->load), HP_POP2(HP_mapreg_load), 2866 },
+	{ HP_POP(mapreg->save), HP_POP2(HP_mapreg_save), 2868 },
+	{ HP_POP(mapreg->save_timer), HP_POP2(HP_mapreg_save_timer), 2870 },
+	{ HP_POP(mapreg->reload), HP_POP2(HP_mapreg_reload), 2872 },
+	{ HP_POP(mapreg->config_read), HP_POP2(HP_mapreg_config_read), 2874 },
 /* mercenary */
-	{ HP_POP(mercenary->init), HP_POP2(HP_mercenary_init), 2862 },
-	{ HP_POP(mercenary->class), HP_POP2(HP_mercenary_class), 2864 },
-	{ HP_POP(mercenary->get_viewdata), HP_POP2(HP_mercenary_get_viewdata), 2866 },
-	{ HP_POP(mercenary->create), HP_POP2(HP_mercenary_create), 2868 },
-	{ HP_POP(mercenary->data_received), HP_POP2(HP_mercenary_data_received), 2870 },
-	{ HP_POP(mercenary->save), HP_POP2(HP_mercenary_save), 2872 },
-	{ HP_POP(mercenary->heal), HP_POP2(HP_mercenary_heal), 2874 },
-	{ HP_POP(mercenary->dead), HP_POP2(HP_mercenary_dead), 2876 },
-	{ HP_POP(mercenary->delete), HP_POP2(HP_mercenary_delete), 2878 },
-	{ HP_POP(mercenary->contract_stop), HP_POP2(HP_mercenary_contract_stop), 2880 },
-	{ HP_POP(mercenary->get_lifetime), HP_POP2(HP_mercenary_get_lifetime), 2882 },
-	{ HP_POP(mercenary->get_guild), HP_POP2(HP_mercenary_get_guild), 2884 },
-	{ HP_POP(mercenary->get_faith), HP_POP2(HP_mercenary_get_faith), 2886 },
-	{ HP_POP(mercenary->set_faith), HP_POP2(HP_mercenary_set_faith), 2888 },
-	{ HP_POP(mercenary->get_calls), HP_POP2(HP_mercenary_get_calls), 2890 },
-	{ HP_POP(mercenary->set_calls), HP_POP2(HP_mercenary_set_calls), 2892 },
-	{ HP_POP(mercenary->kills), HP_POP2(HP_mercenary_kills), 2894 },
-	{ HP_POP(mercenary->checkskill), HP_POP2(HP_mercenary_checkskill), 2896 },
-	{ HP_POP(mercenary->read_db), HP_POP2(HP_mercenary_read_db), 2898 },
-	{ HP_POP(mercenary->read_skilldb), HP_POP2(HP_mercenary_read_skilldb), 2900 },
-	{ HP_POP(mercenary->killbonus), HP_POP2(HP_mercenary_killbonus), 2902 },
-	{ HP_POP(mercenary->search_index), HP_POP2(HP_mercenary_search_index), 2904 },
-	{ HP_POP(mercenary->contract_end_timer), HP_POP2(HP_mercenary_contract_end_timer), 2906 },
-	{ HP_POP(mercenary->read_db_sub), HP_POP2(HP_mercenary_read_db_sub), 2908 },
-	{ HP_POP(mercenary->read_skill_db_sub), HP_POP2(HP_mercenary_read_skill_db_sub), 2910 },
+	{ HP_POP(mercenary->init), HP_POP2(HP_mercenary_init), 2876 },
+	{ HP_POP(mercenary->class), HP_POP2(HP_mercenary_class), 2878 },
+	{ HP_POP(mercenary->get_viewdata), HP_POP2(HP_mercenary_get_viewdata), 2880 },
+	{ HP_POP(mercenary->create), HP_POP2(HP_mercenary_create), 2882 },
+	{ HP_POP(mercenary->data_received), HP_POP2(HP_mercenary_data_received), 2884 },
+	{ HP_POP(mercenary->save), HP_POP2(HP_mercenary_save), 2886 },
+	{ HP_POP(mercenary->heal), HP_POP2(HP_mercenary_heal), 2888 },
+	{ HP_POP(mercenary->dead), HP_POP2(HP_mercenary_dead), 2890 },
+	{ HP_POP(mercenary->delete), HP_POP2(HP_mercenary_delete), 2892 },
+	{ HP_POP(mercenary->contract_stop), HP_POP2(HP_mercenary_contract_stop), 2894 },
+	{ HP_POP(mercenary->get_lifetime), HP_POP2(HP_mercenary_get_lifetime), 2896 },
+	{ HP_POP(mercenary->get_guild), HP_POP2(HP_mercenary_get_guild), 2898 },
+	{ HP_POP(mercenary->get_faith), HP_POP2(HP_mercenary_get_faith), 2900 },
+	{ HP_POP(mercenary->set_faith), HP_POP2(HP_mercenary_set_faith), 2902 },
+	{ HP_POP(mercenary->get_calls), HP_POP2(HP_mercenary_get_calls), 2904 },
+	{ HP_POP(mercenary->set_calls), HP_POP2(HP_mercenary_set_calls), 2906 },
+	{ HP_POP(mercenary->kills), HP_POP2(HP_mercenary_kills), 2908 },
+	{ HP_POP(mercenary->checkskill), HP_POP2(HP_mercenary_checkskill), 2910 },
+	{ HP_POP(mercenary->read_db), HP_POP2(HP_mercenary_read_db), 2912 },
+	{ HP_POP(mercenary->read_skilldb), HP_POP2(HP_mercenary_read_skilldb), 2914 },
+	{ HP_POP(mercenary->killbonus), HP_POP2(HP_mercenary_killbonus), 2916 },
+	{ HP_POP(mercenary->search_index), HP_POP2(HP_mercenary_search_index), 2918 },
+	{ HP_POP(mercenary->contract_end_timer), HP_POP2(HP_mercenary_contract_end_timer), 2920 },
+	{ HP_POP(mercenary->read_db_sub), HP_POP2(HP_mercenary_read_db_sub), 2922 },
+	{ HP_POP(mercenary->read_skill_db_sub), HP_POP2(HP_mercenary_read_skill_db_sub), 2924 },
 /* mob */
-	{ HP_POP(mob->init), HP_POP2(HP_mob_init), 2912 },
-	{ HP_POP(mob->final), HP_POP2(HP_mob_final), 2914 },
-	{ HP_POP(mob->reload), HP_POP2(HP_mob_reload), 2916 },
-	{ HP_POP(mob->db), HP_POP2(HP_mob_db), 2918 },
-	{ HP_POP(mob->chat), HP_POP2(HP_mob_chat), 2920 },
-	{ HP_POP(mob->makedummymobdb), HP_POP2(HP_mob_makedummymobdb), 2922 },
-	{ HP_POP(mob->spawn_guardian_sub), HP_POP2(HP_mob_spawn_guardian_sub), 2924 },
-	{ HP_POP(mob->skill_id2skill_idx), HP_POP2(HP_mob_skill_id2skill_idx), 2926 },
-	{ HP_POP(mob->db_searchname), HP_POP2(HP_mob_db_searchname), 2928 },
-	{ HP_POP(mob->db_searchname_array_sub), HP_POP2(HP_mob_db_searchname_array_sub), 2930 },
-	{ HP_POP(mob->mvptomb_create), HP_POP2(HP_mob_mvptomb_create), 2932 },
-	{ HP_POP(mob->mvptomb_destroy), HP_POP2(HP_mob_mvptomb_destroy), 2934 },
-	{ HP_POP(mob->db_searchname_array), HP_POP2(HP_mob_db_searchname_array), 2936 },
-	{ HP_POP(mob->db_checkid), HP_POP2(HP_mob_db_checkid), 2938 },
-	{ HP_POP(mob->get_viewdata), HP_POP2(HP_mob_get_viewdata), 2940 },
-	{ HP_POP(mob->parse_dataset), HP_POP2(HP_mob_parse_dataset), 2942 },
-	{ HP_POP(mob->spawn_dataset), HP_POP2(HP_mob_spawn_dataset), 2944 },
-	{ HP_POP(mob->get_random_id), HP_POP2(HP_mob_get_random_id), 2946 },
-	{ HP_POP(mob->ksprotected), HP_POP2(HP_mob_ksprotected), 2948 },
-	{ HP_POP(mob->once_spawn_sub), HP_POP2(HP_mob_once_spawn_sub), 2950 },
-	{ HP_POP(mob->once_spawn), HP_POP2(HP_mob_once_spawn), 2952 },
-	{ HP_POP(mob->once_spawn_area), HP_POP2(HP_mob_once_spawn_area), 2954 },
-	{ HP_POP(mob->spawn_guardian), HP_POP2(HP_mob_spawn_guardian), 2956 },
-	{ HP_POP(mob->spawn_bg), HP_POP2(HP_mob_spawn_bg), 2958 },
-	{ HP_POP(mob->can_reach), HP_POP2(HP_mob_can_reach), 2960 },
-	{ HP_POP(mob->linksearch), HP_POP2(HP_mob_linksearch), 2962 },
-	{ HP_POP(mob->delayspawn), HP_POP2(HP_mob_delayspawn), 2964 },
-	{ HP_POP(mob->setdelayspawn), HP_POP2(HP_mob_setdelayspawn), 2966 },
-	{ HP_POP(mob->count_sub), HP_POP2(HP_mob_count_sub), 2968 },
-	{ HP_POP(mob->spawn), HP_POP2(HP_mob_spawn), 2970 },
-	{ HP_POP(mob->can_changetarget), HP_POP2(HP_mob_can_changetarget), 2972 },
-	{ HP_POP(mob->target), HP_POP2(HP_mob_target), 2974 },
-	{ HP_POP(mob->ai_sub_hard_activesearch), HP_POP2(HP_mob_ai_sub_hard_activesearch), 2976 },
-	{ HP_POP(mob->ai_sub_hard_changechase), HP_POP2(HP_mob_ai_sub_hard_changechase), 2978 },
-	{ HP_POP(mob->ai_sub_hard_bg_ally), HP_POP2(HP_mob_ai_sub_hard_bg_ally), 2980 },
-	{ HP_POP(mob->ai_sub_hard_lootsearch), HP_POP2(HP_mob_ai_sub_hard_lootsearch), 2982 },
-	{ HP_POP(mob->warpchase_sub), HP_POP2(HP_mob_warpchase_sub), 2984 },
-	{ HP_POP(mob->ai_sub_hard_slavemob), HP_POP2(HP_mob_ai_sub_hard_slavemob), 2986 },
-	{ HP_POP(mob->unlocktarget), HP_POP2(HP_mob_unlocktarget), 2988 },
-	{ HP_POP(mob->randomwalk), HP_POP2(HP_mob_randomwalk), 2990 },
-	{ HP_POP(mob->warpchase), HP_POP2(HP_mob_warpchase), 2992 },
-	{ HP_POP(mob->ai_sub_hard), HP_POP2(HP_mob_ai_sub_hard), 2994 },
-	{ HP_POP(mob->ai_sub_hard_timer), HP_POP2(HP_mob_ai_sub_hard_timer), 2996 },
-	{ HP_POP(mob->ai_sub_foreachclient), HP_POP2(HP_mob_ai_sub_foreachclient), 2998 },
-	{ HP_POP(mob->ai_sub_lazy), HP_POP2(HP_mob_ai_sub_lazy), 3000 },
-	{ HP_POP(mob->ai_lazy), HP_POP2(HP_mob_ai_lazy), 3002 },
-	{ HP_POP(mob->ai_hard), HP_POP2(HP_mob_ai_hard), 3004 },
-	{ HP_POP(mob->setdropitem), HP_POP2(HP_mob_setdropitem), 3006 },
-	{ HP_POP(mob->setlootitem), HP_POP2(HP_mob_setlootitem), 3008 },
-	{ HP_POP(mob->delay_item_drop), HP_POP2(HP_mob_delay_item_drop), 3010 },
-	{ HP_POP(mob->item_drop), HP_POP2(HP_mob_item_drop), 3012 },
-	{ HP_POP(mob->timer_delete), HP_POP2(HP_mob_timer_delete), 3014 },
-	{ HP_POP(mob->deleteslave_sub), HP_POP2(HP_mob_deleteslave_sub), 3016 },
-	{ HP_POP(mob->deleteslave), HP_POP2(HP_mob_deleteslave), 3018 },
-	{ HP_POP(mob->respawn), HP_POP2(HP_mob_respawn), 3020 },
-	{ HP_POP(mob->log_damage), HP_POP2(HP_mob_log_damage), 3022 },
-	{ HP_POP(mob->damage), HP_POP2(HP_mob_damage), 3024 },
-	{ HP_POP(mob->dead), HP_POP2(HP_mob_dead), 3026 },
-	{ HP_POP(mob->revive), HP_POP2(HP_mob_revive), 3028 },
-	{ HP_POP(mob->guardian_guildchange), HP_POP2(HP_mob_guardian_guildchange), 3030 },
-	{ HP_POP(mob->random_class), HP_POP2(HP_mob_random_class), 3032 },
-	{ HP_POP(mob->class_change), HP_POP2(HP_mob_class_change), 3034 },
-	{ HP_POP(mob->heal), HP_POP2(HP_mob_heal), 3036 },
-	{ HP_POP(mob->warpslave_sub), HP_POP2(HP_mob_warpslave_sub), 3038 },
-	{ HP_POP(mob->warpslave), HP_POP2(HP_mob_warpslave), 3040 },
-	{ HP_POP(mob->countslave_sub), HP_POP2(HP_mob_countslave_sub), 3042 },
-	{ HP_POP(mob->countslave), HP_POP2(HP_mob_countslave), 3044 },
-	{ HP_POP(mob->summonslave), HP_POP2(HP_mob_summonslave), 3046 },
-	{ HP_POP(mob->getfriendhprate_sub), HP_POP2(HP_mob_getfriendhprate_sub), 3048 },
-	{ HP_POP(mob->getfriendhprate), HP_POP2(HP_mob_getfriendhprate), 3050 },
-	{ HP_POP(mob->getmasterhpltmaxrate), HP_POP2(HP_mob_getmasterhpltmaxrate), 3052 },
-	{ HP_POP(mob->getfriendstatus_sub), HP_POP2(HP_mob_getfriendstatus_sub), 3054 },
-	{ HP_POP(mob->getfriendstatus), HP_POP2(HP_mob_getfriendstatus), 3056 },
-	{ HP_POP(mob->skill_use), HP_POP2(HP_mob_skill_use), 3058 },
-	{ HP_POP(mob->skill_event), HP_POP2(HP_mob_skill_event), 3060 },
-	{ HP_POP(mob->is_clone), HP_POP2(HP_mob_is_clone), 3062 },
-	{ HP_POP(mob->clone_spawn), HP_POP2(HP_mob_clone_spawn), 3064 },
-	{ HP_POP(mob->clone_delete), HP_POP2(HP_mob_clone_delete), 3066 },
-	{ HP_POP(mob->drop_adjust), HP_POP2(HP_mob_drop_adjust), 3068 },
-	{ HP_POP(mob->item_dropratio_adjust), HP_POP2(HP_mob_item_dropratio_adjust), 3070 },
-	{ HP_POP(mob->parse_dbrow), HP_POP2(HP_mob_parse_dbrow), 3072 },
-	{ HP_POP(mob->readdb_sub), HP_POP2(HP_mob_readdb_sub), 3074 },
-	{ HP_POP(mob->readdb), HP_POP2(HP_mob_readdb), 3076 },
-	{ HP_POP(mob->read_sqldb), HP_POP2(HP_mob_read_sqldb), 3078 },
-	{ HP_POP(mob->readdb_mobavail), HP_POP2(HP_mob_readdb_mobavail), 3080 },
-	{ HP_POP(mob->read_randommonster), HP_POP2(HP_mob_read_randommonster), 3082 },
-	{ HP_POP(mob->parse_row_chatdb), HP_POP2(HP_mob_parse_row_chatdb), 3084 },
-	{ HP_POP(mob->readchatdb), HP_POP2(HP_mob_readchatdb), 3086 },
-	{ HP_POP(mob->parse_row_mobskilldb), HP_POP2(HP_mob_parse_row_mobskilldb), 3088 },
-	{ HP_POP(mob->readskilldb), HP_POP2(HP_mob_readskilldb), 3090 },
-	{ HP_POP(mob->read_sqlskilldb), HP_POP2(HP_mob_read_sqlskilldb), 3092 },
-	{ HP_POP(mob->readdb_race2), HP_POP2(HP_mob_readdb_race2), 3094 },
-	{ HP_POP(mob->readdb_itemratio), HP_POP2(HP_mob_readdb_itemratio), 3096 },
-	{ HP_POP(mob->load), HP_POP2(HP_mob_load), 3098 },
-	{ HP_POP(mob->clear_spawninfo), HP_POP2(HP_mob_clear_spawninfo), 3100 },
+	{ HP_POP(mob->init), HP_POP2(HP_mob_init), 2926 },
+	{ HP_POP(mob->final), HP_POP2(HP_mob_final), 2928 },
+	{ HP_POP(mob->reload), HP_POP2(HP_mob_reload), 2930 },
+	{ HP_POP(mob->db), HP_POP2(HP_mob_db), 2932 },
+	{ HP_POP(mob->chat), HP_POP2(HP_mob_chat), 2934 },
+	{ HP_POP(mob->makedummymobdb), HP_POP2(HP_mob_makedummymobdb), 2936 },
+	{ HP_POP(mob->spawn_guardian_sub), HP_POP2(HP_mob_spawn_guardian_sub), 2938 },
+	{ HP_POP(mob->skill_id2skill_idx), HP_POP2(HP_mob_skill_id2skill_idx), 2940 },
+	{ HP_POP(mob->db_searchname), HP_POP2(HP_mob_db_searchname), 2942 },
+	{ HP_POP(mob->db_searchname_array_sub), HP_POP2(HP_mob_db_searchname_array_sub), 2944 },
+	{ HP_POP(mob->mvptomb_create), HP_POP2(HP_mob_mvptomb_create), 2946 },
+	{ HP_POP(mob->mvptomb_destroy), HP_POP2(HP_mob_mvptomb_destroy), 2948 },
+	{ HP_POP(mob->db_searchname_array), HP_POP2(HP_mob_db_searchname_array), 2950 },
+	{ HP_POP(mob->db_checkid), HP_POP2(HP_mob_db_checkid), 2952 },
+	{ HP_POP(mob->get_viewdata), HP_POP2(HP_mob_get_viewdata), 2954 },
+	{ HP_POP(mob->parse_dataset), HP_POP2(HP_mob_parse_dataset), 2956 },
+	{ HP_POP(mob->spawn_dataset), HP_POP2(HP_mob_spawn_dataset), 2958 },
+	{ HP_POP(mob->get_random_id), HP_POP2(HP_mob_get_random_id), 2960 },
+	{ HP_POP(mob->ksprotected), HP_POP2(HP_mob_ksprotected), 2962 },
+	{ HP_POP(mob->once_spawn_sub), HP_POP2(HP_mob_once_spawn_sub), 2964 },
+	{ HP_POP(mob->once_spawn), HP_POP2(HP_mob_once_spawn), 2966 },
+	{ HP_POP(mob->once_spawn_area), HP_POP2(HP_mob_once_spawn_area), 2968 },
+	{ HP_POP(mob->spawn_guardian), HP_POP2(HP_mob_spawn_guardian), 2970 },
+	{ HP_POP(mob->spawn_bg), HP_POP2(HP_mob_spawn_bg), 2972 },
+	{ HP_POP(mob->can_reach), HP_POP2(HP_mob_can_reach), 2974 },
+	{ HP_POP(mob->linksearch), HP_POP2(HP_mob_linksearch), 2976 },
+	{ HP_POP(mob->delayspawn), HP_POP2(HP_mob_delayspawn), 2978 },
+	{ HP_POP(mob->setdelayspawn), HP_POP2(HP_mob_setdelayspawn), 2980 },
+	{ HP_POP(mob->count_sub), HP_POP2(HP_mob_count_sub), 2982 },
+	{ HP_POP(mob->spawn), HP_POP2(HP_mob_spawn), 2984 },
+	{ HP_POP(mob->can_changetarget), HP_POP2(HP_mob_can_changetarget), 2986 },
+	{ HP_POP(mob->target), HP_POP2(HP_mob_target), 2988 },
+	{ HP_POP(mob->ai_sub_hard_activesearch), HP_POP2(HP_mob_ai_sub_hard_activesearch), 2990 },
+	{ HP_POP(mob->ai_sub_hard_changechase), HP_POP2(HP_mob_ai_sub_hard_changechase), 2992 },
+	{ HP_POP(mob->ai_sub_hard_bg_ally), HP_POP2(HP_mob_ai_sub_hard_bg_ally), 2994 },
+	{ HP_POP(mob->ai_sub_hard_lootsearch), HP_POP2(HP_mob_ai_sub_hard_lootsearch), 2996 },
+	{ HP_POP(mob->warpchase_sub), HP_POP2(HP_mob_warpchase_sub), 2998 },
+	{ HP_POP(mob->ai_sub_hard_slavemob), HP_POP2(HP_mob_ai_sub_hard_slavemob), 3000 },
+	{ HP_POP(mob->unlocktarget), HP_POP2(HP_mob_unlocktarget), 3002 },
+	{ HP_POP(mob->randomwalk), HP_POP2(HP_mob_randomwalk), 3004 },
+	{ HP_POP(mob->warpchase), HP_POP2(HP_mob_warpchase), 3006 },
+	{ HP_POP(mob->ai_sub_hard), HP_POP2(HP_mob_ai_sub_hard), 3008 },
+	{ HP_POP(mob->ai_sub_hard_timer), HP_POP2(HP_mob_ai_sub_hard_timer), 3010 },
+	{ HP_POP(mob->ai_sub_foreachclient), HP_POP2(HP_mob_ai_sub_foreachclient), 3012 },
+	{ HP_POP(mob->ai_sub_lazy), HP_POP2(HP_mob_ai_sub_lazy), 3014 },
+	{ HP_POP(mob->ai_lazy), HP_POP2(HP_mob_ai_lazy), 3016 },
+	{ HP_POP(mob->ai_hard), HP_POP2(HP_mob_ai_hard), 3018 },
+	{ HP_POP(mob->setdropitem), HP_POP2(HP_mob_setdropitem), 3020 },
+	{ HP_POP(mob->setlootitem), HP_POP2(HP_mob_setlootitem), 3022 },
+	{ HP_POP(mob->delay_item_drop), HP_POP2(HP_mob_delay_item_drop), 3024 },
+	{ HP_POP(mob->item_drop), HP_POP2(HP_mob_item_drop), 3026 },
+	{ HP_POP(mob->timer_delete), HP_POP2(HP_mob_timer_delete), 3028 },
+	{ HP_POP(mob->deleteslave_sub), HP_POP2(HP_mob_deleteslave_sub), 3030 },
+	{ HP_POP(mob->deleteslave), HP_POP2(HP_mob_deleteslave), 3032 },
+	{ HP_POP(mob->respawn), HP_POP2(HP_mob_respawn), 3034 },
+	{ HP_POP(mob->log_damage), HP_POP2(HP_mob_log_damage), 3036 },
+	{ HP_POP(mob->damage), HP_POP2(HP_mob_damage), 3038 },
+	{ HP_POP(mob->dead), HP_POP2(HP_mob_dead), 3040 },
+	{ HP_POP(mob->revive), HP_POP2(HP_mob_revive), 3042 },
+	{ HP_POP(mob->guardian_guildchange), HP_POP2(HP_mob_guardian_guildchange), 3044 },
+	{ HP_POP(mob->random_class), HP_POP2(HP_mob_random_class), 3046 },
+	{ HP_POP(mob->class_change), HP_POP2(HP_mob_class_change), 3048 },
+	{ HP_POP(mob->heal), HP_POP2(HP_mob_heal), 3050 },
+	{ HP_POP(mob->warpslave_sub), HP_POP2(HP_mob_warpslave_sub), 3052 },
+	{ HP_POP(mob->warpslave), HP_POP2(HP_mob_warpslave), 3054 },
+	{ HP_POP(mob->countslave_sub), HP_POP2(HP_mob_countslave_sub), 3056 },
+	{ HP_POP(mob->countslave), HP_POP2(HP_mob_countslave), 3058 },
+	{ HP_POP(mob->summonslave), HP_POP2(HP_mob_summonslave), 3060 },
+	{ HP_POP(mob->getfriendhprate_sub), HP_POP2(HP_mob_getfriendhprate_sub), 3062 },
+	{ HP_POP(mob->getfriendhprate), HP_POP2(HP_mob_getfriendhprate), 3064 },
+	{ HP_POP(mob->getmasterhpltmaxrate), HP_POP2(HP_mob_getmasterhpltmaxrate), 3066 },
+	{ HP_POP(mob->getfriendstatus_sub), HP_POP2(HP_mob_getfriendstatus_sub), 3068 },
+	{ HP_POP(mob->getfriendstatus), HP_POP2(HP_mob_getfriendstatus), 3070 },
+	{ HP_POP(mob->skill_use), HP_POP2(HP_mob_skill_use), 3072 },
+	{ HP_POP(mob->skill_event), HP_POP2(HP_mob_skill_event), 3074 },
+	{ HP_POP(mob->is_clone), HP_POP2(HP_mob_is_clone), 3076 },
+	{ HP_POP(mob->clone_spawn), HP_POP2(HP_mob_clone_spawn), 3078 },
+	{ HP_POP(mob->clone_delete), HP_POP2(HP_mob_clone_delete), 3080 },
+	{ HP_POP(mob->drop_adjust), HP_POP2(HP_mob_drop_adjust), 3082 },
+	{ HP_POP(mob->item_dropratio_adjust), HP_POP2(HP_mob_item_dropratio_adjust), 3084 },
+	{ HP_POP(mob->parse_dbrow), HP_POP2(HP_mob_parse_dbrow), 3086 },
+	{ HP_POP(mob->readdb_sub), HP_POP2(HP_mob_readdb_sub), 3088 },
+	{ HP_POP(mob->readdb), HP_POP2(HP_mob_readdb), 3090 },
+	{ HP_POP(mob->read_sqldb), HP_POP2(HP_mob_read_sqldb), 3092 },
+	{ HP_POP(mob->readdb_mobavail), HP_POP2(HP_mob_readdb_mobavail), 3094 },
+	{ HP_POP(mob->read_randommonster), HP_POP2(HP_mob_read_randommonster), 3096 },
+	{ HP_POP(mob->parse_row_chatdb), HP_POP2(HP_mob_parse_row_chatdb), 3098 },
+	{ HP_POP(mob->readchatdb), HP_POP2(HP_mob_readchatdb), 3100 },
+	{ HP_POP(mob->parse_row_mobskilldb), HP_POP2(HP_mob_parse_row_mobskilldb), 3102 },
+	{ HP_POP(mob->readskilldb), HP_POP2(HP_mob_readskilldb), 3104 },
+	{ HP_POP(mob->read_sqlskilldb), HP_POP2(HP_mob_read_sqlskilldb), 3106 },
+	{ HP_POP(mob->readdb_race2), HP_POP2(HP_mob_readdb_race2), 3108 },
+	{ HP_POP(mob->readdb_itemratio), HP_POP2(HP_mob_readdb_itemratio), 3110 },
+	{ HP_POP(mob->load), HP_POP2(HP_mob_load), 3112 },
+	{ HP_POP(mob->clear_spawninfo), HP_POP2(HP_mob_clear_spawninfo), 3114 },
 /* npc */
-	{ HP_POP(npc->init), HP_POP2(HP_npc_init), 3102 },
-	{ HP_POP(npc->final), HP_POP2(HP_npc_final), 3104 },
-	{ HP_POP(npc->get_new_npc_id), HP_POP2(HP_npc_get_new_npc_id), 3106 },
-	{ HP_POP(npc->get_viewdata), HP_POP2(HP_npc_get_viewdata), 3108 },
-	{ HP_POP(npc->isnear_sub), HP_POP2(HP_npc_isnear_sub), 3110 },
-	{ HP_POP(npc->isnear), HP_POP2(HP_npc_isnear), 3112 },
-	{ HP_POP(npc->ontouch_event), HP_POP2(HP_npc_ontouch_event), 3114 },
-	{ HP_POP(npc->ontouch2_event), HP_POP2(HP_npc_ontouch2_event), 3116 },
-	{ HP_POP(npc->enable_sub), HP_POP2(HP_npc_enable_sub), 3118 },
-	{ HP_POP(npc->enable), HP_POP2(HP_npc_enable), 3120 },
-	{ HP_POP(npc->name2id), HP_POP2(HP_npc_name2id), 3122 },
-	{ HP_POP(npc->event_dequeue), HP_POP2(HP_npc_event_dequeue), 3124 },
-	{ HP_POP(npc->event_export_create), HP_POP2(HP_npc_event_export_create), 3126 },
-	{ HP_POP(npc->event_export), HP_POP2(HP_npc_event_export), 3128 },
-	{ HP_POP(npc->event_sub), HP_POP2(HP_npc_event_sub), 3130 },
-	{ HP_POP(npc->event_doall_sub), HP_POP2(HP_npc_event_doall_sub), 3132 },
-	{ HP_POP(npc->event_do), HP_POP2(HP_npc_event_do), 3134 },
-	{ HP_POP(npc->event_doall_id), HP_POP2(HP_npc_event_doall_id), 3136 },
-	{ HP_POP(npc->event_doall), HP_POP2(HP_npc_event_doall), 3138 },
-	{ HP_POP(npc->event_do_clock), HP_POP2(HP_npc_event_do_clock), 3140 },
-	{ HP_POP(npc->event_do_oninit), HP_POP2(HP_npc_event_do_oninit), 3142 },
-	{ HP_POP(npc->timerevent_export), HP_POP2(HP_npc_timerevent_export), 3144 },
-	{ HP_POP(npc->timerevent), HP_POP2(HP_npc_timerevent), 3146 },
-	{ HP_POP(npc->timerevent_start), HP_POP2(HP_npc_timerevent_start), 3148 },
-	{ HP_POP(npc->timerevent_stop), HP_POP2(HP_npc_timerevent_stop), 3150 },
-	{ HP_POP(npc->timerevent_quit), HP_POP2(HP_npc_timerevent_quit), 3152 },
-	{ HP_POP(npc->gettimerevent_tick), HP_POP2(HP_npc_gettimerevent_tick), 3154 },
-	{ HP_POP(npc->settimerevent_tick), HP_POP2(HP_npc_settimerevent_tick), 3156 },
-	{ HP_POP(npc->event), HP_POP2(HP_npc_event), 3158 },
-	{ HP_POP(npc->touch_areanpc_sub), HP_POP2(HP_npc_touch_areanpc_sub), 3160 },
-	{ HP_POP(npc->touchnext_areanpc), HP_POP2(HP_npc_touchnext_areanpc), 3162 },
-	{ HP_POP(npc->touch_areanpc), HP_POP2(HP_npc_touch_areanpc), 3164 },
-	{ HP_POP(npc->touch_areanpc2), HP_POP2(HP_npc_touch_areanpc2), 3166 },
-	{ HP_POP(npc->check_areanpc), HP_POP2(HP_npc_check_areanpc), 3168 },
-	{ HP_POP(npc->checknear), HP_POP2(HP_npc_checknear), 3170 },
-	{ HP_POP(npc->globalmessage), HP_POP2(HP_npc_globalmessage), 3172 },
-	{ HP_POP(npc->run_tomb), HP_POP2(HP_npc_run_tomb), 3174 },
-	{ HP_POP(npc->click), HP_POP2(HP_npc_click), 3176 },
-	{ HP_POP(npc->scriptcont), HP_POP2(HP_npc_scriptcont), 3178 },
-	{ HP_POP(npc->buysellsel), HP_POP2(HP_npc_buysellsel), 3180 },
-	{ HP_POP(npc->cashshop_buylist), HP_POP2(HP_npc_cashshop_buylist), 3182 },
-	{ HP_POP(npc->buylist_sub), HP_POP2(HP_npc_buylist_sub), 3184 },
-	{ HP_POP(npc->cashshop_buy), HP_POP2(HP_npc_cashshop_buy), 3186 },
-	{ HP_POP(npc->buylist), HP_POP2(HP_npc_buylist), 3188 },
-	{ HP_POP(npc->selllist_sub), HP_POP2(HP_npc_selllist_sub), 3190 },
-	{ HP_POP(npc->selllist), HP_POP2(HP_npc_selllist), 3192 },
-	{ HP_POP(npc->remove_map), HP_POP2(HP_npc_remove_map), 3194 },
-	{ HP_POP(npc->unload_ev), HP_POP2(HP_npc_unload_ev), 3196 },
-	{ HP_POP(npc->unload_ev_label), HP_POP2(HP_npc_unload_ev_label), 3198 },
-	{ HP_POP(npc->unload_dup_sub), HP_POP2(HP_npc_unload_dup_sub), 3200 },
-	{ HP_POP(npc->unload_duplicates), HP_POP2(HP_npc_unload_duplicates), 3202 },
-	{ HP_POP(npc->unload), HP_POP2(HP_npc_unload), 3204 },
-	{ HP_POP(npc->clearsrcfile), HP_POP2(HP_npc_clearsrcfile), 3206 },
-	{ HP_POP(npc->addsrcfile), HP_POP2(HP_npc_addsrcfile), 3208 },
-	{ HP_POP(npc->delsrcfile), HP_POP2(HP_npc_delsrcfile), 3210 },
-	{ HP_POP(npc->parsename), HP_POP2(HP_npc_parsename), 3212 },
-	{ HP_POP(npc->add_warp), HP_POP2(HP_npc_add_warp), 3214 },
-	{ HP_POP(npc->parse_warp), HP_POP2(HP_npc_parse_warp), 3216 },
-	{ HP_POP(npc->parse_shop), HP_POP2(HP_npc_parse_shop), 3218 },
-	{ HP_POP(npc->convertlabel_db), HP_POP2(HP_npc_convertlabel_db), 3220 },
-	{ HP_POP(npc->skip_script), HP_POP2(HP_npc_skip_script), 3222 },
-	{ HP_POP(npc->parse_script), HP_POP2(HP_npc_parse_script), 3224 },
-	{ HP_POP(npc->parse_duplicate), HP_POP2(HP_npc_parse_duplicate), 3226 },
-	{ HP_POP(npc->duplicate4instance), HP_POP2(HP_npc_duplicate4instance), 3228 },
-	{ HP_POP(npc->setcells), HP_POP2(HP_npc_setcells), 3230 },
-	{ HP_POP(npc->unsetcells_sub), HP_POP2(HP_npc_unsetcells_sub), 3232 },
-	{ HP_POP(npc->unsetcells), HP_POP2(HP_npc_unsetcells), 3234 },
-	{ HP_POP(npc->movenpc), HP_POP2(HP_npc_movenpc), 3236 },
-	{ HP_POP(npc->setdisplayname), HP_POP2(HP_npc_setdisplayname), 3238 },
-	{ HP_POP(npc->setclass), HP_POP2(HP_npc_setclass), 3240 },
-	{ HP_POP(npc->do_atcmd_event), HP_POP2(HP_npc_do_atcmd_event), 3242 },
-	{ HP_POP(npc->parse_function), HP_POP2(HP_npc_parse_function), 3244 },
-	{ HP_POP(npc->parse_mob2), HP_POP2(HP_npc_parse_mob2), 3246 },
-	{ HP_POP(npc->parse_mob), HP_POP2(HP_npc_parse_mob), 3248 },
-	{ HP_POP(npc->parse_mapflag), HP_POP2(HP_npc_parse_mapflag), 3250 },
-	{ HP_POP(npc->parsesrcfile), HP_POP2(HP_npc_parsesrcfile), 3252 },
-	{ HP_POP(npc->script_event), HP_POP2(HP_npc_script_event), 3254 },
-	{ HP_POP(npc->read_event_script), HP_POP2(HP_npc_read_event_script), 3256 },
-	{ HP_POP(npc->path_db_clear_sub), HP_POP2(HP_npc_path_db_clear_sub), 3258 },
-	{ HP_POP(npc->ev_label_db_clear_sub), HP_POP2(HP_npc_ev_label_db_clear_sub), 3260 },
-	{ HP_POP(npc->reload), HP_POP2(HP_npc_reload), 3262 },
-	{ HP_POP(npc->unloadfile), HP_POP2(HP_npc_unloadfile), 3264 },
-	{ HP_POP(npc->do_clear_npc), HP_POP2(HP_npc_do_clear_npc), 3266 },
-	{ HP_POP(npc->debug_warps_sub), HP_POP2(HP_npc_debug_warps_sub), 3268 },
-	{ HP_POP(npc->debug_warps), HP_POP2(HP_npc_debug_warps), 3270 },
-	{ HP_POP(npc->secure_timeout_timer), HP_POP2(HP_npc_secure_timeout_timer), 3272 },
+	{ HP_POP(npc->init), HP_POP2(HP_npc_init), 3116 },
+	{ HP_POP(npc->final), HP_POP2(HP_npc_final), 3118 },
+	{ HP_POP(npc->get_new_npc_id), HP_POP2(HP_npc_get_new_npc_id), 3120 },
+	{ HP_POP(npc->get_viewdata), HP_POP2(HP_npc_get_viewdata), 3122 },
+	{ HP_POP(npc->isnear_sub), HP_POP2(HP_npc_isnear_sub), 3124 },
+	{ HP_POP(npc->isnear), HP_POP2(HP_npc_isnear), 3126 },
+	{ HP_POP(npc->ontouch_event), HP_POP2(HP_npc_ontouch_event), 3128 },
+	{ HP_POP(npc->ontouch2_event), HP_POP2(HP_npc_ontouch2_event), 3130 },
+	{ HP_POP(npc->enable_sub), HP_POP2(HP_npc_enable_sub), 3132 },
+	{ HP_POP(npc->enable), HP_POP2(HP_npc_enable), 3134 },
+	{ HP_POP(npc->name2id), HP_POP2(HP_npc_name2id), 3136 },
+	{ HP_POP(npc->event_dequeue), HP_POP2(HP_npc_event_dequeue), 3138 },
+	{ HP_POP(npc->event_export_create), HP_POP2(HP_npc_event_export_create), 3140 },
+	{ HP_POP(npc->event_export), HP_POP2(HP_npc_event_export), 3142 },
+	{ HP_POP(npc->event_sub), HP_POP2(HP_npc_event_sub), 3144 },
+	{ HP_POP(npc->event_doall_sub), HP_POP2(HP_npc_event_doall_sub), 3146 },
+	{ HP_POP(npc->event_do), HP_POP2(HP_npc_event_do), 3148 },
+	{ HP_POP(npc->event_doall_id), HP_POP2(HP_npc_event_doall_id), 3150 },
+	{ HP_POP(npc->event_doall), HP_POP2(HP_npc_event_doall), 3152 },
+	{ HP_POP(npc->event_do_clock), HP_POP2(HP_npc_event_do_clock), 3154 },
+	{ HP_POP(npc->event_do_oninit), HP_POP2(HP_npc_event_do_oninit), 3156 },
+	{ HP_POP(npc->timerevent_export), HP_POP2(HP_npc_timerevent_export), 3158 },
+	{ HP_POP(npc->timerevent), HP_POP2(HP_npc_timerevent), 3160 },
+	{ HP_POP(npc->timerevent_start), HP_POP2(HP_npc_timerevent_start), 3162 },
+	{ HP_POP(npc->timerevent_stop), HP_POP2(HP_npc_timerevent_stop), 3164 },
+	{ HP_POP(npc->timerevent_quit), HP_POP2(HP_npc_timerevent_quit), 3166 },
+	{ HP_POP(npc->gettimerevent_tick), HP_POP2(HP_npc_gettimerevent_tick), 3168 },
+	{ HP_POP(npc->settimerevent_tick), HP_POP2(HP_npc_settimerevent_tick), 3170 },
+	{ HP_POP(npc->event), HP_POP2(HP_npc_event), 3172 },
+	{ HP_POP(npc->touch_areanpc_sub), HP_POP2(HP_npc_touch_areanpc_sub), 3174 },
+	{ HP_POP(npc->touchnext_areanpc), HP_POP2(HP_npc_touchnext_areanpc), 3176 },
+	{ HP_POP(npc->touch_areanpc), HP_POP2(HP_npc_touch_areanpc), 3178 },
+	{ HP_POP(npc->touch_areanpc2), HP_POP2(HP_npc_touch_areanpc2), 3180 },
+	{ HP_POP(npc->check_areanpc), HP_POP2(HP_npc_check_areanpc), 3182 },
+	{ HP_POP(npc->checknear), HP_POP2(HP_npc_checknear), 3184 },
+	{ HP_POP(npc->globalmessage), HP_POP2(HP_npc_globalmessage), 3186 },
+	{ HP_POP(npc->run_tomb), HP_POP2(HP_npc_run_tomb), 3188 },
+	{ HP_POP(npc->click), HP_POP2(HP_npc_click), 3190 },
+	{ HP_POP(npc->scriptcont), HP_POP2(HP_npc_scriptcont), 3192 },
+	{ HP_POP(npc->buysellsel), HP_POP2(HP_npc_buysellsel), 3194 },
+	{ HP_POP(npc->cashshop_buylist), HP_POP2(HP_npc_cashshop_buylist), 3196 },
+	{ HP_POP(npc->buylist_sub), HP_POP2(HP_npc_buylist_sub), 3198 },
+	{ HP_POP(npc->cashshop_buy), HP_POP2(HP_npc_cashshop_buy), 3200 },
+	{ HP_POP(npc->buylist), HP_POP2(HP_npc_buylist), 3202 },
+	{ HP_POP(npc->selllist_sub), HP_POP2(HP_npc_selllist_sub), 3204 },
+	{ HP_POP(npc->selllist), HP_POP2(HP_npc_selllist), 3206 },
+	{ HP_POP(npc->remove_map), HP_POP2(HP_npc_remove_map), 3208 },
+	{ HP_POP(npc->unload_ev), HP_POP2(HP_npc_unload_ev), 3210 },
+	{ HP_POP(npc->unload_ev_label), HP_POP2(HP_npc_unload_ev_label), 3212 },
+	{ HP_POP(npc->unload_dup_sub), HP_POP2(HP_npc_unload_dup_sub), 3214 },
+	{ HP_POP(npc->unload_duplicates), HP_POP2(HP_npc_unload_duplicates), 3216 },
+	{ HP_POP(npc->unload), HP_POP2(HP_npc_unload), 3218 },
+	{ HP_POP(npc->clearsrcfile), HP_POP2(HP_npc_clearsrcfile), 3220 },
+	{ HP_POP(npc->addsrcfile), HP_POP2(HP_npc_addsrcfile), 3222 },
+	{ HP_POP(npc->delsrcfile), HP_POP2(HP_npc_delsrcfile), 3224 },
+	{ HP_POP(npc->parsename), HP_POP2(HP_npc_parsename), 3226 },
+	{ HP_POP(npc->add_warp), HP_POP2(HP_npc_add_warp), 3228 },
+	{ HP_POP(npc->parse_warp), HP_POP2(HP_npc_parse_warp), 3230 },
+	{ HP_POP(npc->parse_shop), HP_POP2(HP_npc_parse_shop), 3232 },
+	{ HP_POP(npc->convertlabel_db), HP_POP2(HP_npc_convertlabel_db), 3234 },
+	{ HP_POP(npc->skip_script), HP_POP2(HP_npc_skip_script), 3236 },
+	{ HP_POP(npc->parse_script), HP_POP2(HP_npc_parse_script), 3238 },
+	{ HP_POP(npc->parse_duplicate), HP_POP2(HP_npc_parse_duplicate), 3240 },
+	{ HP_POP(npc->duplicate4instance), HP_POP2(HP_npc_duplicate4instance), 3242 },
+	{ HP_POP(npc->setcells), HP_POP2(HP_npc_setcells), 3244 },
+	{ HP_POP(npc->unsetcells_sub), HP_POP2(HP_npc_unsetcells_sub), 3246 },
+	{ HP_POP(npc->unsetcells), HP_POP2(HP_npc_unsetcells), 3248 },
+	{ HP_POP(npc->movenpc), HP_POP2(HP_npc_movenpc), 3250 },
+	{ HP_POP(npc->setdisplayname), HP_POP2(HP_npc_setdisplayname), 3252 },
+	{ HP_POP(npc->setclass), HP_POP2(HP_npc_setclass), 3254 },
+	{ HP_POP(npc->do_atcmd_event), HP_POP2(HP_npc_do_atcmd_event), 3256 },
+	{ HP_POP(npc->parse_function), HP_POP2(HP_npc_parse_function), 3258 },
+	{ HP_POP(npc->parse_mob2), HP_POP2(HP_npc_parse_mob2), 3260 },
+	{ HP_POP(npc->parse_mob), HP_POP2(HP_npc_parse_mob), 3262 },
+	{ HP_POP(npc->parse_mapflag), HP_POP2(HP_npc_parse_mapflag), 3264 },
+	{ HP_POP(npc->parsesrcfile), HP_POP2(HP_npc_parsesrcfile), 3266 },
+	{ HP_POP(npc->script_event), HP_POP2(HP_npc_script_event), 3268 },
+	{ HP_POP(npc->read_event_script), HP_POP2(HP_npc_read_event_script), 3270 },
+	{ HP_POP(npc->path_db_clear_sub), HP_POP2(HP_npc_path_db_clear_sub), 3272 },
+	{ HP_POP(npc->ev_label_db_clear_sub), HP_POP2(HP_npc_ev_label_db_clear_sub), 3274 },
+	{ HP_POP(npc->reload), HP_POP2(HP_npc_reload), 3276 },
+	{ HP_POP(npc->unloadfile), HP_POP2(HP_npc_unloadfile), 3278 },
+	{ HP_POP(npc->do_clear_npc), HP_POP2(HP_npc_do_clear_npc), 3280 },
+	{ HP_POP(npc->debug_warps_sub), HP_POP2(HP_npc_debug_warps_sub), 3282 },
+	{ HP_POP(npc->debug_warps), HP_POP2(HP_npc_debug_warps), 3284 },
+	{ HP_POP(npc->secure_timeout_timer), HP_POP2(HP_npc_secure_timeout_timer), 3286 },
 /* party */
-	{ HP_POP(party->init), HP_POP2(HP_party_init), 3274 },
-	{ HP_POP(party->final), HP_POP2(HP_party_final), 3276 },
-	{ HP_POP(party->search), HP_POP2(HP_party_search), 3278 },
-	{ HP_POP(party->searchname), HP_POP2(HP_party_searchname), 3280 },
-	{ HP_POP(party->getmemberid), HP_POP2(HP_party_getmemberid), 3282 },
-	{ HP_POP(party->getavailablesd), HP_POP2(HP_party_getavailablesd), 3284 },
-	{ HP_POP(party->create), HP_POP2(HP_party_create), 3286 },
-	{ HP_POP(party->created), HP_POP2(HP_party_created), 3288 },
-	{ HP_POP(party->request_info), HP_POP2(HP_party_request_info), 3290 },
-	{ HP_POP(party->invite), HP_POP2(HP_party_invite), 3292 },
-	{ HP_POP(party->member_joined), HP_POP2(HP_party_member_joined), 3294 },
-	{ HP_POP(party->member_added), HP_POP2(HP_party_member_added), 3296 },
-	{ HP_POP(party->leave), HP_POP2(HP_party_leave), 3298 },
-	{ HP_POP(party->removemember), HP_POP2(HP_party_removemember), 3300 },
-	{ HP_POP(party->member_withdraw), HP_POP2(HP_party_member_withdraw), 3302 },
-	{ HP_POP(party->reply_invite), HP_POP2(HP_party_reply_invite), 3304 },
-	{ HP_POP(party->recv_noinfo), HP_POP2(HP_party_recv_noinfo), 3306 },
-	{ HP_POP(party->recv_info), HP_POP2(HP_party_recv_info), 3308 },
-	{ HP_POP(party->recv_movemap), HP_POP2(HP_party_recv_movemap), 3310 },
-	{ HP_POP(party->broken), HP_POP2(HP_party_broken), 3312 },
-	{ HP_POP(party->optionchanged), HP_POP2(HP_party_optionchanged), 3314 },
-	{ HP_POP(party->changeoption), HP_POP2(HP_party_changeoption), 3316 },
-	{ HP_POP(party->changeleader), HP_POP2(HP_party_changeleader), 3318 },
-	{ HP_POP(party->send_movemap), HP_POP2(HP_party_send_movemap), 3320 },
-	{ HP_POP(party->send_levelup), HP_POP2(HP_party_send_levelup), 3322 },
-	{ HP_POP(party->send_logout), HP_POP2(HP_party_send_logout), 3324 },
-	{ HP_POP(party->send_message), HP_POP2(HP_party_send_message), 3326 },
-	{ HP_POP(party->recv_message), HP_POP2(HP_party_recv_message), 3328 },
-	{ HP_POP(party->skill_check), HP_POP2(HP_party_skill_check), 3330 },
-	{ HP_POP(party->send_xy_clear), HP_POP2(HP_party_send_xy_clear), 3332 },
-	{ HP_POP(party->exp_share), HP_POP2(HP_party_exp_share), 3334 },
-	{ HP_POP(party->share_loot), HP_POP2(HP_party_share_loot), 3336 },
-	{ HP_POP(party->send_dot_remove), HP_POP2(HP_party_send_dot_remove), 3338 },
-	{ HP_POP(party->sub_count), HP_POP2(HP_party_sub_count), 3340 },
-	{ HP_POP(party->booking_register), HP_POP2(HP_party_booking_register), 3342 },
-	{ HP_POP(party->booking_update), HP_POP2(HP_party_booking_update), 3344 },
-	{ HP_POP(party->booking_search), HP_POP2(HP_party_booking_search), 3346 },
-	{ HP_POP(party->recruit_register), HP_POP2(HP_party_recruit_register), 3348 },
-	{ HP_POP(party->recruit_update), HP_POP2(HP_party_recruit_update), 3350 },
-	{ HP_POP(party->recruit_search), HP_POP2(HP_party_recruit_search), 3352 },
-	{ HP_POP(party->booking_delete), HP_POP2(HP_party_booking_delete), 3354 },
-	{ HP_POP(party->vforeachsamemap), HP_POP2(HP_party_vforeachsamemap), 3356 },
-	{ HP_POP(party->send_xy_timer), HP_POP2(HP_party_send_xy_timer), 3358 },
-	{ HP_POP(party->fill_member), HP_POP2(HP_party_fill_member), 3360 },
-	{ HP_POP(party->sd_check), HP_POP2(HP_party_sd_check), 3362 },
-	{ HP_POP(party->check_state), HP_POP2(HP_party_check_state), 3364 },
-	{ HP_POP(party->create_booking_data), HP_POP2(HP_party_create_booking_data), 3366 },
-	{ HP_POP(party->db_final), HP_POP2(HP_party_db_final), 3368 },
+	{ HP_POP(party->init), HP_POP2(HP_party_init), 3288 },
+	{ HP_POP(party->final), HP_POP2(HP_party_final), 3290 },
+	{ HP_POP(party->search), HP_POP2(HP_party_search), 3292 },
+	{ HP_POP(party->searchname), HP_POP2(HP_party_searchname), 3294 },
+	{ HP_POP(party->getmemberid), HP_POP2(HP_party_getmemberid), 3296 },
+	{ HP_POP(party->getavailablesd), HP_POP2(HP_party_getavailablesd), 3298 },
+	{ HP_POP(party->create), HP_POP2(HP_party_create), 3300 },
+	{ HP_POP(party->created), HP_POP2(HP_party_created), 3302 },
+	{ HP_POP(party->request_info), HP_POP2(HP_party_request_info), 3304 },
+	{ HP_POP(party->invite), HP_POP2(HP_party_invite), 3306 },
+	{ HP_POP(party->member_joined), HP_POP2(HP_party_member_joined), 3308 },
+	{ HP_POP(party->member_added), HP_POP2(HP_party_member_added), 3310 },
+	{ HP_POP(party->leave), HP_POP2(HP_party_leave), 3312 },
+	{ HP_POP(party->removemember), HP_POP2(HP_party_removemember), 3314 },
+	{ HP_POP(party->member_withdraw), HP_POP2(HP_party_member_withdraw), 3316 },
+	{ HP_POP(party->reply_invite), HP_POP2(HP_party_reply_invite), 3318 },
+	{ HP_POP(party->recv_noinfo), HP_POP2(HP_party_recv_noinfo), 3320 },
+	{ HP_POP(party->recv_info), HP_POP2(HP_party_recv_info), 3322 },
+	{ HP_POP(party->recv_movemap), HP_POP2(HP_party_recv_movemap), 3324 },
+	{ HP_POP(party->broken), HP_POP2(HP_party_broken), 3326 },
+	{ HP_POP(party->optionchanged), HP_POP2(HP_party_optionchanged), 3328 },
+	{ HP_POP(party->changeoption), HP_POP2(HP_party_changeoption), 3330 },
+	{ HP_POP(party->changeleader), HP_POP2(HP_party_changeleader), 3332 },
+	{ HP_POP(party->send_movemap), HP_POP2(HP_party_send_movemap), 3334 },
+	{ HP_POP(party->send_levelup), HP_POP2(HP_party_send_levelup), 3336 },
+	{ HP_POP(party->send_logout), HP_POP2(HP_party_send_logout), 3338 },
+	{ HP_POP(party->send_message), HP_POP2(HP_party_send_message), 3340 },
+	{ HP_POP(party->recv_message), HP_POP2(HP_party_recv_message), 3342 },
+	{ HP_POP(party->skill_check), HP_POP2(HP_party_skill_check), 3344 },
+	{ HP_POP(party->send_xy_clear), HP_POP2(HP_party_send_xy_clear), 3346 },
+	{ HP_POP(party->exp_share), HP_POP2(HP_party_exp_share), 3348 },
+	{ HP_POP(party->share_loot), HP_POP2(HP_party_share_loot), 3350 },
+	{ HP_POP(party->send_dot_remove), HP_POP2(HP_party_send_dot_remove), 3352 },
+	{ HP_POP(party->sub_count), HP_POP2(HP_party_sub_count), 3354 },
+	{ HP_POP(party->booking_register), HP_POP2(HP_party_booking_register), 3356 },
+	{ HP_POP(party->booking_update), HP_POP2(HP_party_booking_update), 3358 },
+	{ HP_POP(party->booking_search), HP_POP2(HP_party_booking_search), 3360 },
+	{ HP_POP(party->recruit_register), HP_POP2(HP_party_recruit_register), 3362 },
+	{ HP_POP(party->recruit_update), HP_POP2(HP_party_recruit_update), 3364 },
+	{ HP_POP(party->recruit_search), HP_POP2(HP_party_recruit_search), 3366 },
+	{ HP_POP(party->booking_delete), HP_POP2(HP_party_booking_delete), 3368 },
+	{ HP_POP(party->vforeachsamemap), HP_POP2(HP_party_vforeachsamemap), 3370 },
+	{ HP_POP(party->send_xy_timer), HP_POP2(HP_party_send_xy_timer), 3372 },
+	{ HP_POP(party->fill_member), HP_POP2(HP_party_fill_member), 3374 },
+	{ HP_POP(party->sd_check), HP_POP2(HP_party_sd_check), 3376 },
+	{ HP_POP(party->check_state), HP_POP2(HP_party_check_state), 3378 },
+	{ HP_POP(party->create_booking_data), HP_POP2(HP_party_create_booking_data), 3380 },
+	{ HP_POP(party->db_final), HP_POP2(HP_party_db_final), 3382 },
 /* path */
-	{ HP_POP(path->blownpos), HP_POP2(HP_path_blownpos), 3370 },
-	{ HP_POP(path->search), HP_POP2(HP_path_search), 3372 },
-	{ HP_POP(path->search_long), HP_POP2(HP_path_search_long), 3374 },
-	{ HP_POP(path->check_distance), HP_POP2(HP_path_check_distance), 3376 },
-	{ HP_POP(path->distance), HP_POP2(HP_path_distance), 3378 },
+	{ HP_POP(path->blownpos), HP_POP2(HP_path_blownpos), 3384 },
+	{ HP_POP(path->search), HP_POP2(HP_path_search), 3386 },
+	{ HP_POP(path->search_long), HP_POP2(HP_path_search_long), 3388 },
+	{ HP_POP(path->check_distance), HP_POP2(HP_path_check_distance), 3390 },
+	{ HP_POP(path->distance), HP_POP2(HP_path_distance), 3392 },
 /* pc */
-	{ HP_POP(pc->init), HP_POP2(HP_pc_init), 3380 },
-	{ HP_POP(pc->final), HP_POP2(HP_pc_final), 3382 },
-	{ HP_POP(pc->get_dummy_sd), HP_POP2(HP_pc_get_dummy_sd), 3384 },
-	{ HP_POP(pc->class2idx), HP_POP2(HP_pc_class2idx), 3386 },
-	{ HP_POP(pc->get_group_level), HP_POP2(HP_pc_get_group_level), 3388 },
-	{ HP_POP(pc->can_give_items), HP_POP2(HP_pc_can_give_items), 3390 },
-	{ HP_POP(pc->can_use_command), HP_POP2(HP_pc_can_use_command), 3392 },
-	{ HP_POP(pc->has_permission), HP_POP2(HP_pc_has_permission), 3394 },
-	{ HP_POP(pc->set_group), HP_POP2(HP_pc_set_group), 3396 },
-	{ HP_POP(pc->should_log_commands), HP_POP2(HP_pc_should_log_commands), 3398 },
-	{ HP_POP(pc->setrestartvalue), HP_POP2(HP_pc_setrestartvalue), 3400 },
-	{ HP_POP(pc->makesavestatus), HP_POP2(HP_pc_makesavestatus), 3402 },
-	{ HP_POP(pc->respawn), HP_POP2(HP_pc_respawn), 3404 },
-	{ HP_POP(pc->setnewpc), HP_POP2(HP_pc_setnewpc), 3406 },
-	{ HP_POP(pc->authok), HP_POP2(HP_pc_authok), 3408 },
-	{ HP_POP(pc->authfail), HP_POP2(HP_pc_authfail), 3410 },
-	{ HP_POP(pc->reg_received), HP_POP2(HP_pc_reg_received), 3412 },
-	{ HP_POP(pc->isequip), HP_POP2(HP_pc_isequip), 3414 },
-	{ HP_POP(pc->equippoint), HP_POP2(HP_pc_equippoint), 3416 },
-	{ HP_POP(pc->setinventorydata), HP_POP2(HP_pc_setinventorydata), 3418 },
-	{ HP_POP(pc->checkskill), HP_POP2(HP_pc_checkskill), 3420 },
-	{ HP_POP(pc->checkskill2), HP_POP2(HP_pc_checkskill2), 3422 },
-	{ HP_POP(pc->checkallowskill), HP_POP2(HP_pc_checkallowskill), 3424 },
-	{ HP_POP(pc->checkequip), HP_POP2(HP_pc_checkequip), 3426 },
-	{ HP_POP(pc->calc_skilltree), HP_POP2(HP_pc_calc_skilltree), 3428 },
-	{ HP_POP(pc->calc_skilltree_normalize_job), HP_POP2(HP_pc_calc_skilltree_normalize_job), 3430 },
-	{ HP_POP(pc->clean_skilltree), HP_POP2(HP_pc_clean_skilltree), 3432 },
-	{ HP_POP(pc->setpos), HP_POP2(HP_pc_setpos), 3434 },
-	{ HP_POP(pc->setsavepoint), HP_POP2(HP_pc_setsavepoint), 3436 },
-	{ HP_POP(pc->randomwarp), HP_POP2(HP_pc_randomwarp), 3438 },
-	{ HP_POP(pc->memo), HP_POP2(HP_pc_memo), 3440 },
-	{ HP_POP(pc->checkadditem), HP_POP2(HP_pc_checkadditem), 3442 },
-	{ HP_POP(pc->inventoryblank), HP_POP2(HP_pc_inventoryblank), 3444 },
-	{ HP_POP(pc->search_inventory), HP_POP2(HP_pc_search_inventory), 3446 },
-	{ HP_POP(pc->payzeny), HP_POP2(HP_pc_payzeny), 3448 },
-	{ HP_POP(pc->additem), HP_POP2(HP_pc_additem), 3450 },
-	{ HP_POP(pc->getzeny), HP_POP2(HP_pc_getzeny), 3452 },
-	{ HP_POP(pc->delitem), HP_POP2(HP_pc_delitem), 3454 },
-	{ HP_POP(pc->paycash), HP_POP2(HP_pc_paycash), 3456 },
-	{ HP_POP(pc->getcash), HP_POP2(HP_pc_getcash), 3458 },
-	{ HP_POP(pc->cart_additem), HP_POP2(HP_pc_cart_additem), 3460 },
-	{ HP_POP(pc->cart_delitem), HP_POP2(HP_pc_cart_delitem), 3462 },
-	{ HP_POP(pc->putitemtocart), HP_POP2(HP_pc_putitemtocart), 3464 },
-	{ HP_POP(pc->getitemfromcart), HP_POP2(HP_pc_getitemfromcart), 3466 },
-	{ HP_POP(pc->cartitem_amount), HP_POP2(HP_pc_cartitem_amount), 3468 },
-	{ HP_POP(pc->takeitem), HP_POP2(HP_pc_takeitem), 3470 },
-	{ HP_POP(pc->dropitem), HP_POP2(HP_pc_dropitem), 3472 },
-	{ HP_POP(pc->isequipped), HP_POP2(HP_pc_isequipped), 3474 },
-	{ HP_POP(pc->can_Adopt), HP_POP2(HP_pc_can_Adopt), 3476 },
-	{ HP_POP(pc->adoption), HP_POP2(HP_pc_adoption), 3478 },
-	{ HP_POP(pc->updateweightstatus), HP_POP2(HP_pc_updateweightstatus), 3480 },
-	{ HP_POP(pc->addautobonus), HP_POP2(HP_pc_addautobonus), 3482 },
-	{ HP_POP(pc->exeautobonus), HP_POP2(HP_pc_exeautobonus), 3484 },
-	{ HP_POP(pc->endautobonus), HP_POP2(HP_pc_endautobonus), 3486 },
-	{ HP_POP(pc->delautobonus), HP_POP2(HP_pc_delautobonus), 3488 },
-	{ HP_POP(pc->bonus), HP_POP2(HP_pc_bonus), 3490 },
-	{ HP_POP(pc->bonus2), HP_POP2(HP_pc_bonus2), 3492 },
-	{ HP_POP(pc->bonus3), HP_POP2(HP_pc_bonus3), 3494 },
-	{ HP_POP(pc->bonus4), HP_POP2(HP_pc_bonus4), 3496 },
-	{ HP_POP(pc->bonus5), HP_POP2(HP_pc_bonus5), 3498 },
-	{ HP_POP(pc->skill), HP_POP2(HP_pc_skill), 3500 },
-	{ HP_POP(pc->insert_card), HP_POP2(HP_pc_insert_card), 3502 },
-	{ HP_POP(pc->steal_item), HP_POP2(HP_pc_steal_item), 3504 },
-	{ HP_POP(pc->steal_coin), HP_POP2(HP_pc_steal_coin), 3506 },
-	{ HP_POP(pc->modifybuyvalue), HP_POP2(HP_pc_modifybuyvalue), 3508 },
-	{ HP_POP(pc->modifysellvalue), HP_POP2(HP_pc_modifysellvalue), 3510 },
-	{ HP_POP(pc->follow), HP_POP2(HP_pc_follow), 3512 },
-	{ HP_POP(pc->stop_following), HP_POP2(HP_pc_stop_following), 3514 },
-	{ HP_POP(pc->maxbaselv), HP_POP2(HP_pc_maxbaselv), 3516 },
-	{ HP_POP(pc->maxjoblv), HP_POP2(HP_pc_maxjoblv), 3518 },
-	{ HP_POP(pc->checkbaselevelup), HP_POP2(HP_pc_checkbaselevelup), 3520 },
-	{ HP_POP(pc->checkjoblevelup), HP_POP2(HP_pc_checkjoblevelup), 3522 },
-	{ HP_POP(pc->gainexp), HP_POP2(HP_pc_gainexp), 3524 },
-	{ HP_POP(pc->nextbaseexp), HP_POP2(HP_pc_nextbaseexp), 3526 },
-	{ HP_POP(pc->thisbaseexp), HP_POP2(HP_pc_thisbaseexp), 3528 },
-	{ HP_POP(pc->nextjobexp), HP_POP2(HP_pc_nextjobexp), 3530 },
-	{ HP_POP(pc->thisjobexp), HP_POP2(HP_pc_thisjobexp), 3532 },
-	{ HP_POP(pc->gets_status_point), HP_POP2(HP_pc_gets_status_point), 3534 },
-	{ HP_POP(pc->need_status_point), HP_POP2(HP_pc_need_status_point), 3536 },
-	{ HP_POP(pc->statusup), HP_POP2(HP_pc_statusup), 3538 },
-	{ HP_POP(pc->statusup2), HP_POP2(HP_pc_statusup2), 3540 },
-	{ HP_POP(pc->skillup), HP_POP2(HP_pc_skillup), 3542 },
-	{ HP_POP(pc->allskillup), HP_POP2(HP_pc_allskillup), 3544 },
-	{ HP_POP(pc->resetlvl), HP_POP2(HP_pc_resetlvl), 3546 },
-	{ HP_POP(pc->resetstate), HP_POP2(HP_pc_resetstate), 3548 },
-	{ HP_POP(pc->resetskill), HP_POP2(HP_pc_resetskill), 3550 },
-	{ HP_POP(pc->resetfeel), HP_POP2(HP_pc_resetfeel), 3552 },
-	{ HP_POP(pc->resethate), HP_POP2(HP_pc_resethate), 3554 },
-	{ HP_POP(pc->equipitem), HP_POP2(HP_pc_equipitem), 3556 },
-	{ HP_POP(pc->unequipitem), HP_POP2(HP_pc_unequipitem), 3558 },
-	{ HP_POP(pc->checkitem), HP_POP2(HP_pc_checkitem), 3560 },
-	{ HP_POP(pc->useitem), HP_POP2(HP_pc_useitem), 3562 },
-	{ HP_POP(pc->skillatk_bonus), HP_POP2(HP_pc_skillatk_bonus), 3564 },
-	{ HP_POP(pc->skillheal_bonus), HP_POP2(HP_pc_skillheal_bonus), 3566 },
-	{ HP_POP(pc->skillheal2_bonus), HP_POP2(HP_pc_skillheal2_bonus), 3568 },
-	{ HP_POP(pc->damage), HP_POP2(HP_pc_damage), 3570 },
-	{ HP_POP(pc->dead), HP_POP2(HP_pc_dead), 3572 },
-	{ HP_POP(pc->revive), HP_POP2(HP_pc_revive), 3574 },
-	{ HP_POP(pc->heal), HP_POP2(HP_pc_heal), 3576 },
-	{ HP_POP(pc->itemheal), HP_POP2(HP_pc_itemheal), 3578 },
-	{ HP_POP(pc->percentheal), HP_POP2(HP_pc_percentheal), 3580 },
-	{ HP_POP(pc->jobchange), HP_POP2(HP_pc_jobchange), 3582 },
-	{ HP_POP(pc->setoption), HP_POP2(HP_pc_setoption), 3584 },
-	{ HP_POP(pc->setcart), HP_POP2(HP_pc_setcart), 3586 },
-	{ HP_POP(pc->setfalcon), HP_POP2(HP_pc_setfalcon), 3588 },
-	{ HP_POP(pc->setriding), HP_POP2(HP_pc_setriding), 3590 },
-	{ HP_POP(pc->setmadogear), HP_POP2(HP_pc_setmadogear), 3592 },
-	{ HP_POP(pc->changelook), HP_POP2(HP_pc_changelook), 3594 },
-	{ HP_POP(pc->equiplookall), HP_POP2(HP_pc_equiplookall), 3596 },
-	{ HP_POP(pc->readparam), HP_POP2(HP_pc_readparam), 3598 },
-	{ HP_POP(pc->setparam), HP_POP2(HP_pc_setparam), 3600 },
-	{ HP_POP(pc->readreg), HP_POP2(HP_pc_readreg), 3602 },
-	{ HP_POP(pc->setreg), HP_POP2(HP_pc_setreg), 3604 },
-	{ HP_POP(pc->readregstr), HP_POP2(HP_pc_readregstr), 3606 },
-	{ HP_POP(pc->setregstr), HP_POP2(HP_pc_setregstr), 3608 },
-	{ HP_POP(pc->readregistry), HP_POP2(HP_pc_readregistry), 3610 },
-	{ HP_POP(pc->setregistry), HP_POP2(HP_pc_setregistry), 3612 },
-	{ HP_POP(pc->readregistry_str), HP_POP2(HP_pc_readregistry_str), 3614 },
-	{ HP_POP(pc->setregistry_str), HP_POP2(HP_pc_setregistry_str), 3616 },
-	{ HP_POP(pc->addeventtimer), HP_POP2(HP_pc_addeventtimer), 3618 },
-	{ HP_POP(pc->deleventtimer), HP_POP2(HP_pc_deleventtimer), 3620 },
-	{ HP_POP(pc->cleareventtimer), HP_POP2(HP_pc_cleareventtimer), 3622 },
-	{ HP_POP(pc->addeventtimercount), HP_POP2(HP_pc_addeventtimercount), 3624 },
-	{ HP_POP(pc->calc_pvprank), HP_POP2(HP_pc_calc_pvprank), 3626 },
-	{ HP_POP(pc->calc_pvprank_timer), HP_POP2(HP_pc_calc_pvprank_timer), 3628 },
-	{ HP_POP(pc->ismarried), HP_POP2(HP_pc_ismarried), 3630 },
-	{ HP_POP(pc->marriage), HP_POP2(HP_pc_marriage), 3632 },
-	{ HP_POP(pc->divorce), HP_POP2(HP_pc_divorce), 3634 },
-	{ HP_POP(pc->get_partner), HP_POP2(HP_pc_get_partner), 3636 },
-	{ HP_POP(pc->get_father), HP_POP2(HP_pc_get_father), 3638 },
-	{ HP_POP(pc->get_mother), HP_POP2(HP_pc_get_mother), 3640 },
-	{ HP_POP(pc->get_child), HP_POP2(HP_pc_get_child), 3642 },
-	{ HP_POP(pc->bleeding), HP_POP2(HP_pc_bleeding), 3644 },
-	{ HP_POP(pc->regen), HP_POP2(HP_pc_regen), 3646 },
-	{ HP_POP(pc->setstand), HP_POP2(HP_pc_setstand), 3648 },
-	{ HP_POP(pc->candrop), HP_POP2(HP_pc_candrop), 3650 },
-	{ HP_POP(pc->jobid2mapid), HP_POP2(HP_pc_jobid2mapid), 3652 },
-	{ HP_POP(pc->mapid2jobid), HP_POP2(HP_pc_mapid2jobid), 3654 },
-	{ HP_POP(pc->job_name), HP_POP2(HP_pc_job_name), 3656 },
-	{ HP_POP(pc->setinvincibletimer), HP_POP2(HP_pc_setinvincibletimer), 3658 },
-	{ HP_POP(pc->delinvincibletimer), HP_POP2(HP_pc_delinvincibletimer), 3660 },
-	{ HP_POP(pc->addspiritball), HP_POP2(HP_pc_addspiritball), 3662 },
-	{ HP_POP(pc->delspiritball), HP_POP2(HP_pc_delspiritball), 3664 },
-	{ HP_POP(pc->addfame), HP_POP2(HP_pc_addfame), 3666 },
-	{ HP_POP(pc->famerank), HP_POP2(HP_pc_famerank), 3668 },
-	{ HP_POP(pc->set_hate_mob), HP_POP2(HP_pc_set_hate_mob), 3670 },
-	{ HP_POP(pc->readdb), HP_POP2(HP_pc_readdb), 3672 },
-	{ HP_POP(pc->map_day_timer), HP_POP2(HP_pc_map_day_timer), 3674 },
-	{ HP_POP(pc->map_night_timer), HP_POP2(HP_pc_map_night_timer), 3676 },
-	{ HP_POP(pc->inventory_rentals), HP_POP2(HP_pc_inventory_rentals), 3678 },
-	{ HP_POP(pc->inventory_rental_clear), HP_POP2(HP_pc_inventory_rental_clear), 3680 },
-	{ HP_POP(pc->inventory_rental_add), HP_POP2(HP_pc_inventory_rental_add), 3682 },
-	{ HP_POP(pc->disguise), HP_POP2(HP_pc_disguise), 3684 },
-	{ HP_POP(pc->isautolooting), HP_POP2(HP_pc_isautolooting), 3686 },
-	{ HP_POP(pc->overheat), HP_POP2(HP_pc_overheat), 3688 },
-	{ HP_POP(pc->banding), HP_POP2(HP_pc_banding), 3690 },
-	{ HP_POP(pc->itemcd_do), HP_POP2(HP_pc_itemcd_do), 3692 },
-	{ HP_POP(pc->load_combo), HP_POP2(HP_pc_load_combo), 3694 },
-	{ HP_POP(pc->add_charm), HP_POP2(HP_pc_add_charm), 3696 },
-	{ HP_POP(pc->del_charm), HP_POP2(HP_pc_del_charm), 3698 },
-	{ HP_POP(pc->baselevelchanged), HP_POP2(HP_pc_baselevelchanged), 3700 },
-	{ HP_POP(pc->level_penalty_mod), HP_POP2(HP_pc_level_penalty_mod), 3702 },
-	{ HP_POP(pc->calc_skillpoint), HP_POP2(HP_pc_calc_skillpoint), 3704 },
-	{ HP_POP(pc->invincible_timer), HP_POP2(HP_pc_invincible_timer), 3706 },
-	{ HP_POP(pc->spiritball_timer), HP_POP2(HP_pc_spiritball_timer), 3708 },
-	{ HP_POP(pc->check_banding), HP_POP2(HP_pc_check_banding), 3710 },
-	{ HP_POP(pc->inventory_rental_end), HP_POP2(HP_pc_inventory_rental_end), 3712 },
-	{ HP_POP(pc->check_skilltree), HP_POP2(HP_pc_check_skilltree), 3714 },
-	{ HP_POP(pc->bonus_autospell), HP_POP2(HP_pc_bonus_autospell), 3716 },
-	{ HP_POP(pc->bonus_autospell_onskill), HP_POP2(HP_pc_bonus_autospell_onskill), 3718 },
-	{ HP_POP(pc->bonus_addeff), HP_POP2(HP_pc_bonus_addeff), 3720 },
-	{ HP_POP(pc->bonus_addeff_onskill), HP_POP2(HP_pc_bonus_addeff_onskill), 3722 },
-	{ HP_POP(pc->bonus_item_drop), HP_POP2(HP_pc_bonus_item_drop), 3724 },
-	{ HP_POP(pc->calcexp), HP_POP2(HP_pc_calcexp), 3726 },
-	{ HP_POP(pc->respawn_timer), HP_POP2(HP_pc_respawn_timer), 3728 },
-	{ HP_POP(pc->jobchange_killclone), HP_POP2(HP_pc_jobchange_killclone), 3730 },
-	{ HP_POP(pc->getstat), HP_POP2(HP_pc_getstat), 3732 },
-	{ HP_POP(pc->setstat), HP_POP2(HP_pc_setstat), 3734 },
-	{ HP_POP(pc->eventtimer), HP_POP2(HP_pc_eventtimer), 3736 },
-	{ HP_POP(pc->daynight_timer_sub), HP_POP2(HP_pc_daynight_timer_sub), 3738 },
-	{ HP_POP(pc->charm_timer), HP_POP2(HP_pc_charm_timer), 3740 },
-	{ HP_POP(pc->readdb_levelpenalty), HP_POP2(HP_pc_readdb_levelpenalty), 3742 },
-	{ HP_POP(pc->autosave), HP_POP2(HP_pc_autosave), 3744 },
-	{ HP_POP(pc->follow_timer), HP_POP2(HP_pc_follow_timer), 3746 },
-	{ HP_POP(pc->read_skill_tree), HP_POP2(HP_pc_read_skill_tree), 3748 },
-	{ HP_POP(pc->isUseitem), HP_POP2(HP_pc_isUseitem), 3750 },
-	{ HP_POP(pc->show_steal), HP_POP2(HP_pc_show_steal), 3752 },
-	{ HP_POP(pc->checkcombo), HP_POP2(HP_pc_checkcombo), 3754 },
-	{ HP_POP(pc->calcweapontype), HP_POP2(HP_pc_calcweapontype), 3756 },
-	{ HP_POP(pc->removecombo), HP_POP2(HP_pc_removecombo), 3758 },
+	{ HP_POP(pc->init), HP_POP2(HP_pc_init), 3394 },
+	{ HP_POP(pc->final), HP_POP2(HP_pc_final), 3396 },
+	{ HP_POP(pc->get_dummy_sd), HP_POP2(HP_pc_get_dummy_sd), 3398 },
+	{ HP_POP(pc->class2idx), HP_POP2(HP_pc_class2idx), 3400 },
+	{ HP_POP(pc->get_group_level), HP_POP2(HP_pc_get_group_level), 3402 },
+	{ HP_POP(pc->can_give_items), HP_POP2(HP_pc_can_give_items), 3404 },
+	{ HP_POP(pc->can_use_command), HP_POP2(HP_pc_can_use_command), 3406 },
+	{ HP_POP(pc->has_permission), HP_POP2(HP_pc_has_permission), 3408 },
+	{ HP_POP(pc->set_group), HP_POP2(HP_pc_set_group), 3410 },
+	{ HP_POP(pc->should_log_commands), HP_POP2(HP_pc_should_log_commands), 3412 },
+	{ HP_POP(pc->setrestartvalue), HP_POP2(HP_pc_setrestartvalue), 3414 },
+	{ HP_POP(pc->makesavestatus), HP_POP2(HP_pc_makesavestatus), 3416 },
+	{ HP_POP(pc->respawn), HP_POP2(HP_pc_respawn), 3418 },
+	{ HP_POP(pc->setnewpc), HP_POP2(HP_pc_setnewpc), 3420 },
+	{ HP_POP(pc->authok), HP_POP2(HP_pc_authok), 3422 },
+	{ HP_POP(pc->authfail), HP_POP2(HP_pc_authfail), 3424 },
+	{ HP_POP(pc->reg_received), HP_POP2(HP_pc_reg_received), 3426 },
+	{ HP_POP(pc->isequip), HP_POP2(HP_pc_isequip), 3428 },
+	{ HP_POP(pc->equippoint), HP_POP2(HP_pc_equippoint), 3430 },
+	{ HP_POP(pc->setinventorydata), HP_POP2(HP_pc_setinventorydata), 3432 },
+	{ HP_POP(pc->checkskill), HP_POP2(HP_pc_checkskill), 3434 },
+	{ HP_POP(pc->checkskill2), HP_POP2(HP_pc_checkskill2), 3436 },
+	{ HP_POP(pc->checkallowskill), HP_POP2(HP_pc_checkallowskill), 3438 },
+	{ HP_POP(pc->checkequip), HP_POP2(HP_pc_checkequip), 3440 },
+	{ HP_POP(pc->calc_skilltree), HP_POP2(HP_pc_calc_skilltree), 3442 },
+	{ HP_POP(pc->calc_skilltree_normalize_job), HP_POP2(HP_pc_calc_skilltree_normalize_job), 3444 },
+	{ HP_POP(pc->clean_skilltree), HP_POP2(HP_pc_clean_skilltree), 3446 },
+	{ HP_POP(pc->setpos), HP_POP2(HP_pc_setpos), 3448 },
+	{ HP_POP(pc->setsavepoint), HP_POP2(HP_pc_setsavepoint), 3450 },
+	{ HP_POP(pc->randomwarp), HP_POP2(HP_pc_randomwarp), 3452 },
+	{ HP_POP(pc->memo), HP_POP2(HP_pc_memo), 3454 },
+	{ HP_POP(pc->checkadditem), HP_POP2(HP_pc_checkadditem), 3456 },
+	{ HP_POP(pc->inventoryblank), HP_POP2(HP_pc_inventoryblank), 3458 },
+	{ HP_POP(pc->search_inventory), HP_POP2(HP_pc_search_inventory), 3460 },
+	{ HP_POP(pc->payzeny), HP_POP2(HP_pc_payzeny), 3462 },
+	{ HP_POP(pc->additem), HP_POP2(HP_pc_additem), 3464 },
+	{ HP_POP(pc->getzeny), HP_POP2(HP_pc_getzeny), 3466 },
+	{ HP_POP(pc->delitem), HP_POP2(HP_pc_delitem), 3468 },
+	{ HP_POP(pc->paycash), HP_POP2(HP_pc_paycash), 3470 },
+	{ HP_POP(pc->getcash), HP_POP2(HP_pc_getcash), 3472 },
+	{ HP_POP(pc->cart_additem), HP_POP2(HP_pc_cart_additem), 3474 },
+	{ HP_POP(pc->cart_delitem), HP_POP2(HP_pc_cart_delitem), 3476 },
+	{ HP_POP(pc->putitemtocart), HP_POP2(HP_pc_putitemtocart), 3478 },
+	{ HP_POP(pc->getitemfromcart), HP_POP2(HP_pc_getitemfromcart), 3480 },
+	{ HP_POP(pc->cartitem_amount), HP_POP2(HP_pc_cartitem_amount), 3482 },
+	{ HP_POP(pc->takeitem), HP_POP2(HP_pc_takeitem), 3484 },
+	{ HP_POP(pc->dropitem), HP_POP2(HP_pc_dropitem), 3486 },
+	{ HP_POP(pc->isequipped), HP_POP2(HP_pc_isequipped), 3488 },
+	{ HP_POP(pc->can_Adopt), HP_POP2(HP_pc_can_Adopt), 3490 },
+	{ HP_POP(pc->adoption), HP_POP2(HP_pc_adoption), 3492 },
+	{ HP_POP(pc->updateweightstatus), HP_POP2(HP_pc_updateweightstatus), 3494 },
+	{ HP_POP(pc->addautobonus), HP_POP2(HP_pc_addautobonus), 3496 },
+	{ HP_POP(pc->exeautobonus), HP_POP2(HP_pc_exeautobonus), 3498 },
+	{ HP_POP(pc->endautobonus), HP_POP2(HP_pc_endautobonus), 3500 },
+	{ HP_POP(pc->delautobonus), HP_POP2(HP_pc_delautobonus), 3502 },
+	{ HP_POP(pc->bonus), HP_POP2(HP_pc_bonus), 3504 },
+	{ HP_POP(pc->bonus2), HP_POP2(HP_pc_bonus2), 3506 },
+	{ HP_POP(pc->bonus3), HP_POP2(HP_pc_bonus3), 3508 },
+	{ HP_POP(pc->bonus4), HP_POP2(HP_pc_bonus4), 3510 },
+	{ HP_POP(pc->bonus5), HP_POP2(HP_pc_bonus5), 3512 },
+	{ HP_POP(pc->skill), HP_POP2(HP_pc_skill), 3514 },
+	{ HP_POP(pc->insert_card), HP_POP2(HP_pc_insert_card), 3516 },
+	{ HP_POP(pc->steal_item), HP_POP2(HP_pc_steal_item), 3518 },
+	{ HP_POP(pc->steal_coin), HP_POP2(HP_pc_steal_coin), 3520 },
+	{ HP_POP(pc->modifybuyvalue), HP_POP2(HP_pc_modifybuyvalue), 3522 },
+	{ HP_POP(pc->modifysellvalue), HP_POP2(HP_pc_modifysellvalue), 3524 },
+	{ HP_POP(pc->follow), HP_POP2(HP_pc_follow), 3526 },
+	{ HP_POP(pc->stop_following), HP_POP2(HP_pc_stop_following), 3528 },
+	{ HP_POP(pc->maxbaselv), HP_POP2(HP_pc_maxbaselv), 3530 },
+	{ HP_POP(pc->maxjoblv), HP_POP2(HP_pc_maxjoblv), 3532 },
+	{ HP_POP(pc->checkbaselevelup), HP_POP2(HP_pc_checkbaselevelup), 3534 },
+	{ HP_POP(pc->checkjoblevelup), HP_POP2(HP_pc_checkjoblevelup), 3536 },
+	{ HP_POP(pc->gainexp), HP_POP2(HP_pc_gainexp), 3538 },
+	{ HP_POP(pc->nextbaseexp), HP_POP2(HP_pc_nextbaseexp), 3540 },
+	{ HP_POP(pc->thisbaseexp), HP_POP2(HP_pc_thisbaseexp), 3542 },
+	{ HP_POP(pc->nextjobexp), HP_POP2(HP_pc_nextjobexp), 3544 },
+	{ HP_POP(pc->thisjobexp), HP_POP2(HP_pc_thisjobexp), 3546 },
+	{ HP_POP(pc->gets_status_point), HP_POP2(HP_pc_gets_status_point), 3548 },
+	{ HP_POP(pc->need_status_point), HP_POP2(HP_pc_need_status_point), 3550 },
+	{ HP_POP(pc->statusup), HP_POP2(HP_pc_statusup), 3552 },
+	{ HP_POP(pc->statusup2), HP_POP2(HP_pc_statusup2), 3554 },
+	{ HP_POP(pc->skillup), HP_POP2(HP_pc_skillup), 3556 },
+	{ HP_POP(pc->allskillup), HP_POP2(HP_pc_allskillup), 3558 },
+	{ HP_POP(pc->resetlvl), HP_POP2(HP_pc_resetlvl), 3560 },
+	{ HP_POP(pc->resetstate), HP_POP2(HP_pc_resetstate), 3562 },
+	{ HP_POP(pc->resetskill), HP_POP2(HP_pc_resetskill), 3564 },
+	{ HP_POP(pc->resetfeel), HP_POP2(HP_pc_resetfeel), 3566 },
+	{ HP_POP(pc->resethate), HP_POP2(HP_pc_resethate), 3568 },
+	{ HP_POP(pc->equipitem), HP_POP2(HP_pc_equipitem), 3570 },
+	{ HP_POP(pc->unequipitem), HP_POP2(HP_pc_unequipitem), 3572 },
+	{ HP_POP(pc->checkitem), HP_POP2(HP_pc_checkitem), 3574 },
+	{ HP_POP(pc->useitem), HP_POP2(HP_pc_useitem), 3576 },
+	{ HP_POP(pc->skillatk_bonus), HP_POP2(HP_pc_skillatk_bonus), 3578 },
+	{ HP_POP(pc->skillheal_bonus), HP_POP2(HP_pc_skillheal_bonus), 3580 },
+	{ HP_POP(pc->skillheal2_bonus), HP_POP2(HP_pc_skillheal2_bonus), 3582 },
+	{ HP_POP(pc->damage), HP_POP2(HP_pc_damage), 3584 },
+	{ HP_POP(pc->dead), HP_POP2(HP_pc_dead), 3586 },
+	{ HP_POP(pc->revive), HP_POP2(HP_pc_revive), 3588 },
+	{ HP_POP(pc->heal), HP_POP2(HP_pc_heal), 3590 },
+	{ HP_POP(pc->itemheal), HP_POP2(HP_pc_itemheal), 3592 },
+	{ HP_POP(pc->percentheal), HP_POP2(HP_pc_percentheal), 3594 },
+	{ HP_POP(pc->jobchange), HP_POP2(HP_pc_jobchange), 3596 },
+	{ HP_POP(pc->setoption), HP_POP2(HP_pc_setoption), 3598 },
+	{ HP_POP(pc->setcart), HP_POP2(HP_pc_setcart), 3600 },
+	{ HP_POP(pc->setfalcon), HP_POP2(HP_pc_setfalcon), 3602 },
+	{ HP_POP(pc->setriding), HP_POP2(HP_pc_setriding), 3604 },
+	{ HP_POP(pc->setmadogear), HP_POP2(HP_pc_setmadogear), 3606 },
+	{ HP_POP(pc->changelook), HP_POP2(HP_pc_changelook), 3608 },
+	{ HP_POP(pc->equiplookall), HP_POP2(HP_pc_equiplookall), 3610 },
+	{ HP_POP(pc->readparam), HP_POP2(HP_pc_readparam), 3612 },
+	{ HP_POP(pc->setparam), HP_POP2(HP_pc_setparam), 3614 },
+	{ HP_POP(pc->readreg), HP_POP2(HP_pc_readreg), 3616 },
+	{ HP_POP(pc->setreg), HP_POP2(HP_pc_setreg), 3618 },
+	{ HP_POP(pc->readregstr), HP_POP2(HP_pc_readregstr), 3620 },
+	{ HP_POP(pc->setregstr), HP_POP2(HP_pc_setregstr), 3622 },
+	{ HP_POP(pc->readregistry), HP_POP2(HP_pc_readregistry), 3624 },
+	{ HP_POP(pc->setregistry), HP_POP2(HP_pc_setregistry), 3626 },
+	{ HP_POP(pc->readregistry_str), HP_POP2(HP_pc_readregistry_str), 3628 },
+	{ HP_POP(pc->setregistry_str), HP_POP2(HP_pc_setregistry_str), 3630 },
+	{ HP_POP(pc->addeventtimer), HP_POP2(HP_pc_addeventtimer), 3632 },
+	{ HP_POP(pc->deleventtimer), HP_POP2(HP_pc_deleventtimer), 3634 },
+	{ HP_POP(pc->cleareventtimer), HP_POP2(HP_pc_cleareventtimer), 3636 },
+	{ HP_POP(pc->addeventtimercount), HP_POP2(HP_pc_addeventtimercount), 3638 },
+	{ HP_POP(pc->calc_pvprank), HP_POP2(HP_pc_calc_pvprank), 3640 },
+	{ HP_POP(pc->calc_pvprank_timer), HP_POP2(HP_pc_calc_pvprank_timer), 3642 },
+	{ HP_POP(pc->ismarried), HP_POP2(HP_pc_ismarried), 3644 },
+	{ HP_POP(pc->marriage), HP_POP2(HP_pc_marriage), 3646 },
+	{ HP_POP(pc->divorce), HP_POP2(HP_pc_divorce), 3648 },
+	{ HP_POP(pc->get_partner), HP_POP2(HP_pc_get_partner), 3650 },
+	{ HP_POP(pc->get_father), HP_POP2(HP_pc_get_father), 3652 },
+	{ HP_POP(pc->get_mother), HP_POP2(HP_pc_get_mother), 3654 },
+	{ HP_POP(pc->get_child), HP_POP2(HP_pc_get_child), 3656 },
+	{ HP_POP(pc->bleeding), HP_POP2(HP_pc_bleeding), 3658 },
+	{ HP_POP(pc->regen), HP_POP2(HP_pc_regen), 3660 },
+	{ HP_POP(pc->setstand), HP_POP2(HP_pc_setstand), 3662 },
+	{ HP_POP(pc->candrop), HP_POP2(HP_pc_candrop), 3664 },
+	{ HP_POP(pc->jobid2mapid), HP_POP2(HP_pc_jobid2mapid), 3666 },
+	{ HP_POP(pc->mapid2jobid), HP_POP2(HP_pc_mapid2jobid), 3668 },
+	{ HP_POP(pc->job_name), HP_POP2(HP_pc_job_name), 3670 },
+	{ HP_POP(pc->setinvincibletimer), HP_POP2(HP_pc_setinvincibletimer), 3672 },
+	{ HP_POP(pc->delinvincibletimer), HP_POP2(HP_pc_delinvincibletimer), 3674 },
+	{ HP_POP(pc->addspiritball), HP_POP2(HP_pc_addspiritball), 3676 },
+	{ HP_POP(pc->delspiritball), HP_POP2(HP_pc_delspiritball), 3678 },
+	{ HP_POP(pc->addfame), HP_POP2(HP_pc_addfame), 3680 },
+	{ HP_POP(pc->famerank), HP_POP2(HP_pc_famerank), 3682 },
+	{ HP_POP(pc->set_hate_mob), HP_POP2(HP_pc_set_hate_mob), 3684 },
+	{ HP_POP(pc->readdb), HP_POP2(HP_pc_readdb), 3686 },
+	{ HP_POP(pc->map_day_timer), HP_POP2(HP_pc_map_day_timer), 3688 },
+	{ HP_POP(pc->map_night_timer), HP_POP2(HP_pc_map_night_timer), 3690 },
+	{ HP_POP(pc->inventory_rentals), HP_POP2(HP_pc_inventory_rentals), 3692 },
+	{ HP_POP(pc->inventory_rental_clear), HP_POP2(HP_pc_inventory_rental_clear), 3694 },
+	{ HP_POP(pc->inventory_rental_add), HP_POP2(HP_pc_inventory_rental_add), 3696 },
+	{ HP_POP(pc->disguise), HP_POP2(HP_pc_disguise), 3698 },
+	{ HP_POP(pc->isautolooting), HP_POP2(HP_pc_isautolooting), 3700 },
+	{ HP_POP(pc->overheat), HP_POP2(HP_pc_overheat), 3702 },
+	{ HP_POP(pc->banding), HP_POP2(HP_pc_banding), 3704 },
+	{ HP_POP(pc->itemcd_do), HP_POP2(HP_pc_itemcd_do), 3706 },
+	{ HP_POP(pc->load_combo), HP_POP2(HP_pc_load_combo), 3708 },
+	{ HP_POP(pc->add_charm), HP_POP2(HP_pc_add_charm), 3710 },
+	{ HP_POP(pc->del_charm), HP_POP2(HP_pc_del_charm), 3712 },
+	{ HP_POP(pc->baselevelchanged), HP_POP2(HP_pc_baselevelchanged), 3714 },
+	{ HP_POP(pc->level_penalty_mod), HP_POP2(HP_pc_level_penalty_mod), 3716 },
+	{ HP_POP(pc->calc_skillpoint), HP_POP2(HP_pc_calc_skillpoint), 3718 },
+	{ HP_POP(pc->invincible_timer), HP_POP2(HP_pc_invincible_timer), 3720 },
+	{ HP_POP(pc->spiritball_timer), HP_POP2(HP_pc_spiritball_timer), 3722 },
+	{ HP_POP(pc->check_banding), HP_POP2(HP_pc_check_banding), 3724 },
+	{ HP_POP(pc->inventory_rental_end), HP_POP2(HP_pc_inventory_rental_end), 3726 },
+	{ HP_POP(pc->check_skilltree), HP_POP2(HP_pc_check_skilltree), 3728 },
+	{ HP_POP(pc->bonus_autospell), HP_POP2(HP_pc_bonus_autospell), 3730 },
+	{ HP_POP(pc->bonus_autospell_onskill), HP_POP2(HP_pc_bonus_autospell_onskill), 3732 },
+	{ HP_POP(pc->bonus_addeff), HP_POP2(HP_pc_bonus_addeff), 3734 },
+	{ HP_POP(pc->bonus_addeff_onskill), HP_POP2(HP_pc_bonus_addeff_onskill), 3736 },
+	{ HP_POP(pc->bonus_item_drop), HP_POP2(HP_pc_bonus_item_drop), 3738 },
+	{ HP_POP(pc->calcexp), HP_POP2(HP_pc_calcexp), 3740 },
+	{ HP_POP(pc->respawn_timer), HP_POP2(HP_pc_respawn_timer), 3742 },
+	{ HP_POP(pc->jobchange_killclone), HP_POP2(HP_pc_jobchange_killclone), 3744 },
+	{ HP_POP(pc->getstat), HP_POP2(HP_pc_getstat), 3746 },
+	{ HP_POP(pc->setstat), HP_POP2(HP_pc_setstat), 3748 },
+	{ HP_POP(pc->eventtimer), HP_POP2(HP_pc_eventtimer), 3750 },
+	{ HP_POP(pc->daynight_timer_sub), HP_POP2(HP_pc_daynight_timer_sub), 3752 },
+	{ HP_POP(pc->charm_timer), HP_POP2(HP_pc_charm_timer), 3754 },
+	{ HP_POP(pc->readdb_levelpenalty), HP_POP2(HP_pc_readdb_levelpenalty), 3756 },
+	{ HP_POP(pc->autosave), HP_POP2(HP_pc_autosave), 3758 },
+	{ HP_POP(pc->follow_timer), HP_POP2(HP_pc_follow_timer), 3760 },
+	{ HP_POP(pc->read_skill_tree), HP_POP2(HP_pc_read_skill_tree), 3762 },
+	{ HP_POP(pc->isUseitem), HP_POP2(HP_pc_isUseitem), 3764 },
+	{ HP_POP(pc->show_steal), HP_POP2(HP_pc_show_steal), 3766 },
+	{ HP_POP(pc->checkcombo), HP_POP2(HP_pc_checkcombo), 3768 },
+	{ HP_POP(pc->calcweapontype), HP_POP2(HP_pc_calcweapontype), 3770 },
+	{ HP_POP(pc->removecombo), HP_POP2(HP_pc_removecombo), 3772 },
+	{ HP_POP(pc->bank_deposit), HP_POP2(HP_pc_bank_deposit), 3774 },
+	{ HP_POP(pc->bank_withdraw), HP_POP2(HP_pc_bank_withdraw), 3776 },
 /* pet */
-	{ HP_POP(pet->init), HP_POP2(HP_pet_init), 3760 },
-	{ HP_POP(pet->final), HP_POP2(HP_pet_final), 3762 },
-	{ HP_POP(pet->hungry_val), HP_POP2(HP_pet_hungry_val), 3764 },
-	{ HP_POP(pet->set_intimate), HP_POP2(HP_pet_set_intimate), 3766 },
-	{ HP_POP(pet->create_egg), HP_POP2(HP_pet_create_egg), 3768 },
-	{ HP_POP(pet->unlocktarget), HP_POP2(HP_pet_unlocktarget), 3770 },
-	{ HP_POP(pet->attackskill), HP_POP2(HP_pet_attackskill), 3772 },
-	{ HP_POP(pet->target_check), HP_POP2(HP_pet_target_check), 3774 },
-	{ HP_POP(pet->sc_check), HP_POP2(HP_pet_sc_check), 3776 },
-	{ HP_POP(pet->hungry), HP_POP2(HP_pet_hungry), 3778 },
-	{ HP_POP(pet->search_petDB_index), HP_POP2(HP_pet_search_petDB_index), 3780 },
-	{ HP_POP(pet->hungry_timer_delete), HP_POP2(HP_pet_hungry_timer_delete), 3782 },
-	{ HP_POP(pet->performance), HP_POP2(HP_pet_performance), 3784 },
-	{ HP_POP(pet->return_egg), HP_POP2(HP_pet_return_egg), 3786 },
-	{ HP_POP(pet->data_init), HP_POP2(HP_pet_data_init), 3788 },
-	{ HP_POP(pet->birth_process), HP_POP2(HP_pet_birth_process), 3790 },
-	{ HP_POP(pet->recv_petdata), HP_POP2(HP_pet_recv_petdata), 3792 },
-	{ HP_POP(pet->select_egg), HP_POP2(HP_pet_select_egg), 3794 },
-	{ HP_POP(pet->catch_process1), HP_POP2(HP_pet_catch_process1), 3796 },
-	{ HP_POP(pet->catch_process2), HP_POP2(HP_pet_catch_process2), 3798 },
-	{ HP_POP(pet->get_egg), HP_POP2(HP_pet_get_egg), 3800 },
-	{ HP_POP(pet->unequipitem), HP_POP2(HP_pet_unequipitem), 3802 },
-	{ HP_POP(pet->food), HP_POP2(HP_pet_food), 3804 },
-	{ HP_POP(pet->ai_sub_hard_lootsearch), HP_POP2(HP_pet_ai_sub_hard_lootsearch), 3806 },
-	{ HP_POP(pet->menu), HP_POP2(HP_pet_menu), 3808 },
-	{ HP_POP(pet->change_name), HP_POP2(HP_pet_change_name), 3810 },
-	{ HP_POP(pet->change_name_ack), HP_POP2(HP_pet_change_name_ack), 3812 },
-	{ HP_POP(pet->equipitem), HP_POP2(HP_pet_equipitem), 3814 },
-	{ HP_POP(pet->randomwalk), HP_POP2(HP_pet_randomwalk), 3816 },
-	{ HP_POP(pet->ai_sub_hard), HP_POP2(HP_pet_ai_sub_hard), 3818 },
-	{ HP_POP(pet->ai_sub_foreachclient), HP_POP2(HP_pet_ai_sub_foreachclient), 3820 },
-	{ HP_POP(pet->ai_hard), HP_POP2(HP_pet_ai_hard), 3822 },
-	{ HP_POP(pet->delay_item_drop), HP_POP2(HP_pet_delay_item_drop), 3824 },
-	{ HP_POP(pet->lootitem_drop), HP_POP2(HP_pet_lootitem_drop), 3826 },
-	{ HP_POP(pet->skill_bonus_timer), HP_POP2(HP_pet_skill_bonus_timer), 3828 },
-	{ HP_POP(pet->recovery_timer), HP_POP2(HP_pet_recovery_timer), 3830 },
-	{ HP_POP(pet->heal_timer), HP_POP2(HP_pet_heal_timer), 3832 },
-	{ HP_POP(pet->skill_support_timer), HP_POP2(HP_pet_skill_support_timer), 3834 },
-	{ HP_POP(pet->read_db), HP_POP2(HP_pet_read_db), 3836 },
+	{ HP_POP(pet->init), HP_POP2(HP_pet_init), 3778 },
+	{ HP_POP(pet->final), HP_POP2(HP_pet_final), 3780 },
+	{ HP_POP(pet->hungry_val), HP_POP2(HP_pet_hungry_val), 3782 },
+	{ HP_POP(pet->set_intimate), HP_POP2(HP_pet_set_intimate), 3784 },
+	{ HP_POP(pet->create_egg), HP_POP2(HP_pet_create_egg), 3786 },
+	{ HP_POP(pet->unlocktarget), HP_POP2(HP_pet_unlocktarget), 3788 },
+	{ HP_POP(pet->attackskill), HP_POP2(HP_pet_attackskill), 3790 },
+	{ HP_POP(pet->target_check), HP_POP2(HP_pet_target_check), 3792 },
+	{ HP_POP(pet->sc_check), HP_POP2(HP_pet_sc_check), 3794 },
+	{ HP_POP(pet->hungry), HP_POP2(HP_pet_hungry), 3796 },
+	{ HP_POP(pet->search_petDB_index), HP_POP2(HP_pet_search_petDB_index), 3798 },
+	{ HP_POP(pet->hungry_timer_delete), HP_POP2(HP_pet_hungry_timer_delete), 3800 },
+	{ HP_POP(pet->performance), HP_POP2(HP_pet_performance), 3802 },
+	{ HP_POP(pet->return_egg), HP_POP2(HP_pet_return_egg), 3804 },
+	{ HP_POP(pet->data_init), HP_POP2(HP_pet_data_init), 3806 },
+	{ HP_POP(pet->birth_process), HP_POP2(HP_pet_birth_process), 3808 },
+	{ HP_POP(pet->recv_petdata), HP_POP2(HP_pet_recv_petdata), 3810 },
+	{ HP_POP(pet->select_egg), HP_POP2(HP_pet_select_egg), 3812 },
+	{ HP_POP(pet->catch_process1), HP_POP2(HP_pet_catch_process1), 3814 },
+	{ HP_POP(pet->catch_process2), HP_POP2(HP_pet_catch_process2), 3816 },
+	{ HP_POP(pet->get_egg), HP_POP2(HP_pet_get_egg), 3818 },
+	{ HP_POP(pet->unequipitem), HP_POP2(HP_pet_unequipitem), 3820 },
+	{ HP_POP(pet->food), HP_POP2(HP_pet_food), 3822 },
+	{ HP_POP(pet->ai_sub_hard_lootsearch), HP_POP2(HP_pet_ai_sub_hard_lootsearch), 3824 },
+	{ HP_POP(pet->menu), HP_POP2(HP_pet_menu), 3826 },
+	{ HP_POP(pet->change_name), HP_POP2(HP_pet_change_name), 3828 },
+	{ HP_POP(pet->change_name_ack), HP_POP2(HP_pet_change_name_ack), 3830 },
+	{ HP_POP(pet->equipitem), HP_POP2(HP_pet_equipitem), 3832 },
+	{ HP_POP(pet->randomwalk), HP_POP2(HP_pet_randomwalk), 3834 },
+	{ HP_POP(pet->ai_sub_hard), HP_POP2(HP_pet_ai_sub_hard), 3836 },
+	{ HP_POP(pet->ai_sub_foreachclient), HP_POP2(HP_pet_ai_sub_foreachclient), 3838 },
+	{ HP_POP(pet->ai_hard), HP_POP2(HP_pet_ai_hard), 3840 },
+	{ HP_POP(pet->delay_item_drop), HP_POP2(HP_pet_delay_item_drop), 3842 },
+	{ HP_POP(pet->lootitem_drop), HP_POP2(HP_pet_lootitem_drop), 3844 },
+	{ HP_POP(pet->skill_bonus_timer), HP_POP2(HP_pet_skill_bonus_timer), 3846 },
+	{ HP_POP(pet->recovery_timer), HP_POP2(HP_pet_recovery_timer), 3848 },
+	{ HP_POP(pet->heal_timer), HP_POP2(HP_pet_heal_timer), 3850 },
+	{ HP_POP(pet->skill_support_timer), HP_POP2(HP_pet_skill_support_timer), 3852 },
+	{ HP_POP(pet->read_db), HP_POP2(HP_pet_read_db), 3854 },
 /* quest */
-	{ HP_POP(quest->init), HP_POP2(HP_quest_init), 3838 },
-	{ HP_POP(quest->reload), HP_POP2(HP_quest_reload), 3840 },
-	{ HP_POP(quest->search_db), HP_POP2(HP_quest_search_db), 3842 },
-	{ HP_POP(quest->pc_login), HP_POP2(HP_quest_pc_login), 3844 },
-	{ HP_POP(quest->add), HP_POP2(HP_quest_add), 3846 },
-	{ HP_POP(quest->change), HP_POP2(HP_quest_change), 3848 },
-	{ HP_POP(quest->delete), HP_POP2(HP_quest_delete), 3850 },
-	{ HP_POP(quest->update_objective_sub), HP_POP2(HP_quest_update_objective_sub), 3852 },
-	{ HP_POP(quest->update_objective), HP_POP2(HP_quest_update_objective), 3854 },
-	{ HP_POP(quest->update_status), HP_POP2(HP_quest_update_status), 3856 },
-	{ HP_POP(quest->check), HP_POP2(HP_quest_check), 3858 },
-	{ HP_POP(quest->read_db), HP_POP2(HP_quest_read_db), 3860 },
+	{ HP_POP(quest->init), HP_POP2(HP_quest_init), 3856 },
+	{ HP_POP(quest->reload), HP_POP2(HP_quest_reload), 3858 },
+	{ HP_POP(quest->search_db), HP_POP2(HP_quest_search_db), 3860 },
+	{ HP_POP(quest->pc_login), HP_POP2(HP_quest_pc_login), 3862 },
+	{ HP_POP(quest->add), HP_POP2(HP_quest_add), 3864 },
+	{ HP_POP(quest->change), HP_POP2(HP_quest_change), 3866 },
+	{ HP_POP(quest->delete), HP_POP2(HP_quest_delete), 3868 },
+	{ HP_POP(quest->update_objective_sub), HP_POP2(HP_quest_update_objective_sub), 3870 },
+	{ HP_POP(quest->update_objective), HP_POP2(HP_quest_update_objective), 3872 },
+	{ HP_POP(quest->update_status), HP_POP2(HP_quest_update_status), 3874 },
+	{ HP_POP(quest->check), HP_POP2(HP_quest_check), 3876 },
+	{ HP_POP(quest->read_db), HP_POP2(HP_quest_read_db), 3878 },
 /* script */
-	{ HP_POP(script->init), HP_POP2(HP_script_init), 3862 },
-	{ HP_POP(script->final), HP_POP2(HP_script_final), 3864 },
-	{ HP_POP(script->reload), HP_POP2(HP_script_reload), 3866 },
-	{ HP_POP(script->parse), HP_POP2(HP_script_parse), 3868 },
-	{ HP_POP(script->parse_builtin), HP_POP2(HP_script_parse_builtin), 3870 },
-	{ HP_POP(script->parse_subexpr), HP_POP2(HP_script_parse_subexpr), 3872 },
-	{ HP_POP(script->skip_space), HP_POP2(HP_script_skip_space), 3874 },
-	{ HP_POP(script->error), HP_POP2(HP_script_error), 3876 },
-	{ HP_POP(script->warning), HP_POP2(HP_script_warning), 3878 },
-	{ HP_POP(script->addScript), HP_POP2(HP_script_addScript), 3880 },
-	{ HP_POP(script->conv_num), HP_POP2(HP_script_conv_num), 3882 },
-	{ HP_POP(script->conv_str), HP_POP2(HP_script_conv_str), 3884 },
-	{ HP_POP(script->rid2sd), HP_POP2(HP_script_rid2sd), 3886 },
-	{ HP_POP(script->detach_rid), HP_POP2(HP_script_detach_rid), 3888 },
-	{ HP_POP(script->push_val), HP_POP2(HP_script_push_val), 3890 },
-	{ HP_POP(script->get_val), HP_POP2(HP_script_get_val), 3892 },
-	{ HP_POP(script->get_val2), HP_POP2(HP_script_get_val2), 3894 },
-	{ HP_POP(script->push_str), HP_POP2(HP_script_push_str), 3896 },
-	{ HP_POP(script->push_copy), HP_POP2(HP_script_push_copy), 3898 },
-	{ HP_POP(script->pop_stack), HP_POP2(HP_script_pop_stack), 3900 },
-	{ HP_POP(script->set_constant), HP_POP2(HP_script_set_constant), 3902 },
-	{ HP_POP(script->set_constant2), HP_POP2(HP_script_set_constant2), 3904 },
-	{ HP_POP(script->set_constant_force), HP_POP2(HP_script_set_constant_force), 3906 },
-	{ HP_POP(script->get_constant), HP_POP2(HP_script_get_constant), 3908 },
-	{ HP_POP(script->label_add), HP_POP2(HP_script_label_add), 3910 },
-	{ HP_POP(script->run), HP_POP2(HP_script_run), 3912 },
-	{ HP_POP(script->run_main), HP_POP2(HP_script_run_main), 3914 },
-	{ HP_POP(script->run_timer), HP_POP2(HP_script_run_timer), 3916 },
-	{ HP_POP(script->set_var), HP_POP2(HP_script_set_var), 3918 },
-	{ HP_POP(script->stop_instances), HP_POP2(HP_script_stop_instances), 3920 },
-	{ HP_POP(script->free_code), HP_POP2(HP_script_free_code), 3922 },
-	{ HP_POP(script->free_vars), HP_POP2(HP_script_free_vars), 3924 },
-	{ HP_POP(script->alloc_state), HP_POP2(HP_script_alloc_state), 3926 },
-	{ HP_POP(script->free_state), HP_POP2(HP_script_free_state), 3928 },
-	{ HP_POP(script->run_autobonus), HP_POP2(HP_script_run_autobonus), 3930 },
-	{ HP_POP(script->cleararray_pc), HP_POP2(HP_script_cleararray_pc), 3932 },
-	{ HP_POP(script->setarray_pc), HP_POP2(HP_script_setarray_pc), 3934 },
-	{ HP_POP(script->config_read), HP_POP2(HP_script_config_read), 3936 },
-	{ HP_POP(script->add_str), HP_POP2(HP_script_add_str), 3938 },
-	{ HP_POP(script->get_str), HP_POP2(HP_script_get_str), 3940 },
-	{ HP_POP(script->search_str), HP_POP2(HP_script_search_str), 3942 },
-	{ HP_POP(script->setd_sub), HP_POP2(HP_script_setd_sub), 3944 },
-	{ HP_POP(script->attach_state), HP_POP2(HP_script_attach_state), 3946 },
-	{ HP_POP(script->queue), HP_POP2(HP_script_queue), 3948 },
-	{ HP_POP(script->queue_add), HP_POP2(HP_script_queue_add), 3950 },
-	{ HP_POP(script->queue_del), HP_POP2(HP_script_queue_del), 3952 },
-	{ HP_POP(script->queue_remove), HP_POP2(HP_script_queue_remove), 3954 },
-	{ HP_POP(script->queue_create), HP_POP2(HP_script_queue_create), 3956 },
-	{ HP_POP(script->queue_clear), HP_POP2(HP_script_queue_clear), 3958 },
-	{ HP_POP(script->parse_curly_close), HP_POP2(HP_script_parse_curly_close), 3960 },
-	{ HP_POP(script->parse_syntax_close), HP_POP2(HP_script_parse_syntax_close), 3962 },
-	{ HP_POP(script->parse_syntax_close_sub), HP_POP2(HP_script_parse_syntax_close_sub), 3964 },
-	{ HP_POP(script->parse_syntax), HP_POP2(HP_script_parse_syntax), 3966 },
-	{ HP_POP(script->get_com), HP_POP2(HP_script_get_com), 3968 },
-	{ HP_POP(script->get_num), HP_POP2(HP_script_get_num), 3970 },
-	{ HP_POP(script->op2name), HP_POP2(HP_script_op2name), 3972 },
-	{ HP_POP(script->reportsrc), HP_POP2(HP_script_reportsrc), 3974 },
-	{ HP_POP(script->reportdata), HP_POP2(HP_script_reportdata), 3976 },
-	{ HP_POP(script->reportfunc), HP_POP2(HP_script_reportfunc), 3978 },
-	{ HP_POP(script->disp_error_message2), HP_POP2(HP_script_disp_error_message2), 3980 },
-	{ HP_POP(script->disp_warning_message), HP_POP2(HP_script_disp_warning_message), 3982 },
-	{ HP_POP(script->check_event), HP_POP2(HP_script_check_event), 3984 },
-	{ HP_POP(script->calc_hash), HP_POP2(HP_script_calc_hash), 3986 },
-	{ HP_POP(script->addb), HP_POP2(HP_script_addb), 3988 },
-	{ HP_POP(script->addc), HP_POP2(HP_script_addc), 3990 },
-	{ HP_POP(script->addi), HP_POP2(HP_script_addi), 3992 },
-	{ HP_POP(script->addl), HP_POP2(HP_script_addl), 3994 },
-	{ HP_POP(script->set_label), HP_POP2(HP_script_set_label), 3996 },
-	{ HP_POP(script->skip_word), HP_POP2(HP_script_skip_word), 3998 },
-	{ HP_POP(script->add_word), HP_POP2(HP_script_add_word), 4000 },
-	{ HP_POP(script->parse_callfunc), HP_POP2(HP_script_parse_callfunc), 4002 },
-	{ HP_POP(script->parse_nextline), HP_POP2(HP_script_parse_nextline), 4004 },
-	{ HP_POP(script->parse_variable), HP_POP2(HP_script_parse_variable), 4006 },
-	{ HP_POP(script->parse_simpleexpr), HP_POP2(HP_script_parse_simpleexpr), 4008 },
-	{ HP_POP(script->parse_expr), HP_POP2(HP_script_parse_expr), 4010 },
-	{ HP_POP(script->parse_line), HP_POP2(HP_script_parse_line), 4012 },
-	{ HP_POP(script->read_constdb), HP_POP2(HP_script_read_constdb), 4014 },
-	{ HP_POP(script->print_line), HP_POP2(HP_script_print_line), 4016 },
-	{ HP_POP(script->errorwarning_sub), HP_POP2(HP_script_errorwarning_sub), 4018 },
-	{ HP_POP(script->set_reg), HP_POP2(HP_script_set_reg), 4020 },
-	{ HP_POP(script->stack_expand), HP_POP2(HP_script_stack_expand), 4022 },
-	{ HP_POP(script->push_retinfo), HP_POP2(HP_script_push_retinfo), 4024 },
-	{ HP_POP(script->pop_val), HP_POP2(HP_script_pop_val), 4026 },
-	{ HP_POP(script->op_3), HP_POP2(HP_script_op_3), 4028 },
-	{ HP_POP(script->op_2str), HP_POP2(HP_script_op_2str), 4030 },
-	{ HP_POP(script->op_2num), HP_POP2(HP_script_op_2num), 4032 },
-	{ HP_POP(script->op_2), HP_POP2(HP_script_op_2), 4034 },
-	{ HP_POP(script->op_1), HP_POP2(HP_script_op_1), 4036 },
-	{ HP_POP(script->check_buildin_argtype), HP_POP2(HP_script_check_buildin_argtype), 4038 },
-	{ HP_POP(script->detach_state), HP_POP2(HP_script_detach_state), 4040 },
-	{ HP_POP(script->db_free_code_sub), HP_POP2(HP_script_db_free_code_sub), 4042 },
-	{ HP_POP(script->add_autobonus), HP_POP2(HP_script_add_autobonus), 4044 },
-	{ HP_POP(script->menu_countoptions), HP_POP2(HP_script_menu_countoptions), 4046 },
-	{ HP_POP(script->buildin_areawarp_sub), HP_POP2(HP_script_buildin_areawarp_sub), 4048 },
-	{ HP_POP(script->buildin_areapercentheal_sub), HP_POP2(HP_script_buildin_areapercentheal_sub), 4050 },
-	{ HP_POP(script->getarraysize), HP_POP2(HP_script_getarraysize), 4052 },
-	{ HP_POP(script->buildin_delitem_delete), HP_POP2(HP_script_buildin_delitem_delete), 4054 },
-	{ HP_POP(script->buildin_delitem_search), HP_POP2(HP_script_buildin_delitem_search), 4056 },
-	{ HP_POP(script->buildin_killmonster_sub_strip), HP_POP2(HP_script_buildin_killmonster_sub_strip), 4058 },
-	{ HP_POP(script->buildin_killmonster_sub), HP_POP2(HP_script_buildin_killmonster_sub), 4060 },
-	{ HP_POP(script->buildin_killmonsterall_sub_strip), HP_POP2(HP_script_buildin_killmonsterall_sub_strip), 4062 },
-	{ HP_POP(script->buildin_killmonsterall_sub), HP_POP2(HP_script_buildin_killmonsterall_sub), 4064 },
-	{ HP_POP(script->buildin_announce_sub), HP_POP2(HP_script_buildin_announce_sub), 4066 },
-	{ HP_POP(script->buildin_getareausers_sub), HP_POP2(HP_script_buildin_getareausers_sub), 4068 },
-	{ HP_POP(script->buildin_getareadropitem_sub), HP_POP2(HP_script_buildin_getareadropitem_sub), 4070 },
-	{ HP_POP(script->mapflag_pvp_sub), HP_POP2(HP_script_mapflag_pvp_sub), 4072 },
-	{ HP_POP(script->buildin_pvpoff_sub), HP_POP2(HP_script_buildin_pvpoff_sub), 4074 },
-	{ HP_POP(script->buildin_maprespawnguildid_sub_pc), HP_POP2(HP_script_buildin_maprespawnguildid_sub_pc), 4076 },
-	{ HP_POP(script->buildin_maprespawnguildid_sub_mob), HP_POP2(HP_script_buildin_maprespawnguildid_sub_mob), 4078 },
-	{ HP_POP(script->buildin_mobcount_sub), HP_POP2(HP_script_buildin_mobcount_sub), 4080 },
-	{ HP_POP(script->playBGM_sub), HP_POP2(HP_script_playBGM_sub), 4082 },
-	{ HP_POP(script->playBGM_foreachpc_sub), HP_POP2(HP_script_playBGM_foreachpc_sub), 4084 },
-	{ HP_POP(script->soundeffect_sub), HP_POP2(HP_script_soundeffect_sub), 4086 },
-	{ HP_POP(script->buildin_query_sql_sub), HP_POP2(HP_script_buildin_query_sql_sub), 4088 },
-	{ HP_POP(script->axtoi), HP_POP2(HP_script_axtoi), 4090 },
-	{ HP_POP(script->buildin_instance_warpall_sub), HP_POP2(HP_script_buildin_instance_warpall_sub), 4092 },
-	{ HP_POP(script->buildin_mobuseskill_sub), HP_POP2(HP_script_buildin_mobuseskill_sub), 4094 },
-	{ HP_POP(script->cleanfloor_sub), HP_POP2(HP_script_cleanfloor_sub), 4096 },
-	{ HP_POP(script->run_func), HP_POP2(HP_script_run_func), 4098 },
+	{ HP_POP(script->init), HP_POP2(HP_script_init), 3880 },
+	{ HP_POP(script->final), HP_POP2(HP_script_final), 3882 },
+	{ HP_POP(script->reload), HP_POP2(HP_script_reload), 3884 },
+	{ HP_POP(script->parse), HP_POP2(HP_script_parse), 3886 },
+	{ HP_POP(script->parse_builtin), HP_POP2(HP_script_parse_builtin), 3888 },
+	{ HP_POP(script->parse_subexpr), HP_POP2(HP_script_parse_subexpr), 3890 },
+	{ HP_POP(script->skip_space), HP_POP2(HP_script_skip_space), 3892 },
+	{ HP_POP(script->error), HP_POP2(HP_script_error), 3894 },
+	{ HP_POP(script->warning), HP_POP2(HP_script_warning), 3896 },
+	{ HP_POP(script->addScript), HP_POP2(HP_script_addScript), 3898 },
+	{ HP_POP(script->conv_num), HP_POP2(HP_script_conv_num), 3900 },
+	{ HP_POP(script->conv_str), HP_POP2(HP_script_conv_str), 3902 },
+	{ HP_POP(script->rid2sd), HP_POP2(HP_script_rid2sd), 3904 },
+	{ HP_POP(script->detach_rid), HP_POP2(HP_script_detach_rid), 3906 },
+	{ HP_POP(script->push_val), HP_POP2(HP_script_push_val), 3908 },
+	{ HP_POP(script->get_val), HP_POP2(HP_script_get_val), 3910 },
+	{ HP_POP(script->get_val2), HP_POP2(HP_script_get_val2), 3912 },
+	{ HP_POP(script->push_str), HP_POP2(HP_script_push_str), 3914 },
+	{ HP_POP(script->push_copy), HP_POP2(HP_script_push_copy), 3916 },
+	{ HP_POP(script->pop_stack), HP_POP2(HP_script_pop_stack), 3918 },
+	{ HP_POP(script->set_constant), HP_POP2(HP_script_set_constant), 3920 },
+	{ HP_POP(script->set_constant2), HP_POP2(HP_script_set_constant2), 3922 },
+	{ HP_POP(script->set_constant_force), HP_POP2(HP_script_set_constant_force), 3924 },
+	{ HP_POP(script->get_constant), HP_POP2(HP_script_get_constant), 3926 },
+	{ HP_POP(script->label_add), HP_POP2(HP_script_label_add), 3928 },
+	{ HP_POP(script->run), HP_POP2(HP_script_run), 3930 },
+	{ HP_POP(script->run_main), HP_POP2(HP_script_run_main), 3932 },
+	{ HP_POP(script->run_timer), HP_POP2(HP_script_run_timer), 3934 },
+	{ HP_POP(script->set_var), HP_POP2(HP_script_set_var), 3936 },
+	{ HP_POP(script->stop_instances), HP_POP2(HP_script_stop_instances), 3938 },
+	{ HP_POP(script->free_code), HP_POP2(HP_script_free_code), 3940 },
+	{ HP_POP(script->free_vars), HP_POP2(HP_script_free_vars), 3942 },
+	{ HP_POP(script->alloc_state), HP_POP2(HP_script_alloc_state), 3944 },
+	{ HP_POP(script->free_state), HP_POP2(HP_script_free_state), 3946 },
+	{ HP_POP(script->run_autobonus), HP_POP2(HP_script_run_autobonus), 3948 },
+	{ HP_POP(script->cleararray_pc), HP_POP2(HP_script_cleararray_pc), 3950 },
+	{ HP_POP(script->setarray_pc), HP_POP2(HP_script_setarray_pc), 3952 },
+	{ HP_POP(script->config_read), HP_POP2(HP_script_config_read), 3954 },
+	{ HP_POP(script->add_str), HP_POP2(HP_script_add_str), 3956 },
+	{ HP_POP(script->get_str), HP_POP2(HP_script_get_str), 3958 },
+	{ HP_POP(script->search_str), HP_POP2(HP_script_search_str), 3960 },
+	{ HP_POP(script->setd_sub), HP_POP2(HP_script_setd_sub), 3962 },
+	{ HP_POP(script->attach_state), HP_POP2(HP_script_attach_state), 3964 },
+	{ HP_POP(script->queue), HP_POP2(HP_script_queue), 3966 },
+	{ HP_POP(script->queue_add), HP_POP2(HP_script_queue_add), 3968 },
+	{ HP_POP(script->queue_del), HP_POP2(HP_script_queue_del), 3970 },
+	{ HP_POP(script->queue_remove), HP_POP2(HP_script_queue_remove), 3972 },
+	{ HP_POP(script->queue_create), HP_POP2(HP_script_queue_create), 3974 },
+	{ HP_POP(script->queue_clear), HP_POP2(HP_script_queue_clear), 3976 },
+	{ HP_POP(script->parse_curly_close), HP_POP2(HP_script_parse_curly_close), 3978 },
+	{ HP_POP(script->parse_syntax_close), HP_POP2(HP_script_parse_syntax_close), 3980 },
+	{ HP_POP(script->parse_syntax_close_sub), HP_POP2(HP_script_parse_syntax_close_sub), 3982 },
+	{ HP_POP(script->parse_syntax), HP_POP2(HP_script_parse_syntax), 3984 },
+	{ HP_POP(script->get_com), HP_POP2(HP_script_get_com), 3986 },
+	{ HP_POP(script->get_num), HP_POP2(HP_script_get_num), 3988 },
+	{ HP_POP(script->op2name), HP_POP2(HP_script_op2name), 3990 },
+	{ HP_POP(script->reportsrc), HP_POP2(HP_script_reportsrc), 3992 },
+	{ HP_POP(script->reportdata), HP_POP2(HP_script_reportdata), 3994 },
+	{ HP_POP(script->reportfunc), HP_POP2(HP_script_reportfunc), 3996 },
+	{ HP_POP(script->disp_error_message2), HP_POP2(HP_script_disp_error_message2), 3998 },
+	{ HP_POP(script->disp_warning_message), HP_POP2(HP_script_disp_warning_message), 4000 },
+	{ HP_POP(script->check_event), HP_POP2(HP_script_check_event), 4002 },
+	{ HP_POP(script->calc_hash), HP_POP2(HP_script_calc_hash), 4004 },
+	{ HP_POP(script->addb), HP_POP2(HP_script_addb), 4006 },
+	{ HP_POP(script->addc), HP_POP2(HP_script_addc), 4008 },
+	{ HP_POP(script->addi), HP_POP2(HP_script_addi), 4010 },
+	{ HP_POP(script->addl), HP_POP2(HP_script_addl), 4012 },
+	{ HP_POP(script->set_label), HP_POP2(HP_script_set_label), 4014 },
+	{ HP_POP(script->skip_word), HP_POP2(HP_script_skip_word), 4016 },
+	{ HP_POP(script->add_word), HP_POP2(HP_script_add_word), 4018 },
+	{ HP_POP(script->parse_callfunc), HP_POP2(HP_script_parse_callfunc), 4020 },
+	{ HP_POP(script->parse_nextline), HP_POP2(HP_script_parse_nextline), 4022 },
+	{ HP_POP(script->parse_variable), HP_POP2(HP_script_parse_variable), 4024 },
+	{ HP_POP(script->parse_simpleexpr), HP_POP2(HP_script_parse_simpleexpr), 4026 },
+	{ HP_POP(script->parse_expr), HP_POP2(HP_script_parse_expr), 4028 },
+	{ HP_POP(script->parse_line), HP_POP2(HP_script_parse_line), 4030 },
+	{ HP_POP(script->read_constdb), HP_POP2(HP_script_read_constdb), 4032 },
+	{ HP_POP(script->print_line), HP_POP2(HP_script_print_line), 4034 },
+	{ HP_POP(script->errorwarning_sub), HP_POP2(HP_script_errorwarning_sub), 4036 },
+	{ HP_POP(script->set_reg), HP_POP2(HP_script_set_reg), 4038 },
+	{ HP_POP(script->stack_expand), HP_POP2(HP_script_stack_expand), 4040 },
+	{ HP_POP(script->push_retinfo), HP_POP2(HP_script_push_retinfo), 4042 },
+	{ HP_POP(script->pop_val), HP_POP2(HP_script_pop_val), 4044 },
+	{ HP_POP(script->op_3), HP_POP2(HP_script_op_3), 4046 },
+	{ HP_POP(script->op_2str), HP_POP2(HP_script_op_2str), 4048 },
+	{ HP_POP(script->op_2num), HP_POP2(HP_script_op_2num), 4050 },
+	{ HP_POP(script->op_2), HP_POP2(HP_script_op_2), 4052 },
+	{ HP_POP(script->op_1), HP_POP2(HP_script_op_1), 4054 },
+	{ HP_POP(script->check_buildin_argtype), HP_POP2(HP_script_check_buildin_argtype), 4056 },
+	{ HP_POP(script->detach_state), HP_POP2(HP_script_detach_state), 4058 },
+	{ HP_POP(script->db_free_code_sub), HP_POP2(HP_script_db_free_code_sub), 4060 },
+	{ HP_POP(script->add_autobonus), HP_POP2(HP_script_add_autobonus), 4062 },
+	{ HP_POP(script->menu_countoptions), HP_POP2(HP_script_menu_countoptions), 4064 },
+	{ HP_POP(script->buildin_areawarp_sub), HP_POP2(HP_script_buildin_areawarp_sub), 4066 },
+	{ HP_POP(script->buildin_areapercentheal_sub), HP_POP2(HP_script_buildin_areapercentheal_sub), 4068 },
+	{ HP_POP(script->getarraysize), HP_POP2(HP_script_getarraysize), 4070 },
+	{ HP_POP(script->buildin_delitem_delete), HP_POP2(HP_script_buildin_delitem_delete), 4072 },
+	{ HP_POP(script->buildin_delitem_search), HP_POP2(HP_script_buildin_delitem_search), 4074 },
+	{ HP_POP(script->buildin_killmonster_sub_strip), HP_POP2(HP_script_buildin_killmonster_sub_strip), 4076 },
+	{ HP_POP(script->buildin_killmonster_sub), HP_POP2(HP_script_buildin_killmonster_sub), 4078 },
+	{ HP_POP(script->buildin_killmonsterall_sub_strip), HP_POP2(HP_script_buildin_killmonsterall_sub_strip), 4080 },
+	{ HP_POP(script->buildin_killmonsterall_sub), HP_POP2(HP_script_buildin_killmonsterall_sub), 4082 },
+	{ HP_POP(script->buildin_announce_sub), HP_POP2(HP_script_buildin_announce_sub), 4084 },
+	{ HP_POP(script->buildin_getareausers_sub), HP_POP2(HP_script_buildin_getareausers_sub), 4086 },
+	{ HP_POP(script->buildin_getareadropitem_sub), HP_POP2(HP_script_buildin_getareadropitem_sub), 4088 },
+	{ HP_POP(script->mapflag_pvp_sub), HP_POP2(HP_script_mapflag_pvp_sub), 4090 },
+	{ HP_POP(script->buildin_pvpoff_sub), HP_POP2(HP_script_buildin_pvpoff_sub), 4092 },
+	{ HP_POP(script->buildin_maprespawnguildid_sub_pc), HP_POP2(HP_script_buildin_maprespawnguildid_sub_pc), 4094 },
+	{ HP_POP(script->buildin_maprespawnguildid_sub_mob), HP_POP2(HP_script_buildin_maprespawnguildid_sub_mob), 4096 },
+	{ HP_POP(script->buildin_mobcount_sub), HP_POP2(HP_script_buildin_mobcount_sub), 4098 },
+	{ HP_POP(script->playBGM_sub), HP_POP2(HP_script_playBGM_sub), 4100 },
+	{ HP_POP(script->playBGM_foreachpc_sub), HP_POP2(HP_script_playBGM_foreachpc_sub), 4102 },
+	{ HP_POP(script->soundeffect_sub), HP_POP2(HP_script_soundeffect_sub), 4104 },
+	{ HP_POP(script->buildin_query_sql_sub), HP_POP2(HP_script_buildin_query_sql_sub), 4106 },
+	{ HP_POP(script->axtoi), HP_POP2(HP_script_axtoi), 4108 },
+	{ HP_POP(script->buildin_instance_warpall_sub), HP_POP2(HP_script_buildin_instance_warpall_sub), 4110 },
+	{ HP_POP(script->buildin_mobuseskill_sub), HP_POP2(HP_script_buildin_mobuseskill_sub), 4112 },
+	{ HP_POP(script->cleanfloor_sub), HP_POP2(HP_script_cleanfloor_sub), 4114 },
+	{ HP_POP(script->run_func), HP_POP2(HP_script_run_func), 4116 },
 /* searchstore */
-	{ HP_POP(searchstore->open), HP_POP2(HP_searchstore_open), 4100 },
-	{ HP_POP(searchstore->query), HP_POP2(HP_searchstore_query), 4102 },
-	{ HP_POP(searchstore->querynext), HP_POP2(HP_searchstore_querynext), 4104 },
-	{ HP_POP(searchstore->next), HP_POP2(HP_searchstore_next), 4106 },
-	{ HP_POP(searchstore->clear), HP_POP2(HP_searchstore_clear), 4108 },
-	{ HP_POP(searchstore->close), HP_POP2(HP_searchstore_close), 4110 },
-	{ HP_POP(searchstore->click), HP_POP2(HP_searchstore_click), 4112 },
-	{ HP_POP(searchstore->queryremote), HP_POP2(HP_searchstore_queryremote), 4114 },
-	{ HP_POP(searchstore->clearremote), HP_POP2(HP_searchstore_clearremote), 4116 },
-	{ HP_POP(searchstore->result), HP_POP2(HP_searchstore_result), 4118 },
+	{ HP_POP(searchstore->open), HP_POP2(HP_searchstore_open), 4118 },
+	{ HP_POP(searchstore->query), HP_POP2(HP_searchstore_query), 4120 },
+	{ HP_POP(searchstore->querynext), HP_POP2(HP_searchstore_querynext), 4122 },
+	{ HP_POP(searchstore->next), HP_POP2(HP_searchstore_next), 4124 },
+	{ HP_POP(searchstore->clear), HP_POP2(HP_searchstore_clear), 4126 },
+	{ HP_POP(searchstore->close), HP_POP2(HP_searchstore_close), 4128 },
+	{ HP_POP(searchstore->click), HP_POP2(HP_searchstore_click), 4130 },
+	{ HP_POP(searchstore->queryremote), HP_POP2(HP_searchstore_queryremote), 4132 },
+	{ HP_POP(searchstore->clearremote), HP_POP2(HP_searchstore_clearremote), 4134 },
+	{ HP_POP(searchstore->result), HP_POP2(HP_searchstore_result), 4136 },
 /* skill */
-	{ HP_POP(skill->init), HP_POP2(HP_skill_init), 4120 },
-	{ HP_POP(skill->final), HP_POP2(HP_skill_final), 4122 },
-	{ HP_POP(skill->reload), HP_POP2(HP_skill_reload), 4124 },
-	{ HP_POP(skill->read_db), HP_POP2(HP_skill_read_db), 4126 },
-	{ HP_POP(skill->get_index), HP_POP2(HP_skill_get_index), 4128 },
-	{ HP_POP(skill->get_type), HP_POP2(HP_skill_get_type), 4130 },
-	{ HP_POP(skill->get_hit), HP_POP2(HP_skill_get_hit), 4132 },
-	{ HP_POP(skill->get_inf), HP_POP2(HP_skill_get_inf), 4134 },
-	{ HP_POP(skill->get_ele), HP_POP2(HP_skill_get_ele), 4136 },
-	{ HP_POP(skill->get_nk), HP_POP2(HP_skill_get_nk), 4138 },
-	{ HP_POP(skill->get_max), HP_POP2(HP_skill_get_max), 4140 },
-	{ HP_POP(skill->get_range), HP_POP2(HP_skill_get_range), 4142 },
-	{ HP_POP(skill->get_range2), HP_POP2(HP_skill_get_range2), 4144 },
-	{ HP_POP(skill->get_splash), HP_POP2(HP_skill_get_splash), 4146 },
-	{ HP_POP(skill->get_hp), HP_POP2(HP_skill_get_hp), 4148 },
-	{ HP_POP(skill->get_mhp), HP_POP2(HP_skill_get_mhp), 4150 },
-	{ HP_POP(skill->get_sp), HP_POP2(HP_skill_get_sp), 4152 },
-	{ HP_POP(skill->get_state), HP_POP2(HP_skill_get_state), 4154 },
-	{ HP_POP(skill->get_spiritball), HP_POP2(HP_skill_get_spiritball), 4156 },
-	{ HP_POP(skill->get_zeny), HP_POP2(HP_skill_get_zeny), 4158 },
-	{ HP_POP(skill->get_num), HP_POP2(HP_skill_get_num), 4160 },
-	{ HP_POP(skill->get_cast), HP_POP2(HP_skill_get_cast), 4162 },
-	{ HP_POP(skill->get_delay), HP_POP2(HP_skill_get_delay), 4164 },
-	{ HP_POP(skill->get_walkdelay), HP_POP2(HP_skill_get_walkdelay), 4166 },
-	{ HP_POP(skill->get_time), HP_POP2(HP_skill_get_time), 4168 },
-	{ HP_POP(skill->get_time2), HP_POP2(HP_skill_get_time2), 4170 },
-	{ HP_POP(skill->get_castnodex), HP_POP2(HP_skill_get_castnodex), 4172 },
-	{ HP_POP(skill->get_delaynodex), HP_POP2(HP_skill_get_delaynodex), 4174 },
-	{ HP_POP(skill->get_castdef), HP_POP2(HP_skill_get_castdef), 4176 },
-	{ HP_POP(skill->get_weapontype), HP_POP2(HP_skill_get_weapontype), 4178 },
-	{ HP_POP(skill->get_ammotype), HP_POP2(HP_skill_get_ammotype), 4180 },
-	{ HP_POP(skill->get_ammo_qty), HP_POP2(HP_skill_get_ammo_qty), 4182 },
-	{ HP_POP(skill->get_unit_id), HP_POP2(HP_skill_get_unit_id), 4184 },
-	{ HP_POP(skill->get_inf2), HP_POP2(HP_skill_get_inf2), 4186 },
-	{ HP_POP(skill->get_castcancel), HP_POP2(HP_skill_get_castcancel), 4188 },
-	{ HP_POP(skill->get_maxcount), HP_POP2(HP_skill_get_maxcount), 4190 },
-	{ HP_POP(skill->get_blewcount), HP_POP2(HP_skill_get_blewcount), 4192 },
-	{ HP_POP(skill->get_unit_flag), HP_POP2(HP_skill_get_unit_flag), 4194 },
-	{ HP_POP(skill->get_unit_target), HP_POP2(HP_skill_get_unit_target), 4196 },
-	{ HP_POP(skill->get_unit_interval), HP_POP2(HP_skill_get_unit_interval), 4198 },
-	{ HP_POP(skill->get_unit_bl_target), HP_POP2(HP_skill_get_unit_bl_target), 4200 },
-	{ HP_POP(skill->get_unit_layout_type), HP_POP2(HP_skill_get_unit_layout_type), 4202 },
-	{ HP_POP(skill->get_unit_range), HP_POP2(HP_skill_get_unit_range), 4204 },
-	{ HP_POP(skill->get_cooldown), HP_POP2(HP_skill_get_cooldown), 4206 },
-	{ HP_POP(skill->tree_get_max), HP_POP2(HP_skill_tree_get_max), 4208 },
-	{ HP_POP(skill->get_name), HP_POP2(HP_skill_get_name), 4210 },
-	{ HP_POP(skill->get_desc), HP_POP2(HP_skill_get_desc), 4212 },
-	{ HP_POP(skill->chk), HP_POP2(HP_skill_chk), 4214 },
-	{ HP_POP(skill->get_casttype), HP_POP2(HP_skill_get_casttype), 4216 },
-	{ HP_POP(skill->get_casttype2), HP_POP2(HP_skill_get_casttype2), 4218 },
-	{ HP_POP(skill->name2id), HP_POP2(HP_skill_name2id), 4220 },
-	{ HP_POP(skill->isammotype), HP_POP2(HP_skill_isammotype), 4222 },
-	{ HP_POP(skill->castend_id), HP_POP2(HP_skill_castend_id), 4224 },
-	{ HP_POP(skill->castend_pos), HP_POP2(HP_skill_castend_pos), 4226 },
-	{ HP_POP(skill->castend_map), HP_POP2(HP_skill_castend_map), 4228 },
-	{ HP_POP(skill->cleartimerskill), HP_POP2(HP_skill_cleartimerskill), 4230 },
-	{ HP_POP(skill->addtimerskill), HP_POP2(HP_skill_addtimerskill), 4232 },
-	{ HP_POP(skill->additional_effect), HP_POP2(HP_skill_additional_effect), 4234 },
-	{ HP_POP(skill->counter_additional_effect), HP_POP2(HP_skill_counter_additional_effect), 4236 },
-	{ HP_POP(skill->blown), HP_POP2(HP_skill_blown), 4238 },
-	{ HP_POP(skill->break_equip), HP_POP2(HP_skill_break_equip), 4240 },
-	{ HP_POP(skill->strip_equip), HP_POP2(HP_skill_strip_equip), 4242 },
-	{ HP_POP(skill->id2group), HP_POP2(HP_skill_id2group), 4244 },
-	{ HP_POP(skill->unitsetting), HP_POP2(HP_skill_unitsetting), 4246 },
-	{ HP_POP(skill->initunit), HP_POP2(HP_skill_initunit), 4248 },
-	{ HP_POP(skill->delunit), HP_POP2(HP_skill_delunit), 4250 },
-	{ HP_POP(skill->init_unitgroup), HP_POP2(HP_skill_init_unitgroup), 4252 },
-	{ HP_POP(skill->del_unitgroup), HP_POP2(HP_skill_del_unitgroup), 4254 },
-	{ HP_POP(skill->clear_unitgroup), HP_POP2(HP_skill_clear_unitgroup), 4256 },
-	{ HP_POP(skill->clear_group), HP_POP2(HP_skill_clear_group), 4258 },
-	{ HP_POP(skill->unit_onplace), HP_POP2(HP_skill_unit_onplace), 4260 },
-	{ HP_POP(skill->unit_ondamaged), HP_POP2(HP_skill_unit_ondamaged), 4262 },
-	{ HP_POP(skill->cast_fix), HP_POP2(HP_skill_cast_fix), 4264 },
-	{ HP_POP(skill->cast_fix_sc), HP_POP2(HP_skill_cast_fix_sc), 4266 },
-	{ HP_POP(skill->vf_cast_fix), HP_POP2(HP_skill_vf_cast_fix), 4268 },
-	{ HP_POP(skill->delay_fix), HP_POP2(HP_skill_delay_fix), 4270 },
-	{ HP_POP(skill->check_condition_castbegin), HP_POP2(HP_skill_check_condition_castbegin), 4272 },
-	{ HP_POP(skill->check_condition_castend), HP_POP2(HP_skill_check_condition_castend), 4274 },
-	{ HP_POP(skill->consume_requirement), HP_POP2(HP_skill_consume_requirement), 4276 },
-	{ HP_POP(skill->get_requirement), HP_POP2(HP_skill_get_requirement), 4278 },
-	{ HP_POP(skill->check_pc_partner), HP_POP2(HP_skill_check_pc_partner), 4280 },
-	{ HP_POP(skill->unit_move), HP_POP2(HP_skill_unit_move), 4282 },
-	{ HP_POP(skill->unit_onleft), HP_POP2(HP_skill_unit_onleft), 4284 },
-	{ HP_POP(skill->unit_onout), HP_POP2(HP_skill_unit_onout), 4286 },
-	{ HP_POP(skill->unit_move_unit_group), HP_POP2(HP_skill_unit_move_unit_group), 4288 },
-	{ HP_POP(skill->sit), HP_POP2(HP_skill_sit), 4290 },
-	{ HP_POP(skill->brandishspear), HP_POP2(HP_skill_brandishspear), 4292 },
-	{ HP_POP(skill->repairweapon), HP_POP2(HP_skill_repairweapon), 4294 },
-	{ HP_POP(skill->identify), HP_POP2(HP_skill_identify), 4296 },
-	{ HP_POP(skill->weaponrefine), HP_POP2(HP_skill_weaponrefine), 4298 },
-	{ HP_POP(skill->autospell), HP_POP2(HP_skill_autospell), 4300 },
-	{ HP_POP(skill->calc_heal), HP_POP2(HP_skill_calc_heal), 4302 },
-	{ HP_POP(skill->check_cloaking), HP_POP2(HP_skill_check_cloaking), 4304 },
-	{ HP_POP(skill->enchant_elemental_end), HP_POP2(HP_skill_enchant_elemental_end), 4306 },
-	{ HP_POP(skill->not_ok), HP_POP2(HP_skill_not_ok), 4308 },
-	{ HP_POP(skill->not_ok_hom), HP_POP2(HP_skill_not_ok_hom), 4310 },
-	{ HP_POP(skill->not_ok_mercenary), HP_POP2(HP_skill_not_ok_mercenary), 4312 },
-	{ HP_POP(skill->chastle_mob_changetarget), HP_POP2(HP_skill_chastle_mob_changetarget), 4314 },
-	{ HP_POP(skill->can_produce_mix), HP_POP2(HP_skill_can_produce_mix), 4316 },
-	{ HP_POP(skill->produce_mix), HP_POP2(HP_skill_produce_mix), 4318 },
-	{ HP_POP(skill->arrow_create), HP_POP2(HP_skill_arrow_create), 4320 },
-	{ HP_POP(skill->castend_nodamage_id), HP_POP2(HP_skill_castend_nodamage_id), 4322 },
-	{ HP_POP(skill->castend_damage_id), HP_POP2(HP_skill_castend_damage_id), 4324 },
-	{ HP_POP(skill->castend_pos2), HP_POP2(HP_skill_castend_pos2), 4326 },
-	{ HP_POP(skill->blockpc_start), HP_POP2(HP_skill_blockpc_start), 4328 },
-	{ HP_POP(skill->blockhomun_start), HP_POP2(HP_skill_blockhomun_start), 4330 },
-	{ HP_POP(skill->blockmerc_start), HP_POP2(HP_skill_blockmerc_start), 4332 },
-	{ HP_POP(skill->attack), HP_POP2(HP_skill_attack), 4334 },
-	{ HP_POP(skill->attack_area), HP_POP2(HP_skill_attack_area), 4336 },
-	{ HP_POP(skill->area_sub), HP_POP2(HP_skill_area_sub), 4338 },
-	{ HP_POP(skill->area_sub_count), HP_POP2(HP_skill_area_sub_count), 4340 },
-	{ HP_POP(skill->check_unit_range), HP_POP2(HP_skill_check_unit_range), 4342 },
-	{ HP_POP(skill->check_unit_range_sub), HP_POP2(HP_skill_check_unit_range_sub), 4344 },
-	{ HP_POP(skill->check_unit_range2), HP_POP2(HP_skill_check_unit_range2), 4346 },
-	{ HP_POP(skill->check_unit_range2_sub), HP_POP2(HP_skill_check_unit_range2_sub), 4348 },
-	{ HP_POP(skill->toggle_magicpower), HP_POP2(HP_skill_toggle_magicpower), 4350 },
-	{ HP_POP(skill->magic_reflect), HP_POP2(HP_skill_magic_reflect), 4352 },
-	{ HP_POP(skill->onskillusage), HP_POP2(HP_skill_onskillusage), 4354 },
-	{ HP_POP(skill->cell_overlap), HP_POP2(HP_skill_cell_overlap), 4356 },
-	{ HP_POP(skill->timerskill), HP_POP2(HP_skill_timerskill), 4358 },
-	{ HP_POP(skill->trap_splash), HP_POP2(HP_skill_trap_splash), 4360 },
-	{ HP_POP(skill->check_condition_mercenary), HP_POP2(HP_skill_check_condition_mercenary), 4362 },
-	{ HP_POP(skill->locate_element_field), HP_POP2(HP_skill_locate_element_field), 4364 },
-	{ HP_POP(skill->graffitiremover), HP_POP2(HP_skill_graffitiremover), 4366 },
-	{ HP_POP(skill->activate_reverberation), HP_POP2(HP_skill_activate_reverberation), 4368 },
-	{ HP_POP(skill->dance_overlap_sub), HP_POP2(HP_skill_dance_overlap_sub), 4370 },
-	{ HP_POP(skill->dance_overlap), HP_POP2(HP_skill_dance_overlap), 4372 },
-	{ HP_POP(skill->get_unit_layout), HP_POP2(HP_skill_get_unit_layout), 4374 },
-	{ HP_POP(skill->frostjoke_scream), HP_POP2(HP_skill_frostjoke_scream), 4376 },
-	{ HP_POP(skill->greed), HP_POP2(HP_skill_greed), 4378 },
-	{ HP_POP(skill->destroy_trap), HP_POP2(HP_skill_destroy_trap), 4380 },
-	{ HP_POP(skill->icewall_block), HP_POP2(HP_skill_icewall_block), 4382 },
-	{ HP_POP(skill->unitgrouptickset_search), HP_POP2(HP_skill_unitgrouptickset_search), 4384 },
-	{ HP_POP(skill->dance_switch), HP_POP2(HP_skill_dance_switch), 4386 },
-	{ HP_POP(skill->check_condition_char_sub), HP_POP2(HP_skill_check_condition_char_sub), 4388 },
-	{ HP_POP(skill->check_condition_mob_master_sub), HP_POP2(HP_skill_check_condition_mob_master_sub), 4390 },
-	{ HP_POP(skill->brandishspear_first), HP_POP2(HP_skill_brandishspear_first), 4392 },
-	{ HP_POP(skill->brandishspear_dir), HP_POP2(HP_skill_brandishspear_dir), 4394 },
-	{ HP_POP(skill->get_fixed_cast), HP_POP2(HP_skill_get_fixed_cast), 4396 },
-	{ HP_POP(skill->sit_count), HP_POP2(HP_skill_sit_count), 4398 },
-	{ HP_POP(skill->sit_in), HP_POP2(HP_skill_sit_in), 4400 },
-	{ HP_POP(skill->sit_out), HP_POP2(HP_skill_sit_out), 4402 },
-	{ HP_POP(skill->unitsetmapcell), HP_POP2(HP_skill_unitsetmapcell), 4404 },
-	{ HP_POP(skill->unit_onplace_timer), HP_POP2(HP_skill_unit_onplace_timer), 4406 },
-	{ HP_POP(skill->unit_effect), HP_POP2(HP_skill_unit_effect), 4408 },
-	{ HP_POP(skill->unit_timer_sub_onplace), HP_POP2(HP_skill_unit_timer_sub_onplace), 4410 },
-	{ HP_POP(skill->unit_move_sub), HP_POP2(HP_skill_unit_move_sub), 4412 },
-	{ HP_POP(skill->blockpc_end), HP_POP2(HP_skill_blockpc_end), 4414 },
-	{ HP_POP(skill->blockhomun_end), HP_POP2(HP_skill_blockhomun_end), 4416 },
-	{ HP_POP(skill->blockmerc_end), HP_POP2(HP_skill_blockmerc_end), 4418 },
-	{ HP_POP(skill->split_atoi), HP_POP2(HP_skill_split_atoi), 4420 },
-	{ HP_POP(skill->unit_timer), HP_POP2(HP_skill_unit_timer), 4422 },
-	{ HP_POP(skill->unit_timer_sub), HP_POP2(HP_skill_unit_timer_sub), 4424 },
-	{ HP_POP(skill->init_unit_layout), HP_POP2(HP_skill_init_unit_layout), 4426 },
-	{ HP_POP(skill->parse_row_skilldb), HP_POP2(HP_skill_parse_row_skilldb), 4428 },
-	{ HP_POP(skill->parse_row_requiredb), HP_POP2(HP_skill_parse_row_requiredb), 4430 },
-	{ HP_POP(skill->parse_row_castdb), HP_POP2(HP_skill_parse_row_castdb), 4432 },
-	{ HP_POP(skill->parse_row_castnodexdb), HP_POP2(HP_skill_parse_row_castnodexdb), 4434 },
-	{ HP_POP(skill->parse_row_unitdb), HP_POP2(HP_skill_parse_row_unitdb), 4436 },
-	{ HP_POP(skill->parse_row_producedb), HP_POP2(HP_skill_parse_row_producedb), 4438 },
-	{ HP_POP(skill->parse_row_createarrowdb), HP_POP2(HP_skill_parse_row_createarrowdb), 4440 },
-	{ HP_POP(skill->parse_row_abradb), HP_POP2(HP_skill_parse_row_abradb), 4442 },
-	{ HP_POP(skill->parse_row_spellbookdb), HP_POP2(HP_skill_parse_row_spellbookdb), 4444 },
-	{ HP_POP(skill->parse_row_magicmushroomdb), HP_POP2(HP_skill_parse_row_magicmushroomdb), 4446 },
-	{ HP_POP(skill->parse_row_reproducedb), HP_POP2(HP_skill_parse_row_reproducedb), 4448 },
-	{ HP_POP(skill->parse_row_improvisedb), HP_POP2(HP_skill_parse_row_improvisedb), 4450 },
-	{ HP_POP(skill->parse_row_changematerialdb), HP_POP2(HP_skill_parse_row_changematerialdb), 4452 },
-	{ HP_POP(skill->usave_add), HP_POP2(HP_skill_usave_add), 4454 },
-	{ HP_POP(skill->usave_trigger), HP_POP2(HP_skill_usave_trigger), 4456 },
-	{ HP_POP(skill->cooldown_load), HP_POP2(HP_skill_cooldown_load), 4458 },
-	{ HP_POP(skill->spellbook), HP_POP2(HP_skill_spellbook), 4460 },
-	{ HP_POP(skill->block_check), HP_POP2(HP_skill_block_check), 4462 },
-	{ HP_POP(skill->detonator), HP_POP2(HP_skill_detonator), 4464 },
-	{ HP_POP(skill->check_camouflage), HP_POP2(HP_skill_check_camouflage), 4466 },
-	{ HP_POP(skill->magicdecoy), HP_POP2(HP_skill_magicdecoy), 4468 },
-	{ HP_POP(skill->poisoningweapon), HP_POP2(HP_skill_poisoningweapon), 4470 },
-	{ HP_POP(skill->select_menu), HP_POP2(HP_skill_select_menu), 4472 },
-	{ HP_POP(skill->elementalanalysis), HP_POP2(HP_skill_elementalanalysis), 4474 },
-	{ HP_POP(skill->changematerial), HP_POP2(HP_skill_changematerial), 4476 },
-	{ HP_POP(skill->get_elemental_type), HP_POP2(HP_skill_get_elemental_type), 4478 },
-	{ HP_POP(skill->cooldown_save), HP_POP2(HP_skill_cooldown_save), 4480 },
-	{ HP_POP(skill->maelstrom_suction), HP_POP2(HP_skill_maelstrom_suction), 4482 },
-	{ HP_POP(skill->get_new_group_id), HP_POP2(HP_skill_get_new_group_id), 4484 },
+	{ HP_POP(skill->init), HP_POP2(HP_skill_init), 4138 },
+	{ HP_POP(skill->final), HP_POP2(HP_skill_final), 4140 },
+	{ HP_POP(skill->reload), HP_POP2(HP_skill_reload), 4142 },
+	{ HP_POP(skill->read_db), HP_POP2(HP_skill_read_db), 4144 },
+	{ HP_POP(skill->get_index), HP_POP2(HP_skill_get_index), 4146 },
+	{ HP_POP(skill->get_type), HP_POP2(HP_skill_get_type), 4148 },
+	{ HP_POP(skill->get_hit), HP_POP2(HP_skill_get_hit), 4150 },
+	{ HP_POP(skill->get_inf), HP_POP2(HP_skill_get_inf), 4152 },
+	{ HP_POP(skill->get_ele), HP_POP2(HP_skill_get_ele), 4154 },
+	{ HP_POP(skill->get_nk), HP_POP2(HP_skill_get_nk), 4156 },
+	{ HP_POP(skill->get_max), HP_POP2(HP_skill_get_max), 4158 },
+	{ HP_POP(skill->get_range), HP_POP2(HP_skill_get_range), 4160 },
+	{ HP_POP(skill->get_range2), HP_POP2(HP_skill_get_range2), 4162 },
+	{ HP_POP(skill->get_splash), HP_POP2(HP_skill_get_splash), 4164 },
+	{ HP_POP(skill->get_hp), HP_POP2(HP_skill_get_hp), 4166 },
+	{ HP_POP(skill->get_mhp), HP_POP2(HP_skill_get_mhp), 4168 },
+	{ HP_POP(skill->get_sp), HP_POP2(HP_skill_get_sp), 4170 },
+	{ HP_POP(skill->get_state), HP_POP2(HP_skill_get_state), 4172 },
+	{ HP_POP(skill->get_spiritball), HP_POP2(HP_skill_get_spiritball), 4174 },
+	{ HP_POP(skill->get_zeny), HP_POP2(HP_skill_get_zeny), 4176 },
+	{ HP_POP(skill->get_num), HP_POP2(HP_skill_get_num), 4178 },
+	{ HP_POP(skill->get_cast), HP_POP2(HP_skill_get_cast), 4180 },
+	{ HP_POP(skill->get_delay), HP_POP2(HP_skill_get_delay), 4182 },
+	{ HP_POP(skill->get_walkdelay), HP_POP2(HP_skill_get_walkdelay), 4184 },
+	{ HP_POP(skill->get_time), HP_POP2(HP_skill_get_time), 4186 },
+	{ HP_POP(skill->get_time2), HP_POP2(HP_skill_get_time2), 4188 },
+	{ HP_POP(skill->get_castnodex), HP_POP2(HP_skill_get_castnodex), 4190 },
+	{ HP_POP(skill->get_delaynodex), HP_POP2(HP_skill_get_delaynodex), 4192 },
+	{ HP_POP(skill->get_castdef), HP_POP2(HP_skill_get_castdef), 4194 },
+	{ HP_POP(skill->get_weapontype), HP_POP2(HP_skill_get_weapontype), 4196 },
+	{ HP_POP(skill->get_ammotype), HP_POP2(HP_skill_get_ammotype), 4198 },
+	{ HP_POP(skill->get_ammo_qty), HP_POP2(HP_skill_get_ammo_qty), 4200 },
+	{ HP_POP(skill->get_unit_id), HP_POP2(HP_skill_get_unit_id), 4202 },
+	{ HP_POP(skill->get_inf2), HP_POP2(HP_skill_get_inf2), 4204 },
+	{ HP_POP(skill->get_castcancel), HP_POP2(HP_skill_get_castcancel), 4206 },
+	{ HP_POP(skill->get_maxcount), HP_POP2(HP_skill_get_maxcount), 4208 },
+	{ HP_POP(skill->get_blewcount), HP_POP2(HP_skill_get_blewcount), 4210 },
+	{ HP_POP(skill->get_unit_flag), HP_POP2(HP_skill_get_unit_flag), 4212 },
+	{ HP_POP(skill->get_unit_target), HP_POP2(HP_skill_get_unit_target), 4214 },
+	{ HP_POP(skill->get_unit_interval), HP_POP2(HP_skill_get_unit_interval), 4216 },
+	{ HP_POP(skill->get_unit_bl_target), HP_POP2(HP_skill_get_unit_bl_target), 4218 },
+	{ HP_POP(skill->get_unit_layout_type), HP_POP2(HP_skill_get_unit_layout_type), 4220 },
+	{ HP_POP(skill->get_unit_range), HP_POP2(HP_skill_get_unit_range), 4222 },
+	{ HP_POP(skill->get_cooldown), HP_POP2(HP_skill_get_cooldown), 4224 },
+	{ HP_POP(skill->tree_get_max), HP_POP2(HP_skill_tree_get_max), 4226 },
+	{ HP_POP(skill->get_name), HP_POP2(HP_skill_get_name), 4228 },
+	{ HP_POP(skill->get_desc), HP_POP2(HP_skill_get_desc), 4230 },
+	{ HP_POP(skill->chk), HP_POP2(HP_skill_chk), 4232 },
+	{ HP_POP(skill->get_casttype), HP_POP2(HP_skill_get_casttype), 4234 },
+	{ HP_POP(skill->get_casttype2), HP_POP2(HP_skill_get_casttype2), 4236 },
+	{ HP_POP(skill->name2id), HP_POP2(HP_skill_name2id), 4238 },
+	{ HP_POP(skill->isammotype), HP_POP2(HP_skill_isammotype), 4240 },
+	{ HP_POP(skill->castend_id), HP_POP2(HP_skill_castend_id), 4242 },
+	{ HP_POP(skill->castend_pos), HP_POP2(HP_skill_castend_pos), 4244 },
+	{ HP_POP(skill->castend_map), HP_POP2(HP_skill_castend_map), 4246 },
+	{ HP_POP(skill->cleartimerskill), HP_POP2(HP_skill_cleartimerskill), 4248 },
+	{ HP_POP(skill->addtimerskill), HP_POP2(HP_skill_addtimerskill), 4250 },
+	{ HP_POP(skill->additional_effect), HP_POP2(HP_skill_additional_effect), 4252 },
+	{ HP_POP(skill->counter_additional_effect), HP_POP2(HP_skill_counter_additional_effect), 4254 },
+	{ HP_POP(skill->blown), HP_POP2(HP_skill_blown), 4256 },
+	{ HP_POP(skill->break_equip), HP_POP2(HP_skill_break_equip), 4258 },
+	{ HP_POP(skill->strip_equip), HP_POP2(HP_skill_strip_equip), 4260 },
+	{ HP_POP(skill->id2group), HP_POP2(HP_skill_id2group), 4262 },
+	{ HP_POP(skill->unitsetting), HP_POP2(HP_skill_unitsetting), 4264 },
+	{ HP_POP(skill->initunit), HP_POP2(HP_skill_initunit), 4266 },
+	{ HP_POP(skill->delunit), HP_POP2(HP_skill_delunit), 4268 },
+	{ HP_POP(skill->init_unitgroup), HP_POP2(HP_skill_init_unitgroup), 4270 },
+	{ HP_POP(skill->del_unitgroup), HP_POP2(HP_skill_del_unitgroup), 4272 },
+	{ HP_POP(skill->clear_unitgroup), HP_POP2(HP_skill_clear_unitgroup), 4274 },
+	{ HP_POP(skill->clear_group), HP_POP2(HP_skill_clear_group), 4276 },
+	{ HP_POP(skill->unit_onplace), HP_POP2(HP_skill_unit_onplace), 4278 },
+	{ HP_POP(skill->unit_ondamaged), HP_POP2(HP_skill_unit_ondamaged), 4280 },
+	{ HP_POP(skill->cast_fix), HP_POP2(HP_skill_cast_fix), 4282 },
+	{ HP_POP(skill->cast_fix_sc), HP_POP2(HP_skill_cast_fix_sc), 4284 },
+	{ HP_POP(skill->vf_cast_fix), HP_POP2(HP_skill_vf_cast_fix), 4286 },
+	{ HP_POP(skill->delay_fix), HP_POP2(HP_skill_delay_fix), 4288 },
+	{ HP_POP(skill->check_condition_castbegin), HP_POP2(HP_skill_check_condition_castbegin), 4290 },
+	{ HP_POP(skill->check_condition_castend), HP_POP2(HP_skill_check_condition_castend), 4292 },
+	{ HP_POP(skill->consume_requirement), HP_POP2(HP_skill_consume_requirement), 4294 },
+	{ HP_POP(skill->get_requirement), HP_POP2(HP_skill_get_requirement), 4296 },
+	{ HP_POP(skill->check_pc_partner), HP_POP2(HP_skill_check_pc_partner), 4298 },
+	{ HP_POP(skill->unit_move), HP_POP2(HP_skill_unit_move), 4300 },
+	{ HP_POP(skill->unit_onleft), HP_POP2(HP_skill_unit_onleft), 4302 },
+	{ HP_POP(skill->unit_onout), HP_POP2(HP_skill_unit_onout), 4304 },
+	{ HP_POP(skill->unit_move_unit_group), HP_POP2(HP_skill_unit_move_unit_group), 4306 },
+	{ HP_POP(skill->sit), HP_POP2(HP_skill_sit), 4308 },
+	{ HP_POP(skill->brandishspear), HP_POP2(HP_skill_brandishspear), 4310 },
+	{ HP_POP(skill->repairweapon), HP_POP2(HP_skill_repairweapon), 4312 },
+	{ HP_POP(skill->identify), HP_POP2(HP_skill_identify), 4314 },
+	{ HP_POP(skill->weaponrefine), HP_POP2(HP_skill_weaponrefine), 4316 },
+	{ HP_POP(skill->autospell), HP_POP2(HP_skill_autospell), 4318 },
+	{ HP_POP(skill->calc_heal), HP_POP2(HP_skill_calc_heal), 4320 },
+	{ HP_POP(skill->check_cloaking), HP_POP2(HP_skill_check_cloaking), 4322 },
+	{ HP_POP(skill->enchant_elemental_end), HP_POP2(HP_skill_enchant_elemental_end), 4324 },
+	{ HP_POP(skill->not_ok), HP_POP2(HP_skill_not_ok), 4326 },
+	{ HP_POP(skill->not_ok_hom), HP_POP2(HP_skill_not_ok_hom), 4328 },
+	{ HP_POP(skill->not_ok_mercenary), HP_POP2(HP_skill_not_ok_mercenary), 4330 },
+	{ HP_POP(skill->chastle_mob_changetarget), HP_POP2(HP_skill_chastle_mob_changetarget), 4332 },
+	{ HP_POP(skill->can_produce_mix), HP_POP2(HP_skill_can_produce_mix), 4334 },
+	{ HP_POP(skill->produce_mix), HP_POP2(HP_skill_produce_mix), 4336 },
+	{ HP_POP(skill->arrow_create), HP_POP2(HP_skill_arrow_create), 4338 },
+	{ HP_POP(skill->castend_nodamage_id), HP_POP2(HP_skill_castend_nodamage_id), 4340 },
+	{ HP_POP(skill->castend_damage_id), HP_POP2(HP_skill_castend_damage_id), 4342 },
+	{ HP_POP(skill->castend_pos2), HP_POP2(HP_skill_castend_pos2), 4344 },
+	{ HP_POP(skill->blockpc_start), HP_POP2(HP_skill_blockpc_start), 4346 },
+	{ HP_POP(skill->blockhomun_start), HP_POP2(HP_skill_blockhomun_start), 4348 },
+	{ HP_POP(skill->blockmerc_start), HP_POP2(HP_skill_blockmerc_start), 4350 },
+	{ HP_POP(skill->attack), HP_POP2(HP_skill_attack), 4352 },
+	{ HP_POP(skill->attack_area), HP_POP2(HP_skill_attack_area), 4354 },
+	{ HP_POP(skill->area_sub), HP_POP2(HP_skill_area_sub), 4356 },
+	{ HP_POP(skill->area_sub_count), HP_POP2(HP_skill_area_sub_count), 4358 },
+	{ HP_POP(skill->check_unit_range), HP_POP2(HP_skill_check_unit_range), 4360 },
+	{ HP_POP(skill->check_unit_range_sub), HP_POP2(HP_skill_check_unit_range_sub), 4362 },
+	{ HP_POP(skill->check_unit_range2), HP_POP2(HP_skill_check_unit_range2), 4364 },
+	{ HP_POP(skill->check_unit_range2_sub), HP_POP2(HP_skill_check_unit_range2_sub), 4366 },
+	{ HP_POP(skill->toggle_magicpower), HP_POP2(HP_skill_toggle_magicpower), 4368 },
+	{ HP_POP(skill->magic_reflect), HP_POP2(HP_skill_magic_reflect), 4370 },
+	{ HP_POP(skill->onskillusage), HP_POP2(HP_skill_onskillusage), 4372 },
+	{ HP_POP(skill->cell_overlap), HP_POP2(HP_skill_cell_overlap), 4374 },
+	{ HP_POP(skill->timerskill), HP_POP2(HP_skill_timerskill), 4376 },
+	{ HP_POP(skill->trap_splash), HP_POP2(HP_skill_trap_splash), 4378 },
+	{ HP_POP(skill->check_condition_mercenary), HP_POP2(HP_skill_check_condition_mercenary), 4380 },
+	{ HP_POP(skill->locate_element_field), HP_POP2(HP_skill_locate_element_field), 4382 },
+	{ HP_POP(skill->graffitiremover), HP_POP2(HP_skill_graffitiremover), 4384 },
+	{ HP_POP(skill->activate_reverberation), HP_POP2(HP_skill_activate_reverberation), 4386 },
+	{ HP_POP(skill->dance_overlap_sub), HP_POP2(HP_skill_dance_overlap_sub), 4388 },
+	{ HP_POP(skill->dance_overlap), HP_POP2(HP_skill_dance_overlap), 4390 },
+	{ HP_POP(skill->get_unit_layout), HP_POP2(HP_skill_get_unit_layout), 4392 },
+	{ HP_POP(skill->frostjoke_scream), HP_POP2(HP_skill_frostjoke_scream), 4394 },
+	{ HP_POP(skill->greed), HP_POP2(HP_skill_greed), 4396 },
+	{ HP_POP(skill->destroy_trap), HP_POP2(HP_skill_destroy_trap), 4398 },
+	{ HP_POP(skill->icewall_block), HP_POP2(HP_skill_icewall_block), 4400 },
+	{ HP_POP(skill->unitgrouptickset_search), HP_POP2(HP_skill_unitgrouptickset_search), 4402 },
+	{ HP_POP(skill->dance_switch), HP_POP2(HP_skill_dance_switch), 4404 },
+	{ HP_POP(skill->check_condition_char_sub), HP_POP2(HP_skill_check_condition_char_sub), 4406 },
+	{ HP_POP(skill->check_condition_mob_master_sub), HP_POP2(HP_skill_check_condition_mob_master_sub), 4408 },
+	{ HP_POP(skill->brandishspear_first), HP_POP2(HP_skill_brandishspear_first), 4410 },
+	{ HP_POP(skill->brandishspear_dir), HP_POP2(HP_skill_brandishspear_dir), 4412 },
+	{ HP_POP(skill->get_fixed_cast), HP_POP2(HP_skill_get_fixed_cast), 4414 },
+	{ HP_POP(skill->sit_count), HP_POP2(HP_skill_sit_count), 4416 },
+	{ HP_POP(skill->sit_in), HP_POP2(HP_skill_sit_in), 4418 },
+	{ HP_POP(skill->sit_out), HP_POP2(HP_skill_sit_out), 4420 },
+	{ HP_POP(skill->unitsetmapcell), HP_POP2(HP_skill_unitsetmapcell), 4422 },
+	{ HP_POP(skill->unit_onplace_timer), HP_POP2(HP_skill_unit_onplace_timer), 4424 },
+	{ HP_POP(skill->unit_effect), HP_POP2(HP_skill_unit_effect), 4426 },
+	{ HP_POP(skill->unit_timer_sub_onplace), HP_POP2(HP_skill_unit_timer_sub_onplace), 4428 },
+	{ HP_POP(skill->unit_move_sub), HP_POP2(HP_skill_unit_move_sub), 4430 },
+	{ HP_POP(skill->blockpc_end), HP_POP2(HP_skill_blockpc_end), 4432 },
+	{ HP_POP(skill->blockhomun_end), HP_POP2(HP_skill_blockhomun_end), 4434 },
+	{ HP_POP(skill->blockmerc_end), HP_POP2(HP_skill_blockmerc_end), 4436 },
+	{ HP_POP(skill->split_atoi), HP_POP2(HP_skill_split_atoi), 4438 },
+	{ HP_POP(skill->unit_timer), HP_POP2(HP_skill_unit_timer), 4440 },
+	{ HP_POP(skill->unit_timer_sub), HP_POP2(HP_skill_unit_timer_sub), 4442 },
+	{ HP_POP(skill->init_unit_layout), HP_POP2(HP_skill_init_unit_layout), 4444 },
+	{ HP_POP(skill->parse_row_skilldb), HP_POP2(HP_skill_parse_row_skilldb), 4446 },
+	{ HP_POP(skill->parse_row_requiredb), HP_POP2(HP_skill_parse_row_requiredb), 4448 },
+	{ HP_POP(skill->parse_row_castdb), HP_POP2(HP_skill_parse_row_castdb), 4450 },
+	{ HP_POP(skill->parse_row_castnodexdb), HP_POP2(HP_skill_parse_row_castnodexdb), 4452 },
+	{ HP_POP(skill->parse_row_unitdb), HP_POP2(HP_skill_parse_row_unitdb), 4454 },
+	{ HP_POP(skill->parse_row_producedb), HP_POP2(HP_skill_parse_row_producedb), 4456 },
+	{ HP_POP(skill->parse_row_createarrowdb), HP_POP2(HP_skill_parse_row_createarrowdb), 4458 },
+	{ HP_POP(skill->parse_row_abradb), HP_POP2(HP_skill_parse_row_abradb), 4460 },
+	{ HP_POP(skill->parse_row_spellbookdb), HP_POP2(HP_skill_parse_row_spellbookdb), 4462 },
+	{ HP_POP(skill->parse_row_magicmushroomdb), HP_POP2(HP_skill_parse_row_magicmushroomdb), 4464 },
+	{ HP_POP(skill->parse_row_reproducedb), HP_POP2(HP_skill_parse_row_reproducedb), 4466 },
+	{ HP_POP(skill->parse_row_improvisedb), HP_POP2(HP_skill_parse_row_improvisedb), 4468 },
+	{ HP_POP(skill->parse_row_changematerialdb), HP_POP2(HP_skill_parse_row_changematerialdb), 4470 },
+	{ HP_POP(skill->usave_add), HP_POP2(HP_skill_usave_add), 4472 },
+	{ HP_POP(skill->usave_trigger), HP_POP2(HP_skill_usave_trigger), 4474 },
+	{ HP_POP(skill->cooldown_load), HP_POP2(HP_skill_cooldown_load), 4476 },
+	{ HP_POP(skill->spellbook), HP_POP2(HP_skill_spellbook), 4478 },
+	{ HP_POP(skill->block_check), HP_POP2(HP_skill_block_check), 4480 },
+	{ HP_POP(skill->detonator), HP_POP2(HP_skill_detonator), 4482 },
+	{ HP_POP(skill->check_camouflage), HP_POP2(HP_skill_check_camouflage), 4484 },
+	{ HP_POP(skill->magicdecoy), HP_POP2(HP_skill_magicdecoy), 4486 },
+	{ HP_POP(skill->poisoningweapon), HP_POP2(HP_skill_poisoningweapon), 4488 },
+	{ HP_POP(skill->select_menu), HP_POP2(HP_skill_select_menu), 4490 },
+	{ HP_POP(skill->elementalanalysis), HP_POP2(HP_skill_elementalanalysis), 4492 },
+	{ HP_POP(skill->changematerial), HP_POP2(HP_skill_changematerial), 4494 },
+	{ HP_POP(skill->get_elemental_type), HP_POP2(HP_skill_get_elemental_type), 4496 },
+	{ HP_POP(skill->cooldown_save), HP_POP2(HP_skill_cooldown_save), 4498 },
+	{ HP_POP(skill->maelstrom_suction), HP_POP2(HP_skill_maelstrom_suction), 4500 },
+	{ HP_POP(skill->get_new_group_id), HP_POP2(HP_skill_get_new_group_id), 4502 },
 /* status */
-	{ HP_POP(status->init), HP_POP2(HP_status_init), 4486 },
-	{ HP_POP(status->final), HP_POP2(HP_status_final), 4488 },
-	{ HP_POP(status->get_refine_chance), HP_POP2(HP_status_get_refine_chance), 4490 },
-	{ HP_POP(status->skill2sc), HP_POP2(HP_status_skill2sc), 4492 },
-	{ HP_POP(status->sc2skill), HP_POP2(HP_status_sc2skill), 4494 },
-	{ HP_POP(status->sc2scb_flag), HP_POP2(HP_status_sc2scb_flag), 4496 },
-	{ HP_POP(status->type2relevant_bl_types), HP_POP2(HP_status_type2relevant_bl_types), 4498 },
-	{ HP_POP(status->get_sc_type), HP_POP2(HP_status_get_sc_type), 4500 },
-	{ HP_POP(status->damage), HP_POP2(HP_status_damage), 4502 },
-	{ HP_POP(status->charge), HP_POP2(HP_status_charge), 4504 },
-	{ HP_POP(status->percent_change), HP_POP2(HP_status_percent_change), 4506 },
-	{ HP_POP(status->set_hp), HP_POP2(HP_status_set_hp), 4508 },
-	{ HP_POP(status->set_sp), HP_POP2(HP_status_set_sp), 4510 },
-	{ HP_POP(status->heal), HP_POP2(HP_status_heal), 4512 },
-	{ HP_POP(status->revive), HP_POP2(HP_status_revive), 4514 },
-	{ HP_POP(status->get_regen_data), HP_POP2(HP_status_get_regen_data), 4516 },
-	{ HP_POP(status->get_status_data), HP_POP2(HP_status_get_status_data), 4518 },
-	{ HP_POP(status->get_base_status), HP_POP2(HP_status_get_base_status), 4520 },
-	{ HP_POP(status->get_name), HP_POP2(HP_status_get_name), 4522 },
-	{ HP_POP(status->get_class), HP_POP2(HP_status_get_class), 4524 },
-	{ HP_POP(status->get_lv), HP_POP2(HP_status_get_lv), 4526 },
-	{ HP_POP(status->get_def), HP_POP2(HP_status_get_def), 4528 },
-	{ HP_POP(status->get_speed), HP_POP2(HP_status_get_speed), 4530 },
-	{ HP_POP(status->calc_attack_element), HP_POP2(HP_status_calc_attack_element), 4532 },
-	{ HP_POP(status->get_party_id), HP_POP2(HP_status_get_party_id), 4534 },
-	{ HP_POP(status->get_guild_id), HP_POP2(HP_status_get_guild_id), 4536 },
-	{ HP_POP(status->get_emblem_id), HP_POP2(HP_status_get_emblem_id), 4538 },
-	{ HP_POP(status->get_mexp), HP_POP2(HP_status_get_mexp), 4540 },
-	{ HP_POP(status->get_race2), HP_POP2(HP_status_get_race2), 4542 },
-	{ HP_POP(status->get_viewdata), HP_POP2(HP_status_get_viewdata), 4544 },
-	{ HP_POP(status->set_viewdata), HP_POP2(HP_status_set_viewdata), 4546 },
-	{ HP_POP(status->change_init), HP_POP2(HP_status_change_init), 4548 },
-	{ HP_POP(status->get_sc), HP_POP2(HP_status_get_sc), 4550 },
-	{ HP_POP(status->isdead), HP_POP2(HP_status_isdead), 4552 },
-	{ HP_POP(status->isimmune), HP_POP2(HP_status_isimmune), 4554 },
-	{ HP_POP(status->get_sc_def), HP_POP2(HP_status_get_sc_def), 4556 },
-	{ HP_POP(status->change_start), HP_POP2(HP_status_change_start), 4558 },
-	{ HP_POP(status->change_end_), HP_POP2(HP_status_change_end_), 4560 },
-	{ HP_POP(status->kaahi_heal_timer), HP_POP2(HP_status_kaahi_heal_timer), 4562 },
-	{ HP_POP(status->change_timer), HP_POP2(HP_status_change_timer), 4564 },
-	{ HP_POP(status->change_timer_sub), HP_POP2(HP_status_change_timer_sub), 4566 },
-	{ HP_POP(status->change_clear), HP_POP2(HP_status_change_clear), 4568 },
-	{ HP_POP(status->change_clear_buffs), HP_POP2(HP_status_change_clear_buffs), 4570 },
-	{ HP_POP(status->calc_bl_), HP_POP2(HP_status_calc_bl_), 4572 },
-	{ HP_POP(status->calc_mob_), HP_POP2(HP_status_calc_mob_), 4574 },
-	{ HP_POP(status->calc_pet_), HP_POP2(HP_status_calc_pet_), 4576 },
-	{ HP_POP(status->calc_pc_), HP_POP2(HP_status_calc_pc_), 4578 },
-	{ HP_POP(status->calc_homunculus_), HP_POP2(HP_status_calc_homunculus_), 4580 },
-	{ HP_POP(status->calc_mercenary_), HP_POP2(HP_status_calc_mercenary_), 4582 },
-	{ HP_POP(status->calc_elemental_), HP_POP2(HP_status_calc_elemental_), 4584 },
-	{ HP_POP(status->calc_misc), HP_POP2(HP_status_calc_misc), 4586 },
-	{ HP_POP(status->calc_regen), HP_POP2(HP_status_calc_regen), 4588 },
-	{ HP_POP(status->calc_regen_rate), HP_POP2(HP_status_calc_regen_rate), 4590 },
-	{ HP_POP(status->check_skilluse), HP_POP2(HP_status_check_skilluse), 4592 },
-	{ HP_POP(status->check_visibility), HP_POP2(HP_status_check_visibility), 4594 },
-	{ HP_POP(status->change_spread), HP_POP2(HP_status_change_spread), 4596 },
-	{ HP_POP(status->calc_def), HP_POP2(HP_status_calc_def), 4598 },
-	{ HP_POP(status->calc_def2), HP_POP2(HP_status_calc_def2), 4600 },
-	{ HP_POP(status->calc_mdef), HP_POP2(HP_status_calc_mdef), 4602 },
-	{ HP_POP(status->calc_mdef2), HP_POP2(HP_status_calc_mdef2), 4604 },
-	{ HP_POP(status->calc_batk), HP_POP2(HP_status_calc_batk), 4606 },
-	{ HP_POP(status->base_matk), HP_POP2(HP_status_base_matk), 4608 },
-	{ HP_POP(status->get_weapon_atk), HP_POP2(HP_status_get_weapon_atk), 4610 },
-	{ HP_POP(status->get_total_mdef), HP_POP2(HP_status_get_total_mdef), 4612 },
-	{ HP_POP(status->get_total_def), HP_POP2(HP_status_get_total_def), 4614 },
-	{ HP_POP(status->get_matk), HP_POP2(HP_status_get_matk), 4616 },
-	{ HP_POP(status->readdb), HP_POP2(HP_status_readdb), 4618 },
-	{ HP_POP(status->initChangeTables), HP_POP2(HP_status_initChangeTables), 4620 },
-	{ HP_POP(status->initDummyData), HP_POP2(HP_status_initDummyData), 4622 },
-	{ HP_POP(status->base_amotion_pc), HP_POP2(HP_status_base_amotion_pc), 4624 },
-	{ HP_POP(status->base_atk), HP_POP2(HP_status_base_atk), 4626 },
-	{ HP_POP(status->calc_sigma), HP_POP2(HP_status_calc_sigma), 4628 },
-	{ HP_POP(status->base_pc_maxhp), HP_POP2(HP_status_base_pc_maxhp), 4630 },
-	{ HP_POP(status->base_pc_maxsp), HP_POP2(HP_status_base_pc_maxsp), 4632 },
-	{ HP_POP(status->calc_npc_), HP_POP2(HP_status_calc_npc_), 4634 },
-	{ HP_POP(status->calc_str), HP_POP2(HP_status_calc_str), 4636 },
-	{ HP_POP(status->calc_agi), HP_POP2(HP_status_calc_agi), 4638 },
-	{ HP_POP(status->calc_vit), HP_POP2(HP_status_calc_vit), 4640 },
-	{ HP_POP(status->calc_int), HP_POP2(HP_status_calc_int), 4642 },
-	{ HP_POP(status->calc_dex), HP_POP2(HP_status_calc_dex), 4644 },
-	{ HP_POP(status->calc_luk), HP_POP2(HP_status_calc_luk), 4646 },
-	{ HP_POP(status->calc_watk), HP_POP2(HP_status_calc_watk), 4648 },
-	{ HP_POP(status->calc_matk), HP_POP2(HP_status_calc_matk), 4650 },
-	{ HP_POP(status->calc_hit), HP_POP2(HP_status_calc_hit), 4652 },
-	{ HP_POP(status->calc_critical), HP_POP2(HP_status_calc_critical), 4654 },
-	{ HP_POP(status->calc_flee), HP_POP2(HP_status_calc_flee), 4656 },
-	{ HP_POP(status->calc_flee2), HP_POP2(HP_status_calc_flee2), 4658 },
-	{ HP_POP(status->calc_speed), HP_POP2(HP_status_calc_speed), 4660 },
-	{ HP_POP(status->calc_aspd_rate), HP_POP2(HP_status_calc_aspd_rate), 4662 },
-	{ HP_POP(status->calc_dmotion), HP_POP2(HP_status_calc_dmotion), 4664 },
-	{ HP_POP(status->calc_aspd), HP_POP2(HP_status_calc_aspd), 4666 },
-	{ HP_POP(status->calc_fix_aspd), HP_POP2(HP_status_calc_fix_aspd), 4668 },
-	{ HP_POP(status->calc_maxhp), HP_POP2(HP_status_calc_maxhp), 4670 },
-	{ HP_POP(status->calc_maxsp), HP_POP2(HP_status_calc_maxsp), 4672 },
-	{ HP_POP(status->calc_element), HP_POP2(HP_status_calc_element), 4674 },
-	{ HP_POP(status->calc_element_lv), HP_POP2(HP_status_calc_element_lv), 4676 },
-	{ HP_POP(status->calc_mode), HP_POP2(HP_status_calc_mode), 4678 },
-	{ HP_POP(status->calc_ematk), HP_POP2(HP_status_calc_ematk), 4680 },
-	{ HP_POP(status->calc_bl_main), HP_POP2(HP_status_calc_bl_main), 4682 },
-	{ HP_POP(status->display_add), HP_POP2(HP_status_display_add), 4684 },
-	{ HP_POP(status->display_remove), HP_POP2(HP_status_display_remove), 4686 },
-	{ HP_POP(status->natural_heal), HP_POP2(HP_status_natural_heal), 4688 },
-	{ HP_POP(status->natural_heal_timer), HP_POP2(HP_status_natural_heal_timer), 4690 },
-	{ HP_POP(status->readdb_job1), HP_POP2(HP_status_readdb_job1), 4692 },
-	{ HP_POP(status->readdb_job2), HP_POP2(HP_status_readdb_job2), 4694 },
-	{ HP_POP(status->readdb_sizefix), HP_POP2(HP_status_readdb_sizefix), 4696 },
-	{ HP_POP(status->readdb_refine), HP_POP2(HP_status_readdb_refine), 4698 },
-	{ HP_POP(status->readdb_scconfig), HP_POP2(HP_status_readdb_scconfig), 4700 },
+	{ HP_POP(status->init), HP_POP2(HP_status_init), 4504 },
+	{ HP_POP(status->final), HP_POP2(HP_status_final), 4506 },
+	{ HP_POP(status->get_refine_chance), HP_POP2(HP_status_get_refine_chance), 4508 },
+	{ HP_POP(status->skill2sc), HP_POP2(HP_status_skill2sc), 4510 },
+	{ HP_POP(status->sc2skill), HP_POP2(HP_status_sc2skill), 4512 },
+	{ HP_POP(status->sc2scb_flag), HP_POP2(HP_status_sc2scb_flag), 4514 },
+	{ HP_POP(status->type2relevant_bl_types), HP_POP2(HP_status_type2relevant_bl_types), 4516 },
+	{ HP_POP(status->get_sc_type), HP_POP2(HP_status_get_sc_type), 4518 },
+	{ HP_POP(status->damage), HP_POP2(HP_status_damage), 4520 },
+	{ HP_POP(status->charge), HP_POP2(HP_status_charge), 4522 },
+	{ HP_POP(status->percent_change), HP_POP2(HP_status_percent_change), 4524 },
+	{ HP_POP(status->set_hp), HP_POP2(HP_status_set_hp), 4526 },
+	{ HP_POP(status->set_sp), HP_POP2(HP_status_set_sp), 4528 },
+	{ HP_POP(status->heal), HP_POP2(HP_status_heal), 4530 },
+	{ HP_POP(status->revive), HP_POP2(HP_status_revive), 4532 },
+	{ HP_POP(status->get_regen_data), HP_POP2(HP_status_get_regen_data), 4534 },
+	{ HP_POP(status->get_status_data), HP_POP2(HP_status_get_status_data), 4536 },
+	{ HP_POP(status->get_base_status), HP_POP2(HP_status_get_base_status), 4538 },
+	{ HP_POP(status->get_name), HP_POP2(HP_status_get_name), 4540 },
+	{ HP_POP(status->get_class), HP_POP2(HP_status_get_class), 4542 },
+	{ HP_POP(status->get_lv), HP_POP2(HP_status_get_lv), 4544 },
+	{ HP_POP(status->get_def), HP_POP2(HP_status_get_def), 4546 },
+	{ HP_POP(status->get_speed), HP_POP2(HP_status_get_speed), 4548 },
+	{ HP_POP(status->calc_attack_element), HP_POP2(HP_status_calc_attack_element), 4550 },
+	{ HP_POP(status->get_party_id), HP_POP2(HP_status_get_party_id), 4552 },
+	{ HP_POP(status->get_guild_id), HP_POP2(HP_status_get_guild_id), 4554 },
+	{ HP_POP(status->get_emblem_id), HP_POP2(HP_status_get_emblem_id), 4556 },
+	{ HP_POP(status->get_mexp), HP_POP2(HP_status_get_mexp), 4558 },
+	{ HP_POP(status->get_race2), HP_POP2(HP_status_get_race2), 4560 },
+	{ HP_POP(status->get_viewdata), HP_POP2(HP_status_get_viewdata), 4562 },
+	{ HP_POP(status->set_viewdata), HP_POP2(HP_status_set_viewdata), 4564 },
+	{ HP_POP(status->change_init), HP_POP2(HP_status_change_init), 4566 },
+	{ HP_POP(status->get_sc), HP_POP2(HP_status_get_sc), 4568 },
+	{ HP_POP(status->isdead), HP_POP2(HP_status_isdead), 4570 },
+	{ HP_POP(status->isimmune), HP_POP2(HP_status_isimmune), 4572 },
+	{ HP_POP(status->get_sc_def), HP_POP2(HP_status_get_sc_def), 4574 },
+	{ HP_POP(status->change_start), HP_POP2(HP_status_change_start), 4576 },
+	{ HP_POP(status->change_end_), HP_POP2(HP_status_change_end_), 4578 },
+	{ HP_POP(status->kaahi_heal_timer), HP_POP2(HP_status_kaahi_heal_timer), 4580 },
+	{ HP_POP(status->change_timer), HP_POP2(HP_status_change_timer), 4582 },
+	{ HP_POP(status->change_timer_sub), HP_POP2(HP_status_change_timer_sub), 4584 },
+	{ HP_POP(status->change_clear), HP_POP2(HP_status_change_clear), 4586 },
+	{ HP_POP(status->change_clear_buffs), HP_POP2(HP_status_change_clear_buffs), 4588 },
+	{ HP_POP(status->calc_bl_), HP_POP2(HP_status_calc_bl_), 4590 },
+	{ HP_POP(status->calc_mob_), HP_POP2(HP_status_calc_mob_), 4592 },
+	{ HP_POP(status->calc_pet_), HP_POP2(HP_status_calc_pet_), 4594 },
+	{ HP_POP(status->calc_pc_), HP_POP2(HP_status_calc_pc_), 4596 },
+	{ HP_POP(status->calc_homunculus_), HP_POP2(HP_status_calc_homunculus_), 4598 },
+	{ HP_POP(status->calc_mercenary_), HP_POP2(HP_status_calc_mercenary_), 4600 },
+	{ HP_POP(status->calc_elemental_), HP_POP2(HP_status_calc_elemental_), 4602 },
+	{ HP_POP(status->calc_misc), HP_POP2(HP_status_calc_misc), 4604 },
+	{ HP_POP(status->calc_regen), HP_POP2(HP_status_calc_regen), 4606 },
+	{ HP_POP(status->calc_regen_rate), HP_POP2(HP_status_calc_regen_rate), 4608 },
+	{ HP_POP(status->check_skilluse), HP_POP2(HP_status_check_skilluse), 4610 },
+	{ HP_POP(status->check_visibility), HP_POP2(HP_status_check_visibility), 4612 },
+	{ HP_POP(status->change_spread), HP_POP2(HP_status_change_spread), 4614 },
+	{ HP_POP(status->calc_def), HP_POP2(HP_status_calc_def), 4616 },
+	{ HP_POP(status->calc_def2), HP_POP2(HP_status_calc_def2), 4618 },
+	{ HP_POP(status->calc_mdef), HP_POP2(HP_status_calc_mdef), 4620 },
+	{ HP_POP(status->calc_mdef2), HP_POP2(HP_status_calc_mdef2), 4622 },
+	{ HP_POP(status->calc_batk), HP_POP2(HP_status_calc_batk), 4624 },
+	{ HP_POP(status->base_matk), HP_POP2(HP_status_base_matk), 4626 },
+	{ HP_POP(status->get_weapon_atk), HP_POP2(HP_status_get_weapon_atk), 4628 },
+	{ HP_POP(status->get_total_mdef), HP_POP2(HP_status_get_total_mdef), 4630 },
+	{ HP_POP(status->get_total_def), HP_POP2(HP_status_get_total_def), 4632 },
+	{ HP_POP(status->get_matk), HP_POP2(HP_status_get_matk), 4634 },
+	{ HP_POP(status->readdb), HP_POP2(HP_status_readdb), 4636 },
+	{ HP_POP(status->initChangeTables), HP_POP2(HP_status_initChangeTables), 4638 },
+	{ HP_POP(status->initDummyData), HP_POP2(HP_status_initDummyData), 4640 },
+	{ HP_POP(status->base_amotion_pc), HP_POP2(HP_status_base_amotion_pc), 4642 },
+	{ HP_POP(status->base_atk), HP_POP2(HP_status_base_atk), 4644 },
+	{ HP_POP(status->calc_sigma), HP_POP2(HP_status_calc_sigma), 4646 },
+	{ HP_POP(status->base_pc_maxhp), HP_POP2(HP_status_base_pc_maxhp), 4648 },
+	{ HP_POP(status->base_pc_maxsp), HP_POP2(HP_status_base_pc_maxsp), 4650 },
+	{ HP_POP(status->calc_npc_), HP_POP2(HP_status_calc_npc_), 4652 },
+	{ HP_POP(status->calc_str), HP_POP2(HP_status_calc_str), 4654 },
+	{ HP_POP(status->calc_agi), HP_POP2(HP_status_calc_agi), 4656 },
+	{ HP_POP(status->calc_vit), HP_POP2(HP_status_calc_vit), 4658 },
+	{ HP_POP(status->calc_int), HP_POP2(HP_status_calc_int), 4660 },
+	{ HP_POP(status->calc_dex), HP_POP2(HP_status_calc_dex), 4662 },
+	{ HP_POP(status->calc_luk), HP_POP2(HP_status_calc_luk), 4664 },
+	{ HP_POP(status->calc_watk), HP_POP2(HP_status_calc_watk), 4666 },
+	{ HP_POP(status->calc_matk), HP_POP2(HP_status_calc_matk), 4668 },
+	{ HP_POP(status->calc_hit), HP_POP2(HP_status_calc_hit), 4670 },
+	{ HP_POP(status->calc_critical), HP_POP2(HP_status_calc_critical), 4672 },
+	{ HP_POP(status->calc_flee), HP_POP2(HP_status_calc_flee), 4674 },
+	{ HP_POP(status->calc_flee2), HP_POP2(HP_status_calc_flee2), 4676 },
+	{ HP_POP(status->calc_speed), HP_POP2(HP_status_calc_speed), 4678 },
+	{ HP_POP(status->calc_aspd_rate), HP_POP2(HP_status_calc_aspd_rate), 4680 },
+	{ HP_POP(status->calc_dmotion), HP_POP2(HP_status_calc_dmotion), 4682 },
+	{ HP_POP(status->calc_aspd), HP_POP2(HP_status_calc_aspd), 4684 },
+	{ HP_POP(status->calc_fix_aspd), HP_POP2(HP_status_calc_fix_aspd), 4686 },
+	{ HP_POP(status->calc_maxhp), HP_POP2(HP_status_calc_maxhp), 4688 },
+	{ HP_POP(status->calc_maxsp), HP_POP2(HP_status_calc_maxsp), 4690 },
+	{ HP_POP(status->calc_element), HP_POP2(HP_status_calc_element), 4692 },
+	{ HP_POP(status->calc_element_lv), HP_POP2(HP_status_calc_element_lv), 4694 },
+	{ HP_POP(status->calc_mode), HP_POP2(HP_status_calc_mode), 4696 },
+	{ HP_POP(status->calc_ematk), HP_POP2(HP_status_calc_ematk), 4698 },
+	{ HP_POP(status->calc_bl_main), HP_POP2(HP_status_calc_bl_main), 4700 },
+	{ HP_POP(status->display_add), HP_POP2(HP_status_display_add), 4702 },
+	{ HP_POP(status->display_remove), HP_POP2(HP_status_display_remove), 4704 },
+	{ HP_POP(status->natural_heal), HP_POP2(HP_status_natural_heal), 4706 },
+	{ HP_POP(status->natural_heal_timer), HP_POP2(HP_status_natural_heal_timer), 4708 },
+	{ HP_POP(status->readdb_job1), HP_POP2(HP_status_readdb_job1), 4710 },
+	{ HP_POP(status->readdb_job2), HP_POP2(HP_status_readdb_job2), 4712 },
+	{ HP_POP(status->readdb_sizefix), HP_POP2(HP_status_readdb_sizefix), 4714 },
+	{ HP_POP(status->readdb_refine), HP_POP2(HP_status_readdb_refine), 4716 },
+	{ HP_POP(status->readdb_scconfig), HP_POP2(HP_status_readdb_scconfig), 4718 },
 /* storage */
-	{ HP_POP(storage->reconnect), HP_POP2(HP_storage_reconnect), 4702 },
-	{ HP_POP(storage->delitem), HP_POP2(HP_storage_delitem), 4704 },
-	{ HP_POP(storage->open), HP_POP2(HP_storage_open), 4706 },
-	{ HP_POP(storage->add), HP_POP2(HP_storage_add), 4708 },
-	{ HP_POP(storage->get), HP_POP2(HP_storage_get), 4710 },
-	{ HP_POP(storage->additem), HP_POP2(HP_storage_additem), 4712 },
-	{ HP_POP(storage->addfromcart), HP_POP2(HP_storage_addfromcart), 4714 },
-	{ HP_POP(storage->gettocart), HP_POP2(HP_storage_gettocart), 4716 },
-	{ HP_POP(storage->close), HP_POP2(HP_storage_close), 4718 },
-	{ HP_POP(storage->pc_quit), HP_POP2(HP_storage_pc_quit), 4720 },
-	{ HP_POP(storage->comp_item), HP_POP2(HP_storage_comp_item), 4722 },
-	{ HP_POP(storage->sortitem), HP_POP2(HP_storage_sortitem), 4724 },
-	{ HP_POP(storage->reconnect_sub), HP_POP2(HP_storage_reconnect_sub), 4726 },
+	{ HP_POP(storage->reconnect), HP_POP2(HP_storage_reconnect), 4720 },
+	{ HP_POP(storage->delitem), HP_POP2(HP_storage_delitem), 4722 },
+	{ HP_POP(storage->open), HP_POP2(HP_storage_open), 4724 },
+	{ HP_POP(storage->add), HP_POP2(HP_storage_add), 4726 },
+	{ HP_POP(storage->get), HP_POP2(HP_storage_get), 4728 },
+	{ HP_POP(storage->additem), HP_POP2(HP_storage_additem), 4730 },
+	{ HP_POP(storage->addfromcart), HP_POP2(HP_storage_addfromcart), 4732 },
+	{ HP_POP(storage->gettocart), HP_POP2(HP_storage_gettocart), 4734 },
+	{ HP_POP(storage->close), HP_POP2(HP_storage_close), 4736 },
+	{ HP_POP(storage->pc_quit), HP_POP2(HP_storage_pc_quit), 4738 },
+	{ HP_POP(storage->comp_item), HP_POP2(HP_storage_comp_item), 4740 },
+	{ HP_POP(storage->sortitem), HP_POP2(HP_storage_sortitem), 4742 },
+	{ HP_POP(storage->reconnect_sub), HP_POP2(HP_storage_reconnect_sub), 4744 },
 /* trade */
-	{ HP_POP(trade->request), HP_POP2(HP_trade_request), 4728 },
-	{ HP_POP(trade->ack), HP_POP2(HP_trade_ack), 4730 },
-	{ HP_POP(trade->check_impossible), HP_POP2(HP_trade_check_impossible), 4732 },
-	{ HP_POP(trade->check), HP_POP2(HP_trade_check), 4734 },
-	{ HP_POP(trade->additem), HP_POP2(HP_trade_additem), 4736 },
-	{ HP_POP(trade->addzeny), HP_POP2(HP_trade_addzeny), 4738 },
-	{ HP_POP(trade->ok), HP_POP2(HP_trade_ok), 4740 },
-	{ HP_POP(trade->cancel), HP_POP2(HP_trade_cancel), 4742 },
-	{ HP_POP(trade->commit), HP_POP2(HP_trade_commit), 4744 },
+	{ HP_POP(trade->request), HP_POP2(HP_trade_request), 4746 },
+	{ HP_POP(trade->ack), HP_POP2(HP_trade_ack), 4748 },
+	{ HP_POP(trade->check_impossible), HP_POP2(HP_trade_check_impossible), 4750 },
+	{ HP_POP(trade->check), HP_POP2(HP_trade_check), 4752 },
+	{ HP_POP(trade->additem), HP_POP2(HP_trade_additem), 4754 },
+	{ HP_POP(trade->addzeny), HP_POP2(HP_trade_addzeny), 4756 },
+	{ HP_POP(trade->ok), HP_POP2(HP_trade_ok), 4758 },
+	{ HP_POP(trade->cancel), HP_POP2(HP_trade_cancel), 4760 },
+	{ HP_POP(trade->commit), HP_POP2(HP_trade_commit), 4762 },
 /* unit */
-	{ HP_POP(unit->init), HP_POP2(HP_unit_init), 4746 },
-	{ HP_POP(unit->final), HP_POP2(HP_unit_final), 4748 },
-	{ HP_POP(unit->bl2ud), HP_POP2(HP_unit_bl2ud), 4750 },
-	{ HP_POP(unit->bl2ud2), HP_POP2(HP_unit_bl2ud2), 4752 },
-	{ HP_POP(unit->attack_timer), HP_POP2(HP_unit_attack_timer), 4754 },
-	{ HP_POP(unit->walktoxy_timer), HP_POP2(HP_unit_walktoxy_timer), 4756 },
-	{ HP_POP(unit->walktoxy_sub), HP_POP2(HP_unit_walktoxy_sub), 4758 },
-	{ HP_POP(unit->delay_walktoxy_timer), HP_POP2(HP_unit_delay_walktoxy_timer), 4760 },
-	{ HP_POP(unit->walktoxy), HP_POP2(HP_unit_walktoxy), 4762 },
-	{ HP_POP(unit->walktobl_sub), HP_POP2(HP_unit_walktobl_sub), 4764 },
-	{ HP_POP(unit->walktobl), HP_POP2(HP_unit_walktobl), 4766 },
-	{ HP_POP(unit->run), HP_POP2(HP_unit_run), 4768 },
-	{ HP_POP(unit->wugdash), HP_POP2(HP_unit_wugdash), 4770 },
-	{ HP_POP(unit->escape), HP_POP2(HP_unit_escape), 4772 },
-	{ HP_POP(unit->movepos), HP_POP2(HP_unit_movepos), 4774 },
-	{ HP_POP(unit->setdir), HP_POP2(HP_unit_setdir), 4776 },
-	{ HP_POP(unit->getdir), HP_POP2(HP_unit_getdir), 4778 },
-	{ HP_POP(unit->blown), HP_POP2(HP_unit_blown), 4780 },
-	{ HP_POP(unit->warp), HP_POP2(HP_unit_warp), 4782 },
-	{ HP_POP(unit->stop_walking), HP_POP2(HP_unit_stop_walking), 4784 },
-	{ HP_POP(unit->skilluse_id), HP_POP2(HP_unit_skilluse_id), 4786 },
-	{ HP_POP(unit->is_walking), HP_POP2(HP_unit_is_walking), 4788 },
-	{ HP_POP(unit->can_move), HP_POP2(HP_unit_can_move), 4790 },
-	{ HP_POP(unit->resume_running), HP_POP2(HP_unit_resume_running), 4792 },
-	{ HP_POP(unit->set_walkdelay), HP_POP2(HP_unit_set_walkdelay), 4794 },
-	{ HP_POP(unit->skilluse_id2), HP_POP2(HP_unit_skilluse_id2), 4796 },
-	{ HP_POP(unit->skilluse_pos), HP_POP2(HP_unit_skilluse_pos), 4798 },
-	{ HP_POP(unit->skilluse_pos2), HP_POP2(HP_unit_skilluse_pos2), 4800 },
-	{ HP_POP(unit->set_target), HP_POP2(HP_unit_set_target), 4802 },
-	{ HP_POP(unit->stop_attack), HP_POP2(HP_unit_stop_attack), 4804 },
-	{ HP_POP(unit->unattackable), HP_POP2(HP_unit_unattackable), 4806 },
-	{ HP_POP(unit->attack), HP_POP2(HP_unit_attack), 4808 },
-	{ HP_POP(unit->cancel_combo), HP_POP2(HP_unit_cancel_combo), 4810 },
-	{ HP_POP(unit->can_reach_pos), HP_POP2(HP_unit_can_reach_pos), 4812 },
-	{ HP_POP(unit->can_reach_bl), HP_POP2(HP_unit_can_reach_bl), 4814 },
-	{ HP_POP(unit->calc_pos), HP_POP2(HP_unit_calc_pos), 4816 },
-	{ HP_POP(unit->attack_timer_sub), HP_POP2(HP_unit_attack_timer_sub), 4818 },
-	{ HP_POP(unit->skillcastcancel), HP_POP2(HP_unit_skillcastcancel), 4820 },
-	{ HP_POP(unit->dataset), HP_POP2(HP_unit_dataset), 4822 },
-	{ HP_POP(unit->counttargeted), HP_POP2(HP_unit_counttargeted), 4824 },
-	{ HP_POP(unit->fixdamage), HP_POP2(HP_unit_fixdamage), 4826 },
-	{ HP_POP(unit->changeviewsize), HP_POP2(HP_unit_changeviewsize), 4828 },
-	{ HP_POP(unit->remove_map), HP_POP2(HP_unit_remove_map), 4830 },
-	{ HP_POP(unit->remove_map_pc), HP_POP2(HP_unit_remove_map_pc), 4832 },
-	{ HP_POP(unit->free_pc), HP_POP2(HP_unit_free_pc), 4834 },
-	{ HP_POP(unit->free), HP_POP2(HP_unit_free), 4836 },
+	{ HP_POP(unit->init), HP_POP2(HP_unit_init), 4764 },
+	{ HP_POP(unit->final), HP_POP2(HP_unit_final), 4766 },
+	{ HP_POP(unit->bl2ud), HP_POP2(HP_unit_bl2ud), 4768 },
+	{ HP_POP(unit->bl2ud2), HP_POP2(HP_unit_bl2ud2), 4770 },
+	{ HP_POP(unit->attack_timer), HP_POP2(HP_unit_attack_timer), 4772 },
+	{ HP_POP(unit->walktoxy_timer), HP_POP2(HP_unit_walktoxy_timer), 4774 },
+	{ HP_POP(unit->walktoxy_sub), HP_POP2(HP_unit_walktoxy_sub), 4776 },
+	{ HP_POP(unit->delay_walktoxy_timer), HP_POP2(HP_unit_delay_walktoxy_timer), 4778 },
+	{ HP_POP(unit->walktoxy), HP_POP2(HP_unit_walktoxy), 4780 },
+	{ HP_POP(unit->walktobl_sub), HP_POP2(HP_unit_walktobl_sub), 4782 },
+	{ HP_POP(unit->walktobl), HP_POP2(HP_unit_walktobl), 4784 },
+	{ HP_POP(unit->run), HP_POP2(HP_unit_run), 4786 },
+	{ HP_POP(unit->wugdash), HP_POP2(HP_unit_wugdash), 4788 },
+	{ HP_POP(unit->escape), HP_POP2(HP_unit_escape), 4790 },
+	{ HP_POP(unit->movepos), HP_POP2(HP_unit_movepos), 4792 },
+	{ HP_POP(unit->setdir), HP_POP2(HP_unit_setdir), 4794 },
+	{ HP_POP(unit->getdir), HP_POP2(HP_unit_getdir), 4796 },
+	{ HP_POP(unit->blown), HP_POP2(HP_unit_blown), 4798 },
+	{ HP_POP(unit->warp), HP_POP2(HP_unit_warp), 4800 },
+	{ HP_POP(unit->stop_walking), HP_POP2(HP_unit_stop_walking), 4802 },
+	{ HP_POP(unit->skilluse_id), HP_POP2(HP_unit_skilluse_id), 4804 },
+	{ HP_POP(unit->is_walking), HP_POP2(HP_unit_is_walking), 4806 },
+	{ HP_POP(unit->can_move), HP_POP2(HP_unit_can_move), 4808 },
+	{ HP_POP(unit->resume_running), HP_POP2(HP_unit_resume_running), 4810 },
+	{ HP_POP(unit->set_walkdelay), HP_POP2(HP_unit_set_walkdelay), 4812 },
+	{ HP_POP(unit->skilluse_id2), HP_POP2(HP_unit_skilluse_id2), 4814 },
+	{ HP_POP(unit->skilluse_pos), HP_POP2(HP_unit_skilluse_pos), 4816 },
+	{ HP_POP(unit->skilluse_pos2), HP_POP2(HP_unit_skilluse_pos2), 4818 },
+	{ HP_POP(unit->set_target), HP_POP2(HP_unit_set_target), 4820 },
+	{ HP_POP(unit->stop_attack), HP_POP2(HP_unit_stop_attack), 4822 },
+	{ HP_POP(unit->unattackable), HP_POP2(HP_unit_unattackable), 4824 },
+	{ HP_POP(unit->attack), HP_POP2(HP_unit_attack), 4826 },
+	{ HP_POP(unit->cancel_combo), HP_POP2(HP_unit_cancel_combo), 4828 },
+	{ HP_POP(unit->can_reach_pos), HP_POP2(HP_unit_can_reach_pos), 4830 },
+	{ HP_POP(unit->can_reach_bl), HP_POP2(HP_unit_can_reach_bl), 4832 },
+	{ HP_POP(unit->calc_pos), HP_POP2(HP_unit_calc_pos), 4834 },
+	{ HP_POP(unit->attack_timer_sub), HP_POP2(HP_unit_attack_timer_sub), 4836 },
+	{ HP_POP(unit->skillcastcancel), HP_POP2(HP_unit_skillcastcancel), 4838 },
+	{ HP_POP(unit->dataset), HP_POP2(HP_unit_dataset), 4840 },
+	{ HP_POP(unit->counttargeted), HP_POP2(HP_unit_counttargeted), 4842 },
+	{ HP_POP(unit->fixdamage), HP_POP2(HP_unit_fixdamage), 4844 },
+	{ HP_POP(unit->changeviewsize), HP_POP2(HP_unit_changeviewsize), 4846 },
+	{ HP_POP(unit->remove_map), HP_POP2(HP_unit_remove_map), 4848 },
+	{ HP_POP(unit->remove_map_pc), HP_POP2(HP_unit_remove_map_pc), 4850 },
+	{ HP_POP(unit->free_pc), HP_POP2(HP_unit_free_pc), 4852 },
+	{ HP_POP(unit->free), HP_POP2(HP_unit_free), 4854 },
 /* vending */
-	{ HP_POP(vending->init), HP_POP2(HP_vending_init), 4838 },
-	{ HP_POP(vending->final), HP_POP2(HP_vending_final), 4840 },
-	{ HP_POP(vending->close), HP_POP2(HP_vending_close), 4842 },
-	{ HP_POP(vending->open), HP_POP2(HP_vending_open), 4844 },
-	{ HP_POP(vending->list), HP_POP2(HP_vending_list), 4846 },
-	{ HP_POP(vending->purchase), HP_POP2(HP_vending_purchase), 4848 },
-	{ HP_POP(vending->search), HP_POP2(HP_vending_search), 4850 },
-	{ HP_POP(vending->searchall), HP_POP2(HP_vending_searchall), 4852 },
+	{ HP_POP(vending->init), HP_POP2(HP_vending_init), 4856 },
+	{ HP_POP(vending->final), HP_POP2(HP_vending_final), 4858 },
+	{ HP_POP(vending->close), HP_POP2(HP_vending_close), 4860 },
+	{ HP_POP(vending->open), HP_POP2(HP_vending_open), 4862 },
+	{ HP_POP(vending->list), HP_POP2(HP_vending_list), 4864 },
+	{ HP_POP(vending->purchase), HP_POP2(HP_vending_purchase), 4866 },
+	{ HP_POP(vending->search), HP_POP2(HP_vending_search), 4868 },
+	{ HP_POP(vending->searchall), HP_POP2(HP_vending_searchall), 4870 },
 };
 
 int HookingPointsLenMax = 41;
diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
index 3eafd4dbb..b57e0e6c5 100644
--- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
@@ -16147,6 +16147,56 @@ void HP_clif_chsys_gleave(struct guild *g1, struct guild *g2) {
 	}
 	return;
 }
+void HP_clif_bank_deposit(struct map_session_data *sd, enum e_BANKING_DEPOSIT_ACK reason) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_clif_bank_deposit_pre ) {
+		void (*preHookFunc) (struct map_session_data *sd, enum e_BANKING_DEPOSIT_ACK *reason);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bank_deposit_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_clif_bank_deposit_pre[hIndex].func;
+			preHookFunc(sd, &reason);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.bank_deposit(sd, reason);
+	}
+	if( HPMHooks.count.HP_clif_bank_deposit_post ) {
+		void (*postHookFunc) (struct map_session_data *sd, enum e_BANKING_DEPOSIT_ACK *reason);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bank_deposit_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_clif_bank_deposit_post[hIndex].func;
+			postHookFunc(sd, &reason);
+		}
+	}
+	return;
+}
+void HP_clif_bank_withdraw(struct map_session_data *sd, enum e_BANKING_WITHDRAW_ACK reason) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_clif_bank_withdraw_pre ) {
+		void (*preHookFunc) (struct map_session_data *sd, enum e_BANKING_WITHDRAW_ACK *reason);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bank_withdraw_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_clif_bank_withdraw_pre[hIndex].func;
+			preHookFunc(sd, &reason);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.bank_withdraw(sd, reason);
+	}
+	if( HPMHooks.count.HP_clif_bank_withdraw_post ) {
+		void (*postHookFunc) (struct map_session_data *sd, enum e_BANKING_WITHDRAW_ACK *reason);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bank_withdraw_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_clif_bank_withdraw_post[hIndex].func;
+			postHookFunc(sd, &reason);
+		}
+	}
+	return;
+}
 void HP_clif_pWantToConnection(int fd, struct map_session_data *sd) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_clif_pWantToConnection_pre ) {
@@ -21497,6 +21547,131 @@ void HP_clif_pPartyBookingCancelVolunteer(int fd, struct map_session_data *sd) {
 	}
 	return;
 }
+void HP_clif_pBankDeposit(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_clif_pBankDeposit_pre ) {
+		void (*preHookFunc) (int *fd, struct map_session_data *sd);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankDeposit_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_clif_pBankDeposit_pre[hIndex].func;
+			preHookFunc(&fd, sd);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pBankDeposit(fd, sd);
+	}
+	if( HPMHooks.count.HP_clif_pBankDeposit_post ) {
+		void (*postHookFunc) (int *fd, struct map_session_data *sd);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankDeposit_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_clif_pBankDeposit_post[hIndex].func;
+			postHookFunc(&fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_pBankWithdraw(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_clif_pBankWithdraw_pre ) {
+		void (*preHookFunc) (int *fd, struct map_session_data *sd);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankWithdraw_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_clif_pBankWithdraw_pre[hIndex].func;
+			preHookFunc(&fd, sd);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pBankWithdraw(fd, sd);
+	}
+	if( HPMHooks.count.HP_clif_pBankWithdraw_post ) {
+		void (*postHookFunc) (int *fd, struct map_session_data *sd);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankWithdraw_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_clif_pBankWithdraw_post[hIndex].func;
+			postHookFunc(&fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_pBankCheck(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_clif_pBankCheck_pre ) {
+		void (*preHookFunc) (int *fd, struct map_session_data *sd);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankCheck_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_clif_pBankCheck_pre[hIndex].func;
+			preHookFunc(&fd, sd);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pBankCheck(fd, sd);
+	}
+	if( HPMHooks.count.HP_clif_pBankCheck_post ) {
+		void (*postHookFunc) (int *fd, struct map_session_data *sd);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankCheck_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_clif_pBankCheck_post[hIndex].func;
+			postHookFunc(&fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_pBankOpen(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_clif_pBankOpen_pre ) {
+		void (*preHookFunc) (int *fd, struct map_session_data *sd);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankOpen_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_clif_pBankOpen_pre[hIndex].func;
+			preHookFunc(&fd, sd);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pBankOpen(fd, sd);
+	}
+	if( HPMHooks.count.HP_clif_pBankOpen_post ) {
+		void (*postHookFunc) (int *fd, struct map_session_data *sd);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankOpen_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_clif_pBankOpen_post[hIndex].func;
+			postHookFunc(&fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_pBankClose(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_clif_pBankClose_pre ) {
+		void (*preHookFunc) (int *fd, struct map_session_data *sd);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankClose_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_clif_pBankClose_pre[hIndex].func;
+			preHookFunc(&fd, sd);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pBankClose(fd, sd);
+	}
+	if( HPMHooks.count.HP_clif_pBankClose_post ) {
+		void (*postHookFunc) (int *fd, struct map_session_data *sd);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pBankClose_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_clif_pBankClose_post[hIndex].func;
+			postHookFunc(&fd, sd);
+		}
+	}
+	return;
+}
 /* duel */
 int HP_duel_create(struct map_session_data *sd, const unsigned int maxpl) {
 	int hIndex = 0;
@@ -25467,11 +25642,11 @@ int HP_homun_dead(struct homun_data *hd) {
 	}
 	return retVal___;
 }
-int HP_homun_vaporize(struct map_session_data *sd, int flag) {
+int HP_homun_vaporize(struct map_session_data *sd, enum homun_state flag) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_homun_vaporize_pre ) {
-		int (*preHookFunc) (struct map_session_data *sd, int *flag);
+		int (*preHookFunc) (struct map_session_data *sd, enum homun_state *flag);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_vaporize_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_homun_vaporize_pre[hIndex].func;
 			retVal___ = preHookFunc(sd, &flag);
@@ -25485,7 +25660,7 @@ int HP_homun_vaporize(struct map_session_data *sd, int flag) {
 		retVal___ = HPMHooks.source.homun.vaporize(sd, flag);
 	}
 	if( HPMHooks.count.HP_homun_vaporize_post ) {
-		int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *flag);
+		int (*postHookFunc) (int retVal___, struct map_session_data *sd, enum homun_state *flag);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_vaporize_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_homun_vaporize_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, sd, &flag);
@@ -48540,6 +48715,56 @@ int HP_pc_removecombo(struct map_session_data *sd, struct item_data *data) {
 	}
 	return retVal___;
 }
+void HP_pc_bank_deposit(struct map_session_data *sd, int money) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_pc_bank_deposit_pre ) {
+		void (*preHookFunc) (struct map_session_data *sd, int *money);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bank_deposit_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_pc_bank_deposit_pre[hIndex].func;
+			preHookFunc(sd, &money);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.pc.bank_deposit(sd, money);
+	}
+	if( HPMHooks.count.HP_pc_bank_deposit_post ) {
+		void (*postHookFunc) (struct map_session_data *sd, int *money);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bank_deposit_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_pc_bank_deposit_post[hIndex].func;
+			postHookFunc(sd, &money);
+		}
+	}
+	return;
+}
+void HP_pc_bank_withdraw(struct map_session_data *sd, int money) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_pc_bank_withdraw_pre ) {
+		void (*preHookFunc) (struct map_session_data *sd, int *money);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bank_withdraw_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_pc_bank_withdraw_pre[hIndex].func;
+			preHookFunc(sd, &money);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.pc.bank_withdraw(sd, money);
+	}
+	if( HPMHooks.count.HP_pc_bank_withdraw_post ) {
+		void (*postHookFunc) (struct map_session_data *sd, int *money);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_bank_withdraw_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_pc_bank_withdraw_post[hIndex].func;
+			postHookFunc(sd, &money);
+		}
+	}
+	return;
+}
 /* pet */
 int HP_pet_init(void) {
 	int hIndex = 0;