Merge branch 'master' into configure_newopt

1 files changed, 740 insertions, 181 deletions

diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index 4b0054b28..70bc309f3 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2013-2018  Hercules Dev Team
+ * Copyright (C) 2013-2020 Hercules Dev Team
  *
  * Hercules is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -886,12 +886,18 @@ struct {
 	struct HPMHookPoint *HP_clif_fame_taekwon_post;
 	struct HPMHookPoint *HP_clif_ranklist_pre;
 	struct HPMHookPoint *HP_clif_ranklist_post;
+	struct HPMHookPoint *HP_clif_ranklist_sub_pre;
+	struct HPMHookPoint *HP_clif_ranklist_sub_post;
+	struct HPMHookPoint *HP_clif_ranklist_sub2_pre;
+	struct HPMHookPoint *HP_clif_ranklist_sub2_post;
 	struct HPMHookPoint *HP_clif_update_rankingpoint_pre;
 	struct HPMHookPoint *HP_clif_update_rankingpoint_post;
 	struct HPMHookPoint *HP_clif_pRanklist_pre;
 	struct HPMHookPoint *HP_clif_pRanklist_post;
 	struct HPMHookPoint *HP_clif_hotkeys_pre;
 	struct HPMHookPoint *HP_clif_hotkeys_post;
+	struct HPMHookPoint *HP_clif_hotkeysAll_pre;
+	struct HPMHookPoint *HP_clif_hotkeysAll_post;
 	struct HPMHookPoint *HP_clif_insight_pre;
 	struct HPMHookPoint *HP_clif_insight_post;
 	struct HPMHookPoint *HP_clif_outsight_pre;
@@ -916,6 +922,8 @@ struct {
 	struct HPMHookPoint *HP_clif_combo_delay_post;
 	struct HPMHookPoint *HP_clif_status_change_pre;
 	struct HPMHookPoint *HP_clif_status_change_post;
+	struct HPMHookPoint *HP_clif_status_change_sub_pre;
+	struct HPMHookPoint *HP_clif_status_change_sub_post;
 	struct HPMHookPoint *HP_clif_insert_card_pre;
 	struct HPMHookPoint *HP_clif_insert_card_post;
 	struct HPMHookPoint *HP_clif_inventoryList_pre;
@@ -930,6 +938,18 @@ struct {
 	struct HPMHookPoint *HP_clif_cartList_post;
 	struct HPMHookPoint *HP_clif_cartItems_pre;
 	struct HPMHookPoint *HP_clif_cartItems_post;
+	struct HPMHookPoint *HP_clif_inventoryExpansionInfo_pre;
+	struct HPMHookPoint *HP_clif_inventoryExpansionInfo_post;
+	struct HPMHookPoint *HP_clif_inventoryExpandAck_pre;
+	struct HPMHookPoint *HP_clif_inventoryExpandAck_post;
+	struct HPMHookPoint *HP_clif_inventoryExpandResult_pre;
+	struct HPMHookPoint *HP_clif_inventoryExpandResult_post;
+	struct HPMHookPoint *HP_clif_pInventoryExpansion_pre;
+	struct HPMHookPoint *HP_clif_pInventoryExpansion_post;
+	struct HPMHookPoint *HP_clif_pInventoryExpansionConfirmed_pre;
+	struct HPMHookPoint *HP_clif_pInventoryExpansionConfirmed_post;
+	struct HPMHookPoint *HP_clif_pInventoryExpansionRejected_pre;
+	struct HPMHookPoint *HP_clif_pInventoryExpansionRejected_post;
 	struct HPMHookPoint *HP_clif_favorite_item_pre;
 	struct HPMHookPoint *HP_clif_favorite_item_post;
 	struct HPMHookPoint *HP_clif_clearcart_pre;
@@ -956,8 +976,36 @@ struct {
 	struct HPMHookPoint *HP_clif_mvp_noitem_post;
 	struct HPMHookPoint *HP_clif_changed_dir_pre;
 	struct HPMHookPoint *HP_clif_changed_dir_post;
-	struct HPMHookPoint *HP_clif_charnameack_pre;
-	struct HPMHookPoint *HP_clif_charnameack_post;
+	struct HPMHookPoint *HP_clif_blname_ack_pre;
+	struct HPMHookPoint *HP_clif_blname_ack_post;
+	struct HPMHookPoint *HP_clif_pcname_ack_pre;
+	struct HPMHookPoint *HP_clif_pcname_ack_post;
+	struct HPMHookPoint *HP_clif_homname_ack_pre;
+	struct HPMHookPoint *HP_clif_homname_ack_post;
+	struct HPMHookPoint *HP_clif_mername_ack_pre;
+	struct HPMHookPoint *HP_clif_mername_ack_post;
+	struct HPMHookPoint *HP_clif_petname_ack_pre;
+	struct HPMHookPoint *HP_clif_petname_ack_post;
+	struct HPMHookPoint *HP_clif_npcname_ack_pre;
+	struct HPMHookPoint *HP_clif_npcname_ack_post;
+	struct HPMHookPoint *HP_clif_mobname_ack_pre;
+	struct HPMHookPoint *HP_clif_mobname_ack_post;
+	struct HPMHookPoint *HP_clif_mobname_guardian_ack_pre;
+	struct HPMHookPoint *HP_clif_mobname_guardian_ack_post;
+	struct HPMHookPoint *HP_clif_mobname_additional_ack_pre;
+	struct HPMHookPoint *HP_clif_mobname_additional_ack_post;
+	struct HPMHookPoint *HP_clif_mobname_normal_ack_pre;
+	struct HPMHookPoint *HP_clif_mobname_normal_ack_post;
+	struct HPMHookPoint *HP_clif_chatname_ack_pre;
+	struct HPMHookPoint *HP_clif_chatname_ack_post;
+	struct HPMHookPoint *HP_clif_elemname_ack_pre;
+	struct HPMHookPoint *HP_clif_elemname_ack_post;
+	struct HPMHookPoint *HP_clif_skillname_ack_pre;
+	struct HPMHookPoint *HP_clif_skillname_ack_post;
+	struct HPMHookPoint *HP_clif_itemname_ack_pre;
+	struct HPMHookPoint *HP_clif_itemname_ack_post;
+	struct HPMHookPoint *HP_clif_unknownname_ack_pre;
+	struct HPMHookPoint *HP_clif_unknownname_ack_post;
 	struct HPMHookPoint *HP_clif_monster_hp_bar_pre;
 	struct HPMHookPoint *HP_clif_monster_hp_bar_post;
 	struct HPMHookPoint *HP_clif_hpmeter_pre;
@@ -1060,6 +1108,8 @@ struct {
 	struct HPMHookPoint *HP_clif_misceffect_post;
 	struct HPMHookPoint *HP_clif_changeoption_pre;
 	struct HPMHookPoint *HP_clif_changeoption_post;
+	struct HPMHookPoint *HP_clif_changeoption_target_pre;
+	struct HPMHookPoint *HP_clif_changeoption_target_post;
 	struct HPMHookPoint *HP_clif_changeoption2_pre;
 	struct HPMHookPoint *HP_clif_changeoption2_post;
 	struct HPMHookPoint *HP_clif_emotion_pre;
@@ -1110,6 +1160,8 @@ struct {
 	struct HPMHookPoint *HP_clif_specialeffect_single_post;
 	struct HPMHookPoint *HP_clif_specialeffect_value_pre;
 	struct HPMHookPoint *HP_clif_specialeffect_value_post;
+	struct HPMHookPoint *HP_clif_specialeffect_value_single_pre;
+	struct HPMHookPoint *HP_clif_specialeffect_value_single_post;
 	struct HPMHookPoint *HP_clif_removeSpecialEffect_pre;
 	struct HPMHookPoint *HP_clif_removeSpecialEffect_post;
 	struct HPMHookPoint *HP_clif_removeSpecialEffect_single_pre;
@@ -1144,6 +1196,8 @@ struct {
 	struct HPMHookPoint *HP_clif_addchat_post;
 	struct HPMHookPoint *HP_clif_changechatowner_pre;
 	struct HPMHookPoint *HP_clif_changechatowner_post;
+	struct HPMHookPoint *HP_clif_chatRoleChange_pre;
+	struct HPMHookPoint *HP_clif_chatRoleChange_post;
 	struct HPMHookPoint *HP_clif_clearchat_pre;
 	struct HPMHookPoint *HP_clif_clearchat_post;
 	struct HPMHookPoint *HP_clif_leavechat_pre;
@@ -1164,6 +1218,8 @@ struct {
 	struct HPMHookPoint *HP_clif_messagecolor_self_post;
 	struct HPMHookPoint *HP_clif_messagecolor_pre;
 	struct HPMHookPoint *HP_clif_messagecolor_post;
+	struct HPMHookPoint *HP_clif_serviceMessageColor_pre;
+	struct HPMHookPoint *HP_clif_serviceMessageColor_post;
 	struct HPMHookPoint *HP_clif_disp_overhead_pre;
 	struct HPMHookPoint *HP_clif_disp_overhead_post;
 	struct HPMHookPoint *HP_clif_notify_playerchat_pre;
@@ -1256,6 +1312,8 @@ struct {
 	struct HPMHookPoint *HP_clif_addskill_post;
 	struct HPMHookPoint *HP_clif_deleteskill_pre;
 	struct HPMHookPoint *HP_clif_deleteskill_post;
+	struct HPMHookPoint *HP_clif_playerSkillToPacket_pre;
+	struct HPMHookPoint *HP_clif_playerSkillToPacket_post;
 	struct HPMHookPoint *HP_clif_party_created_pre;
 	struct HPMHookPoint *HP_clif_party_created_post;
 	struct HPMHookPoint *HP_clif_party_member_info_pre;
@@ -1298,6 +1356,10 @@ struct {
 	struct HPMHookPoint *HP_clif_guild_basicinfo_post;
 	struct HPMHookPoint *HP_clif_guild_allianceinfo_pre;
 	struct HPMHookPoint *HP_clif_guild_allianceinfo_post;
+	struct HPMHookPoint *HP_clif_guild_castlelist_pre;
+	struct HPMHookPoint *HP_clif_guild_castlelist_post;
+	struct HPMHookPoint *HP_clif_guild_castleinfo_pre;
+	struct HPMHookPoint *HP_clif_guild_castleinfo_post;
 	struct HPMHookPoint *HP_clif_guild_memberlist_pre;
 	struct HPMHookPoint *HP_clif_guild_memberlist_post;
 	struct HPMHookPoint *HP_clif_guild_skillinfo_pre;
@@ -1600,6 +1662,8 @@ struct {
 	struct HPMHookPoint *HP_clif_parse_roulette_db_post;
 	struct HPMHookPoint *HP_clif_roulette_generate_ack_pre;
 	struct HPMHookPoint *HP_clif_roulette_generate_ack_post;
+	struct HPMHookPoint *HP_clif_roulette_close_pre;
+	struct HPMHookPoint *HP_clif_roulette_close_post;
 	struct HPMHookPoint *HP_clif_openmergeitem_pre;
 	struct HPMHookPoint *HP_clif_openmergeitem_post;
 	struct HPMHookPoint *HP_clif_cancelmergeitem_pre;
@@ -1608,6 +1672,8 @@ struct {
 	struct HPMHookPoint *HP_clif_comparemergeitem_post;
 	struct HPMHookPoint *HP_clif_ackmergeitems_pre;
 	struct HPMHookPoint *HP_clif_ackmergeitems_post;
+	struct HPMHookPoint *HP_clif_mergeitems_pre;
+	struct HPMHookPoint *HP_clif_mergeitems_post;
 	struct HPMHookPoint *HP_clif_isdisguised_pre;
 	struct HPMHookPoint *HP_clif_isdisguised_post;
 	struct HPMHookPoint *HP_clif_navigate_to_pre;
@@ -1632,8 +1698,10 @@ struct {
 	struct HPMHookPoint *HP_clif_pLoadEndAck_post;
 	struct HPMHookPoint *HP_clif_pTickSend_pre;
 	struct HPMHookPoint *HP_clif_pTickSend_post;
-	struct HPMHookPoint *HP_clif_pHotkey_pre;
-	struct HPMHookPoint *HP_clif_pHotkey_post;
+	struct HPMHookPoint *HP_clif_pHotkey1_pre;
+	struct HPMHookPoint *HP_clif_pHotkey1_post;
+	struct HPMHookPoint *HP_clif_pHotkey2_pre;
+	struct HPMHookPoint *HP_clif_pHotkey2_post;
 	struct HPMHookPoint *HP_clif_pProgressbar_pre;
 	struct HPMHookPoint *HP_clif_pProgressbar_post;
 	struct HPMHookPoint *HP_clif_pWalkToXY_pre;
@@ -1718,8 +1786,14 @@ struct {
 	struct HPMHookPoint *HP_clif_pStatusUp_post;
 	struct HPMHookPoint *HP_clif_pSkillUp_pre;
 	struct HPMHookPoint *HP_clif_pSkillUp_post;
+	struct HPMHookPoint *HP_clif_useSkillToIdReal_pre;
+	struct HPMHookPoint *HP_clif_useSkillToIdReal_post;
 	struct HPMHookPoint *HP_clif_pUseSkillToId_pre;
 	struct HPMHookPoint *HP_clif_pUseSkillToId_post;
+	struct HPMHookPoint *HP_clif_pStartUseSkillToId_pre;
+	struct HPMHookPoint *HP_clif_pStartUseSkillToId_post;
+	struct HPMHookPoint *HP_clif_pStopUseSkillToId_pre;
+	struct HPMHookPoint *HP_clif_pStopUseSkillToId_post;
 	struct HPMHookPoint *HP_clif_pUseSkillToId_homun_pre;
 	struct HPMHookPoint *HP_clif_pUseSkillToId_homun_post;
 	struct HPMHookPoint *HP_clif_pUseSkillToId_mercenary_pre;
@@ -2032,8 +2106,12 @@ struct {
 	struct HPMHookPoint *HP_clif_pBGQueueRevokeReq_post;
 	struct HPMHookPoint *HP_clif_pBGQueueBattleBeginAck_pre;
 	struct HPMHookPoint *HP_clif_pBGQueueBattleBeginAck_post;
-	struct HPMHookPoint *HP_clif_pCashShopOpen_pre;
-	struct HPMHookPoint *HP_clif_pCashShopOpen_post;
+	struct HPMHookPoint *HP_clif_pCashShopOpen1_pre;
+	struct HPMHookPoint *HP_clif_pCashShopOpen1_post;
+	struct HPMHookPoint *HP_clif_pCashShopOpen2_pre;
+	struct HPMHookPoint *HP_clif_pCashShopOpen2_post;
+	struct HPMHookPoint *HP_clif_pCashShopLimitedReq_pre;
+	struct HPMHookPoint *HP_clif_pCashShopLimitedReq_post;
 	struct HPMHookPoint *HP_clif_pCashShopClose_pre;
 	struct HPMHookPoint *HP_clif_pCashShopClose_post;
 	struct HPMHookPoint *HP_clif_pCashShopReqTab_pre;
@@ -2046,6 +2124,10 @@ struct {
 	struct HPMHookPoint *HP_clif_pPartyTick_post;
 	struct HPMHookPoint *HP_clif_pGuildInvite2_pre;
 	struct HPMHookPoint *HP_clif_pGuildInvite2_post;
+	struct HPMHookPoint *HP_clif_cashShopBuyAck_pre;
+	struct HPMHookPoint *HP_clif_cashShopBuyAck_post;
+	struct HPMHookPoint *HP_clif_cashShopOpen_pre;
+	struct HPMHookPoint *HP_clif_cashShopOpen_post;
 	struct HPMHookPoint *HP_clif_pPartyBookingAddFilter_pre;
 	struct HPMHookPoint *HP_clif_pPartyBookingAddFilter_post;
 	struct HPMHookPoint *HP_clif_pPartyBookingSubFilter_pre;
@@ -2084,8 +2166,10 @@ struct {
 	struct HPMHookPoint *HP_clif_pNPCMarketPurchase_post;
 	struct HPMHookPoint *HP_clif_add_item_options_pre;
 	struct HPMHookPoint *HP_clif_add_item_options_post;
-	struct HPMHookPoint *HP_clif_pHotkeyRowShift_pre;
-	struct HPMHookPoint *HP_clif_pHotkeyRowShift_post;
+	struct HPMHookPoint *HP_clif_pHotkeyRowShift1_pre;
+	struct HPMHookPoint *HP_clif_pHotkeyRowShift1_post;
+	struct HPMHookPoint *HP_clif_pHotkeyRowShift2_pre;
+	struct HPMHookPoint *HP_clif_pHotkeyRowShift2_post;
 	struct HPMHookPoint *HP_clif_dressroom_open_pre;
 	struct HPMHookPoint *HP_clif_dressroom_open_post;
 	struct HPMHookPoint *HP_clif_pOneClick_ItemIdentify_pre;
@@ -2190,24 +2274,12 @@ struct {
 	struct HPMHookPoint *HP_clif_pPrivateAirshipRequest_post;
 	struct HPMHookPoint *HP_clif_PrivateAirshipResponse_pre;
 	struct HPMHookPoint *HP_clif_PrivateAirshipResponse_post;
-	struct HPMHookPoint *HP_clif_stylist_vector_init_pre;
-	struct HPMHookPoint *HP_clif_stylist_vector_init_post;
-	struct HPMHookPoint *HP_clif_stylist_vector_clear_pre;
-	struct HPMHookPoint *HP_clif_stylist_vector_clear_post;
-	struct HPMHookPoint *HP_clif_stylist_read_db_libconfig_pre;
-	struct HPMHookPoint *HP_clif_stylist_read_db_libconfig_post;
-	struct HPMHookPoint *HP_clif_stylist_read_db_libconfig_sub_pre;
-	struct HPMHookPoint *HP_clif_stylist_read_db_libconfig_sub_post;
-	struct HPMHookPoint *HP_clif_style_change_validate_requirements_pre;
-	struct HPMHookPoint *HP_clif_style_change_validate_requirements_post;
-	struct HPMHookPoint *HP_clif_stylist_send_rodexitem_pre;
-	struct HPMHookPoint *HP_clif_stylist_send_rodexitem_post;
 	struct HPMHookPoint *HP_clif_pReqStyleChange_pre;
 	struct HPMHookPoint *HP_clif_pReqStyleChange_post;
 	struct HPMHookPoint *HP_clif_pReqStyleChange2_pre;
 	struct HPMHookPoint *HP_clif_pReqStyleChange2_post;
-	struct HPMHookPoint *HP_clif_cz_req_style_change_sub_pre;
-	struct HPMHookPoint *HP_clif_cz_req_style_change_sub_post;
+	struct HPMHookPoint *HP_clif_pStyleClose_pre;
+	struct HPMHookPoint *HP_clif_pStyleClose_post;
 	struct HPMHookPoint *HP_clif_style_change_response_pre;
 	struct HPMHookPoint *HP_clif_style_change_response_post;
 	struct HPMHookPoint *HP_clif_pPetEvolution_pre;
@@ -2222,8 +2294,78 @@ struct {
 	struct HPMHookPoint *HP_clif_camera_showWindow_post;
 	struct HPMHookPoint *HP_clif_camera_change_pre;
 	struct HPMHookPoint *HP_clif_camera_change_post;
+	struct HPMHookPoint *HP_clif_pCameraInfo_pre;
+	struct HPMHookPoint *HP_clif_pCameraInfo_post;
 	struct HPMHookPoint *HP_clif_item_preview_pre;
 	struct HPMHookPoint *HP_clif_item_preview_post;
+	struct HPMHookPoint *HP_clif_enchant_equipment_pre;
+	struct HPMHookPoint *HP_clif_enchant_equipment_post;
+	struct HPMHookPoint *HP_clif_pReqRemainTime_pre;
+	struct HPMHookPoint *HP_clif_pReqRemainTime_post;
+	struct HPMHookPoint *HP_clif_npc_barter_open_pre;
+	struct HPMHookPoint *HP_clif_npc_barter_open_post;
+	struct HPMHookPoint *HP_clif_pNPCBarterClosed_pre;
+	struct HPMHookPoint *HP_clif_pNPCBarterClosed_post;
+	struct HPMHookPoint *HP_clif_pNPCBarterPurchase_pre;
+	struct HPMHookPoint *HP_clif_pNPCBarterPurchase_post;
+	struct HPMHookPoint *HP_clif_pNPCExpandedBarterClosed_pre;
+	struct HPMHookPoint *HP_clif_pNPCExpandedBarterClosed_post;
+	struct HPMHookPoint *HP_clif_pNPCExpandedBarterPurchase_pre;
+	struct HPMHookPoint *HP_clif_pNPCExpandedBarterPurchase_post;
+	struct HPMHookPoint *HP_clif_npc_expanded_barter_open_pre;
+	struct HPMHookPoint *HP_clif_npc_expanded_barter_open_post;
+	struct HPMHookPoint *HP_clif_pClientVersion_pre;
+	struct HPMHookPoint *HP_clif_pClientVersion_post;
+	struct HPMHookPoint *HP_clif_pPing_pre;
+	struct HPMHookPoint *HP_clif_pPing_post;
+	struct HPMHookPoint *HP_clif_ping_pre;
+	struct HPMHookPoint *HP_clif_ping_post;
+	struct HPMHookPoint *HP_clif_pingTimer_pre;
+	struct HPMHookPoint *HP_clif_pingTimer_post;
+	struct HPMHookPoint *HP_clif_pingTimerSub_pre;
+	struct HPMHookPoint *HP_clif_pingTimerSub_post;
+	struct HPMHookPoint *HP_clif_pResetCooldown_pre;
+	struct HPMHookPoint *HP_clif_pResetCooldown_post;
+	struct HPMHookPoint *HP_clif_loadConfirm_pre;
+	struct HPMHookPoint *HP_clif_loadConfirm_post;
+	struct HPMHookPoint *HP_clif_send_selforarea_pre;
+	struct HPMHookPoint *HP_clif_send_selforarea_post;
+	struct HPMHookPoint *HP_clif_OpenRefineryUI_pre;
+	struct HPMHookPoint *HP_clif_OpenRefineryUI_post;
+	struct HPMHookPoint *HP_clif_pAddItemRefineryUI_pre;
+	struct HPMHookPoint *HP_clif_pAddItemRefineryUI_post;
+	struct HPMHookPoint *HP_clif_AddItemRefineryUIAck_pre;
+	struct HPMHookPoint *HP_clif_AddItemRefineryUIAck_post;
+	struct HPMHookPoint *HP_clif_pRefineryUIClose_pre;
+	struct HPMHookPoint *HP_clif_pRefineryUIClose_post;
+	struct HPMHookPoint *HP_clif_pRefineryUIRefine_pre;
+	struct HPMHookPoint *HP_clif_pRefineryUIRefine_post;
+	struct HPMHookPoint *HP_clif_announce_refine_status_pre;
+	struct HPMHookPoint *HP_clif_announce_refine_status_post;
+	struct HPMHookPoint *HP_clif_pGuildCastleTeleportRequest_pre;
+	struct HPMHookPoint *HP_clif_pGuildCastleTeleportRequest_post;
+	struct HPMHookPoint *HP_clif_pGuildCastleInfoRequest_pre;
+	struct HPMHookPoint *HP_clif_pGuildCastleInfoRequest_post;
+	struct HPMHookPoint *HP_clif_guild_castleteleport_res_pre;
+	struct HPMHookPoint *HP_clif_guild_castleteleport_res_post;
+	struct HPMHookPoint *HP_clif_lapineDdukDdak_open_pre;
+	struct HPMHookPoint *HP_clif_lapineDdukDdak_open_post;
+	struct HPMHookPoint *HP_clif_lapineDdukDdak_result_pre;
+	struct HPMHookPoint *HP_clif_lapineDdukDdak_result_post;
+	struct HPMHookPoint *HP_clif_plapineDdukDdak_ack_pre;
+	struct HPMHookPoint *HP_clif_plapineDdukDdak_ack_post;
+	struct HPMHookPoint *HP_clif_plapineDdukDdak_close_pre;
+	struct HPMHookPoint *HP_clif_plapineDdukDdak_close_post;
+	struct HPMHookPoint *HP_clif_lapineUpgrade_open_pre;
+	struct HPMHookPoint *HP_clif_lapineUpgrade_open_post;
+	struct HPMHookPoint *HP_clif_lapineUpgrade_result_pre;
+	struct HPMHookPoint *HP_clif_lapineUpgrade_result_post;
+	struct HPMHookPoint *HP_clif_pLapineUpgrade_close_pre;
+	struct HPMHookPoint *HP_clif_pLapineUpgrade_close_post;
+	struct HPMHookPoint *HP_clif_pLapineUpgrade_makeItem_pre;
+	struct HPMHookPoint *HP_clif_pLapineUpgrade_makeItem_post;
+	struct HPMHookPoint *HP_clif_pReqGearOff_pre;
+	struct HPMHookPoint *HP_clif_pReqGearOff_post;
 	struct HPMHookPoint *HP_cmdline_init_pre;
 	struct HPMHookPoint *HP_cmdline_init_post;
 	struct HPMHookPoint *HP_cmdline_final_pre;
@@ -2300,8 +2442,8 @@ struct {
 	struct HPMHookPoint *HP_duel_leave_post;
 	struct HPMHookPoint *HP_duel_showinfo_pre;
 	struct HPMHookPoint *HP_duel_showinfo_post;
-	struct HPMHookPoint *HP_duel_checktime_pre;
-	struct HPMHookPoint *HP_duel_checktime_post;
+	struct HPMHookPoint *HP_duel_difftime_pre;
+	struct HPMHookPoint *HP_duel_difftime_post;
 	struct HPMHookPoint *HP_duel_init_pre;
 	struct HPMHookPoint *HP_duel_init_post;
 	struct HPMHookPoint *HP_duel_final_pre;
@@ -2482,8 +2624,6 @@ struct {
 	struct HPMHookPoint *HP_guild_emblem_changed_post;
 	struct HPMHookPoint *HP_guild_send_message_pre;
 	struct HPMHookPoint *HP_guild_send_message_post;
-	struct HPMHookPoint *HP_guild_recv_message_pre;
-	struct HPMHookPoint *HP_guild_recv_message_post;
 	struct HPMHookPoint *HP_guild_send_dot_remove_pre;
 	struct HPMHookPoint *HP_guild_send_dot_remove_post;
 	struct HPMHookPoint *HP_guild_skillupack_pre;
@@ -2528,8 +2668,12 @@ struct {
 	struct HPMHookPoint *HP_guild_sd_check_post;
 	struct HPMHookPoint *HP_guild_read_guildskill_tree_db_pre;
 	struct HPMHookPoint *HP_guild_read_guildskill_tree_db_post;
-	struct HPMHookPoint *HP_guild_read_castledb_pre;
-	struct HPMHookPoint *HP_guild_read_castledb_post;
+	struct HPMHookPoint *HP_guild_read_castledb_libconfig_pre;
+	struct HPMHookPoint *HP_guild_read_castledb_libconfig_post;
+	struct HPMHookPoint *HP_guild_read_castledb_libconfig_sub_pre;
+	struct HPMHookPoint *HP_guild_read_castledb_libconfig_sub_post;
+	struct HPMHookPoint *HP_guild_read_castledb_libconfig_sub_warp_pre;
+	struct HPMHookPoint *HP_guild_read_castledb_libconfig_sub_warp_post;
 	struct HPMHookPoint *HP_guild_payexp_timer_sub_pre;
 	struct HPMHookPoint *HP_guild_payexp_timer_sub_post;
 	struct HPMHookPoint *HP_guild_send_xy_timer_sub_pre;
@@ -2626,6 +2770,8 @@ struct {
 	struct HPMHookPoint *HP_homun_mutate_post;
 	struct HPMHookPoint *HP_homun_gainexp_pre;
 	struct HPMHookPoint *HP_homun_gainexp_post;
+	struct HPMHookPoint *HP_homun_gainexp_real_pre;
+	struct HPMHookPoint *HP_homun_gainexp_real_post;
 	struct HPMHookPoint *HP_homun_add_intimacy_pre;
 	struct HPMHookPoint *HP_homun_add_intimacy_post;
 	struct HPMHookPoint *HP_homun_consume_intimacy_pre;
@@ -2724,16 +2870,6 @@ struct {
 	struct HPMHookPoint *HP_intif_parse_post;
 	struct HPMHookPoint *HP_intif_create_pet_pre;
 	struct HPMHookPoint *HP_intif_create_pet_post;
-	struct HPMHookPoint *HP_intif_broadcast_pre;
-	struct HPMHookPoint *HP_intif_broadcast_post;
-	struct HPMHookPoint *HP_intif_broadcast2_pre;
-	struct HPMHookPoint *HP_intif_broadcast2_post;
-	struct HPMHookPoint *HP_intif_main_message_pre;
-	struct HPMHookPoint *HP_intif_main_message_post;
-	struct HPMHookPoint *HP_intif_wis_message_pre;
-	struct HPMHookPoint *HP_intif_wis_message_post;
-	struct HPMHookPoint *HP_intif_wis_message_to_gm_pre;
-	struct HPMHookPoint *HP_intif_wis_message_to_gm_post;
 	struct HPMHookPoint *HP_intif_saveregistry_pre;
 	struct HPMHookPoint *HP_intif_saveregistry_post;
 	struct HPMHookPoint *HP_intif_request_registry_pre;
@@ -2760,8 +2896,6 @@ struct {
 	struct HPMHookPoint *HP_intif_party_changemap_post;
 	struct HPMHookPoint *HP_intif_break_party_pre;
 	struct HPMHookPoint *HP_intif_break_party_post;
-	struct HPMHookPoint *HP_intif_party_message_pre;
-	struct HPMHookPoint *HP_intif_party_message_post;
 	struct HPMHookPoint *HP_intif_party_leaderchange_pre;
 	struct HPMHookPoint *HP_intif_party_leaderchange_post;
 	struct HPMHookPoint *HP_intif_guild_create_pre;
@@ -2776,8 +2910,6 @@ struct {
 	struct HPMHookPoint *HP_intif_guild_memberinfoshort_post;
 	struct HPMHookPoint *HP_intif_guild_break_pre;
 	struct HPMHookPoint *HP_intif_guild_break_post;
-	struct HPMHookPoint *HP_intif_guild_message_pre;
-	struct HPMHookPoint *HP_intif_guild_message_post;
 	struct HPMHookPoint *HP_intif_guild_change_gm_pre;
 	struct HPMHookPoint *HP_intif_guild_change_gm_post;
 	struct HPMHookPoint *HP_intif_guild_change_basicinfo_pre;
@@ -2868,6 +3000,10 @@ struct {
 	struct HPMHookPoint *HP_intif_rodex_sendmail_post;
 	struct HPMHookPoint *HP_intif_rodex_checkname_pre;
 	struct HPMHookPoint *HP_intif_rodex_checkname_post;
+	struct HPMHookPoint *HP_intif_pGetZenyAck_pre;
+	struct HPMHookPoint *HP_intif_pGetZenyAck_post;
+	struct HPMHookPoint *HP_intif_pGetItemsAck_pre;
+	struct HPMHookPoint *HP_intif_pGetItemsAck_post;
 	struct HPMHookPoint *HP_intif_clan_kickoffline_pre;
 	struct HPMHookPoint *HP_intif_clan_kickoffline_post;
 	struct HPMHookPoint *HP_intif_clan_membercount_pre;
@@ -2880,14 +3016,6 @@ struct {
 	struct HPMHookPoint *HP_intif_achievements_request_post;
 	struct HPMHookPoint *HP_intif_achievements_save_pre;
 	struct HPMHookPoint *HP_intif_achievements_save_post;
-	struct HPMHookPoint *HP_intif_pWisMessage_pre;
-	struct HPMHookPoint *HP_intif_pWisMessage_post;
-	struct HPMHookPoint *HP_intif_pWisEnd_pre;
-	struct HPMHookPoint *HP_intif_pWisEnd_post;
-	struct HPMHookPoint *HP_intif_pWisToGM_sub_pre;
-	struct HPMHookPoint *HP_intif_pWisToGM_sub_post;
-	struct HPMHookPoint *HP_intif_pWisToGM_pre;
-	struct HPMHookPoint *HP_intif_pWisToGM_post;
 	struct HPMHookPoint *HP_intif_pRegisters_pre;
 	struct HPMHookPoint *HP_intif_pRegisters_post;
 	struct HPMHookPoint *HP_intif_pAccountStorage_pre;
@@ -2916,8 +3044,6 @@ struct {
 	struct HPMHookPoint *HP_intif_pPartyMove_post;
 	struct HPMHookPoint *HP_intif_pPartyBroken_pre;
 	struct HPMHookPoint *HP_intif_pPartyBroken_post;
-	struct HPMHookPoint *HP_intif_pPartyMessage_pre;
-	struct HPMHookPoint *HP_intif_pPartyMessage_post;
 	struct HPMHookPoint *HP_intif_pGuildCreated_pre;
 	struct HPMHookPoint *HP_intif_pGuildCreated_post;
 	struct HPMHookPoint *HP_intif_pGuildInfo_pre;
@@ -2930,8 +3056,6 @@ struct {
 	struct HPMHookPoint *HP_intif_pGuildMemberInfoShort_post;
 	struct HPMHookPoint *HP_intif_pGuildBroken_pre;
 	struct HPMHookPoint *HP_intif_pGuildBroken_post;
-	struct HPMHookPoint *HP_intif_pGuildMessage_pre;
-	struct HPMHookPoint *HP_intif_pGuildMessage_post;
 	struct HPMHookPoint *HP_intif_pGuildBasicInfoChanged_pre;
 	struct HPMHookPoint *HP_intif_pGuildBasicInfoChanged_post;
 	struct HPMHookPoint *HP_intif_pGuildMemberInfoChanged_pre;
@@ -3148,10 +3272,10 @@ struct {
 	struct HPMHookPoint *HP_itemdb_isidentified_post;
 	struct HPMHookPoint *HP_itemdb_isidentified2_pre;
 	struct HPMHookPoint *HP_itemdb_isidentified2_post;
-	struct HPMHookPoint *HP_itemdb_combo_split_atoi_pre;
-	struct HPMHookPoint *HP_itemdb_combo_split_atoi_post;
-	struct HPMHookPoint *HP_itemdb_read_combos_pre;
-	struct HPMHookPoint *HP_itemdb_read_combos_post;
+	struct HPMHookPoint *HP_itemdb_read_combodb_libconfig_pre;
+	struct HPMHookPoint *HP_itemdb_read_combodb_libconfig_post;
+	struct HPMHookPoint *HP_itemdb_read_combodb_libconfig_sub_pre;
+	struct HPMHookPoint *HP_itemdb_read_combodb_libconfig_sub_post;
 	struct HPMHookPoint *HP_itemdb_gendercheck_pre;
 	struct HPMHookPoint *HP_itemdb_gendercheck_post;
 	struct HPMHookPoint *HP_itemdb_validate_entry_pre;
@@ -3186,6 +3310,18 @@ struct {
 	struct HPMHookPoint *HP_itemdb_lookup_const_post;
 	struct HPMHookPoint *HP_itemdb_lookup_const_mask_pre;
 	struct HPMHookPoint *HP_itemdb_lookup_const_mask_post;
+	struct HPMHookPoint *HP_itemdb_addname_sub_pre;
+	struct HPMHookPoint *HP_itemdb_addname_sub_post;
+	struct HPMHookPoint *HP_itemdb_read_libconfig_lapineddukddak_pre;
+	struct HPMHookPoint *HP_itemdb_read_libconfig_lapineddukddak_post;
+	struct HPMHookPoint *HP_itemdb_read_libconfig_lapineddukddak_sub_pre;
+	struct HPMHookPoint *HP_itemdb_read_libconfig_lapineddukddak_sub_post;
+	struct HPMHookPoint *HP_itemdb_read_libconfig_lapineddukddak_sub_sources_pre;
+	struct HPMHookPoint *HP_itemdb_read_libconfig_lapineddukddak_sub_sources_post;
+	struct HPMHookPoint *HP_libconfig_set_db_path_pre;
+	struct HPMHookPoint *HP_libconfig_set_db_path_post;
+	struct HPMHookPoint *HP_libconfig_format_db_path_pre;
+	struct HPMHookPoint *HP_libconfig_format_db_path_post;
 	struct HPMHookPoint *HP_libconfig_read_pre;
 	struct HPMHookPoint *HP_libconfig_read_post;
 	struct HPMHookPoint *HP_libconfig_write_pre;
@@ -3656,6 +3792,10 @@ struct {
 	struct HPMHookPoint *HP_map_merge_zone_post;
 	struct HPMHookPoint *HP_map_zone_clear_single_pre;
 	struct HPMHookPoint *HP_map_zone_clear_single_post;
+	struct HPMHookPoint *HP_mapindex_config_read_dbpath_pre;
+	struct HPMHookPoint *HP_mapindex_config_read_dbpath_post;
+	struct HPMHookPoint *HP_mapindex_config_read_pre;
+	struct HPMHookPoint *HP_mapindex_config_read_post;
 	struct HPMHookPoint *HP_mapindex_init_pre;
 	struct HPMHookPoint *HP_mapindex_init_post;
 	struct HPMHookPoint *HP_mapindex_final_pre;
@@ -3774,6 +3914,8 @@ struct {
 	struct HPMHookPoint *HP_mob_final_post;
 	struct HPMHookPoint *HP_mob_reload_pre;
 	struct HPMHookPoint *HP_mob_reload_post;
+	struct HPMHookPoint *HP_mob_reload_sub_mob_pre;
+	struct HPMHookPoint *HP_mob_reload_sub_mob_post;
 	struct HPMHookPoint *HP_mob_db_pre;
 	struct HPMHookPoint *HP_mob_db_post;
 	struct HPMHookPoint *HP_mob_chat_pre;
@@ -3846,6 +3988,8 @@ struct {
 	struct HPMHookPoint *HP_mob_ai_sub_hard_lootsearch_post;
 	struct HPMHookPoint *HP_mob_warpchase_sub_pre;
 	struct HPMHookPoint *HP_mob_warpchase_sub_post;
+	struct HPMHookPoint *HP_mob_is_in_battle_state_pre;
+	struct HPMHookPoint *HP_mob_is_in_battle_state_post;
 	struct HPMHookPoint *HP_mob_ai_sub_hard_slavemob_pre;
 	struct HPMHookPoint *HP_mob_ai_sub_hard_slavemob_post;
 	struct HPMHookPoint *HP_mob_unlocktarget_pre;
@@ -3866,6 +4010,8 @@ struct {
 	struct HPMHookPoint *HP_mob_ai_lazy_post;
 	struct HPMHookPoint *HP_mob_ai_hard_pre;
 	struct HPMHookPoint *HP_mob_ai_hard_post;
+	struct HPMHookPoint *HP_mob_setdropitem_options_pre;
+	struct HPMHookPoint *HP_mob_setdropitem_options_post;
 	struct HPMHookPoint *HP_mob_setdropitem_pre;
 	struct HPMHookPoint *HP_mob_setdropitem_post;
 	struct HPMHookPoint *HP_mob_setlootitem_pre;
@@ -3932,6 +4078,14 @@ struct {
 	struct HPMHookPoint *HP_mob_drop_adjust_post;
 	struct HPMHookPoint *HP_mob_item_dropratio_adjust_pre;
 	struct HPMHookPoint *HP_mob_item_dropratio_adjust_post;
+	struct HPMHookPoint *HP_mob_read_optdrops_option_pre;
+	struct HPMHookPoint *HP_mob_read_optdrops_option_post;
+	struct HPMHookPoint *HP_mob_read_optdrops_optslot_pre;
+	struct HPMHookPoint *HP_mob_read_optdrops_optslot_post;
+	struct HPMHookPoint *HP_mob_read_optdrops_group_pre;
+	struct HPMHookPoint *HP_mob_read_optdrops_group_post;
+	struct HPMHookPoint *HP_mob_read_optdrops_db_pre;
+	struct HPMHookPoint *HP_mob_read_optdrops_db_post;
 	struct HPMHookPoint *HP_mob_readdb_pre;
 	struct HPMHookPoint *HP_mob_readdb_post;
 	struct HPMHookPoint *HP_mob_lookup_const_pre;
@@ -3952,12 +4106,16 @@ struct {
 	struct HPMHookPoint *HP_mob_read_db_mvpdrops_sub_post;
 	struct HPMHookPoint *HP_mob_read_db_mode_sub_pre;
 	struct HPMHookPoint *HP_mob_read_db_mode_sub_post;
+	struct HPMHookPoint *HP_mob_read_db_drops_option_pre;
+	struct HPMHookPoint *HP_mob_read_db_drops_option_post;
 	struct HPMHookPoint *HP_mob_read_db_stats_sub_pre;
 	struct HPMHookPoint *HP_mob_read_db_stats_sub_post;
+	struct HPMHookPoint *HP_mob_read_db_viewdata_sub_pre;
+	struct HPMHookPoint *HP_mob_read_db_viewdata_sub_post;
 	struct HPMHookPoint *HP_mob_name_constants_pre;
 	struct HPMHookPoint *HP_mob_name_constants_post;
-	struct HPMHookPoint *HP_mob_readdb_mobavail_pre;
-	struct HPMHookPoint *HP_mob_readdb_mobavail_post;
+	struct HPMHookPoint *HP_mob_mobavail_removal_notice_pre;
+	struct HPMHookPoint *HP_mob_mobavail_removal_notice_post;
 	struct HPMHookPoint *HP_mob_read_randommonster_pre;
 	struct HPMHookPoint *HP_mob_read_randommonster_post;
 	struct HPMHookPoint *HP_mob_parse_row_chatdb_pre;
@@ -3982,6 +4140,8 @@ struct {
 	struct HPMHookPoint *HP_mob_final_ratio_sub_post;
 	struct HPMHookPoint *HP_mob_destroy_mob_db_pre;
 	struct HPMHookPoint *HP_mob_destroy_mob_db_post;
+	struct HPMHookPoint *HP_mob_destroy_drop_groups_pre;
+	struct HPMHookPoint *HP_mob_destroy_drop_groups_post;
 	struct HPMHookPoint *HP_mob_skill_db_libconfig_pre;
 	struct HPMHookPoint *HP_mob_skill_db_libconfig_post;
 	struct HPMHookPoint *HP_mob_skill_db_libconfig_sub_pre;
@@ -4132,6 +4292,8 @@ struct {
 	struct HPMHookPoint *HP_npc_unload_dup_sub_post;
 	struct HPMHookPoint *HP_npc_unload_duplicates_pre;
 	struct HPMHookPoint *HP_npc_unload_duplicates_post;
+	struct HPMHookPoint *HP_npc_unload_mob_pre;
+	struct HPMHookPoint *HP_npc_unload_mob_post;
 	struct HPMHookPoint *HP_npc_unload_pre;
 	struct HPMHookPoint *HP_npc_unload_post;
 	struct HPMHookPoint *HP_npc_clearsrcfile_pre;
@@ -4232,6 +4394,10 @@ struct {
 	struct HPMHookPoint *HP_npc_trader_update_post;
 	struct HPMHookPoint *HP_npc_market_buylist_pre;
 	struct HPMHookPoint *HP_npc_market_buylist_post;
+	struct HPMHookPoint *HP_npc_barter_buylist_pre;
+	struct HPMHookPoint *HP_npc_barter_buylist_post;
+	struct HPMHookPoint *HP_npc_expanded_barter_buylist_pre;
+	struct HPMHookPoint *HP_npc_expanded_barter_buylist_post;
 	struct HPMHookPoint *HP_npc_trader_open_pre;
 	struct HPMHookPoint *HP_npc_trader_open_post;
 	struct HPMHookPoint *HP_npc_market_fromsql_pre;
@@ -4242,12 +4408,34 @@ struct {
 	struct HPMHookPoint *HP_npc_market_delfromsql_post;
 	struct HPMHookPoint *HP_npc_market_delfromsql_sub_pre;
 	struct HPMHookPoint *HP_npc_market_delfromsql_sub_post;
+	struct HPMHookPoint *HP_npc_barter_fromsql_pre;
+	struct HPMHookPoint *HP_npc_barter_fromsql_post;
+	struct HPMHookPoint *HP_npc_barter_tosql_pre;
+	struct HPMHookPoint *HP_npc_barter_tosql_post;
+	struct HPMHookPoint *HP_npc_barter_delfromsql_pre;
+	struct HPMHookPoint *HP_npc_barter_delfromsql_post;
+	struct HPMHookPoint *HP_npc_barter_delfromsql_sub_pre;
+	struct HPMHookPoint *HP_npc_barter_delfromsql_sub_post;
+	struct HPMHookPoint *HP_npc_expanded_barter_fromsql_pre;
+	struct HPMHookPoint *HP_npc_expanded_barter_fromsql_post;
+	struct HPMHookPoint *HP_npc_expanded_barter_tosql_pre;
+	struct HPMHookPoint *HP_npc_expanded_barter_tosql_post;
+	struct HPMHookPoint *HP_npc_expanded_barter_delfromsql_pre;
+	struct HPMHookPoint *HP_npc_expanded_barter_delfromsql_post;
+	struct HPMHookPoint *HP_npc_expanded_barter_delfromsql_sub_pre;
+	struct HPMHookPoint *HP_npc_expanded_barter_delfromsql_sub_post;
 	struct HPMHookPoint *HP_npc_db_checkid_pre;
 	struct HPMHookPoint *HP_npc_db_checkid_post;
 	struct HPMHookPoint *HP_npc_refresh_pre;
 	struct HPMHookPoint *HP_npc_refresh_post;
+	struct HPMHookPoint *HP_npc_questinfo_clear_pre;
+	struct HPMHookPoint *HP_npc_questinfo_clear_post;
 	struct HPMHookPoint *HP_npc_secure_timeout_timer_pre;
 	struct HPMHookPoint *HP_npc_secure_timeout_timer_post;
+	struct HPMHookPoint *HP_nullpo_init_pre;
+	struct HPMHookPoint *HP_nullpo_init_post;
+	struct HPMHookPoint *HP_nullpo_final_pre;
+	struct HPMHookPoint *HP_nullpo_final_post;
 	struct HPMHookPoint *HP_nullpo_assert_report_pre;
 	struct HPMHookPoint *HP_nullpo_assert_report_post;
 	struct HPMHookPoint *HP_packets_init_pre;
@@ -4312,8 +4500,6 @@ struct {
 	struct HPMHookPoint *HP_party_send_logout_post;
 	struct HPMHookPoint *HP_party_send_message_pre;
 	struct HPMHookPoint *HP_party_send_message_post;
-	struct HPMHookPoint *HP_party_recv_message_pre;
-	struct HPMHookPoint *HP_party_recv_message_post;
 	struct HPMHookPoint *HP_party_skill_check_pre;
 	struct HPMHookPoint *HP_party_skill_check_post;
 	struct HPMHookPoint *HP_party_send_xy_clear_pre;
@@ -4594,6 +4780,8 @@ struct {
 	struct HPMHookPoint *HP_pc_checkitem_post;
 	struct HPMHookPoint *HP_pc_useitem_pre;
 	struct HPMHookPoint *HP_pc_useitem_post;
+	struct HPMHookPoint *HP_pc_autocast_clear_pre;
+	struct HPMHookPoint *HP_pc_autocast_clear_post;
 	struct HPMHookPoint *HP_pc_skillatk_bonus_pre;
 	struct HPMHookPoint *HP_pc_skillatk_bonus_post;
 	struct HPMHookPoint *HP_pc_skillheal_bonus_pre;
@@ -4614,6 +4802,10 @@ struct {
 	struct HPMHookPoint *HP_pc_percentheal_post;
 	struct HPMHookPoint *HP_pc_jobchange_pre;
 	struct HPMHookPoint *HP_pc_jobchange_post;
+	struct HPMHookPoint *HP_pc_hide_pre;
+	struct HPMHookPoint *HP_pc_hide_post;
+	struct HPMHookPoint *HP_pc_unhide_pre;
+	struct HPMHookPoint *HP_pc_unhide_post;
 	struct HPMHookPoint *HP_pc_setoption_pre;
 	struct HPMHookPoint *HP_pc_setoption_post;
 	struct HPMHookPoint *HP_pc_setcart_pre;
@@ -4858,8 +5050,14 @@ struct {
 	struct HPMHookPoint *HP_pc_update_idle_time_post;
 	struct HPMHookPoint *HP_pc_have_magnifier_pre;
 	struct HPMHookPoint *HP_pc_have_magnifier_post;
+	struct HPMHookPoint *HP_pc_have_item_chain_pre;
+	struct HPMHookPoint *HP_pc_have_item_chain_post;
 	struct HPMHookPoint *HP_pc_process_chat_message_pre;
 	struct HPMHookPoint *HP_pc_process_chat_message_post;
+	struct HPMHookPoint *HP_pc_wis_message_to_gm_pre;
+	struct HPMHookPoint *HP_pc_wis_message_to_gm_post;
+	struct HPMHookPoint *HP_pc_wis_message_to_gm_sub_pre;
+	struct HPMHookPoint *HP_pc_wis_message_to_gm_sub_post;
 	struct HPMHookPoint *HP_pc_check_supernovice_call_pre;
 	struct HPMHookPoint *HP_pc_check_supernovice_call_post;
 	struct HPMHookPoint *HP_pc_check_basicskill_pre;
@@ -4868,6 +5066,10 @@ struct {
 	struct HPMHookPoint *HP_pc_isDeathPenaltyJob_post;
 	struct HPMHookPoint *HP_pc_has_second_costume_pre;
 	struct HPMHookPoint *HP_pc_has_second_costume_post;
+	struct HPMHookPoint *HP_pc_expandInventory_pre;
+	struct HPMHookPoint *HP_pc_expandInventory_post;
+	struct HPMHookPoint *HP_pc_auto_exp_insurance_pre;
+	struct HPMHookPoint *HP_pc_auto_exp_insurance_post;
 	struct HPMHookPoint *HP_libpcre_compile_pre;
 	struct HPMHookPoint *HP_libpcre_compile_post;
 	struct HPMHookPoint *HP_libpcre_study_pre;
@@ -4890,6 +5092,8 @@ struct {
 	struct HPMHookPoint *HP_pet_final_post;
 	struct HPMHookPoint *HP_pet_hungry_val_pre;
 	struct HPMHookPoint *HP_pet_hungry_val_post;
+	struct HPMHookPoint *HP_pet_set_hunger_pre;
+	struct HPMHookPoint *HP_pet_set_hunger_post;
 	struct HPMHookPoint *HP_pet_set_intimate_pre;
 	struct HPMHookPoint *HP_pet_set_intimate_post;
 	struct HPMHookPoint *HP_pet_create_egg_pre;
@@ -5024,8 +5228,36 @@ struct {
 	struct HPMHookPoint *HP_quest_questinfo_validate_quests_post;
 	struct HPMHookPoint *HP_quest_questinfo_validate_mercenary_class_pre;
 	struct HPMHookPoint *HP_quest_questinfo_validate_mercenary_class_post;
-	struct HPMHookPoint *HP_quest_questinfo_vector_clear_pre;
-	struct HPMHookPoint *HP_quest_questinfo_vector_clear_post;
+	struct HPMHookPoint *HP_refine_init_pre;
+	struct HPMHookPoint *HP_refine_init_post;
+	struct HPMHookPoint *HP_refine_final_pre;
+	struct HPMHookPoint *HP_refine_final_post;
+	struct HPMHookPoint *HP_refine_get_refine_chance_pre;
+	struct HPMHookPoint *HP_refine_get_refine_chance_post;
+	struct HPMHookPoint *HP_refine_get_bonus_pre;
+	struct HPMHookPoint *HP_refine_get_bonus_post;
+	struct HPMHookPoint *HP_refine_get_randombonus_max_pre;
+	struct HPMHookPoint *HP_refine_get_randombonus_max_post;
+	struct HPMHookPoint *HP_refine_refinery_add_item_pre;
+	struct HPMHookPoint *HP_refine_refinery_add_item_post;
+	struct HPMHookPoint *HP_refine_refinery_refine_request_pre;
+	struct HPMHookPoint *HP_refine_refinery_refine_request_post;
+	struct HPMHookPoint *HP_PRIV__refine_readdb_refine_libconfig_sub_pre;
+	struct HPMHookPoint *HP_PRIV__refine_readdb_refine_libconfig_sub_post;
+	struct HPMHookPoint *HP_PRIV__refine_readdb_refine_libconfig_pre;
+	struct HPMHookPoint *HP_PRIV__refine_readdb_refine_libconfig_post;
+	struct HPMHookPoint *HP_PRIV__refine_announce_behavior_string2enum_pre;
+	struct HPMHookPoint *HP_PRIV__refine_announce_behavior_string2enum_post;
+	struct HPMHookPoint *HP_PRIV__refine_failure_behavior_string2enum_pre;
+	struct HPMHookPoint *HP_PRIV__refine_failure_behavior_string2enum_post;
+	struct HPMHookPoint *HP_PRIV__refine_readdb_refinery_ui_settings_items_pre;
+	struct HPMHookPoint *HP_PRIV__refine_readdb_refinery_ui_settings_items_post;
+	struct HPMHookPoint *HP_PRIV__refine_readdb_refinery_ui_settings_sub_pre;
+	struct HPMHookPoint *HP_PRIV__refine_readdb_refinery_ui_settings_sub_post;
+	struct HPMHookPoint *HP_PRIV__refine_readdb_refinery_ui_settings_pre;
+	struct HPMHookPoint *HP_PRIV__refine_readdb_refinery_ui_settings_post;
+	struct HPMHookPoint *HP_PRIV__refine_is_refinable_pre;
+	struct HPMHookPoint *HP_PRIV__refine_is_refinable_post;
 	struct HPMHookPoint *HP_rnd_init_pre;
 	struct HPMHookPoint *HP_rnd_init_post;
 	struct HPMHookPoint *HP_rnd_final_pre;
@@ -5076,6 +5308,10 @@ struct {
 	struct HPMHookPoint *HP_rodex_delete_mail_post;
 	struct HPMHookPoint *HP_rodex_clean_pre;
 	struct HPMHookPoint *HP_rodex_clean_post;
+	struct HPMHookPoint *HP_rodex_getZenyAck_pre;
+	struct HPMHookPoint *HP_rodex_getZenyAck_post;
+	struct HPMHookPoint *HP_rodex_getItemsAck_pre;
+	struct HPMHookPoint *HP_rodex_getItemsAck_post;
 	struct HPMHookPoint *HP_script_init_pre;
 	struct HPMHookPoint *HP_script_init_post;
 	struct HPMHookPoint *HP_script_final_pre;
@@ -5424,6 +5660,8 @@ struct {
 	struct HPMHookPoint *HP_script_load_translations_post;
 	struct HPMHookPoint *HP_script_load_translation_addstring_pre;
 	struct HPMHookPoint *HP_script_load_translation_addstring_post;
+	struct HPMHookPoint *HP_script_load_translation_file_pre;
+	struct HPMHookPoint *HP_script_load_translation_file_post;
 	struct HPMHookPoint *HP_script_load_translation_pre;
 	struct HPMHookPoint *HP_script_load_translation_post;
 	struct HPMHookPoint *HP_script_translation_db_destroyer_pre;
@@ -5434,8 +5672,8 @@ struct {
 	struct HPMHookPoint *HP_script_parse_cleanup_timer_post;
 	struct HPMHookPoint *HP_script_add_language_pre;
 	struct HPMHookPoint *HP_script_add_language_post;
-	struct HPMHookPoint *HP_script_get_translation_file_name_pre;
-	struct HPMHookPoint *HP_script_get_translation_file_name_post;
+	struct HPMHookPoint *HP_script_get_translation_dir_name_pre;
+	struct HPMHookPoint *HP_script_get_translation_dir_name_post;
 	struct HPMHookPoint *HP_script_parser_clean_leftovers_pre;
 	struct HPMHookPoint *HP_script_parser_clean_leftovers_post;
 	struct HPMHookPoint *HP_script_run_use_script_pre;
@@ -5444,6 +5682,14 @@ struct {
 	struct HPMHookPoint *HP_script_run_item_equip_script_post;
 	struct HPMHookPoint *HP_script_run_item_unequip_script_pre;
 	struct HPMHookPoint *HP_script_run_item_unequip_script_post;
+	struct HPMHookPoint *HP_script_run_item_rental_end_script_pre;
+	struct HPMHookPoint *HP_script_run_item_rental_end_script_post;
+	struct HPMHookPoint *HP_script_run_item_rental_start_script_pre;
+	struct HPMHookPoint *HP_script_run_item_rental_start_script_post;
+	struct HPMHookPoint *HP_script_run_item_lapineddukddak_script_pre;
+	struct HPMHookPoint *HP_script_run_item_lapineddukddak_script_post;
+	struct HPMHookPoint *HP_script_sellitemcurrency_add_pre;
+	struct HPMHookPoint *HP_script_sellitemcurrency_add_post;
 	struct HPMHookPoint *HP_searchstore_open_pre;
 	struct HPMHookPoint *HP_searchstore_open_post;
 	struct HPMHookPoint *HP_searchstore_query_pre;
@@ -5682,6 +5928,8 @@ struct {
 	struct HPMHookPoint *HP_skill_not_ok_hom_unknown_post;
 	struct HPMHookPoint *HP_skill_not_ok_mercenary_pre;
 	struct HPMHookPoint *HP_skill_not_ok_mercenary_post;
+	struct HPMHookPoint *HP_skill_validate_autocast_data_pre;
+	struct HPMHookPoint *HP_skill_validate_autocast_data_post;
 	struct HPMHookPoint *HP_skill_chastle_mob_changetarget_pre;
 	struct HPMHookPoint *HP_skill_chastle_mob_changetarget_post;
 	struct HPMHookPoint *HP_skill_can_produce_mix_pre;
@@ -5960,6 +6208,8 @@ struct {
 	struct HPMHookPoint *HP_skill_check_npc_chaospanic_post;
 	struct HPMHookPoint *HP_skill_count_wos_pre;
 	struct HPMHookPoint *HP_skill_count_wos_post;
+	struct HPMHookPoint *HP_skill_get_linked_song_dance_id_pre;
+	struct HPMHookPoint *HP_skill_get_linked_song_dance_id_post;
 	struct HPMHookPoint *HP_sockt_init_pre;
 	struct HPMHookPoint *HP_sockt_init_post;
 	struct HPMHookPoint *HP_sockt_final_pre;
@@ -5994,6 +6244,8 @@ struct {
 	struct HPMHookPoint *HP_sockt_flush_post;
 	struct HPMHookPoint *HP_sockt_flush_fifos_pre;
 	struct HPMHookPoint *HP_sockt_flush_fifos_post;
+	struct HPMHookPoint *HP_sockt_connect_client_pre;
+	struct HPMHookPoint *HP_sockt_connect_client_post;
 	struct HPMHookPoint *HP_sockt_set_nonblocking_pre;
 	struct HPMHookPoint *HP_sockt_set_nonblocking_post;
 	struct HPMHookPoint *HP_sockt_set_defaultparse_pre;
@@ -6088,18 +6340,18 @@ struct {
 	struct HPMHookPoint *HP_status_init_post;
 	struct HPMHookPoint *HP_status_final_pre;
 	struct HPMHookPoint *HP_status_final_post;
-	struct HPMHookPoint *HP_status_get_refine_chance_pre;
-	struct HPMHookPoint *HP_status_get_refine_chance_post;
 	struct HPMHookPoint *HP_status_skill2sc_pre;
 	struct HPMHookPoint *HP_status_skill2sc_post;
 	struct HPMHookPoint *HP_status_sc2skill_pre;
 	struct HPMHookPoint *HP_status_sc2skill_post;
 	struct HPMHookPoint *HP_status_sc2scb_flag_pre;
 	struct HPMHookPoint *HP_status_sc2scb_flag_post;
-	struct HPMHookPoint *HP_status_type2relevant_bl_types_pre;
-	struct HPMHookPoint *HP_status_type2relevant_bl_types_post;
+	struct HPMHookPoint *HP_status_get_sc_relevant_bl_types_pre;
+	struct HPMHookPoint *HP_status_get_sc_relevant_bl_types_post;
 	struct HPMHookPoint *HP_status_get_sc_type_pre;
 	struct HPMHookPoint *HP_status_get_sc_type_post;
+	struct HPMHookPoint *HP_status_get_sc_icon_pre;
+	struct HPMHookPoint *HP_status_get_sc_icon_post;
 	struct HPMHookPoint *HP_status_damage_pre;
 	struct HPMHookPoint *HP_status_damage_post;
 	struct HPMHookPoint *HP_status_charge_pre;
@@ -6160,6 +6412,8 @@ struct {
 	struct HPMHookPoint *HP_status_get_sc_def_post;
 	struct HPMHookPoint *HP_status_change_start_pre;
 	struct HPMHookPoint *HP_status_change_start_post;
+	struct HPMHookPoint *HP_status_change_start_sub_pre;
+	struct HPMHookPoint *HP_status_change_start_sub_post;
 	struct HPMHookPoint *HP_status_change_end__pre;
 	struct HPMHookPoint *HP_status_change_end__post;
 	struct HPMHookPoint *HP_status_is_immune_to_status_pre;
@@ -6320,12 +6574,14 @@ struct {
 	struct HPMHookPoint *HP_status_readdb_job2_post;
 	struct HPMHookPoint *HP_status_readdb_sizefix_pre;
 	struct HPMHookPoint *HP_status_readdb_sizefix_post;
-	struct HPMHookPoint *HP_status_readdb_refine_libconfig_pre;
-	struct HPMHookPoint *HP_status_readdb_refine_libconfig_post;
-	struct HPMHookPoint *HP_status_readdb_refine_libconfig_sub_pre;
-	struct HPMHookPoint *HP_status_readdb_refine_libconfig_sub_post;
-	struct HPMHookPoint *HP_status_readdb_scconfig_pre;
-	struct HPMHookPoint *HP_status_readdb_scconfig_post;
+	struct HPMHookPoint *HP_status_read_scdb_libconfig_pre;
+	struct HPMHookPoint *HP_status_read_scdb_libconfig_post;
+	struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_pre;
+	struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_post;
+	struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_flag_pre;
+	struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_flag_post;
+	struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_flag_additional_pre;
+	struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_flag_additional_post;
 	struct HPMHookPoint *HP_status_read_job_db_pre;
 	struct HPMHookPoint *HP_status_read_job_db_post;
 	struct HPMHookPoint *HP_status_read_job_db_sub_pre;
@@ -6414,6 +6670,24 @@ struct {
 	struct HPMHookPoint *HP_strlib_strline__post;
 	struct HPMHookPoint *HP_strlib_bin2hex__pre;
 	struct HPMHookPoint *HP_strlib_bin2hex__post;
+	struct HPMHookPoint *HP_stylist_init_pre;
+	struct HPMHookPoint *HP_stylist_init_post;
+	struct HPMHookPoint *HP_stylist_final_pre;
+	struct HPMHookPoint *HP_stylist_final_post;
+	struct HPMHookPoint *HP_stylist_vector_init_pre;
+	struct HPMHookPoint *HP_stylist_vector_init_post;
+	struct HPMHookPoint *HP_stylist_vector_clear_pre;
+	struct HPMHookPoint *HP_stylist_vector_clear_post;
+	struct HPMHookPoint *HP_stylist_read_db_libconfig_pre;
+	struct HPMHookPoint *HP_stylist_read_db_libconfig_post;
+	struct HPMHookPoint *HP_stylist_read_db_libconfig_sub_pre;
+	struct HPMHookPoint *HP_stylist_read_db_libconfig_sub_post;
+	struct HPMHookPoint *HP_stylist_request_style_change_pre;
+	struct HPMHookPoint *HP_stylist_request_style_change_post;
+	struct HPMHookPoint *HP_stylist_validate_requirements_pre;
+	struct HPMHookPoint *HP_stylist_validate_requirements_post;
+	struct HPMHookPoint *HP_stylist_send_rodexitem_pre;
+	struct HPMHookPoint *HP_stylist_send_rodexitem_post;
 	struct HPMHookPoint *HP_sv_parse_next_pre;
 	struct HPMHookPoint *HP_sv_parse_next_post;
 	struct HPMHookPoint *HP_sv_parse_pre;
@@ -6536,22 +6810,24 @@ struct {
 	struct HPMHookPoint *HP_unit_final_post;
 	struct HPMHookPoint *HP_unit_bl2ud_pre;
 	struct HPMHookPoint *HP_unit_bl2ud_post;
+	struct HPMHookPoint *HP_unit_cbl2ud_pre;
+	struct HPMHookPoint *HP_unit_cbl2ud_post;
 	struct HPMHookPoint *HP_unit_bl2ud2_pre;
 	struct HPMHookPoint *HP_unit_bl2ud2_post;
 	struct HPMHookPoint *HP_unit_init_ud_pre;
 	struct HPMHookPoint *HP_unit_init_ud_post;
 	struct HPMHookPoint *HP_unit_attack_timer_pre;
 	struct HPMHookPoint *HP_unit_attack_timer_post;
-	struct HPMHookPoint *HP_unit_walktoxy_timer_pre;
-	struct HPMHookPoint *HP_unit_walktoxy_timer_post;
-	struct HPMHookPoint *HP_unit_walktoxy_sub_pre;
-	struct HPMHookPoint *HP_unit_walktoxy_sub_post;
-	struct HPMHookPoint *HP_unit_delay_walktoxy_timer_pre;
-	struct HPMHookPoint *HP_unit_delay_walktoxy_timer_post;
-	struct HPMHookPoint *HP_unit_walktoxy_pre;
-	struct HPMHookPoint *HP_unit_walktoxy_post;
-	struct HPMHookPoint *HP_unit_walktobl_sub_pre;
-	struct HPMHookPoint *HP_unit_walktobl_sub_post;
+	struct HPMHookPoint *HP_unit_walk_toxy_timer_pre;
+	struct HPMHookPoint *HP_unit_walk_toxy_timer_post;
+	struct HPMHookPoint *HP_unit_walk_toxy_sub_pre;
+	struct HPMHookPoint *HP_unit_walk_toxy_sub_post;
+	struct HPMHookPoint *HP_unit_delay_walk_toxy_timer_pre;
+	struct HPMHookPoint *HP_unit_delay_walk_toxy_timer_post;
+	struct HPMHookPoint *HP_unit_walk_toxy_pre;
+	struct HPMHookPoint *HP_unit_walk_toxy_post;
+	struct HPMHookPoint *HP_unit_walktobl_timer_pre;
+	struct HPMHookPoint *HP_unit_walktobl_timer_post;
 	struct HPMHookPoint *HP_unit_walktobl_pre;
 	struct HPMHookPoint *HP_unit_walktobl_post;
 	struct HPMHookPoint *HP_unit_run_pre;
@@ -6562,20 +6838,22 @@ struct {
 	struct HPMHookPoint *HP_unit_escape_post;
 	struct HPMHookPoint *HP_unit_movepos_pre;
 	struct HPMHookPoint *HP_unit_movepos_post;
-	struct HPMHookPoint *HP_unit_setdir_pre;
-	struct HPMHookPoint *HP_unit_setdir_post;
+	struct HPMHookPoint *HP_unit_set_dir_pre;
+	struct HPMHookPoint *HP_unit_set_dir_post;
 	struct HPMHookPoint *HP_unit_getdir_pre;
 	struct HPMHookPoint *HP_unit_getdir_post;
 	struct HPMHookPoint *HP_unit_blown_pre;
 	struct HPMHookPoint *HP_unit_blown_post;
 	struct HPMHookPoint *HP_unit_warp_pre;
 	struct HPMHookPoint *HP_unit_warp_post;
+	struct HPMHookPoint *HP_unit_warpto_master_pre;
+	struct HPMHookPoint *HP_unit_warpto_master_post;
 	struct HPMHookPoint *HP_unit_stop_walking_pre;
 	struct HPMHookPoint *HP_unit_stop_walking_post;
 	struct HPMHookPoint *HP_unit_skilluse_id_pre;
 	struct HPMHookPoint *HP_unit_skilluse_id_post;
-	struct HPMHookPoint *HP_unit_step_timer_pre;
-	struct HPMHookPoint *HP_unit_step_timer_post;
+	struct HPMHookPoint *HP_unit_steptimer_pre;
+	struct HPMHookPoint *HP_unit_steptimer_post;
 	struct HPMHookPoint *HP_unit_stop_stepaction_pre;
 	struct HPMHookPoint *HP_unit_stop_stepaction_post;
 	struct HPMHookPoint *HP_unit_is_walking_pre;
@@ -7507,12 +7785,18 @@ struct {
 	int HP_clif_fame_taekwon_post;
 	int HP_clif_ranklist_pre;
 	int HP_clif_ranklist_post;
+	int HP_clif_ranklist_sub_pre;
+	int HP_clif_ranklist_sub_post;
+	int HP_clif_ranklist_sub2_pre;
+	int HP_clif_ranklist_sub2_post;
 	int HP_clif_update_rankingpoint_pre;
 	int HP_clif_update_rankingpoint_post;
 	int HP_clif_pRanklist_pre;
 	int HP_clif_pRanklist_post;
 	int HP_clif_hotkeys_pre;
 	int HP_clif_hotkeys_post;
+	int HP_clif_hotkeysAll_pre;
+	int HP_clif_hotkeysAll_post;
 	int HP_clif_insight_pre;
 	int HP_clif_insight_post;
 	int HP_clif_outsight_pre;
@@ -7537,6 +7821,8 @@ struct {
 	int HP_clif_combo_delay_post;
 	int HP_clif_status_change_pre;
 	int HP_clif_status_change_post;
+	int HP_clif_status_change_sub_pre;
+	int HP_clif_status_change_sub_post;
 	int HP_clif_insert_card_pre;
 	int HP_clif_insert_card_post;
 	int HP_clif_inventoryList_pre;
@@ -7551,6 +7837,18 @@ struct {
 	int HP_clif_cartList_post;
 	int HP_clif_cartItems_pre;
 	int HP_clif_cartItems_post;
+	int HP_clif_inventoryExpansionInfo_pre;
+	int HP_clif_inventoryExpansionInfo_post;
+	int HP_clif_inventoryExpandAck_pre;
+	int HP_clif_inventoryExpandAck_post;
+	int HP_clif_inventoryExpandResult_pre;
+	int HP_clif_inventoryExpandResult_post;
+	int HP_clif_pInventoryExpansion_pre;
+	int HP_clif_pInventoryExpansion_post;
+	int HP_clif_pInventoryExpansionConfirmed_pre;
+	int HP_clif_pInventoryExpansionConfirmed_post;
+	int HP_clif_pInventoryExpansionRejected_pre;
+	int HP_clif_pInventoryExpansionRejected_post;
 	int HP_clif_favorite_item_pre;
 	int HP_clif_favorite_item_post;
 	int HP_clif_clearcart_pre;
@@ -7577,8 +7875,36 @@ struct {
 	int HP_clif_mvp_noitem_post;
 	int HP_clif_changed_dir_pre;
 	int HP_clif_changed_dir_post;
-	int HP_clif_charnameack_pre;
-	int HP_clif_charnameack_post;
+	int HP_clif_blname_ack_pre;
+	int HP_clif_blname_ack_post;
+	int HP_clif_pcname_ack_pre;
+	int HP_clif_pcname_ack_post;
+	int HP_clif_homname_ack_pre;
+	int HP_clif_homname_ack_post;
+	int HP_clif_mername_ack_pre;
+	int HP_clif_mername_ack_post;
+	int HP_clif_petname_ack_pre;
+	int HP_clif_petname_ack_post;
+	int HP_clif_npcname_ack_pre;
+	int HP_clif_npcname_ack_post;
+	int HP_clif_mobname_ack_pre;
+	int HP_clif_mobname_ack_post;
+	int HP_clif_mobname_guardian_ack_pre;
+	int HP_clif_mobname_guardian_ack_post;
+	int HP_clif_mobname_additional_ack_pre;
+	int HP_clif_mobname_additional_ack_post;
+	int HP_clif_mobname_normal_ack_pre;
+	int HP_clif_mobname_normal_ack_post;
+	int HP_clif_chatname_ack_pre;
+	int HP_clif_chatname_ack_post;
+	int HP_clif_elemname_ack_pre;
+	int HP_clif_elemname_ack_post;
+	int HP_clif_skillname_ack_pre;
+	int HP_clif_skillname_ack_post;
+	int HP_clif_itemname_ack_pre;
+	int HP_clif_itemname_ack_post;
+	int HP_clif_unknownname_ack_pre;
+	int HP_clif_unknownname_ack_post;
 	int HP_clif_monster_hp_bar_pre;
 	int HP_clif_monster_hp_bar_post;
 	int HP_clif_hpmeter_pre;
@@ -7681,6 +8007,8 @@ struct {
 	int HP_clif_misceffect_post;
 	int HP_clif_changeoption_pre;
 	int HP_clif_changeoption_post;
+	int HP_clif_changeoption_target_pre;
+	int HP_clif_changeoption_target_post;
 	int HP_clif_changeoption2_pre;
 	int HP_clif_changeoption2_post;
 	int HP_clif_emotion_pre;
@@ -7731,6 +8059,8 @@ struct {
 	int HP_clif_specialeffect_single_post;
 	int HP_clif_specialeffect_value_pre;
 	int HP_clif_specialeffect_value_post;
+	int HP_clif_specialeffect_value_single_pre;
+	int HP_clif_specialeffect_value_single_post;
 	int HP_clif_removeSpecialEffect_pre;
 	int HP_clif_removeSpecialEffect_post;
 	int HP_clif_removeSpecialEffect_single_pre;
@@ -7765,6 +8095,8 @@ struct {
 	int HP_clif_addchat_post;
 	int HP_clif_changechatowner_pre;
 	int HP_clif_changechatowner_post;
+	int HP_clif_chatRoleChange_pre;
+	int HP_clif_chatRoleChange_post;
 	int HP_clif_clearchat_pre;
 	int HP_clif_clearchat_post;
 	int HP_clif_leavechat_pre;
@@ -7785,6 +8117,8 @@ struct {
 	int HP_clif_messagecolor_self_post;
 	int HP_clif_messagecolor_pre;
 	int HP_clif_messagecolor_post;
+	int HP_clif_serviceMessageColor_pre;
+	int HP_clif_serviceMessageColor_post;
 	int HP_clif_disp_overhead_pre;
 	int HP_clif_disp_overhead_post;
 	int HP_clif_notify_playerchat_pre;
@@ -7877,6 +8211,8 @@ struct {
 	int HP_clif_addskill_post;
 	int HP_clif_deleteskill_pre;
 	int HP_clif_deleteskill_post;
+	int HP_clif_playerSkillToPacket_pre;
+	int HP_clif_playerSkillToPacket_post;
 	int HP_clif_party_created_pre;
 	int HP_clif_party_created_post;
 	int HP_clif_party_member_info_pre;
@@ -7919,6 +8255,10 @@ struct {
 	int HP_clif_guild_basicinfo_post;
 	int HP_clif_guild_allianceinfo_pre;
 	int HP_clif_guild_allianceinfo_post;
+	int HP_clif_guild_castlelist_pre;
+	int HP_clif_guild_castlelist_post;
+	int HP_clif_guild_castleinfo_pre;
+	int HP_clif_guild_castleinfo_post;
 	int HP_clif_guild_memberlist_pre;
 	int HP_clif_guild_memberlist_post;
 	int HP_clif_guild_skillinfo_pre;
@@ -8221,6 +8561,8 @@ struct {
 	int HP_clif_parse_roulette_db_post;
 	int HP_clif_roulette_generate_ack_pre;
 	int HP_clif_roulette_generate_ack_post;
+	int HP_clif_roulette_close_pre;
+	int HP_clif_roulette_close_post;
 	int HP_clif_openmergeitem_pre;
 	int HP_clif_openmergeitem_post;
 	int HP_clif_cancelmergeitem_pre;
@@ -8229,6 +8571,8 @@ struct {
 	int HP_clif_comparemergeitem_post;
 	int HP_clif_ackmergeitems_pre;
 	int HP_clif_ackmergeitems_post;
+	int HP_clif_mergeitems_pre;
+	int HP_clif_mergeitems_post;
 	int HP_clif_isdisguised_pre;
 	int HP_clif_isdisguised_post;
 	int HP_clif_navigate_to_pre;
@@ -8253,8 +8597,10 @@ struct {
 	int HP_clif_pLoadEndAck_post;
 	int HP_clif_pTickSend_pre;
 	int HP_clif_pTickSend_post;
-	int HP_clif_pHotkey_pre;
-	int HP_clif_pHotkey_post;
+	int HP_clif_pHotkey1_pre;
+	int HP_clif_pHotkey1_post;
+	int HP_clif_pHotkey2_pre;
+	int HP_clif_pHotkey2_post;
 	int HP_clif_pProgressbar_pre;
 	int HP_clif_pProgressbar_post;
 	int HP_clif_pWalkToXY_pre;
@@ -8339,8 +8685,14 @@ struct {
 	int HP_clif_pStatusUp_post;
 	int HP_clif_pSkillUp_pre;
 	int HP_clif_pSkillUp_post;
+	int HP_clif_useSkillToIdReal_pre;
+	int HP_clif_useSkillToIdReal_post;
 	int HP_clif_pUseSkillToId_pre;
 	int HP_clif_pUseSkillToId_post;
+	int HP_clif_pStartUseSkillToId_pre;
+	int HP_clif_pStartUseSkillToId_post;
+	int HP_clif_pStopUseSkillToId_pre;
+	int HP_clif_pStopUseSkillToId_post;
 	int HP_clif_pUseSkillToId_homun_pre;
 	int HP_clif_pUseSkillToId_homun_post;
 	int HP_clif_pUseSkillToId_mercenary_pre;
@@ -8653,8 +9005,12 @@ struct {
 	int HP_clif_pBGQueueRevokeReq_post;
 	int HP_clif_pBGQueueBattleBeginAck_pre;
 	int HP_clif_pBGQueueBattleBeginAck_post;
-	int HP_clif_pCashShopOpen_pre;
-	int HP_clif_pCashShopOpen_post;
+	int HP_clif_pCashShopOpen1_pre;
+	int HP_clif_pCashShopOpen1_post;
+	int HP_clif_pCashShopOpen2_pre;
+	int HP_clif_pCashShopOpen2_post;
+	int HP_clif_pCashShopLimitedReq_pre;
+	int HP_clif_pCashShopLimitedReq_post;
 	int HP_clif_pCashShopClose_pre;
 	int HP_clif_pCashShopClose_post;
 	int HP_clif_pCashShopReqTab_pre;
@@ -8667,6 +9023,10 @@ struct {
 	int HP_clif_pPartyTick_post;
 	int HP_clif_pGuildInvite2_pre;
 	int HP_clif_pGuildInvite2_post;
+	int HP_clif_cashShopBuyAck_pre;
+	int HP_clif_cashShopBuyAck_post;
+	int HP_clif_cashShopOpen_pre;
+	int HP_clif_cashShopOpen_post;
 	int HP_clif_pPartyBookingAddFilter_pre;
 	int HP_clif_pPartyBookingAddFilter_post;
 	int HP_clif_pPartyBookingSubFilter_pre;
@@ -8705,8 +9065,10 @@ struct {
 	int HP_clif_pNPCMarketPurchase_post;
 	int HP_clif_add_item_options_pre;
 	int HP_clif_add_item_options_post;
-	int HP_clif_pHotkeyRowShift_pre;
-	int HP_clif_pHotkeyRowShift_post;
+	int HP_clif_pHotkeyRowShift1_pre;
+	int HP_clif_pHotkeyRowShift1_post;
+	int HP_clif_pHotkeyRowShift2_pre;
+	int HP_clif_pHotkeyRowShift2_post;
 	int HP_clif_dressroom_open_pre;
 	int HP_clif_dressroom_open_post;
 	int HP_clif_pOneClick_ItemIdentify_pre;
@@ -8811,24 +9173,12 @@ struct {
 	int HP_clif_pPrivateAirshipRequest_post;
 	int HP_clif_PrivateAirshipResponse_pre;
 	int HP_clif_PrivateAirshipResponse_post;
-	int HP_clif_stylist_vector_init_pre;
-	int HP_clif_stylist_vector_init_post;
-	int HP_clif_stylist_vector_clear_pre;
-	int HP_clif_stylist_vector_clear_post;
-	int HP_clif_stylist_read_db_libconfig_pre;
-	int HP_clif_stylist_read_db_libconfig_post;
-	int HP_clif_stylist_read_db_libconfig_sub_pre;
-	int HP_clif_stylist_read_db_libconfig_sub_post;
-	int HP_clif_style_change_validate_requirements_pre;
-	int HP_clif_style_change_validate_requirements_post;
-	int HP_clif_stylist_send_rodexitem_pre;
-	int HP_clif_stylist_send_rodexitem_post;
 	int HP_clif_pReqStyleChange_pre;
 	int HP_clif_pReqStyleChange_post;
 	int HP_clif_pReqStyleChange2_pre;
 	int HP_clif_pReqStyleChange2_post;
-	int HP_clif_cz_req_style_change_sub_pre;
-	int HP_clif_cz_req_style_change_sub_post;
+	int HP_clif_pStyleClose_pre;
+	int HP_clif_pStyleClose_post;
 	int HP_clif_style_change_response_pre;
 	int HP_clif_style_change_response_post;
 	int HP_clif_pPetEvolution_pre;
@@ -8843,8 +9193,78 @@ struct {
 	int HP_clif_camera_showWindow_post;
 	int HP_clif_camera_change_pre;
 	int HP_clif_camera_change_post;
+	int HP_clif_pCameraInfo_pre;
+	int HP_clif_pCameraInfo_post;
 	int HP_clif_item_preview_pre;
 	int HP_clif_item_preview_post;
+	int HP_clif_enchant_equipment_pre;
+	int HP_clif_enchant_equipment_post;
+	int HP_clif_pReqRemainTime_pre;
+	int HP_clif_pReqRemainTime_post;
+	int HP_clif_npc_barter_open_pre;
+	int HP_clif_npc_barter_open_post;
+	int HP_clif_pNPCBarterClosed_pre;
+	int HP_clif_pNPCBarterClosed_post;
+	int HP_clif_pNPCBarterPurchase_pre;
+	int HP_clif_pNPCBarterPurchase_post;
+	int HP_clif_pNPCExpandedBarterClosed_pre;
+	int HP_clif_pNPCExpandedBarterClosed_post;
+	int HP_clif_pNPCExpandedBarterPurchase_pre;
+	int HP_clif_pNPCExpandedBarterPurchase_post;
+	int HP_clif_npc_expanded_barter_open_pre;
+	int HP_clif_npc_expanded_barter_open_post;
+	int HP_clif_pClientVersion_pre;
+	int HP_clif_pClientVersion_post;
+	int HP_clif_pPing_pre;
+	int HP_clif_pPing_post;
+	int HP_clif_ping_pre;
+	int HP_clif_ping_post;
+	int HP_clif_pingTimer_pre;
+	int HP_clif_pingTimer_post;
+	int HP_clif_pingTimerSub_pre;
+	int HP_clif_pingTimerSub_post;
+	int HP_clif_pResetCooldown_pre;
+	int HP_clif_pResetCooldown_post;
+	int HP_clif_loadConfirm_pre;
+	int HP_clif_loadConfirm_post;
+	int HP_clif_send_selforarea_pre;
+	int HP_clif_send_selforarea_post;
+	int HP_clif_OpenRefineryUI_pre;
+	int HP_clif_OpenRefineryUI_post;
+	int HP_clif_pAddItemRefineryUI_pre;
+	int HP_clif_pAddItemRefineryUI_post;
+	int HP_clif_AddItemRefineryUIAck_pre;
+	int HP_clif_AddItemRefineryUIAck_post;
+	int HP_clif_pRefineryUIClose_pre;
+	int HP_clif_pRefineryUIClose_post;
+	int HP_clif_pRefineryUIRefine_pre;
+	int HP_clif_pRefineryUIRefine_post;
+	int HP_clif_announce_refine_status_pre;
+	int HP_clif_announce_refine_status_post;
+	int HP_clif_pGuildCastleTeleportRequest_pre;
+	int HP_clif_pGuildCastleTeleportRequest_post;
+	int HP_clif_pGuildCastleInfoRequest_pre;
+	int HP_clif_pGuildCastleInfoRequest_post;
+	int HP_clif_guild_castleteleport_res_pre;
+	int HP_clif_guild_castleteleport_res_post;
+	int HP_clif_lapineDdukDdak_open_pre;
+	int HP_clif_lapineDdukDdak_open_post;
+	int HP_clif_lapineDdukDdak_result_pre;
+	int HP_clif_lapineDdukDdak_result_post;
+	int HP_clif_plapineDdukDdak_ack_pre;
+	int HP_clif_plapineDdukDdak_ack_post;
+	int HP_clif_plapineDdukDdak_close_pre;
+	int HP_clif_plapineDdukDdak_close_post;
+	int HP_clif_lapineUpgrade_open_pre;
+	int HP_clif_lapineUpgrade_open_post;
+	int HP_clif_lapineUpgrade_result_pre;
+	int HP_clif_lapineUpgrade_result_post;
+	int HP_clif_pLapineUpgrade_close_pre;
+	int HP_clif_pLapineUpgrade_close_post;
+	int HP_clif_pLapineUpgrade_makeItem_pre;
+	int HP_clif_pLapineUpgrade_makeItem_post;
+	int HP_clif_pReqGearOff_pre;
+	int HP_clif_pReqGearOff_post;
 	int HP_cmdline_init_pre;
 	int HP_cmdline_init_post;
 	int HP_cmdline_final_pre;
@@ -8921,8 +9341,8 @@ struct {
 	int HP_duel_leave_post;
 	int HP_duel_showinfo_pre;
 	int HP_duel_showinfo_post;
-	int HP_duel_checktime_pre;
-	int HP_duel_checktime_post;
+	int HP_duel_difftime_pre;
+	int HP_duel_difftime_post;
 	int HP_duel_init_pre;
 	int HP_duel_init_post;
 	int HP_duel_final_pre;
@@ -9103,8 +9523,6 @@ struct {
 	int HP_guild_emblem_changed_post;
 	int HP_guild_send_message_pre;
 	int HP_guild_send_message_post;
-	int HP_guild_recv_message_pre;
-	int HP_guild_recv_message_post;
 	int HP_guild_send_dot_remove_pre;
 	int HP_guild_send_dot_remove_post;
 	int HP_guild_skillupack_pre;
@@ -9149,8 +9567,12 @@ struct {
 	int HP_guild_sd_check_post;
 	int HP_guild_read_guildskill_tree_db_pre;
 	int HP_guild_read_guildskill_tree_db_post;
-	int HP_guild_read_castledb_pre;
-	int HP_guild_read_castledb_post;
+	int HP_guild_read_castledb_libconfig_pre;
+	int HP_guild_read_castledb_libconfig_post;
+	int HP_guild_read_castledb_libconfig_sub_pre;
+	int HP_guild_read_castledb_libconfig_sub_post;
+	int HP_guild_read_castledb_libconfig_sub_warp_pre;
+	int HP_guild_read_castledb_libconfig_sub_warp_post;
 	int HP_guild_payexp_timer_sub_pre;
 	int HP_guild_payexp_timer_sub_post;
 	int HP_guild_send_xy_timer_sub_pre;
@@ -9247,6 +9669,8 @@ struct {
 	int HP_homun_mutate_post;
 	int HP_homun_gainexp_pre;
 	int HP_homun_gainexp_post;
+	int HP_homun_gainexp_real_pre;
+	int HP_homun_gainexp_real_post;
 	int HP_homun_add_intimacy_pre;
 	int HP_homun_add_intimacy_post;
 	int HP_homun_consume_intimacy_pre;
@@ -9345,16 +9769,6 @@ struct {
 	int HP_intif_parse_post;
 	int HP_intif_create_pet_pre;
 	int HP_intif_create_pet_post;
-	int HP_intif_broadcast_pre;
-	int HP_intif_broadcast_post;
-	int HP_intif_broadcast2_pre;
-	int HP_intif_broadcast2_post;
-	int HP_intif_main_message_pre;
-	int HP_intif_main_message_post;
-	int HP_intif_wis_message_pre;
-	int HP_intif_wis_message_post;
-	int HP_intif_wis_message_to_gm_pre;
-	int HP_intif_wis_message_to_gm_post;
 	int HP_intif_saveregistry_pre;
 	int HP_intif_saveregistry_post;
 	int HP_intif_request_registry_pre;
@@ -9381,8 +9795,6 @@ struct {
 	int HP_intif_party_changemap_post;
 	int HP_intif_break_party_pre;
 	int HP_intif_break_party_post;
-	int HP_intif_party_message_pre;
-	int HP_intif_party_message_post;
 	int HP_intif_party_leaderchange_pre;
 	int HP_intif_party_leaderchange_post;
 	int HP_intif_guild_create_pre;
@@ -9397,8 +9809,6 @@ struct {
 	int HP_intif_guild_memberinfoshort_post;
 	int HP_intif_guild_break_pre;
 	int HP_intif_guild_break_post;
-	int HP_intif_guild_message_pre;
-	int HP_intif_guild_message_post;
 	int HP_intif_guild_change_gm_pre;
 	int HP_intif_guild_change_gm_post;
 	int HP_intif_guild_change_basicinfo_pre;
@@ -9489,6 +9899,10 @@ struct {
 	int HP_intif_rodex_sendmail_post;
 	int HP_intif_rodex_checkname_pre;
 	int HP_intif_rodex_checkname_post;
+	int HP_intif_pGetZenyAck_pre;
+	int HP_intif_pGetZenyAck_post;
+	int HP_intif_pGetItemsAck_pre;
+	int HP_intif_pGetItemsAck_post;
 	int HP_intif_clan_kickoffline_pre;
 	int HP_intif_clan_kickoffline_post;
 	int HP_intif_clan_membercount_pre;
@@ -9501,14 +9915,6 @@ struct {
 	int HP_intif_achievements_request_post;
 	int HP_intif_achievements_save_pre;
 	int HP_intif_achievements_save_post;
-	int HP_intif_pWisMessage_pre;
-	int HP_intif_pWisMessage_post;
-	int HP_intif_pWisEnd_pre;
-	int HP_intif_pWisEnd_post;
-	int HP_intif_pWisToGM_sub_pre;
-	int HP_intif_pWisToGM_sub_post;
-	int HP_intif_pWisToGM_pre;
-	int HP_intif_pWisToGM_post;
 	int HP_intif_pRegisters_pre;
 	int HP_intif_pRegisters_post;
 	int HP_intif_pAccountStorage_pre;
@@ -9537,8 +9943,6 @@ struct {
 	int HP_intif_pPartyMove_post;
 	int HP_intif_pPartyBroken_pre;
 	int HP_intif_pPartyBroken_post;
-	int HP_intif_pPartyMessage_pre;
-	int HP_intif_pPartyMessage_post;
 	int HP_intif_pGuildCreated_pre;
 	int HP_intif_pGuildCreated_post;
 	int HP_intif_pGuildInfo_pre;
@@ -9551,8 +9955,6 @@ struct {
 	int HP_intif_pGuildMemberInfoShort_post;
 	int HP_intif_pGuildBroken_pre;
 	int HP_intif_pGuildBroken_post;
-	int HP_intif_pGuildMessage_pre;
-	int HP_intif_pGuildMessage_post;
 	int HP_intif_pGuildBasicInfoChanged_pre;
 	int HP_intif_pGuildBasicInfoChanged_post;
 	int HP_intif_pGuildMemberInfoChanged_pre;
@@ -9769,10 +10171,10 @@ struct {
 	int HP_itemdb_isidentified_post;
 	int HP_itemdb_isidentified2_pre;
 	int HP_itemdb_isidentified2_post;
-	int HP_itemdb_combo_split_atoi_pre;
-	int HP_itemdb_combo_split_atoi_post;
-	int HP_itemdb_read_combos_pre;
-	int HP_itemdb_read_combos_post;
+	int HP_itemdb_read_combodb_libconfig_pre;
+	int HP_itemdb_read_combodb_libconfig_post;
+	int HP_itemdb_read_combodb_libconfig_sub_pre;
+	int HP_itemdb_read_combodb_libconfig_sub_post;
 	int HP_itemdb_gendercheck_pre;
 	int HP_itemdb_gendercheck_post;
 	int HP_itemdb_validate_entry_pre;
@@ -9807,6 +10209,18 @@ struct {
 	int HP_itemdb_lookup_const_post;
 	int HP_itemdb_lookup_const_mask_pre;
 	int HP_itemdb_lookup_const_mask_post;
+	int HP_itemdb_addname_sub_pre;
+	int HP_itemdb_addname_sub_post;
+	int HP_itemdb_read_libconfig_lapineddukddak_pre;
+	int HP_itemdb_read_libconfig_lapineddukddak_post;
+	int HP_itemdb_read_libconfig_lapineddukddak_sub_pre;
+	int HP_itemdb_read_libconfig_lapineddukddak_sub_post;
+	int HP_itemdb_read_libconfig_lapineddukddak_sub_sources_pre;
+	int HP_itemdb_read_libconfig_lapineddukddak_sub_sources_post;
+	int HP_libconfig_set_db_path_pre;
+	int HP_libconfig_set_db_path_post;
+	int HP_libconfig_format_db_path_pre;
+	int HP_libconfig_format_db_path_post;
 	int HP_libconfig_read_pre;
 	int HP_libconfig_read_post;
 	int HP_libconfig_write_pre;
@@ -10277,6 +10691,10 @@ struct {
 	int HP_map_merge_zone_post;
 	int HP_map_zone_clear_single_pre;
 	int HP_map_zone_clear_single_post;
+	int HP_mapindex_config_read_dbpath_pre;
+	int HP_mapindex_config_read_dbpath_post;
+	int HP_mapindex_config_read_pre;
+	int HP_mapindex_config_read_post;
 	int HP_mapindex_init_pre;
 	int HP_mapindex_init_post;
 	int HP_mapindex_final_pre;
@@ -10395,6 +10813,8 @@ struct {
 	int HP_mob_final_post;
 	int HP_mob_reload_pre;
 	int HP_mob_reload_post;
+	int HP_mob_reload_sub_mob_pre;
+	int HP_mob_reload_sub_mob_post;
 	int HP_mob_db_pre;
 	int HP_mob_db_post;
 	int HP_mob_chat_pre;
@@ -10467,6 +10887,8 @@ struct {
 	int HP_mob_ai_sub_hard_lootsearch_post;
 	int HP_mob_warpchase_sub_pre;
 	int HP_mob_warpchase_sub_post;
+	int HP_mob_is_in_battle_state_pre;
+	int HP_mob_is_in_battle_state_post;
 	int HP_mob_ai_sub_hard_slavemob_pre;
 	int HP_mob_ai_sub_hard_slavemob_post;
 	int HP_mob_unlocktarget_pre;
@@ -10487,6 +10909,8 @@ struct {
 	int HP_mob_ai_lazy_post;
 	int HP_mob_ai_hard_pre;
 	int HP_mob_ai_hard_post;
+	int HP_mob_setdropitem_options_pre;
+	int HP_mob_setdropitem_options_post;
 	int HP_mob_setdropitem_pre;
 	int HP_mob_setdropitem_post;
 	int HP_mob_setlootitem_pre;
@@ -10553,6 +10977,14 @@ struct {
 	int HP_mob_drop_adjust_post;
 	int HP_mob_item_dropratio_adjust_pre;
 	int HP_mob_item_dropratio_adjust_post;
+	int HP_mob_read_optdrops_option_pre;
+	int HP_mob_read_optdrops_option_post;
+	int HP_mob_read_optdrops_optslot_pre;
+	int HP_mob_read_optdrops_optslot_post;
+	int HP_mob_read_optdrops_group_pre;
+	int HP_mob_read_optdrops_group_post;
+	int HP_mob_read_optdrops_db_pre;
+	int HP_mob_read_optdrops_db_post;
 	int HP_mob_readdb_pre;
 	int HP_mob_readdb_post;
 	int HP_mob_lookup_const_pre;
@@ -10573,12 +11005,16 @@ struct {
 	int HP_mob_read_db_mvpdrops_sub_post;
 	int HP_mob_read_db_mode_sub_pre;
 	int HP_mob_read_db_mode_sub_post;
+	int HP_mob_read_db_drops_option_pre;
+	int HP_mob_read_db_drops_option_post;
 	int HP_mob_read_db_stats_sub_pre;
 	int HP_mob_read_db_stats_sub_post;
+	int HP_mob_read_db_viewdata_sub_pre;
+	int HP_mob_read_db_viewdata_sub_post;
 	int HP_mob_name_constants_pre;
 	int HP_mob_name_constants_post;
-	int HP_mob_readdb_mobavail_pre;
-	int HP_mob_readdb_mobavail_post;
+	int HP_mob_mobavail_removal_notice_pre;
+	int HP_mob_mobavail_removal_notice_post;
 	int HP_mob_read_randommonster_pre;
 	int HP_mob_read_randommonster_post;
 	int HP_mob_parse_row_chatdb_pre;
@@ -10603,6 +11039,8 @@ struct {
 	int HP_mob_final_ratio_sub_post;
 	int HP_mob_destroy_mob_db_pre;
 	int HP_mob_destroy_mob_db_post;
+	int HP_mob_destroy_drop_groups_pre;
+	int HP_mob_destroy_drop_groups_post;
 	int HP_mob_skill_db_libconfig_pre;
 	int HP_mob_skill_db_libconfig_post;
 	int HP_mob_skill_db_libconfig_sub_pre;
@@ -10753,6 +11191,8 @@ struct {
 	int HP_npc_unload_dup_sub_post;
 	int HP_npc_unload_duplicates_pre;
 	int HP_npc_unload_duplicates_post;
+	int HP_npc_unload_mob_pre;
+	int HP_npc_unload_mob_post;
 	int HP_npc_unload_pre;
 	int HP_npc_unload_post;
 	int HP_npc_clearsrcfile_pre;
@@ -10853,6 +11293,10 @@ struct {
 	int HP_npc_trader_update_post;
 	int HP_npc_market_buylist_pre;
 	int HP_npc_market_buylist_post;
+	int HP_npc_barter_buylist_pre;
+	int HP_npc_barter_buylist_post;
+	int HP_npc_expanded_barter_buylist_pre;
+	int HP_npc_expanded_barter_buylist_post;
 	int HP_npc_trader_open_pre;
 	int HP_npc_trader_open_post;
 	int HP_npc_market_fromsql_pre;
@@ -10863,12 +11307,34 @@ struct {
 	int HP_npc_market_delfromsql_post;
 	int HP_npc_market_delfromsql_sub_pre;
 	int HP_npc_market_delfromsql_sub_post;
+	int HP_npc_barter_fromsql_pre;
+	int HP_npc_barter_fromsql_post;
+	int HP_npc_barter_tosql_pre;
+	int HP_npc_barter_tosql_post;
+	int HP_npc_barter_delfromsql_pre;
+	int HP_npc_barter_delfromsql_post;
+	int HP_npc_barter_delfromsql_sub_pre;
+	int HP_npc_barter_delfromsql_sub_post;
+	int HP_npc_expanded_barter_fromsql_pre;
+	int HP_npc_expanded_barter_fromsql_post;
+	int HP_npc_expanded_barter_tosql_pre;
+	int HP_npc_expanded_barter_tosql_post;
+	int HP_npc_expanded_barter_delfromsql_pre;
+	int HP_npc_expanded_barter_delfromsql_post;
+	int HP_npc_expanded_barter_delfromsql_sub_pre;
+	int HP_npc_expanded_barter_delfromsql_sub_post;
 	int HP_npc_db_checkid_pre;
 	int HP_npc_db_checkid_post;
 	int HP_npc_refresh_pre;
 	int HP_npc_refresh_post;
+	int HP_npc_questinfo_clear_pre;
+	int HP_npc_questinfo_clear_post;
 	int HP_npc_secure_timeout_timer_pre;
 	int HP_npc_secure_timeout_timer_post;
+	int HP_nullpo_init_pre;
+	int HP_nullpo_init_post;
+	int HP_nullpo_final_pre;
+	int HP_nullpo_final_post;
 	int HP_nullpo_assert_report_pre;
 	int HP_nullpo_assert_report_post;
 	int HP_packets_init_pre;
@@ -10933,8 +11399,6 @@ struct {
 	int HP_party_send_logout_post;
 	int HP_party_send_message_pre;
 	int HP_party_send_message_post;
-	int HP_party_recv_message_pre;
-	int HP_party_recv_message_post;
 	int HP_party_skill_check_pre;
 	int HP_party_skill_check_post;
 	int HP_party_send_xy_clear_pre;
@@ -11215,6 +11679,8 @@ struct {
 	int HP_pc_checkitem_post;
 	int HP_pc_useitem_pre;
 	int HP_pc_useitem_post;
+	int HP_pc_autocast_clear_pre;
+	int HP_pc_autocast_clear_post;
 	int HP_pc_skillatk_bonus_pre;
 	int HP_pc_skillatk_bonus_post;
 	int HP_pc_skillheal_bonus_pre;
@@ -11235,6 +11701,10 @@ struct {
 	int HP_pc_percentheal_post;
 	int HP_pc_jobchange_pre;
 	int HP_pc_jobchange_post;
+	int HP_pc_hide_pre;
+	int HP_pc_hide_post;
+	int HP_pc_unhide_pre;
+	int HP_pc_unhide_post;
 	int HP_pc_setoption_pre;
 	int HP_pc_setoption_post;
 	int HP_pc_setcart_pre;
@@ -11479,8 +11949,14 @@ struct {
 	int HP_pc_update_idle_time_post;
 	int HP_pc_have_magnifier_pre;
 	int HP_pc_have_magnifier_post;
+	int HP_pc_have_item_chain_pre;
+	int HP_pc_have_item_chain_post;
 	int HP_pc_process_chat_message_pre;
 	int HP_pc_process_chat_message_post;
+	int HP_pc_wis_message_to_gm_pre;
+	int HP_pc_wis_message_to_gm_post;
+	int HP_pc_wis_message_to_gm_sub_pre;
+	int HP_pc_wis_message_to_gm_sub_post;
 	int HP_pc_check_supernovice_call_pre;
 	int HP_pc_check_supernovice_call_post;
 	int HP_pc_check_basicskill_pre;
@@ -11489,6 +11965,10 @@ struct {
 	int HP_pc_isDeathPenaltyJob_post;
 	int HP_pc_has_second_costume_pre;
 	int HP_pc_has_second_costume_post;
+	int HP_pc_expandInventory_pre;
+	int HP_pc_expandInventory_post;
+	int HP_pc_auto_exp_insurance_pre;
+	int HP_pc_auto_exp_insurance_post;
 	int HP_libpcre_compile_pre;
 	int HP_libpcre_compile_post;
 	int HP_libpcre_study_pre;
@@ -11511,6 +11991,8 @@ struct {
 	int HP_pet_final_post;
 	int HP_pet_hungry_val_pre;
 	int HP_pet_hungry_val_post;
+	int HP_pet_set_hunger_pre;
+	int HP_pet_set_hunger_post;
 	int HP_pet_set_intimate_pre;
 	int HP_pet_set_intimate_post;
 	int HP_pet_create_egg_pre;
@@ -11645,8 +12127,36 @@ struct {
 	int HP_quest_questinfo_validate_quests_post;
 	int HP_quest_questinfo_validate_mercenary_class_pre;
 	int HP_quest_questinfo_validate_mercenary_class_post;
-	int HP_quest_questinfo_vector_clear_pre;
-	int HP_quest_questinfo_vector_clear_post;
+	int HP_refine_init_pre;
+	int HP_refine_init_post;
+	int HP_refine_final_pre;
+	int HP_refine_final_post;
+	int HP_refine_get_refine_chance_pre;
+	int HP_refine_get_refine_chance_post;
+	int HP_refine_get_bonus_pre;
+	int HP_refine_get_bonus_post;
+	int HP_refine_get_randombonus_max_pre;
+	int HP_refine_get_randombonus_max_post;
+	int HP_refine_refinery_add_item_pre;
+	int HP_refine_refinery_add_item_post;
+	int HP_refine_refinery_refine_request_pre;
+	int HP_refine_refinery_refine_request_post;
+	int HP_PRIV__refine_readdb_refine_libconfig_sub_pre;
+	int HP_PRIV__refine_readdb_refine_libconfig_sub_post;
+	int HP_PRIV__refine_readdb_refine_libconfig_pre;
+	int HP_PRIV__refine_readdb_refine_libconfig_post;
+	int HP_PRIV__refine_announce_behavior_string2enum_pre;
+	int HP_PRIV__refine_announce_behavior_string2enum_post;
+	int HP_PRIV__refine_failure_behavior_string2enum_pre;
+	int HP_PRIV__refine_failure_behavior_string2enum_post;
+	int HP_PRIV__refine_readdb_refinery_ui_settings_items_pre;
+	int HP_PRIV__refine_readdb_refinery_ui_settings_items_post;
+	int HP_PRIV__refine_readdb_refinery_ui_settings_sub_pre;
+	int HP_PRIV__refine_readdb_refinery_ui_settings_sub_post;
+	int HP_PRIV__refine_readdb_refinery_ui_settings_pre;
+	int HP_PRIV__refine_readdb_refinery_ui_settings_post;
+	int HP_PRIV__refine_is_refinable_pre;
+	int HP_PRIV__refine_is_refinable_post;
 	int HP_rnd_init_pre;
 	int HP_rnd_init_post;
 	int HP_rnd_final_pre;
@@ -11697,6 +12207,10 @@ struct {
 	int HP_rodex_delete_mail_post;
 	int HP_rodex_clean_pre;
 	int HP_rodex_clean_post;
+	int HP_rodex_getZenyAck_pre;
+	int HP_rodex_getZenyAck_post;
+	int HP_rodex_getItemsAck_pre;
+	int HP_rodex_getItemsAck_post;
 	int HP_script_init_pre;
 	int HP_script_init_post;
 	int HP_script_final_pre;
@@ -12045,6 +12559,8 @@ struct {
 	int HP_script_load_translations_post;
 	int HP_script_load_translation_addstring_pre;
 	int HP_script_load_translation_addstring_post;
+	int HP_script_load_translation_file_pre;
+	int HP_script_load_translation_file_post;
 	int HP_script_load_translation_pre;
 	int HP_script_load_translation_post;
 	int HP_script_translation_db_destroyer_pre;
@@ -12055,8 +12571,8 @@ struct {
 	int HP_script_parse_cleanup_timer_post;
 	int HP_script_add_language_pre;
 	int HP_script_add_language_post;
-	int HP_script_get_translation_file_name_pre;
-	int HP_script_get_translation_file_name_post;
+	int HP_script_get_translation_dir_name_pre;
+	int HP_script_get_translation_dir_name_post;
 	int HP_script_parser_clean_leftovers_pre;
 	int HP_script_parser_clean_leftovers_post;
 	int HP_script_run_use_script_pre;
@@ -12065,6 +12581,14 @@ struct {
 	int HP_script_run_item_equip_script_post;
 	int HP_script_run_item_unequip_script_pre;
 	int HP_script_run_item_unequip_script_post;
+	int HP_script_run_item_rental_end_script_pre;
+	int HP_script_run_item_rental_end_script_post;
+	int HP_script_run_item_rental_start_script_pre;
+	int HP_script_run_item_rental_start_script_post;
+	int HP_script_run_item_lapineddukddak_script_pre;
+	int HP_script_run_item_lapineddukddak_script_post;
+	int HP_script_sellitemcurrency_add_pre;
+	int HP_script_sellitemcurrency_add_post;
 	int HP_searchstore_open_pre;
 	int HP_searchstore_open_post;
 	int HP_searchstore_query_pre;
@@ -12303,6 +12827,8 @@ struct {
 	int HP_skill_not_ok_hom_unknown_post;
 	int HP_skill_not_ok_mercenary_pre;
 	int HP_skill_not_ok_mercenary_post;
+	int HP_skill_validate_autocast_data_pre;
+	int HP_skill_validate_autocast_data_post;
 	int HP_skill_chastle_mob_changetarget_pre;
 	int HP_skill_chastle_mob_changetarget_post;
 	int HP_skill_can_produce_mix_pre;
@@ -12581,6 +13107,8 @@ struct {
 	int HP_skill_check_npc_chaospanic_post;
 	int HP_skill_count_wos_pre;
 	int HP_skill_count_wos_post;
+	int HP_skill_get_linked_song_dance_id_pre;
+	int HP_skill_get_linked_song_dance_id_post;
 	int HP_sockt_init_pre;
 	int HP_sockt_init_post;
 	int HP_sockt_final_pre;
@@ -12615,6 +13143,8 @@ struct {
 	int HP_sockt_flush_post;
 	int HP_sockt_flush_fifos_pre;
 	int HP_sockt_flush_fifos_post;
+	int HP_sockt_connect_client_pre;
+	int HP_sockt_connect_client_post;
 	int HP_sockt_set_nonblocking_pre;
 	int HP_sockt_set_nonblocking_post;
 	int HP_sockt_set_defaultparse_pre;
@@ -12709,18 +13239,18 @@ struct {
 	int HP_status_init_post;
 	int HP_status_final_pre;
 	int HP_status_final_post;
-	int HP_status_get_refine_chance_pre;
-	int HP_status_get_refine_chance_post;
 	int HP_status_skill2sc_pre;
 	int HP_status_skill2sc_post;
 	int HP_status_sc2skill_pre;
 	int HP_status_sc2skill_post;
 	int HP_status_sc2scb_flag_pre;
 	int HP_status_sc2scb_flag_post;
-	int HP_status_type2relevant_bl_types_pre;
-	int HP_status_type2relevant_bl_types_post;
+	int HP_status_get_sc_relevant_bl_types_pre;
+	int HP_status_get_sc_relevant_bl_types_post;
 	int HP_status_get_sc_type_pre;
 	int HP_status_get_sc_type_post;
+	int HP_status_get_sc_icon_pre;
+	int HP_status_get_sc_icon_post;
 	int HP_status_damage_pre;
 	int HP_status_damage_post;
 	int HP_status_charge_pre;
@@ -12781,6 +13311,8 @@ struct {
 	int HP_status_get_sc_def_post;
 	int HP_status_change_start_pre;
 	int HP_status_change_start_post;
+	int HP_status_change_start_sub_pre;
+	int HP_status_change_start_sub_post;
 	int HP_status_change_end__pre;
 	int HP_status_change_end__post;
 	int HP_status_is_immune_to_status_pre;
@@ -12941,12 +13473,14 @@ struct {
 	int HP_status_readdb_job2_post;
 	int HP_status_readdb_sizefix_pre;
 	int HP_status_readdb_sizefix_post;
-	int HP_status_readdb_refine_libconfig_pre;
-	int HP_status_readdb_refine_libconfig_post;
-	int HP_status_readdb_refine_libconfig_sub_pre;
-	int HP_status_readdb_refine_libconfig_sub_post;
-	int HP_status_readdb_scconfig_pre;
-	int HP_status_readdb_scconfig_post;
+	int HP_status_read_scdb_libconfig_pre;
+	int HP_status_read_scdb_libconfig_post;
+	int HP_status_read_scdb_libconfig_sub_pre;
+	int HP_status_read_scdb_libconfig_sub_post;
+	int HP_status_read_scdb_libconfig_sub_flag_pre;
+	int HP_status_read_scdb_libconfig_sub_flag_post;
+	int HP_status_read_scdb_libconfig_sub_flag_additional_pre;
+	int HP_status_read_scdb_libconfig_sub_flag_additional_post;
 	int HP_status_read_job_db_pre;
 	int HP_status_read_job_db_post;
 	int HP_status_read_job_db_sub_pre;
@@ -13035,6 +13569,24 @@ struct {
 	int HP_strlib_strline__post;
 	int HP_strlib_bin2hex__pre;
 	int HP_strlib_bin2hex__post;
+	int HP_stylist_init_pre;
+	int HP_stylist_init_post;
+	int HP_stylist_final_pre;
+	int HP_stylist_final_post;
+	int HP_stylist_vector_init_pre;
+	int HP_stylist_vector_init_post;
+	int HP_stylist_vector_clear_pre;
+	int HP_stylist_vector_clear_post;
+	int HP_stylist_read_db_libconfig_pre;
+	int HP_stylist_read_db_libconfig_post;
+	int HP_stylist_read_db_libconfig_sub_pre;
+	int HP_stylist_read_db_libconfig_sub_post;
+	int HP_stylist_request_style_change_pre;
+	int HP_stylist_request_style_change_post;
+	int HP_stylist_validate_requirements_pre;
+	int HP_stylist_validate_requirements_post;
+	int HP_stylist_send_rodexitem_pre;
+	int HP_stylist_send_rodexitem_post;
 	int HP_sv_parse_next_pre;
 	int HP_sv_parse_next_post;
 	int HP_sv_parse_pre;
@@ -13157,22 +13709,24 @@ struct {
 	int HP_unit_final_post;
 	int HP_unit_bl2ud_pre;
 	int HP_unit_bl2ud_post;
+	int HP_unit_cbl2ud_pre;
+	int HP_unit_cbl2ud_post;
 	int HP_unit_bl2ud2_pre;
 	int HP_unit_bl2ud2_post;
 	int HP_unit_init_ud_pre;
 	int HP_unit_init_ud_post;
 	int HP_unit_attack_timer_pre;
 	int HP_unit_attack_timer_post;
-	int HP_unit_walktoxy_timer_pre;
-	int HP_unit_walktoxy_timer_post;
-	int HP_unit_walktoxy_sub_pre;
-	int HP_unit_walktoxy_sub_post;
-	int HP_unit_delay_walktoxy_timer_pre;
-	int HP_unit_delay_walktoxy_timer_post;
-	int HP_unit_walktoxy_pre;
-	int HP_unit_walktoxy_post;
-	int HP_unit_walktobl_sub_pre;
-	int HP_unit_walktobl_sub_post;
+	int HP_unit_walk_toxy_timer_pre;
+	int HP_unit_walk_toxy_timer_post;
+	int HP_unit_walk_toxy_sub_pre;
+	int HP_unit_walk_toxy_sub_post;
+	int HP_unit_delay_walk_toxy_timer_pre;
+	int HP_unit_delay_walk_toxy_timer_post;
+	int HP_unit_walk_toxy_pre;
+	int HP_unit_walk_toxy_post;
+	int HP_unit_walktobl_timer_pre;
+	int HP_unit_walktobl_timer_post;
 	int HP_unit_walktobl_pre;
 	int HP_unit_walktobl_post;
 	int HP_unit_run_pre;
@@ -13183,20 +13737,22 @@ struct {
 	int HP_unit_escape_post;
 	int HP_unit_movepos_pre;
 	int HP_unit_movepos_post;
-	int HP_unit_setdir_pre;
-	int HP_unit_setdir_post;
+	int HP_unit_set_dir_pre;
+	int HP_unit_set_dir_post;
 	int HP_unit_getdir_pre;
 	int HP_unit_getdir_post;
 	int HP_unit_blown_pre;
 	int HP_unit_blown_post;
 	int HP_unit_warp_pre;
 	int HP_unit_warp_post;
+	int HP_unit_warpto_master_pre;
+	int HP_unit_warpto_master_post;
 	int HP_unit_stop_walking_pre;
 	int HP_unit_stop_walking_post;
 	int HP_unit_skilluse_id_pre;
 	int HP_unit_skilluse_id_post;
-	int HP_unit_step_timer_pre;
-	int HP_unit_step_timer_post;
+	int HP_unit_steptimer_pre;
+	int HP_unit_steptimer_post;
 	int HP_unit_stop_stepaction_pre;
 	int HP_unit_stop_stepaction_post;
 	int HP_unit_is_walking_pre;
@@ -13316,6 +13872,8 @@ struct {
 	struct pcre_interface libpcre;
 	struct pet_interface pet;
 	struct quest_interface quest;
+	struct refine_interface refine;
+	struct refine_interface_private PRIV__refine;
 	struct rnd_interface rnd;
 	struct rodex_interface rodex;
 	struct script_interface script;
@@ -13328,6 +13886,7 @@ struct {
 	struct storage_interface storage;
 	struct stringbuf_interface StrBuf;
 	struct strlib_interface strlib;
+	struct stylist_interface stylist;
 	struct sv_interface sv;
 	struct sysinfo_interface sysinfo;
 	struct thread_interface thread;