13 files changed, 5944 insertions, 2112 deletions

diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 7cc5ef2b1..1451b34b2 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2013-2019  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
@@ -1276,8 +1276,8 @@ typedef void (*HPMHOOK_pre_clif_scriptclear) (struct map_session_data **sd, int
 typedef void (*HPMHOOK_post_clif_scriptclear) (struct map_session_data *sd, int npcid);
 typedef void (*HPMHOOK_pre_clif_viewpoint) (struct map_session_data **sd, int *npc_id, int *type, int *x, int *y, int *id, int *color);
 typedef void (*HPMHOOK_post_clif_viewpoint) (struct map_session_data *sd, int npc_id, int type, int x, int y, int id, int color);
-typedef int (*HPMHOOK_pre_clif_damage) (struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *damage, short *div, unsigned char *type, int64 *damage2);
-typedef int (*HPMHOOK_post_clif_damage) (int retVal___, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 damage, short div, unsigned char type, int64 damage2);
+typedef int (*HPMHOOK_pre_clif_damage) (struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *damage, short *div, enum battle_dmg_type *type, int64 *damage2);
+typedef int (*HPMHOOK_post_clif_damage) (int retVal___, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 damage, short div, enum battle_dmg_type type, int64 damage2);
 typedef void (*HPMHOOK_pre_clif_sitting) (struct block_list **bl);
 typedef void (*HPMHOOK_post_clif_sitting) (struct block_list *bl);
 typedef void (*HPMHOOK_pre_clif_standing) (struct block_list **bl);
@@ -1296,12 +1296,18 @@ typedef void (*HPMHOOK_pre_clif_fame_taekwon) (struct map_session_data **sd, int
 typedef void (*HPMHOOK_post_clif_fame_taekwon) (struct map_session_data *sd, int points);
 typedef void (*HPMHOOK_pre_clif_ranklist) (struct map_session_data **sd, enum fame_list_type *type);
 typedef void (*HPMHOOK_post_clif_ranklist) (struct map_session_data *sd, enum fame_list_type type);
+typedef void (*HPMHOOK_pre_clif_ranklist_sub) (struct PACKET_ZC_ACK_RANKING_sub **ranks, enum fame_list_type *type);
+typedef void (*HPMHOOK_post_clif_ranklist_sub) (struct PACKET_ZC_ACK_RANKING_sub *ranks, enum fame_list_type type);
+typedef void (*HPMHOOK_pre_clif_ranklist_sub2) (uint32 **chars, uint32 **points, enum fame_list_type *type);
+typedef void (*HPMHOOK_post_clif_ranklist_sub2) (uint32 *chars, uint32 *points, enum fame_list_type type);
 typedef void (*HPMHOOK_pre_clif_update_rankingpoint) (struct map_session_data **sd, enum fame_list_type *type, int *points);
 typedef void (*HPMHOOK_post_clif_update_rankingpoint) (struct map_session_data *sd, enum fame_list_type type, int points);
 typedef void (*HPMHOOK_pre_clif_pRanklist) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pRanklist) (int fd, struct map_session_data *sd);
-typedef void (*HPMHOOK_pre_clif_hotkeys) (struct map_session_data **sd);
-typedef void (*HPMHOOK_post_clif_hotkeys) (struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_hotkeys) (struct map_session_data **sd, int *tab);
+typedef void (*HPMHOOK_post_clif_hotkeys) (struct map_session_data *sd, int tab);
+typedef void (*HPMHOOK_pre_clif_hotkeysAll) (struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_hotkeysAll) (struct map_session_data *sd);
 typedef int (*HPMHOOK_pre_clif_insight) (struct block_list **bl, va_list ap);
 typedef int (*HPMHOOK_post_clif_insight) (int retVal___, struct block_list *bl, va_list ap);
 typedef int (*HPMHOOK_pre_clif_outsight) (struct block_list **bl, va_list ap);
@@ -1324,8 +1330,10 @@ typedef void (*HPMHOOK_pre_clif_autospell) (struct map_session_data **sd, uint16
 typedef void (*HPMHOOK_post_clif_autospell) (struct map_session_data *sd, uint16 skill_lv);
 typedef void (*HPMHOOK_pre_clif_combo_delay) (struct block_list **bl, int *wait);
 typedef void (*HPMHOOK_post_clif_combo_delay) (struct block_list *bl, int wait);
-typedef void (*HPMHOOK_pre_clif_status_change) (struct block_list **bl, int *type, int *flag, int *tick, int *val1, int *val2, int *val3);
-typedef void (*HPMHOOK_post_clif_status_change) (struct block_list *bl, int type, int flag, int tick, int val1, int val2, int val3);
+typedef void (*HPMHOOK_pre_clif_status_change) (struct block_list **bl, int *relevant_bl, int *type, int *flag, int *total_tick, int *val1, int *val2, int *val3);
+typedef void (*HPMHOOK_post_clif_status_change) (struct block_list *bl, int relevant_bl, int type, int flag, int total_tick, int val1, int val2, int val3);
+typedef void (*HPMHOOK_pre_clif_status_change_sub) (struct block_list **bl, int *type, int *relevant_bl, int *flag, int *tick, int *total_tick, int *val1, int *val2, int *val3);
+typedef void (*HPMHOOK_post_clif_status_change_sub) (struct block_list *bl, int type, int relevant_bl, int flag, int tick, int total_tick, int val1, int val2, int val3);
 typedef void (*HPMHOOK_pre_clif_insert_card) (struct map_session_data **sd, int *idx_equip, int *idx_card, int *flag);
 typedef void (*HPMHOOK_post_clif_insert_card) (struct map_session_data *sd, int idx_equip, int idx_card, int flag);
 typedef void (*HPMHOOK_pre_clif_inventoryList) (struct map_session_data **sd);
@@ -1378,8 +1386,36 @@ typedef void (*HPMHOOK_pre_clif_mvp_noitem) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_mvp_noitem) (struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_changed_dir) (struct block_list **bl, enum send_target *target);
 typedef void (*HPMHOOK_post_clif_changed_dir) (struct block_list *bl, enum send_target target);
-typedef void (*HPMHOOK_pre_clif_charnameack) (int *fd, struct block_list **bl);
-typedef void (*HPMHOOK_post_clif_charnameack) (int fd, struct block_list *bl);
+typedef void (*HPMHOOK_pre_clif_blname_ack) (int *fd, struct block_list **bl);
+typedef void (*HPMHOOK_post_clif_blname_ack) (int fd, struct block_list *bl);
+typedef void (*HPMHOOK_pre_clif_pcname_ack) (int *fd, struct block_list **bl);
+typedef void (*HPMHOOK_post_clif_pcname_ack) (int fd, struct block_list *bl);
+typedef void (*HPMHOOK_pre_clif_homname_ack) (int *fd, struct block_list **bl);
+typedef void (*HPMHOOK_post_clif_homname_ack) (int fd, struct block_list *bl);
+typedef void (*HPMHOOK_pre_clif_mername_ack) (int *fd, struct block_list **bl);
+typedef void (*HPMHOOK_post_clif_mername_ack) (int fd, struct block_list *bl);
+typedef void (*HPMHOOK_pre_clif_petname_ack) (int *fd, struct block_list **bl);
+typedef void (*HPMHOOK_post_clif_petname_ack) (int fd, struct block_list *bl);
+typedef void (*HPMHOOK_pre_clif_npcname_ack) (int *fd, struct block_list **bl);
+typedef void (*HPMHOOK_post_clif_npcname_ack) (int fd, struct block_list *bl);
+typedef void (*HPMHOOK_pre_clif_mobname_ack) (int *fd, struct block_list **bl);
+typedef void (*HPMHOOK_post_clif_mobname_ack) (int fd, struct block_list *bl);
+typedef void (*HPMHOOK_pre_clif_mobname_guardian_ack) (int *fd, struct block_list **bl);
+typedef void (*HPMHOOK_post_clif_mobname_guardian_ack) (int fd, struct block_list *bl);
+typedef void (*HPMHOOK_pre_clif_mobname_additional_ack) (int *fd, struct block_list **bl);
+typedef void (*HPMHOOK_post_clif_mobname_additional_ack) (int fd, struct block_list *bl);
+typedef void (*HPMHOOK_pre_clif_mobname_normal_ack) (int *fd, struct block_list **bl);
+typedef void (*HPMHOOK_post_clif_mobname_normal_ack) (int fd, struct block_list *bl);
+typedef void (*HPMHOOK_pre_clif_chatname_ack) (int *fd, struct block_list **bl);
+typedef void (*HPMHOOK_post_clif_chatname_ack) (int fd, struct block_list *bl);
+typedef void (*HPMHOOK_pre_clif_elemname_ack) (int *fd, struct block_list **bl);
+typedef void (*HPMHOOK_post_clif_elemname_ack) (int fd, struct block_list *bl);
+typedef void (*HPMHOOK_pre_clif_skillname_ack) (int *fd, struct block_list **bl);
+typedef void (*HPMHOOK_post_clif_skillname_ack) (int fd, struct block_list *bl);
+typedef void (*HPMHOOK_pre_clif_itemname_ack) (int *fd, struct block_list **bl);
+typedef void (*HPMHOOK_post_clif_itemname_ack) (int fd, struct block_list *bl);
+typedef void (*HPMHOOK_pre_clif_unknownname_ack) (int *fd, struct block_list **bl);
+typedef void (*HPMHOOK_post_clif_unknownname_ack) (int fd, struct block_list *bl);
 typedef void (*HPMHOOK_pre_clif_monster_hp_bar) (struct mob_data **md, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_monster_hp_bar) (struct mob_data *md, struct map_session_data *sd);
 typedef int (*HPMHOOK_pre_clif_hpmeter) (struct map_session_data **sd);
@@ -1482,6 +1518,8 @@ typedef void (*HPMHOOK_pre_clif_misceffect) (struct block_list **bl, int *type);
 typedef void (*HPMHOOK_post_clif_misceffect) (struct block_list *bl, int type);
 typedef void (*HPMHOOK_pre_clif_changeoption) (struct block_list **bl);
 typedef void (*HPMHOOK_post_clif_changeoption) (struct block_list *bl);
+typedef void (*HPMHOOK_pre_clif_changeoption_target) (struct block_list **bl, struct block_list **target_bl, enum send_target *target);
+typedef void (*HPMHOOK_post_clif_changeoption_target) (struct block_list *bl, struct block_list *target_bl, enum send_target target);
 typedef void (*HPMHOOK_pre_clif_changeoption2) (struct block_list **bl);
 typedef void (*HPMHOOK_post_clif_changeoption2) (struct block_list *bl);
 typedef void (*HPMHOOK_pre_clif_emotion) (struct block_list **bl, int *type);
@@ -1494,8 +1532,8 @@ typedef void (*HPMHOOK_pre_clif_divorced) (struct map_session_data **sd, const c
 typedef void (*HPMHOOK_post_clif_divorced) (struct map_session_data *sd, const char *name);
 typedef void (*HPMHOOK_pre_clif_callpartner) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_callpartner) (struct map_session_data *sd);
-typedef int (*HPMHOOK_pre_clif_skill_damage) (struct block_list **src, struct block_list **dst, int64 *tick, int *sdelay, int *ddelay, int64 *damage, int *div, uint16 *skill_id, uint16 *skill_lv, int *type);
-typedef int (*HPMHOOK_post_clif_skill_damage) (int retVal___, struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, int type);
+typedef int (*HPMHOOK_pre_clif_skill_damage) (struct block_list **src, struct block_list **dst, int64 *tick, int *sdelay, int *ddelay, int64 *damage, int *div, uint16 *skill_id, uint16 *skill_lv, enum battle_dmg_type *type);
+typedef int (*HPMHOOK_post_clif_skill_damage) (int retVal___, struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, enum battle_dmg_type type);
 typedef int (*HPMHOOK_pre_clif_skill_nodamage) (struct block_list **src, struct block_list **dst, uint16 *skill_id, int *heal, int *fail);
 typedef int (*HPMHOOK_post_clif_skill_nodamage) (int retVal___, struct block_list *src, struct block_list *dst, uint16 skill_id, int heal, int fail);
 typedef void (*HPMHOOK_pre_clif_skill_poseffect) (struct block_list **src, uint16 *skill_id, int *val, int *x, int *y, int64 *tick);
@@ -1530,8 +1568,10 @@ typedef void (*HPMHOOK_pre_clif_specialeffect) (struct block_list **bl, int *typ
 typedef void (*HPMHOOK_post_clif_specialeffect) (struct block_list *bl, int type, enum send_target target);
 typedef void (*HPMHOOK_pre_clif_specialeffect_single) (struct block_list **bl, int *type, int *fd);
 typedef void (*HPMHOOK_post_clif_specialeffect_single) (struct block_list *bl, int type, int fd);
-typedef void (*HPMHOOK_pre_clif_specialeffect_value) (struct block_list **bl, int *effect_id, int *num, send_target *target);
-typedef void (*HPMHOOK_post_clif_specialeffect_value) (struct block_list *bl, int effect_id, int num, send_target target);
+typedef void (*HPMHOOK_pre_clif_specialeffect_value) (struct block_list **bl, int *effect_id, uint64 *num, send_target *target);
+typedef void (*HPMHOOK_post_clif_specialeffect_value) (struct block_list *bl, int effect_id, uint64 num, send_target target);
+typedef void (*HPMHOOK_pre_clif_specialeffect_value_single) (struct block_list **bl, int *effect_id, uint64 *num, int *fd);
+typedef void (*HPMHOOK_post_clif_specialeffect_value_single) (struct block_list *bl, int effect_id, uint64 num, int fd);
 typedef void (*HPMHOOK_pre_clif_removeSpecialEffect) (struct block_list **bl, int *effectId, enum send_target *target);
 typedef void (*HPMHOOK_post_clif_removeSpecialEffect) (struct block_list *bl, int effectId, enum send_target target);
 typedef void (*HPMHOOK_pre_clif_removeSpecialEffect_single) (struct block_list **bl, int *effectId, struct block_list **targetBl);
@@ -1566,6 +1606,8 @@ typedef void (*HPMHOOK_pre_clif_addchat) (struct chat_data **cd, struct map_sess
 typedef void (*HPMHOOK_post_clif_addchat) (struct chat_data *cd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_changechatowner) (struct chat_data **cd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_changechatowner) (struct chat_data *cd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_chatRoleChange) (struct chat_data **cd, struct map_session_data **sd, struct block_list **bl, int *isNotOwner);
+typedef void (*HPMHOOK_post_clif_chatRoleChange) (struct chat_data *cd, struct map_session_data *sd, struct block_list *bl, int isNotOwner);
 typedef void (*HPMHOOK_pre_clif_clearchat) (struct chat_data **cd, int *fd);
 typedef void (*HPMHOOK_post_clif_clearchat) (struct chat_data *cd, int fd);
 typedef void (*HPMHOOK_pre_clif_leavechat) (struct chat_data **cd, struct map_session_data **sd, bool *flag);
@@ -1618,8 +1660,8 @@ typedef void (*HPMHOOK_pre_clif_wisall) (struct map_session_data **sd, int *type
 typedef void (*HPMHOOK_post_clif_wisall) (struct map_session_data *sd, int type, int flag);
 typedef void (*HPMHOOK_pre_clif_PMIgnoreList) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_PMIgnoreList) (struct map_session_data *sd);
-typedef void (*HPMHOOK_pre_clif_ShowScript) (struct block_list **bl, const char **message);
-typedef void (*HPMHOOK_post_clif_ShowScript) (struct block_list *bl, const char *message);
+typedef void (*HPMHOOK_pre_clif_ShowScript) (struct block_list **bl, const char **message, enum send_target *target);
+typedef void (*HPMHOOK_post_clif_ShowScript) (struct block_list *bl, const char *message, enum send_target target);
 typedef void (*HPMHOOK_pre_clif_traderequest) (struct map_session_data **sd, const char **name);
 typedef void (*HPMHOOK_post_clif_traderequest) (struct map_session_data *sd, const char *name);
 typedef void (*HPMHOOK_pre_clif_tradestart) (struct map_session_data **sd, uint8 *type);
@@ -1680,6 +1722,8 @@ typedef void (*HPMHOOK_pre_clif_addskill) (struct map_session_data **sd, int *id
 typedef void (*HPMHOOK_post_clif_addskill) (struct map_session_data *sd, int id);
 typedef void (*HPMHOOK_pre_clif_deleteskill) (struct map_session_data **sd, int *id);
 typedef void (*HPMHOOK_post_clif_deleteskill) (struct map_session_data *sd, int id);
+typedef void (*HPMHOOK_pre_clif_playerSkillToPacket) (struct map_session_data **sd, struct SKILLDATA **skillData, int *skillId, int *idx, bool *newSkill);
+typedef void (*HPMHOOK_post_clif_playerSkillToPacket) (struct map_session_data *sd, struct SKILLDATA *skillData, int skillId, int idx, bool newSkill);
 typedef void (*HPMHOOK_pre_clif_party_created) (struct map_session_data **sd, int *result);
 typedef void (*HPMHOOK_post_clif_party_created) (struct map_session_data *sd, int result);
 typedef void (*HPMHOOK_pre_clif_party_member_info) (struct party_data **p, struct map_session_data **sd);
@@ -1722,6 +1766,10 @@ typedef void (*HPMHOOK_pre_clif_guild_basicinfo) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_guild_basicinfo) (struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_guild_allianceinfo) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_guild_allianceinfo) (struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_guild_castlelist) (struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_guild_castlelist) (struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_guild_castleinfo) (struct map_session_data **sd, struct guild_castle **gc);
+typedef void (*HPMHOOK_post_clif_guild_castleinfo) (struct map_session_data *sd, struct guild_castle *gc);
 typedef void (*HPMHOOK_pre_clif_guild_memberlist) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_guild_memberlist) (struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_guild_skillinfo) (struct map_session_data **sd);
@@ -2012,18 +2060,20 @@ typedef void (*HPMHOOK_pre_clif_show_modifiers) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_show_modifiers) (struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_notify_bounditem) (struct map_session_data **sd, unsigned short *index);
 typedef void (*HPMHOOK_post_clif_notify_bounditem) (struct map_session_data *sd, unsigned short index);
-typedef int (*HPMHOOK_pre_clif_delay_damage) (int64 *tick, struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *in_damage, short *div, unsigned char *type);
-typedef int (*HPMHOOK_post_clif_delay_damage) (int retVal___, int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, unsigned char type);
+typedef int (*HPMHOOK_pre_clif_delay_damage) (int64 *tick, struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *in_damage, short *div, enum battle_dmg_type *type);
+typedef int (*HPMHOOK_post_clif_delay_damage) (int retVal___, int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, enum battle_dmg_type type);
 typedef int (*HPMHOOK_pre_clif_delay_damage_sub) (int *tid, int64 *tick, int *id, intptr_t *data);
 typedef int (*HPMHOOK_post_clif_delay_damage_sub) (int retVal___, int tid, int64 tick, int id, intptr_t data);
 typedef void (*HPMHOOK_pre_clif_npc_market_open) (struct map_session_data **sd, struct npc_data **nd);
 typedef void (*HPMHOOK_post_clif_npc_market_open) (struct map_session_data *sd, struct npc_data *nd);
-typedef void (*HPMHOOK_pre_clif_npc_market_purchase_ack) (struct map_session_data **sd, const struct itemlist **item_list, unsigned char *response);
-typedef void (*HPMHOOK_post_clif_npc_market_purchase_ack) (struct map_session_data *sd, const struct itemlist *item_list, unsigned char response);
+typedef void (*HPMHOOK_pre_clif_npc_market_purchase_ack) (struct map_session_data **sd, const struct itemlist **item_list, enum market_buy_result *response);
+typedef void (*HPMHOOK_post_clif_npc_market_purchase_ack) (struct map_session_data *sd, const struct itemlist *item_list, enum market_buy_result response);
 typedef bool (*HPMHOOK_pre_clif_parse_roulette_db) (void);
 typedef bool (*HPMHOOK_post_clif_parse_roulette_db) (bool retVal___);
 typedef void (*HPMHOOK_pre_clif_roulette_generate_ack) (struct map_session_data **sd, enum GENERATE_ROULETTE_ACK *result, short *stage, short *prizeIdx, int *bonusItemID);
 typedef void (*HPMHOOK_post_clif_roulette_generate_ack) (struct map_session_data *sd, enum GENERATE_ROULETTE_ACK result, short stage, short prizeIdx, int bonusItemID);
+typedef void (*HPMHOOK_pre_clif_roulette_close) (struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_roulette_close) (struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_openmergeitem) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_openmergeitem) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_cancelmergeitem) (int *fd, struct map_session_data **sd);
@@ -2032,6 +2082,8 @@ typedef int (*HPMHOOK_pre_clif_comparemergeitem) (const void **a, const void **b
 typedef int (*HPMHOOK_post_clif_comparemergeitem) (int retVal___, const void *a, const void *b);
 typedef void (*HPMHOOK_pre_clif_ackmergeitems) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_ackmergeitems) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_mergeitems) (int *fd, struct map_session_data **sd, int *index, int *amount, enum mergeitem_reason *reason);
+typedef void (*HPMHOOK_post_clif_mergeitems) (int fd, struct map_session_data *sd, int index, int amount, enum mergeitem_reason reason);
 typedef bool (*HPMHOOK_pre_clif_isdisguised) (struct block_list **bl);
 typedef bool (*HPMHOOK_post_clif_isdisguised) (bool retVal___, struct block_list *bl);
 typedef void (*HPMHOOK_pre_clif_navigate_to) (struct map_session_data **sd, const char **mapname, uint16 *x, uint16 *y, uint8 *flag, bool *hideWindow, uint16 *mob_id);
@@ -2056,8 +2108,10 @@ typedef void (*HPMHOOK_pre_clif_pLoadEndAck) (int *fd, struct map_session_data *
 typedef void (*HPMHOOK_post_clif_pLoadEndAck) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_pTickSend) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pTickSend) (int fd, struct map_session_data *sd);
-typedef void (*HPMHOOK_pre_clif_pHotkey) (int *fd, struct map_session_data **sd);
-typedef void (*HPMHOOK_post_clif_pHotkey) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pHotkey1) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pHotkey1) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pHotkey2) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pHotkey2) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_pProgressbar) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pProgressbar) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_pWalkToXY) (int *fd, struct map_session_data **sd);
@@ -2462,8 +2516,12 @@ typedef void (*HPMHOOK_pre_clif_pBGQueueRevokeReq) (int *fd, struct map_session_
 typedef void (*HPMHOOK_post_clif_pBGQueueRevokeReq) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_pBGQueueBattleBeginAck) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pBGQueueBattleBeginAck) (int fd, struct map_session_data *sd);
-typedef void (*HPMHOOK_pre_clif_pCashShopOpen) (int *fd, struct map_session_data **sd);
-typedef void (*HPMHOOK_post_clif_pCashShopOpen) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pCashShopOpen1) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pCashShopOpen1) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pCashShopOpen2) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pCashShopOpen2) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pCashShopLimitedReq) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pCashShopLimitedReq) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_pCashShopClose) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pCashShopClose) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_pCashShopReqTab) (int *fd, struct map_session_data **sd);
@@ -2476,6 +2534,10 @@ typedef void (*HPMHOOK_pre_clif_pPartyTick) (int *fd, struct map_session_data **
 typedef void (*HPMHOOK_post_clif_pPartyTick) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_pGuildInvite2) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pGuildInvite2) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_cashShopBuyAck) (int *fd, struct map_session_data **sd, int *itemId, enum CASH_SHOP_BUY_RESULT *result);
+typedef void (*HPMHOOK_post_clif_cashShopBuyAck) (int fd, struct map_session_data *sd, int itemId, enum CASH_SHOP_BUY_RESULT result);
+typedef void (*HPMHOOK_pre_clif_cashShopOpen) (int *fd, struct map_session_data **sd, int *tab);
+typedef void (*HPMHOOK_post_clif_cashShopOpen) (int fd, struct map_session_data *sd, int tab);
 typedef void (*HPMHOOK_pre_clif_pPartyBookingAddFilter) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pPartyBookingAddFilter) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_pPartyBookingSubFilter) (int *fd, struct map_session_data **sd);
@@ -2514,8 +2576,10 @@ typedef void (*HPMHOOK_pre_clif_pNPCMarketPurchase) (int *fd, struct map_session
 typedef void (*HPMHOOK_post_clif_pNPCMarketPurchase) (int fd, struct map_session_data *sd);
 typedef int (*HPMHOOK_pre_clif_add_item_options) (struct ItemOptions **buf, const struct item **it);
 typedef int (*HPMHOOK_post_clif_add_item_options) (int retVal___, struct ItemOptions *buf, const struct item *it);
-typedef void (*HPMHOOK_pre_clif_pHotkeyRowShift) (int *fd, struct map_session_data **sd);
-typedef void (*HPMHOOK_post_clif_pHotkeyRowShift) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pHotkeyRowShift1) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pHotkeyRowShift1) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pHotkeyRowShift2) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pHotkeyRowShift2) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_dressroom_open) (struct map_session_data **sd, int *view);
 typedef void (*HPMHOOK_post_clif_dressroom_open) (struct map_session_data *sd, int view);
 typedef void (*HPMHOOK_pre_clif_pOneClick_ItemIdentify) (int *fd, struct map_session_data **sd);
@@ -2620,24 +2684,12 @@ typedef void (*HPMHOOK_pre_clif_pPrivateAirshipRequest) (int *fd, struct map_ses
 typedef void (*HPMHOOK_post_clif_pPrivateAirshipRequest) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_PrivateAirshipResponse) (struct map_session_data **sd, uint32 *flag);
 typedef void (*HPMHOOK_post_clif_PrivateAirshipResponse) (struct map_session_data *sd, uint32 flag);
-typedef void (*HPMHOOK_pre_clif_stylist_vector_init) (void);
-typedef void (*HPMHOOK_post_clif_stylist_vector_init) (void);
-typedef void (*HPMHOOK_pre_clif_stylist_vector_clear) (void);
-typedef void (*HPMHOOK_post_clif_stylist_vector_clear) (void);
-typedef bool (*HPMHOOK_pre_clif_stylist_read_db_libconfig) (void);
-typedef bool (*HPMHOOK_post_clif_stylist_read_db_libconfig) (bool retVal___);
-typedef bool (*HPMHOOK_pre_clif_stylist_read_db_libconfig_sub) (struct config_setting_t **it, int *idx, const char **source);
-typedef bool (*HPMHOOK_post_clif_stylist_read_db_libconfig_sub) (bool retVal___, struct config_setting_t *it, int idx, const char *source);
-typedef bool (*HPMHOOK_pre_clif_style_change_validate_requirements) (struct map_session_data **sd, int *type, int16 *idx);
-typedef bool (*HPMHOOK_post_clif_style_change_validate_requirements) (bool retVal___, struct map_session_data *sd, int type, int16 idx);
-typedef void (*HPMHOOK_pre_clif_stylist_send_rodexitem) (struct map_session_data **sd, int *itemid);
-typedef void (*HPMHOOK_post_clif_stylist_send_rodexitem) (struct map_session_data *sd, int itemid);
 typedef void (*HPMHOOK_pre_clif_pReqStyleChange) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pReqStyleChange) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_pReqStyleChange2) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pReqStyleChange2) (int fd, struct map_session_data *sd);
-typedef void (*HPMHOOK_pre_clif_cz_req_style_change_sub) (struct map_session_data **sd, int *type, int16 *idx, bool *isitem);
-typedef void (*HPMHOOK_post_clif_cz_req_style_change_sub) (struct map_session_data *sd, int type, int16 idx, bool isitem);
+typedef void (*HPMHOOK_pre_clif_pStyleClose) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pStyleClose) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_style_change_response) (struct map_session_data **sd, enum stylist_shop *flag);
 typedef void (*HPMHOOK_post_clif_style_change_response) (struct map_session_data *sd, enum stylist_shop flag);
 typedef void (*HPMHOOK_pre_clif_pPetEvolution) (int *fd, struct map_session_data **sd);
@@ -2666,8 +2718,64 @@ typedef void (*HPMHOOK_pre_clif_pNPCBarterClosed) (int *fd, struct map_session_d
 typedef void (*HPMHOOK_post_clif_pNPCBarterClosed) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_pNPCBarterPurchase) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pNPCBarterPurchase) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pNPCExpandedBarterClosed) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pNPCExpandedBarterClosed) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pNPCExpandedBarterPurchase) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pNPCExpandedBarterPurchase) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_npc_expanded_barter_open) (struct map_session_data **sd, struct npc_data **nd);
+typedef void (*HPMHOOK_post_clif_npc_expanded_barter_open) (struct map_session_data *sd, struct npc_data *nd);
 typedef void (*HPMHOOK_pre_clif_pClientVersion) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pClientVersion) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pPing) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pPing) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_ping) (struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_ping) (struct map_session_data *sd);
+typedef int (*HPMHOOK_pre_clif_pingTimer) (int *tid, int64 *tick, int *id, intptr_t *data);
+typedef int (*HPMHOOK_post_clif_pingTimer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
+typedef int (*HPMHOOK_pre_clif_pingTimerSub) (struct map_session_data **sd, va_list ap);
+typedef int (*HPMHOOK_post_clif_pingTimerSub) (int retVal___, struct map_session_data *sd, va_list ap);
+typedef void (*HPMHOOK_pre_clif_pResetCooldown) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pResetCooldown) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_loadConfirm) (struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_loadConfirm) (struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_send_selforarea) (int *fd, struct block_list **bl, const void **buf, int *len);
+typedef void (*HPMHOOK_post_clif_send_selforarea) (int fd, struct block_list *bl, const void *buf, int len);
+typedef void (*HPMHOOK_pre_clif_OpenRefineryUI) (struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_OpenRefineryUI) (struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pAddItemRefineryUI) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pAddItemRefineryUI) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_AddItemRefineryUIAck) (struct map_session_data **sd, int *item_index, struct s_refine_requirement **req);
+typedef void (*HPMHOOK_post_clif_AddItemRefineryUIAck) (struct map_session_data *sd, int item_index, struct s_refine_requirement *req);
+typedef void (*HPMHOOK_pre_clif_pRefineryUIClose) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pRefineryUIClose) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pRefineryUIRefine) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pRefineryUIRefine) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_announce_refine_status) (struct map_session_data **sd, int *item_id, int *refine_level, bool *success, enum send_target *target);
+typedef void (*HPMHOOK_post_clif_announce_refine_status) (struct map_session_data *sd, int item_id, int refine_level, bool success, enum send_target target);
+typedef void (*HPMHOOK_pre_clif_pGuildCastleTeleportRequest) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pGuildCastleTeleportRequest) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pGuildCastleInfoRequest) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pGuildCastleInfoRequest) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_guild_castleteleport_res) (struct map_session_data **sd, enum siege_teleport_result *result);
+typedef void (*HPMHOOK_post_clif_guild_castleteleport_res) (struct map_session_data *sd, enum siege_teleport_result result);
+typedef bool (*HPMHOOK_pre_clif_lapineDdukDdak_open) (struct map_session_data **sd, int *item_id);
+typedef bool (*HPMHOOK_post_clif_lapineDdukDdak_open) (bool retVal___, struct map_session_data *sd, int item_id);
+typedef bool (*HPMHOOK_pre_clif_lapineDdukDdak_result) (struct map_session_data **sd, enum lapineddukddak_result *result);
+typedef bool (*HPMHOOK_post_clif_lapineDdukDdak_result) (bool retVal___, struct map_session_data *sd, enum lapineddukddak_result result);
+typedef void (*HPMHOOK_pre_clif_plapineDdukDdak_ack) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_plapineDdukDdak_ack) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_plapineDdukDdak_close) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_plapineDdukDdak_close) (int fd, struct map_session_data *sd);
+typedef bool (*HPMHOOK_pre_clif_lapineUpgrade_open) (struct map_session_data **sd, int *item_id);
+typedef bool (*HPMHOOK_post_clif_lapineUpgrade_open) (bool retVal___, struct map_session_data *sd, int item_id);
+typedef bool (*HPMHOOK_pre_clif_lapineUpgrade_result) (struct map_session_data **sd, enum lapineUpgrade_result *result);
+typedef bool (*HPMHOOK_post_clif_lapineUpgrade_result) (bool retVal___, struct map_session_data *sd, enum lapineUpgrade_result result);
+typedef void (*HPMHOOK_pre_clif_pLapineUpgrade_close) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pLapineUpgrade_close) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pLapineUpgrade_makeItem) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pLapineUpgrade_makeItem) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pReqGearOff) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pReqGearOff) (int fd, struct map_session_data *sd);
 #endif // MAP_CLIF_H
 #ifdef COMMON_CORE_H /* cmdline */
 typedef void (*HPMHOOK_pre_cmdline_init) (void);
@@ -2756,8 +2864,8 @@ typedef void (*HPMHOOK_pre_duel_leave) (const unsigned int *did, struct map_sess
 typedef void (*HPMHOOK_post_duel_leave) (const unsigned int did, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_duel_showinfo) (const unsigned int *did, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_duel_showinfo) (const unsigned int did, struct map_session_data *sd);
-typedef int (*HPMHOOK_pre_duel_checktime) (struct map_session_data **sd);
-typedef int (*HPMHOOK_post_duel_checktime) (int retVal___, struct map_session_data *sd);
+typedef int64 (*HPMHOOK_pre_duel_difftime) (struct map_session_data **sd);
+typedef int64 (*HPMHOOK_post_duel_difftime) (int64 retVal___, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_duel_init) (bool *minimal);
 typedef void (*HPMHOOK_post_duel_init) (bool minimal);
 typedef void (*HPMHOOK_pre_duel_final) (void);
@@ -2870,8 +2978,8 @@ typedef bool (*HPMHOOK_pre_guild_isallied) (int *guild_id, int *guild_id2);
 typedef bool (*HPMHOOK_post_guild_isallied) (bool retVal___, int guild_id, int guild_id2);
 typedef struct guild* (*HPMHOOK_pre_guild_search) (int *guild_id);
 typedef struct guild* (*HPMHOOK_post_guild_search) (struct guild* retVal___, int guild_id);
-typedef struct guild* (*HPMHOOK_pre_guild_searchname) (char **str);
-typedef struct guild* (*HPMHOOK_post_guild_searchname) (struct guild* retVal___, char *str);
+typedef struct guild* (*HPMHOOK_pre_guild_searchname) (const char **str);
+typedef struct guild* (*HPMHOOK_post_guild_searchname) (struct guild* retVal___, const char *str);
 typedef struct guild_castle* (*HPMHOOK_pre_guild_castle_search) (int *gcid);
 typedef struct guild_castle* (*HPMHOOK_post_guild_castle_search) (struct guild_castle* retVal___, int gcid);
 typedef struct guild_castle* (*HPMHOOK_pre_guild_mapname2gc) (const char **mapname);
@@ -2952,8 +3060,6 @@ typedef int (*HPMHOOK_pre_guild_emblem_changed) (int *len, int *guild_id, int *e
 typedef int (*HPMHOOK_post_guild_emblem_changed) (int retVal___, int len, int guild_id, int emblem_id, const char *data);
 typedef int (*HPMHOOK_pre_guild_send_message) (struct map_session_data **sd, const char **mes);
 typedef int (*HPMHOOK_post_guild_send_message) (int retVal___, struct map_session_data *sd, const char *mes);
-typedef int (*HPMHOOK_pre_guild_recv_message) (int *guild_id, int *account_id, const char **mes, int *len);
-typedef int (*HPMHOOK_post_guild_recv_message) (int retVal___, int guild_id, int account_id, const char *mes, int len);
 typedef int (*HPMHOOK_pre_guild_send_dot_remove) (struct map_session_data **sd);
 typedef int (*HPMHOOK_post_guild_send_dot_remove) (int retVal___, struct map_session_data *sd);
 typedef int (*HPMHOOK_pre_guild_skillupack) (int *guild_id, uint16 *skill_id, int *account_id);
@@ -2998,8 +3104,12 @@ typedef struct map_session_data* (*HPMHOOK_pre_guild_sd_check) (int *guild_id, i
 typedef struct map_session_data* (*HPMHOOK_post_guild_sd_check) (struct map_session_data* retVal___, int guild_id, int account_id, int char_id);
 typedef bool (*HPMHOOK_pre_guild_read_guildskill_tree_db) (char **split[], int *columns, int *current);
 typedef bool (*HPMHOOK_post_guild_read_guildskill_tree_db) (bool retVal___, char *split[], int columns, int current);
-typedef bool (*HPMHOOK_pre_guild_read_castledb) (char **str[], int *columns, int *current);
-typedef bool (*HPMHOOK_post_guild_read_castledb) (bool retVal___, char *str[], int columns, int current);
+typedef bool (*HPMHOOK_pre_guild_read_castledb_libconfig) (void);
+typedef bool (*HPMHOOK_post_guild_read_castledb_libconfig) (bool retVal___);
+typedef bool (*HPMHOOK_pre_guild_read_castledb_libconfig_sub) (struct config_setting_t **it, int *idx, const char **source);
+typedef bool (*HPMHOOK_post_guild_read_castledb_libconfig_sub) (bool retVal___, struct config_setting_t *it, int idx, const char *source);
+typedef bool (*HPMHOOK_pre_guild_read_castledb_libconfig_sub_warp) (struct config_setting_t **wd, const char **source, struct guild_castle **gc);
+typedef bool (*HPMHOOK_post_guild_read_castledb_libconfig_sub_warp) (bool retVal___, struct config_setting_t *wd, const char *source, struct guild_castle *gc);
 typedef int (*HPMHOOK_pre_guild_payexp_timer_sub) (union DBKey *key, struct DBData **data, va_list ap);
 typedef int (*HPMHOOK_post_guild_payexp_timer_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap);
 typedef int (*HPMHOOK_pre_guild_send_xy_timer_sub) (union DBKey *key, struct DBData **data, va_list ap);
@@ -3078,8 +3188,8 @@ typedef void (*HPMHOOK_pre_homun_damaged) (struct homun_data **hd);
 typedef void (*HPMHOOK_post_homun_damaged) (struct homun_data *hd);
 typedef int (*HPMHOOK_pre_homun_dead) (struct homun_data **hd);
 typedef int (*HPMHOOK_post_homun_dead) (int retVal___, struct homun_data *hd);
-typedef int (*HPMHOOK_pre_homun_vaporize) (struct map_session_data **sd, enum homun_state *flag);
-typedef int (*HPMHOOK_post_homun_vaporize) (int retVal___, struct map_session_data *sd, enum homun_state flag);
+typedef int (*HPMHOOK_pre_homun_vaporize) (struct map_session_data **sd, enum homun_state *state, bool *force);
+typedef int (*HPMHOOK_post_homun_vaporize) (int retVal___, struct map_session_data *sd, enum homun_state state, bool force);
 typedef int (*HPMHOOK_pre_homun_delete) (struct homun_data **hd, int *emote);
 typedef int (*HPMHOOK_post_homun_delete) (int retVal___, struct homun_data *hd, int emote);
 typedef int (*HPMHOOK_pre_homun_checkskill) (struct homun_data **hd, uint16 *skill_id);
@@ -3100,6 +3210,8 @@ typedef bool (*HPMHOOK_pre_homun_mutate) (struct homun_data **hd, int *homun_id)
 typedef bool (*HPMHOOK_post_homun_mutate) (bool retVal___, struct homun_data *hd, int homun_id);
 typedef int (*HPMHOOK_pre_homun_gainexp) (struct homun_data **hd, unsigned int *exp);
 typedef int (*HPMHOOK_post_homun_gainexp) (int retVal___, struct homun_data *hd, unsigned int exp);
+typedef int (*HPMHOOK_pre_homun_gainexp_real) (struct homun_data **hd, unsigned int *exp);
+typedef int (*HPMHOOK_post_homun_gainexp_real) (int retVal___, struct homun_data *hd, unsigned int exp);
 typedef unsigned int (*HPMHOOK_pre_homun_add_intimacy) (struct homun_data **hd, unsigned int *value);
 typedef unsigned int (*HPMHOOK_post_homun_add_intimacy) (unsigned int retVal___, struct homun_data *hd, unsigned int value);
 typedef unsigned int (*HPMHOOK_pre_homun_consume_intimacy) (struct homun_data **hd, unsigned int *value);
@@ -3122,8 +3234,8 @@ typedef bool (*HPMHOOK_pre_homun_change_name_ack) (struct map_session_data **sd,
 typedef bool (*HPMHOOK_post_homun_change_name_ack) (bool retVal___, struct map_session_data *sd, const char *name, int flag);
 typedef int (*HPMHOOK_pre_homun_db_search) (int *key, int *type);
 typedef int (*HPMHOOK_post_homun_db_search) (int retVal___, int key, int type);
-typedef bool (*HPMHOOK_pre_homun_create) (struct map_session_data **sd, const struct s_homunculus **hom);
-typedef bool (*HPMHOOK_post_homun_create) (bool retVal___, struct map_session_data *sd, const struct s_homunculus *hom);
+typedef bool (*HPMHOOK_pre_homun_create) (struct map_session_data **sd, const struct s_homunculus **hom, bool *is_new);
+typedef bool (*HPMHOOK_post_homun_create) (bool retVal___, struct map_session_data *sd, const struct s_homunculus *hom, bool is_new);
 typedef void (*HPMHOOK_pre_homun_init_timers) (struct homun_data **hd);
 typedef void (*HPMHOOK_post_homun_init_timers) (struct homun_data *hd);
 typedef bool (*HPMHOOK_pre_homun_call) (struct map_session_data **sd);
@@ -3370,10 +3482,6 @@ typedef int (*HPMHOOK_pre_inter_init_sql) (const char **file);
 typedef int (*HPMHOOK_post_inter_init_sql) (int retVal___, const char *file);
 typedef int (*HPMHOOK_pre_inter_mapif_init) (int *fd);
 typedef int (*HPMHOOK_post_inter_mapif_init) (int retVal___, int fd);
-typedef int (*HPMHOOK_pre_inter_check_ttl_wisdata_sub) (union DBKey *key, struct DBData **data, va_list ap);
-typedef int (*HPMHOOK_post_inter_check_ttl_wisdata_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap);
-typedef int (*HPMHOOK_pre_inter_check_ttl_wisdata) (void);
-typedef int (*HPMHOOK_post_inter_check_ttl_wisdata) (int retVal___);
 typedef int (*HPMHOOK_pre_inter_check_length) (int *fd, int *length);
 typedef int (*HPMHOOK_post_inter_check_length) (int retVal___, int fd, int length);
 typedef int (*HPMHOOK_pre_inter_parse_frommap) (int *fd);
@@ -3390,12 +3498,6 @@ typedef void (*HPMHOOK_pre_inter_accinfo) (int *u_fd, int *aid, int *castergroup
 typedef void (*HPMHOOK_post_inter_accinfo) (int u_fd, int aid, int castergroup, const char *query, int map_fd);
 typedef void (*HPMHOOK_pre_inter_accinfo2) (bool *success, int *map_fd, int *u_fd, int *u_aid, int *account_id, const char **userid, const char **user_pass, const char **email, const char **last_ip, const char **lastlogin, const char **pin_code, const char **birthdate, int *group_id, int *logincount, int *state);
 typedef void (*HPMHOOK_post_inter_accinfo2) (bool success, int map_fd, int u_fd, int u_aid, int account_id, const char *userid, const char *user_pass, const char *email, const char *last_ip, const char *lastlogin, const char *pin_code, const char *birthdate, int group_id, int logincount, int state);
-typedef struct WisData* (*HPMHOOK_pre_inter_add_wisdata) (int *fd, const unsigned char **src, const unsigned char **dst, const unsigned char **msg, int *msg_len);
-typedef struct WisData* (*HPMHOOK_post_inter_add_wisdata) (struct WisData* retVal___, int fd, const unsigned char *src, const unsigned char *dst, const unsigned char *msg, int msg_len);
-typedef struct WisData* (*HPMHOOK_pre_inter_get_wisdata) (int *id);
-typedef struct WisData* (*HPMHOOK_post_inter_get_wisdata) (struct WisData* retVal___, int id);
-typedef void (*HPMHOOK_pre_inter_remove_wisdata) (int *id);
-typedef void (*HPMHOOK_post_inter_remove_wisdata) (int id);
 #endif // CHAR_INTER_H
 #ifdef CHAR_INT_MAIL_H /* inter_mail */
 typedef int (*HPMHOOK_pre_inter_mail_sql_init) (void);
@@ -3450,10 +3552,14 @@ typedef bool (*HPMHOOK_post_inter_mercenary_delete) (bool retVal___, int merc_id
 #ifdef CHAR_INT_PARTY_H /* inter_party */
 typedef int (*HPMHOOK_pre_inter_party_check_lv) (struct party_data **p);
 typedef int (*HPMHOOK_post_inter_party_check_lv) (int retVal___, struct party_data *p);
+typedef int (*HPMHOOK_pre_inter_party_is_family_party) (struct party_data **p);
+typedef int (*HPMHOOK_post_inter_party_is_family_party) (int retVal___, struct party_data *p);
 typedef void (*HPMHOOK_pre_inter_party_calc_state) (struct party_data **p);
 typedef void (*HPMHOOK_post_inter_party_calc_state) (struct party_data *p);
 typedef int (*HPMHOOK_pre_inter_party_tosql) (struct party **p, int *flag, int *index);
 typedef int (*HPMHOOK_post_inter_party_tosql) (int retVal___, struct party *p, int flag, int index);
+typedef int (*HPMHOOK_pre_inter_party_del_nonexistent_party) (int *party_id);
+typedef int (*HPMHOOK_post_inter_party_del_nonexistent_party) (int retVal___, int party_id);
 typedef struct party_data* (*HPMHOOK_pre_inter_party_fromsql) (int *party_id);
 typedef struct party_data* (*HPMHOOK_post_inter_party_fromsql) (struct party_data* retVal___, int party_id);
 typedef int (*HPMHOOK_pre_inter_party_sql_init) (void);
@@ -3480,8 +3586,8 @@ typedef bool (*HPMHOOK_pre_inter_party_add_member) (int *party_id, const struct
 typedef bool (*HPMHOOK_post_inter_party_add_member) (bool retVal___, int party_id, const struct party_member *member);
 typedef bool (*HPMHOOK_pre_inter_party_change_option) (int *party_id, int *account_id, int *exp, int *item, int *map_fd);
 typedef bool (*HPMHOOK_post_inter_party_change_option) (bool retVal___, int party_id, int account_id, int exp, int item, int map_fd);
-typedef bool (*HPMHOOK_pre_inter_party_change_map) (int *party_id, int *account_id, int *char_id, unsigned short *map, int *online, unsigned int *lv);
-typedef bool (*HPMHOOK_post_inter_party_change_map) (bool retVal___, int party_id, int account_id, int char_id, unsigned short map, int online, unsigned int lv);
+typedef bool (*HPMHOOK_pre_inter_party_change_map) (int *party_id, int *account_id, int *char_id, unsigned short *map, int *online, int *lv);
+typedef bool (*HPMHOOK_post_inter_party_change_map) (bool retVal___, int party_id, int account_id, int char_id, unsigned short map, int online, int lv);
 typedef bool (*HPMHOOK_pre_inter_party_disband) (int *party_id);
 typedef bool (*HPMHOOK_post_inter_party_disband) (bool retVal___, int party_id);
 typedef bool (*HPMHOOK_pre_inter_party_change_leader) (int *party_id, int *account_id, int *char_id);
@@ -3534,8 +3640,12 @@ typedef bool (*HPMHOOK_pre_inter_rodex_checkname) (const char **name, int **targ
 typedef bool (*HPMHOOK_post_inter_rodex_checkname) (bool retVal___, const char *name, int *target_char_id, int *target_class, int *target_level);
 typedef int64 (*HPMHOOK_pre_inter_rodex_savemessage) (struct rodex_message **msg);
 typedef int64 (*HPMHOOK_post_inter_rodex_savemessage) (int64 retVal___, struct rodex_message *msg);
-typedef bool (*HPMHOOK_pre_inter_rodex_updatemail) (int64 *mail_id, int8 *flag);
-typedef bool (*HPMHOOK_post_inter_rodex_updatemail) (bool retVal___, int64 mail_id, int8 flag);
+typedef bool (*HPMHOOK_pre_inter_rodex_updatemail) (int *fd, int *account_id, int *char_id, int64 *mail_id, uint8 *opentype, int8 *flag);
+typedef bool (*HPMHOOK_post_inter_rodex_updatemail) (bool retVal___, int fd, int account_id, int char_id, int64 mail_id, uint8 opentype, int8 flag);
+typedef int64 (*HPMHOOK_pre_inter_rodex_getzeny) (int64 *mail_id);
+typedef int64 (*HPMHOOK_post_inter_rodex_getzeny) (int64 retVal___, int64 mail_id);
+typedef int (*HPMHOOK_pre_inter_rodex_getitems) (int64 *mail_id, struct rodex_item **items);
+typedef int (*HPMHOOK_post_inter_rodex_getitems) (int retVal___, int64 mail_id, struct rodex_item *items);
 #endif // CHAR_INT_RODEX_H
 #ifdef CHAR_INT_STORAGE_H /* inter_storage */
 typedef int (*HPMHOOK_pre_inter_storage_tosql) (int *account_id, const struct storage_data **p);
@@ -3564,16 +3674,6 @@ typedef int (*HPMHOOK_pre_intif_parse) (int *fd);
 typedef int (*HPMHOOK_post_intif_parse) (int retVal___, int fd);
 typedef int (*HPMHOOK_pre_intif_create_pet) (int *account_id, int *char_id, int *pet_type, int *pet_lv, int *pet_egg_id, int *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, char **pet_name);
 typedef int (*HPMHOOK_post_intif_create_pet) (int retVal___, int account_id, int char_id, int pet_type, int pet_lv, int pet_egg_id, int pet_equip, short intimate, short hungry, char rename_flag, char incubate, char *pet_name);
-typedef int (*HPMHOOK_pre_intif_broadcast) (const char **mes, int *len, int *type);
-typedef int (*HPMHOOK_post_intif_broadcast) (int retVal___, const char *mes, int len, int type);
-typedef int (*HPMHOOK_pre_intif_broadcast2) (const char **mes, int *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY);
-typedef int (*HPMHOOK_post_intif_broadcast2) (int retVal___, const char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY);
-typedef int (*HPMHOOK_pre_intif_main_message) (struct map_session_data **sd, const char **message);
-typedef int (*HPMHOOK_post_intif_main_message) (int retVal___, struct map_session_data *sd, const char *message);
-typedef int (*HPMHOOK_pre_intif_wis_message) (struct map_session_data **sd, const char **nick, const char **mes, int *mes_len);
-typedef int (*HPMHOOK_post_intif_wis_message) (int retVal___, struct map_session_data *sd, const char *nick, const char *mes, int mes_len);
-typedef int (*HPMHOOK_pre_intif_wis_message_to_gm) (char **Wisp_name, int *permission, char **mes);
-typedef int (*HPMHOOK_post_intif_wis_message_to_gm) (int retVal___, char *Wisp_name, int permission, char *mes);
 typedef int (*HPMHOOK_pre_intif_saveregistry) (struct map_session_data **sd);
 typedef int (*HPMHOOK_post_intif_saveregistry) (int retVal___, struct map_session_data *sd);
 typedef int (*HPMHOOK_pre_intif_request_registry) (struct map_session_data **sd, int *flag);
@@ -3600,8 +3700,6 @@ typedef int (*HPMHOOK_pre_intif_party_changemap) (struct map_session_data **sd,
 typedef int (*HPMHOOK_post_intif_party_changemap) (int retVal___, struct map_session_data *sd, int online);
 typedef int (*HPMHOOK_pre_intif_break_party) (int *party_id);
 typedef int (*HPMHOOK_post_intif_break_party) (int retVal___, int party_id);
-typedef int (*HPMHOOK_pre_intif_party_message) (int *party_id, int *account_id, const char **mes, int *len);
-typedef int (*HPMHOOK_post_intif_party_message) (int retVal___, int party_id, int account_id, const char *mes, int len);
 typedef int (*HPMHOOK_pre_intif_party_leaderchange) (int *party_id, int *account_id, int *char_id);
 typedef int (*HPMHOOK_post_intif_party_leaderchange) (int retVal___, int party_id, int account_id, int char_id);
 typedef int (*HPMHOOK_pre_intif_guild_create) (const char **name, const struct guild_member **master);
@@ -3616,8 +3714,6 @@ typedef int (*HPMHOOK_pre_intif_guild_memberinfoshort) (int *guild_id, int *acco
 typedef int (*HPMHOOK_post_intif_guild_memberinfoshort) (int retVal___, int guild_id, int account_id, int char_id, int online, int lv, int class);
 typedef int (*HPMHOOK_pre_intif_guild_break) (int *guild_id);
 typedef int (*HPMHOOK_post_intif_guild_break) (int retVal___, int guild_id);
-typedef int (*HPMHOOK_pre_intif_guild_message) (int *guild_id, int *account_id, const char **mes, int *len);
-typedef int (*HPMHOOK_post_intif_guild_message) (int retVal___, int guild_id, int account_id, const char *mes, int len);
 typedef int (*HPMHOOK_pre_intif_guild_change_gm) (int *guild_id, const char **name, int *len);
 typedef int (*HPMHOOK_post_intif_guild_change_gm) (int retVal___, int guild_id, const char *name, int len);
 typedef int (*HPMHOOK_pre_intif_guild_change_basicinfo) (int *guild_id, int *type, const void **data, int *len);
@@ -3702,12 +3798,16 @@ typedef int (*HPMHOOK_pre_intif_rodex_requestinbox) (int *char_id, int *account_
 typedef int (*HPMHOOK_post_intif_rodex_requestinbox) (int retVal___, int char_id, int account_id, int8 flag, int8 opentype, int64 mail_id);
 typedef int (*HPMHOOK_pre_intif_rodex_checkhasnew) (struct map_session_data **sd);
 typedef int (*HPMHOOK_post_intif_rodex_checkhasnew) (int retVal___, struct map_session_data *sd);
-typedef int (*HPMHOOK_pre_intif_rodex_updatemail) (int64 *mail_id, int8 *flag);
-typedef int (*HPMHOOK_post_intif_rodex_updatemail) (int retVal___, int64 mail_id, int8 flag);
+typedef int (*HPMHOOK_pre_intif_rodex_updatemail) (struct map_session_data **sd, int64 *mail_id, uint8 *opentype, int8 *flag);
+typedef int (*HPMHOOK_post_intif_rodex_updatemail) (int retVal___, struct map_session_data *sd, int64 mail_id, uint8 opentype, int8 flag);
 typedef int (*HPMHOOK_pre_intif_rodex_sendmail) (struct rodex_message **msg);
 typedef int (*HPMHOOK_post_intif_rodex_sendmail) (int retVal___, struct rodex_message *msg);
 typedef int (*HPMHOOK_pre_intif_rodex_checkname) (struct map_session_data **sd, const char **name);
 typedef int (*HPMHOOK_post_intif_rodex_checkname) (int retVal___, struct map_session_data *sd, const char *name);
+typedef void (*HPMHOOK_pre_intif_pGetZenyAck) (int *fd);
+typedef void (*HPMHOOK_post_intif_pGetZenyAck) (int fd);
+typedef void (*HPMHOOK_pre_intif_pGetItemsAck) (int *fd);
+typedef void (*HPMHOOK_post_intif_pGetItemsAck) (int fd);
 typedef int (*HPMHOOK_pre_intif_clan_kickoffline) (int *clan_id, int *kick_interval);
 typedef int (*HPMHOOK_post_intif_clan_kickoffline) (int retVal___, int clan_id, int kick_interval);
 typedef int (*HPMHOOK_pre_intif_clan_membercount) (int *clan_id, int *kick_interval);
@@ -3720,14 +3820,6 @@ typedef void (*HPMHOOK_pre_intif_achievements_request) (struct map_session_data
 typedef void (*HPMHOOK_post_intif_achievements_request) (struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_intif_achievements_save) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_intif_achievements_save) (struct map_session_data *sd);
-typedef void (*HPMHOOK_pre_intif_pWisMessage) (int *fd);
-typedef void (*HPMHOOK_post_intif_pWisMessage) (int fd);
-typedef void (*HPMHOOK_pre_intif_pWisEnd) (int *fd);
-typedef void (*HPMHOOK_post_intif_pWisEnd) (int fd);
-typedef int (*HPMHOOK_pre_intif_pWisToGM_sub) (struct map_session_data **sd, va_list va);
-typedef int (*HPMHOOK_post_intif_pWisToGM_sub) (int retVal___, struct map_session_data *sd, va_list va);
-typedef void (*HPMHOOK_pre_intif_pWisToGM) (int *fd);
-typedef void (*HPMHOOK_post_intif_pWisToGM) (int fd);
 typedef void (*HPMHOOK_pre_intif_pRegisters) (int *fd);
 typedef void (*HPMHOOK_post_intif_pRegisters) (int fd);
 typedef void (*HPMHOOK_pre_intif_pAccountStorage) (int *fd);
@@ -3756,8 +3848,6 @@ typedef void (*HPMHOOK_pre_intif_pPartyMove) (int *fd);
 typedef void (*HPMHOOK_post_intif_pPartyMove) (int fd);
 typedef void (*HPMHOOK_pre_intif_pPartyBroken) (int *fd);
 typedef void (*HPMHOOK_post_intif_pPartyBroken) (int fd);
-typedef void (*HPMHOOK_pre_intif_pPartyMessage) (int *fd);
-typedef void (*HPMHOOK_post_intif_pPartyMessage) (int fd);
 typedef void (*HPMHOOK_pre_intif_pGuildCreated) (int *fd);
 typedef void (*HPMHOOK_post_intif_pGuildCreated) (int fd);
 typedef void (*HPMHOOK_pre_intif_pGuildInfo) (int *fd);
@@ -3770,8 +3860,6 @@ typedef void (*HPMHOOK_pre_intif_pGuildMemberInfoShort) (int *fd);
 typedef void (*HPMHOOK_post_intif_pGuildMemberInfoShort) (int fd);
 typedef void (*HPMHOOK_pre_intif_pGuildBroken) (int *fd);
 typedef void (*HPMHOOK_post_intif_pGuildBroken) (int fd);
-typedef void (*HPMHOOK_pre_intif_pGuildMessage) (int *fd);
-typedef void (*HPMHOOK_post_intif_pGuildMessage) (int fd);
 typedef void (*HPMHOOK_pre_intif_pGuildBasicInfoChanged) (int *fd);
 typedef void (*HPMHOOK_post_intif_pGuildBasicInfoChanged) (int fd);
 typedef void (*HPMHOOK_pre_intif_pGuildMemberInfoChanged) (int *fd);
@@ -3946,8 +4034,8 @@ typedef struct item_data* (*HPMHOOK_pre_itemdb_name2id) (const char **str);
 typedef struct item_data* (*HPMHOOK_post_itemdb_name2id) (struct item_data* retVal___, const char *str);
 typedef struct item_data* (*HPMHOOK_pre_itemdb_search_name) (const char **name);
 typedef struct item_data* (*HPMHOOK_post_itemdb_search_name) (struct item_data* retVal___, const char *name);
-typedef int (*HPMHOOK_pre_itemdb_search_name_array) (struct item_data ***data, int *size, const char **str, int *flag);
-typedef int (*HPMHOOK_post_itemdb_search_name_array) (int retVal___, struct item_data **data, int size, const char *str, int flag);
+typedef int (*HPMHOOK_pre_itemdb_search_name_array) (struct item_data ***data, const int *size, const char **str, enum item_name_search_flag *flag);
+typedef int (*HPMHOOK_post_itemdb_search_name_array) (int retVal___, struct item_data **data, const int size, const char *str, enum item_name_search_flag flag);
 typedef struct item_data* (*HPMHOOK_pre_itemdb_load) (int *nameid);
 typedef struct item_data* (*HPMHOOK_post_itemdb_load) (struct item_data* retVal___, int nameid);
 typedef struct item_data* (*HPMHOOK_pre_itemdb_search) (int *nameid);
@@ -4012,10 +4100,10 @@ typedef int (*HPMHOOK_pre_itemdb_isidentified) (int *nameid);
 typedef int (*HPMHOOK_post_itemdb_isidentified) (int retVal___, int nameid);
 typedef int (*HPMHOOK_pre_itemdb_isidentified2) (struct item_data **data);
 typedef int (*HPMHOOK_post_itemdb_isidentified2) (int retVal___, struct item_data *data);
-typedef int (*HPMHOOK_pre_itemdb_combo_split_atoi) (char **str, int **val);
-typedef int (*HPMHOOK_post_itemdb_combo_split_atoi) (int retVal___, char *str, int *val);
-typedef void (*HPMHOOK_pre_itemdb_read_combos) (void);
-typedef void (*HPMHOOK_post_itemdb_read_combos) (void);
+typedef bool (*HPMHOOK_pre_itemdb_read_combodb_libconfig) (void);
+typedef bool (*HPMHOOK_post_itemdb_read_combodb_libconfig) (bool retVal___);
+typedef bool (*HPMHOOK_pre_itemdb_read_combodb_libconfig_sub) (struct config_setting_t **it, int *idx, const char **source);
+typedef bool (*HPMHOOK_post_itemdb_read_combodb_libconfig_sub) (bool retVal___, struct config_setting_t *it, int idx, const char *source);
 typedef int (*HPMHOOK_pre_itemdb_gendercheck) (struct item_data **id);
 typedef int (*HPMHOOK_post_itemdb_gendercheck) (int retVal___, struct item_data *id);
 typedef int (*HPMHOOK_pre_itemdb_validate_entry) (struct item_data **entry, int *n, const char **source);
@@ -4052,6 +4140,12 @@ typedef bool (*HPMHOOK_pre_itemdb_lookup_const_mask) (const struct config_settin
 typedef bool (*HPMHOOK_post_itemdb_lookup_const_mask) (bool retVal___, const struct config_setting_t *it, const char *name, int *value);
 typedef int (*HPMHOOK_pre_itemdb_addname_sub) (union DBKey *key, struct DBData **data, va_list ap);
 typedef int (*HPMHOOK_post_itemdb_addname_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap);
+typedef bool (*HPMHOOK_pre_itemdb_read_libconfig_lapineddukddak) (void);
+typedef bool (*HPMHOOK_post_itemdb_read_libconfig_lapineddukddak) (bool retVal___);
+typedef bool (*HPMHOOK_pre_itemdb_read_libconfig_lapineddukddak_sub) (struct config_setting_t **it, const char **source);
+typedef bool (*HPMHOOK_post_itemdb_read_libconfig_lapineddukddak_sub) (bool retVal___, struct config_setting_t *it, const char *source);
+typedef bool (*HPMHOOK_pre_itemdb_read_libconfig_lapineddukddak_sub_sources) (struct config_setting_t **sources, struct item_data **data);
+typedef bool (*HPMHOOK_post_itemdb_read_libconfig_lapineddukddak_sub_sources) (bool retVal___, struct config_setting_t *sources, struct item_data *data);
 #endif // MAP_ITEMDB_H
 #ifdef LOGIN_LOGIN_H /* lchrif */
 typedef void (*HPMHOOK_pre_lchrif_server_init) (int *id);
@@ -4120,6 +4214,10 @@ typedef enum parsefunc_rcode (*HPMHOOK_pre_PRIV__lclif_parse_CA_CHARSERVERCONNEC
 typedef enum parsefunc_rcode (*HPMHOOK_post_PRIV__lclif_parse_CA_CHARSERVERCONNECT) (enum parsefunc_rcode retVal___, int fd, struct login_session_data *sd);
 #endif // LOGIN_LCLIF_P_H
 #ifdef COMMON_CONF_H /* libconfig */
+typedef void (*HPMHOOK_pre_libconfig_set_db_path) (const char **db_path);
+typedef void (*HPMHOOK_post_libconfig_set_db_path) (const char *db_path);
+typedef void (*HPMHOOK_pre_libconfig_format_db_path) (const char **filename, char **path_buf, int *buffer_len);
+typedef void (*HPMHOOK_post_libconfig_format_db_path) (const char *filename, char *path_buf, int buffer_len);
 typedef int (*HPMHOOK_pre_libconfig_read) (struct config_t **config, FILE **stream);
 typedef int (*HPMHOOK_post_libconfig_read) (int retVal___, struct config_t *config, FILE *stream);
 typedef void (*HPMHOOK_pre_libconfig_write) (const struct config_t **config, FILE **stream);
@@ -4300,8 +4398,8 @@ typedef char (*HPMHOOK_pre_logs_picktype2char) (e_log_pick_type *type);
 typedef char (*HPMHOOK_post_logs_picktype2char) (char retVal___, e_log_pick_type type);
 typedef char (*HPMHOOK_pre_logs_chattype2char) (e_log_chat_type *type);
 typedef char (*HPMHOOK_post_logs_chattype2char) (char retVal___, e_log_chat_type type);
-typedef bool (*HPMHOOK_pre_logs_should_log_item) (int *nameid, int *amount, int *refine, struct item_data **id);
-typedef bool (*HPMHOOK_post_logs_should_log_item) (bool retVal___, int nameid, int amount, int refine, struct item_data *id);
+typedef bool (*HPMHOOK_pre_logs_should_log_item) (int *nameid, int *amount, int *refine_level, struct item_data **id);
+typedef bool (*HPMHOOK_post_logs_should_log_item) (bool retVal___, int nameid, int amount, int refine_level, struct item_data *id);
 #endif // MAP_LOG_H
 #ifdef LOGIN_LOGIN_H /* login */
 typedef int (*HPMHOOK_pre_login_mmo_auth) (struct login_session_data **sd, bool *isServer);
@@ -4638,8 +4736,8 @@ typedef void (*HPMHOOK_pre_map_addiddb) (struct block_list **bl);
 typedef void (*HPMHOOK_post_map_addiddb) (struct block_list *bl);
 typedef void (*HPMHOOK_pre_map_deliddb) (struct block_list **bl);
 typedef void (*HPMHOOK_post_map_deliddb) (struct block_list *bl);
-typedef struct map_session_data* (*HPMHOOK_pre_map_nick2sd) (const char **nick);
-typedef struct map_session_data* (*HPMHOOK_post_map_nick2sd) (struct map_session_data* retVal___, const char *nick);
+typedef struct map_session_data* (*HPMHOOK_pre_map_nick2sd) (const char **nick, bool *allow_partial);
+typedef struct map_session_data* (*HPMHOOK_post_map_nick2sd) (struct map_session_data* retVal___, const char *nick, bool allow_partial);
 typedef struct mob_data* (*HPMHOOK_pre_map_getmob_boss) (int16 *m);
 typedef struct mob_data* (*HPMHOOK_post_map_getmob_boss) (struct mob_data* retVal___, int16 m);
 typedef struct mob_data* (*HPMHOOK_pre_map_id2boss) (int *id);
@@ -4648,10 +4746,10 @@ typedef uint32 (*HPMHOOK_pre_map_race_id2mask) (int *race);
 typedef uint32 (*HPMHOOK_post_map_race_id2mask) (uint32 retVal___, int race);
 typedef void (*HPMHOOK_pre_map_reloadnpc) (bool *clear);
 typedef void (*HPMHOOK_post_map_reloadnpc) (bool clear);
-typedef int (*HPMHOOK_pre_map_check_dir) (int *s_dir, int *t_dir);
-typedef int (*HPMHOOK_post_map_check_dir) (int retVal___, int s_dir, int t_dir);
-typedef uint8 (*HPMHOOK_pre_map_calc_dir) (struct block_list **src, int16 *x, int16 *y);
-typedef uint8 (*HPMHOOK_post_map_calc_dir) (uint8 retVal___, struct block_list *src, int16 x, int16 y);
+typedef int (*HPMHOOK_pre_map_check_dir) (enum unit_dir *s_dir, enum unit_dir *t_dir);
+typedef int (*HPMHOOK_post_map_check_dir) (int retVal___, enum unit_dir s_dir, enum unit_dir t_dir);
+typedef enum unit_dir (*HPMHOOK_pre_map_calc_dir) (const struct block_list **src, int16 *x, int16 *y);
+typedef enum unit_dir (*HPMHOOK_post_map_calc_dir) (enum unit_dir retVal___, const struct block_list *src, int16 x, int16 y);
 typedef int (*HPMHOOK_pre_map_random_dir) (struct block_list **bl, short **x, short **y);
 typedef int (*HPMHOOK_post_map_random_dir) (int retVal___, struct block_list *bl, short *x, short *y);
 typedef int (*HPMHOOK_pre_map_cleanup_sub) (struct block_list **bl, va_list ap);
@@ -4762,8 +4860,8 @@ typedef void (*HPMHOOK_pre_map_update_cell_bl) (struct block_list **bl, bool *in
 typedef void (*HPMHOOK_post_map_update_cell_bl) (struct block_list *bl, bool increase);
 typedef int (*HPMHOOK_pre_map_get_new_bonus_id) (void);
 typedef int (*HPMHOOK_post_map_get_new_bonus_id) (int retVal___);
-typedef void (*HPMHOOK_pre_map_add_questinfo) (int *m, struct questinfo **qi);
-typedef void (*HPMHOOK_post_map_add_questinfo) (int m, struct questinfo *qi);
+typedef bool (*HPMHOOK_pre_map_add_questinfo) (int *m, struct npc_data **nd);
+typedef bool (*HPMHOOK_post_map_add_questinfo) (bool retVal___, int m, struct npc_data *nd);
 typedef bool (*HPMHOOK_pre_map_remove_questinfo) (int *m, struct npc_data **nd);
 typedef bool (*HPMHOOK_post_map_remove_questinfo) (bool retVal___, int m, struct npc_data *nd);
 typedef struct map_zone_data* (*HPMHOOK_pre_map_merge_zone) (struct map_zone_data **main, struct map_zone_data **other);
@@ -4854,8 +4952,6 @@ typedef int (*HPMHOOK_pre_mapif_guild_memberinfoshort) (struct guild **g, int *i
 typedef int (*HPMHOOK_post_mapif_guild_memberinfoshort) (int retVal___, struct guild *g, int idx);
 typedef int (*HPMHOOK_pre_mapif_guild_broken) (int *guild_id, int *flag);
 typedef int (*HPMHOOK_post_mapif_guild_broken) (int retVal___, int guild_id, int flag);
-typedef int (*HPMHOOK_pre_mapif_guild_message) (int *guild_id, int *account_id, const char **mes, int *len, int *sfd);
-typedef int (*HPMHOOK_post_mapif_guild_message) (int retVal___, int guild_id, int account_id, const char *mes, int len, int sfd);
 typedef int (*HPMHOOK_pre_mapif_guild_basicinfochanged) (int *guild_id, int *type, const void **data, int *len);
 typedef int (*HPMHOOK_post_mapif_guild_basicinfochanged) (int retVal___, int guild_id, int type, const void *data, int len);
 typedef int (*HPMHOOK_pre_mapif_guild_memberinfochanged) (int *guild_id, int *account_id, int *char_id, int *type, const void **data, int *len);
@@ -4886,8 +4982,6 @@ typedef int (*HPMHOOK_pre_mapif_parse_GuildChangeMemberInfoShort) (int *fd, int
 typedef int (*HPMHOOK_post_mapif_parse_GuildChangeMemberInfoShort) (int retVal___, int fd, int guild_id, int account_id, int char_id, int online, int lv, int class);
 typedef int (*HPMHOOK_pre_mapif_parse_BreakGuild) (int *fd, int *guild_id);
 typedef int (*HPMHOOK_post_mapif_parse_BreakGuild) (int retVal___, int fd, int guild_id);
-typedef int (*HPMHOOK_pre_mapif_parse_GuildMessage) (int *fd, int *guild_id, int *account_id, const char **mes, int *len);
-typedef int (*HPMHOOK_post_mapif_parse_GuildMessage) (int retVal___, int fd, int guild_id, int account_id, const char *mes, int len);
 typedef int (*HPMHOOK_pre_mapif_parse_GuildBasicInfoChange) (int *fd, int *guild_id, int *type, const void **data, int *len);
 typedef int (*HPMHOOK_post_mapif_parse_GuildBasicInfoChange) (int retVal___, int fd, int guild_id, int type, const void *data, int len);
 typedef int (*HPMHOOK_pre_mapif_parse_GuildMemberInfoChange) (int *fd, int *guild_id, int *account_id, int *char_id, int *type, const char **data, int *len);
@@ -4982,8 +5076,6 @@ typedef int (*HPMHOOK_pre_mapif_party_membermoved) (struct party **p, int *idx);
 typedef int (*HPMHOOK_post_mapif_party_membermoved) (int retVal___, struct party *p, int idx);
 typedef int (*HPMHOOK_pre_mapif_party_broken) (int *party_id, int *flag);
 typedef int (*HPMHOOK_post_mapif_party_broken) (int retVal___, int party_id, int flag);
-typedef int (*HPMHOOK_pre_mapif_party_message) (int *party_id, int *account_id, const char **mes, int *len, int *sfd);
-typedef int (*HPMHOOK_post_mapif_party_message) (int retVal___, int party_id, int account_id, const char *mes, int len, int sfd);
 typedef int (*HPMHOOK_pre_mapif_parse_CreateParty) (int *fd, const char **name, int *item, int *item2, const struct party_member **leader);
 typedef int (*HPMHOOK_post_mapif_parse_CreateParty) (int retVal___, int fd, const char *name, int item, int item2, const struct party_member *leader);
 typedef void (*HPMHOOK_pre_mapif_parse_PartyInfo) (int *fd, int *party_id, int *char_id);
@@ -4998,8 +5090,6 @@ typedef int (*HPMHOOK_pre_mapif_parse_PartyChangeMap) (int *fd, int *party_id, i
 typedef int (*HPMHOOK_post_mapif_parse_PartyChangeMap) (int retVal___, int fd, int party_id, int account_id, int char_id, unsigned short map, int online, unsigned int lv);
 typedef int (*HPMHOOK_pre_mapif_parse_BreakParty) (int *fd, int *party_id);
 typedef int (*HPMHOOK_post_mapif_parse_BreakParty) (int retVal___, int fd, int party_id);
-typedef int (*HPMHOOK_pre_mapif_parse_PartyMessage) (int *fd, int *party_id, int *account_id, const char **mes, int *len);
-typedef int (*HPMHOOK_post_mapif_parse_PartyMessage) (int retVal___, int fd, int party_id, int account_id, const char *mes, int len);
 typedef int (*HPMHOOK_pre_mapif_parse_PartyLeaderChange) (int *fd, int *party_id, int *account_id, int *char_id);
 typedef int (*HPMHOOK_post_mapif_parse_PartyLeaderChange) (int retVal___, int fd, int party_id, int account_id, int char_id);
 typedef int (*HPMHOOK_pre_mapif_pet_created) (int *fd, int *account_id, struct s_pet **p);
@@ -5050,6 +5140,10 @@ typedef void (*HPMHOOK_pre_mapif_parse_rodex_checkname) (int *fd);
 typedef void (*HPMHOOK_post_mapif_parse_rodex_checkname) (int fd);
 typedef void (*HPMHOOK_pre_mapif_rodex_checkname) (int *fd, int *reqchar_id, int *target_char_id, int *target_class, int *target_level, char **name);
 typedef void (*HPMHOOK_post_mapif_rodex_checkname) (int fd, int reqchar_id, int target_char_id, int target_class, int target_level, char *name);
+typedef void (*HPMHOOK_pre_mapif_rodex_getzenyack) (int *fd, int *char_id, int64 *mail_id, uint8 *opentype, int64 *zeny);
+typedef void (*HPMHOOK_post_mapif_rodex_getzenyack) (int fd, int char_id, int64 mail_id, uint8 opentype, int64 zeny);
+typedef void (*HPMHOOK_pre_mapif_rodex_getitemsack) (int *fd, int *char_id, int64 *mail_id, uint8 *opentype, int *count, const struct rodex_item **items);
+typedef void (*HPMHOOK_post_mapif_rodex_getitemsack) (int fd, int char_id, int64 mail_id, uint8 opentype, int count, const struct rodex_item *items);
 typedef int (*HPMHOOK_pre_mapif_load_guild_storage) (int *fd, int *account_id, int *guild_id, char *flag);
 typedef int (*HPMHOOK_post_mapif_load_guild_storage) (int retVal___, int fd, int account_id, int guild_id, char flag);
 typedef int (*HPMHOOK_pre_mapif_save_guild_storage_ack) (int *fd, int *account_id, int *guild_id, int *fail);
@@ -5072,26 +5166,10 @@ typedef void (*HPMHOOK_pre_mapif_parse_ItemBoundRetrieve) (int *fd);
 typedef void (*HPMHOOK_post_mapif_parse_ItemBoundRetrieve) (int fd);
 typedef void (*HPMHOOK_pre_mapif_parse_accinfo) (int *fd);
 typedef void (*HPMHOOK_post_mapif_parse_accinfo) (int fd);
-typedef int (*HPMHOOK_pre_mapif_broadcast) (const unsigned char **mes, int *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, int *sfd);
-typedef int (*HPMHOOK_post_mapif_broadcast) (int retVal___, const unsigned char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, int sfd);
-typedef int (*HPMHOOK_pre_mapif_wis_message) (struct WisData **wd);
-typedef int (*HPMHOOK_post_mapif_wis_message) (int retVal___, struct WisData *wd);
-typedef void (*HPMHOOK_pre_mapif_wis_response) (int *fd, const unsigned char **src, int *flag);
-typedef void (*HPMHOOK_post_mapif_wis_response) (int fd, const unsigned char *src, int flag);
-typedef int (*HPMHOOK_pre_mapif_wis_end) (struct WisData **wd, int *flag);
-typedef int (*HPMHOOK_post_mapif_wis_end) (int retVal___, struct WisData *wd, int flag);
 typedef int (*HPMHOOK_pre_mapif_account_reg_reply) (int *fd, int *account_id, int *char_id, int *type);
 typedef int (*HPMHOOK_post_mapif_account_reg_reply) (int retVal___, int fd, int account_id, int char_id, int type);
 typedef int (*HPMHOOK_pre_mapif_disconnectplayer) (int *fd, int *account_id, int *char_id, int *reason);
 typedef int (*HPMHOOK_post_mapif_disconnectplayer) (int retVal___, int fd, int account_id, int char_id, int reason);
-typedef int (*HPMHOOK_pre_mapif_parse_broadcast) (int *fd);
-typedef int (*HPMHOOK_post_mapif_parse_broadcast) (int retVal___, int fd);
-typedef int (*HPMHOOK_pre_mapif_parse_WisRequest) (int *fd);
-typedef int (*HPMHOOK_post_mapif_parse_WisRequest) (int retVal___, int fd);
-typedef int (*HPMHOOK_pre_mapif_parse_WisReply) (int *fd);
-typedef int (*HPMHOOK_post_mapif_parse_WisReply) (int retVal___, int fd);
-typedef int (*HPMHOOK_pre_mapif_parse_WisToGM) (int *fd);
-typedef int (*HPMHOOK_post_mapif_parse_WisToGM) (int retVal___, int fd);
 typedef int (*HPMHOOK_pre_mapif_parse_Registry) (int *fd);
 typedef int (*HPMHOOK_post_mapif_parse_Registry) (int retVal___, int fd);
 typedef int (*HPMHOOK_pre_mapif_parse_RegistryRequest) (int *fd);
@@ -5106,6 +5184,10 @@ typedef int (*HPMHOOK_pre_mapif_parse_ClanMemberCount) (int *fd, int *clan_id, i
 typedef int (*HPMHOOK_post_mapif_parse_ClanMemberCount) (int retVal___, int fd, int clan_id, int kick_interval);
 #endif // CHAR_MAPIF_H
 #ifdef COMMON_MAPINDEX_H /* mapindex */
+typedef bool (*HPMHOOK_pre_mapindex_config_read_dbpath) (const char **filename, const struct config_t **config);
+typedef bool (*HPMHOOK_post_mapindex_config_read_dbpath) (bool retVal___, const char *filename, const struct config_t *config);
+typedef bool (*HPMHOOK_pre_mapindex_config_read) (void);
+typedef bool (*HPMHOOK_post_mapindex_config_read) (bool retVal___);
 typedef int (*HPMHOOK_pre_mapindex_init) (void);
 typedef int (*HPMHOOK_post_mapindex_init) (int retVal___);
 typedef void (*HPMHOOK_pre_mapindex_final) (void);
@@ -5234,6 +5316,8 @@ typedef int (*HPMHOOK_pre_mob_final) (void);
 typedef int (*HPMHOOK_post_mob_final) (int retVal___);
 typedef void (*HPMHOOK_pre_mob_reload) (void);
 typedef void (*HPMHOOK_post_mob_reload) (void);
+typedef int (*HPMHOOK_pre_mob_reload_sub_mob) (struct mob_data **md, va_list args);
+typedef int (*HPMHOOK_post_mob_reload_sub_mob) (int retVal___, struct mob_data *md, va_list args);
 typedef struct mob_db* (*HPMHOOK_pre_mob_db) (int *index);
 typedef struct mob_db* (*HPMHOOK_post_mob_db) (struct mob_db* retVal___, int index);
 typedef struct mob_chat* (*HPMHOOK_pre_mob_chat) (short *id);
@@ -5264,22 +5348,22 @@ typedef struct view_data* (*HPMHOOK_pre_mob_get_viewdata) (int *class_);
 typedef struct view_data* (*HPMHOOK_post_mob_get_viewdata) (struct view_data* retVal___, int class_);
 typedef int (*HPMHOOK_pre_mob_parse_dataset) (struct spawn_data **data);
 typedef int (*HPMHOOK_post_mob_parse_dataset) (int retVal___, struct spawn_data *data);
-typedef struct mob_data* (*HPMHOOK_pre_mob_spawn_dataset) (struct spawn_data **data);
-typedef struct mob_data* (*HPMHOOK_post_mob_spawn_dataset) (struct mob_data* retVal___, struct spawn_data *data);
+typedef struct mob_data* (*HPMHOOK_pre_mob_spawn_dataset) (struct spawn_data **data, int *npc_id);
+typedef struct mob_data* (*HPMHOOK_post_mob_spawn_dataset) (struct mob_data* retVal___, struct spawn_data *data, int npc_id);
 typedef int (*HPMHOOK_pre_mob_get_random_id) (int *type, int *flag, int *lv);
 typedef int (*HPMHOOK_post_mob_get_random_id) (int retVal___, int type, int flag, int lv);
 typedef bool (*HPMHOOK_pre_mob_ksprotected) (struct block_list **src, struct block_list **target);
 typedef bool (*HPMHOOK_post_mob_ksprotected) (bool retVal___, struct block_list *src, struct block_list *target);
-typedef struct mob_data* (*HPMHOOK_pre_mob_once_spawn_sub) (struct block_list **bl, int16 *m, int16 *x, int16 *y, const char **mobname, int *class_, const char **event, unsigned int *size, unsigned int *ai);
-typedef struct mob_data* (*HPMHOOK_post_mob_once_spawn_sub) (struct mob_data* retVal___, struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int class_, const char *event, unsigned int size, unsigned int ai);
+typedef struct mob_data* (*HPMHOOK_pre_mob_once_spawn_sub) (struct block_list **bl, int16 *m, int16 *x, int16 *y, const char **mobname, int *class_, const char **event, unsigned int *size, unsigned int *ai, int *npc_id);
+typedef struct mob_data* (*HPMHOOK_post_mob_once_spawn_sub) (struct mob_data* retVal___, struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int class_, const char *event, unsigned int size, unsigned int ai, int npc_id);
 typedef int (*HPMHOOK_pre_mob_once_spawn) (struct map_session_data **sd, int16 *m, int16 *x, int16 *y, const char **mobname, int *class_, int *amount, const char **event, unsigned int *size, unsigned int *ai);
 typedef int (*HPMHOOK_post_mob_once_spawn) (int retVal___, struct map_session_data *sd, int16 m, int16 x, int16 y, const char *mobname, int class_, int amount, const char *event, unsigned int size, unsigned int ai);
 typedef int (*HPMHOOK_pre_mob_once_spawn_area) (struct map_session_data **sd, int16 *m, int16 *x0, int16 *y0, int16 *x1, int16 *y1, const char **mobname, int *class_, int *amount, const char **event, unsigned int *size, unsigned int *ai);
 typedef int (*HPMHOOK_post_mob_once_spawn_area) (int retVal___, struct map_session_data *sd, int16 m, int16 x0, int16 y0, int16 x1, int16 y1, const char *mobname, int class_, int amount, const char *event, unsigned int size, unsigned int ai);
-typedef int (*HPMHOOK_pre_mob_spawn_guardian) (const char **mapname, short *x, short *y, const char **mobname, int *class_, const char **event, int *guardian, bool *has_index);
-typedef int (*HPMHOOK_post_mob_spawn_guardian) (int retVal___, const char *mapname, short x, short y, const char *mobname, int class_, const char *event, int guardian, bool has_index);
-typedef int (*HPMHOOK_pre_mob_spawn_bg) (const char **mapname, short *x, short *y, const char **mobname, int *class_, const char **event, unsigned int *bg_id);
-typedef int (*HPMHOOK_post_mob_spawn_bg) (int retVal___, const char *mapname, short x, short y, const char *mobname, int class_, const char *event, unsigned int bg_id);
+typedef int (*HPMHOOK_pre_mob_spawn_guardian) (const char **mapname, short *x, short *y, const char **mobname, int *class_, const char **event, int *guardian, bool *has_index, int *npc_id);
+typedef int (*HPMHOOK_post_mob_spawn_guardian) (int retVal___, const char *mapname, short x, short y, const char *mobname, int class_, const char *event, int guardian, bool has_index, int npc_id);
+typedef int (*HPMHOOK_pre_mob_spawn_bg) (const char **mapname, short *x, short *y, const char **mobname, int *class_, const char **event, unsigned int *bg_id, int *npc_id);
+typedef int (*HPMHOOK_post_mob_spawn_bg) (int retVal___, const char *mapname, short x, short y, const char *mobname, int class_, const char *event, unsigned int bg_id, int npc_id);
 typedef int (*HPMHOOK_pre_mob_can_reach) (struct mob_data **md, struct block_list **bl, int *range, int *state);
 typedef int (*HPMHOOK_post_mob_can_reach) (int retVal___, struct mob_data *md, struct block_list *bl, int range, int state);
 typedef int (*HPMHOOK_pre_mob_linksearch) (struct block_list **bl, va_list ap);
@@ -5306,6 +5390,8 @@ typedef int (*HPMHOOK_pre_mob_ai_sub_hard_lootsearch) (struct block_list **bl, v
 typedef int (*HPMHOOK_post_mob_ai_sub_hard_lootsearch) (int retVal___, struct block_list *bl, va_list ap);
 typedef int (*HPMHOOK_pre_mob_warpchase_sub) (struct block_list **bl, va_list ap);
 typedef int (*HPMHOOK_post_mob_warpchase_sub) (int retVal___, struct block_list *bl, va_list ap);
+typedef bool (*HPMHOOK_pre_mob_is_in_battle_state) (const struct mob_data **md);
+typedef bool (*HPMHOOK_post_mob_is_in_battle_state) (bool retVal___, const struct mob_data *md);
 typedef int (*HPMHOOK_pre_mob_ai_sub_hard_slavemob) (struct mob_data **md, int64 *tick);
 typedef int (*HPMHOOK_post_mob_ai_sub_hard_slavemob) (int retVal___, struct mob_data *md, int64 tick);
 typedef int (*HPMHOOK_pre_mob_unlocktarget) (struct mob_data **md, int64 *tick);
@@ -5326,8 +5412,10 @@ typedef int (*HPMHOOK_pre_mob_ai_lazy) (int *tid, int64 *tick, int *id, intptr_t
 typedef int (*HPMHOOK_post_mob_ai_lazy) (int retVal___, int tid, int64 tick, int id, intptr_t data);
 typedef int (*HPMHOOK_pre_mob_ai_hard) (int *tid, int64 *tick, int *id, intptr_t *data);
 typedef int (*HPMHOOK_post_mob_ai_hard) (int retVal___, int tid, int64 tick, int id, intptr_t data);
-typedef struct item_drop* (*HPMHOOK_pre_mob_setdropitem) (int *nameid, int *qty, struct item_data **data);
-typedef struct item_drop* (*HPMHOOK_post_mob_setdropitem) (struct item_drop* retVal___, int nameid, int qty, struct item_data *data);
+typedef void (*HPMHOOK_pre_mob_setdropitem_options) (struct item **item, struct optdrop_group **options);
+typedef void (*HPMHOOK_post_mob_setdropitem_options) (struct item *item, struct optdrop_group *options);
+typedef struct item_drop* (*HPMHOOK_pre_mob_setdropitem) (int *nameid, struct optdrop_group **options, int *qty, struct item_data **data);
+typedef struct item_drop* (*HPMHOOK_post_mob_setdropitem) (struct item_drop* retVal___, int nameid, struct optdrop_group *options, int qty, struct item_data *data);
 typedef struct item_drop* (*HPMHOOK_pre_mob_setlootitem) (struct item **item);
 typedef struct item_drop* (*HPMHOOK_post_mob_setlootitem) (struct item_drop* retVal___, struct item *item);
 typedef int (*HPMHOOK_pre_mob_delay_item_drop) (int *tid, int64 *tick, int *id, intptr_t *data);
@@ -5376,8 +5464,8 @@ typedef struct block_list* (*HPMHOOK_pre_mob_getmasterhpltmaxrate) (struct mob_d
 typedef struct block_list* (*HPMHOOK_post_mob_getmasterhpltmaxrate) (struct block_list* retVal___, struct mob_data *md, int rate);
 typedef int (*HPMHOOK_pre_mob_getfriendstatus_sub) (struct block_list **bl, va_list ap);
 typedef int (*HPMHOOK_post_mob_getfriendstatus_sub) (int retVal___, struct block_list *bl, va_list ap);
-typedef struct mob_data* (*HPMHOOK_pre_mob_getfriendstatus) (struct mob_data **md, int *cond1, int *cond2);
-typedef struct mob_data* (*HPMHOOK_post_mob_getfriendstatus) (struct mob_data* retVal___, struct mob_data *md, int cond1, int cond2);
+typedef struct block_list* (*HPMHOOK_pre_mob_getfriendstatus) (struct mob_data **md, int *cond1, int *cond2);
+typedef struct block_list* (*HPMHOOK_post_mob_getfriendstatus) (struct block_list* retVal___, struct mob_data *md, int cond1, int cond2);
 typedef int (*HPMHOOK_pre_mob_skill_use) (struct mob_data **md, int64 *tick, int *event);
 typedef int (*HPMHOOK_post_mob_skill_use) (int retVal___, struct mob_data *md, int64 tick, int event);
 typedef int (*HPMHOOK_pre_mob_skill_event) (struct mob_data **md, struct block_list **src, int64 *tick, int *flag);
@@ -5392,6 +5480,14 @@ typedef unsigned int (*HPMHOOK_pre_mob_drop_adjust) (int *baserate, int *rate_ad
 typedef unsigned int (*HPMHOOK_post_mob_drop_adjust) (unsigned int retVal___, int baserate, int rate_adjust, unsigned short rate_min, unsigned short rate_max);
 typedef void (*HPMHOOK_pre_mob_item_dropratio_adjust) (int *nameid, int *mob_id, int **rate_adjust);
 typedef void (*HPMHOOK_post_mob_item_dropratio_adjust) (int nameid, int mob_id, int *rate_adjust);
+typedef bool (*HPMHOOK_pre_mob_read_optdrops_option) (struct config_setting_t **option, struct optdrop_group_optslot **entry, int **idx, bool **calc_rate, int *slot, const char **group);
+typedef bool (*HPMHOOK_post_mob_read_optdrops_option) (bool retVal___, struct config_setting_t *option, struct optdrop_group_optslot *entry, int *idx, bool *calc_rate, int slot, const char *group);
+typedef bool (*HPMHOOK_pre_mob_read_optdrops_optslot) (struct config_setting_t **optslot, int *n, int *group_id, const char **group);
+typedef bool (*HPMHOOK_post_mob_read_optdrops_optslot) (bool retVal___, struct config_setting_t *optslot, int n, int group_id, const char *group);
+typedef bool (*HPMHOOK_pre_mob_read_optdrops_group) (struct config_setting_t **group, int *n);
+typedef bool (*HPMHOOK_post_mob_read_optdrops_group) (bool retVal___, struct config_setting_t *group, int n);
+typedef bool (*HPMHOOK_pre_mob_read_optdrops_db) (void);
+typedef bool (*HPMHOOK_post_mob_read_optdrops_db) (bool retVal___);
 typedef void (*HPMHOOK_pre_mob_readdb) (void);
 typedef void (*HPMHOOK_post_mob_readdb) (void);
 typedef bool (*HPMHOOK_pre_mob_lookup_const) (const struct config_setting_t **it, const char **name, int **value);
@@ -5412,12 +5508,16 @@ typedef void (*HPMHOOK_pre_mob_read_db_mvpdrops_sub) (struct mob_db **entry, str
 typedef void (*HPMHOOK_post_mob_read_db_mvpdrops_sub) (struct mob_db *entry, struct config_setting_t *t);
 typedef uint32 (*HPMHOOK_pre_mob_read_db_mode_sub) (struct mob_db **entry, struct config_setting_t **t);
 typedef uint32 (*HPMHOOK_post_mob_read_db_mode_sub) (uint32 retVal___, struct mob_db *entry, struct config_setting_t *t);
+typedef struct optdrop_group* (*HPMHOOK_pre_mob_read_db_drops_option) (struct mob_db **entry, const char **item_name, struct config_setting_t **drop, int **drop_rate);
+typedef struct optdrop_group* (*HPMHOOK_post_mob_read_db_drops_option) (struct optdrop_group* retVal___, struct mob_db *entry, const char *item_name, struct config_setting_t *drop, int *drop_rate);
 typedef void (*HPMHOOK_pre_mob_read_db_stats_sub) (struct mob_db **entry, struct config_setting_t **t);
 typedef void (*HPMHOOK_post_mob_read_db_stats_sub) (struct mob_db *entry, struct config_setting_t *t);
+typedef void (*HPMHOOK_pre_mob_read_db_viewdata_sub) (struct mob_db **entry, struct config_setting_t **t);
+typedef void (*HPMHOOK_post_mob_read_db_viewdata_sub) (struct mob_db *entry, struct config_setting_t *t);
 typedef void (*HPMHOOK_pre_mob_name_constants) (void);
 typedef void (*HPMHOOK_post_mob_name_constants) (void);
-typedef bool (*HPMHOOK_pre_mob_readdb_mobavail) (char **str[], int *columns, int *current);
-typedef bool (*HPMHOOK_post_mob_readdb_mobavail) (bool retVal___, char *str[], int columns, int current);
+typedef void (*HPMHOOK_pre_mob_mobavail_removal_notice) (void);
+typedef void (*HPMHOOK_post_mob_mobavail_removal_notice) (void);
 typedef int (*HPMHOOK_pre_mob_read_randommonster) (void);
 typedef int (*HPMHOOK_post_mob_read_randommonster) (int retVal___);
 typedef bool (*HPMHOOK_pre_mob_parse_row_chatdb) (char ***str, const char **source, int *line, int **last_msg_id);
@@ -5442,6 +5542,8 @@ typedef int (*HPMHOOK_pre_mob_final_ratio_sub) (union DBKey *key, struct DBData
 typedef int (*HPMHOOK_post_mob_final_ratio_sub) (int retVal___, union DBKey key, struct DBData *data, va_list ap);
 typedef void (*HPMHOOK_pre_mob_destroy_mob_db) (int *index);
 typedef void (*HPMHOOK_post_mob_destroy_mob_db) (int index);
+typedef void (*HPMHOOK_pre_mob_destroy_drop_groups) (void);
+typedef void (*HPMHOOK_post_mob_destroy_drop_groups) (void);
 typedef bool (*HPMHOOK_pre_mob_skill_db_libconfig) (const char **filename, bool *ignore_missing);
 typedef bool (*HPMHOOK_post_mob_skill_db_libconfig) (bool retVal___, const char *filename, bool ignore_missing);
 typedef bool (*HPMHOOK_pre_mob_skill_db_libconfig_sub) (struct config_setting_t **it, int *n);
@@ -5596,10 +5698,12 @@ typedef int (*HPMHOOK_pre_npc_unload_ev_label) (union DBKey *key, struct DBData
 typedef int (*HPMHOOK_post_npc_unload_ev_label) (int retVal___, union DBKey key, struct DBData *data, va_list ap);
 typedef int (*HPMHOOK_pre_npc_unload_dup_sub) (struct npc_data **nd, va_list args);
 typedef int (*HPMHOOK_post_npc_unload_dup_sub) (int retVal___, struct npc_data *nd, va_list args);
-typedef void (*HPMHOOK_pre_npc_unload_duplicates) (struct npc_data **nd);
-typedef void (*HPMHOOK_post_npc_unload_duplicates) (struct npc_data *nd);
-typedef int (*HPMHOOK_pre_npc_unload) (struct npc_data **nd, bool *single);
-typedef int (*HPMHOOK_post_npc_unload) (int retVal___, struct npc_data *nd, bool single);
+typedef void (*HPMHOOK_pre_npc_unload_duplicates) (struct npc_data **nd, bool *unload_mobs);
+typedef void (*HPMHOOK_post_npc_unload_duplicates) (struct npc_data *nd, bool unload_mobs);
+typedef int (*HPMHOOK_pre_npc_unload_mob) (struct mob_data **md, va_list args);
+typedef int (*HPMHOOK_post_npc_unload_mob) (int retVal___, struct mob_data *md, va_list args);
+typedef int (*HPMHOOK_pre_npc_unload) (struct npc_data **nd, bool *single, bool *unload_mobs);
+typedef int (*HPMHOOK_post_npc_unload) (int retVal___, struct npc_data *nd, bool single, bool unload_mobs);
 typedef void (*HPMHOOK_pre_npc_clearsrcfile) (void);
 typedef void (*HPMHOOK_post_npc_clearsrcfile) (void);
 typedef void (*HPMHOOK_pre_npc_addsrcfile) (const char **name);
@@ -5616,8 +5720,8 @@ typedef int (*HPMHOOK_pre_npc_parseview) (const char **w4, const char **start, c
 typedef int (*HPMHOOK_post_npc_parseview) (int retVal___, const char *w4, const char *start, const char *buffer, const char *filepath);
 typedef bool (*HPMHOOK_pre_npc_viewisid) (const char **viewid);
 typedef bool (*HPMHOOK_post_npc_viewisid) (bool retVal___, const char *viewid);
-typedef struct npc_data* (*HPMHOOK_pre_npc_create_npc) (enum npc_subtype *subtype, int *m, int *x, int *y, uint8 *dir, int *class_);
-typedef struct npc_data* (*HPMHOOK_post_npc_create_npc) (struct npc_data* retVal___, enum npc_subtype subtype, int m, int x, int y, uint8 dir, int class_);
+typedef struct npc_data* (*HPMHOOK_pre_npc_create_npc) (enum npc_subtype *subtype, int *m, int *x, int *y, enum unit_dir *dir, int *class_);
+typedef struct npc_data* (*HPMHOOK_post_npc_create_npc) (struct npc_data* retVal___, enum npc_subtype subtype, int m, int x, int y, enum unit_dir dir, int class_);
 typedef struct npc_data* (*HPMHOOK_pre_npc_add_warp) (char **name, short *from_mapid, short *from_x, short *from_y, short *xs, short *ys, unsigned short *to_mapindex, short *to_x, short *to_y);
 typedef struct npc_data* (*HPMHOOK_post_npc_add_warp) (struct npc_data* retVal___, char *name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y);
 typedef const char* (*HPMHOOK_pre_npc_parse_warp) (const char **w1, const char **w2, const char **w3, const char **w4, const char **start, const char **buffer, const char **filepath, int **retval);
@@ -5682,8 +5786,8 @@ typedef int (*HPMHOOK_pre_npc_ev_label_db_clear_sub) (union DBKey *key, struct D
 typedef int (*HPMHOOK_post_npc_ev_label_db_clear_sub) (int retVal___, union DBKey key, struct DBData *data, va_list args);
 typedef int (*HPMHOOK_pre_npc_reload) (void);
 typedef int (*HPMHOOK_post_npc_reload) (int retVal___);
-typedef bool (*HPMHOOK_pre_npc_unloadfile) (const char **filepath);
-typedef bool (*HPMHOOK_post_npc_unloadfile) (bool retVal___, const char *filepath);
+typedef bool (*HPMHOOK_pre_npc_unloadfile) (const char **filepath, bool *unload_mobs);
+typedef bool (*HPMHOOK_post_npc_unloadfile) (bool retVal___, const char *filepath, bool unload_mobs);
 typedef void (*HPMHOOK_pre_npc_do_clear_npc) (void);
 typedef void (*HPMHOOK_post_npc_do_clear_npc) (void);
 typedef void (*HPMHOOK_pre_npc_debug_warps_sub) (struct npc_data **nd);
@@ -5696,10 +5800,12 @@ typedef bool (*HPMHOOK_pre_npc_trader_pay) (struct npc_data **nd, struct map_ses
 typedef bool (*HPMHOOK_post_npc_trader_pay) (bool retVal___, struct npc_data *nd, struct map_session_data *sd, int price, int points);
 typedef void (*HPMHOOK_pre_npc_trader_update) (int *master);
 typedef void (*HPMHOOK_post_npc_trader_update) (int master);
-typedef int (*HPMHOOK_pre_npc_market_buylist) (struct map_session_data **sd, struct itemlist **item_list);
-typedef int (*HPMHOOK_post_npc_market_buylist) (int retVal___, struct map_session_data *sd, struct itemlist *item_list);
+typedef enum market_buy_result (*HPMHOOK_pre_npc_market_buylist) (struct map_session_data **sd, struct itemlist **item_list);
+typedef enum market_buy_result (*HPMHOOK_post_npc_market_buylist) (enum market_buy_result retVal___, struct map_session_data *sd, struct itemlist *item_list);
 typedef int (*HPMHOOK_pre_npc_barter_buylist) (struct map_session_data **sd, struct barteritemlist **item_list);
 typedef int (*HPMHOOK_post_npc_barter_buylist) (int retVal___, struct map_session_data *sd, struct barteritemlist *item_list);
+typedef int (*HPMHOOK_pre_npc_expanded_barter_buylist) (struct map_session_data **sd, struct barteritemlist **item_list);
+typedef int (*HPMHOOK_post_npc_expanded_barter_buylist) (int retVal___, struct map_session_data *sd, struct barteritemlist *item_list);
 typedef bool (*HPMHOOK_pre_npc_trader_open) (struct map_session_data **sd, struct npc_data **nd);
 typedef bool (*HPMHOOK_post_npc_trader_open) (bool retVal___, struct map_session_data *sd, struct npc_data *nd);
 typedef void (*HPMHOOK_pre_npc_market_fromsql) (void);
@@ -5718,14 +5824,28 @@ typedef void (*HPMHOOK_pre_npc_barter_delfromsql) (struct npc_data **nd, int *in
 typedef void (*HPMHOOK_post_npc_barter_delfromsql) (struct npc_data *nd, int index);
 typedef void (*HPMHOOK_pre_npc_barter_delfromsql_sub) (const char **npcname, int *itemId, int *itemId2, int *amount2);
 typedef void (*HPMHOOK_post_npc_barter_delfromsql_sub) (const char *npcname, int itemId, int itemId2, int amount2);
+typedef void (*HPMHOOK_pre_npc_expanded_barter_fromsql) (void);
+typedef void (*HPMHOOK_post_npc_expanded_barter_fromsql) (void);
+typedef void (*HPMHOOK_pre_npc_expanded_barter_tosql) (struct npc_data **nd, int *index);
+typedef void (*HPMHOOK_post_npc_expanded_barter_tosql) (struct npc_data *nd, int index);
+typedef void (*HPMHOOK_pre_npc_expanded_barter_delfromsql) (struct npc_data **nd, int *index);
+typedef void (*HPMHOOK_post_npc_expanded_barter_delfromsql) (struct npc_data *nd, int index);
+typedef void (*HPMHOOK_pre_npc_expanded_barter_delfromsql_sub) (const char **npcname, int *itemId, int *zeny, int *currencyCount, struct npc_barter_currency **currency);
+typedef void (*HPMHOOK_post_npc_expanded_barter_delfromsql_sub) (const char *npcname, int itemId, int zeny, int currencyCount, struct npc_barter_currency *currency);
 typedef bool (*HPMHOOK_pre_npc_db_checkid) (const int *id);
 typedef bool (*HPMHOOK_post_npc_db_checkid) (bool retVal___, const int id);
 typedef void (*HPMHOOK_pre_npc_refresh) (struct npc_data **nd);
 typedef void (*HPMHOOK_post_npc_refresh) (struct npc_data *nd);
+typedef void (*HPMHOOK_pre_npc_questinfo_clear) (struct npc_data **nd);
+typedef void (*HPMHOOK_post_npc_questinfo_clear) (struct npc_data *nd);
 typedef int (*HPMHOOK_pre_npc_secure_timeout_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
 typedef int (*HPMHOOK_post_npc_secure_timeout_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
 #endif // MAP_NPC_H
 #ifdef COMMON_NULLPO_H /* nullpo */
+typedef void (*HPMHOOK_pre_nullpo_init) (void);
+typedef void (*HPMHOOK_post_nullpo_init) (void);
+typedef void (*HPMHOOK_pre_nullpo_final) (void);
+typedef void (*HPMHOOK_post_nullpo_final) (void);
 typedef void (*HPMHOOK_pre_nullpo_assert_report) (const char **file, int *line, const char **func, const char **targetname, const char **title);
 typedef void (*HPMHOOK_post_nullpo_assert_report) (const char *file, int line, const char *func, const char *targetname, const char *title);
 #endif // COMMON_NULLPO_H
@@ -5794,8 +5914,6 @@ typedef int (*HPMHOOK_pre_party_send_logout) (struct map_session_data **sd);
 typedef int (*HPMHOOK_post_party_send_logout) (int retVal___, struct map_session_data *sd);
 typedef int (*HPMHOOK_pre_party_send_message) (struct map_session_data **sd, const char **mes);
 typedef int (*HPMHOOK_post_party_send_message) (int retVal___, struct map_session_data *sd, const char *mes);
-typedef int (*HPMHOOK_pre_party_recv_message) (int *party_id, int *account_id, const char **mes, int *len);
-typedef int (*HPMHOOK_post_party_recv_message) (int retVal___, int party_id, int account_id, const char *mes, int len);
 typedef int (*HPMHOOK_pre_party_skill_check) (struct map_session_data **sd, int *party_id, uint16 *skill_id, uint16 *skill_lv);
 typedef int (*HPMHOOK_post_party_skill_check) (int retVal___, struct map_session_data *sd, int party_id, uint16 skill_id, uint16 skill_lv);
 typedef int (*HPMHOOK_pre_party_send_xy_clear) (struct party_data **p);
@@ -5986,8 +6104,8 @@ typedef bool (*HPMHOOK_pre_pc_adoption) (struct map_session_data **p1_sd, struct
 typedef bool (*HPMHOOK_post_pc_adoption) (bool retVal___, struct map_session_data *p1_sd, struct map_session_data *p2_sd, struct map_session_data *b_sd);
 typedef int (*HPMHOOK_pre_pc_updateweightstatus) (struct map_session_data **sd);
 typedef int (*HPMHOOK_post_pc_updateweightstatus) (int retVal___, struct map_session_data *sd);
-typedef int (*HPMHOOK_pre_pc_addautobonus) (struct s_autobonus **bonus, char *max, const char **bonus_script, short *rate, unsigned int *dur, short *atk_type, const char **o_script, unsigned short *pos, bool *onskill);
-typedef int (*HPMHOOK_post_pc_addautobonus) (int retVal___, struct s_autobonus *bonus, char max, const char *bonus_script, short rate, unsigned int dur, short atk_type, const char *o_script, unsigned short pos, bool onskill);
+typedef int (*HPMHOOK_pre_pc_addautobonus) (struct s_autobonus **bonus, char *max, const char **bonus_script, short *rate, unsigned int *dur, short *atk_type, const char **o_script, unsigned int *pos, bool *onskill);
+typedef int (*HPMHOOK_post_pc_addautobonus) (int retVal___, struct s_autobonus *bonus, char max, const char *bonus_script, short rate, unsigned int dur, short atk_type, const char *o_script, unsigned int pos, bool onskill);
 typedef int (*HPMHOOK_pre_pc_exeautobonus) (struct map_session_data **sd, struct s_autobonus **bonus);
 typedef int (*HPMHOOK_post_pc_exeautobonus) (int retVal___, struct map_session_data *sd, struct s_autobonus *bonus);
 typedef int (*HPMHOOK_pre_pc_endautobonus) (int *tid, int64 *tick, int *id, intptr_t *data);
@@ -6082,6 +6200,8 @@ typedef int (*HPMHOOK_pre_pc_checkitem) (struct map_session_data **sd);
 typedef int (*HPMHOOK_post_pc_checkitem) (int retVal___, struct map_session_data *sd);
 typedef int (*HPMHOOK_pre_pc_useitem) (struct map_session_data **sd, int *n);
 typedef int (*HPMHOOK_post_pc_useitem) (int retVal___, struct map_session_data *sd, int n);
+typedef int (*HPMHOOK_pre_pc_autocast_clear) (struct map_session_data **sd);
+typedef int (*HPMHOOK_post_pc_autocast_clear) (int retVal___, struct map_session_data *sd);
 typedef int (*HPMHOOK_pre_pc_skillatk_bonus) (struct map_session_data **sd, uint16 *skill_id);
 typedef int (*HPMHOOK_post_pc_skillatk_bonus) (int retVal___, struct map_session_data *sd, uint16 skill_id);
 typedef int (*HPMHOOK_pre_pc_skillheal_bonus) (struct map_session_data **sd, uint16 *skill_id);
@@ -6102,6 +6222,10 @@ typedef int (*HPMHOOK_pre_pc_percentheal) (struct map_session_data **sd, int *hp
 typedef int (*HPMHOOK_post_pc_percentheal) (int retVal___, struct map_session_data *sd, int hp, int sp);
 typedef int (*HPMHOOK_pre_pc_jobchange) (struct map_session_data **sd, int *class, int *upper);
 typedef int (*HPMHOOK_post_pc_jobchange) (int retVal___, struct map_session_data *sd, int class, int upper);
+typedef void (*HPMHOOK_pre_pc_hide) (struct map_session_data **sd, bool *show_msg);
+typedef void (*HPMHOOK_post_pc_hide) (struct map_session_data *sd, bool show_msg);
+typedef void (*HPMHOOK_pre_pc_unhide) (struct map_session_data **sd, bool *show_msg);
+typedef void (*HPMHOOK_post_pc_unhide) (struct map_session_data *sd, bool show_msg);
 typedef int (*HPMHOOK_pre_pc_setoption) (struct map_session_data **sd, int *type);
 typedef int (*HPMHOOK_post_pc_setoption) (int retVal___, struct map_session_data *sd, int type);
 typedef int (*HPMHOOK_pre_pc_setcart) (struct map_session_data **sd, int *type);
@@ -6110,8 +6234,8 @@ typedef void (*HPMHOOK_pre_pc_setfalcon) (struct map_session_data **sd, bool *fl
 typedef void (*HPMHOOK_post_pc_setfalcon) (struct map_session_data *sd, bool flag);
 typedef void (*HPMHOOK_pre_pc_setridingpeco) (struct map_session_data **sd, bool *flag);
 typedef void (*HPMHOOK_post_pc_setridingpeco) (struct map_session_data *sd, bool flag);
-typedef void (*HPMHOOK_pre_pc_setmadogear) (struct map_session_data **sd, bool *flag);
-typedef void (*HPMHOOK_post_pc_setmadogear) (struct map_session_data *sd, bool flag);
+typedef void (*HPMHOOK_pre_pc_setmadogear) (struct map_session_data **sd, bool *flag, enum mado_type *mtype);
+typedef void (*HPMHOOK_post_pc_setmadogear) (struct map_session_data *sd, bool flag, enum mado_type mtype);
 typedef void (*HPMHOOK_pre_pc_setridingdragon) (struct map_session_data **sd, unsigned int *type);
 typedef void (*HPMHOOK_post_pc_setridingdragon) (struct map_session_data *sd, unsigned int type);
 typedef void (*HPMHOOK_pre_pc_setridingwug) (struct map_session_data **sd, bool *flag);
@@ -6232,10 +6356,10 @@ typedef void (*HPMHOOK_pre_pc_itemcd_do) (struct map_session_data **sd, bool *lo
 typedef void (*HPMHOOK_post_pc_itemcd_do) (struct map_session_data *sd, bool load);
 typedef int (*HPMHOOK_pre_pc_load_combo) (struct map_session_data **sd);
 typedef int (*HPMHOOK_post_pc_load_combo) (int retVal___, struct map_session_data *sd);
-typedef void (*HPMHOOK_pre_pc_add_charm) (struct map_session_data **sd, int *interval, int *max, int *type);
-typedef void (*HPMHOOK_post_pc_add_charm) (struct map_session_data *sd, int interval, int max, int type);
-typedef void (*HPMHOOK_pre_pc_del_charm) (struct map_session_data **sd, int *count, int *type);
-typedef void (*HPMHOOK_post_pc_del_charm) (struct map_session_data *sd, int count, int type);
+typedef void (*HPMHOOK_pre_pc_add_charm) (struct map_session_data **sd, int *interval, int *max, enum spirit_charm_types *type);
+typedef void (*HPMHOOK_post_pc_add_charm) (struct map_session_data *sd, int interval, int max, enum spirit_charm_types type);
+typedef void (*HPMHOOK_pre_pc_del_charm) (struct map_session_data **sd, int *count, enum spirit_charm_types *type);
+typedef void (*HPMHOOK_post_pc_del_charm) (struct map_session_data *sd, int count, enum spirit_charm_types type);
 typedef void (*HPMHOOK_pre_pc_baselevelchanged) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_pc_baselevelchanged) (struct map_session_data *sd);
 typedef int (*HPMHOOK_pre_pc_level_penalty_mod) (int *diff, unsigned char *race, uint32 *mode, int *type);
@@ -6346,8 +6470,14 @@ typedef void (*HPMHOOK_pre_pc_update_idle_time) (struct map_session_data **sd, e
 typedef void (*HPMHOOK_post_pc_update_idle_time) (struct map_session_data *sd, enum e_battle_config_idletime type);
 typedef int (*HPMHOOK_pre_pc_have_magnifier) (struct map_session_data **sd);
 typedef int (*HPMHOOK_post_pc_have_magnifier) (int retVal___, struct map_session_data *sd);
+typedef int (*HPMHOOK_pre_pc_have_item_chain) (struct map_session_data **sd, enum e_chain_cache *chain_cache_id);
+typedef int (*HPMHOOK_post_pc_have_item_chain) (int retVal___, struct map_session_data *sd, enum e_chain_cache chain_cache_id);
 typedef bool (*HPMHOOK_pre_pc_process_chat_message) (struct map_session_data **sd, const char **message);
 typedef bool (*HPMHOOK_post_pc_process_chat_message) (bool retVal___, struct map_session_data *sd, const char *message);
+typedef int (*HPMHOOK_pre_pc_wis_message_to_gm) (const char **sender_name, int *permission, const char **message);
+typedef int (*HPMHOOK_post_pc_wis_message_to_gm) (int retVal___, const char *sender_name, int permission, const char *message);
+typedef int (*HPMHOOK_pre_pc_wis_message_to_gm_sub) (struct map_session_data **sd, va_list va);
+typedef int (*HPMHOOK_post_pc_wis_message_to_gm_sub) (int retVal___, struct map_session_data *sd, va_list va);
 typedef void (*HPMHOOK_pre_pc_check_supernovice_call) (struct map_session_data **sd, const char **message);
 typedef void (*HPMHOOK_post_pc_check_supernovice_call) (struct map_session_data *sd, const char *message);
 typedef bool (*HPMHOOK_pre_pc_check_basicskill) (struct map_session_data **sd, int *level);
@@ -6358,6 +6488,8 @@ typedef bool (*HPMHOOK_pre_pc_has_second_costume) (struct map_session_data **sd)
 typedef bool (*HPMHOOK_post_pc_has_second_costume) (bool retVal___, struct map_session_data *sd);
 typedef bool (*HPMHOOK_pre_pc_expandInventory) (struct map_session_data **sd, int *adjustSize);
 typedef bool (*HPMHOOK_post_pc_expandInventory) (bool retVal___, struct map_session_data *sd, int adjustSize);
+typedef bool (*HPMHOOK_pre_pc_auto_exp_insurance) (struct map_session_data **sd);
+typedef bool (*HPMHOOK_post_pc_auto_exp_insurance) (bool retVal___, struct map_session_data *sd);
 #endif // MAP_PC_H
 #ifdef MAP_NPC_H /* libpcre */
 typedef pcre* (*HPMHOOK_pre_libpcre_compile) (const char **pattern, int *options, const char ***errptr, int **erroffset, const unsigned char **tableptr);
@@ -6384,6 +6516,8 @@ typedef int (*HPMHOOK_pre_pet_final) (void);
 typedef int (*HPMHOOK_post_pet_final) (int retVal___);
 typedef int (*HPMHOOK_pre_pet_hungry_val) (struct pet_data **pd);
 typedef int (*HPMHOOK_post_pet_hungry_val) (int retVal___, struct pet_data *pd);
+typedef void (*HPMHOOK_pre_pet_set_hunger) (struct pet_data **pd, int *value);
+typedef void (*HPMHOOK_post_pet_set_hunger) (struct pet_data *pd, int value);
 typedef void (*HPMHOOK_pre_pet_set_intimate) (struct pet_data **pd, int *value);
 typedef void (*HPMHOOK_post_pet_set_intimate) (struct pet_data *pd, int value);
 typedef int (*HPMHOOK_pre_pet_create_egg) (struct map_session_data **sd, int *item_id);
@@ -6554,9 +6688,41 @@ typedef bool (*HPMHOOK_pre_quest_questinfo_validate_quests) (struct map_session_
 typedef bool (*HPMHOOK_post_quest_questinfo_validate_quests) (bool retVal___, struct map_session_data *sd, struct questinfo *qi);
 typedef bool (*HPMHOOK_pre_quest_questinfo_validate_mercenary_class) (struct map_session_data **sd, struct questinfo **qi);
 typedef bool (*HPMHOOK_post_quest_questinfo_validate_mercenary_class) (bool retVal___, struct map_session_data *sd, struct questinfo *qi);
-typedef void (*HPMHOOK_pre_quest_questinfo_vector_clear) (int *m);
-typedef void (*HPMHOOK_post_quest_questinfo_vector_clear) (int m);
 #endif // MAP_QUEST_H
+#ifdef MAP_REFINE_H /* refine */
+typedef int (*HPMHOOK_pre_refine_init) (bool *minimal);
+typedef int (*HPMHOOK_post_refine_init) (int retVal___, bool minimal);
+typedef void (*HPMHOOK_pre_refine_final) (void);
+typedef void (*HPMHOOK_post_refine_final) (void);
+typedef int (*HPMHOOK_pre_refine_get_refine_chance) (enum refine_type *wlv, int *refine_level, enum refine_chance_type *type);
+typedef int (*HPMHOOK_post_refine_get_refine_chance) (int retVal___, enum refine_type wlv, int refine_level, enum refine_chance_type type);
+typedef int (*HPMHOOK_pre_refine_get_bonus) (enum refine_type *equipment_type, int *refine_level);
+typedef int (*HPMHOOK_post_refine_get_bonus) (int retVal___, enum refine_type equipment_type, int refine_level);
+typedef int (*HPMHOOK_pre_refine_get_randombonus_max) (enum refine_type *equipment_type, int *refine_level);
+typedef int (*HPMHOOK_post_refine_get_randombonus_max) (int retVal___, enum refine_type equipment_type, int refine_level);
+typedef void (*HPMHOOK_pre_refine_refinery_add_item) (struct map_session_data **sd, int *item_index);
+typedef void (*HPMHOOK_post_refine_refinery_add_item) (struct map_session_data *sd, int item_index);
+typedef void (*HPMHOOK_pre_refine_refinery_refine_request) (struct map_session_data **sd, int *item_index, int *material_id, bool *use_blacksmith_blessing);
+typedef void (*HPMHOOK_post_refine_refinery_refine_request) (struct map_session_data *sd, int item_index, int material_id, bool use_blacksmith_blessing);
+#endif // MAP_REFINE_H
+#ifdef MAP_REFINE_P_H /* PRIV__refine */
+typedef int (*HPMHOOK_pre_PRIV__refine_readdb_refine_libconfig_sub) (struct config_setting_t **r, const char **name, const char **source);
+typedef int (*HPMHOOK_post_PRIV__refine_readdb_refine_libconfig_sub) (int retVal___, struct config_setting_t *r, const char *name, const char *source);
+typedef int (*HPMHOOK_pre_PRIV__refine_readdb_refine_libconfig) (const char **filename);
+typedef int (*HPMHOOK_post_PRIV__refine_readdb_refine_libconfig) (int retVal___, const char *filename);
+typedef bool (*HPMHOOK_pre_PRIV__refine_announce_behavior_string2enum) (const char **str, unsigned int **result);
+typedef bool (*HPMHOOK_post_PRIV__refine_announce_behavior_string2enum) (bool retVal___, const char *str, unsigned int *result);
+typedef bool (*HPMHOOK_pre_PRIV__refine_failure_behavior_string2enum) (const char **str, enum refine_ui_failure_behavior **result);
+typedef bool (*HPMHOOK_post_PRIV__refine_failure_behavior_string2enum) (bool retVal___, const char *str, enum refine_ui_failure_behavior *result);
+typedef bool (*HPMHOOK_pre_PRIV__refine_readdb_refinery_ui_settings_items) (const struct config_setting_t **elem, struct s_refine_requirement **req, const char **name, const char **source);
+typedef bool (*HPMHOOK_post_PRIV__refine_readdb_refinery_ui_settings_items) (bool retVal___, const struct config_setting_t *elem, struct s_refine_requirement *req, const char *name, const char *source);
+typedef bool (*HPMHOOK_pre_PRIV__refine_readdb_refinery_ui_settings_sub) (const struct config_setting_t **elem, int *type, const char **name, const char **source);
+typedef bool (*HPMHOOK_post_PRIV__refine_readdb_refinery_ui_settings_sub) (bool retVal___, const struct config_setting_t *elem, int type, const char *name, const char *source);
+typedef int (*HPMHOOK_pre_PRIV__refine_readdb_refinery_ui_settings) (const struct config_setting_t **r, int *type, const char **name, const char **source);
+typedef int (*HPMHOOK_post_PRIV__refine_readdb_refinery_ui_settings) (int retVal___, const struct config_setting_t *r, int type, const char *name, const char *source);
+typedef bool (*HPMHOOK_pre_PRIV__refine_is_refinable) (struct map_session_data **sd, int *item_index);
+typedef bool (*HPMHOOK_post_PRIV__refine_is_refinable) (bool retVal___, struct map_session_data *sd, int item_index);
+#endif // MAP_REFINE_P_H
 #ifdef COMMON_RANDOM_H /* rnd */
 typedef void (*HPMHOOK_pre_rnd_init) (void);
 typedef void (*HPMHOOK_post_rnd_init) (void);
@@ -6610,6 +6776,10 @@ typedef void (*HPMHOOK_pre_rodex_delete_mail) (struct map_session_data **sd, int
 typedef void (*HPMHOOK_post_rodex_delete_mail) (struct map_session_data *sd, int64 mail_id);
 typedef void (*HPMHOOK_pre_rodex_clean) (struct map_session_data **sd, int8 *flag);
 typedef void (*HPMHOOK_post_rodex_clean) (struct map_session_data *sd, int8 flag);
+typedef void (*HPMHOOK_pre_rodex_getZenyAck) (struct map_session_data **sd, int64 *mail_id, int8 *opentype, int64 *zeny);
+typedef void (*HPMHOOK_post_rodex_getZenyAck) (struct map_session_data *sd, int64 mail_id, int8 opentype, int64 zeny);
+typedef void (*HPMHOOK_pre_rodex_getItemsAck) (struct map_session_data **sd, int64 *mail_id, int8 *opentype, int *count, const struct rodex_item **items);
+typedef void (*HPMHOOK_post_rodex_getItemsAck) (struct map_session_data *sd, int64 mail_id, int8 opentype, int count, const struct rodex_item *items);
 #endif // MAP_RODEX_H
 #ifdef MAP_SCRIPT_H /* script */
 typedef void (*HPMHOOK_pre_script_init) (bool *minimal);
@@ -6960,8 +7130,10 @@ typedef void (*HPMHOOK_pre_script_load_translations) (void);
 typedef void (*HPMHOOK_post_script_load_translations) (void);
 typedef bool (*HPMHOOK_pre_script_load_translation_addstring) (const char **file, uint8 *lang_id, const char **msgctxt, const struct script_string_buf **msgid, const struct script_string_buf **msgstr);
 typedef bool (*HPMHOOK_post_script_load_translation_addstring) (bool retVal___, const char *file, uint8 lang_id, const char *msgctxt, const struct script_string_buf *msgid, const struct script_string_buf *msgstr);
-typedef int (*HPMHOOK_pre_script_load_translation) (const char **file, uint8 *lang_id);
-typedef int (*HPMHOOK_post_script_load_translation) (int retVal___, const char *file, uint8 lang_id);
+typedef int (*HPMHOOK_pre_script_load_translation_file) (const char **file, uint8 *lang_id);
+typedef int (*HPMHOOK_post_script_load_translation_file) (int retVal___, const char *file, uint8 lang_id);
+typedef int (*HPMHOOK_pre_script_load_translation) (const char **directory, uint8 *lang_id);
+typedef int (*HPMHOOK_post_script_load_translation) (int retVal___, const char *directory, uint8 lang_id);
 typedef int (*HPMHOOK_pre_script_translation_db_destroyer) (union DBKey *key, struct DBData **data, va_list ap);
 typedef int (*HPMHOOK_post_script_translation_db_destroyer) (int retVal___, union DBKey key, struct DBData *data, va_list ap);
 typedef void (*HPMHOOK_pre_script_clear_translations) (bool *reload);
@@ -6970,8 +7142,8 @@ typedef int (*HPMHOOK_pre_script_parse_cleanup_timer) (int *tid, int64 *tick, in
 typedef int (*HPMHOOK_post_script_parse_cleanup_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
 typedef uint8 (*HPMHOOK_pre_script_add_language) (const char **name);
 typedef uint8 (*HPMHOOK_post_script_add_language) (uint8 retVal___, const char *name);
-typedef const char* (*HPMHOOK_pre_script_get_translation_file_name) (const char **file);
-typedef const char* (*HPMHOOK_post_script_get_translation_file_name) (const char* retVal___, const char *file);
+typedef const char* (*HPMHOOK_pre_script_get_translation_dir_name) (const char **directory);
+typedef const char* (*HPMHOOK_post_script_get_translation_dir_name) (const char* retVal___, const char *directory);
 typedef void (*HPMHOOK_pre_script_parser_clean_leftovers) (void);
 typedef void (*HPMHOOK_post_script_parser_clean_leftovers) (void);
 typedef void (*HPMHOOK_pre_script_run_use_script) (struct map_session_data **sd, struct item_data **data, int *oid);
@@ -6980,6 +7152,14 @@ typedef void (*HPMHOOK_pre_script_run_item_equip_script) (struct map_session_dat
 typedef void (*HPMHOOK_post_script_run_item_equip_script) (struct map_session_data *sd, struct item_data *data, int oid);
 typedef void (*HPMHOOK_pre_script_run_item_unequip_script) (struct map_session_data **sd, struct item_data **data, int *oid);
 typedef void (*HPMHOOK_post_script_run_item_unequip_script) (struct map_session_data *sd, struct item_data *data, int oid);
+typedef void (*HPMHOOK_pre_script_run_item_rental_end_script) (struct map_session_data **sd, struct item_data **data, int *oid);
+typedef void (*HPMHOOK_post_script_run_item_rental_end_script) (struct map_session_data *sd, struct item_data *data, int oid);
+typedef void (*HPMHOOK_pre_script_run_item_rental_start_script) (struct map_session_data **sd, struct item_data **data, int *oid);
+typedef void (*HPMHOOK_post_script_run_item_rental_start_script) (struct map_session_data *sd, struct item_data *data, int oid);
+typedef void (*HPMHOOK_pre_script_run_item_lapineddukddak_script) (struct map_session_data **sd, struct item_data **data, int *oid);
+typedef void (*HPMHOOK_post_script_run_item_lapineddukddak_script) (struct map_session_data *sd, struct item_data *data, int oid);
+typedef bool (*HPMHOOK_pre_script_sellitemcurrency_add) (struct npc_data **nd, struct script_state **st, int *argIndex);
+typedef bool (*HPMHOOK_post_script_sellitemcurrency_add) (bool retVal___, struct npc_data *nd, struct script_state *st, int argIndex);
 #endif // MAP_SCRIPT_H
 #ifdef MAP_SEARCHSTORE_H /* searchstore */
 typedef bool (*HPMHOOK_pre_searchstore_open) (struct map_session_data **sd, unsigned int *uses, unsigned short *effect);
@@ -7000,8 +7180,8 @@ typedef bool (*HPMHOOK_pre_searchstore_queryremote) (struct map_session_data **s
 typedef bool (*HPMHOOK_post_searchstore_queryremote) (bool retVal___, struct map_session_data *sd, int account_id);
 typedef void (*HPMHOOK_pre_searchstore_clearremote) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_searchstore_clearremote) (struct map_session_data *sd);
-typedef bool (*HPMHOOK_pre_searchstore_result) (struct map_session_data **sd, unsigned int *store_id, int *account_id, const char **store_name, int *nameid, unsigned short *amount, unsigned int *price, const int **card, unsigned char *refine, const struct item_option **option);
-typedef bool (*HPMHOOK_post_searchstore_result) (bool retVal___, struct map_session_data *sd, unsigned int store_id, int account_id, const char *store_name, int nameid, unsigned short amount, unsigned int price, const int *card, unsigned char refine, const struct item_option *option);
+typedef bool (*HPMHOOK_pre_searchstore_result) (struct map_session_data **sd, unsigned int *store_id, int *account_id, const char **store_name, int *nameid, unsigned short *amount, unsigned int *price, const int **card, unsigned char *refine_level, const struct item_option **option);
+typedef bool (*HPMHOOK_post_searchstore_result) (bool retVal___, struct map_session_data *sd, unsigned int store_id, int account_id, const char *store_name, int nameid, unsigned short amount, unsigned int price, const int *card, unsigned char refine_level, const struct item_option *option);
 #endif // MAP_SEARCHSTORE_H
 #ifdef COMMON_SHOWMSG_H /* showmsg */
 typedef void (*HPMHOOK_pre_showmsg_init) (void);
@@ -7140,8 +7320,8 @@ typedef int (*HPMHOOK_pre_skill_additional_effect) (struct block_list **src, str
 typedef int (*HPMHOOK_post_skill_additional_effect) (int retVal___, struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, int dmg_lv, int64 tick);
 typedef int (*HPMHOOK_pre_skill_counter_additional_effect) (struct block_list **src, struct block_list **bl, uint16 *skill_id, uint16 *skill_lv, int *attack_type, int64 *tick);
 typedef int (*HPMHOOK_post_skill_counter_additional_effect) (int retVal___, struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int attack_type, int64 tick);
-typedef int (*HPMHOOK_pre_skill_blown) (struct block_list **src, struct block_list **target, int *count, int8 *dir, int *flag);
-typedef int (*HPMHOOK_post_skill_blown) (int retVal___, struct block_list *src, struct block_list *target, int count, int8 dir, int flag);
+typedef int (*HPMHOOK_pre_skill_blown) (struct block_list **src, struct block_list **target, int *count, enum unit_dir *dir, int *flag);
+typedef int (*HPMHOOK_post_skill_blown) (int retVal___, struct block_list *src, struct block_list *target, int count, enum unit_dir dir, int flag);
 typedef int (*HPMHOOK_pre_skill_break_equip) (struct block_list **bl, unsigned short *where, int *rate, int *flag);
 typedef int (*HPMHOOK_post_skill_break_equip) (int retVal___, struct block_list *bl, unsigned short where, int rate, int flag);
 typedef int (*HPMHOOK_pre_skill_strip_equip) (struct block_list **bl, unsigned short *where, int *rate, int *lv, int *time);
@@ -7224,6 +7404,8 @@ typedef int (*HPMHOOK_pre_skill_not_ok_hom_unknown) (uint16 *skill_id, struct ho
 typedef int (*HPMHOOK_post_skill_not_ok_hom_unknown) (int retVal___, uint16 skill_id, struct homun_data *hd);
 typedef int (*HPMHOOK_pre_skill_not_ok_mercenary) (uint16 *skill_id, struct mercenary_data **md);
 typedef int (*HPMHOOK_post_skill_not_ok_mercenary) (int retVal___, uint16 skill_id, struct mercenary_data *md);
+typedef void (*HPMHOOK_pre_skill_validate_autocast_data) (struct map_session_data **sd, int *skill_id, int *skill_lv);
+typedef void (*HPMHOOK_post_skill_validate_autocast_data) (struct map_session_data *sd, int skill_id, int skill_lv);
 typedef int (*HPMHOOK_pre_skill_chastle_mob_changetarget) (struct block_list **bl, va_list ap);
 typedef int (*HPMHOOK_post_skill_chastle_mob_changetarget) (int retVal___, struct block_list *bl, va_list ap);
 typedef int (*HPMHOOK_pre_skill_can_produce_mix) (struct map_session_data **sd, int *nameid, int *trigger, int *qty);
@@ -7304,10 +7486,10 @@ typedef int (*HPMHOOK_pre_skill_check_condition_char_sub) (struct block_list **b
 typedef int (*HPMHOOK_post_skill_check_condition_char_sub) (int retVal___, struct block_list *bl, va_list ap);
 typedef int (*HPMHOOK_pre_skill_check_condition_mob_master_sub) (struct block_list **bl, va_list ap);
 typedef int (*HPMHOOK_post_skill_check_condition_mob_master_sub) (int retVal___, struct block_list *bl, va_list ap);
-typedef void (*HPMHOOK_pre_skill_brandishspear_first) (struct square **tc, uint8 *dir, int16 *x, int16 *y);
-typedef void (*HPMHOOK_post_skill_brandishspear_first) (struct square *tc, uint8 dir, int16 x, int16 y);
-typedef void (*HPMHOOK_pre_skill_brandishspear_dir) (struct square **tc, uint8 *dir, int *are);
-typedef void (*HPMHOOK_post_skill_brandishspear_dir) (struct square *tc, uint8 dir, int are);
+typedef void (*HPMHOOK_pre_skill_brandishspear_first) (struct square **tc, enum unit_dir *dir, int16 *x, int16 *y);
+typedef void (*HPMHOOK_post_skill_brandishspear_first) (struct square *tc, enum unit_dir dir, int16 x, int16 y);
+typedef void (*HPMHOOK_pre_skill_brandishspear_dir) (struct square **tc, enum unit_dir *dir, int *are);
+typedef void (*HPMHOOK_post_skill_brandishspear_dir) (struct square *tc, enum unit_dir dir, int are);
 typedef int (*HPMHOOK_pre_skill_get_fixed_cast) (int *skill_id, int *skill_lv);
 typedef int (*HPMHOOK_post_skill_get_fixed_cast) (int retVal___, int skill_id, int skill_lv);
 typedef int (*HPMHOOK_pre_skill_sit_count) (struct block_list **bl, va_list ap);
@@ -7448,8 +7630,8 @@ typedef int (*HPMHOOK_pre_skill_attack_copy_unknown) (int **attack_type, struct
 typedef int (*HPMHOOK_post_skill_attack_copy_unknown) (int retVal___, int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag);
 typedef int (*HPMHOOK_pre_skill_attack_dir_unknown) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag);
 typedef int (*HPMHOOK_post_skill_attack_dir_unknown) (int retVal___, int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag);
-typedef void (*HPMHOOK_pre_skill_attack_blow_unknown) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag, int **type, struct Damage **dmg, int64 **damage, int8 **dir);
-typedef void (*HPMHOOK_post_skill_attack_blow_unknown) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *type, struct Damage *dmg, int64 *damage, int8 *dir);
+typedef void (*HPMHOOK_pre_skill_attack_blow_unknown) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag, int **type, struct Damage **dmg, int64 **damage, enum unit_dir **dir);
+typedef void (*HPMHOOK_post_skill_attack_blow_unknown) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *type, struct Damage *dmg, int64 *damage, enum unit_dir *dir);
 typedef void (*HPMHOOK_pre_skill_attack_post_unknown) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag);
 typedef void (*HPMHOOK_post_skill_attack_post_unknown) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag);
 typedef bool (*HPMHOOK_pre_skill_timerskill_dead_unknown) (struct block_list **src, struct unit_data **ud, struct skill_timerskill **skl);
@@ -7538,6 +7720,8 @@ typedef void (*HPMHOOK_pre_sockt_flush) (int *fd);
 typedef void (*HPMHOOK_post_sockt_flush) (int fd);
 typedef void (*HPMHOOK_pre_sockt_flush_fifos) (void);
 typedef void (*HPMHOOK_post_sockt_flush_fifos) (void);
+typedef int (*HPMHOOK_pre_sockt_connect_client) (int *listen_fd);
+typedef int (*HPMHOOK_post_sockt_connect_client) (int retVal___, int listen_fd);
 typedef void (*HPMHOOK_pre_sockt_set_nonblocking) (int *fd, unsigned long *yes);
 typedef void (*HPMHOOK_post_sockt_set_nonblocking) (int fd, unsigned long yes);
 typedef void (*HPMHOOK_pre_sockt_set_defaultparse) (ParseFunc *defaultparse);
@@ -7636,18 +7820,18 @@ typedef int (*HPMHOOK_pre_status_init) (bool *minimal);
 typedef int (*HPMHOOK_post_status_init) (int retVal___, bool minimal);
 typedef void (*HPMHOOK_pre_status_final) (void);
 typedef void (*HPMHOOK_post_status_final) (void);
-typedef int (*HPMHOOK_pre_status_get_refine_chance) (enum refine_type *wlv, int *refine, enum refine_chance_type *type);
-typedef int (*HPMHOOK_post_status_get_refine_chance) (int retVal___, enum refine_type wlv, int refine, enum refine_chance_type type);
 typedef sc_type (*HPMHOOK_pre_status_skill2sc) (int *skill_id);
 typedef sc_type (*HPMHOOK_post_status_skill2sc) (sc_type retVal___, int skill_id);
 typedef int (*HPMHOOK_pre_status_sc2skill) (sc_type *sc);
 typedef int (*HPMHOOK_post_status_sc2skill) (int retVal___, sc_type sc);
 typedef unsigned int (*HPMHOOK_pre_status_sc2scb_flag) (sc_type *sc);
 typedef unsigned int (*HPMHOOK_post_status_sc2scb_flag) (unsigned int retVal___, sc_type sc);
-typedef int (*HPMHOOK_pre_status_type2relevant_bl_types) (int *type);
-typedef int (*HPMHOOK_post_status_type2relevant_bl_types) (int retVal___, int type);
+typedef int (*HPMHOOK_pre_status_get_sc_relevant_bl_types) (sc_type *type);
+typedef int (*HPMHOOK_post_status_get_sc_relevant_bl_types) (int retVal___, sc_type type);
 typedef int (*HPMHOOK_pre_status_get_sc_type) (sc_type *idx);
 typedef int (*HPMHOOK_post_status_get_sc_type) (int retVal___, sc_type idx);
+typedef int (*HPMHOOK_pre_status_get_sc_icon) (sc_type *type);
+typedef int (*HPMHOOK_post_status_get_sc_icon) (int retVal___, sc_type type);
 typedef int (*HPMHOOK_pre_status_damage) (struct block_list **src, struct block_list **target, int64 *hp, int64 *sp, int *walkdelay, int *flag);
 typedef int (*HPMHOOK_post_status_damage) (int retVal___, struct block_list *src, struct block_list *target, int64 hp, int64 sp, int walkdelay, int flag);
 typedef int (*HPMHOOK_pre_status_charge) (struct block_list **bl, int64 *hp, int64 *sp);
@@ -7708,6 +7892,8 @@ typedef int (*HPMHOOK_pre_status_get_sc_def) (struct block_list **src, struct bl
 typedef int (*HPMHOOK_post_status_get_sc_def) (int retVal___, struct block_list *src, struct block_list *bl, enum sc_type type, int rate, int tick, int flag);
 typedef int (*HPMHOOK_pre_status_change_start) (struct block_list **src, struct block_list **bl, enum sc_type *type, int *rate, int *val1, int *val2, int *val3, int *val4, int *tick, int *flag);
 typedef int (*HPMHOOK_post_status_change_start) (int retVal___, struct block_list *src, struct block_list *bl, enum sc_type type, int rate, int val1, int val2, int val3, int val4, int tick, int flag);
+typedef int (*HPMHOOK_pre_status_change_start_sub) (struct block_list **src, struct block_list **bl, enum sc_type *type, int *rate, int *val1, int *val2, int *val3, int *val4, int *tick, int *total_tick, int *flag);
+typedef int (*HPMHOOK_post_status_change_start_sub) (int retVal___, struct block_list *src, struct block_list *bl, enum sc_type type, int rate, int val1, int val2, int val3, int val4, int tick, int total_tick, int flag);
 typedef int (*HPMHOOK_pre_status_change_end_) (struct block_list **bl, enum sc_type *type, int *tid, const char **file, int *line);
 typedef int (*HPMHOOK_post_status_change_end_) (int retVal___, struct block_list *bl, enum sc_type type, int tid, const char *file, int line);
 typedef bool (*HPMHOOK_pre_status_is_immune_to_status) (struct status_change **sc, enum sc_type *type);
@@ -7724,8 +7910,8 @@ typedef int (*HPMHOOK_pre_status_get_val_flag) (enum sc_type *type);
 typedef int (*HPMHOOK_post_status_get_val_flag) (int retVal___, enum sc_type type);
 typedef void (*HPMHOOK_pre_status_change_start_display) (struct map_session_data **sd, enum sc_type *type, int *val1, int *val2, int *val3, int *val4);
 typedef void (*HPMHOOK_post_status_change_start_display) (struct map_session_data *sd, enum sc_type type, int val1, int val2, int val3, int val4);
-typedef bool (*HPMHOOK_pre_status_change_start_unknown_sc) (struct block_list **src, struct block_list **bl, enum sc_type *type, int *calc_flag, int *rate, int *val1, int *val2, int *val3, int *val4, int *tick, int *flag);
-typedef bool (*HPMHOOK_post_status_change_start_unknown_sc) (bool retVal___, struct block_list *src, struct block_list *bl, enum sc_type type, int calc_flag, int rate, int val1, int val2, int val3, int val4, int tick, int flag);
+typedef bool (*HPMHOOK_pre_status_change_start_unknown_sc) (struct block_list **src, struct block_list **bl, enum sc_type *type, int *calc_flag, int *rate, int *val1, int *val2, int *val3, int *val4, int *total_tick, int *flag);
+typedef bool (*HPMHOOK_post_status_change_start_unknown_sc) (bool retVal___, struct block_list *src, struct block_list *bl, enum sc_type type, int calc_flag, int rate, int val1, int val2, int val3, int val4, int total_tick, int flag);
 typedef int (*HPMHOOK_pre_status_kaahi_heal_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
 typedef int (*HPMHOOK_post_status_kaahi_heal_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
 typedef int (*HPMHOOK_pre_status_change_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
@@ -7774,10 +7960,10 @@ typedef defType (*HPMHOOK_pre_status_calc_mdef) (struct block_list **bl, struct
 typedef defType (*HPMHOOK_post_status_calc_mdef) (defType retVal___, struct block_list *bl, struct status_change *sc, int mdef, bool viewable);
 typedef short (*HPMHOOK_pre_status_calc_mdef2) (struct block_list **bl, struct status_change **sc, int *mdef2, bool *viewable);
 typedef short (*HPMHOOK_post_status_calc_mdef2) (short retVal___, struct block_list *bl, struct status_change *sc, int mdef2, bool viewable);
-typedef unsigned short (*HPMHOOK_pre_status_calc_batk) (struct block_list **bl, struct status_change **sc, int *batk, bool *viewable);
-typedef unsigned short (*HPMHOOK_post_status_calc_batk) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int batk, bool viewable);
-typedef unsigned short (*HPMHOOK_pre_status_base_matk) (struct block_list **bl, const struct status_data **st, int *level);
-typedef unsigned short (*HPMHOOK_post_status_base_matk) (unsigned short retVal___, struct block_list *bl, const struct status_data *st, int level);
+typedef int (*HPMHOOK_pre_status_calc_batk) (struct block_list **bl, struct status_change **sc, int *batk, bool *viewable);
+typedef int (*HPMHOOK_post_status_calc_batk) (int retVal___, struct block_list *bl, struct status_change *sc, int batk, bool viewable);
+typedef int (*HPMHOOK_pre_status_base_matk) (struct block_list **bl, const struct status_data **st, int *level);
+typedef int (*HPMHOOK_post_status_base_matk) (int retVal___, struct block_list *bl, const struct status_data *st, int level);
 typedef int (*HPMHOOK_pre_status_get_weapon_atk) (struct block_list **src, struct weapon_atk **watk, int *flag);
 typedef int (*HPMHOOK_post_status_get_weapon_atk) (int retVal___, struct block_list *src, struct weapon_atk *watk, int flag);
 typedef int (*HPMHOOK_pre_status_get_total_mdef) (struct block_list **src);
@@ -7796,8 +7982,8 @@ typedef void (*HPMHOOK_pre_status_initDummyData) (void);
 typedef void (*HPMHOOK_post_status_initDummyData) (void);
 typedef int (*HPMHOOK_pre_status_base_amotion_pc) (struct map_session_data **sd, struct status_data **st);
 typedef int (*HPMHOOK_post_status_base_amotion_pc) (int retVal___, struct map_session_data *sd, struct status_data *st);
-typedef unsigned short (*HPMHOOK_pre_status_base_atk) (const struct block_list **bl, const struct status_data **st);
-typedef unsigned short (*HPMHOOK_post_status_base_atk) (unsigned short retVal___, const struct block_list *bl, const struct status_data *st);
+typedef int (*HPMHOOK_pre_status_base_atk) (const struct block_list **bl, const struct status_data **st);
+typedef int (*HPMHOOK_post_status_base_atk) (int retVal___, const struct block_list *bl, const struct status_data *st);
 typedef unsigned int (*HPMHOOK_pre_status_get_base_maxhp) (const struct map_session_data **sd, const struct status_data **st);
 typedef unsigned int (*HPMHOOK_post_status_get_base_maxhp) (unsigned int retVal___, const struct map_session_data *sd, const struct status_data *st);
 typedef unsigned int (*HPMHOOK_pre_status_get_base_maxsp) (const struct map_session_data **sd, const struct status_data **st);
@@ -7820,18 +8006,18 @@ typedef unsigned short (*HPMHOOK_pre_status_calc_dex) (struct block_list **bl, s
 typedef unsigned short (*HPMHOOK_post_status_calc_dex) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int dex);
 typedef unsigned short (*HPMHOOK_pre_status_calc_luk) (struct block_list **bl, struct status_change **sc, int *luk);
 typedef unsigned short (*HPMHOOK_post_status_calc_luk) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int luk);
-typedef unsigned short (*HPMHOOK_pre_status_calc_watk) (struct block_list **bl, struct status_change **sc, int *watk, bool *viewable);
-typedef unsigned short (*HPMHOOK_post_status_calc_watk) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int watk, bool viewable);
-typedef unsigned short (*HPMHOOK_pre_status_calc_matk) (struct block_list **bl, struct status_change **sc, int *matk, bool *viewable);
-typedef unsigned short (*HPMHOOK_post_status_calc_matk) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int matk, bool viewable);
-typedef signed short (*HPMHOOK_pre_status_calc_hit) (struct block_list **bl, struct status_change **sc, int *hit, bool *viewable);
-typedef signed short (*HPMHOOK_post_status_calc_hit) (signed short retVal___, struct block_list *bl, struct status_change *sc, int hit, bool viewable);
-typedef signed short (*HPMHOOK_pre_status_calc_critical) (struct block_list **bl, struct status_change **sc, int *critical, bool *viewable);
-typedef signed short (*HPMHOOK_post_status_calc_critical) (signed short retVal___, struct block_list *bl, struct status_change *sc, int critical, bool viewable);
-typedef signed short (*HPMHOOK_pre_status_calc_flee) (struct block_list **bl, struct status_change **sc, int *flee, bool *viewable);
-typedef signed short (*HPMHOOK_post_status_calc_flee) (signed short retVal___, struct block_list *bl, struct status_change *sc, int flee, bool viewable);
-typedef signed short (*HPMHOOK_pre_status_calc_flee2) (struct block_list **bl, struct status_change **sc, int *flee2, bool *viewable);
-typedef signed short (*HPMHOOK_post_status_calc_flee2) (signed short retVal___, struct block_list *bl, struct status_change *sc, int flee2, bool viewable);
+typedef int (*HPMHOOK_pre_status_calc_watk) (struct block_list **bl, struct status_change **sc, int *watk, bool *viewable);
+typedef int (*HPMHOOK_post_status_calc_watk) (int retVal___, struct block_list *bl, struct status_change *sc, int watk, bool viewable);
+typedef int (*HPMHOOK_pre_status_calc_matk) (struct block_list **bl, struct status_change **sc, int *matk, bool *viewable);
+typedef int (*HPMHOOK_post_status_calc_matk) (int retVal___, struct block_list *bl, struct status_change *sc, int matk, bool viewable);
+typedef signed int (*HPMHOOK_pre_status_calc_hit) (struct block_list **bl, struct status_change **sc, int *hit, bool *viewable);
+typedef signed int (*HPMHOOK_post_status_calc_hit) (signed int retVal___, struct block_list *bl, struct status_change *sc, int hit, bool viewable);
+typedef signed int (*HPMHOOK_pre_status_calc_critical) (struct block_list **bl, struct status_change **sc, int *critical, bool *viewable);
+typedef signed int (*HPMHOOK_post_status_calc_critical) (signed int retVal___, struct block_list *bl, struct status_change *sc, int critical, bool viewable);
+typedef signed int (*HPMHOOK_pre_status_calc_flee) (struct block_list **bl, struct status_change **sc, int *flee, bool *viewable);
+typedef signed int (*HPMHOOK_post_status_calc_flee) (signed int retVal___, struct block_list *bl, struct status_change *sc, int flee, bool viewable);
+typedef signed int (*HPMHOOK_pre_status_calc_flee2) (struct block_list **bl, struct status_change **sc, int *flee2, bool *viewable);
+typedef signed int (*HPMHOOK_post_status_calc_flee2) (signed int retVal___, struct block_list *bl, struct status_change *sc, int flee2, bool viewable);
 typedef unsigned short (*HPMHOOK_pre_status_calc_speed) (struct block_list **bl, struct status_change **sc, int *speed);
 typedef unsigned short (*HPMHOOK_post_status_calc_speed) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int speed);
 typedef short (*HPMHOOK_pre_status_calc_aspd_rate) (struct block_list **bl, struct status_change **sc, int *aspd_rate);
@@ -7852,8 +8038,8 @@ typedef unsigned char (*HPMHOOK_pre_status_calc_element_lv) (struct block_list *
 typedef unsigned char (*HPMHOOK_post_status_calc_element_lv) (unsigned char retVal___, struct block_list *bl, struct status_change *sc, int lv);
 typedef uint32 (*HPMHOOK_pre_status_calc_mode) (const struct block_list **bl, const struct status_change **sc, uint32 *mode);
 typedef uint32 (*HPMHOOK_post_status_calc_mode) (uint32 retVal___, const struct block_list *bl, const struct status_change *sc, uint32 mode);
-typedef unsigned short (*HPMHOOK_pre_status_calc_ematk) (struct block_list **bl, struct status_change **sc, int *matk);
-typedef unsigned short (*HPMHOOK_post_status_calc_ematk) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int matk);
+typedef int (*HPMHOOK_pre_status_calc_ematk) (struct block_list **bl, struct status_change **sc, int *matk);
+typedef int (*HPMHOOK_post_status_calc_ematk) (int retVal___, struct block_list *bl, struct status_change *sc, int matk);
 typedef void (*HPMHOOK_pre_status_calc_bl_main) (struct block_list **bl, int *flag);
 typedef void (*HPMHOOK_post_status_calc_bl_main) (struct block_list *bl, int flag);
 typedef void (*HPMHOOK_pre_status_display_add) (struct map_session_data **sd, enum sc_type *type, int *dval1, int *dval2, int *dval3);
@@ -7868,24 +8054,26 @@ typedef bool (*HPMHOOK_pre_status_readdb_job2) (char **fields[], int *columns, i
 typedef bool (*HPMHOOK_post_status_readdb_job2) (bool retVal___, char *fields[], int columns, int current);
 typedef bool (*HPMHOOK_pre_status_readdb_sizefix) (char **fields[], int *columns, int *current);
 typedef bool (*HPMHOOK_post_status_readdb_sizefix) (bool retVal___, char *fields[], int columns, int current);
-typedef int (*HPMHOOK_pre_status_readdb_refine_libconfig) (const char **filename);
-typedef int (*HPMHOOK_post_status_readdb_refine_libconfig) (int retVal___, const char *filename);
-typedef int (*HPMHOOK_pre_status_readdb_refine_libconfig_sub) (struct config_setting_t **r, const char **name, const char **source);
-typedef int (*HPMHOOK_post_status_readdb_refine_libconfig_sub) (int retVal___, struct config_setting_t *r, const char *name, const char *source);
-typedef bool (*HPMHOOK_pre_status_readdb_scconfig) (char **fields[], int *columns, int *current);
-typedef bool (*HPMHOOK_post_status_readdb_scconfig) (bool retVal___, char *fields[], int columns, int current);
+typedef bool (*HPMHOOK_pre_status_read_scdb_libconfig) (void);
+typedef bool (*HPMHOOK_post_status_read_scdb_libconfig) (bool retVal___);
+typedef bool (*HPMHOOK_pre_status_read_scdb_libconfig_sub) (struct config_setting_t **it, int *idx, const char **source);
+typedef bool (*HPMHOOK_post_status_read_scdb_libconfig_sub) (bool retVal___, struct config_setting_t *it, int idx, const char *source);
+typedef bool (*HPMHOOK_pre_status_read_scdb_libconfig_sub_flag) (struct config_setting_t **it, int *type, const char **source);
+typedef bool (*HPMHOOK_post_status_read_scdb_libconfig_sub_flag) (bool retVal___, struct config_setting_t *it, int type, const char *source);
+typedef bool (*HPMHOOK_pre_status_read_scdb_libconfig_sub_flag_additional) (struct config_setting_t **it, int *type, const char **source);
+typedef bool (*HPMHOOK_post_status_read_scdb_libconfig_sub_flag_additional) (bool retVal___, struct config_setting_t *it, int type, const char *source);
 typedef void (*HPMHOOK_pre_status_read_job_db) (void);
 typedef void (*HPMHOOK_post_status_read_job_db) (void);
 typedef void (*HPMHOOK_pre_status_read_job_db_sub) (int *idx, const char **name, struct config_setting_t **jdb);
 typedef void (*HPMHOOK_post_status_read_job_db_sub) (int idx, const char *name, struct config_setting_t *jdb);
-typedef void (*HPMHOOK_pre_status_set_sc) (uint16 *skill_id, sc_type *sc, int *icon, unsigned int *flag);
-typedef void (*HPMHOOK_post_status_set_sc) (uint16 skill_id, sc_type sc, int icon, unsigned int flag);
+typedef void (*HPMHOOK_pre_status_set_sc) (uint16 *skill_id, sc_type *sc, unsigned int *flag);
+typedef void (*HPMHOOK_post_status_set_sc) (uint16 skill_id, sc_type sc, unsigned int flag);
 typedef void (*HPMHOOK_pre_status_copy) (struct status_data **a, const struct status_data **b);
 typedef void (*HPMHOOK_post_status_copy) (struct status_data *a, const struct status_data *b);
-typedef unsigned short (*HPMHOOK_pre_status_base_matk_min) (const struct status_data **st);
-typedef unsigned short (*HPMHOOK_post_status_base_matk_min) (unsigned short retVal___, const struct status_data *st);
-typedef unsigned short (*HPMHOOK_pre_status_base_matk_max) (const struct status_data **st);
-typedef unsigned short (*HPMHOOK_post_status_base_matk_max) (unsigned short retVal___, const struct status_data *st);
+typedef int (*HPMHOOK_pre_status_base_matk_min) (const struct status_data **st);
+typedef int (*HPMHOOK_post_status_base_matk_min) (int retVal___, const struct status_data *st);
+typedef int (*HPMHOOK_pre_status_base_matk_max) (const struct status_data **st);
+typedef int (*HPMHOOK_post_status_base_matk_max) (int retVal___, const struct status_data *st);
 #endif // MAP_STATUS_H
 #ifdef MAP_STORAGE_H /* storage */
 typedef void (*HPMHOOK_pre_storage_reconnect) (void);
@@ -7969,6 +8157,26 @@ typedef int (*HPMHOOK_post_strlib_strline_) (int retVal___, const char *str, siz
 typedef bool (*HPMHOOK_pre_strlib_bin2hex_) (char **output, const unsigned char **input, size_t *count);
 typedef bool (*HPMHOOK_post_strlib_bin2hex_) (bool retVal___, char *output, const unsigned char *input, size_t count);
 #endif // COMMON_STRLIB_H
+#ifdef MAP_STYLIST_H /* stylist */
+typedef void (*HPMHOOK_pre_stylist_init) (bool *minimal);
+typedef void (*HPMHOOK_post_stylist_init) (bool minimal);
+typedef void (*HPMHOOK_pre_stylist_final) (void);
+typedef void (*HPMHOOK_post_stylist_final) (void);
+typedef void (*HPMHOOK_pre_stylist_vector_init) (void);
+typedef void (*HPMHOOK_post_stylist_vector_init) (void);
+typedef void (*HPMHOOK_pre_stylist_vector_clear) (void);
+typedef void (*HPMHOOK_post_stylist_vector_clear) (void);
+typedef bool (*HPMHOOK_pre_stylist_read_db_libconfig) (void);
+typedef bool (*HPMHOOK_post_stylist_read_db_libconfig) (bool retVal___);
+typedef bool (*HPMHOOK_pre_stylist_read_db_libconfig_sub) (struct config_setting_t **it, int *idx, const char **source);
+typedef bool (*HPMHOOK_post_stylist_read_db_libconfig_sub) (bool retVal___, struct config_setting_t *it, int idx, const char *source);
+typedef void (*HPMHOOK_pre_stylist_request_style_change) (struct map_session_data **sd, int *type, int16 *idx, bool *isitem);
+typedef void (*HPMHOOK_post_stylist_request_style_change) (struct map_session_data *sd, int type, int16 idx, bool isitem);
+typedef bool (*HPMHOOK_pre_stylist_validate_requirements) (struct map_session_data **sd, int *type, int16 *idx);
+typedef bool (*HPMHOOK_post_stylist_validate_requirements) (bool retVal___, struct map_session_data *sd, int type, int16 idx);
+typedef void (*HPMHOOK_pre_stylist_send_rodexitem) (struct map_session_data **sd, int *itemid);
+typedef void (*HPMHOOK_post_stylist_send_rodexitem) (struct map_session_data *sd, int itemid);
+#endif // MAP_STYLIST_H
 #ifdef COMMON_STRLIB_H /* sv */
 typedef int (*HPMHOOK_pre_sv_parse_next) (struct s_svstate **svstate);
 typedef int (*HPMHOOK_post_sv_parse_next) (int retVal___, struct s_svstate *svstate);
@@ -8102,22 +8310,24 @@ typedef int (*HPMHOOK_pre_unit_final) (void);
 typedef int (*HPMHOOK_post_unit_final) (int retVal___);
 typedef struct unit_data* (*HPMHOOK_pre_unit_bl2ud) (struct block_list **bl);
 typedef struct unit_data* (*HPMHOOK_post_unit_bl2ud) (struct unit_data* retVal___, struct block_list *bl);
+typedef const struct unit_data* (*HPMHOOK_pre_unit_cbl2ud) (const struct block_list **bl);
+typedef const struct unit_data* (*HPMHOOK_post_unit_cbl2ud) (const struct unit_data* retVal___, const struct block_list *bl);
 typedef struct unit_data* (*HPMHOOK_pre_unit_bl2ud2) (struct block_list **bl);
 typedef struct unit_data* (*HPMHOOK_post_unit_bl2ud2) (struct unit_data* retVal___, struct block_list *bl);
 typedef void (*HPMHOOK_pre_unit_init_ud) (struct unit_data **ud);
 typedef void (*HPMHOOK_post_unit_init_ud) (struct unit_data *ud);
 typedef int (*HPMHOOK_pre_unit_attack_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
 typedef int (*HPMHOOK_post_unit_attack_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
-typedef int (*HPMHOOK_pre_unit_walktoxy_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
-typedef int (*HPMHOOK_post_unit_walktoxy_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
-typedef int (*HPMHOOK_pre_unit_walktoxy_sub) (struct block_list **bl);
-typedef int (*HPMHOOK_post_unit_walktoxy_sub) (int retVal___, struct block_list *bl);
-typedef int (*HPMHOOK_pre_unit_delay_walktoxy_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
-typedef int (*HPMHOOK_post_unit_delay_walktoxy_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
-typedef int (*HPMHOOK_pre_unit_walktoxy) (struct block_list **bl, short *x, short *y, int *flag);
-typedef int (*HPMHOOK_post_unit_walktoxy) (int retVal___, struct block_list *bl, short x, short y, int flag);
-typedef int (*HPMHOOK_pre_unit_walktobl_sub) (int *tid, int64 *tick, int *id, intptr_t *data);
-typedef int (*HPMHOOK_post_unit_walktobl_sub) (int retVal___, int tid, int64 tick, int id, intptr_t data);
+typedef int (*HPMHOOK_pre_unit_walk_toxy_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
+typedef int (*HPMHOOK_post_unit_walk_toxy_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
+typedef int (*HPMHOOK_pre_unit_walk_toxy_sub) (struct block_list **bl);
+typedef int (*HPMHOOK_post_unit_walk_toxy_sub) (int retVal___, struct block_list *bl);
+typedef int (*HPMHOOK_pre_unit_delay_walk_toxy_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
+typedef int (*HPMHOOK_post_unit_delay_walk_toxy_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
+typedef int (*HPMHOOK_pre_unit_walk_toxy) (struct block_list **bl, short *x, short *y, int *flag);
+typedef int (*HPMHOOK_post_unit_walk_toxy) (int retVal___, struct block_list *bl, short x, short y, int flag);
+typedef int (*HPMHOOK_pre_unit_walktobl_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
+typedef int (*HPMHOOK_post_unit_walktobl_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
 typedef int (*HPMHOOK_pre_unit_walktobl) (struct block_list **bl, struct block_list **tbl, int *range, int *flag);
 typedef int (*HPMHOOK_post_unit_walktobl) (int retVal___, struct block_list *bl, struct block_list *tbl, int range, int flag);
 typedef bool (*HPMHOOK_pre_unit_run) (struct block_list **bl, struct map_session_data **sd, enum sc_type *type);
@@ -8128,20 +8338,22 @@ typedef int (*HPMHOOK_pre_unit_escape) (struct block_list **bl, struct block_lis
 typedef int (*HPMHOOK_post_unit_escape) (int retVal___, struct block_list *bl, struct block_list *target, short dist);
 typedef int (*HPMHOOK_pre_unit_movepos) (struct block_list **bl, short *dst_x, short *dst_y, int *easy, bool *checkpath);
 typedef int (*HPMHOOK_post_unit_movepos) (int retVal___, struct block_list *bl, short dst_x, short dst_y, int easy, bool checkpath);
-typedef int (*HPMHOOK_pre_unit_setdir) (struct block_list **bl, unsigned char *dir);
-typedef int (*HPMHOOK_post_unit_setdir) (int retVal___, struct block_list *bl, unsigned char dir);
-typedef uint8 (*HPMHOOK_pre_unit_getdir) (struct block_list **bl);
-typedef uint8 (*HPMHOOK_post_unit_getdir) (uint8 retVal___, struct block_list *bl);
+typedef int (*HPMHOOK_pre_unit_set_dir) (struct block_list **bl, enum unit_dir *dir);
+typedef int (*HPMHOOK_post_unit_set_dir) (int retVal___, struct block_list *bl, enum unit_dir dir);
+typedef enum unit_dir (*HPMHOOK_pre_unit_getdir) (const struct block_list **bl);
+typedef enum unit_dir (*HPMHOOK_post_unit_getdir) (enum unit_dir retVal___, const struct block_list *bl);
 typedef int (*HPMHOOK_pre_unit_blown) (struct block_list **bl, int *dx, int *dy, int *count, int *flag);
 typedef int (*HPMHOOK_post_unit_blown) (int retVal___, struct block_list *bl, int dx, int dy, int count, int flag);
 typedef int (*HPMHOOK_pre_unit_warp) (struct block_list **bl, short *m, short *x, short *y, enum clr_type *type);
 typedef int (*HPMHOOK_post_unit_warp) (int retVal___, struct block_list *bl, short m, short x, short y, enum clr_type type);
+typedef int (*HPMHOOK_pre_unit_warpto_master) (struct block_list **master_bl, struct block_list **slave_bl);
+typedef int (*HPMHOOK_post_unit_warpto_master) (int retVal___, struct block_list *master_bl, struct block_list *slave_bl);
 typedef int (*HPMHOOK_pre_unit_stop_walking) (struct block_list **bl, int *type);
 typedef int (*HPMHOOK_post_unit_stop_walking) (int retVal___, struct block_list *bl, int type);
 typedef int (*HPMHOOK_pre_unit_skilluse_id) (struct block_list **src, int *target_id, uint16 *skill_id, uint16 *skill_lv);
 typedef int (*HPMHOOK_post_unit_skilluse_id) (int retVal___, struct block_list *src, int target_id, uint16 skill_id, uint16 skill_lv);
-typedef int (*HPMHOOK_pre_unit_step_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
-typedef int (*HPMHOOK_post_unit_step_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
+typedef int (*HPMHOOK_pre_unit_steptimer) (int *tid, int64 *tick, int *id, intptr_t *data);
+typedef int (*HPMHOOK_post_unit_steptimer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
 typedef void (*HPMHOOK_pre_unit_stop_stepaction) (struct block_list **bl);
 typedef void (*HPMHOOK_post_unit_stop_stepaction) (struct block_list *bl);
 typedef int (*HPMHOOK_pre_unit_is_walking) (struct block_list **bl);
@@ -8172,8 +8384,8 @@ typedef bool (*HPMHOOK_pre_unit_can_reach_pos) (struct block_list **bl, int *x,
 typedef bool (*HPMHOOK_post_unit_can_reach_pos) (bool retVal___, struct block_list *bl, int x, int y, int easy);
 typedef bool (*HPMHOOK_pre_unit_can_reach_bl) (struct block_list **bl, struct block_list **tbl, int *range, int *easy, short **x, short **y);
 typedef bool (*HPMHOOK_post_unit_can_reach_bl) (bool retVal___, struct block_list *bl, struct block_list *tbl, int range, int easy, short *x, short *y);
-typedef int (*HPMHOOK_pre_unit_calc_pos) (struct block_list **bl, int *tx, int *ty, uint8 *dir);
-typedef int (*HPMHOOK_post_unit_calc_pos) (int retVal___, struct block_list *bl, int tx, int ty, uint8 dir);
+typedef int (*HPMHOOK_pre_unit_calc_pos) (struct block_list **bl, int *tx, int *ty, enum unit_dir *dir);
+typedef int (*HPMHOOK_post_unit_calc_pos) (int retVal___, struct block_list *bl, int tx, int ty, enum unit_dir dir);
 typedef int (*HPMHOOK_pre_unit_attack_timer_sub) (struct block_list **src, int *tid, int64 *tick);
 typedef int (*HPMHOOK_post_unit_attack_timer_sub) (int retVal___, struct block_list *src, int tid, int64 tick);
 typedef int (*HPMHOOK_pre_unit_skillcastcancel) (struct block_list **bl, int *type);
diff --git a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
index a8b4860f3..ab34a4f18 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2013-2019  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
@@ -610,10 +610,6 @@ struct {
 	struct HPMHookPoint *HP_inter_init_sql_post;
 	struct HPMHookPoint *HP_inter_mapif_init_pre;
 	struct HPMHookPoint *HP_inter_mapif_init_post;
-	struct HPMHookPoint *HP_inter_check_ttl_wisdata_sub_pre;
-	struct HPMHookPoint *HP_inter_check_ttl_wisdata_sub_post;
-	struct HPMHookPoint *HP_inter_check_ttl_wisdata_pre;
-	struct HPMHookPoint *HP_inter_check_ttl_wisdata_post;
 	struct HPMHookPoint *HP_inter_check_length_pre;
 	struct HPMHookPoint *HP_inter_check_length_post;
 	struct HPMHookPoint *HP_inter_parse_frommap_pre;
@@ -630,12 +626,6 @@ struct {
 	struct HPMHookPoint *HP_inter_accinfo_post;
 	struct HPMHookPoint *HP_inter_accinfo2_pre;
 	struct HPMHookPoint *HP_inter_accinfo2_post;
-	struct HPMHookPoint *HP_inter_add_wisdata_pre;
-	struct HPMHookPoint *HP_inter_add_wisdata_post;
-	struct HPMHookPoint *HP_inter_get_wisdata_pre;
-	struct HPMHookPoint *HP_inter_get_wisdata_post;
-	struct HPMHookPoint *HP_inter_remove_wisdata_pre;
-	struct HPMHookPoint *HP_inter_remove_wisdata_post;
 	struct HPMHookPoint *HP_inter_mail_sql_init_pre;
 	struct HPMHookPoint *HP_inter_mail_sql_init_post;
 	struct HPMHookPoint *HP_inter_mail_sql_final_pre;
@@ -684,10 +674,14 @@ struct {
 	struct HPMHookPoint *HP_inter_mercenary_delete_post;
 	struct HPMHookPoint *HP_inter_party_check_lv_pre;
 	struct HPMHookPoint *HP_inter_party_check_lv_post;
+	struct HPMHookPoint *HP_inter_party_is_family_party_pre;
+	struct HPMHookPoint *HP_inter_party_is_family_party_post;
 	struct HPMHookPoint *HP_inter_party_calc_state_pre;
 	struct HPMHookPoint *HP_inter_party_calc_state_post;
 	struct HPMHookPoint *HP_inter_party_tosql_pre;
 	struct HPMHookPoint *HP_inter_party_tosql_post;
+	struct HPMHookPoint *HP_inter_party_del_nonexistent_party_pre;
+	struct HPMHookPoint *HP_inter_party_del_nonexistent_party_post;
 	struct HPMHookPoint *HP_inter_party_fromsql_pre;
 	struct HPMHookPoint *HP_inter_party_fromsql_post;
 	struct HPMHookPoint *HP_inter_party_sql_init_pre;
@@ -764,6 +758,10 @@ struct {
 	struct HPMHookPoint *HP_inter_rodex_savemessage_post;
 	struct HPMHookPoint *HP_inter_rodex_updatemail_pre;
 	struct HPMHookPoint *HP_inter_rodex_updatemail_post;
+	struct HPMHookPoint *HP_inter_rodex_getzeny_pre;
+	struct HPMHookPoint *HP_inter_rodex_getzeny_post;
+	struct HPMHookPoint *HP_inter_rodex_getitems_pre;
+	struct HPMHookPoint *HP_inter_rodex_getitems_post;
 	struct HPMHookPoint *HP_inter_storage_tosql_pre;
 	struct HPMHookPoint *HP_inter_storage_tosql_post;
 	struct HPMHookPoint *HP_inter_storage_fromsql_pre;
@@ -784,6 +782,10 @@ struct {
 	struct HPMHookPoint *HP_inter_storage_parse_frommap_post;
 	struct HPMHookPoint *HP_inter_storage_retrieve_bound_items_pre;
 	struct HPMHookPoint *HP_inter_storage_retrieve_bound_items_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;
@@ -1028,8 +1030,6 @@ struct {
 	struct HPMHookPoint *HP_mapif_guild_memberinfoshort_post;
 	struct HPMHookPoint *HP_mapif_guild_broken_pre;
 	struct HPMHookPoint *HP_mapif_guild_broken_post;
-	struct HPMHookPoint *HP_mapif_guild_message_pre;
-	struct HPMHookPoint *HP_mapif_guild_message_post;
 	struct HPMHookPoint *HP_mapif_guild_basicinfochanged_pre;
 	struct HPMHookPoint *HP_mapif_guild_basicinfochanged_post;
 	struct HPMHookPoint *HP_mapif_guild_memberinfochanged_pre;
@@ -1060,8 +1060,6 @@ struct {
 	struct HPMHookPoint *HP_mapif_parse_GuildChangeMemberInfoShort_post;
 	struct HPMHookPoint *HP_mapif_parse_BreakGuild_pre;
 	struct HPMHookPoint *HP_mapif_parse_BreakGuild_post;
-	struct HPMHookPoint *HP_mapif_parse_GuildMessage_pre;
-	struct HPMHookPoint *HP_mapif_parse_GuildMessage_post;
 	struct HPMHookPoint *HP_mapif_parse_GuildBasicInfoChange_pre;
 	struct HPMHookPoint *HP_mapif_parse_GuildBasicInfoChange_post;
 	struct HPMHookPoint *HP_mapif_parse_GuildMemberInfoChange_pre;
@@ -1156,8 +1154,6 @@ struct {
 	struct HPMHookPoint *HP_mapif_party_membermoved_post;
 	struct HPMHookPoint *HP_mapif_party_broken_pre;
 	struct HPMHookPoint *HP_mapif_party_broken_post;
-	struct HPMHookPoint *HP_mapif_party_message_pre;
-	struct HPMHookPoint *HP_mapif_party_message_post;
 	struct HPMHookPoint *HP_mapif_parse_CreateParty_pre;
 	struct HPMHookPoint *HP_mapif_parse_CreateParty_post;
 	struct HPMHookPoint *HP_mapif_parse_PartyInfo_pre;
@@ -1172,8 +1168,6 @@ struct {
 	struct HPMHookPoint *HP_mapif_parse_PartyChangeMap_post;
 	struct HPMHookPoint *HP_mapif_parse_BreakParty_pre;
 	struct HPMHookPoint *HP_mapif_parse_BreakParty_post;
-	struct HPMHookPoint *HP_mapif_parse_PartyMessage_pre;
-	struct HPMHookPoint *HP_mapif_parse_PartyMessage_post;
 	struct HPMHookPoint *HP_mapif_parse_PartyLeaderChange_pre;
 	struct HPMHookPoint *HP_mapif_parse_PartyLeaderChange_post;
 	struct HPMHookPoint *HP_mapif_pet_created_pre;
@@ -1224,6 +1218,10 @@ struct {
 	struct HPMHookPoint *HP_mapif_parse_rodex_checkname_post;
 	struct HPMHookPoint *HP_mapif_rodex_checkname_pre;
 	struct HPMHookPoint *HP_mapif_rodex_checkname_post;
+	struct HPMHookPoint *HP_mapif_rodex_getzenyack_pre;
+	struct HPMHookPoint *HP_mapif_rodex_getzenyack_post;
+	struct HPMHookPoint *HP_mapif_rodex_getitemsack_pre;
+	struct HPMHookPoint *HP_mapif_rodex_getitemsack_post;
 	struct HPMHookPoint *HP_mapif_load_guild_storage_pre;
 	struct HPMHookPoint *HP_mapif_load_guild_storage_post;
 	struct HPMHookPoint *HP_mapif_save_guild_storage_ack_pre;
@@ -1246,26 +1244,10 @@ struct {
 	struct HPMHookPoint *HP_mapif_parse_ItemBoundRetrieve_post;
 	struct HPMHookPoint *HP_mapif_parse_accinfo_pre;
 	struct HPMHookPoint *HP_mapif_parse_accinfo_post;
-	struct HPMHookPoint *HP_mapif_broadcast_pre;
-	struct HPMHookPoint *HP_mapif_broadcast_post;
-	struct HPMHookPoint *HP_mapif_wis_message_pre;
-	struct HPMHookPoint *HP_mapif_wis_message_post;
-	struct HPMHookPoint *HP_mapif_wis_response_pre;
-	struct HPMHookPoint *HP_mapif_wis_response_post;
-	struct HPMHookPoint *HP_mapif_wis_end_pre;
-	struct HPMHookPoint *HP_mapif_wis_end_post;
 	struct HPMHookPoint *HP_mapif_account_reg_reply_pre;
 	struct HPMHookPoint *HP_mapif_account_reg_reply_post;
 	struct HPMHookPoint *HP_mapif_disconnectplayer_pre;
 	struct HPMHookPoint *HP_mapif_disconnectplayer_post;
-	struct HPMHookPoint *HP_mapif_parse_broadcast_pre;
-	struct HPMHookPoint *HP_mapif_parse_broadcast_post;
-	struct HPMHookPoint *HP_mapif_parse_WisRequest_pre;
-	struct HPMHookPoint *HP_mapif_parse_WisRequest_post;
-	struct HPMHookPoint *HP_mapif_parse_WisReply_pre;
-	struct HPMHookPoint *HP_mapif_parse_WisReply_post;
-	struct HPMHookPoint *HP_mapif_parse_WisToGM_pre;
-	struct HPMHookPoint *HP_mapif_parse_WisToGM_post;
 	struct HPMHookPoint *HP_mapif_parse_Registry_pre;
 	struct HPMHookPoint *HP_mapif_parse_Registry_post;
 	struct HPMHookPoint *HP_mapif_parse_RegistryRequest_pre;
@@ -1278,6 +1260,10 @@ struct {
 	struct HPMHookPoint *HP_mapif_parse_ClanMemberKick_post;
 	struct HPMHookPoint *HP_mapif_parse_ClanMemberCount_pre;
 	struct HPMHookPoint *HP_mapif_parse_ClanMemberCount_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;
@@ -1322,6 +1308,10 @@ struct {
 	struct HPMHookPoint *HP_mutex_cond_signal_post;
 	struct HPMHookPoint *HP_mutex_cond_broadcast_pre;
 	struct HPMHookPoint *HP_mutex_cond_broadcast_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;
@@ -1422,6 +1412,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;
@@ -2247,10 +2239,6 @@ struct {
 	int HP_inter_init_sql_post;
 	int HP_inter_mapif_init_pre;
 	int HP_inter_mapif_init_post;
-	int HP_inter_check_ttl_wisdata_sub_pre;
-	int HP_inter_check_ttl_wisdata_sub_post;
-	int HP_inter_check_ttl_wisdata_pre;
-	int HP_inter_check_ttl_wisdata_post;
 	int HP_inter_check_length_pre;
 	int HP_inter_check_length_post;
 	int HP_inter_parse_frommap_pre;
@@ -2267,12 +2255,6 @@ struct {
 	int HP_inter_accinfo_post;
 	int HP_inter_accinfo2_pre;
 	int HP_inter_accinfo2_post;
-	int HP_inter_add_wisdata_pre;
-	int HP_inter_add_wisdata_post;
-	int HP_inter_get_wisdata_pre;
-	int HP_inter_get_wisdata_post;
-	int HP_inter_remove_wisdata_pre;
-	int HP_inter_remove_wisdata_post;
 	int HP_inter_mail_sql_init_pre;
 	int HP_inter_mail_sql_init_post;
 	int HP_inter_mail_sql_final_pre;
@@ -2321,10 +2303,14 @@ struct {
 	int HP_inter_mercenary_delete_post;
 	int HP_inter_party_check_lv_pre;
 	int HP_inter_party_check_lv_post;
+	int HP_inter_party_is_family_party_pre;
+	int HP_inter_party_is_family_party_post;
 	int HP_inter_party_calc_state_pre;
 	int HP_inter_party_calc_state_post;
 	int HP_inter_party_tosql_pre;
 	int HP_inter_party_tosql_post;
+	int HP_inter_party_del_nonexistent_party_pre;
+	int HP_inter_party_del_nonexistent_party_post;
 	int HP_inter_party_fromsql_pre;
 	int HP_inter_party_fromsql_post;
 	int HP_inter_party_sql_init_pre;
@@ -2401,6 +2387,10 @@ struct {
 	int HP_inter_rodex_savemessage_post;
 	int HP_inter_rodex_updatemail_pre;
 	int HP_inter_rodex_updatemail_post;
+	int HP_inter_rodex_getzeny_pre;
+	int HP_inter_rodex_getzeny_post;
+	int HP_inter_rodex_getitems_pre;
+	int HP_inter_rodex_getitems_post;
 	int HP_inter_storage_tosql_pre;
 	int HP_inter_storage_tosql_post;
 	int HP_inter_storage_fromsql_pre;
@@ -2421,6 +2411,10 @@ struct {
 	int HP_inter_storage_parse_frommap_post;
 	int HP_inter_storage_retrieve_bound_items_pre;
 	int HP_inter_storage_retrieve_bound_items_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;
@@ -2665,8 +2659,6 @@ struct {
 	int HP_mapif_guild_memberinfoshort_post;
 	int HP_mapif_guild_broken_pre;
 	int HP_mapif_guild_broken_post;
-	int HP_mapif_guild_message_pre;
-	int HP_mapif_guild_message_post;
 	int HP_mapif_guild_basicinfochanged_pre;
 	int HP_mapif_guild_basicinfochanged_post;
 	int HP_mapif_guild_memberinfochanged_pre;
@@ -2697,8 +2689,6 @@ struct {
 	int HP_mapif_parse_GuildChangeMemberInfoShort_post;
 	int HP_mapif_parse_BreakGuild_pre;
 	int HP_mapif_parse_BreakGuild_post;
-	int HP_mapif_parse_GuildMessage_pre;
-	int HP_mapif_parse_GuildMessage_post;
 	int HP_mapif_parse_GuildBasicInfoChange_pre;
 	int HP_mapif_parse_GuildBasicInfoChange_post;
 	int HP_mapif_parse_GuildMemberInfoChange_pre;
@@ -2793,8 +2783,6 @@ struct {
 	int HP_mapif_party_membermoved_post;
 	int HP_mapif_party_broken_pre;
 	int HP_mapif_party_broken_post;
-	int HP_mapif_party_message_pre;
-	int HP_mapif_party_message_post;
 	int HP_mapif_parse_CreateParty_pre;
 	int HP_mapif_parse_CreateParty_post;
 	int HP_mapif_parse_PartyInfo_pre;
@@ -2809,8 +2797,6 @@ struct {
 	int HP_mapif_parse_PartyChangeMap_post;
 	int HP_mapif_parse_BreakParty_pre;
 	int HP_mapif_parse_BreakParty_post;
-	int HP_mapif_parse_PartyMessage_pre;
-	int HP_mapif_parse_PartyMessage_post;
 	int HP_mapif_parse_PartyLeaderChange_pre;
 	int HP_mapif_parse_PartyLeaderChange_post;
 	int HP_mapif_pet_created_pre;
@@ -2861,6 +2847,10 @@ struct {
 	int HP_mapif_parse_rodex_checkname_post;
 	int HP_mapif_rodex_checkname_pre;
 	int HP_mapif_rodex_checkname_post;
+	int HP_mapif_rodex_getzenyack_pre;
+	int HP_mapif_rodex_getzenyack_post;
+	int HP_mapif_rodex_getitemsack_pre;
+	int HP_mapif_rodex_getitemsack_post;
 	int HP_mapif_load_guild_storage_pre;
 	int HP_mapif_load_guild_storage_post;
 	int HP_mapif_save_guild_storage_ack_pre;
@@ -2883,26 +2873,10 @@ struct {
 	int HP_mapif_parse_ItemBoundRetrieve_post;
 	int HP_mapif_parse_accinfo_pre;
 	int HP_mapif_parse_accinfo_post;
-	int HP_mapif_broadcast_pre;
-	int HP_mapif_broadcast_post;
-	int HP_mapif_wis_message_pre;
-	int HP_mapif_wis_message_post;
-	int HP_mapif_wis_response_pre;
-	int HP_mapif_wis_response_post;
-	int HP_mapif_wis_end_pre;
-	int HP_mapif_wis_end_post;
 	int HP_mapif_account_reg_reply_pre;
 	int HP_mapif_account_reg_reply_post;
 	int HP_mapif_disconnectplayer_pre;
 	int HP_mapif_disconnectplayer_post;
-	int HP_mapif_parse_broadcast_pre;
-	int HP_mapif_parse_broadcast_post;
-	int HP_mapif_parse_WisRequest_pre;
-	int HP_mapif_parse_WisRequest_post;
-	int HP_mapif_parse_WisReply_pre;
-	int HP_mapif_parse_WisReply_post;
-	int HP_mapif_parse_WisToGM_pre;
-	int HP_mapif_parse_WisToGM_post;
 	int HP_mapif_parse_Registry_pre;
 	int HP_mapif_parse_Registry_post;
 	int HP_mapif_parse_RegistryRequest_pre;
@@ -2915,6 +2889,10 @@ struct {
 	int HP_mapif_parse_ClanMemberKick_post;
 	int HP_mapif_parse_ClanMemberCount_pre;
 	int HP_mapif_parse_ClanMemberCount_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;
@@ -2959,6 +2937,10 @@ struct {
 	int HP_mutex_cond_signal_post;
 	int HP_mutex_cond_broadcast_pre;
 	int HP_mutex_cond_broadcast_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;
@@ -3059,6 +3041,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;
diff --git a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
index 56c5bcfb7..238580b83 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2013-2019  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
@@ -333,8 +333,6 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(inter->vlog, HP_inter_vlog) },
 	{ HP_POP(inter->init_sql, HP_inter_init_sql) },
 	{ HP_POP(inter->mapif_init, HP_inter_mapif_init) },
-	{ HP_POP(inter->check_ttl_wisdata_sub, HP_inter_check_ttl_wisdata_sub) },
-	{ HP_POP(inter->check_ttl_wisdata, HP_inter_check_ttl_wisdata) },
 	{ HP_POP(inter->check_length, HP_inter_check_length) },
 	{ HP_POP(inter->parse_frommap, HP_inter_parse_frommap) },
 	{ HP_POP(inter->final, HP_inter_final) },
@@ -343,9 +341,6 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(inter->config_read_connection, HP_inter_config_read_connection) },
 	{ HP_POP(inter->accinfo, HP_inter_accinfo) },
 	{ HP_POP(inter->accinfo2, HP_inter_accinfo2) },
-	{ HP_POP(inter->add_wisdata, HP_inter_add_wisdata) },
-	{ HP_POP(inter->get_wisdata, HP_inter_get_wisdata) },
-	{ HP_POP(inter->remove_wisdata, HP_inter_remove_wisdata) },
 /* inter_mail_interface */
 	{ HP_POP(inter_mail->sql_init, HP_inter_mail_sql_init) },
 	{ HP_POP(inter_mail->sql_final, HP_inter_mail_sql_final) },
@@ -373,8 +368,10 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(inter_mercenary->delete, HP_inter_mercenary_delete) },
 /* inter_party_interface */
 	{ HP_POP(inter_party->check_lv, HP_inter_party_check_lv) },
+	{ HP_POP(inter_party->is_family_party, HP_inter_party_is_family_party) },
 	{ HP_POP(inter_party->calc_state, HP_inter_party_calc_state) },
 	{ HP_POP(inter_party->tosql, HP_inter_party_tosql) },
+	{ HP_POP(inter_party->del_nonexistent_party, HP_inter_party_del_nonexistent_party) },
 	{ HP_POP(inter_party->fromsql, HP_inter_party_fromsql) },
 	{ HP_POP(inter_party->sql_init, HP_inter_party_sql_init) },
 	{ HP_POP(inter_party->sql_final, HP_inter_party_sql_final) },
@@ -416,6 +413,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(inter_rodex->checkname, HP_inter_rodex_checkname) },
 	{ HP_POP(inter_rodex->savemessage, HP_inter_rodex_savemessage) },
 	{ HP_POP(inter_rodex->updatemail, HP_inter_rodex_updatemail) },
+	{ HP_POP(inter_rodex->getzeny, HP_inter_rodex_getzeny) },
+	{ HP_POP(inter_rodex->getitems, HP_inter_rodex_getitems) },
 /* inter_storage_interface */
 	{ HP_POP(inter_storage->tosql, HP_inter_storage_tosql) },
 	{ HP_POP(inter_storage->fromsql, HP_inter_storage_fromsql) },
@@ -428,6 +427,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(inter_storage->parse_frommap, HP_inter_storage_parse_frommap) },
 	{ HP_POP(inter_storage->retrieve_bound_items, HP_inter_storage_retrieve_bound_items) },
 /* libconfig_interface */
+	{ HP_POP(libconfig->set_db_path, HP_libconfig_set_db_path) },
+	{ HP_POP(libconfig->format_db_path, HP_libconfig_format_db_path) },
 	{ HP_POP(libconfig->read, HP_libconfig_read) },
 	{ HP_POP(libconfig->write, HP_libconfig_write) },
 	{ HP_POP(libconfig->set_options, HP_libconfig_set_options) },
@@ -552,7 +553,6 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(mapif->guild_withdraw, HP_mapif_guild_withdraw) },
 	{ HP_POP(mapif->guild_memberinfoshort, HP_mapif_guild_memberinfoshort) },
 	{ HP_POP(mapif->guild_broken, HP_mapif_guild_broken) },
-	{ HP_POP(mapif->guild_message, HP_mapif_guild_message) },
 	{ HP_POP(mapif->guild_basicinfochanged, HP_mapif_guild_basicinfochanged) },
 	{ HP_POP(mapif->guild_memberinfochanged, HP_mapif_guild_memberinfochanged) },
 	{ HP_POP(mapif->guild_skillupack, HP_mapif_guild_skillupack) },
@@ -568,7 +568,6 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(mapif->parse_GuildLeave, HP_mapif_parse_GuildLeave) },
 	{ HP_POP(mapif->parse_GuildChangeMemberInfoShort, HP_mapif_parse_GuildChangeMemberInfoShort) },
 	{ HP_POP(mapif->parse_BreakGuild, HP_mapif_parse_BreakGuild) },
-	{ HP_POP(mapif->parse_GuildMessage, HP_mapif_parse_GuildMessage) },
 	{ HP_POP(mapif->parse_GuildBasicInfoChange, HP_mapif_parse_GuildBasicInfoChange) },
 	{ HP_POP(mapif->parse_GuildMemberInfoChange, HP_mapif_parse_GuildMemberInfoChange) },
 	{ HP_POP(mapif->parse_GuildPosition, HP_mapif_parse_GuildPosition) },
@@ -616,7 +615,6 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(mapif->party_withdraw, HP_mapif_party_withdraw) },
 	{ HP_POP(mapif->party_membermoved, HP_mapif_party_membermoved) },
 	{ HP_POP(mapif->party_broken, HP_mapif_party_broken) },
-	{ HP_POP(mapif->party_message, HP_mapif_party_message) },
 	{ HP_POP(mapif->parse_CreateParty, HP_mapif_parse_CreateParty) },
 	{ HP_POP(mapif->parse_PartyInfo, HP_mapif_parse_PartyInfo) },
 	{ HP_POP(mapif->parse_PartyAddMember, HP_mapif_parse_PartyAddMember) },
@@ -624,7 +622,6 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(mapif->parse_PartyLeave, HP_mapif_parse_PartyLeave) },
 	{ HP_POP(mapif->parse_PartyChangeMap, HP_mapif_parse_PartyChangeMap) },
 	{ HP_POP(mapif->parse_BreakParty, HP_mapif_parse_BreakParty) },
-	{ HP_POP(mapif->parse_PartyMessage, HP_mapif_parse_PartyMessage) },
 	{ HP_POP(mapif->parse_PartyLeaderChange, HP_mapif_parse_PartyLeaderChange) },
 	{ HP_POP(mapif->pet_created, HP_mapif_pet_created) },
 	{ HP_POP(mapif->pet_info, HP_mapif_pet_info) },
@@ -650,6 +647,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(mapif->rodex_send, HP_mapif_rodex_send) },
 	{ HP_POP(mapif->parse_rodex_checkname, HP_mapif_parse_rodex_checkname) },
 	{ HP_POP(mapif->rodex_checkname, HP_mapif_rodex_checkname) },
+	{ HP_POP(mapif->rodex_getzenyack, HP_mapif_rodex_getzenyack) },
+	{ HP_POP(mapif->rodex_getitemsack, HP_mapif_rodex_getitemsack) },
 	{ HP_POP(mapif->load_guild_storage, HP_mapif_load_guild_storage) },
 	{ HP_POP(mapif->save_guild_storage_ack, HP_mapif_save_guild_storage_ack) },
 	{ HP_POP(mapif->parse_LoadGuildStorage, HP_mapif_parse_LoadGuildStorage) },
@@ -661,16 +660,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(mapif->itembound_ack, HP_mapif_itembound_ack) },
 	{ HP_POP(mapif->parse_ItemBoundRetrieve, HP_mapif_parse_ItemBoundRetrieve) },
 	{ HP_POP(mapif->parse_accinfo, HP_mapif_parse_accinfo) },
-	{ HP_POP(mapif->broadcast, HP_mapif_broadcast) },
-	{ HP_POP(mapif->wis_message, HP_mapif_wis_message) },
-	{ HP_POP(mapif->wis_response, HP_mapif_wis_response) },
-	{ HP_POP(mapif->wis_end, HP_mapif_wis_end) },
 	{ HP_POP(mapif->account_reg_reply, HP_mapif_account_reg_reply) },
 	{ HP_POP(mapif->disconnectplayer, HP_mapif_disconnectplayer) },
-	{ HP_POP(mapif->parse_broadcast, HP_mapif_parse_broadcast) },
-	{ HP_POP(mapif->parse_WisRequest, HP_mapif_parse_WisRequest) },
-	{ HP_POP(mapif->parse_WisReply, HP_mapif_parse_WisReply) },
-	{ HP_POP(mapif->parse_WisToGM, HP_mapif_parse_WisToGM) },
 	{ HP_POP(mapif->parse_Registry, HP_mapif_parse_Registry) },
 	{ HP_POP(mapif->parse_RegistryRequest, HP_mapif_parse_RegistryRequest) },
 	{ HP_POP(mapif->namechange_ack, HP_mapif_namechange_ack) },
@@ -678,6 +669,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(mapif->parse_ClanMemberKick, HP_mapif_parse_ClanMemberKick) },
 	{ HP_POP(mapif->parse_ClanMemberCount, HP_mapif_parse_ClanMemberCount) },
 /* mapindex_interface */
+	{ HP_POP(mapindex->config_read_dbpath, HP_mapindex_config_read_dbpath) },
+	{ HP_POP(mapindex->config_read, HP_mapindex_config_read) },
 	{ HP_POP(mapindex->init, HP_mapindex_init) },
 	{ HP_POP(mapindex->final, HP_mapindex_final) },
 	{ HP_POP(mapindex->addmap, HP_mapindex_addmap) },
@@ -703,6 +696,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(mutex->cond_signal, HP_mutex_cond_signal) },
 	{ HP_POP(mutex->cond_broadcast, HP_mutex_cond_broadcast) },
 /* nullpo_interface */
+	{ HP_POP(nullpo->init, HP_nullpo_init) },
+	{ HP_POP(nullpo->final, HP_nullpo_final) },
 	{ HP_POP(nullpo->assert_report, HP_nullpo_assert_report) },
 /* packets_interface */
 	{ HP_POP(packets->init, HP_packets_init) },
@@ -758,6 +753,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(sockt->session_is_active, HP_sockt_session_is_active) },
 	{ HP_POP(sockt->flush, HP_sockt_flush) },
 	{ HP_POP(sockt->flush_fifos, HP_sockt_flush_fifos) },
+	{ HP_POP(sockt->connect_client, HP_sockt_connect_client) },
 	{ HP_POP(sockt->set_nonblocking, HP_sockt_set_nonblocking) },
 	{ HP_POP(sockt->set_defaultparse, HP_sockt_set_defaultparse) },
 	{ HP_POP(sockt->host2ip, HP_sockt_host2ip) },
diff --git a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
index 0bd61ba15..8c1dec681 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2013-2019  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
@@ -7851,66 +7851,6 @@ int HP_inter_mapif_init(int fd) {
 	}
 	return retVal___;
 }
-int HP_inter_check_ttl_wisdata_sub(union DBKey key, struct DBData *data, va_list ap) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_inter_check_ttl_wisdata_sub_pre > 0) {
-		int (*preHookFunc) (union DBKey *key, struct DBData **data, va_list ap);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_check_ttl_wisdata_sub_pre; hIndex++) {
-			va_list ap___copy; va_copy(ap___copy, ap);
-			preHookFunc = HPMHooks.list.HP_inter_check_ttl_wisdata_sub_pre[hIndex].func;
-			retVal___ = preHookFunc(&key, &data, ap___copy);
-			va_end(ap___copy);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		va_list ap___copy; va_copy(ap___copy, ap);
-		retVal___ = HPMHooks.source.inter.check_ttl_wisdata_sub(key, data, ap___copy);
-		va_end(ap___copy);
-	}
-	if (HPMHooks.count.HP_inter_check_ttl_wisdata_sub_post > 0) {
-		int (*postHookFunc) (int retVal___, union DBKey key, struct DBData *data, va_list ap);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_check_ttl_wisdata_sub_post; hIndex++) {
-			va_list ap___copy; va_copy(ap___copy, ap);
-			postHookFunc = HPMHooks.list.HP_inter_check_ttl_wisdata_sub_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, key, data, ap___copy);
-			va_end(ap___copy);
-		}
-	}
-	return retVal___;
-}
-int HP_inter_check_ttl_wisdata(void) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_inter_check_ttl_wisdata_pre > 0) {
-		int (*preHookFunc) (void);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_check_ttl_wisdata_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_inter_check_ttl_wisdata_pre[hIndex].func;
-			retVal___ = preHookFunc();
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.inter.check_ttl_wisdata();
-	}
-	if (HPMHooks.count.HP_inter_check_ttl_wisdata_post > 0) {
-		int (*postHookFunc) (int retVal___);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_check_ttl_wisdata_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_inter_check_ttl_wisdata_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___);
-		}
-	}
-	return retVal___;
-}
 int HP_inter_check_length(int fd, int length) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -8124,86 +8064,6 @@ void HP_inter_accinfo2(bool success, int map_fd, int u_fd, int u_aid, int accoun
 	}
 	return;
 }
-struct WisData* HP_inter_add_wisdata(int fd, const unsigned char *src, const unsigned char *dst, const unsigned char *msg, int msg_len) {
-	int hIndex = 0;
-	struct WisData* retVal___ = NULL;
-	if (HPMHooks.count.HP_inter_add_wisdata_pre > 0) {
-		struct WisData* (*preHookFunc) (int *fd, const unsigned char **src, const unsigned char **dst, const unsigned char **msg, int *msg_len);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_add_wisdata_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_inter_add_wisdata_pre[hIndex].func;
-			retVal___ = preHookFunc(&fd, &src, &dst, &msg, &msg_len);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.inter.add_wisdata(fd, src, dst, msg, msg_len);
-	}
-	if (HPMHooks.count.HP_inter_add_wisdata_post > 0) {
-		struct WisData* (*postHookFunc) (struct WisData* retVal___, int fd, const unsigned char *src, const unsigned char *dst, const unsigned char *msg, int msg_len);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_add_wisdata_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_inter_add_wisdata_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, fd, src, dst, msg, msg_len);
-		}
-	}
-	return retVal___;
-}
-struct WisData* HP_inter_get_wisdata(int id) {
-	int hIndex = 0;
-	struct WisData* retVal___ = NULL;
-	if (HPMHooks.count.HP_inter_get_wisdata_pre > 0) {
-		struct WisData* (*preHookFunc) (int *id);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_get_wisdata_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_inter_get_wisdata_pre[hIndex].func;
-			retVal___ = preHookFunc(&id);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.inter.get_wisdata(id);
-	}
-	if (HPMHooks.count.HP_inter_get_wisdata_post > 0) {
-		struct WisData* (*postHookFunc) (struct WisData* retVal___, int id);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_get_wisdata_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_inter_get_wisdata_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, id);
-		}
-	}
-	return retVal___;
-}
-void HP_inter_remove_wisdata(int id) {
-	int hIndex = 0;
-	if (HPMHooks.count.HP_inter_remove_wisdata_pre > 0) {
-		void (*preHookFunc) (int *id);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_remove_wisdata_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_inter_remove_wisdata_pre[hIndex].func;
-			preHookFunc(&id);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return;
-		}
-	}
-	{
-		HPMHooks.source.inter.remove_wisdata(id);
-	}
-	if (HPMHooks.count.HP_inter_remove_wisdata_post > 0) {
-		void (*postHookFunc) (int id);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_remove_wisdata_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_inter_remove_wisdata_post[hIndex].func;
-			postHookFunc(id);
-		}
-	}
-	return;
-}
 /* inter_mail_interface */
 int HP_inter_mail_sql_init(void) {
 	int hIndex = 0;
@@ -8852,6 +8712,33 @@ int HP_inter_party_check_lv(struct party_data *p) {
 	}
 	return retVal___;
 }
+int HP_inter_party_is_family_party(struct party_data *p) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_inter_party_is_family_party_pre > 0) {
+		int (*preHookFunc) (struct party_data **p);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_is_family_party_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_inter_party_is_family_party_pre[hIndex].func;
+			retVal___ = preHookFunc(&p);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.inter_party.is_family_party(p);
+	}
+	if (HPMHooks.count.HP_inter_party_is_family_party_post > 0) {
+		int (*postHookFunc) (int retVal___, struct party_data *p);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_is_family_party_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_inter_party_is_family_party_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, p);
+		}
+	}
+	return retVal___;
+}
 void HP_inter_party_calc_state(struct party_data *p) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_inter_party_calc_state_pre > 0) {
@@ -8905,6 +8792,33 @@ int HP_inter_party_tosql(struct party *p, int flag, int index) {
 	}
 	return retVal___;
 }
+int HP_inter_party_del_nonexistent_party(int party_id) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_inter_party_del_nonexistent_party_pre > 0) {
+		int (*preHookFunc) (int *party_id);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_del_nonexistent_party_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_inter_party_del_nonexistent_party_pre[hIndex].func;
+			retVal___ = preHookFunc(&party_id);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.inter_party.del_nonexistent_party(party_id);
+	}
+	if (HPMHooks.count.HP_inter_party_del_nonexistent_party_post > 0) {
+		int (*postHookFunc) (int retVal___, int party_id);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_del_nonexistent_party_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_inter_party_del_nonexistent_party_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, party_id);
+		}
+	}
+	return retVal___;
+}
 struct party_data* HP_inter_party_fromsql(int party_id) {
 	int hIndex = 0;
 	struct party_data* retVal___ = NULL;
@@ -9255,11 +9169,11 @@ bool HP_inter_party_change_option(int party_id, int account_id, int exp, int ite
 	}
 	return retVal___;
 }
-bool HP_inter_party_change_map(int party_id, int account_id, int char_id, unsigned short map, int online, unsigned int lv) {
+bool HP_inter_party_change_map(int party_id, int account_id, int char_id, unsigned short map, int online, int lv) {
 	int hIndex = 0;
 	bool retVal___ = false;
 	if (HPMHooks.count.HP_inter_party_change_map_pre > 0) {
-		bool (*preHookFunc) (int *party_id, int *account_id, int *char_id, unsigned short *map, int *online, unsigned int *lv);
+		bool (*preHookFunc) (int *party_id, int *account_id, int *char_id, unsigned short *map, int *online, int *lv);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_change_map_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_inter_party_change_map_pre[hIndex].func;
@@ -9274,7 +9188,7 @@ bool HP_inter_party_change_map(int party_id, int account_id, int char_id, unsign
 		retVal___ = HPMHooks.source.inter_party.change_map(party_id, account_id, char_id, map, online, lv);
 	}
 	if (HPMHooks.count.HP_inter_party_change_map_post > 0) {
-		bool (*postHookFunc) (bool retVal___, int party_id, int account_id, int char_id, unsigned short map, int online, unsigned int lv);
+		bool (*postHookFunc) (bool retVal___, int party_id, int account_id, int char_id, unsigned short map, int online, int lv);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_party_change_map_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_inter_party_change_map_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, party_id, account_id, char_id, map, online, lv);
@@ -9904,15 +9818,15 @@ int64 HP_inter_rodex_savemessage(struct rodex_message *msg) {
 	}
 	return retVal___;
 }
-bool HP_inter_rodex_updatemail(int64 mail_id, int8 flag) {
+bool HP_inter_rodex_updatemail(int fd, int account_id, int char_id, int64 mail_id, uint8 opentype, int8 flag) {
 	int hIndex = 0;
 	bool retVal___ = false;
 	if (HPMHooks.count.HP_inter_rodex_updatemail_pre > 0) {
-		bool (*preHookFunc) (int64 *mail_id, int8 *flag);
+		bool (*preHookFunc) (int *fd, int *account_id, int *char_id, int64 *mail_id, uint8 *opentype, int8 *flag);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_rodex_updatemail_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_inter_rodex_updatemail_pre[hIndex].func;
-			retVal___ = preHookFunc(&mail_id, &flag);
+			retVal___ = preHookFunc(&fd, &account_id, &char_id, &mail_id, &opentype, &flag);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -9920,13 +9834,67 @@ bool HP_inter_rodex_updatemail(int64 mail_id, int8 flag) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.inter_rodex.updatemail(mail_id, flag);
+		retVal___ = HPMHooks.source.inter_rodex.updatemail(fd, account_id, char_id, mail_id, opentype, flag);
 	}
 	if (HPMHooks.count.HP_inter_rodex_updatemail_post > 0) {
-		bool (*postHookFunc) (bool retVal___, int64 mail_id, int8 flag);
+		bool (*postHookFunc) (bool retVal___, int fd, int account_id, int char_id, int64 mail_id, uint8 opentype, int8 flag);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_rodex_updatemail_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_inter_rodex_updatemail_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, mail_id, flag);
+			retVal___ = postHookFunc(retVal___, fd, account_id, char_id, mail_id, opentype, flag);
+		}
+	}
+	return retVal___;
+}
+int64 HP_inter_rodex_getzeny(int64 mail_id) {
+	int hIndex = 0;
+	int64 retVal___ = 0;
+	if (HPMHooks.count.HP_inter_rodex_getzeny_pre > 0) {
+		int64 (*preHookFunc) (int64 *mail_id);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_rodex_getzeny_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_inter_rodex_getzeny_pre[hIndex].func;
+			retVal___ = preHookFunc(&mail_id);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.inter_rodex.getzeny(mail_id);
+	}
+	if (HPMHooks.count.HP_inter_rodex_getzeny_post > 0) {
+		int64 (*postHookFunc) (int64 retVal___, int64 mail_id);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_rodex_getzeny_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_inter_rodex_getzeny_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, mail_id);
+		}
+	}
+	return retVal___;
+}
+int HP_inter_rodex_getitems(int64 mail_id, struct rodex_item *items) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_inter_rodex_getitems_pre > 0) {
+		int (*preHookFunc) (int64 *mail_id, struct rodex_item **items);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_rodex_getitems_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_inter_rodex_getitems_pre[hIndex].func;
+			retVal___ = preHookFunc(&mail_id, &items);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.inter_rodex.getitems(mail_id, items);
+	}
+	if (HPMHooks.count.HP_inter_rodex_getitems_post > 0) {
+		int (*postHookFunc) (int retVal___, int64 mail_id, struct rodex_item *items);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_inter_rodex_getitems_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_inter_rodex_getitems_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, mail_id, items);
 		}
 	}
 	return retVal___;
@@ -10202,6 +10170,58 @@ bool HP_inter_storage_retrieve_bound_items(int char_id, int account_id, int guil
 	return retVal___;
 }
 /* libconfig_interface */
+void HP_libconfig_set_db_path(const char *db_path) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_libconfig_set_db_path_pre > 0) {
+		void (*preHookFunc) (const char **db_path);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_db_path_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_libconfig_set_db_path_pre[hIndex].func;
+			preHookFunc(&db_path);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.libconfig.set_db_path(db_path);
+	}
+	if (HPMHooks.count.HP_libconfig_set_db_path_post > 0) {
+		void (*postHookFunc) (const char *db_path);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_db_path_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_libconfig_set_db_path_post[hIndex].func;
+			postHookFunc(db_path);
+		}
+	}
+	return;
+}
+void HP_libconfig_format_db_path(const char *filename, char *path_buf, int buffer_len) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_libconfig_format_db_path_pre > 0) {
+		void (*preHookFunc) (const char **filename, char **path_buf, int *buffer_len);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_format_db_path_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_libconfig_format_db_path_pre[hIndex].func;
+			preHookFunc(&filename, &path_buf, &buffer_len);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.libconfig.format_db_path(filename, path_buf, buffer_len);
+	}
+	if (HPMHooks.count.HP_libconfig_format_db_path_post > 0) {
+		void (*postHookFunc) (const char *filename, char *path_buf, int buffer_len);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_format_db_path_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_libconfig_format_db_path_post[hIndex].func;
+			postHookFunc(filename, path_buf, buffer_len);
+		}
+	}
+	return;
+}
 int HP_libconfig_read(struct config_t *config, FILE *stream) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -13444,33 +13464,6 @@ int HP_mapif_guild_broken(int guild_id, int flag) {
 	}
 	return retVal___;
 }
-int HP_mapif_guild_message(int guild_id, int account_id, const char *mes, int len, int sfd) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_mapif_guild_message_pre > 0) {
-		int (*preHookFunc) (int *guild_id, int *account_id, const char **mes, int *len, int *sfd);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_message_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_mapif_guild_message_pre[hIndex].func;
-			retVal___ = preHookFunc(&guild_id, &account_id, &mes, &len, &sfd);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.mapif.guild_message(guild_id, account_id, mes, len, sfd);
-	}
-	if (HPMHooks.count.HP_mapif_guild_message_post > 0) {
-		int (*postHookFunc) (int retVal___, int guild_id, int account_id, const char *mes, int len, int sfd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_message_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_mapif_guild_message_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, guild_id, account_id, mes, len, sfd);
-		}
-	}
-	return retVal___;
-}
 int HP_mapif_guild_basicinfochanged(int guild_id, int type, const void *data, int len) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -13876,33 +13869,6 @@ int HP_mapif_parse_BreakGuild(int fd, int guild_id) {
 	}
 	return retVal___;
 }
-int HP_mapif_parse_GuildMessage(int fd, int guild_id, int account_id, const char *mes, int len) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_mapif_parse_GuildMessage_pre > 0) {
-		int (*preHookFunc) (int *fd, int *guild_id, int *account_id, const char **mes, int *len);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildMessage_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_mapif_parse_GuildMessage_pre[hIndex].func;
-			retVal___ = preHookFunc(&fd, &guild_id, &account_id, &mes, &len);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.mapif.parse_GuildMessage(fd, guild_id, account_id, mes, len);
-	}
-	if (HPMHooks.count.HP_mapif_parse_GuildMessage_post > 0) {
-		int (*postHookFunc) (int retVal___, int fd, int guild_id, int account_id, const char *mes, int len);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildMessage_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_mapif_parse_GuildMessage_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, fd, guild_id, account_id, mes, len);
-		}
-	}
-	return retVal___;
-}
 int HP_mapif_parse_GuildBasicInfoChange(int fd, int guild_id, int type, const void *data, int len) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -15141,33 +15107,6 @@ int HP_mapif_party_broken(int party_id, int flag) {
 	}
 	return retVal___;
 }
-int HP_mapif_party_message(int party_id, int account_id, const char *mes, int len, int sfd) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_mapif_party_message_pre > 0) {
-		int (*preHookFunc) (int *party_id, int *account_id, const char **mes, int *len, int *sfd);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_message_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_mapif_party_message_pre[hIndex].func;
-			retVal___ = preHookFunc(&party_id, &account_id, &mes, &len, &sfd);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.mapif.party_message(party_id, account_id, mes, len, sfd);
-	}
-	if (HPMHooks.count.HP_mapif_party_message_post > 0) {
-		int (*postHookFunc) (int retVal___, int party_id, int account_id, const char *mes, int len, int sfd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_message_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_mapif_party_message_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, party_id, account_id, mes, len, sfd);
-		}
-	}
-	return retVal___;
-}
 int HP_mapif_parse_CreateParty(int fd, const char *name, int item, int item2, const struct party_member *leader) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -15356,33 +15295,6 @@ int HP_mapif_parse_BreakParty(int fd, int party_id) {
 	}
 	return retVal___;
 }
-int HP_mapif_parse_PartyMessage(int fd, int party_id, int account_id, const char *mes, int len) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_mapif_parse_PartyMessage_pre > 0) {
-		int (*preHookFunc) (int *fd, int *party_id, int *account_id, const char **mes, int *len);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_PartyMessage_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_mapif_parse_PartyMessage_pre[hIndex].func;
-			retVal___ = preHookFunc(&fd, &party_id, &account_id, &mes, &len);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.mapif.parse_PartyMessage(fd, party_id, account_id, mes, len);
-	}
-	if (HPMHooks.count.HP_mapif_parse_PartyMessage_post > 0) {
-		int (*postHookFunc) (int retVal___, int fd, int party_id, int account_id, const char *mes, int len);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_PartyMessage_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_mapif_parse_PartyMessage_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, fd, party_id, account_id, mes, len);
-		}
-	}
-	return retVal___;
-}
 int HP_mapif_parse_PartyLeaderChange(int fd, int party_id, int account_id, int char_id) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -16047,6 +15959,58 @@ void HP_mapif_rodex_checkname(int fd, int reqchar_id, int target_char_id, int ta
 	}
 	return;
 }
+void HP_mapif_rodex_getzenyack(int fd, int char_id, int64 mail_id, uint8 opentype, int64 zeny) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_mapif_rodex_getzenyack_pre > 0) {
+		void (*preHookFunc) (int *fd, int *char_id, int64 *mail_id, uint8 *opentype, int64 *zeny);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_rodex_getzenyack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_mapif_rodex_getzenyack_pre[hIndex].func;
+			preHookFunc(&fd, &char_id, &mail_id, &opentype, &zeny);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.mapif.rodex_getzenyack(fd, char_id, mail_id, opentype, zeny);
+	}
+	if (HPMHooks.count.HP_mapif_rodex_getzenyack_post > 0) {
+		void (*postHookFunc) (int fd, int char_id, int64 mail_id, uint8 opentype, int64 zeny);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_rodex_getzenyack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_mapif_rodex_getzenyack_post[hIndex].func;
+			postHookFunc(fd, char_id, mail_id, opentype, zeny);
+		}
+	}
+	return;
+}
+void HP_mapif_rodex_getitemsack(int fd, int char_id, int64 mail_id, uint8 opentype, int count, const struct rodex_item *items) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_mapif_rodex_getitemsack_pre > 0) {
+		void (*preHookFunc) (int *fd, int *char_id, int64 *mail_id, uint8 *opentype, int *count, const struct rodex_item **items);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_rodex_getitemsack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_mapif_rodex_getitemsack_pre[hIndex].func;
+			preHookFunc(&fd, &char_id, &mail_id, &opentype, &count, &items);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.mapif.rodex_getitemsack(fd, char_id, mail_id, opentype, count, items);
+	}
+	if (HPMHooks.count.HP_mapif_rodex_getitemsack_post > 0) {
+		void (*postHookFunc) (int fd, int char_id, int64 mail_id, uint8 opentype, int count, const struct rodex_item *items);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_rodex_getitemsack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_mapif_rodex_getitemsack_post[hIndex].func;
+			postHookFunc(fd, char_id, mail_id, opentype, count, items);
+		}
+	}
+	return;
+}
 int HP_mapif_load_guild_storage(int fd, int account_id, int guild_id, char flag) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -16341,113 +16305,6 @@ void HP_mapif_parse_accinfo(int fd) {
 	}
 	return;
 }
-int HP_mapif_broadcast(const unsigned char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, int sfd) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_mapif_broadcast_pre > 0) {
-		int (*preHookFunc) (const unsigned char **mes, int *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, int *sfd);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_broadcast_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_mapif_broadcast_pre[hIndex].func;
-			retVal___ = preHookFunc(&mes, &len, &fontColor, &fontType, &fontSize, &fontAlign, &fontY, &sfd);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.mapif.broadcast(mes, len, fontColor, fontType, fontSize, fontAlign, fontY, sfd);
-	}
-	if (HPMHooks.count.HP_mapif_broadcast_post > 0) {
-		int (*postHookFunc) (int retVal___, const unsigned char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, int sfd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_broadcast_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_mapif_broadcast_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, mes, len, fontColor, fontType, fontSize, fontAlign, fontY, sfd);
-		}
-	}
-	return retVal___;
-}
-int HP_mapif_wis_message(struct WisData *wd) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_mapif_wis_message_pre > 0) {
-		int (*preHookFunc) (struct WisData **wd);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_wis_message_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_mapif_wis_message_pre[hIndex].func;
-			retVal___ = preHookFunc(&wd);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.mapif.wis_message(wd);
-	}
-	if (HPMHooks.count.HP_mapif_wis_message_post > 0) {
-		int (*postHookFunc) (int retVal___, struct WisData *wd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_wis_message_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_mapif_wis_message_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, wd);
-		}
-	}
-	return retVal___;
-}
-void HP_mapif_wis_response(int fd, const unsigned char *src, int flag) {
-	int hIndex = 0;
-	if (HPMHooks.count.HP_mapif_wis_response_pre > 0) {
-		void (*preHookFunc) (int *fd, const unsigned char **src, int *flag);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_wis_response_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_mapif_wis_response_pre[hIndex].func;
-			preHookFunc(&fd, &src, &flag);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return;
-		}
-	}
-	{
-		HPMHooks.source.mapif.wis_response(fd, src, flag);
-	}
-	if (HPMHooks.count.HP_mapif_wis_response_post > 0) {
-		void (*postHookFunc) (int fd, const unsigned char *src, int flag);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_wis_response_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_mapif_wis_response_post[hIndex].func;
-			postHookFunc(fd, src, flag);
-		}
-	}
-	return;
-}
-int HP_mapif_wis_end(struct WisData *wd, int flag) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_mapif_wis_end_pre > 0) {
-		int (*preHookFunc) (struct WisData **wd, int *flag);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_wis_end_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_mapif_wis_end_pre[hIndex].func;
-			retVal___ = preHookFunc(&wd, &flag);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.mapif.wis_end(wd, flag);
-	}
-	if (HPMHooks.count.HP_mapif_wis_end_post > 0) {
-		int (*postHookFunc) (int retVal___, struct WisData *wd, int flag);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_wis_end_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_mapif_wis_end_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, wd, flag);
-		}
-	}
-	return retVal___;
-}
 int HP_mapif_account_reg_reply(int fd, int account_id, int char_id, int type) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -16502,114 +16359,6 @@ int HP_mapif_disconnectplayer(int fd, int account_id, int char_id, int reason) {
 	}
 	return retVal___;
 }
-int HP_mapif_parse_broadcast(int fd) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_mapif_parse_broadcast_pre > 0) {
-		int (*preHookFunc) (int *fd);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_broadcast_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_mapif_parse_broadcast_pre[hIndex].func;
-			retVal___ = preHookFunc(&fd);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.mapif.parse_broadcast(fd);
-	}
-	if (HPMHooks.count.HP_mapif_parse_broadcast_post > 0) {
-		int (*postHookFunc) (int retVal___, int fd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_broadcast_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_mapif_parse_broadcast_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, fd);
-		}
-	}
-	return retVal___;
-}
-int HP_mapif_parse_WisRequest(int fd) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_mapif_parse_WisRequest_pre > 0) {
-		int (*preHookFunc) (int *fd);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_WisRequest_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_mapif_parse_WisRequest_pre[hIndex].func;
-			retVal___ = preHookFunc(&fd);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.mapif.parse_WisRequest(fd);
-	}
-	if (HPMHooks.count.HP_mapif_parse_WisRequest_post > 0) {
-		int (*postHookFunc) (int retVal___, int fd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_WisRequest_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_mapif_parse_WisRequest_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, fd);
-		}
-	}
-	return retVal___;
-}
-int HP_mapif_parse_WisReply(int fd) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_mapif_parse_WisReply_pre > 0) {
-		int (*preHookFunc) (int *fd);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_WisReply_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_mapif_parse_WisReply_pre[hIndex].func;
-			retVal___ = preHookFunc(&fd);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.mapif.parse_WisReply(fd);
-	}
-	if (HPMHooks.count.HP_mapif_parse_WisReply_post > 0) {
-		int (*postHookFunc) (int retVal___, int fd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_WisReply_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_mapif_parse_WisReply_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, fd);
-		}
-	}
-	return retVal___;
-}
-int HP_mapif_parse_WisToGM(int fd) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_mapif_parse_WisToGM_pre > 0) {
-		int (*preHookFunc) (int *fd);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_WisToGM_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_mapif_parse_WisToGM_pre[hIndex].func;
-			retVal___ = preHookFunc(&fd);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.mapif.parse_WisToGM(fd);
-	}
-	if (HPMHooks.count.HP_mapif_parse_WisToGM_post > 0) {
-		int (*postHookFunc) (int retVal___, int fd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_WisToGM_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_mapif_parse_WisToGM_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, fd);
-		}
-	}
-	return retVal___;
-}
 int HP_mapif_parse_Registry(int fd) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -16772,6 +16521,60 @@ int HP_mapif_parse_ClanMemberCount(int fd, int clan_id, int kick_interval) {
 	return retVal___;
 }
 /* mapindex_interface */
+bool HP_mapindex_config_read_dbpath(const char *filename, const struct config_t *config) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_mapindex_config_read_dbpath_pre > 0) {
+		bool (*preHookFunc) (const char **filename, const struct config_t **config);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_config_read_dbpath_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_mapindex_config_read_dbpath_pre[hIndex].func;
+			retVal___ = preHookFunc(&filename, &config);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.mapindex.config_read_dbpath(filename, config);
+	}
+	if (HPMHooks.count.HP_mapindex_config_read_dbpath_post > 0) {
+		bool (*postHookFunc) (bool retVal___, const char *filename, const struct config_t *config);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_config_read_dbpath_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_mapindex_config_read_dbpath_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, filename, config);
+		}
+	}
+	return retVal___;
+}
+bool HP_mapindex_config_read(void) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_mapindex_config_read_pre > 0) {
+		bool (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_config_read_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_mapindex_config_read_pre[hIndex].func;
+			retVal___ = preHookFunc();
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.mapindex.config_read();
+	}
+	if (HPMHooks.count.HP_mapindex_config_read_post > 0) {
+		bool (*postHookFunc) (bool retVal___);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_config_read_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_mapindex_config_read_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___);
+		}
+	}
+	return retVal___;
+}
 int HP_mapindex_init(void) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -17357,6 +17160,58 @@ void HP_mutex_cond_broadcast(struct cond_data *c) {
 	return;
 }
 /* nullpo_interface */
+void HP_nullpo_init(void) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_nullpo_init_pre > 0) {
+		void (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_init_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_nullpo_init_pre[hIndex].func;
+			preHookFunc();
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.nullpo.init();
+	}
+	if (HPMHooks.count.HP_nullpo_init_post > 0) {
+		void (*postHookFunc) (void);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_init_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_nullpo_init_post[hIndex].func;
+			postHookFunc();
+		}
+	}
+	return;
+}
+void HP_nullpo_final(void) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_nullpo_final_pre > 0) {
+		void (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_final_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_nullpo_final_pre[hIndex].func;
+			preHookFunc();
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.nullpo.final();
+	}
+	if (HPMHooks.count.HP_nullpo_final_post > 0) {
+		void (*postHookFunc) (void);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_final_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_nullpo_final_post[hIndex].func;
+			postHookFunc();
+		}
+	}
+	return;
+}
 void HP_nullpo_assert_report(const char *file, int line, const char *func, const char *targetname, const char *title) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_nullpo_assert_report_pre > 0) {
@@ -18686,6 +18541,33 @@ void HP_sockt_flush_fifos(void) {
 	}
 	return;
 }
+int HP_sockt_connect_client(int listen_fd) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_sockt_connect_client_pre > 0) {
+		int (*preHookFunc) (int *listen_fd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_sockt_connect_client_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_sockt_connect_client_pre[hIndex].func;
+			retVal___ = preHookFunc(&listen_fd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.sockt.connect_client(listen_fd);
+	}
+	if (HPMHooks.count.HP_sockt_connect_client_post > 0) {
+		int (*postHookFunc) (int retVal___, int listen_fd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_sockt_connect_client_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_sockt_connect_client_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, listen_fd);
+		}
+	}
+	return retVal___;
+}
 void HP_sockt_set_nonblocking(int fd, unsigned long yes) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_sockt_set_nonblocking_pre > 0) {
diff --git a/src/plugins/HPMHooking/HPMHooking_char.sources.inc b/src/plugins/HPMHooking/HPMHooking_char.sources.inc
index 973f8aff3..7adc65b3c 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.sources.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.sources.inc
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2013-2019  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
diff --git a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
index 7293e8fc4..2875df334 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2013-2019  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
@@ -212,6 +212,10 @@ struct {
 	struct HPMHookPoint *HP_PRIV__lclif_parse_CA_REQ_HASH_post;
 	struct HPMHookPoint *HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT_pre;
 	struct HPMHookPoint *HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT_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;
@@ -516,6 +520,10 @@ struct {
 	struct HPMHookPoint *HP_mutex_cond_signal_post;
 	struct HPMHookPoint *HP_mutex_cond_broadcast_pre;
 	struct HPMHookPoint *HP_mutex_cond_broadcast_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;
@@ -584,6 +592,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;
@@ -1011,6 +1021,10 @@ struct {
 	int HP_PRIV__lclif_parse_CA_REQ_HASH_post;
 	int HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT_pre;
 	int HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT_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;
@@ -1315,6 +1329,10 @@ struct {
 	int HP_mutex_cond_signal_post;
 	int HP_mutex_cond_broadcast_pre;
 	int HP_mutex_cond_broadcast_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;
@@ -1383,6 +1401,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;
diff --git a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
index 825e049b1..61864325b 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2013-2019  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
@@ -131,6 +131,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(lclif->p->parse_CA_REQ_HASH, HP_PRIV__lclif_parse_CA_REQ_HASH) },
 	{ HP_POP(lclif->p->parse_CA_CHARSERVERCONNECT, HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT) },
 /* libconfig_interface */
+	{ HP_POP(libconfig->set_db_path, HP_libconfig_set_db_path) },
+	{ HP_POP(libconfig->format_db_path, HP_libconfig_format_db_path) },
 	{ HP_POP(libconfig->read, HP_libconfig_read) },
 	{ HP_POP(libconfig->write, HP_libconfig_write) },
 	{ HP_POP(libconfig->set_options, HP_libconfig_set_options) },
@@ -288,6 +290,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(mutex->cond_signal, HP_mutex_cond_signal) },
 	{ HP_POP(mutex->cond_broadcast, HP_mutex_cond_broadcast) },
 /* nullpo_interface */
+	{ HP_POP(nullpo->init, HP_nullpo_init) },
+	{ HP_POP(nullpo->final, HP_nullpo_final) },
 	{ HP_POP(nullpo->assert_report, HP_nullpo_assert_report) },
 /* packets_interface */
 	{ HP_POP(packets->init, HP_packets_init) },
@@ -326,6 +330,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(sockt->session_is_active, HP_sockt_session_is_active) },
 	{ HP_POP(sockt->flush, HP_sockt_flush) },
 	{ HP_POP(sockt->flush_fifos, HP_sockt_flush_fifos) },
+	{ HP_POP(sockt->connect_client, HP_sockt_connect_client) },
 	{ HP_POP(sockt->set_nonblocking, HP_sockt_set_nonblocking) },
 	{ HP_POP(sockt->set_defaultparse, HP_sockt_set_defaultparse) },
 	{ HP_POP(sockt->host2ip, HP_sockt_host2ip) },
diff --git a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
index 044ee2df2..1c1817276 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2013-2019  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
@@ -2518,6 +2518,58 @@ enum parsefunc_rcode HP_PRIV__lclif_parse_CA_CHARSERVERCONNECT(int fd, struct lo
 	return retVal___;
 }
 /* libconfig_interface */
+void HP_libconfig_set_db_path(const char *db_path) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_libconfig_set_db_path_pre > 0) {
+		void (*preHookFunc) (const char **db_path);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_db_path_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_libconfig_set_db_path_pre[hIndex].func;
+			preHookFunc(&db_path);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.libconfig.set_db_path(db_path);
+	}
+	if (HPMHooks.count.HP_libconfig_set_db_path_post > 0) {
+		void (*postHookFunc) (const char *db_path);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_db_path_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_libconfig_set_db_path_post[hIndex].func;
+			postHookFunc(db_path);
+		}
+	}
+	return;
+}
+void HP_libconfig_format_db_path(const char *filename, char *path_buf, int buffer_len) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_libconfig_format_db_path_pre > 0) {
+		void (*preHookFunc) (const char **filename, char **path_buf, int *buffer_len);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_format_db_path_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_libconfig_format_db_path_pre[hIndex].func;
+			preHookFunc(&filename, &path_buf, &buffer_len);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.libconfig.format_db_path(filename, path_buf, buffer_len);
+	}
+	if (HPMHooks.count.HP_libconfig_format_db_path_post > 0) {
+		void (*postHookFunc) (const char *filename, char *path_buf, int buffer_len);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_format_db_path_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_libconfig_format_db_path_post[hIndex].func;
+			postHookFunc(filename, path_buf, buffer_len);
+		}
+	}
+	return;
+}
 int HP_libconfig_read(struct config_t *config, FILE *stream) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -6586,6 +6638,58 @@ void HP_mutex_cond_broadcast(struct cond_data *c) {
 	return;
 }
 /* nullpo_interface */
+void HP_nullpo_init(void) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_nullpo_init_pre > 0) {
+		void (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_init_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_nullpo_init_pre[hIndex].func;
+			preHookFunc();
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.nullpo.init();
+	}
+	if (HPMHooks.count.HP_nullpo_init_post > 0) {
+		void (*postHookFunc) (void);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_init_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_nullpo_init_post[hIndex].func;
+			postHookFunc();
+		}
+	}
+	return;
+}
+void HP_nullpo_final(void) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_nullpo_final_pre > 0) {
+		void (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_final_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_nullpo_final_pre[hIndex].func;
+			preHookFunc();
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.nullpo.final();
+	}
+	if (HPMHooks.count.HP_nullpo_final_post > 0) {
+		void (*postHookFunc) (void);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_final_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_nullpo_final_post[hIndex].func;
+			postHookFunc();
+		}
+	}
+	return;
+}
 void HP_nullpo_assert_report(const char *file, int line, const char *func, const char *targetname, const char *title) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_nullpo_assert_report_pre > 0) {
@@ -7495,6 +7599,33 @@ void HP_sockt_flush_fifos(void) {
 	}
 	return;
 }
+int HP_sockt_connect_client(int listen_fd) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_sockt_connect_client_pre > 0) {
+		int (*preHookFunc) (int *listen_fd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_sockt_connect_client_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_sockt_connect_client_pre[hIndex].func;
+			retVal___ = preHookFunc(&listen_fd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.sockt.connect_client(listen_fd);
+	}
+	if (HPMHooks.count.HP_sockt_connect_client_post > 0) {
+		int (*postHookFunc) (int retVal___, int listen_fd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_sockt_connect_client_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_sockt_connect_client_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, listen_fd);
+		}
+	}
+	return retVal___;
+}
 void HP_sockt_set_nonblocking(int fd, unsigned long yes) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_sockt_set_nonblocking_pre > 0) {
diff --git a/src/plugins/HPMHooking/HPMHooking_login.sources.inc b/src/plugins/HPMHooking/HPMHooking_login.sources.inc
index 510cb8bc4..8a548bedc 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.sources.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.sources.inc
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2013-2019  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
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index b323d77e6..82a2a3bdb 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-2019  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;
@@ -968,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;
@@ -1072,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;
@@ -1122,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;
@@ -1156,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;
@@ -1270,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;
@@ -1312,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;
@@ -1614,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;
@@ -1622,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;
@@ -1646,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;
@@ -2052,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;
@@ -2066,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;
@@ -2104,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;
@@ -2210,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;
@@ -2256,8 +2308,64 @@ struct {
 	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;
@@ -2334,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;
@@ -2516,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;
@@ -2562,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;
@@ -2660,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;
@@ -2758,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;
@@ -2794,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;
@@ -2810,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;
@@ -2902,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;
@@ -2914,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;
@@ -2950,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;
@@ -2964,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;
@@ -3182,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;
@@ -3222,6 +3312,16 @@ struct {
 	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;
@@ -3692,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;
@@ -3810,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;
@@ -3882,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;
@@ -3902,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;
@@ -3968,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;
@@ -3988,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;
@@ -4018,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;
@@ -4168,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;
@@ -4270,6 +4396,8 @@ struct {
 	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;
@@ -4288,12 +4416,26 @@ struct {
 	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;
@@ -4358,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;
@@ -4640,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;
@@ -4660,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;
@@ -4904,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;
@@ -4916,6 +5068,8 @@ struct {
 	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;
@@ -4938,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;
@@ -5072,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;
@@ -5124,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;
@@ -5472,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;
@@ -5482,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;
@@ -5492,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;
@@ -5730,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;
@@ -6042,6 +6242,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;
@@ -6136,18 +6338,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;
@@ -6208,6 +6410,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;
@@ -6368,12 +6572,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;
@@ -6462,6 +6668,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;
@@ -6584,22 +6808,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;
@@ -6610,20 +6836,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;
@@ -7555,12 +7783,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;
@@ -7585,6 +7819,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;
@@ -7637,8 +7873,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;
@@ -7741,6 +8005,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;
@@ -7791,6 +8057,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;
@@ -7825,6 +8093,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;
@@ -7939,6 +8209,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;
@@ -7981,6 +8253,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;
@@ -8283,6 +8559,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;
@@ -8291,6 +8569,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;
@@ -8315,8 +8595,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;
@@ -8721,8 +9003,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;
@@ -8735,6 +9021,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;
@@ -8773,8 +9063,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;
@@ -8879,24 +9171,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;
@@ -8925,8 +9205,64 @@ struct {
 	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;
@@ -9003,8 +9339,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;
@@ -9185,8 +9521,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;
@@ -9231,8 +9565,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;
@@ -9329,6 +9667,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;
@@ -9427,16 +9767,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;
@@ -9463,8 +9793,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;
@@ -9479,8 +9807,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;
@@ -9571,6 +9897,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;
@@ -9583,14 +9913,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;
@@ -9619,8 +9941,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;
@@ -9633,8 +9953,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;
@@ -9851,10 +10169,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;
@@ -9891,6 +10209,16 @@ struct {
 	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;
@@ -10361,6 +10689,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;
@@ -10479,6 +10811,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;
@@ -10551,6 +10885,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;
@@ -10571,6 +10907,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;
@@ -10637,6 +10975,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;
@@ -10657,12 +11003,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;
@@ -10687,6 +11037,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;
@@ -10837,6 +11189,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;
@@ -10939,6 +11293,8 @@ struct {
 	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;
@@ -10957,12 +11313,26 @@ struct {
 	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;
@@ -11027,8 +11397,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;
@@ -11309,6 +11677,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;
@@ -11329,6 +11699,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;
@@ -11573,8 +11947,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;
@@ -11585,6 +11965,8 @@ struct {
 	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;
@@ -11607,6 +11989,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;
@@ -11741,8 +12125,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;
@@ -11793,6 +12205,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;
@@ -12141,6 +12557,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;
@@ -12151,8 +12569,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;
@@ -12161,6 +12579,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;
@@ -12399,6 +12825,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;
@@ -12711,6 +13139,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;
@@ -12805,18 +13235,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;
@@ -12877,6 +13307,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;
@@ -13037,12 +13469,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;
@@ -13131,6 +13565,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;
@@ -13253,22 +13705,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;
@@ -13279,20 +13733,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;
@@ -13412,6 +13868,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;
@@ -13424,6 +13882,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;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index 3c09aba59..9880a679f 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2013-2019  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
@@ -467,9 +467,12 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->fame_alchemist, HP_clif_fame_alchemist) },
 	{ HP_POP(clif->fame_taekwon, HP_clif_fame_taekwon) },
 	{ HP_POP(clif->ranklist, HP_clif_ranklist) },
+	{ HP_POP(clif->ranklist_sub, HP_clif_ranklist_sub) },
+	{ HP_POP(clif->ranklist_sub2, HP_clif_ranklist_sub2) },
 	{ HP_POP(clif->update_rankingpoint, HP_clif_update_rankingpoint) },
 	{ HP_POP(clif->pRanklist, HP_clif_pRanklist) },
 	{ HP_POP(clif->hotkeys, HP_clif_hotkeys) },
+	{ HP_POP(clif->hotkeysAll, HP_clif_hotkeysAll) },
 	{ HP_POP(clif->insight, HP_clif_insight) },
 	{ HP_POP(clif->outsight, HP_clif_outsight) },
 	{ HP_POP(clif->skillcastcancel, HP_clif_skillcastcancel) },
@@ -482,6 +485,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->autospell, HP_clif_autospell) },
 	{ HP_POP(clif->combo_delay, HP_clif_combo_delay) },
 	{ HP_POP(clif->status_change, HP_clif_status_change) },
+	{ HP_POP(clif->status_change_sub, HP_clif_status_change_sub) },
 	{ HP_POP(clif->insert_card, HP_clif_insert_card) },
 	{ HP_POP(clif->inventoryList, HP_clif_inventoryList) },
 	{ HP_POP(clif->inventoryItems, HP_clif_inventoryItems) },
@@ -508,7 +512,21 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->mvp_exp, HP_clif_mvp_exp) },
 	{ HP_POP(clif->mvp_noitem, HP_clif_mvp_noitem) },
 	{ HP_POP(clif->changed_dir, HP_clif_changed_dir) },
-	{ HP_POP(clif->charnameack, HP_clif_charnameack) },
+	{ HP_POP(clif->blname_ack, HP_clif_blname_ack) },
+	{ HP_POP(clif->pcname_ack, HP_clif_pcname_ack) },
+	{ HP_POP(clif->homname_ack, HP_clif_homname_ack) },
+	{ HP_POP(clif->mername_ack, HP_clif_mername_ack) },
+	{ HP_POP(clif->petname_ack, HP_clif_petname_ack) },
+	{ HP_POP(clif->npcname_ack, HP_clif_npcname_ack) },
+	{ HP_POP(clif->mobname_ack, HP_clif_mobname_ack) },
+	{ HP_POP(clif->mobname_guardian_ack, HP_clif_mobname_guardian_ack) },
+	{ HP_POP(clif->mobname_additional_ack, HP_clif_mobname_additional_ack) },
+	{ HP_POP(clif->mobname_normal_ack, HP_clif_mobname_normal_ack) },
+	{ HP_POP(clif->chatname_ack, HP_clif_chatname_ack) },
+	{ HP_POP(clif->elemname_ack, HP_clif_elemname_ack) },
+	{ HP_POP(clif->skillname_ack, HP_clif_skillname_ack) },
+	{ HP_POP(clif->itemname_ack, HP_clif_itemname_ack) },
+	{ HP_POP(clif->unknownname_ack, HP_clif_unknownname_ack) },
 	{ HP_POP(clif->monster_hp_bar, HP_clif_monster_hp_bar) },
 	{ HP_POP(clif->hpmeter, HP_clif_hpmeter) },
 	{ HP_POP(clif->hpmeter_single, HP_clif_hpmeter_single) },
@@ -560,6 +578,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->quitsave, HP_clif_quitsave) },
 	{ HP_POP(clif->misceffect, HP_clif_misceffect) },
 	{ HP_POP(clif->changeoption, HP_clif_changeoption) },
+	{ HP_POP(clif->changeoption_target, HP_clif_changeoption_target) },
 	{ HP_POP(clif->changeoption2, HP_clif_changeoption2) },
 	{ HP_POP(clif->emotion, HP_clif_emotion) },
 	{ HP_POP(clif->talkiebox, HP_clif_talkiebox) },
@@ -585,6 +604,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->specialeffect, HP_clif_specialeffect) },
 	{ HP_POP(clif->specialeffect_single, HP_clif_specialeffect_single) },
 	{ HP_POP(clif->specialeffect_value, HP_clif_specialeffect_value) },
+	{ HP_POP(clif->specialeffect_value_single, HP_clif_specialeffect_value_single) },
 	{ HP_POP(clif->removeSpecialEffect, HP_clif_removeSpecialEffect) },
 	{ HP_POP(clif->removeSpecialEffect_single, HP_clif_removeSpecialEffect_single) },
 	{ HP_POP(clif->millenniumshield, HP_clif_millenniumshield) },
@@ -602,6 +622,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->joinchatok, HP_clif_joinchatok) },
 	{ HP_POP(clif->addchat, HP_clif_addchat) },
 	{ HP_POP(clif->changechatowner, HP_clif_changechatowner) },
+	{ HP_POP(clif->chatRoleChange, HP_clif_chatRoleChange) },
 	{ HP_POP(clif->clearchat, HP_clif_clearchat) },
 	{ HP_POP(clif->leavechat, HP_clif_leavechat) },
 	{ HP_POP(clif->changechatstatus, HP_clif_changechatstatus) },
@@ -659,6 +680,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->skillinfo, HP_clif_skillinfo) },
 	{ HP_POP(clif->addskill, HP_clif_addskill) },
 	{ HP_POP(clif->deleteskill, HP_clif_deleteskill) },
+	{ HP_POP(clif->playerSkillToPacket, HP_clif_playerSkillToPacket) },
 	{ HP_POP(clif->party_created, HP_clif_party_created) },
 	{ HP_POP(clif->party_member_info, HP_clif_party_member_info) },
 	{ HP_POP(clif->party_info, HP_clif_party_info) },
@@ -680,6 +702,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->guild_masterormember, HP_clif_guild_masterormember) },
 	{ HP_POP(clif->guild_basicinfo, HP_clif_guild_basicinfo) },
 	{ HP_POP(clif->guild_allianceinfo, HP_clif_guild_allianceinfo) },
+	{ HP_POP(clif->guild_castlelist, HP_clif_guild_castlelist) },
+	{ HP_POP(clif->guild_castleinfo, HP_clif_guild_castleinfo) },
 	{ HP_POP(clif->guild_memberlist, HP_clif_guild_memberlist) },
 	{ HP_POP(clif->guild_skillinfo, HP_clif_guild_skillinfo) },
 	{ HP_POP(clif->guild_send_onlineinfo, HP_clif_guild_send_onlineinfo) },
@@ -831,10 +855,12 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->npc_market_purchase_ack, HP_clif_npc_market_purchase_ack) },
 	{ HP_POP(clif->parse_roulette_db, HP_clif_parse_roulette_db) },
 	{ HP_POP(clif->roulette_generate_ack, HP_clif_roulette_generate_ack) },
+	{ HP_POP(clif->roulette_close, HP_clif_roulette_close) },
 	{ HP_POP(clif->openmergeitem, HP_clif_openmergeitem) },
 	{ HP_POP(clif->cancelmergeitem, HP_clif_cancelmergeitem) },
 	{ HP_POP(clif->comparemergeitem, HP_clif_comparemergeitem) },
 	{ HP_POP(clif->ackmergeitems, HP_clif_ackmergeitems) },
+	{ HP_POP(clif->mergeitems, HP_clif_mergeitems) },
 	{ HP_POP(clif->isdisguised, HP_clif_isdisguised) },
 	{ HP_POP(clif->navigate_to, HP_clif_navigate_to) },
 	{ HP_POP(clif->bl_type, HP_clif_bl_type) },
@@ -847,7 +873,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->pWantToConnection, HP_clif_pWantToConnection) },
 	{ HP_POP(clif->pLoadEndAck, HP_clif_pLoadEndAck) },
 	{ HP_POP(clif->pTickSend, HP_clif_pTickSend) },
-	{ HP_POP(clif->pHotkey, HP_clif_pHotkey) },
+	{ HP_POP(clif->pHotkey1, HP_clif_pHotkey1) },
+	{ HP_POP(clif->pHotkey2, HP_clif_pHotkey2) },
 	{ HP_POP(clif->pProgressbar, HP_clif_pProgressbar) },
 	{ HP_POP(clif->pWalkToXY, HP_clif_pWalkToXY) },
 	{ HP_POP(clif->pQuitGame, HP_clif_pQuitGame) },
@@ -1050,13 +1077,17 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->pBGQueueCheckState, HP_clif_pBGQueueCheckState) },
 	{ HP_POP(clif->pBGQueueRevokeReq, HP_clif_pBGQueueRevokeReq) },
 	{ HP_POP(clif->pBGQueueBattleBeginAck, HP_clif_pBGQueueBattleBeginAck) },
-	{ HP_POP(clif->pCashShopOpen, HP_clif_pCashShopOpen) },
+	{ HP_POP(clif->pCashShopOpen1, HP_clif_pCashShopOpen1) },
+	{ HP_POP(clif->pCashShopOpen2, HP_clif_pCashShopOpen2) },
+	{ HP_POP(clif->pCashShopLimitedReq, HP_clif_pCashShopLimitedReq) },
 	{ HP_POP(clif->pCashShopClose, HP_clif_pCashShopClose) },
 	{ HP_POP(clif->pCashShopReqTab, HP_clif_pCashShopReqTab) },
 	{ HP_POP(clif->pCashShopSchedule, HP_clif_pCashShopSchedule) },
 	{ HP_POP(clif->pCashShopBuy, HP_clif_pCashShopBuy) },
 	{ HP_POP(clif->pPartyTick, HP_clif_pPartyTick) },
 	{ HP_POP(clif->pGuildInvite2, HP_clif_pGuildInvite2) },
+	{ HP_POP(clif->cashShopBuyAck, HP_clif_cashShopBuyAck) },
+	{ HP_POP(clif->cashShopOpen, HP_clif_cashShopOpen) },
 	{ HP_POP(clif->pPartyBookingAddFilter, HP_clif_pPartyBookingAddFilter) },
 	{ HP_POP(clif->pPartyBookingSubFilter, HP_clif_pPartyBookingSubFilter) },
 	{ HP_POP(clif->pPartyBookingReqVolunteer, HP_clif_pPartyBookingReqVolunteer) },
@@ -1076,7 +1107,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->pNPCMarketClosed, HP_clif_pNPCMarketClosed) },
 	{ HP_POP(clif->pNPCMarketPurchase, HP_clif_pNPCMarketPurchase) },
 	{ HP_POP(clif->add_item_options, HP_clif_add_item_options) },
-	{ HP_POP(clif->pHotkeyRowShift, HP_clif_pHotkeyRowShift) },
+	{ HP_POP(clif->pHotkeyRowShift1, HP_clif_pHotkeyRowShift1) },
+	{ HP_POP(clif->pHotkeyRowShift2, HP_clif_pHotkeyRowShift2) },
 	{ HP_POP(clif->dressroom_open, HP_clif_dressroom_open) },
 	{ HP_POP(clif->pOneClick_ItemIdentify, HP_clif_pOneClick_ItemIdentify) },
 	{ HP_POP(clif->selectcart, HP_clif_selectcart) },
@@ -1129,15 +1161,9 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->ui_action, HP_clif_ui_action) },
 	{ HP_POP(clif->pPrivateAirshipRequest, HP_clif_pPrivateAirshipRequest) },
 	{ HP_POP(clif->PrivateAirshipResponse, HP_clif_PrivateAirshipResponse) },
-	{ HP_POP(clif->stylist_vector_init, HP_clif_stylist_vector_init) },
-	{ HP_POP(clif->stylist_vector_clear, HP_clif_stylist_vector_clear) },
-	{ HP_POP(clif->stylist_read_db_libconfig, HP_clif_stylist_read_db_libconfig) },
-	{ HP_POP(clif->stylist_read_db_libconfig_sub, HP_clif_stylist_read_db_libconfig_sub) },
-	{ HP_POP(clif->style_change_validate_requirements, HP_clif_style_change_validate_requirements) },
-	{ HP_POP(clif->stylist_send_rodexitem, HP_clif_stylist_send_rodexitem) },
 	{ HP_POP(clif->pReqStyleChange, HP_clif_pReqStyleChange) },
 	{ HP_POP(clif->pReqStyleChange2, HP_clif_pReqStyleChange2) },
-	{ HP_POP(clif->cz_req_style_change_sub, HP_clif_cz_req_style_change_sub) },
+	{ HP_POP(clif->pStyleClose, HP_clif_pStyleClose) },
 	{ HP_POP(clif->style_change_response, HP_clif_style_change_response) },
 	{ HP_POP(clif->pPetEvolution, HP_clif_pPetEvolution) },
 	{ HP_POP(clif->petEvolutionResult, HP_clif_petEvolutionResult) },
@@ -1152,7 +1178,35 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->npc_barter_open, HP_clif_npc_barter_open) },
 	{ HP_POP(clif->pNPCBarterClosed, HP_clif_pNPCBarterClosed) },
 	{ HP_POP(clif->pNPCBarterPurchase, HP_clif_pNPCBarterPurchase) },
+	{ HP_POP(clif->pNPCExpandedBarterClosed, HP_clif_pNPCExpandedBarterClosed) },
+	{ HP_POP(clif->pNPCExpandedBarterPurchase, HP_clif_pNPCExpandedBarterPurchase) },
+	{ HP_POP(clif->npc_expanded_barter_open, HP_clif_npc_expanded_barter_open) },
 	{ HP_POP(clif->pClientVersion, HP_clif_pClientVersion) },
+	{ HP_POP(clif->pPing, HP_clif_pPing) },
+	{ HP_POP(clif->ping, HP_clif_ping) },
+	{ HP_POP(clif->pingTimer, HP_clif_pingTimer) },
+	{ HP_POP(clif->pingTimerSub, HP_clif_pingTimerSub) },
+	{ HP_POP(clif->pResetCooldown, HP_clif_pResetCooldown) },
+	{ HP_POP(clif->loadConfirm, HP_clif_loadConfirm) },
+	{ HP_POP(clif->send_selforarea, HP_clif_send_selforarea) },
+	{ HP_POP(clif->OpenRefineryUI, HP_clif_OpenRefineryUI) },
+	{ HP_POP(clif->pAddItemRefineryUI, HP_clif_pAddItemRefineryUI) },
+	{ HP_POP(clif->AddItemRefineryUIAck, HP_clif_AddItemRefineryUIAck) },
+	{ HP_POP(clif->pRefineryUIClose, HP_clif_pRefineryUIClose) },
+	{ HP_POP(clif->pRefineryUIRefine, HP_clif_pRefineryUIRefine) },
+	{ HP_POP(clif->announce_refine_status, HP_clif_announce_refine_status) },
+	{ HP_POP(clif->pGuildCastleTeleportRequest, HP_clif_pGuildCastleTeleportRequest) },
+	{ HP_POP(clif->pGuildCastleInfoRequest, HP_clif_pGuildCastleInfoRequest) },
+	{ HP_POP(clif->guild_castleteleport_res, HP_clif_guild_castleteleport_res) },
+	{ HP_POP(clif->lapineDdukDdak_open, HP_clif_lapineDdukDdak_open) },
+	{ HP_POP(clif->lapineDdukDdak_result, HP_clif_lapineDdukDdak_result) },
+	{ HP_POP(clif->plapineDdukDdak_ack, HP_clif_plapineDdukDdak_ack) },
+	{ HP_POP(clif->plapineDdukDdak_close, HP_clif_plapineDdukDdak_close) },
+	{ HP_POP(clif->lapineUpgrade_open, HP_clif_lapineUpgrade_open) },
+	{ HP_POP(clif->lapineUpgrade_result, HP_clif_lapineUpgrade_result) },
+	{ HP_POP(clif->pLapineUpgrade_close, HP_clif_pLapineUpgrade_close) },
+	{ HP_POP(clif->pLapineUpgrade_makeItem, HP_clif_pLapineUpgrade_makeItem) },
+	{ HP_POP(clif->pReqGearOff, HP_clif_pReqGearOff) },
 /* cmdline_interface */
 	{ HP_POP(cmdline->init, HP_cmdline_init) },
 	{ HP_POP(cmdline->final, HP_cmdline_final) },
@@ -1197,7 +1251,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(duel->reject, HP_duel_reject) },
 	{ HP_POP(duel->leave, HP_duel_leave) },
 	{ HP_POP(duel->showinfo, HP_duel_showinfo) },
-	{ HP_POP(duel->checktime, HP_duel_checktime) },
+	{ HP_POP(duel->difftime, HP_duel_difftime) },
 	{ HP_POP(duel->init, HP_duel_init) },
 	{ HP_POP(duel->final, HP_duel_final) },
 /* elemental_interface */
@@ -1291,7 +1345,6 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(guild->change_emblem, HP_guild_change_emblem) },
 	{ HP_POP(guild->emblem_changed, HP_guild_emblem_changed) },
 	{ HP_POP(guild->send_message, HP_guild_send_message) },
-	{ HP_POP(guild->recv_message, HP_guild_recv_message) },
 	{ HP_POP(guild->send_dot_remove, HP_guild_send_dot_remove) },
 	{ HP_POP(guild->skillupack, HP_guild_skillupack) },
 	{ HP_POP(guild->dobreak, HP_guild_dobreak) },
@@ -1314,7 +1367,9 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(guild->payexp_timer, HP_guild_payexp_timer) },
 	{ HP_POP(guild->sd_check, HP_guild_sd_check) },
 	{ HP_POP(guild->read_guildskill_tree_db, HP_guild_read_guildskill_tree_db) },
-	{ HP_POP(guild->read_castledb, HP_guild_read_castledb) },
+	{ HP_POP(guild->read_castledb_libconfig, HP_guild_read_castledb_libconfig) },
+	{ HP_POP(guild->read_castledb_libconfig_sub, HP_guild_read_castledb_libconfig_sub) },
+	{ HP_POP(guild->read_castledb_libconfig_sub_warp, HP_guild_read_castledb_libconfig_sub_warp) },
 	{ HP_POP(guild->payexp_timer_sub, HP_guild_payexp_timer_sub) },
 	{ HP_POP(guild->send_xy_timer_sub, HP_guild_send_xy_timer_sub) },
 	{ HP_POP(guild->send_xy_timer, HP_guild_send_xy_timer) },
@@ -1365,6 +1420,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(homun->evolve, HP_homun_evolve) },
 	{ HP_POP(homun->mutate, HP_homun_mutate) },
 	{ HP_POP(homun->gainexp, HP_homun_gainexp) },
+	{ HP_POP(homun->gainexp_real, HP_homun_gainexp_real) },
 	{ HP_POP(homun->add_intimacy, HP_homun_add_intimacy) },
 	{ HP_POP(homun->consume_intimacy, HP_homun_consume_intimacy) },
 	{ HP_POP(homun->healed, HP_homun_healed) },
@@ -1416,11 +1472,6 @@ struct HookingPointData HookingPoints[] = {
 /* intif_interface */
 	{ HP_POP(intif->parse, HP_intif_parse) },
 	{ HP_POP(intif->create_pet, HP_intif_create_pet) },
-	{ HP_POP(intif->broadcast, HP_intif_broadcast) },
-	{ HP_POP(intif->broadcast2, HP_intif_broadcast2) },
-	{ HP_POP(intif->main_message, HP_intif_main_message) },
-	{ HP_POP(intif->wis_message, HP_intif_wis_message) },
-	{ HP_POP(intif->wis_message_to_gm, HP_intif_wis_message_to_gm) },
 	{ HP_POP(intif->saveregistry, HP_intif_saveregistry) },
 	{ HP_POP(intif->request_registry, HP_intif_request_registry) },
 	{ HP_POP(intif->request_account_storage, HP_intif_request_account_storage) },
@@ -1434,7 +1485,6 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(intif->party_leave, HP_intif_party_leave) },
 	{ HP_POP(intif->party_changemap, HP_intif_party_changemap) },
 	{ HP_POP(intif->break_party, HP_intif_break_party) },
-	{ HP_POP(intif->party_message, HP_intif_party_message) },
 	{ HP_POP(intif->party_leaderchange, HP_intif_party_leaderchange) },
 	{ HP_POP(intif->guild_create, HP_intif_guild_create) },
 	{ HP_POP(intif->guild_request_info, HP_intif_guild_request_info) },
@@ -1442,7 +1492,6 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(intif->guild_leave, HP_intif_guild_leave) },
 	{ HP_POP(intif->guild_memberinfoshort, HP_intif_guild_memberinfoshort) },
 	{ HP_POP(intif->guild_break, HP_intif_guild_break) },
-	{ HP_POP(intif->guild_message, HP_intif_guild_message) },
 	{ HP_POP(intif->guild_change_gm, HP_intif_guild_change_gm) },
 	{ HP_POP(intif->guild_change_basicinfo, HP_intif_guild_change_basicinfo) },
 	{ HP_POP(intif->guild_change_memberinfo, HP_intif_guild_change_memberinfo) },
@@ -1488,16 +1537,14 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(intif->rodex_updatemail, HP_intif_rodex_updatemail) },
 	{ HP_POP(intif->rodex_sendmail, HP_intif_rodex_sendmail) },
 	{ HP_POP(intif->rodex_checkname, HP_intif_rodex_checkname) },
+	{ HP_POP(intif->pGetZenyAck, HP_intif_pGetZenyAck) },
+	{ HP_POP(intif->pGetItemsAck, HP_intif_pGetItemsAck) },
 	{ HP_POP(intif->clan_kickoffline, HP_intif_clan_kickoffline) },
 	{ HP_POP(intif->clan_membercount, HP_intif_clan_membercount) },
 	{ HP_POP(intif->request_accinfo, HP_intif_request_accinfo) },
 	{ HP_POP(intif->CheckForCharServer, HP_intif_CheckForCharServer) },
 	{ HP_POP(intif->achievements_request, HP_intif_achievements_request) },
 	{ HP_POP(intif->achievements_save, HP_intif_achievements_save) },
-	{ HP_POP(intif->pWisMessage, HP_intif_pWisMessage) },
-	{ HP_POP(intif->pWisEnd, HP_intif_pWisEnd) },
-	{ HP_POP(intif->pWisToGM_sub, HP_intif_pWisToGM_sub) },
-	{ HP_POP(intif->pWisToGM, HP_intif_pWisToGM) },
 	{ HP_POP(intif->pRegisters, HP_intif_pRegisters) },
 	{ HP_POP(intif->pAccountStorage, HP_intif_pAccountStorage) },
 	{ HP_POP(intif->pChangeNameOk, HP_intif_pChangeNameOk) },
@@ -1512,14 +1559,12 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(intif->pPartyMemberWithdraw, HP_intif_pPartyMemberWithdraw) },
 	{ HP_POP(intif->pPartyMove, HP_intif_pPartyMove) },
 	{ HP_POP(intif->pPartyBroken, HP_intif_pPartyBroken) },
-	{ HP_POP(intif->pPartyMessage, HP_intif_pPartyMessage) },
 	{ HP_POP(intif->pGuildCreated, HP_intif_pGuildCreated) },
 	{ HP_POP(intif->pGuildInfo, HP_intif_pGuildInfo) },
 	{ HP_POP(intif->pGuildMemberAdded, HP_intif_pGuildMemberAdded) },
 	{ HP_POP(intif->pGuildMemberWithdraw, HP_intif_pGuildMemberWithdraw) },
 	{ HP_POP(intif->pGuildMemberInfoShort, HP_intif_pGuildMemberInfoShort) },
 	{ HP_POP(intif->pGuildBroken, HP_intif_pGuildBroken) },
-	{ HP_POP(intif->pGuildMessage, HP_intif_pGuildMessage) },
 	{ HP_POP(intif->pGuildBasicInfoChanged, HP_intif_pGuildBasicInfoChanged) },
 	{ HP_POP(intif->pGuildMemberInfoChanged, HP_intif_pGuildMemberInfoChanged) },
 	{ HP_POP(intif->pGuildPosition, HP_intif_pGuildPosition) },
@@ -1630,8 +1675,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(itemdb->isrestricted, HP_itemdb_isrestricted) },
 	{ HP_POP(itemdb->isidentified, HP_itemdb_isidentified) },
 	{ HP_POP(itemdb->isidentified2, HP_itemdb_isidentified2) },
-	{ HP_POP(itemdb->combo_split_atoi, HP_itemdb_combo_split_atoi) },
-	{ HP_POP(itemdb->read_combos, HP_itemdb_read_combos) },
+	{ HP_POP(itemdb->read_combodb_libconfig, HP_itemdb_read_combodb_libconfig) },
+	{ HP_POP(itemdb->read_combodb_libconfig_sub, HP_itemdb_read_combodb_libconfig_sub) },
 	{ HP_POP(itemdb->gendercheck, HP_itemdb_gendercheck) },
 	{ HP_POP(itemdb->validate_entry, HP_itemdb_validate_entry) },
 	{ HP_POP(itemdb->readdb_options_additional_fields, HP_itemdb_readdb_options_additional_fields) },
@@ -1650,7 +1695,12 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(itemdb->lookup_const, HP_itemdb_lookup_const) },
 	{ HP_POP(itemdb->lookup_const_mask, HP_itemdb_lookup_const_mask) },
 	{ HP_POP(itemdb->addname_sub, HP_itemdb_addname_sub) },
+	{ HP_POP(itemdb->read_libconfig_lapineddukddak, HP_itemdb_read_libconfig_lapineddukddak) },
+	{ HP_POP(itemdb->read_libconfig_lapineddukddak_sub, HP_itemdb_read_libconfig_lapineddukddak_sub) },
+	{ HP_POP(itemdb->read_libconfig_lapineddukddak_sub_sources, HP_itemdb_read_libconfig_lapineddukddak_sub_sources) },
 /* libconfig_interface */
+	{ HP_POP(libconfig->set_db_path, HP_libconfig_set_db_path) },
+	{ HP_POP(libconfig->format_db_path, HP_libconfig_format_db_path) },
 	{ HP_POP(libconfig->read, HP_libconfig_read) },
 	{ HP_POP(libconfig->write, HP_libconfig_write) },
 	{ HP_POP(libconfig->set_options, HP_libconfig_set_options) },
@@ -1890,6 +1940,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(map->merge_zone, HP_map_merge_zone) },
 	{ HP_POP(map->zone_clear_single, HP_map_zone_clear_single) },
 /* mapindex_interface */
+	{ HP_POP(mapindex->config_read_dbpath, HP_mapindex_config_read_dbpath) },
+	{ HP_POP(mapindex->config_read, HP_mapindex_config_read) },
 	{ HP_POP(mapindex->init, HP_mapindex_init) },
 	{ HP_POP(mapindex->final, HP_mapindex_final) },
 	{ HP_POP(mapindex->addmap, HP_mapindex_addmap) },
@@ -1954,6 +2006,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(mob->init, HP_mob_init) },
 	{ HP_POP(mob->final, HP_mob_final) },
 	{ HP_POP(mob->reload, HP_mob_reload) },
+	{ HP_POP(mob->reload_sub_mob, HP_mob_reload_sub_mob) },
 	{ HP_POP(mob->db, HP_mob_db) },
 	{ HP_POP(mob->chat, HP_mob_chat) },
 	{ HP_POP(mob->makedummymobdb, HP_mob_makedummymobdb) },
@@ -1990,6 +2043,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(mob->ai_sub_hard_bg_ally, HP_mob_ai_sub_hard_bg_ally) },
 	{ HP_POP(mob->ai_sub_hard_lootsearch, HP_mob_ai_sub_hard_lootsearch) },
 	{ HP_POP(mob->warpchase_sub, HP_mob_warpchase_sub) },
+	{ HP_POP(mob->is_in_battle_state, HP_mob_is_in_battle_state) },
 	{ HP_POP(mob->ai_sub_hard_slavemob, HP_mob_ai_sub_hard_slavemob) },
 	{ HP_POP(mob->unlocktarget, HP_mob_unlocktarget) },
 	{ HP_POP(mob->randomwalk, HP_mob_randomwalk) },
@@ -2000,6 +2054,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(mob->ai_sub_lazy, HP_mob_ai_sub_lazy) },
 	{ HP_POP(mob->ai_lazy, HP_mob_ai_lazy) },
 	{ HP_POP(mob->ai_hard, HP_mob_ai_hard) },
+	{ HP_POP(mob->setdropitem_options, HP_mob_setdropitem_options) },
 	{ HP_POP(mob->setdropitem, HP_mob_setdropitem) },
 	{ HP_POP(mob->setlootitem, HP_mob_setlootitem) },
 	{ HP_POP(mob->delay_item_drop, HP_mob_delay_item_drop) },
@@ -2033,6 +2088,10 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(mob->clone_delete, HP_mob_clone_delete) },
 	{ HP_POP(mob->drop_adjust, HP_mob_drop_adjust) },
 	{ HP_POP(mob->item_dropratio_adjust, HP_mob_item_dropratio_adjust) },
+	{ HP_POP(mob->read_optdrops_option, HP_mob_read_optdrops_option) },
+	{ HP_POP(mob->read_optdrops_optslot, HP_mob_read_optdrops_optslot) },
+	{ HP_POP(mob->read_optdrops_group, HP_mob_read_optdrops_group) },
+	{ HP_POP(mob->read_optdrops_db, HP_mob_read_optdrops_db) },
 	{ HP_POP(mob->readdb, HP_mob_readdb) },
 	{ HP_POP(mob->lookup_const, HP_mob_lookup_const) },
 	{ HP_POP(mob->get_const, HP_mob_get_const) },
@@ -2043,9 +2102,11 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(mob->read_db_drops_sub, HP_mob_read_db_drops_sub) },
 	{ HP_POP(mob->read_db_mvpdrops_sub, HP_mob_read_db_mvpdrops_sub) },
 	{ HP_POP(mob->read_db_mode_sub, HP_mob_read_db_mode_sub) },
+	{ HP_POP(mob->read_db_drops_option, HP_mob_read_db_drops_option) },
 	{ HP_POP(mob->read_db_stats_sub, HP_mob_read_db_stats_sub) },
+	{ HP_POP(mob->read_db_viewdata_sub, HP_mob_read_db_viewdata_sub) },
 	{ HP_POP(mob->name_constants, HP_mob_name_constants) },
-	{ HP_POP(mob->readdb_mobavail, HP_mob_readdb_mobavail) },
+	{ HP_POP(mob->mobavail_removal_notice, HP_mob_mobavail_removal_notice) },
 	{ HP_POP(mob->read_randommonster, HP_mob_read_randommonster) },
 	{ HP_POP(mob->parse_row_chatdb, HP_mob_parse_row_chatdb) },
 	{ HP_POP(mob->readchatdb, HP_mob_readchatdb) },
@@ -2058,6 +2119,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(mob->set_item_drop_ratio, HP_mob_set_item_drop_ratio) },
 	{ HP_POP(mob->final_ratio_sub, HP_mob_final_ratio_sub) },
 	{ HP_POP(mob->destroy_mob_db, HP_mob_destroy_mob_db) },
+	{ HP_POP(mob->destroy_drop_groups, HP_mob_destroy_drop_groups) },
 	{ HP_POP(mob->skill_db_libconfig, HP_mob_skill_db_libconfig) },
 	{ HP_POP(mob->skill_db_libconfig_sub, HP_mob_skill_db_libconfig_sub) },
 	{ HP_POP(mob->skill_db_libconfig_sub_skill, HP_mob_skill_db_libconfig_sub_skill) },
@@ -2136,6 +2198,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(npc->unload_ev_label, HP_npc_unload_ev_label) },
 	{ HP_POP(npc->unload_dup_sub, HP_npc_unload_dup_sub) },
 	{ HP_POP(npc->unload_duplicates, HP_npc_unload_duplicates) },
+	{ HP_POP(npc->unload_mob, HP_npc_unload_mob) },
 	{ HP_POP(npc->unload, HP_npc_unload) },
 	{ HP_POP(npc->clearsrcfile, HP_npc_clearsrcfile) },
 	{ HP_POP(npc->addsrcfile, HP_npc_addsrcfile) },
@@ -2187,6 +2250,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(npc->trader_update, HP_npc_trader_update) },
 	{ HP_POP(npc->market_buylist, HP_npc_market_buylist) },
 	{ HP_POP(npc->barter_buylist, HP_npc_barter_buylist) },
+	{ HP_POP(npc->expanded_barter_buylist, HP_npc_expanded_barter_buylist) },
 	{ HP_POP(npc->trader_open, HP_npc_trader_open) },
 	{ HP_POP(npc->market_fromsql, HP_npc_market_fromsql) },
 	{ HP_POP(npc->market_tosql, HP_npc_market_tosql) },
@@ -2196,10 +2260,17 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(npc->barter_tosql, HP_npc_barter_tosql) },
 	{ HP_POP(npc->barter_delfromsql, HP_npc_barter_delfromsql) },
 	{ HP_POP(npc->barter_delfromsql_sub, HP_npc_barter_delfromsql_sub) },
+	{ HP_POP(npc->expanded_barter_fromsql, HP_npc_expanded_barter_fromsql) },
+	{ HP_POP(npc->expanded_barter_tosql, HP_npc_expanded_barter_tosql) },
+	{ HP_POP(npc->expanded_barter_delfromsql, HP_npc_expanded_barter_delfromsql) },
+	{ HP_POP(npc->expanded_barter_delfromsql_sub, HP_npc_expanded_barter_delfromsql_sub) },
 	{ HP_POP(npc->db_checkid, HP_npc_db_checkid) },
 	{ HP_POP(npc->refresh, HP_npc_refresh) },
+	{ HP_POP(npc->questinfo_clear, HP_npc_questinfo_clear) },
 	{ HP_POP(npc->secure_timeout_timer, HP_npc_secure_timeout_timer) },
 /* nullpo_interface */
+	{ HP_POP(nullpo->init, HP_nullpo_init) },
+	{ HP_POP(nullpo->final, HP_nullpo_final) },
 	{ HP_POP(nullpo->assert_report, HP_nullpo_assert_report) },
 /* packets_interface */
 	{ HP_POP(packets->init, HP_packets_init) },
@@ -2234,7 +2305,6 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(party->send_levelup, HP_party_send_levelup) },
 	{ HP_POP(party->send_logout, HP_party_send_logout) },
 	{ HP_POP(party->send_message, HP_party_send_message) },
-	{ HP_POP(party->recv_message, HP_party_recv_message) },
 	{ HP_POP(party->skill_check, HP_party_skill_check) },
 	{ HP_POP(party->send_xy_clear, HP_party_send_xy_clear) },
 	{ HP_POP(party->exp_share, HP_party_exp_share) },
@@ -2378,6 +2448,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(pc->unequipitem_pos, HP_pc_unequipitem_pos) },
 	{ HP_POP(pc->checkitem, HP_pc_checkitem) },
 	{ HP_POP(pc->useitem, HP_pc_useitem) },
+	{ HP_POP(pc->autocast_clear, HP_pc_autocast_clear) },
 	{ HP_POP(pc->skillatk_bonus, HP_pc_skillatk_bonus) },
 	{ HP_POP(pc->skillheal_bonus, HP_pc_skillheal_bonus) },
 	{ HP_POP(pc->skillheal2_bonus, HP_pc_skillheal2_bonus) },
@@ -2388,6 +2459,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(pc->itemheal, HP_pc_itemheal) },
 	{ HP_POP(pc->percentheal, HP_pc_percentheal) },
 	{ HP_POP(pc->jobchange, HP_pc_jobchange) },
+	{ HP_POP(pc->hide, HP_pc_hide) },
+	{ HP_POP(pc->unhide, HP_pc_unhide) },
 	{ HP_POP(pc->setoption, HP_pc_setoption) },
 	{ HP_POP(pc->setcart, HP_pc_setcart) },
 	{ HP_POP(pc->setfalcon, HP_pc_setfalcon) },
@@ -2510,12 +2583,16 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(pc->check_job_name, HP_pc_check_job_name) },
 	{ HP_POP(pc->update_idle_time, HP_pc_update_idle_time) },
 	{ HP_POP(pc->have_magnifier, HP_pc_have_magnifier) },
+	{ HP_POP(pc->have_item_chain, HP_pc_have_item_chain) },
 	{ HP_POP(pc->process_chat_message, HP_pc_process_chat_message) },
+	{ HP_POP(pc->wis_message_to_gm, HP_pc_wis_message_to_gm) },
+	{ HP_POP(pc->wis_message_to_gm_sub, HP_pc_wis_message_to_gm_sub) },
 	{ HP_POP(pc->check_supernovice_call, HP_pc_check_supernovice_call) },
 	{ HP_POP(pc->check_basicskill, HP_pc_check_basicskill) },
 	{ HP_POP(pc->isDeathPenaltyJob, HP_pc_isDeathPenaltyJob) },
 	{ HP_POP(pc->has_second_costume, HP_pc_has_second_costume) },
 	{ HP_POP(pc->expandInventory, HP_pc_expandInventory) },
+	{ HP_POP(pc->auto_exp_insurance, HP_pc_auto_exp_insurance) },
 /* pcre_interface */
 	{ HP_POP(libpcre->compile, HP_libpcre_compile) },
 	{ HP_POP(libpcre->study, HP_libpcre_study) },
@@ -2529,6 +2606,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(pet->init, HP_pet_init) },
 	{ HP_POP(pet->final, HP_pet_final) },
 	{ HP_POP(pet->hungry_val, HP_pet_hungry_val) },
+	{ HP_POP(pet->set_hunger, HP_pet_set_hunger) },
 	{ HP_POP(pet->set_intimate, HP_pet_set_intimate) },
 	{ HP_POP(pet->create_egg, HP_pet_create_egg) },
 	{ HP_POP(pet->unlocktarget, HP_pet_unlocktarget) },
@@ -2597,7 +2675,23 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(quest->questinfo_validate_homunculus_type, HP_quest_questinfo_validate_homunculus_type) },
 	{ HP_POP(quest->questinfo_validate_quests, HP_quest_questinfo_validate_quests) },
 	{ HP_POP(quest->questinfo_validate_mercenary_class, HP_quest_questinfo_validate_mercenary_class) },
-	{ HP_POP(quest->questinfo_vector_clear, HP_quest_questinfo_vector_clear) },
+/* refine_interface */
+	{ HP_POP(refine->init, HP_refine_init) },
+	{ HP_POP(refine->final, HP_refine_final) },
+	{ HP_POP(refine->get_refine_chance, HP_refine_get_refine_chance) },
+	{ HP_POP(refine->get_bonus, HP_refine_get_bonus) },
+	{ HP_POP(refine->get_randombonus_max, HP_refine_get_randombonus_max) },
+	{ HP_POP(refine->refinery_add_item, HP_refine_refinery_add_item) },
+	{ HP_POP(refine->refinery_refine_request, HP_refine_refinery_refine_request) },
+/* refine_interface_private */
+	{ HP_POP(refine->p->readdb_refine_libconfig_sub, HP_PRIV__refine_readdb_refine_libconfig_sub) },
+	{ HP_POP(refine->p->readdb_refine_libconfig, HP_PRIV__refine_readdb_refine_libconfig) },
+	{ HP_POP(refine->p->announce_behavior_string2enum, HP_PRIV__refine_announce_behavior_string2enum) },
+	{ HP_POP(refine->p->failure_behavior_string2enum, HP_PRIV__refine_failure_behavior_string2enum) },
+	{ HP_POP(refine->p->readdb_refinery_ui_settings_items, HP_PRIV__refine_readdb_refinery_ui_settings_items) },
+	{ HP_POP(refine->p->readdb_refinery_ui_settings_sub, HP_PRIV__refine_readdb_refinery_ui_settings_sub) },
+	{ HP_POP(refine->p->readdb_refinery_ui_settings, HP_PRIV__refine_readdb_refinery_ui_settings) },
+	{ HP_POP(refine->p->is_refinable, HP_PRIV__refine_is_refinable) },
 /* rnd_interface */
 	{ HP_POP(rnd->init, HP_rnd_init) },
 	{ HP_POP(rnd->final, HP_rnd_final) },
@@ -2625,6 +2719,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(rodex->get_items, HP_rodex_get_items) },
 	{ HP_POP(rodex->delete_mail, HP_rodex_delete_mail) },
 	{ HP_POP(rodex->clean, HP_rodex_clean) },
+	{ HP_POP(rodex->getZenyAck, HP_rodex_getZenyAck) },
+	{ HP_POP(rodex->getItemsAck, HP_rodex_getItemsAck) },
 /* script_interface */
 	{ HP_POP(script->init, HP_script_init) },
 	{ HP_POP(script->final, HP_script_final) },
@@ -2800,16 +2896,21 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(script->string_dup, HP_script_string_dup) },
 	{ HP_POP(script->load_translations, HP_script_load_translations) },
 	{ HP_POP(script->load_translation_addstring, HP_script_load_translation_addstring) },
+	{ HP_POP(script->load_translation_file, HP_script_load_translation_file) },
 	{ HP_POP(script->load_translation, HP_script_load_translation) },
 	{ HP_POP(script->translation_db_destroyer, HP_script_translation_db_destroyer) },
 	{ HP_POP(script->clear_translations, HP_script_clear_translations) },
 	{ HP_POP(script->parse_cleanup_timer, HP_script_parse_cleanup_timer) },
 	{ HP_POP(script->add_language, HP_script_add_language) },
-	{ HP_POP(script->get_translation_file_name, HP_script_get_translation_file_name) },
+	{ HP_POP(script->get_translation_dir_name, HP_script_get_translation_dir_name) },
 	{ HP_POP(script->parser_clean_leftovers, HP_script_parser_clean_leftovers) },
 	{ HP_POP(script->run_use_script, HP_script_run_use_script) },
 	{ HP_POP(script->run_item_equip_script, HP_script_run_item_equip_script) },
 	{ HP_POP(script->run_item_unequip_script, HP_script_run_item_unequip_script) },
+	{ HP_POP(script->run_item_rental_end_script, HP_script_run_item_rental_end_script) },
+	{ HP_POP(script->run_item_rental_start_script, HP_script_run_item_rental_start_script) },
+	{ HP_POP(script->run_item_lapineddukddak_script, HP_script_run_item_lapineddukddak_script) },
+	{ HP_POP(script->sellitemcurrency_add, HP_script_sellitemcurrency_add) },
 /* searchstore_interface */
 	{ HP_POP(searchstore->open, HP_searchstore_open) },
 	{ HP_POP(searchstore->query, HP_searchstore_query) },
@@ -2932,6 +3033,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(skill->not_ok_hom, HP_skill_not_ok_hom) },
 	{ HP_POP(skill->not_ok_hom_unknown, HP_skill_not_ok_hom_unknown) },
 	{ HP_POP(skill->not_ok_mercenary, HP_skill_not_ok_mercenary) },
+	{ HP_POP(skill->validate_autocast_data, HP_skill_validate_autocast_data) },
 	{ HP_POP(skill->chastle_mob_changetarget, HP_skill_chastle_mob_changetarget) },
 	{ HP_POP(skill->can_produce_mix, HP_skill_can_produce_mix) },
 	{ HP_POP(skill->produce_mix, HP_skill_produce_mix) },
@@ -3089,6 +3191,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(sockt->session_is_active, HP_sockt_session_is_active) },
 	{ HP_POP(sockt->flush, HP_sockt_flush) },
 	{ HP_POP(sockt->flush_fifos, HP_sockt_flush_fifos) },
+	{ HP_POP(sockt->connect_client, HP_sockt_connect_client) },
 	{ HP_POP(sockt->set_nonblocking, HP_sockt_set_nonblocking) },
 	{ HP_POP(sockt->set_defaultparse, HP_sockt_set_defaultparse) },
 	{ HP_POP(sockt->host2ip, HP_sockt_host2ip) },
@@ -3138,12 +3241,12 @@ struct HookingPointData HookingPoints[] = {
 /* status_interface */
 	{ HP_POP(status->init, HP_status_init) },
 	{ HP_POP(status->final, HP_status_final) },
-	{ HP_POP(status->get_refine_chance, HP_status_get_refine_chance) },
 	{ HP_POP(status->skill2sc, HP_status_skill2sc) },
 	{ HP_POP(status->sc2skill, HP_status_sc2skill) },
 	{ HP_POP(status->sc2scb_flag, HP_status_sc2scb_flag) },
-	{ HP_POP(status->type2relevant_bl_types, HP_status_type2relevant_bl_types) },
+	{ HP_POP(status->get_sc_relevant_bl_types, HP_status_get_sc_relevant_bl_types) },
 	{ HP_POP(status->get_sc_type, HP_status_get_sc_type) },
+	{ HP_POP(status->get_sc_icon, HP_status_get_sc_icon) },
 	{ HP_POP(status->damage, HP_status_damage) },
 	{ HP_POP(status->charge, HP_status_charge) },
 	{ HP_POP(status->percent_change, HP_status_percent_change) },
@@ -3174,6 +3277,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(status->isimmune, HP_status_isimmune) },
 	{ HP_POP(status->get_sc_def, HP_status_get_sc_def) },
 	{ HP_POP(status->change_start, HP_status_change_start) },
+	{ HP_POP(status->change_start_sub, HP_status_change_start_sub) },
 	{ HP_POP(status->change_end_, HP_status_change_end_) },
 	{ HP_POP(status->is_immune_to_status, HP_status_is_immune_to_status) },
 	{ HP_POP(status->is_boss_resist_sc, HP_status_is_boss_resist_sc) },
@@ -3254,9 +3358,10 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(status->natural_heal_timer, HP_status_natural_heal_timer) },
 	{ HP_POP(status->readdb_job2, HP_status_readdb_job2) },
 	{ HP_POP(status->readdb_sizefix, HP_status_readdb_sizefix) },
-	{ HP_POP(status->readdb_refine_libconfig, HP_status_readdb_refine_libconfig) },
-	{ HP_POP(status->readdb_refine_libconfig_sub, HP_status_readdb_refine_libconfig_sub) },
-	{ HP_POP(status->readdb_scconfig, HP_status_readdb_scconfig) },
+	{ HP_POP(status->read_scdb_libconfig, HP_status_read_scdb_libconfig) },
+	{ HP_POP(status->read_scdb_libconfig_sub, HP_status_read_scdb_libconfig_sub) },
+	{ HP_POP(status->read_scdb_libconfig_sub_flag, HP_status_read_scdb_libconfig_sub_flag) },
+	{ HP_POP(status->read_scdb_libconfig_sub_flag_additional, HP_status_read_scdb_libconfig_sub_flag_additional) },
 	{ HP_POP(status->read_job_db, HP_status_read_job_db) },
 	{ HP_POP(status->read_job_db_sub, HP_status_read_job_db_sub) },
 	{ HP_POP(status->set_sc, HP_status_set_sc) },
@@ -3304,6 +3409,16 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(strlib->safestrnlen_, HP_strlib_safestrnlen_) },
 	{ HP_POP(strlib->strline_, HP_strlib_strline_) },
 	{ HP_POP(strlib->bin2hex_, HP_strlib_bin2hex_) },
+/* stylist_interface */
+	{ HP_POP(stylist->init, HP_stylist_init) },
+	{ HP_POP(stylist->final, HP_stylist_final) },
+	{ HP_POP(stylist->vector_init, HP_stylist_vector_init) },
+	{ HP_POP(stylist->vector_clear, HP_stylist_vector_clear) },
+	{ HP_POP(stylist->read_db_libconfig, HP_stylist_read_db_libconfig) },
+	{ HP_POP(stylist->read_db_libconfig_sub, HP_stylist_read_db_libconfig_sub) },
+	{ HP_POP(stylist->request_style_change, HP_stylist_request_style_change) },
+	{ HP_POP(stylist->validate_requirements, HP_stylist_validate_requirements) },
+	{ HP_POP(stylist->send_rodexitem, HP_stylist_send_rodexitem) },
 /* sv_interface */
 	{ HP_POP(sv->parse_next, HP_sv_parse_next) },
 	{ HP_POP(sv->parse, HP_sv_parse) },
@@ -3371,26 +3486,28 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(unit->init, HP_unit_init) },
 	{ HP_POP(unit->final, HP_unit_final) },
 	{ HP_POP(unit->bl2ud, HP_unit_bl2ud) },
+	{ HP_POP(unit->cbl2ud, HP_unit_cbl2ud) },
 	{ HP_POP(unit->bl2ud2, HP_unit_bl2ud2) },
 	{ HP_POP(unit->init_ud, HP_unit_init_ud) },
 	{ HP_POP(unit->attack_timer, HP_unit_attack_timer) },
-	{ HP_POP(unit->walktoxy_timer, HP_unit_walktoxy_timer) },
-	{ HP_POP(unit->walktoxy_sub, HP_unit_walktoxy_sub) },
-	{ HP_POP(unit->delay_walktoxy_timer, HP_unit_delay_walktoxy_timer) },
-	{ HP_POP(unit->walktoxy, HP_unit_walktoxy) },
-	{ HP_POP(unit->walktobl_sub, HP_unit_walktobl_sub) },
+	{ HP_POP(unit->walk_toxy_timer, HP_unit_walk_toxy_timer) },
+	{ HP_POP(unit->walk_toxy_sub, HP_unit_walk_toxy_sub) },
+	{ HP_POP(unit->delay_walk_toxy_timer, HP_unit_delay_walk_toxy_timer) },
+	{ HP_POP(unit->walk_toxy, HP_unit_walk_toxy) },
+	{ HP_POP(unit->walktobl_timer, HP_unit_walktobl_timer) },
 	{ HP_POP(unit->walktobl, HP_unit_walktobl) },
 	{ HP_POP(unit->run, HP_unit_run) },
 	{ HP_POP(unit->run_hit, HP_unit_run_hit) },
 	{ HP_POP(unit->escape, HP_unit_escape) },
 	{ HP_POP(unit->movepos, HP_unit_movepos) },
-	{ HP_POP(unit->setdir, HP_unit_setdir) },
+	{ HP_POP(unit->set_dir, HP_unit_set_dir) },
 	{ HP_POP(unit->getdir, HP_unit_getdir) },
 	{ HP_POP(unit->blown, HP_unit_blown) },
 	{ HP_POP(unit->warp, HP_unit_warp) },
+	{ HP_POP(unit->warpto_master, HP_unit_warpto_master) },
 	{ HP_POP(unit->stop_walking, HP_unit_stop_walking) },
 	{ HP_POP(unit->skilluse_id, HP_unit_skilluse_id) },
-	{ HP_POP(unit->step_timer, HP_unit_step_timer) },
+	{ HP_POP(unit->steptimer, HP_unit_steptimer) },
 	{ HP_POP(unit->stop_stepaction, HP_unit_stop_stepaction) },
 	{ HP_POP(unit->is_walking, HP_unit_is_walking) },
 	{ HP_POP(unit->can_move, HP_unit_can_move) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index 8242b9797..f2871964c 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2013-2019  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
@@ -11278,11 +11278,11 @@ void HP_clif_viewpoint(struct map_session_data *sd, int npc_id, int type, int x,
 	}
 	return;
 }
-int HP_clif_damage(struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 damage, short div, unsigned char type, int64 damage2) {
+int HP_clif_damage(struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 damage, short div, enum battle_dmg_type type, int64 damage2) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_clif_damage_pre > 0) {
-		int (*preHookFunc) (struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *damage, short *div, unsigned char *type, int64 *damage2);
+		int (*preHookFunc) (struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *damage, short *div, enum battle_dmg_type *type, int64 *damage2);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_damage_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_clif_damage_pre[hIndex].func;
@@ -11297,7 +11297,7 @@ int HP_clif_damage(struct block_list *src, struct block_list *dst, int sdelay, i
 		retVal___ = HPMHooks.source.clif.damage(src, dst, sdelay, ddelay, damage, div, type, damage2);
 	}
 	if (HPMHooks.count.HP_clif_damage_post > 0) {
-		int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 damage, short div, unsigned char type, int64 damage2);
+		int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 damage, short div, enum battle_dmg_type type, int64 damage2);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_damage_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_clif_damage_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, src, dst, sdelay, ddelay, damage, div, type, damage2);
@@ -11539,6 +11539,58 @@ void HP_clif_ranklist(struct map_session_data *sd, enum fame_list_type type) {
 	}
 	return;
 }
+void HP_clif_ranklist_sub(struct PACKET_ZC_ACK_RANKING_sub *ranks, enum fame_list_type type) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_ranklist_sub_pre > 0) {
+		void (*preHookFunc) (struct PACKET_ZC_ACK_RANKING_sub **ranks, enum fame_list_type *type);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_ranklist_sub_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_ranklist_sub_pre[hIndex].func;
+			preHookFunc(&ranks, &type);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.ranklist_sub(ranks, type);
+	}
+	if (HPMHooks.count.HP_clif_ranklist_sub_post > 0) {
+		void (*postHookFunc) (struct PACKET_ZC_ACK_RANKING_sub *ranks, enum fame_list_type type);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_ranklist_sub_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_ranklist_sub_post[hIndex].func;
+			postHookFunc(ranks, type);
+		}
+	}
+	return;
+}
+void HP_clif_ranklist_sub2(uint32 *chars, uint32 *points, enum fame_list_type type) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_ranklist_sub2_pre > 0) {
+		void (*preHookFunc) (uint32 **chars, uint32 **points, enum fame_list_type *type);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_ranklist_sub2_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_ranklist_sub2_pre[hIndex].func;
+			preHookFunc(&chars, &points, &type);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.ranklist_sub2(chars, points, type);
+	}
+	if (HPMHooks.count.HP_clif_ranklist_sub2_post > 0) {
+		void (*postHookFunc) (uint32 *chars, uint32 *points, enum fame_list_type type);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_ranklist_sub2_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_ranklist_sub2_post[hIndex].func;
+			postHookFunc(chars, points, type);
+		}
+	}
+	return;
+}
 void HP_clif_update_rankingpoint(struct map_session_data *sd, enum fame_list_type type, int points) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_update_rankingpoint_pre > 0) {
@@ -11591,14 +11643,14 @@ void HP_clif_pRanklist(int fd, struct map_session_data *sd) {
 	}
 	return;
 }
-void HP_clif_hotkeys(struct map_session_data *sd) {
+void HP_clif_hotkeys(struct map_session_data *sd, int tab) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_hotkeys_pre > 0) {
-		void (*preHookFunc) (struct map_session_data **sd);
+		void (*preHookFunc) (struct map_session_data **sd, int *tab);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_hotkeys_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_clif_hotkeys_pre[hIndex].func;
-			preHookFunc(&sd);
+			preHookFunc(&sd, &tab);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -11606,12 +11658,38 @@ void HP_clif_hotkeys(struct map_session_data *sd) {
 		}
 	}
 	{
-		HPMHooks.source.clif.hotkeys(sd);
+		HPMHooks.source.clif.hotkeys(sd, tab);
 	}
 	if (HPMHooks.count.HP_clif_hotkeys_post > 0) {
-		void (*postHookFunc) (struct map_session_data *sd);
+		void (*postHookFunc) (struct map_session_data *sd, int tab);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_hotkeys_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_clif_hotkeys_post[hIndex].func;
+			postHookFunc(sd, tab);
+		}
+	}
+	return;
+}
+void HP_clif_hotkeysAll(struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_hotkeysAll_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_hotkeysAll_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_hotkeysAll_pre[hIndex].func;
+			preHookFunc(&sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.hotkeysAll(sd);
+	}
+	if (HPMHooks.count.HP_clif_hotkeysAll_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_hotkeysAll_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_hotkeysAll_post[hIndex].func;
 			postHookFunc(sd);
 		}
 	}
@@ -11917,14 +11995,14 @@ void HP_clif_combo_delay(struct block_list *bl, int wait) {
 	}
 	return;
 }
-void HP_clif_status_change(struct block_list *bl, int type, int flag, int tick, int val1, int val2, int val3) {
+void HP_clif_status_change(struct block_list *bl, int relevant_bl, int type, int flag, int total_tick, int val1, int val2, int val3) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_status_change_pre > 0) {
-		void (*preHookFunc) (struct block_list **bl, int *type, int *flag, int *tick, int *val1, int *val2, int *val3);
+		void (*preHookFunc) (struct block_list **bl, int *relevant_bl, int *type, int *flag, int *total_tick, int *val1, int *val2, int *val3);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_status_change_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_clif_status_change_pre[hIndex].func;
-			preHookFunc(&bl, &type, &flag, &tick, &val1, &val2, &val3);
+			preHookFunc(&bl, &relevant_bl, &type, &flag, &total_tick, &val1, &val2, &val3);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -11932,13 +12010,39 @@ void HP_clif_status_change(struct block_list *bl, int type, int flag, int tick,
 		}
 	}
 	{
-		HPMHooks.source.clif.status_change(bl, type, flag, tick, val1, val2, val3);
+		HPMHooks.source.clif.status_change(bl, relevant_bl, type, flag, total_tick, val1, val2, val3);
 	}
 	if (HPMHooks.count.HP_clif_status_change_post > 0) {
-		void (*postHookFunc) (struct block_list *bl, int type, int flag, int tick, int val1, int val2, int val3);
+		void (*postHookFunc) (struct block_list *bl, int relevant_bl, int type, int flag, int total_tick, int val1, int val2, int val3);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_status_change_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_clif_status_change_post[hIndex].func;
-			postHookFunc(bl, type, flag, tick, val1, val2, val3);
+			postHookFunc(bl, relevant_bl, type, flag, total_tick, val1, val2, val3);
+		}
+	}
+	return;
+}
+void HP_clif_status_change_sub(struct block_list *bl, int type, int relevant_bl, int flag, int tick, int total_tick, int val1, int val2, int val3) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_status_change_sub_pre > 0) {
+		void (*preHookFunc) (struct block_list **bl, int *type, int *relevant_bl, int *flag, int *tick, int *total_tick, int *val1, int *val2, int *val3);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_status_change_sub_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_status_change_sub_pre[hIndex].func;
+			preHookFunc(&bl, &type, &relevant_bl, &flag, &tick, &total_tick, &val1, &val2, &val3);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.status_change_sub(bl, type, relevant_bl, flag, tick, total_tick, val1, val2, val3);
+	}
+	if (HPMHooks.count.HP_clif_status_change_sub_post > 0) {
+		void (*postHookFunc) (struct block_list *bl, int type, int relevant_bl, int flag, int tick, int total_tick, int val1, int val2, int val3);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_status_change_sub_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_status_change_sub_post[hIndex].func;
+			postHookFunc(bl, type, relevant_bl, flag, tick, total_tick, val1, val2, val3);
 		}
 	}
 	return;
@@ -12619,13 +12723,195 @@ void HP_clif_changed_dir(struct block_list *bl, enum send_target target) {
 	}
 	return;
 }
-void HP_clif_charnameack(int fd, struct block_list *bl) {
+void HP_clif_blname_ack(int fd, struct block_list *bl) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_blname_ack_pre > 0) {
+		void (*preHookFunc) (int *fd, struct block_list **bl);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_blname_ack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_blname_ack_pre[hIndex].func;
+			preHookFunc(&fd, &bl);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.blname_ack(fd, bl);
+	}
+	if (HPMHooks.count.HP_clif_blname_ack_post > 0) {
+		void (*postHookFunc) (int fd, struct block_list *bl);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_blname_ack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_blname_ack_post[hIndex].func;
+			postHookFunc(fd, bl);
+		}
+	}
+	return;
+}
+void HP_clif_pcname_ack(int fd, struct block_list *bl) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pcname_ack_pre > 0) {
+		void (*preHookFunc) (int *fd, struct block_list **bl);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pcname_ack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pcname_ack_pre[hIndex].func;
+			preHookFunc(&fd, &bl);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pcname_ack(fd, bl);
+	}
+	if (HPMHooks.count.HP_clif_pcname_ack_post > 0) {
+		void (*postHookFunc) (int fd, struct block_list *bl);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pcname_ack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pcname_ack_post[hIndex].func;
+			postHookFunc(fd, bl);
+		}
+	}
+	return;
+}
+void HP_clif_homname_ack(int fd, struct block_list *bl) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_homname_ack_pre > 0) {
+		void (*preHookFunc) (int *fd, struct block_list **bl);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_homname_ack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_homname_ack_pre[hIndex].func;
+			preHookFunc(&fd, &bl);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.homname_ack(fd, bl);
+	}
+	if (HPMHooks.count.HP_clif_homname_ack_post > 0) {
+		void (*postHookFunc) (int fd, struct block_list *bl);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_homname_ack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_homname_ack_post[hIndex].func;
+			postHookFunc(fd, bl);
+		}
+	}
+	return;
+}
+void HP_clif_mername_ack(int fd, struct block_list *bl) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_mername_ack_pre > 0) {
+		void (*preHookFunc) (int *fd, struct block_list **bl);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_mername_ack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_mername_ack_pre[hIndex].func;
+			preHookFunc(&fd, &bl);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.mername_ack(fd, bl);
+	}
+	if (HPMHooks.count.HP_clif_mername_ack_post > 0) {
+		void (*postHookFunc) (int fd, struct block_list *bl);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_mername_ack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_mername_ack_post[hIndex].func;
+			postHookFunc(fd, bl);
+		}
+	}
+	return;
+}
+void HP_clif_petname_ack(int fd, struct block_list *bl) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_petname_ack_pre > 0) {
+		void (*preHookFunc) (int *fd, struct block_list **bl);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_petname_ack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_petname_ack_pre[hIndex].func;
+			preHookFunc(&fd, &bl);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.petname_ack(fd, bl);
+	}
+	if (HPMHooks.count.HP_clif_petname_ack_post > 0) {
+		void (*postHookFunc) (int fd, struct block_list *bl);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_petname_ack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_petname_ack_post[hIndex].func;
+			postHookFunc(fd, bl);
+		}
+	}
+	return;
+}
+void HP_clif_npcname_ack(int fd, struct block_list *bl) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_npcname_ack_pre > 0) {
+		void (*preHookFunc) (int *fd, struct block_list **bl);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_npcname_ack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_npcname_ack_pre[hIndex].func;
+			preHookFunc(&fd, &bl);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.npcname_ack(fd, bl);
+	}
+	if (HPMHooks.count.HP_clif_npcname_ack_post > 0) {
+		void (*postHookFunc) (int fd, struct block_list *bl);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_npcname_ack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_npcname_ack_post[hIndex].func;
+			postHookFunc(fd, bl);
+		}
+	}
+	return;
+}
+void HP_clif_mobname_ack(int fd, struct block_list *bl) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_mobname_ack_pre > 0) {
+		void (*preHookFunc) (int *fd, struct block_list **bl);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_mobname_ack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_mobname_ack_pre[hIndex].func;
+			preHookFunc(&fd, &bl);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.mobname_ack(fd, bl);
+	}
+	if (HPMHooks.count.HP_clif_mobname_ack_post > 0) {
+		void (*postHookFunc) (int fd, struct block_list *bl);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_mobname_ack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_mobname_ack_post[hIndex].func;
+			postHookFunc(fd, bl);
+		}
+	}
+	return;
+}
+void HP_clif_mobname_guardian_ack(int fd, struct block_list *bl) {
 	int hIndex = 0;
-	if (HPMHooks.count.HP_clif_charnameack_pre > 0) {
+	if (HPMHooks.count.HP_clif_mobname_guardian_ack_pre > 0) {
 		void (*preHookFunc) (int *fd, struct block_list **bl);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_charnameack_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_charnameack_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_mobname_guardian_ack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_mobname_guardian_ack_pre[hIndex].func;
 			preHookFunc(&fd, &bl);
 		}
 		if (*HPMforce_return) {
@@ -12634,12 +12920,194 @@ void HP_clif_charnameack(int fd, struct block_list *bl) {
 		}
 	}
 	{
-		HPMHooks.source.clif.charnameack(fd, bl);
+		HPMHooks.source.clif.mobname_guardian_ack(fd, bl);
 	}
-	if (HPMHooks.count.HP_clif_charnameack_post > 0) {
+	if (HPMHooks.count.HP_clif_mobname_guardian_ack_post > 0) {
 		void (*postHookFunc) (int fd, struct block_list *bl);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_charnameack_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_charnameack_post[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_mobname_guardian_ack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_mobname_guardian_ack_post[hIndex].func;
+			postHookFunc(fd, bl);
+		}
+	}
+	return;
+}
+void HP_clif_mobname_additional_ack(int fd, struct block_list *bl) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_mobname_additional_ack_pre > 0) {
+		void (*preHookFunc) (int *fd, struct block_list **bl);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_mobname_additional_ack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_mobname_additional_ack_pre[hIndex].func;
+			preHookFunc(&fd, &bl);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.mobname_additional_ack(fd, bl);
+	}
+	if (HPMHooks.count.HP_clif_mobname_additional_ack_post > 0) {
+		void (*postHookFunc) (int fd, struct block_list *bl);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_mobname_additional_ack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_mobname_additional_ack_post[hIndex].func;
+			postHookFunc(fd, bl);
+		}
+	}
+	return;
+}
+void HP_clif_mobname_normal_ack(int fd, struct block_list *bl) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_mobname_normal_ack_pre > 0) {
+		void (*preHookFunc) (int *fd, struct block_list **bl);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_mobname_normal_ack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_mobname_normal_ack_pre[hIndex].func;
+			preHookFunc(&fd, &bl);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.mobname_normal_ack(fd, bl);
+	}
+	if (HPMHooks.count.HP_clif_mobname_normal_ack_post > 0) {
+		void (*postHookFunc) (int fd, struct block_list *bl);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_mobname_normal_ack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_mobname_normal_ack_post[hIndex].func;
+			postHookFunc(fd, bl);
+		}
+	}
+	return;
+}
+void HP_clif_chatname_ack(int fd, struct block_list *bl) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_chatname_ack_pre > 0) {
+		void (*preHookFunc) (int *fd, struct block_list **bl);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_chatname_ack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_chatname_ack_pre[hIndex].func;
+			preHookFunc(&fd, &bl);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.chatname_ack(fd, bl);
+	}
+	if (HPMHooks.count.HP_clif_chatname_ack_post > 0) {
+		void (*postHookFunc) (int fd, struct block_list *bl);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_chatname_ack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_chatname_ack_post[hIndex].func;
+			postHookFunc(fd, bl);
+		}
+	}
+	return;
+}
+void HP_clif_elemname_ack(int fd, struct block_list *bl) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_elemname_ack_pre > 0) {
+		void (*preHookFunc) (int *fd, struct block_list **bl);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_elemname_ack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_elemname_ack_pre[hIndex].func;
+			preHookFunc(&fd, &bl);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.elemname_ack(fd, bl);
+	}
+	if (HPMHooks.count.HP_clif_elemname_ack_post > 0) {
+		void (*postHookFunc) (int fd, struct block_list *bl);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_elemname_ack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_elemname_ack_post[hIndex].func;
+			postHookFunc(fd, bl);
+		}
+	}
+	return;
+}
+void HP_clif_skillname_ack(int fd, struct block_list *bl) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_skillname_ack_pre > 0) {
+		void (*preHookFunc) (int *fd, struct block_list **bl);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_skillname_ack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_skillname_ack_pre[hIndex].func;
+			preHookFunc(&fd, &bl);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.skillname_ack(fd, bl);
+	}
+	if (HPMHooks.count.HP_clif_skillname_ack_post > 0) {
+		void (*postHookFunc) (int fd, struct block_list *bl);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_skillname_ack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_skillname_ack_post[hIndex].func;
+			postHookFunc(fd, bl);
+		}
+	}
+	return;
+}
+void HP_clif_itemname_ack(int fd, struct block_list *bl) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_itemname_ack_pre > 0) {
+		void (*preHookFunc) (int *fd, struct block_list **bl);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_itemname_ack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_itemname_ack_pre[hIndex].func;
+			preHookFunc(&fd, &bl);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.itemname_ack(fd, bl);
+	}
+	if (HPMHooks.count.HP_clif_itemname_ack_post > 0) {
+		void (*postHookFunc) (int fd, struct block_list *bl);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_itemname_ack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_itemname_ack_post[hIndex].func;
+			postHookFunc(fd, bl);
+		}
+	}
+	return;
+}
+void HP_clif_unknownname_ack(int fd, struct block_list *bl) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_unknownname_ack_pre > 0) {
+		void (*preHookFunc) (int *fd, struct block_list **bl);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_unknownname_ack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_unknownname_ack_pre[hIndex].func;
+			preHookFunc(&fd, &bl);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.unknownname_ack(fd, bl);
+	}
+	if (HPMHooks.count.HP_clif_unknownname_ack_post > 0) {
+		void (*postHookFunc) (int fd, struct block_list *bl);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_unknownname_ack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_unknownname_ack_post[hIndex].func;
 			postHookFunc(fd, bl);
 		}
 	}
@@ -13986,6 +14454,32 @@ void HP_clif_changeoption(struct block_list *bl) {
 	}
 	return;
 }
+void HP_clif_changeoption_target(struct block_list *bl, struct block_list *target_bl, enum send_target target) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_changeoption_target_pre > 0) {
+		void (*preHookFunc) (struct block_list **bl, struct block_list **target_bl, enum send_target *target);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_changeoption_target_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_changeoption_target_pre[hIndex].func;
+			preHookFunc(&bl, &target_bl, &target);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.changeoption_target(bl, target_bl, target);
+	}
+	if (HPMHooks.count.HP_clif_changeoption_target_post > 0) {
+		void (*postHookFunc) (struct block_list *bl, struct block_list *target_bl, enum send_target target);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_changeoption_target_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_changeoption_target_post[hIndex].func;
+			postHookFunc(bl, target_bl, target);
+		}
+	}
+	return;
+}
 void HP_clif_changeoption2(struct block_list *bl) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_changeoption2_pre > 0) {
@@ -14142,11 +14636,11 @@ void HP_clif_callpartner(struct map_session_data *sd) {
 	}
 	return;
 }
-int HP_clif_skill_damage(struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, int type) {
+int HP_clif_skill_damage(struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, enum battle_dmg_type type) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_clif_skill_damage_pre > 0) {
-		int (*preHookFunc) (struct block_list **src, struct block_list **dst, int64 *tick, int *sdelay, int *ddelay, int64 *damage, int *div, uint16 *skill_id, uint16 *skill_lv, int *type);
+		int (*preHookFunc) (struct block_list **src, struct block_list **dst, int64 *tick, int *sdelay, int *ddelay, int64 *damage, int *div, uint16 *skill_id, uint16 *skill_lv, enum battle_dmg_type *type);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_damage_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_clif_skill_damage_pre[hIndex].func;
@@ -14161,7 +14655,7 @@ int HP_clif_skill_damage(struct block_list *src, struct block_list *dst, int64 t
 		retVal___ = HPMHooks.source.clif.skill_damage(src, dst, tick, sdelay, ddelay, damage, div, skill_id, skill_lv, type);
 	}
 	if (HPMHooks.count.HP_clif_skill_damage_post > 0) {
-		int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, int type);
+		int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, enum battle_dmg_type type);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_damage_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_clif_skill_damage_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, src, dst, tick, sdelay, ddelay, damage, div, skill_id, skill_lv, type);
@@ -14612,10 +15106,10 @@ void HP_clif_specialeffect_single(struct block_list *bl, int type, int fd) {
 	}
 	return;
 }
-void HP_clif_specialeffect_value(struct block_list *bl, int effect_id, int num, send_target target) {
+void HP_clif_specialeffect_value(struct block_list *bl, int effect_id, uint64 num, send_target target) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_specialeffect_value_pre > 0) {
-		void (*preHookFunc) (struct block_list **bl, int *effect_id, int *num, send_target *target);
+		void (*preHookFunc) (struct block_list **bl, int *effect_id, uint64 *num, send_target *target);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_specialeffect_value_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_clif_specialeffect_value_pre[hIndex].func;
@@ -14630,7 +15124,7 @@ void HP_clif_specialeffect_value(struct block_list *bl, int effect_id, int num,
 		HPMHooks.source.clif.specialeffect_value(bl, effect_id, num, target);
 	}
 	if (HPMHooks.count.HP_clif_specialeffect_value_post > 0) {
-		void (*postHookFunc) (struct block_list *bl, int effect_id, int num, send_target target);
+		void (*postHookFunc) (struct block_list *bl, int effect_id, uint64 num, send_target target);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_specialeffect_value_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_clif_specialeffect_value_post[hIndex].func;
 			postHookFunc(bl, effect_id, num, target);
@@ -14638,6 +15132,32 @@ void HP_clif_specialeffect_value(struct block_list *bl, int effect_id, int num,
 	}
 	return;
 }
+void HP_clif_specialeffect_value_single(struct block_list *bl, int effect_id, uint64 num, int fd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_specialeffect_value_single_pre > 0) {
+		void (*preHookFunc) (struct block_list **bl, int *effect_id, uint64 *num, int *fd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_specialeffect_value_single_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_specialeffect_value_single_pre[hIndex].func;
+			preHookFunc(&bl, &effect_id, &num, &fd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.specialeffect_value_single(bl, effect_id, num, fd);
+	}
+	if (HPMHooks.count.HP_clif_specialeffect_value_single_post > 0) {
+		void (*postHookFunc) (struct block_list *bl, int effect_id, uint64 num, int fd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_specialeffect_value_single_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_specialeffect_value_single_post[hIndex].func;
+			postHookFunc(bl, effect_id, num, fd);
+		}
+	}
+	return;
+}
 void HP_clif_removeSpecialEffect(struct block_list *bl, int effectId, enum send_target target) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_removeSpecialEffect_pre > 0) {
@@ -15080,6 +15600,32 @@ void HP_clif_changechatowner(struct chat_data *cd, struct map_session_data *sd)
 	}
 	return;
 }
+void HP_clif_chatRoleChange(struct chat_data *cd, struct map_session_data *sd, struct block_list *bl, int isNotOwner) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_chatRoleChange_pre > 0) {
+		void (*preHookFunc) (struct chat_data **cd, struct map_session_data **sd, struct block_list **bl, int *isNotOwner);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_chatRoleChange_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_chatRoleChange_pre[hIndex].func;
+			preHookFunc(&cd, &sd, &bl, &isNotOwner);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.chatRoleChange(cd, sd, bl, isNotOwner);
+	}
+	if (HPMHooks.count.HP_clif_chatRoleChange_post > 0) {
+		void (*postHookFunc) (struct chat_data *cd, struct map_session_data *sd, struct block_list *bl, int isNotOwner);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_chatRoleChange_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_chatRoleChange_post[hIndex].func;
+			postHookFunc(cd, sd, bl, isNotOwner);
+		}
+	}
+	return;
+}
 void HP_clif_clearchat(struct chat_data *cd, int fd) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_clearchat_pre > 0) {
@@ -15758,14 +16304,14 @@ void HP_clif_PMIgnoreList(struct map_session_data *sd) {
 	}
 	return;
 }
-void HP_clif_ShowScript(struct block_list *bl, const char *message) {
+void HP_clif_ShowScript(struct block_list *bl, const char *message, enum send_target target) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_ShowScript_pre > 0) {
-		void (*preHookFunc) (struct block_list **bl, const char **message);
+		void (*preHookFunc) (struct block_list **bl, const char **message, enum send_target *target);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_ShowScript_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_clif_ShowScript_pre[hIndex].func;
-			preHookFunc(&bl, &message);
+			preHookFunc(&bl, &message, &target);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -15773,13 +16319,13 @@ void HP_clif_ShowScript(struct block_list *bl, const char *message) {
 		}
 	}
 	{
-		HPMHooks.source.clif.ShowScript(bl, message);
+		HPMHooks.source.clif.ShowScript(bl, message, target);
 	}
 	if (HPMHooks.count.HP_clif_ShowScript_post > 0) {
-		void (*postHookFunc) (struct block_list *bl, const char *message);
+		void (*postHookFunc) (struct block_list *bl, const char *message, enum send_target target);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_ShowScript_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_clif_ShowScript_post[hIndex].func;
-			postHookFunc(bl, message);
+			postHookFunc(bl, message, target);
 		}
 	}
 	return;
@@ -16564,6 +17110,32 @@ void HP_clif_deleteskill(struct map_session_data *sd, int id) {
 	}
 	return;
 }
+void HP_clif_playerSkillToPacket(struct map_session_data *sd, struct SKILLDATA *skillData, int skillId, int idx, bool newSkill) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_playerSkillToPacket_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, struct SKILLDATA **skillData, int *skillId, int *idx, bool *newSkill);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_playerSkillToPacket_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_playerSkillToPacket_pre[hIndex].func;
+			preHookFunc(&sd, &skillData, &skillId, &idx, &newSkill);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.playerSkillToPacket(sd, skillData, skillId, idx, newSkill);
+	}
+	if (HPMHooks.count.HP_clif_playerSkillToPacket_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, struct SKILLDATA *skillData, int skillId, int idx, bool newSkill);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_playerSkillToPacket_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_playerSkillToPacket_post[hIndex].func;
+			postHookFunc(sd, skillData, skillId, idx, newSkill);
+		}
+	}
+	return;
+}
 void HP_clif_party_created(struct map_session_data *sd, int result) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_party_created_pre > 0) {
@@ -17110,6 +17682,58 @@ void HP_clif_guild_allianceinfo(struct map_session_data *sd) {
 	}
 	return;
 }
+void HP_clif_guild_castlelist(struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_guild_castlelist_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_castlelist_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_guild_castlelist_pre[hIndex].func;
+			preHookFunc(&sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.guild_castlelist(sd);
+	}
+	if (HPMHooks.count.HP_clif_guild_castlelist_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_castlelist_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_guild_castlelist_post[hIndex].func;
+			postHookFunc(sd);
+		}
+	}
+	return;
+}
+void HP_clif_guild_castleinfo(struct map_session_data *sd, struct guild_castle *gc) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_guild_castleinfo_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, struct guild_castle **gc);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_castleinfo_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_guild_castleinfo_pre[hIndex].func;
+			preHookFunc(&sd, &gc);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.guild_castleinfo(sd, gc);
+	}
+	if (HPMHooks.count.HP_clif_guild_castleinfo_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, struct guild_castle *gc);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_castleinfo_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_guild_castleinfo_post[hIndex].func;
+			postHookFunc(sd, gc);
+		}
+	}
+	return;
+}
 void HP_clif_guild_memberlist(struct map_session_data *sd) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_guild_memberlist_pre > 0) {
@@ -20890,11 +21514,11 @@ void HP_clif_notify_bounditem(struct map_session_data *sd, unsigned short index)
 	}
 	return;
 }
-int HP_clif_delay_damage(int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, unsigned char type) {
+int HP_clif_delay_damage(int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, enum battle_dmg_type type) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_clif_delay_damage_pre > 0) {
-		int (*preHookFunc) (int64 *tick, struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *in_damage, short *div, unsigned char *type);
+		int (*preHookFunc) (int64 *tick, struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *in_damage, short *div, enum battle_dmg_type *type);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_delay_damage_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_clif_delay_damage_pre[hIndex].func;
@@ -20909,7 +21533,7 @@ int HP_clif_delay_damage(int64 tick, struct block_list *src, struct block_list *
 		retVal___ = HPMHooks.source.clif.delay_damage(tick, src, dst, sdelay, ddelay, in_damage, div, type);
 	}
 	if (HPMHooks.count.HP_clif_delay_damage_post > 0) {
-		int (*postHookFunc) (int retVal___, int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, unsigned char type);
+		int (*postHookFunc) (int retVal___, int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, enum battle_dmg_type type);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_delay_damage_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_clif_delay_damage_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, tick, src, dst, sdelay, ddelay, in_damage, div, type);
@@ -20970,10 +21594,10 @@ void HP_clif_npc_market_open(struct map_session_data *sd, struct npc_data *nd) {
 	}
 	return;
 }
-void HP_clif_npc_market_purchase_ack(struct map_session_data *sd, const struct itemlist *item_list, unsigned char response) {
+void HP_clif_npc_market_purchase_ack(struct map_session_data *sd, const struct itemlist *item_list, enum market_buy_result response) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_npc_market_purchase_ack_pre > 0) {
-		void (*preHookFunc) (struct map_session_data **sd, const struct itemlist **item_list, unsigned char *response);
+		void (*preHookFunc) (struct map_session_data **sd, const struct itemlist **item_list, enum market_buy_result *response);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_market_purchase_ack_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_clif_npc_market_purchase_ack_pre[hIndex].func;
@@ -20988,7 +21612,7 @@ void HP_clif_npc_market_purchase_ack(struct map_session_data *sd, const struct i
 		HPMHooks.source.clif.npc_market_purchase_ack(sd, item_list, response);
 	}
 	if (HPMHooks.count.HP_clif_npc_market_purchase_ack_post > 0) {
-		void (*postHookFunc) (struct map_session_data *sd, const struct itemlist *item_list, unsigned char response);
+		void (*postHookFunc) (struct map_session_data *sd, const struct itemlist *item_list, enum market_buy_result response);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_market_purchase_ack_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_clif_npc_market_purchase_ack_post[hIndex].func;
 			postHookFunc(sd, item_list, response);
@@ -21049,6 +21673,32 @@ void HP_clif_roulette_generate_ack(struct map_session_data *sd, enum GENERATE_RO
 	}
 	return;
 }
+void HP_clif_roulette_close(struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_roulette_close_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_roulette_close_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_roulette_close_pre[hIndex].func;
+			preHookFunc(&sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.roulette_close(sd);
+	}
+	if (HPMHooks.count.HP_clif_roulette_close_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_roulette_close_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_roulette_close_post[hIndex].func;
+			postHookFunc(sd);
+		}
+	}
+	return;
+}
 void HP_clif_openmergeitem(int fd, struct map_session_data *sd) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_openmergeitem_pre > 0) {
@@ -21154,6 +21804,32 @@ void HP_clif_ackmergeitems(int fd, struct map_session_data *sd) {
 	}
 	return;
 }
+void HP_clif_mergeitems(int fd, struct map_session_data *sd, int index, int amount, enum mergeitem_reason reason) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_mergeitems_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd, int *index, int *amount, enum mergeitem_reason *reason);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_mergeitems_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_mergeitems_pre[hIndex].func;
+			preHookFunc(&fd, &sd, &index, &amount, &reason);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.mergeitems(fd, sd, index, amount, reason);
+	}
+	if (HPMHooks.count.HP_clif_mergeitems_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd, int index, int amount, enum mergeitem_reason reason);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_mergeitems_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_mergeitems_post[hIndex].func;
+			postHookFunc(fd, sd, index, amount, reason);
+		}
+	}
+	return;
+}
 bool HP_clif_isdisguised(struct block_list *bl) {
 	int hIndex = 0;
 	bool retVal___ = false;
@@ -21468,13 +22144,13 @@ void HP_clif_pTickSend(int fd, struct map_session_data *sd) {
 	}
 	return;
 }
-void HP_clif_pHotkey(int fd, struct map_session_data *sd) {
+void HP_clif_pHotkey1(int fd, struct map_session_data *sd) {
 	int hIndex = 0;
-	if (HPMHooks.count.HP_clif_pHotkey_pre > 0) {
+	if (HPMHooks.count.HP_clif_pHotkey1_pre > 0) {
 		void (*preHookFunc) (int *fd, struct map_session_data **sd);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkey_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_pHotkey_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkey1_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pHotkey1_pre[hIndex].func;
 			preHookFunc(&fd, &sd);
 		}
 		if (*HPMforce_return) {
@@ -21483,12 +22159,38 @@ void HP_clif_pHotkey(int fd, struct map_session_data *sd) {
 		}
 	}
 	{
-		HPMHooks.source.clif.pHotkey(fd, sd);
+		HPMHooks.source.clif.pHotkey1(fd, sd);
 	}
-	if (HPMHooks.count.HP_clif_pHotkey_post > 0) {
+	if (HPMHooks.count.HP_clif_pHotkey1_post > 0) {
 		void (*postHookFunc) (int fd, struct map_session_data *sd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkey_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_pHotkey_post[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkey1_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pHotkey1_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_pHotkey2(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pHotkey2_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkey2_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pHotkey2_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pHotkey2(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pHotkey2_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkey2_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pHotkey2_post[hIndex].func;
 			postHookFunc(fd, sd);
 		}
 	}
@@ -26746,13 +27448,65 @@ void HP_clif_pBGQueueBattleBeginAck(int fd, struct map_session_data *sd) {
 	}
 	return;
 }
-void HP_clif_pCashShopOpen(int fd, struct map_session_data *sd) {
+void HP_clif_pCashShopOpen1(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pCashShopOpen1_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopOpen1_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pCashShopOpen1_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pCashShopOpen1(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pCashShopOpen1_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopOpen1_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pCashShopOpen1_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_pCashShopOpen2(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pCashShopOpen2_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopOpen2_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pCashShopOpen2_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pCashShopOpen2(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pCashShopOpen2_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopOpen2_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pCashShopOpen2_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_pCashShopLimitedReq(int fd, struct map_session_data *sd) {
 	int hIndex = 0;
-	if (HPMHooks.count.HP_clif_pCashShopOpen_pre > 0) {
+	if (HPMHooks.count.HP_clif_pCashShopLimitedReq_pre > 0) {
 		void (*preHookFunc) (int *fd, struct map_session_data **sd);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopOpen_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_pCashShopOpen_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopLimitedReq_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pCashShopLimitedReq_pre[hIndex].func;
 			preHookFunc(&fd, &sd);
 		}
 		if (*HPMforce_return) {
@@ -26761,12 +27515,12 @@ void HP_clif_pCashShopOpen(int fd, struct map_session_data *sd) {
 		}
 	}
 	{
-		HPMHooks.source.clif.pCashShopOpen(fd, sd);
+		HPMHooks.source.clif.pCashShopLimitedReq(fd, sd);
 	}
-	if (HPMHooks.count.HP_clif_pCashShopOpen_post > 0) {
+	if (HPMHooks.count.HP_clif_pCashShopLimitedReq_post > 0) {
 		void (*postHookFunc) (int fd, struct map_session_data *sd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopOpen_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_pCashShopOpen_post[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pCashShopLimitedReq_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pCashShopLimitedReq_post[hIndex].func;
 			postHookFunc(fd, sd);
 		}
 	}
@@ -26928,6 +27682,58 @@ void HP_clif_pGuildInvite2(int fd, struct map_session_data *sd) {
 	}
 	return;
 }
+void HP_clif_cashShopBuyAck(int fd, struct map_session_data *sd, int itemId, enum CASH_SHOP_BUY_RESULT result) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_cashShopBuyAck_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd, int *itemId, enum CASH_SHOP_BUY_RESULT *result);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_cashShopBuyAck_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_cashShopBuyAck_pre[hIndex].func;
+			preHookFunc(&fd, &sd, &itemId, &result);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.cashShopBuyAck(fd, sd, itemId, result);
+	}
+	if (HPMHooks.count.HP_clif_cashShopBuyAck_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd, int itemId, enum CASH_SHOP_BUY_RESULT result);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_cashShopBuyAck_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_cashShopBuyAck_post[hIndex].func;
+			postHookFunc(fd, sd, itemId, result);
+		}
+	}
+	return;
+}
+void HP_clif_cashShopOpen(int fd, struct map_session_data *sd, int tab) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_cashShopOpen_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd, int *tab);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_cashShopOpen_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_cashShopOpen_pre[hIndex].func;
+			preHookFunc(&fd, &sd, &tab);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.cashShopOpen(fd, sd, tab);
+	}
+	if (HPMHooks.count.HP_clif_cashShopOpen_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd, int tab);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_cashShopOpen_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_cashShopOpen_post[hIndex].func;
+			postHookFunc(fd, sd, tab);
+		}
+	}
+	return;
+}
 void HP_clif_pPartyBookingAddFilter(int fd, struct map_session_data *sd) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_pPartyBookingAddFilter_pre > 0) {
@@ -27423,13 +28229,39 @@ int HP_clif_add_item_options(struct ItemOptions *buf, const struct item *it) {
 	}
 	return retVal___;
 }
-void HP_clif_pHotkeyRowShift(int fd, struct map_session_data *sd) {
+void HP_clif_pHotkeyRowShift1(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pHotkeyRowShift1_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkeyRowShift1_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pHotkeyRowShift1_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pHotkeyRowShift1(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pHotkeyRowShift1_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkeyRowShift1_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pHotkeyRowShift1_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_pHotkeyRowShift2(int fd, struct map_session_data *sd) {
 	int hIndex = 0;
-	if (HPMHooks.count.HP_clif_pHotkeyRowShift_pre > 0) {
+	if (HPMHooks.count.HP_clif_pHotkeyRowShift2_pre > 0) {
 		void (*preHookFunc) (int *fd, struct map_session_data **sd);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkeyRowShift_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_pHotkeyRowShift_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkeyRowShift2_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pHotkeyRowShift2_pre[hIndex].func;
 			preHookFunc(&fd, &sd);
 		}
 		if (*HPMforce_return) {
@@ -27438,12 +28270,12 @@ void HP_clif_pHotkeyRowShift(int fd, struct map_session_data *sd) {
 		}
 	}
 	{
-		HPMHooks.source.clif.pHotkeyRowShift(fd, sd);
+		HPMHooks.source.clif.pHotkeyRowShift2(fd, sd);
 	}
-	if (HPMHooks.count.HP_clif_pHotkeyRowShift_post > 0) {
+	if (HPMHooks.count.HP_clif_pHotkeyRowShift2_post > 0) {
 		void (*postHookFunc) (int fd, struct map_session_data *sd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkeyRowShift_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_pHotkeyRowShift_post[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkeyRowShift2_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pHotkeyRowShift2_post[hIndex].func;
 			postHookFunc(fd, sd);
 		}
 	}
@@ -28806,165 +29638,6 @@ void HP_clif_PrivateAirshipResponse(struct map_session_data *sd, uint32 flag) {
 	}
 	return;
 }
-void HP_clif_stylist_vector_init(void) {
-	int hIndex = 0;
-	if (HPMHooks.count.HP_clif_stylist_vector_init_pre > 0) {
-		void (*preHookFunc) (void);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_stylist_vector_init_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_stylist_vector_init_pre[hIndex].func;
-			preHookFunc();
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return;
-		}
-	}
-	{
-		HPMHooks.source.clif.stylist_vector_init();
-	}
-	if (HPMHooks.count.HP_clif_stylist_vector_init_post > 0) {
-		void (*postHookFunc) (void);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_stylist_vector_init_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_stylist_vector_init_post[hIndex].func;
-			postHookFunc();
-		}
-	}
-	return;
-}
-void HP_clif_stylist_vector_clear(void) {
-	int hIndex = 0;
-	if (HPMHooks.count.HP_clif_stylist_vector_clear_pre > 0) {
-		void (*preHookFunc) (void);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_stylist_vector_clear_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_stylist_vector_clear_pre[hIndex].func;
-			preHookFunc();
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return;
-		}
-	}
-	{
-		HPMHooks.source.clif.stylist_vector_clear();
-	}
-	if (HPMHooks.count.HP_clif_stylist_vector_clear_post > 0) {
-		void (*postHookFunc) (void);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_stylist_vector_clear_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_stylist_vector_clear_post[hIndex].func;
-			postHookFunc();
-		}
-	}
-	return;
-}
-bool HP_clif_stylist_read_db_libconfig(void) {
-	int hIndex = 0;
-	bool retVal___ = false;
-	if (HPMHooks.count.HP_clif_stylist_read_db_libconfig_pre > 0) {
-		bool (*preHookFunc) (void);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_stylist_read_db_libconfig_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_stylist_read_db_libconfig_pre[hIndex].func;
-			retVal___ = preHookFunc();
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.clif.stylist_read_db_libconfig();
-	}
-	if (HPMHooks.count.HP_clif_stylist_read_db_libconfig_post > 0) {
-		bool (*postHookFunc) (bool retVal___);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_stylist_read_db_libconfig_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_stylist_read_db_libconfig_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___);
-		}
-	}
-	return retVal___;
-}
-bool HP_clif_stylist_read_db_libconfig_sub(struct config_setting_t *it, int idx, const char *source) {
-	int hIndex = 0;
-	bool retVal___ = false;
-	if (HPMHooks.count.HP_clif_stylist_read_db_libconfig_sub_pre > 0) {
-		bool (*preHookFunc) (struct config_setting_t **it, int *idx, const char **source);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_stylist_read_db_libconfig_sub_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_stylist_read_db_libconfig_sub_pre[hIndex].func;
-			retVal___ = preHookFunc(&it, &idx, &source);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.clif.stylist_read_db_libconfig_sub(it, idx, source);
-	}
-	if (HPMHooks.count.HP_clif_stylist_read_db_libconfig_sub_post > 0) {
-		bool (*postHookFunc) (bool retVal___, struct config_setting_t *it, int idx, const char *source);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_stylist_read_db_libconfig_sub_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_stylist_read_db_libconfig_sub_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, it, idx, source);
-		}
-	}
-	return retVal___;
-}
-bool HP_clif_style_change_validate_requirements(struct map_session_data *sd, int type, int16 idx) {
-	int hIndex = 0;
-	bool retVal___ = false;
-	if (HPMHooks.count.HP_clif_style_change_validate_requirements_pre > 0) {
-		bool (*preHookFunc) (struct map_session_data **sd, int *type, int16 *idx);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_style_change_validate_requirements_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_style_change_validate_requirements_pre[hIndex].func;
-			retVal___ = preHookFunc(&sd, &type, &idx);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.clif.style_change_validate_requirements(sd, type, idx);
-	}
-	if (HPMHooks.count.HP_clif_style_change_validate_requirements_post > 0) {
-		bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int type, int16 idx);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_style_change_validate_requirements_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_style_change_validate_requirements_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, sd, type, idx);
-		}
-	}
-	return retVal___;
-}
-void HP_clif_stylist_send_rodexitem(struct map_session_data *sd, int itemid) {
-	int hIndex = 0;
-	if (HPMHooks.count.HP_clif_stylist_send_rodexitem_pre > 0) {
-		void (*preHookFunc) (struct map_session_data **sd, int *itemid);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_stylist_send_rodexitem_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_stylist_send_rodexitem_pre[hIndex].func;
-			preHookFunc(&sd, &itemid);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return;
-		}
-	}
-	{
-		HPMHooks.source.clif.stylist_send_rodexitem(sd, itemid);
-	}
-	if (HPMHooks.count.HP_clif_stylist_send_rodexitem_post > 0) {
-		void (*postHookFunc) (struct map_session_data *sd, int itemid);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_stylist_send_rodexitem_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_stylist_send_rodexitem_post[hIndex].func;
-			postHookFunc(sd, itemid);
-		}
-	}
-	return;
-}
 void HP_clif_pReqStyleChange(int fd, struct map_session_data *sd) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_pReqStyleChange_pre > 0) {
@@ -29017,14 +29690,14 @@ void HP_clif_pReqStyleChange2(int fd, struct map_session_data *sd) {
 	}
 	return;
 }
-void HP_clif_cz_req_style_change_sub(struct map_session_data *sd, int type, int16 idx, bool isitem) {
+void HP_clif_pStyleClose(int fd, struct map_session_data *sd) {
 	int hIndex = 0;
-	if (HPMHooks.count.HP_clif_cz_req_style_change_sub_pre > 0) {
-		void (*preHookFunc) (struct map_session_data **sd, int *type, int16 *idx, bool *isitem);
+	if (HPMHooks.count.HP_clif_pStyleClose_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_cz_req_style_change_sub_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_cz_req_style_change_sub_pre[hIndex].func;
-			preHookFunc(&sd, &type, &idx, &isitem);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pStyleClose_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pStyleClose_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -29032,13 +29705,13 @@ void HP_clif_cz_req_style_change_sub(struct map_session_data *sd, int type, int1
 		}
 	}
 	{
-		HPMHooks.source.clif.cz_req_style_change_sub(sd, type, idx, isitem);
+		HPMHooks.source.clif.pStyleClose(fd, sd);
 	}
-	if (HPMHooks.count.HP_clif_cz_req_style_change_sub_post > 0) {
-		void (*postHookFunc) (struct map_session_data *sd, int type, int16 idx, bool isitem);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_cz_req_style_change_sub_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_cz_req_style_change_sub_post[hIndex].func;
-			postHookFunc(sd, type, idx, isitem);
+	if (HPMHooks.count.HP_clif_pStyleClose_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pStyleClose_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pStyleClose_post[hIndex].func;
+			postHookFunc(fd, sd);
 		}
 	}
 	return;
@@ -29408,6 +30081,84 @@ void HP_clif_pNPCBarterPurchase(int fd, struct map_session_data *sd) {
 	}
 	return;
 }
+void HP_clif_pNPCExpandedBarterClosed(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pNPCExpandedBarterClosed_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNPCExpandedBarterClosed_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pNPCExpandedBarterClosed_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pNPCExpandedBarterClosed(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pNPCExpandedBarterClosed_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNPCExpandedBarterClosed_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pNPCExpandedBarterClosed_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_pNPCExpandedBarterPurchase(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pNPCExpandedBarterPurchase_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNPCExpandedBarterPurchase_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pNPCExpandedBarterPurchase_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pNPCExpandedBarterPurchase(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pNPCExpandedBarterPurchase_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pNPCExpandedBarterPurchase_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pNPCExpandedBarterPurchase_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_npc_expanded_barter_open(struct map_session_data *sd, struct npc_data *nd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_npc_expanded_barter_open_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, struct npc_data **nd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_expanded_barter_open_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_npc_expanded_barter_open_pre[hIndex].func;
+			preHookFunc(&sd, &nd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.npc_expanded_barter_open(sd, nd);
+	}
+	if (HPMHooks.count.HP_clif_npc_expanded_barter_open_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, struct npc_data *nd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_expanded_barter_open_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_npc_expanded_barter_open_post[hIndex].func;
+			postHookFunc(sd, nd);
+		}
+	}
+	return;
+}
 void HP_clif_pClientVersion(int fd, struct map_session_data *sd) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_pClientVersion_pre > 0) {
@@ -29434,6 +30185,668 @@ void HP_clif_pClientVersion(int fd, struct map_session_data *sd) {
 	}
 	return;
 }
+void HP_clif_pPing(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pPing_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPing_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pPing_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pPing(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pPing_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPing_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pPing_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_ping(struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_ping_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_ping_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_ping_pre[hIndex].func;
+			preHookFunc(&sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.ping(sd);
+	}
+	if (HPMHooks.count.HP_clif_ping_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_ping_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_ping_post[hIndex].func;
+			postHookFunc(sd);
+		}
+	}
+	return;
+}
+int HP_clif_pingTimer(int tid, int64 tick, int id, intptr_t data) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_clif_pingTimer_pre > 0) {
+		int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pingTimer_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pingTimer_pre[hIndex].func;
+			retVal___ = preHookFunc(&tid, &tick, &id, &data);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.clif.pingTimer(tid, tick, id, data);
+	}
+	if (HPMHooks.count.HP_clif_pingTimer_post > 0) {
+		int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pingTimer_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pingTimer_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, tid, tick, id, data);
+		}
+	}
+	return retVal___;
+}
+int HP_clif_pingTimerSub(struct map_session_data *sd, va_list ap) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_clif_pingTimerSub_pre > 0) {
+		int (*preHookFunc) (struct map_session_data **sd, va_list ap);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pingTimerSub_pre; hIndex++) {
+			va_list ap___copy; va_copy(ap___copy, ap);
+			preHookFunc = HPMHooks.list.HP_clif_pingTimerSub_pre[hIndex].func;
+			retVal___ = preHookFunc(&sd, ap___copy);
+			va_end(ap___copy);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		va_list ap___copy; va_copy(ap___copy, ap);
+		retVal___ = HPMHooks.source.clif.pingTimerSub(sd, ap___copy);
+		va_end(ap___copy);
+	}
+	if (HPMHooks.count.HP_clif_pingTimerSub_post > 0) {
+		int (*postHookFunc) (int retVal___, struct map_session_data *sd, va_list ap);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pingTimerSub_post; hIndex++) {
+			va_list ap___copy; va_copy(ap___copy, ap);
+			postHookFunc = HPMHooks.list.HP_clif_pingTimerSub_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sd, ap___copy);
+			va_end(ap___copy);
+		}
+	}
+	return retVal___;
+}
+void HP_clif_pResetCooldown(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pResetCooldown_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pResetCooldown_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pResetCooldown_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pResetCooldown(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pResetCooldown_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pResetCooldown_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pResetCooldown_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_loadConfirm(struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_loadConfirm_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_loadConfirm_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_loadConfirm_pre[hIndex].func;
+			preHookFunc(&sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.loadConfirm(sd);
+	}
+	if (HPMHooks.count.HP_clif_loadConfirm_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_loadConfirm_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_loadConfirm_post[hIndex].func;
+			postHookFunc(sd);
+		}
+	}
+	return;
+}
+void HP_clif_send_selforarea(int fd, struct block_list *bl, const void *buf, int len) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_send_selforarea_pre > 0) {
+		void (*preHookFunc) (int *fd, struct block_list **bl, const void **buf, int *len);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_send_selforarea_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_send_selforarea_pre[hIndex].func;
+			preHookFunc(&fd, &bl, &buf, &len);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.send_selforarea(fd, bl, buf, len);
+	}
+	if (HPMHooks.count.HP_clif_send_selforarea_post > 0) {
+		void (*postHookFunc) (int fd, struct block_list *bl, const void *buf, int len);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_send_selforarea_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_send_selforarea_post[hIndex].func;
+			postHookFunc(fd, bl, buf, len);
+		}
+	}
+	return;
+}
+void HP_clif_OpenRefineryUI(struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_OpenRefineryUI_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_OpenRefineryUI_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_OpenRefineryUI_pre[hIndex].func;
+			preHookFunc(&sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.OpenRefineryUI(sd);
+	}
+	if (HPMHooks.count.HP_clif_OpenRefineryUI_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_OpenRefineryUI_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_OpenRefineryUI_post[hIndex].func;
+			postHookFunc(sd);
+		}
+	}
+	return;
+}
+void HP_clif_pAddItemRefineryUI(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pAddItemRefineryUI_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAddItemRefineryUI_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pAddItemRefineryUI_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pAddItemRefineryUI(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pAddItemRefineryUI_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pAddItemRefineryUI_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pAddItemRefineryUI_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_AddItemRefineryUIAck(struct map_session_data *sd, int item_index, struct s_refine_requirement *req) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_AddItemRefineryUIAck_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, int *item_index, struct s_refine_requirement **req);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_AddItemRefineryUIAck_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_AddItemRefineryUIAck_pre[hIndex].func;
+			preHookFunc(&sd, &item_index, &req);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.AddItemRefineryUIAck(sd, item_index, req);
+	}
+	if (HPMHooks.count.HP_clif_AddItemRefineryUIAck_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, int item_index, struct s_refine_requirement *req);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_AddItemRefineryUIAck_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_AddItemRefineryUIAck_post[hIndex].func;
+			postHookFunc(sd, item_index, req);
+		}
+	}
+	return;
+}
+void HP_clif_pRefineryUIClose(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pRefineryUIClose_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRefineryUIClose_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pRefineryUIClose_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pRefineryUIClose(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pRefineryUIClose_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRefineryUIClose_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pRefineryUIClose_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_pRefineryUIRefine(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pRefineryUIRefine_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRefineryUIRefine_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pRefineryUIRefine_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pRefineryUIRefine(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pRefineryUIRefine_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pRefineryUIRefine_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pRefineryUIRefine_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_announce_refine_status(struct map_session_data *sd, int item_id, int refine_level, bool success, enum send_target target) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_announce_refine_status_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, int *item_id, int *refine_level, bool *success, enum send_target *target);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_announce_refine_status_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_announce_refine_status_pre[hIndex].func;
+			preHookFunc(&sd, &item_id, &refine_level, &success, &target);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.announce_refine_status(sd, item_id, refine_level, success, target);
+	}
+	if (HPMHooks.count.HP_clif_announce_refine_status_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, int item_id, int refine_level, bool success, enum send_target target);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_announce_refine_status_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_announce_refine_status_post[hIndex].func;
+			postHookFunc(sd, item_id, refine_level, success, target);
+		}
+	}
+	return;
+}
+void HP_clif_pGuildCastleTeleportRequest(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pGuildCastleTeleportRequest_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildCastleTeleportRequest_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pGuildCastleTeleportRequest_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pGuildCastleTeleportRequest(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pGuildCastleTeleportRequest_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildCastleTeleportRequest_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pGuildCastleTeleportRequest_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_pGuildCastleInfoRequest(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pGuildCastleInfoRequest_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildCastleInfoRequest_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pGuildCastleInfoRequest_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pGuildCastleInfoRequest(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pGuildCastleInfoRequest_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pGuildCastleInfoRequest_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pGuildCastleInfoRequest_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_guild_castleteleport_res(struct map_session_data *sd, enum siege_teleport_result result) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_guild_castleteleport_res_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, enum siege_teleport_result *result);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_castleteleport_res_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_guild_castleteleport_res_pre[hIndex].func;
+			preHookFunc(&sd, &result);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.guild_castleteleport_res(sd, result);
+	}
+	if (HPMHooks.count.HP_clif_guild_castleteleport_res_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, enum siege_teleport_result result);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_castleteleport_res_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_guild_castleteleport_res_post[hIndex].func;
+			postHookFunc(sd, result);
+		}
+	}
+	return;
+}
+bool HP_clif_lapineDdukDdak_open(struct map_session_data *sd, int item_id) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_clif_lapineDdukDdak_open_pre > 0) {
+		bool (*preHookFunc) (struct map_session_data **sd, int *item_id);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_lapineDdukDdak_open_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_lapineDdukDdak_open_pre[hIndex].func;
+			retVal___ = preHookFunc(&sd, &item_id);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.clif.lapineDdukDdak_open(sd, item_id);
+	}
+	if (HPMHooks.count.HP_clif_lapineDdukDdak_open_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int item_id);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_lapineDdukDdak_open_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_lapineDdukDdak_open_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sd, item_id);
+		}
+	}
+	return retVal___;
+}
+bool HP_clif_lapineDdukDdak_result(struct map_session_data *sd, enum lapineddukddak_result result) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_clif_lapineDdukDdak_result_pre > 0) {
+		bool (*preHookFunc) (struct map_session_data **sd, enum lapineddukddak_result *result);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_lapineDdukDdak_result_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_lapineDdukDdak_result_pre[hIndex].func;
+			retVal___ = preHookFunc(&sd, &result);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.clif.lapineDdukDdak_result(sd, result);
+	}
+	if (HPMHooks.count.HP_clif_lapineDdukDdak_result_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, enum lapineddukddak_result result);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_lapineDdukDdak_result_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_lapineDdukDdak_result_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sd, result);
+		}
+	}
+	return retVal___;
+}
+void HP_clif_plapineDdukDdak_ack(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_plapineDdukDdak_ack_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_plapineDdukDdak_ack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_plapineDdukDdak_ack_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.plapineDdukDdak_ack(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_plapineDdukDdak_ack_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_plapineDdukDdak_ack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_plapineDdukDdak_ack_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_plapineDdukDdak_close(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_plapineDdukDdak_close_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_plapineDdukDdak_close_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_plapineDdukDdak_close_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.plapineDdukDdak_close(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_plapineDdukDdak_close_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_plapineDdukDdak_close_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_plapineDdukDdak_close_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+bool HP_clif_lapineUpgrade_open(struct map_session_data *sd, int item_id) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_clif_lapineUpgrade_open_pre > 0) {
+		bool (*preHookFunc) (struct map_session_data **sd, int *item_id);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_lapineUpgrade_open_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_lapineUpgrade_open_pre[hIndex].func;
+			retVal___ = preHookFunc(&sd, &item_id);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.clif.lapineUpgrade_open(sd, item_id);
+	}
+	if (HPMHooks.count.HP_clif_lapineUpgrade_open_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int item_id);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_lapineUpgrade_open_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_lapineUpgrade_open_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sd, item_id);
+		}
+	}
+	return retVal___;
+}
+bool HP_clif_lapineUpgrade_result(struct map_session_data *sd, enum lapineUpgrade_result result) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_clif_lapineUpgrade_result_pre > 0) {
+		bool (*preHookFunc) (struct map_session_data **sd, enum lapineUpgrade_result *result);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_lapineUpgrade_result_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_lapineUpgrade_result_pre[hIndex].func;
+			retVal___ = preHookFunc(&sd, &result);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.clif.lapineUpgrade_result(sd, result);
+	}
+	if (HPMHooks.count.HP_clif_lapineUpgrade_result_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, enum lapineUpgrade_result result);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_lapineUpgrade_result_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_lapineUpgrade_result_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sd, result);
+		}
+	}
+	return retVal___;
+}
+void HP_clif_pLapineUpgrade_close(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pLapineUpgrade_close_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pLapineUpgrade_close_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pLapineUpgrade_close_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pLapineUpgrade_close(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pLapineUpgrade_close_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pLapineUpgrade_close_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pLapineUpgrade_close_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_pLapineUpgrade_makeItem(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pLapineUpgrade_makeItem_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pLapineUpgrade_makeItem_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pLapineUpgrade_makeItem_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pLapineUpgrade_makeItem(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pLapineUpgrade_makeItem_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pLapineUpgrade_makeItem_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pLapineUpgrade_makeItem_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_pReqGearOff(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pReqGearOff_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReqGearOff_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pReqGearOff_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pReqGearOff(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pReqGearOff_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReqGearOff_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pReqGearOff_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
 /* cmdline_interface */
 void HP_cmdline_init(void) {
 	int hIndex = 0;
@@ -30450,14 +31863,14 @@ void HP_duel_showinfo(const unsigned int did, struct map_session_data *sd) {
 	}
 	return;
 }
-int HP_duel_checktime(struct map_session_data *sd) {
+int64 HP_duel_difftime(struct map_session_data *sd) {
 	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_duel_checktime_pre > 0) {
-		int (*preHookFunc) (struct map_session_data **sd);
+	int64 retVal___ = 0;
+	if (HPMHooks.count.HP_duel_difftime_pre > 0) {
+		int64 (*preHookFunc) (struct map_session_data **sd);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_duel_checktime_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_duel_checktime_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_duel_difftime_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_duel_difftime_pre[hIndex].func;
 			retVal___ = preHookFunc(&sd);
 		}
 		if (*HPMforce_return) {
@@ -30466,12 +31879,12 @@ int HP_duel_checktime(struct map_session_data *sd) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.duel.checktime(sd);
+		retVal___ = HPMHooks.source.duel.difftime(sd);
 	}
-	if (HPMHooks.count.HP_duel_checktime_post > 0) {
-		int (*postHookFunc) (int retVal___, struct map_session_data *sd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_duel_checktime_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_duel_checktime_post[hIndex].func;
+	if (HPMHooks.count.HP_duel_difftime_post > 0) {
+		int64 (*postHookFunc) (int64 retVal___, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_duel_difftime_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_duel_difftime_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, sd);
 		}
 	}
@@ -31803,11 +33216,11 @@ struct guild* HP_guild_search(int guild_id) {
 	}
 	return retVal___;
 }
-struct guild* HP_guild_searchname(char *str) {
+struct guild* HP_guild_searchname(const char *str) {
 	int hIndex = 0;
 	struct guild* retVal___ = NULL;
 	if (HPMHooks.count.HP_guild_searchname_pre > 0) {
-		struct guild* (*preHookFunc) (char **str);
+		struct guild* (*preHookFunc) (const char **str);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_searchname_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_guild_searchname_pre[hIndex].func;
@@ -31822,7 +33235,7 @@ struct guild* HP_guild_searchname(char *str) {
 		retVal___ = HPMHooks.source.guild.searchname(str);
 	}
 	if (HPMHooks.count.HP_guild_searchname_post > 0) {
-		struct guild* (*postHookFunc) (struct guild* retVal___, char *str);
+		struct guild* (*postHookFunc) (struct guild* retVal___, const char *str);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_searchname_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_guild_searchname_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, str);
@@ -32908,33 +34321,6 @@ int HP_guild_send_message(struct map_session_data *sd, const char *mes) {
 	}
 	return retVal___;
 }
-int HP_guild_recv_message(int guild_id, int account_id, const char *mes, int len) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_guild_recv_message_pre > 0) {
-		int (*preHookFunc) (int *guild_id, int *account_id, const char **mes, int *len);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_recv_message_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_guild_recv_message_pre[hIndex].func;
-			retVal___ = preHookFunc(&guild_id, &account_id, &mes, &len);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.guild.recv_message(guild_id, account_id, mes, len);
-	}
-	if (HPMHooks.count.HP_guild_recv_message_post > 0) {
-		int (*postHookFunc) (int retVal___, int guild_id, int account_id, const char *mes, int len);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_recv_message_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_guild_recv_message_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, guild_id, account_id, mes, len);
-		}
-	}
-	return retVal___;
-}
 int HP_guild_send_dot_remove(struct map_session_data *sd) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -33518,15 +34904,15 @@ bool HP_guild_read_guildskill_tree_db(char *split[], int columns, int current) {
 	}
 	return retVal___;
 }
-bool HP_guild_read_castledb(char *str[], int columns, int current) {
+bool HP_guild_read_castledb_libconfig(void) {
 	int hIndex = 0;
 	bool retVal___ = false;
-	if (HPMHooks.count.HP_guild_read_castledb_pre > 0) {
-		bool (*preHookFunc) (char **str[], int *columns, int *current);
+	if (HPMHooks.count.HP_guild_read_castledb_libconfig_pre > 0) {
+		bool (*preHookFunc) (void);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_castledb_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_guild_read_castledb_pre[hIndex].func;
-			retVal___ = preHookFunc(&str, &columns, &current);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_castledb_libconfig_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_guild_read_castledb_libconfig_pre[hIndex].func;
+			retVal___ = preHookFunc();
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -33534,13 +34920,67 @@ bool HP_guild_read_castledb(char *str[], int columns, int current) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.guild.read_castledb(str, columns, current);
+		retVal___ = HPMHooks.source.guild.read_castledb_libconfig();
 	}
-	if (HPMHooks.count.HP_guild_read_castledb_post > 0) {
-		bool (*postHookFunc) (bool retVal___, char *str[], int columns, int current);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_castledb_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_guild_read_castledb_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, str, columns, current);
+	if (HPMHooks.count.HP_guild_read_castledb_libconfig_post > 0) {
+		bool (*postHookFunc) (bool retVal___);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_castledb_libconfig_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_guild_read_castledb_libconfig_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___);
+		}
+	}
+	return retVal___;
+}
+bool HP_guild_read_castledb_libconfig_sub(struct config_setting_t *it, int idx, const char *source) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_guild_read_castledb_libconfig_sub_pre > 0) {
+		bool (*preHookFunc) (struct config_setting_t **it, int *idx, const char **source);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_castledb_libconfig_sub_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_guild_read_castledb_libconfig_sub_pre[hIndex].func;
+			retVal___ = preHookFunc(&it, &idx, &source);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.guild.read_castledb_libconfig_sub(it, idx, source);
+	}
+	if (HPMHooks.count.HP_guild_read_castledb_libconfig_sub_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct config_setting_t *it, int idx, const char *source);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_castledb_libconfig_sub_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_guild_read_castledb_libconfig_sub_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, it, idx, source);
+		}
+	}
+	return retVal___;
+}
+bool HP_guild_read_castledb_libconfig_sub_warp(struct config_setting_t *wd, const char *source, struct guild_castle *gc) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_guild_read_castledb_libconfig_sub_warp_pre > 0) {
+		bool (*preHookFunc) (struct config_setting_t **wd, const char **source, struct guild_castle **gc);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_castledb_libconfig_sub_warp_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_guild_read_castledb_libconfig_sub_warp_pre[hIndex].func;
+			retVal___ = preHookFunc(&wd, &source, &gc);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.guild.read_castledb_libconfig_sub_warp(wd, source, gc);
+	}
+	if (HPMHooks.count.HP_guild_read_castledb_libconfig_sub_warp_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct config_setting_t *wd, const char *source, struct guild_castle *gc);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_guild_read_castledb_libconfig_sub_warp_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_guild_read_castledb_libconfig_sub_warp_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, wd, source, gc);
 		}
 	}
 	return retVal___;
@@ -34597,15 +36037,15 @@ int HP_homun_dead(struct homun_data *hd) {
 	}
 	return retVal___;
 }
-int HP_homun_vaporize(struct map_session_data *sd, enum homun_state flag) {
+int HP_homun_vaporize(struct map_session_data *sd, enum homun_state state, bool force) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_homun_vaporize_pre > 0) {
-		int (*preHookFunc) (struct map_session_data **sd, enum homun_state *flag);
+		int (*preHookFunc) (struct map_session_data **sd, enum homun_state *state, bool *force);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_homun_vaporize_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_homun_vaporize_pre[hIndex].func;
-			retVal___ = preHookFunc(&sd, &flag);
+			retVal___ = preHookFunc(&sd, &state, &force);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -34613,13 +36053,13 @@ int HP_homun_vaporize(struct map_session_data *sd, enum homun_state flag) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.homun.vaporize(sd, flag);
+		retVal___ = HPMHooks.source.homun.vaporize(sd, state, force);
 	}
 	if (HPMHooks.count.HP_homun_vaporize_post > 0) {
-		int (*postHookFunc) (int retVal___, struct map_session_data *sd, enum homun_state flag);
+		int (*postHookFunc) (int retVal___, struct map_session_data *sd, enum homun_state state, bool force);
 		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);
+			retVal___ = postHookFunc(retVal___, sd, state, force);
 		}
 	}
 	return retVal___;
@@ -34893,6 +36333,33 @@ int HP_homun_gainexp(struct homun_data *hd, unsigned int exp) {
 	}
 	return retVal___;
 }
+int HP_homun_gainexp_real(struct homun_data *hd, unsigned int exp) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_homun_gainexp_real_pre > 0) {
+		int (*preHookFunc) (struct homun_data **hd, unsigned int *exp);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_homun_gainexp_real_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_homun_gainexp_real_pre[hIndex].func;
+			retVal___ = preHookFunc(&hd, &exp);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.homun.gainexp_real(hd, exp);
+	}
+	if (HPMHooks.count.HP_homun_gainexp_real_post > 0) {
+		int (*postHookFunc) (int retVal___, struct homun_data *hd, unsigned int exp);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_homun_gainexp_real_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_homun_gainexp_real_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, hd, exp);
+		}
+	}
+	return retVal___;
+}
 unsigned int HP_homun_add_intimacy(struct homun_data *hd, unsigned int value) {
 	int hIndex = 0;
 	unsigned int retVal___ = 0;
@@ -35187,15 +36654,15 @@ int HP_homun_db_search(int key, int type) {
 	}
 	return retVal___;
 }
-bool HP_homun_create(struct map_session_data *sd, const struct s_homunculus *hom) {
+bool HP_homun_create(struct map_session_data *sd, const struct s_homunculus *hom, bool is_new) {
 	int hIndex = 0;
 	bool retVal___ = false;
 	if (HPMHooks.count.HP_homun_create_pre > 0) {
-		bool (*preHookFunc) (struct map_session_data **sd, const struct s_homunculus **hom);
+		bool (*preHookFunc) (struct map_session_data **sd, const struct s_homunculus **hom, bool *is_new);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_homun_create_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_homun_create_pre[hIndex].func;
-			retVal___ = preHookFunc(&sd, &hom);
+			retVal___ = preHookFunc(&sd, &hom, &is_new);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -35203,13 +36670,13 @@ bool HP_homun_create(struct map_session_data *sd, const struct s_homunculus *hom
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.homun.create(sd, hom);
+		retVal___ = HPMHooks.source.homun.create(sd, hom, is_new);
 	}
 	if (HPMHooks.count.HP_homun_create_post > 0) {
-		bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const struct s_homunculus *hom);
+		bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const struct s_homunculus *hom, bool is_new);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_homun_create_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_homun_create_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, sd, hom);
+			retVal___ = postHookFunc(retVal___, sd, hom, is_new);
 		}
 	}
 	return retVal___;
@@ -36209,141 +37676,6 @@ int HP_intif_create_pet(int account_id, int char_id, int pet_type, int pet_lv, i
 	}
 	return retVal___;
 }
-int HP_intif_broadcast(const char *mes, int len, int type) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_intif_broadcast_pre > 0) {
-		int (*preHookFunc) (const char **mes, int *len, int *type);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_broadcast_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_intif_broadcast_pre[hIndex].func;
-			retVal___ = preHookFunc(&mes, &len, &type);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.intif.broadcast(mes, len, type);
-	}
-	if (HPMHooks.count.HP_intif_broadcast_post > 0) {
-		int (*postHookFunc) (int retVal___, const char *mes, int len, int type);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_broadcast_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_intif_broadcast_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, mes, len, type);
-		}
-	}
-	return retVal___;
-}
-int HP_intif_broadcast2(const char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_intif_broadcast2_pre > 0) {
-		int (*preHookFunc) (const char **mes, int *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_broadcast2_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_intif_broadcast2_pre[hIndex].func;
-			retVal___ = preHookFunc(&mes, &len, &fontColor, &fontType, &fontSize, &fontAlign, &fontY);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.intif.broadcast2(mes, len, fontColor, fontType, fontSize, fontAlign, fontY);
-	}
-	if (HPMHooks.count.HP_intif_broadcast2_post > 0) {
-		int (*postHookFunc) (int retVal___, const char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_broadcast2_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_intif_broadcast2_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, mes, len, fontColor, fontType, fontSize, fontAlign, fontY);
-		}
-	}
-	return retVal___;
-}
-int HP_intif_main_message(struct map_session_data *sd, const char *message) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_intif_main_message_pre > 0) {
-		int (*preHookFunc) (struct map_session_data **sd, const char **message);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_main_message_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_intif_main_message_pre[hIndex].func;
-			retVal___ = preHookFunc(&sd, &message);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.intif.main_message(sd, message);
-	}
-	if (HPMHooks.count.HP_intif_main_message_post > 0) {
-		int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *message);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_main_message_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_intif_main_message_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, sd, message);
-		}
-	}
-	return retVal___;
-}
-int HP_intif_wis_message(struct map_session_data *sd, const char *nick, const char *mes, int mes_len) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_intif_wis_message_pre > 0) {
-		int (*preHookFunc) (struct map_session_data **sd, const char **nick, const char **mes, int *mes_len);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_wis_message_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_intif_wis_message_pre[hIndex].func;
-			retVal___ = preHookFunc(&sd, &nick, &mes, &mes_len);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.intif.wis_message(sd, nick, mes, mes_len);
-	}
-	if (HPMHooks.count.HP_intif_wis_message_post > 0) {
-		int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *nick, const char *mes, int mes_len);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_wis_message_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_intif_wis_message_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, sd, nick, mes, mes_len);
-		}
-	}
-	return retVal___;
-}
-int HP_intif_wis_message_to_gm(char *Wisp_name, int permission, char *mes) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_intif_wis_message_to_gm_pre > 0) {
-		int (*preHookFunc) (char **Wisp_name, int *permission, char **mes);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_wis_message_to_gm_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_intif_wis_message_to_gm_pre[hIndex].func;
-			retVal___ = preHookFunc(&Wisp_name, &permission, &mes);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.intif.wis_message_to_gm(Wisp_name, permission, mes);
-	}
-	if (HPMHooks.count.HP_intif_wis_message_to_gm_post > 0) {
-		int (*postHookFunc) (int retVal___, char *Wisp_name, int permission, char *mes);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_wis_message_to_gm_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_intif_wis_message_to_gm_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, Wisp_name, permission, mes);
-		}
-	}
-	return retVal___;
-}
 int HP_intif_saveregistry(struct map_session_data *sd) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -36693,33 +38025,6 @@ int HP_intif_break_party(int party_id) {
 	}
 	return retVal___;
 }
-int HP_intif_party_message(int party_id, int account_id, const char *mes, int len) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_intif_party_message_pre > 0) {
-		int (*preHookFunc) (int *party_id, int *account_id, const char **mes, int *len);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_party_message_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_intif_party_message_pre[hIndex].func;
-			retVal___ = preHookFunc(&party_id, &account_id, &mes, &len);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.intif.party_message(party_id, account_id, mes, len);
-	}
-	if (HPMHooks.count.HP_intif_party_message_post > 0) {
-		int (*postHookFunc) (int retVal___, int party_id, int account_id, const char *mes, int len);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_party_message_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_intif_party_message_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, party_id, account_id, mes, len);
-		}
-	}
-	return retVal___;
-}
 int HP_intif_party_leaderchange(int party_id, int account_id, int char_id) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -36909,33 +38214,6 @@ int HP_intif_guild_break(int guild_id) {
 	}
 	return retVal___;
 }
-int HP_intif_guild_message(int guild_id, int account_id, const char *mes, int len) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_intif_guild_message_pre > 0) {
-		int (*preHookFunc) (int *guild_id, int *account_id, const char **mes, int *len);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_message_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_intif_guild_message_pre[hIndex].func;
-			retVal___ = preHookFunc(&guild_id, &account_id, &mes, &len);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.intif.guild_message(guild_id, account_id, mes, len);
-	}
-	if (HPMHooks.count.HP_intif_guild_message_post > 0) {
-		int (*postHookFunc) (int retVal___, int guild_id, int account_id, const char *mes, int len);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_guild_message_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_intif_guild_message_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, guild_id, account_id, mes, len);
-		}
-	}
-	return retVal___;
-}
 int HP_intif_guild_change_gm(int guild_id, const char *name, int len) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -38068,15 +39346,15 @@ int HP_intif_rodex_checkhasnew(struct map_session_data *sd) {
 	}
 	return retVal___;
 }
-int HP_intif_rodex_updatemail(int64 mail_id, int8 flag) {
+int HP_intif_rodex_updatemail(struct map_session_data *sd, int64 mail_id, uint8 opentype, int8 flag) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_intif_rodex_updatemail_pre > 0) {
-		int (*preHookFunc) (int64 *mail_id, int8 *flag);
+		int (*preHookFunc) (struct map_session_data **sd, int64 *mail_id, uint8 *opentype, int8 *flag);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_rodex_updatemail_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_intif_rodex_updatemail_pre[hIndex].func;
-			retVal___ = preHookFunc(&mail_id, &flag);
+			retVal___ = preHookFunc(&sd, &mail_id, &opentype, &flag);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -38084,13 +39362,13 @@ int HP_intif_rodex_updatemail(int64 mail_id, int8 flag) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.intif.rodex_updatemail(mail_id, flag);
+		retVal___ = HPMHooks.source.intif.rodex_updatemail(sd, mail_id, opentype, flag);
 	}
 	if (HPMHooks.count.HP_intif_rodex_updatemail_post > 0) {
-		int (*postHookFunc) (int retVal___, int64 mail_id, int8 flag);
+		int (*postHookFunc) (int retVal___, struct map_session_data *sd, int64 mail_id, uint8 opentype, int8 flag);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_rodex_updatemail_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_intif_rodex_updatemail_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, mail_id, flag);
+			retVal___ = postHookFunc(retVal___, sd, mail_id, opentype, flag);
 		}
 	}
 	return retVal___;
@@ -38149,6 +39427,58 @@ int HP_intif_rodex_checkname(struct map_session_data *sd, const char *name) {
 	}
 	return retVal___;
 }
+void HP_intif_pGetZenyAck(int fd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_intif_pGetZenyAck_pre > 0) {
+		void (*preHookFunc) (int *fd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGetZenyAck_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_intif_pGetZenyAck_pre[hIndex].func;
+			preHookFunc(&fd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.intif.pGetZenyAck(fd);
+	}
+	if (HPMHooks.count.HP_intif_pGetZenyAck_post > 0) {
+		void (*postHookFunc) (int fd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGetZenyAck_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_intif_pGetZenyAck_post[hIndex].func;
+			postHookFunc(fd);
+		}
+	}
+	return;
+}
+void HP_intif_pGetItemsAck(int fd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_intif_pGetItemsAck_pre > 0) {
+		void (*preHookFunc) (int *fd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGetItemsAck_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_intif_pGetItemsAck_pre[hIndex].func;
+			preHookFunc(&fd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.intif.pGetItemsAck(fd);
+	}
+	if (HPMHooks.count.HP_intif_pGetItemsAck_post > 0) {
+		void (*postHookFunc) (int fd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGetItemsAck_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_intif_pGetItemsAck_post[hIndex].func;
+			postHookFunc(fd);
+		}
+	}
+	return;
+}
 int HP_intif_clan_kickoffline(int clan_id, int kick_interval) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -38308,117 +39638,6 @@ void HP_intif_achievements_save(struct map_session_data *sd) {
 	}
 	return;
 }
-void HP_intif_pWisMessage(int fd) {
-	int hIndex = 0;
-	if (HPMHooks.count.HP_intif_pWisMessage_pre > 0) {
-		void (*preHookFunc) (int *fd);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_pWisMessage_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_intif_pWisMessage_pre[hIndex].func;
-			preHookFunc(&fd);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return;
-		}
-	}
-	{
-		HPMHooks.source.intif.pWisMessage(fd);
-	}
-	if (HPMHooks.count.HP_intif_pWisMessage_post > 0) {
-		void (*postHookFunc) (int fd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_pWisMessage_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_intif_pWisMessage_post[hIndex].func;
-			postHookFunc(fd);
-		}
-	}
-	return;
-}
-void HP_intif_pWisEnd(int fd) {
-	int hIndex = 0;
-	if (HPMHooks.count.HP_intif_pWisEnd_pre > 0) {
-		void (*preHookFunc) (int *fd);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_pWisEnd_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_intif_pWisEnd_pre[hIndex].func;
-			preHookFunc(&fd);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return;
-		}
-	}
-	{
-		HPMHooks.source.intif.pWisEnd(fd);
-	}
-	if (HPMHooks.count.HP_intif_pWisEnd_post > 0) {
-		void (*postHookFunc) (int fd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_pWisEnd_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_intif_pWisEnd_post[hIndex].func;
-			postHookFunc(fd);
-		}
-	}
-	return;
-}
-int HP_intif_pWisToGM_sub(struct map_session_data *sd, va_list va) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_intif_pWisToGM_sub_pre > 0) {
-		int (*preHookFunc) (struct map_session_data **sd, va_list va);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_pWisToGM_sub_pre; hIndex++) {
-			va_list va___copy; va_copy(va___copy, va);
-			preHookFunc = HPMHooks.list.HP_intif_pWisToGM_sub_pre[hIndex].func;
-			retVal___ = preHookFunc(&sd, va___copy);
-			va_end(va___copy);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		va_list va___copy; va_copy(va___copy, va);
-		retVal___ = HPMHooks.source.intif.pWisToGM_sub(sd, va___copy);
-		va_end(va___copy);
-	}
-	if (HPMHooks.count.HP_intif_pWisToGM_sub_post > 0) {
-		int (*postHookFunc) (int retVal___, struct map_session_data *sd, va_list va);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_pWisToGM_sub_post; hIndex++) {
-			va_list va___copy; va_copy(va___copy, va);
-			postHookFunc = HPMHooks.list.HP_intif_pWisToGM_sub_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, sd, va___copy);
-			va_end(va___copy);
-		}
-	}
-	return retVal___;
-}
-void HP_intif_pWisToGM(int fd) {
-	int hIndex = 0;
-	if (HPMHooks.count.HP_intif_pWisToGM_pre > 0) {
-		void (*preHookFunc) (int *fd);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_pWisToGM_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_intif_pWisToGM_pre[hIndex].func;
-			preHookFunc(&fd);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return;
-		}
-	}
-	{
-		HPMHooks.source.intif.pWisToGM(fd);
-	}
-	if (HPMHooks.count.HP_intif_pWisToGM_post > 0) {
-		void (*postHookFunc) (int fd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_pWisToGM_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_intif_pWisToGM_post[hIndex].func;
-			postHookFunc(fd);
-		}
-	}
-	return;
-}
 void HP_intif_pRegisters(int fd) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_intif_pRegisters_pre > 0) {
@@ -38783,32 +40002,6 @@ void HP_intif_pPartyBroken(int fd) {
 	}
 	return;
 }
-void HP_intif_pPartyMessage(int fd) {
-	int hIndex = 0;
-	if (HPMHooks.count.HP_intif_pPartyMessage_pre > 0) {
-		void (*preHookFunc) (int *fd);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_pPartyMessage_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_intif_pPartyMessage_pre[hIndex].func;
-			preHookFunc(&fd);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return;
-		}
-	}
-	{
-		HPMHooks.source.intif.pPartyMessage(fd);
-	}
-	if (HPMHooks.count.HP_intif_pPartyMessage_post > 0) {
-		void (*postHookFunc) (int fd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_pPartyMessage_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_intif_pPartyMessage_post[hIndex].func;
-			postHookFunc(fd);
-		}
-	}
-	return;
-}
 void HP_intif_pGuildCreated(int fd) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_intif_pGuildCreated_pre > 0) {
@@ -38965,32 +40158,6 @@ void HP_intif_pGuildBroken(int fd) {
 	}
 	return;
 }
-void HP_intif_pGuildMessage(int fd) {
-	int hIndex = 0;
-	if (HPMHooks.count.HP_intif_pGuildMessage_pre > 0) {
-		void (*preHookFunc) (int *fd);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildMessage_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_intif_pGuildMessage_pre[hIndex].func;
-			preHookFunc(&fd);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return;
-		}
-	}
-	{
-		HPMHooks.source.intif.pGuildMessage(fd);
-	}
-	if (HPMHooks.count.HP_intif_pGuildMessage_post > 0) {
-		void (*postHookFunc) (int fd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_intif_pGuildMessage_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_intif_pGuildMessage_post[hIndex].func;
-			postHookFunc(fd);
-		}
-	}
-	return;
-}
 void HP_intif_pGuildBasicInfoChanged(int fd) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_intif_pGuildBasicInfoChanged_pre > 0) {
@@ -40952,11 +42119,11 @@ struct item_data* HP_itemdb_search_name(const char *name) {
 	}
 	return retVal___;
 }
-int HP_itemdb_search_name_array(struct item_data **data, int size, const char *str, int flag) {
+int HP_itemdb_search_name_array(struct item_data **data, const int size, const char *str, enum item_name_search_flag flag) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_itemdb_search_name_array_pre > 0) {
-		int (*preHookFunc) (struct item_data ***data, int *size, const char **str, int *flag);
+		int (*preHookFunc) (struct item_data ***data, const int *size, const char **str, enum item_name_search_flag *flag);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_search_name_array_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_itemdb_search_name_array_pre[hIndex].func;
@@ -40971,7 +42138,7 @@ int HP_itemdb_search_name_array(struct item_data **data, int size, const char *s
 		retVal___ = HPMHooks.source.itemdb.search_name_array(data, size, str, flag);
 	}
 	if (HPMHooks.count.HP_itemdb_search_name_array_post > 0) {
-		int (*postHookFunc) (int retVal___, struct item_data **data, int size, const char *str, int flag);
+		int (*postHookFunc) (int retVal___, struct item_data **data, const int size, const char *str, enum item_name_search_flag flag);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_search_name_array_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_itemdb_search_name_array_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, data, size, str, flag);
@@ -41851,15 +43018,15 @@ int HP_itemdb_isidentified2(struct item_data *data) {
 	}
 	return retVal___;
 }
-int HP_itemdb_combo_split_atoi(char *str, int *val) {
+bool HP_itemdb_read_combodb_libconfig(void) {
 	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_itemdb_combo_split_atoi_pre > 0) {
-		int (*preHookFunc) (char **str, int **val);
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_itemdb_read_combodb_libconfig_pre > 0) {
+		bool (*preHookFunc) (void);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_combo_split_atoi_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_itemdb_combo_split_atoi_pre[hIndex].func;
-			retVal___ = preHookFunc(&str, &val);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_combodb_libconfig_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_itemdb_read_combodb_libconfig_pre[hIndex].func;
+			retVal___ = preHookFunc();
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -41867,42 +43034,43 @@ int HP_itemdb_combo_split_atoi(char *str, int *val) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.itemdb.combo_split_atoi(str, val);
+		retVal___ = HPMHooks.source.itemdb.read_combodb_libconfig();
 	}
-	if (HPMHooks.count.HP_itemdb_combo_split_atoi_post > 0) {
-		int (*postHookFunc) (int retVal___, char *str, int *val);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_combo_split_atoi_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_itemdb_combo_split_atoi_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, str, val);
+	if (HPMHooks.count.HP_itemdb_read_combodb_libconfig_post > 0) {
+		bool (*postHookFunc) (bool retVal___);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_combodb_libconfig_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_itemdb_read_combodb_libconfig_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___);
 		}
 	}
 	return retVal___;
 }
-void HP_itemdb_read_combos(void) {
+bool HP_itemdb_read_combodb_libconfig_sub(struct config_setting_t *it, int idx, const char *source) {
 	int hIndex = 0;
-	if (HPMHooks.count.HP_itemdb_read_combos_pre > 0) {
-		void (*preHookFunc) (void);
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_itemdb_read_combodb_libconfig_sub_pre > 0) {
+		bool (*preHookFunc) (struct config_setting_t **it, int *idx, const char **source);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_combos_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_itemdb_read_combos_pre[hIndex].func;
-			preHookFunc();
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_combodb_libconfig_sub_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_itemdb_read_combodb_libconfig_sub_pre[hIndex].func;
+			retVal___ = preHookFunc(&it, &idx, &source);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
-			return;
+			return retVal___;
 		}
 	}
 	{
-		HPMHooks.source.itemdb.read_combos();
+		retVal___ = HPMHooks.source.itemdb.read_combodb_libconfig_sub(it, idx, source);
 	}
-	if (HPMHooks.count.HP_itemdb_read_combos_post > 0) {
-		void (*postHookFunc) (void);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_combos_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_itemdb_read_combos_post[hIndex].func;
-			postHookFunc();
+	if (HPMHooks.count.HP_itemdb_read_combodb_libconfig_sub_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct config_setting_t *it, int idx, const char *source);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_combodb_libconfig_sub_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_itemdb_read_combodb_libconfig_sub_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, it, idx, source);
 		}
 	}
-	return;
+	return retVal___;
 }
 int HP_itemdb_gendercheck(struct item_data *id) {
 	int hIndex = 0;
@@ -42402,7 +43570,140 @@ int HP_itemdb_addname_sub(union DBKey key, struct DBData *data, va_list ap) {
 	}
 	return retVal___;
 }
+bool HP_itemdb_read_libconfig_lapineddukddak(void) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_itemdb_read_libconfig_lapineddukddak_pre > 0) {
+		bool (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_libconfig_lapineddukddak_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_itemdb_read_libconfig_lapineddukddak_pre[hIndex].func;
+			retVal___ = preHookFunc();
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.itemdb.read_libconfig_lapineddukddak();
+	}
+	if (HPMHooks.count.HP_itemdb_read_libconfig_lapineddukddak_post > 0) {
+		bool (*postHookFunc) (bool retVal___);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_libconfig_lapineddukddak_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_itemdb_read_libconfig_lapineddukddak_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___);
+		}
+	}
+	return retVal___;
+}
+bool HP_itemdb_read_libconfig_lapineddukddak_sub(struct config_setting_t *it, const char *source) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_itemdb_read_libconfig_lapineddukddak_sub_pre > 0) {
+		bool (*preHookFunc) (struct config_setting_t **it, const char **source);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_libconfig_lapineddukddak_sub_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_itemdb_read_libconfig_lapineddukddak_sub_pre[hIndex].func;
+			retVal___ = preHookFunc(&it, &source);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.itemdb.read_libconfig_lapineddukddak_sub(it, source);
+	}
+	if (HPMHooks.count.HP_itemdb_read_libconfig_lapineddukddak_sub_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct config_setting_t *it, const char *source);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_libconfig_lapineddukddak_sub_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_itemdb_read_libconfig_lapineddukddak_sub_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, it, source);
+		}
+	}
+	return retVal___;
+}
+bool HP_itemdb_read_libconfig_lapineddukddak_sub_sources(struct config_setting_t *sources, struct item_data *data) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_itemdb_read_libconfig_lapineddukddak_sub_sources_pre > 0) {
+		bool (*preHookFunc) (struct config_setting_t **sources, struct item_data **data);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_libconfig_lapineddukddak_sub_sources_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_itemdb_read_libconfig_lapineddukddak_sub_sources_pre[hIndex].func;
+			retVal___ = preHookFunc(&sources, &data);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.itemdb.read_libconfig_lapineddukddak_sub_sources(sources, data);
+	}
+	if (HPMHooks.count.HP_itemdb_read_libconfig_lapineddukddak_sub_sources_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct config_setting_t *sources, struct item_data *data);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_libconfig_lapineddukddak_sub_sources_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_itemdb_read_libconfig_lapineddukddak_sub_sources_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sources, data);
+		}
+	}
+	return retVal___;
+}
 /* libconfig_interface */
+void HP_libconfig_set_db_path(const char *db_path) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_libconfig_set_db_path_pre > 0) {
+		void (*preHookFunc) (const char **db_path);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_db_path_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_libconfig_set_db_path_pre[hIndex].func;
+			preHookFunc(&db_path);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.libconfig.set_db_path(db_path);
+	}
+	if (HPMHooks.count.HP_libconfig_set_db_path_post > 0) {
+		void (*postHookFunc) (const char *db_path);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_db_path_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_libconfig_set_db_path_post[hIndex].func;
+			postHookFunc(db_path);
+		}
+	}
+	return;
+}
+void HP_libconfig_format_db_path(const char *filename, char *path_buf, int buffer_len) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_libconfig_format_db_path_pre > 0) {
+		void (*preHookFunc) (const char **filename, char **path_buf, int *buffer_len);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_format_db_path_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_libconfig_format_db_path_pre[hIndex].func;
+			preHookFunc(&filename, &path_buf, &buffer_len);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.libconfig.format_db_path(filename, path_buf, buffer_len);
+	}
+	if (HPMHooks.count.HP_libconfig_format_db_path_post > 0) {
+		void (*postHookFunc) (const char *filename, char *path_buf, int buffer_len);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_format_db_path_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_libconfig_format_db_path_post[hIndex].func;
+			postHookFunc(filename, path_buf, buffer_len);
+		}
+	}
+	return;
+}
 int HP_libconfig_read(struct config_t *config, FILE *stream) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -44779,15 +46080,15 @@ char HP_logs_chattype2char(e_log_chat_type type) {
 	}
 	return retVal___;
 }
-bool HP_logs_should_log_item(int nameid, int amount, int refine, struct item_data *id) {
+bool HP_logs_should_log_item(int nameid, int amount, int refine_level, struct item_data *id) {
 	int hIndex = 0;
 	bool retVal___ = false;
 	if (HPMHooks.count.HP_logs_should_log_item_pre > 0) {
-		bool (*preHookFunc) (int *nameid, int *amount, int *refine, struct item_data **id);
+		bool (*preHookFunc) (int *nameid, int *amount, int *refine_level, struct item_data **id);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_logs_should_log_item_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_logs_should_log_item_pre[hIndex].func;
-			retVal___ = preHookFunc(&nameid, &amount, &refine, &id);
+			retVal___ = preHookFunc(&nameid, &amount, &refine_level, &id);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -44795,13 +46096,13 @@ bool HP_logs_should_log_item(int nameid, int amount, int refine, struct item_dat
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.logs.should_log_item(nameid, amount, refine, id);
+		retVal___ = HPMHooks.source.logs.should_log_item(nameid, amount, refine_level, id);
 	}
 	if (HPMHooks.count.HP_logs_should_log_item_post > 0) {
-		bool (*postHookFunc) (bool retVal___, int nameid, int amount, int refine, struct item_data *id);
+		bool (*postHookFunc) (bool retVal___, int nameid, int amount, int refine_level, struct item_data *id);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_logs_should_log_item_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_logs_should_log_item_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, nameid, amount, refine, id);
+			retVal___ = postHookFunc(retVal___, nameid, amount, refine_level, id);
 		}
 	}
 	return retVal___;
@@ -47007,15 +48308,15 @@ void HP_map_deliddb(struct block_list *bl) {
 	}
 	return;
 }
-struct map_session_data* HP_map_nick2sd(const char *nick) {
+struct map_session_data* HP_map_nick2sd(const char *nick, bool allow_partial) {
 	int hIndex = 0;
 	struct map_session_data* retVal___ = NULL;
 	if (HPMHooks.count.HP_map_nick2sd_pre > 0) {
-		struct map_session_data* (*preHookFunc) (const char **nick);
+		struct map_session_data* (*preHookFunc) (const char **nick, bool *allow_partial);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_map_nick2sd_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_map_nick2sd_pre[hIndex].func;
-			retVal___ = preHookFunc(&nick);
+			retVal___ = preHookFunc(&nick, &allow_partial);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -47023,13 +48324,13 @@ struct map_session_data* HP_map_nick2sd(const char *nick) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.map.nick2sd(nick);
+		retVal___ = HPMHooks.source.map.nick2sd(nick, allow_partial);
 	}
 	if (HPMHooks.count.HP_map_nick2sd_post > 0) {
-		struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, const char *nick);
+		struct map_session_data* (*postHookFunc) (struct map_session_data* retVal___, const char *nick, bool allow_partial);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_map_nick2sd_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_map_nick2sd_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, nick);
+			retVal___ = postHookFunc(retVal___, nick, allow_partial);
 		}
 	}
 	return retVal___;
@@ -47141,11 +48442,11 @@ void HP_map_reloadnpc(bool clear) {
 	}
 	return;
 }
-int HP_map_check_dir(int s_dir, int t_dir) {
+int HP_map_check_dir(enum unit_dir s_dir, enum unit_dir t_dir) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_map_check_dir_pre > 0) {
-		int (*preHookFunc) (int *s_dir, int *t_dir);
+		int (*preHookFunc) (enum unit_dir *s_dir, enum unit_dir *t_dir);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_map_check_dir_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_map_check_dir_pre[hIndex].func;
@@ -47160,7 +48461,7 @@ int HP_map_check_dir(int s_dir, int t_dir) {
 		retVal___ = HPMHooks.source.map.check_dir(s_dir, t_dir);
 	}
 	if (HPMHooks.count.HP_map_check_dir_post > 0) {
-		int (*postHookFunc) (int retVal___, int s_dir, int t_dir);
+		int (*postHookFunc) (int retVal___, enum unit_dir s_dir, enum unit_dir t_dir);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_map_check_dir_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_map_check_dir_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, s_dir, t_dir);
@@ -47168,11 +48469,11 @@ int HP_map_check_dir(int s_dir, int t_dir) {
 	}
 	return retVal___;
 }
-uint8 HP_map_calc_dir(struct block_list *src, int16 x, int16 y) {
+enum unit_dir HP_map_calc_dir(const struct block_list *src, int16 x, int16 y) {
 	int hIndex = 0;
-	uint8 retVal___ = 0;
+	enum unit_dir retVal___ = UNIT_DIR_UNDEFINED;
 	if (HPMHooks.count.HP_map_calc_dir_pre > 0) {
-		uint8 (*preHookFunc) (struct block_list **src, int16 *x, int16 *y);
+		enum unit_dir (*preHookFunc) (const struct block_list **src, int16 *x, int16 *y);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_map_calc_dir_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_map_calc_dir_pre[hIndex].func;
@@ -47187,7 +48488,7 @@ uint8 HP_map_calc_dir(struct block_list *src, int16 x, int16 y) {
 		retVal___ = HPMHooks.source.map.calc_dir(src, x, y);
 	}
 	if (HPMHooks.count.HP_map_calc_dir_post > 0) {
-		uint8 (*postHookFunc) (uint8 retVal___, struct block_list *src, int16 x, int16 y);
+		enum unit_dir (*postHookFunc) (enum unit_dir retVal___, const struct block_list *src, int16 x, int16 y);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_map_calc_dir_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_map_calc_dir_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, src, x, y);
@@ -48724,31 +50025,32 @@ int HP_map_get_new_bonus_id(void) {
 	}
 	return retVal___;
 }
-void HP_map_add_questinfo(int m, struct questinfo *qi) {
+bool HP_map_add_questinfo(int m, struct npc_data *nd) {
 	int hIndex = 0;
+	bool retVal___ = false;
 	if (HPMHooks.count.HP_map_add_questinfo_pre > 0) {
-		void (*preHookFunc) (int *m, struct questinfo **qi);
+		bool (*preHookFunc) (int *m, struct npc_data **nd);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_map_add_questinfo_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_map_add_questinfo_pre[hIndex].func;
-			preHookFunc(&m, &qi);
+			retVal___ = preHookFunc(&m, &nd);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
-			return;
+			return retVal___;
 		}
 	}
 	{
-		HPMHooks.source.map.add_questinfo(m, qi);
+		retVal___ = HPMHooks.source.map.add_questinfo(m, nd);
 	}
 	if (HPMHooks.count.HP_map_add_questinfo_post > 0) {
-		void (*postHookFunc) (int m, struct questinfo *qi);
+		bool (*postHookFunc) (bool retVal___, int m, struct npc_data *nd);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_map_add_questinfo_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_map_add_questinfo_post[hIndex].func;
-			postHookFunc(m, qi);
+			retVal___ = postHookFunc(retVal___, m, nd);
 		}
 	}
-	return;
+	return retVal___;
 }
 bool HP_map_remove_questinfo(int m, struct npc_data *nd) {
 	int hIndex = 0;
@@ -48831,6 +50133,60 @@ void HP_map_zone_clear_single(struct map_zone_data *zone) {
 	return;
 }
 /* mapindex_interface */
+bool HP_mapindex_config_read_dbpath(const char *filename, const struct config_t *config) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_mapindex_config_read_dbpath_pre > 0) {
+		bool (*preHookFunc) (const char **filename, const struct config_t **config);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_config_read_dbpath_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_mapindex_config_read_dbpath_pre[hIndex].func;
+			retVal___ = preHookFunc(&filename, &config);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.mapindex.config_read_dbpath(filename, config);
+	}
+	if (HPMHooks.count.HP_mapindex_config_read_dbpath_post > 0) {
+		bool (*postHookFunc) (bool retVal___, const char *filename, const struct config_t *config);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_config_read_dbpath_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_mapindex_config_read_dbpath_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, filename, config);
+		}
+	}
+	return retVal___;
+}
+bool HP_mapindex_config_read(void) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_mapindex_config_read_pre > 0) {
+		bool (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_config_read_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_mapindex_config_read_pre[hIndex].func;
+			retVal___ = preHookFunc();
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.mapindex.config_read();
+	}
+	if (HPMHooks.count.HP_mapindex_config_read_post > 0) {
+		bool (*postHookFunc) (bool retVal___);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapindex_config_read_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_mapindex_config_read_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___);
+		}
+	}
+	return retVal___;
+}
 int HP_mapindex_init(void) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -50420,6 +51776,39 @@ void HP_mob_reload(void) {
 	}
 	return;
 }
+int HP_mob_reload_sub_mob(struct mob_data *md, va_list args) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_mob_reload_sub_mob_pre > 0) {
+		int (*preHookFunc) (struct mob_data **md, va_list args);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_reload_sub_mob_pre; hIndex++) {
+			va_list args___copy; va_copy(args___copy, args);
+			preHookFunc = HPMHooks.list.HP_mob_reload_sub_mob_pre[hIndex].func;
+			retVal___ = preHookFunc(&md, args___copy);
+			va_end(args___copy);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		va_list args___copy; va_copy(args___copy, args);
+		retVal___ = HPMHooks.source.mob.reload_sub_mob(md, args___copy);
+		va_end(args___copy);
+	}
+	if (HPMHooks.count.HP_mob_reload_sub_mob_post > 0) {
+		int (*postHookFunc) (int retVal___, struct mob_data *md, va_list args);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_reload_sub_mob_post; hIndex++) {
+			va_list args___copy; va_copy(args___copy, args);
+			postHookFunc = HPMHooks.list.HP_mob_reload_sub_mob_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, md, args___copy);
+			va_end(args___copy);
+		}
+	}
+	return retVal___;
+}
 struct mob_db* HP_mob_db(int index) {
 	int hIndex = 0;
 	struct mob_db* retVal___ = NULL;
@@ -50822,15 +52211,15 @@ int HP_mob_parse_dataset(struct spawn_data *data) {
 	}
 	return retVal___;
 }
-struct mob_data* HP_mob_spawn_dataset(struct spawn_data *data) {
+struct mob_data* HP_mob_spawn_dataset(struct spawn_data *data, int npc_id) {
 	int hIndex = 0;
 	struct mob_data* retVal___ = NULL;
 	if (HPMHooks.count.HP_mob_spawn_dataset_pre > 0) {
-		struct mob_data* (*preHookFunc) (struct spawn_data **data);
+		struct mob_data* (*preHookFunc) (struct spawn_data **data, int *npc_id);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_spawn_dataset_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_mob_spawn_dataset_pre[hIndex].func;
-			retVal___ = preHookFunc(&data);
+			retVal___ = preHookFunc(&data, &npc_id);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -50838,13 +52227,13 @@ struct mob_data* HP_mob_spawn_dataset(struct spawn_data *data) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.mob.spawn_dataset(data);
+		retVal___ = HPMHooks.source.mob.spawn_dataset(data, npc_id);
 	}
 	if (HPMHooks.count.HP_mob_spawn_dataset_post > 0) {
-		struct mob_data* (*postHookFunc) (struct mob_data* retVal___, struct spawn_data *data);
+		struct mob_data* (*postHookFunc) (struct mob_data* retVal___, struct spawn_data *data, int npc_id);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_spawn_dataset_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_mob_spawn_dataset_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, data);
+			retVal___ = postHookFunc(retVal___, data, npc_id);
 		}
 	}
 	return retVal___;
@@ -50903,15 +52292,15 @@ bool HP_mob_ksprotected(struct block_list *src, struct block_list *target) {
 	}
 	return retVal___;
 }
-struct mob_data* HP_mob_once_spawn_sub(struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int class_, const char *event, unsigned int size, unsigned int ai) {
+struct mob_data* HP_mob_once_spawn_sub(struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int class_, const char *event, unsigned int size, unsigned int ai, int npc_id) {
 	int hIndex = 0;
 	struct mob_data* retVal___ = NULL;
 	if (HPMHooks.count.HP_mob_once_spawn_sub_pre > 0) {
-		struct mob_data* (*preHookFunc) (struct block_list **bl, int16 *m, int16 *x, int16 *y, const char **mobname, int *class_, const char **event, unsigned int *size, unsigned int *ai);
+		struct mob_data* (*preHookFunc) (struct block_list **bl, int16 *m, int16 *x, int16 *y, const char **mobname, int *class_, const char **event, unsigned int *size, unsigned int *ai, int *npc_id);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_once_spawn_sub_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_mob_once_spawn_sub_pre[hIndex].func;
-			retVal___ = preHookFunc(&bl, &m, &x, &y, &mobname, &class_, &event, &size, &ai);
+			retVal___ = preHookFunc(&bl, &m, &x, &y, &mobname, &class_, &event, &size, &ai, &npc_id);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -50919,13 +52308,13 @@ struct mob_data* HP_mob_once_spawn_sub(struct block_list *bl, int16 m, int16 x,
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.mob.once_spawn_sub(bl, m, x, y, mobname, class_, event, size, ai);
+		retVal___ = HPMHooks.source.mob.once_spawn_sub(bl, m, x, y, mobname, class_, event, size, ai, npc_id);
 	}
 	if (HPMHooks.count.HP_mob_once_spawn_sub_post > 0) {
-		struct mob_data* (*postHookFunc) (struct mob_data* retVal___, struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int class_, const char *event, unsigned int size, unsigned int ai);
+		struct mob_data* (*postHookFunc) (struct mob_data* retVal___, struct block_list *bl, int16 m, int16 x, int16 y, const char *mobname, int class_, const char *event, unsigned int size, unsigned int ai, int npc_id);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_once_spawn_sub_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_mob_once_spawn_sub_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, bl, m, x, y, mobname, class_, event, size, ai);
+			retVal___ = postHookFunc(retVal___, bl, m, x, y, mobname, class_, event, size, ai, npc_id);
 		}
 	}
 	return retVal___;
@@ -50984,15 +52373,15 @@ int HP_mob_once_spawn_area(struct map_session_data *sd, int16 m, int16 x0, int16
 	}
 	return retVal___;
 }
-int HP_mob_spawn_guardian(const char *mapname, short x, short y, const char *mobname, int class_, const char *event, int guardian, bool has_index) {
+int HP_mob_spawn_guardian(const char *mapname, short x, short y, const char *mobname, int class_, const char *event, int guardian, bool has_index, int npc_id) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_mob_spawn_guardian_pre > 0) {
-		int (*preHookFunc) (const char **mapname, short *x, short *y, const char **mobname, int *class_, const char **event, int *guardian, bool *has_index);
+		int (*preHookFunc) (const char **mapname, short *x, short *y, const char **mobname, int *class_, const char **event, int *guardian, bool *has_index, int *npc_id);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_spawn_guardian_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_mob_spawn_guardian_pre[hIndex].func;
-			retVal___ = preHookFunc(&mapname, &x, &y, &mobname, &class_, &event, &guardian, &has_index);
+			retVal___ = preHookFunc(&mapname, &x, &y, &mobname, &class_, &event, &guardian, &has_index, &npc_id);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -51000,26 +52389,26 @@ int HP_mob_spawn_guardian(const char *mapname, short x, short y, const char *mob
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.mob.spawn_guardian(mapname, x, y, mobname, class_, event, guardian, has_index);
+		retVal___ = HPMHooks.source.mob.spawn_guardian(mapname, x, y, mobname, class_, event, guardian, has_index, npc_id);
 	}
 	if (HPMHooks.count.HP_mob_spawn_guardian_post > 0) {
-		int (*postHookFunc) (int retVal___, const char *mapname, short x, short y, const char *mobname, int class_, const char *event, int guardian, bool has_index);
+		int (*postHookFunc) (int retVal___, const char *mapname, short x, short y, const char *mobname, int class_, const char *event, int guardian, bool has_index, int npc_id);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_spawn_guardian_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_mob_spawn_guardian_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, mapname, x, y, mobname, class_, event, guardian, has_index);
+			retVal___ = postHookFunc(retVal___, mapname, x, y, mobname, class_, event, guardian, has_index, npc_id);
 		}
 	}
 	return retVal___;
 }
-int HP_mob_spawn_bg(const char *mapname, short x, short y, const char *mobname, int class_, const char *event, unsigned int bg_id) {
+int HP_mob_spawn_bg(const char *mapname, short x, short y, const char *mobname, int class_, const char *event, unsigned int bg_id, int npc_id) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_mob_spawn_bg_pre > 0) {
-		int (*preHookFunc) (const char **mapname, short *x, short *y, const char **mobname, int *class_, const char **event, unsigned int *bg_id);
+		int (*preHookFunc) (const char **mapname, short *x, short *y, const char **mobname, int *class_, const char **event, unsigned int *bg_id, int *npc_id);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_spawn_bg_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_mob_spawn_bg_pre[hIndex].func;
-			retVal___ = preHookFunc(&mapname, &x, &y, &mobname, &class_, &event, &bg_id);
+			retVal___ = preHookFunc(&mapname, &x, &y, &mobname, &class_, &event, &bg_id, &npc_id);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -51027,13 +52416,13 @@ int HP_mob_spawn_bg(const char *mapname, short x, short y, const char *mobname,
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.mob.spawn_bg(mapname, x, y, mobname, class_, event, bg_id);
+		retVal___ = HPMHooks.source.mob.spawn_bg(mapname, x, y, mobname, class_, event, bg_id, npc_id);
 	}
 	if (HPMHooks.count.HP_mob_spawn_bg_post > 0) {
-		int (*postHookFunc) (int retVal___, const char *mapname, short x, short y, const char *mobname, int class_, const char *event, unsigned int bg_id);
+		int (*postHookFunc) (int retVal___, const char *mapname, short x, short y, const char *mobname, int class_, const char *event, unsigned int bg_id, int npc_id);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_spawn_bg_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_mob_spawn_bg_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, mapname, x, y, mobname, class_, event, bg_id);
+			retVal___ = postHookFunc(retVal___, mapname, x, y, mobname, class_, event, bg_id, npc_id);
 		}
 	}
 	return retVal___;
@@ -51431,6 +52820,33 @@ int HP_mob_warpchase_sub(struct block_list *bl, va_list ap) {
 	}
 	return retVal___;
 }
+bool HP_mob_is_in_battle_state(const struct mob_data *md) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_mob_is_in_battle_state_pre > 0) {
+		bool (*preHookFunc) (const struct mob_data **md);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_is_in_battle_state_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_mob_is_in_battle_state_pre[hIndex].func;
+			retVal___ = preHookFunc(&md);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.mob.is_in_battle_state(md);
+	}
+	if (HPMHooks.count.HP_mob_is_in_battle_state_post > 0) {
+		bool (*postHookFunc) (bool retVal___, const struct mob_data *md);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_is_in_battle_state_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_mob_is_in_battle_state_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, md);
+		}
+	}
+	return retVal___;
+}
 int HP_mob_ai_sub_hard_slavemob(struct mob_data *md, int64 tick) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -51719,15 +53135,41 @@ int HP_mob_ai_hard(int tid, int64 tick, int id, intptr_t data) {
 	}
 	return retVal___;
 }
-struct item_drop* HP_mob_setdropitem(int nameid, int qty, struct item_data *data) {
+void HP_mob_setdropitem_options(struct item *item, struct optdrop_group *options) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_mob_setdropitem_options_pre > 0) {
+		void (*preHookFunc) (struct item **item, struct optdrop_group **options);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_setdropitem_options_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_mob_setdropitem_options_pre[hIndex].func;
+			preHookFunc(&item, &options);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.mob.setdropitem_options(item, options);
+	}
+	if (HPMHooks.count.HP_mob_setdropitem_options_post > 0) {
+		void (*postHookFunc) (struct item *item, struct optdrop_group *options);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_setdropitem_options_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_mob_setdropitem_options_post[hIndex].func;
+			postHookFunc(item, options);
+		}
+	}
+	return;
+}
+struct item_drop* HP_mob_setdropitem(int nameid, struct optdrop_group *options, int qty, struct item_data *data) {
 	int hIndex = 0;
 	struct item_drop* retVal___ = NULL;
 	if (HPMHooks.count.HP_mob_setdropitem_pre > 0) {
-		struct item_drop* (*preHookFunc) (int *nameid, int *qty, struct item_data **data);
+		struct item_drop* (*preHookFunc) (int *nameid, struct optdrop_group **options, int *qty, struct item_data **data);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_setdropitem_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_mob_setdropitem_pre[hIndex].func;
-			retVal___ = preHookFunc(&nameid, &qty, &data);
+			retVal___ = preHookFunc(&nameid, &options, &qty, &data);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -51735,13 +53177,13 @@ struct item_drop* HP_mob_setdropitem(int nameid, int qty, struct item_data *data
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.mob.setdropitem(nameid, qty, data);
+		retVal___ = HPMHooks.source.mob.setdropitem(nameid, options, qty, data);
 	}
 	if (HPMHooks.count.HP_mob_setdropitem_post > 0) {
-		struct item_drop* (*postHookFunc) (struct item_drop* retVal___, int nameid, int qty, struct item_data *data);
+		struct item_drop* (*postHookFunc) (struct item_drop* retVal___, int nameid, struct optdrop_group *options, int qty, struct item_data *data);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_setdropitem_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_mob_setdropitem_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, nameid, qty, data);
+			retVal___ = postHookFunc(retVal___, nameid, options, qty, data);
 		}
 	}
 	return retVal___;
@@ -52419,11 +53861,11 @@ int HP_mob_getfriendstatus_sub(struct block_list *bl, va_list ap) {
 	}
 	return retVal___;
 }
-struct mob_data* HP_mob_getfriendstatus(struct mob_data *md, int cond1, int cond2) {
+struct block_list* HP_mob_getfriendstatus(struct mob_data *md, int cond1, int cond2) {
 	int hIndex = 0;
-	struct mob_data* retVal___ = NULL;
+	struct block_list* retVal___ = NULL;
 	if (HPMHooks.count.HP_mob_getfriendstatus_pre > 0) {
-		struct mob_data* (*preHookFunc) (struct mob_data **md, int *cond1, int *cond2);
+		struct block_list* (*preHookFunc) (struct mob_data **md, int *cond1, int *cond2);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_getfriendstatus_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_mob_getfriendstatus_pre[hIndex].func;
@@ -52438,7 +53880,7 @@ struct mob_data* HP_mob_getfriendstatus(struct mob_data *md, int cond1, int cond
 		retVal___ = HPMHooks.source.mob.getfriendstatus(md, cond1, cond2);
 	}
 	if (HPMHooks.count.HP_mob_getfriendstatus_post > 0) {
-		struct mob_data* (*postHookFunc) (struct mob_data* retVal___, struct mob_data *md, int cond1, int cond2);
+		struct block_list* (*postHookFunc) (struct block_list* retVal___, struct mob_data *md, int cond1, int cond2);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_getfriendstatus_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_mob_getfriendstatus_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, md, cond1, cond2);
@@ -52634,6 +54076,114 @@ void HP_mob_item_dropratio_adjust(int nameid, int mob_id, int *rate_adjust) {
 	}
 	return;
 }
+bool HP_mob_read_optdrops_option(struct config_setting_t *option, struct optdrop_group_optslot *entry, int *idx, bool *calc_rate, int slot, const char *group) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_mob_read_optdrops_option_pre > 0) {
+		bool (*preHookFunc) (struct config_setting_t **option, struct optdrop_group_optslot **entry, int **idx, bool **calc_rate, int *slot, const char **group);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_optdrops_option_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_mob_read_optdrops_option_pre[hIndex].func;
+			retVal___ = preHookFunc(&option, &entry, &idx, &calc_rate, &slot, &group);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.mob.read_optdrops_option(option, entry, idx, calc_rate, slot, group);
+	}
+	if (HPMHooks.count.HP_mob_read_optdrops_option_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct config_setting_t *option, struct optdrop_group_optslot *entry, int *idx, bool *calc_rate, int slot, const char *group);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_optdrops_option_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_mob_read_optdrops_option_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, option, entry, idx, calc_rate, slot, group);
+		}
+	}
+	return retVal___;
+}
+bool HP_mob_read_optdrops_optslot(struct config_setting_t *optslot, int n, int group_id, const char *group) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_mob_read_optdrops_optslot_pre > 0) {
+		bool (*preHookFunc) (struct config_setting_t **optslot, int *n, int *group_id, const char **group);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_optdrops_optslot_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_mob_read_optdrops_optslot_pre[hIndex].func;
+			retVal___ = preHookFunc(&optslot, &n, &group_id, &group);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.mob.read_optdrops_optslot(optslot, n, group_id, group);
+	}
+	if (HPMHooks.count.HP_mob_read_optdrops_optslot_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct config_setting_t *optslot, int n, int group_id, const char *group);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_optdrops_optslot_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_mob_read_optdrops_optslot_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, optslot, n, group_id, group);
+		}
+	}
+	return retVal___;
+}
+bool HP_mob_read_optdrops_group(struct config_setting_t *group, int n) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_mob_read_optdrops_group_pre > 0) {
+		bool (*preHookFunc) (struct config_setting_t **group, int *n);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_optdrops_group_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_mob_read_optdrops_group_pre[hIndex].func;
+			retVal___ = preHookFunc(&group, &n);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.mob.read_optdrops_group(group, n);
+	}
+	if (HPMHooks.count.HP_mob_read_optdrops_group_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct config_setting_t *group, int n);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_optdrops_group_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_mob_read_optdrops_group_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, group, n);
+		}
+	}
+	return retVal___;
+}
+bool HP_mob_read_optdrops_db(void) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_mob_read_optdrops_db_pre > 0) {
+		bool (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_optdrops_db_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_mob_read_optdrops_db_pre[hIndex].func;
+			retVal___ = preHookFunc();
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.mob.read_optdrops_db();
+	}
+	if (HPMHooks.count.HP_mob_read_optdrops_db_post > 0) {
+		bool (*postHookFunc) (bool retVal___);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_optdrops_db_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_mob_read_optdrops_db_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___);
+		}
+	}
+	return retVal___;
+}
 void HP_mob_readdb(void) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_mob_readdb_pre > 0) {
@@ -52900,6 +54450,33 @@ uint32 HP_mob_read_db_mode_sub(struct mob_db *entry, struct config_setting_t *t)
 	}
 	return retVal___;
 }
+struct optdrop_group* HP_mob_read_db_drops_option(struct mob_db *entry, const char *item_name, struct config_setting_t *drop, int *drop_rate) {
+	int hIndex = 0;
+	struct optdrop_group* retVal___ = NULL;
+	if (HPMHooks.count.HP_mob_read_db_drops_option_pre > 0) {
+		struct optdrop_group* (*preHookFunc) (struct mob_db **entry, const char **item_name, struct config_setting_t **drop, int **drop_rate);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_drops_option_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_mob_read_db_drops_option_pre[hIndex].func;
+			retVal___ = preHookFunc(&entry, &item_name, &drop, &drop_rate);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.mob.read_db_drops_option(entry, item_name, drop, drop_rate);
+	}
+	if (HPMHooks.count.HP_mob_read_db_drops_option_post > 0) {
+		struct optdrop_group* (*postHookFunc) (struct optdrop_group* retVal___, struct mob_db *entry, const char *item_name, struct config_setting_t *drop, int *drop_rate);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_drops_option_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_mob_read_db_drops_option_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, entry, item_name, drop, drop_rate);
+		}
+	}
+	return retVal___;
+}
 void HP_mob_read_db_stats_sub(struct mob_db *entry, struct config_setting_t *t) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_mob_read_db_stats_sub_pre > 0) {
@@ -52926,6 +54503,32 @@ void HP_mob_read_db_stats_sub(struct mob_db *entry, struct config_setting_t *t)
 	}
 	return;
 }
+void HP_mob_read_db_viewdata_sub(struct mob_db *entry, struct config_setting_t *t) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_mob_read_db_viewdata_sub_pre > 0) {
+		void (*preHookFunc) (struct mob_db **entry, struct config_setting_t **t);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_viewdata_sub_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_mob_read_db_viewdata_sub_pre[hIndex].func;
+			preHookFunc(&entry, &t);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.mob.read_db_viewdata_sub(entry, t);
+	}
+	if (HPMHooks.count.HP_mob_read_db_viewdata_sub_post > 0) {
+		void (*postHookFunc) (struct mob_db *entry, struct config_setting_t *t);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_viewdata_sub_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_mob_read_db_viewdata_sub_post[hIndex].func;
+			postHookFunc(entry, t);
+		}
+	}
+	return;
+}
 void HP_mob_name_constants(void) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_mob_name_constants_pre > 0) {
@@ -52952,32 +54555,31 @@ void HP_mob_name_constants(void) {
 	}
 	return;
 }
-bool HP_mob_readdb_mobavail(char *str[], int columns, int current) {
+void HP_mob_mobavail_removal_notice(void) {
 	int hIndex = 0;
-	bool retVal___ = false;
-	if (HPMHooks.count.HP_mob_readdb_mobavail_pre > 0) {
-		bool (*preHookFunc) (char **str[], int *columns, int *current);
+	if (HPMHooks.count.HP_mob_mobavail_removal_notice_pre > 0) {
+		void (*preHookFunc) (void);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_readdb_mobavail_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_mob_readdb_mobavail_pre[hIndex].func;
-			retVal___ = preHookFunc(&str, &columns, &current);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_mobavail_removal_notice_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_mob_mobavail_removal_notice_pre[hIndex].func;
+			preHookFunc();
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
-			return retVal___;
+			return;
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.mob.readdb_mobavail(str, columns, current);
+		HPMHooks.source.mob.mobavail_removal_notice();
 	}
-	if (HPMHooks.count.HP_mob_readdb_mobavail_post > 0) {
-		bool (*postHookFunc) (bool retVal___, char *str[], int columns, int current);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_readdb_mobavail_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_mob_readdb_mobavail_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, str, columns, current);
+	if (HPMHooks.count.HP_mob_mobavail_removal_notice_post > 0) {
+		void (*postHookFunc) (void);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_mobavail_removal_notice_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_mob_mobavail_removal_notice_post[hIndex].func;
+			postHookFunc();
 		}
 	}
-	return retVal___;
+	return;
 }
 int HP_mob_read_randommonster(void) {
 	int hIndex = 0;
@@ -53303,6 +54905,32 @@ void HP_mob_destroy_mob_db(int index) {
 	}
 	return;
 }
+void HP_mob_destroy_drop_groups(void) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_mob_destroy_drop_groups_pre > 0) {
+		void (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_destroy_drop_groups_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_mob_destroy_drop_groups_pre[hIndex].func;
+			preHookFunc();
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.mob.destroy_drop_groups();
+	}
+	if (HPMHooks.count.HP_mob_destroy_drop_groups_post > 0) {
+		void (*postHookFunc) (void);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_mob_destroy_drop_groups_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_mob_destroy_drop_groups_post[hIndex].func;
+			postHookFunc();
+		}
+	}
+	return;
+}
 bool HP_mob_skill_db_libconfig(const char *filename, bool ignore_missing) {
 	int hIndex = 0;
 	bool retVal___ = false;
@@ -55341,14 +56969,14 @@ int HP_npc_unload_dup_sub(struct npc_data *nd, va_list args) {
 	}
 	return retVal___;
 }
-void HP_npc_unload_duplicates(struct npc_data *nd) {
+void HP_npc_unload_duplicates(struct npc_data *nd, bool unload_mobs) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_npc_unload_duplicates_pre > 0) {
-		void (*preHookFunc) (struct npc_data **nd);
+		void (*preHookFunc) (struct npc_data **nd, bool *unload_mobs);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_unload_duplicates_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_npc_unload_duplicates_pre[hIndex].func;
-			preHookFunc(&nd);
+			preHookFunc(&nd, &unload_mobs);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -55356,26 +56984,59 @@ void HP_npc_unload_duplicates(struct npc_data *nd) {
 		}
 	}
 	{
-		HPMHooks.source.npc.unload_duplicates(nd);
+		HPMHooks.source.npc.unload_duplicates(nd, unload_mobs);
 	}
 	if (HPMHooks.count.HP_npc_unload_duplicates_post > 0) {
-		void (*postHookFunc) (struct npc_data *nd);
+		void (*postHookFunc) (struct npc_data *nd, bool unload_mobs);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_unload_duplicates_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_npc_unload_duplicates_post[hIndex].func;
-			postHookFunc(nd);
+			postHookFunc(nd, unload_mobs);
 		}
 	}
 	return;
 }
-int HP_npc_unload(struct npc_data *nd, bool single) {
+int HP_npc_unload_mob(struct mob_data *md, va_list args) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_npc_unload_mob_pre > 0) {
+		int (*preHookFunc) (struct mob_data **md, va_list args);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_unload_mob_pre; hIndex++) {
+			va_list args___copy; va_copy(args___copy, args);
+			preHookFunc = HPMHooks.list.HP_npc_unload_mob_pre[hIndex].func;
+			retVal___ = preHookFunc(&md, args___copy);
+			va_end(args___copy);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		va_list args___copy; va_copy(args___copy, args);
+		retVal___ = HPMHooks.source.npc.unload_mob(md, args___copy);
+		va_end(args___copy);
+	}
+	if (HPMHooks.count.HP_npc_unload_mob_post > 0) {
+		int (*postHookFunc) (int retVal___, struct mob_data *md, va_list args);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_unload_mob_post; hIndex++) {
+			va_list args___copy; va_copy(args___copy, args);
+			postHookFunc = HPMHooks.list.HP_npc_unload_mob_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, md, args___copy);
+			va_end(args___copy);
+		}
+	}
+	return retVal___;
+}
+int HP_npc_unload(struct npc_data *nd, bool single, bool unload_mobs) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_npc_unload_pre > 0) {
-		int (*preHookFunc) (struct npc_data **nd, bool *single);
+		int (*preHookFunc) (struct npc_data **nd, bool *single, bool *unload_mobs);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_unload_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_npc_unload_pre[hIndex].func;
-			retVal___ = preHookFunc(&nd, &single);
+			retVal___ = preHookFunc(&nd, &single, &unload_mobs);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -55383,13 +57044,13 @@ int HP_npc_unload(struct npc_data *nd, bool single) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.npc.unload(nd, single);
+		retVal___ = HPMHooks.source.npc.unload(nd, single, unload_mobs);
 	}
 	if (HPMHooks.count.HP_npc_unload_post > 0) {
-		int (*postHookFunc) (int retVal___, struct npc_data *nd, bool single);
+		int (*postHookFunc) (int retVal___, struct npc_data *nd, bool single, bool unload_mobs);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_unload_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_npc_unload_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, nd, single);
+			retVal___ = postHookFunc(retVal___, nd, single, unload_mobs);
 		}
 	}
 	return retVal___;
@@ -55605,11 +57266,11 @@ bool HP_npc_viewisid(const char *viewid) {
 	}
 	return retVal___;
 }
-struct npc_data* HP_npc_create_npc(enum npc_subtype subtype, int m, int x, int y, uint8 dir, int class_) {
+struct npc_data* HP_npc_create_npc(enum npc_subtype subtype, int m, int x, int y, enum unit_dir dir, int class_) {
 	int hIndex = 0;
 	struct npc_data* retVal___ = NULL;
 	if (HPMHooks.count.HP_npc_create_npc_pre > 0) {
-		struct npc_data* (*preHookFunc) (enum npc_subtype *subtype, int *m, int *x, int *y, uint8 *dir, int *class_);
+		struct npc_data* (*preHookFunc) (enum npc_subtype *subtype, int *m, int *x, int *y, enum unit_dir *dir, int *class_);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_create_npc_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_npc_create_npc_pre[hIndex].func;
@@ -55624,7 +57285,7 @@ struct npc_data* HP_npc_create_npc(enum npc_subtype subtype, int m, int x, int y
 		retVal___ = HPMHooks.source.npc.create_npc(subtype, m, x, y, dir, class_);
 	}
 	if (HPMHooks.count.HP_npc_create_npc_post > 0) {
-		struct npc_data* (*postHookFunc) (struct npc_data* retVal___, enum npc_subtype subtype, int m, int x, int y, uint8 dir, int class_);
+		struct npc_data* (*postHookFunc) (struct npc_data* retVal___, enum npc_subtype subtype, int m, int x, int y, enum unit_dir dir, int class_);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_create_npc_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_npc_create_npc_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, subtype, m, x, y, dir, class_);
@@ -56504,15 +58165,15 @@ int HP_npc_reload(void) {
 	}
 	return retVal___;
 }
-bool HP_npc_unloadfile(const char *filepath) {
+bool HP_npc_unloadfile(const char *filepath, bool unload_mobs) {
 	int hIndex = 0;
 	bool retVal___ = false;
 	if (HPMHooks.count.HP_npc_unloadfile_pre > 0) {
-		bool (*preHookFunc) (const char **filepath);
+		bool (*preHookFunc) (const char **filepath, bool *unload_mobs);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_unloadfile_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_npc_unloadfile_pre[hIndex].func;
-			retVal___ = preHookFunc(&filepath);
+			retVal___ = preHookFunc(&filepath, &unload_mobs);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -56520,13 +58181,13 @@ bool HP_npc_unloadfile(const char *filepath) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.npc.unloadfile(filepath);
+		retVal___ = HPMHooks.source.npc.unloadfile(filepath, unload_mobs);
 	}
 	if (HPMHooks.count.HP_npc_unloadfile_post > 0) {
-		bool (*postHookFunc) (bool retVal___, const char *filepath);
+		bool (*postHookFunc) (bool retVal___, const char *filepath, bool unload_mobs);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_unloadfile_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_npc_unloadfile_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, filepath);
+			retVal___ = postHookFunc(retVal___, filepath, unload_mobs);
 		}
 	}
 	return retVal___;
@@ -56688,11 +58349,11 @@ void HP_npc_trader_update(int master) {
 	}
 	return;
 }
-int HP_npc_market_buylist(struct map_session_data *sd, struct itemlist *item_list) {
+enum market_buy_result HP_npc_market_buylist(struct map_session_data *sd, struct itemlist *item_list) {
 	int hIndex = 0;
-	int retVal___ = 0;
+	enum market_buy_result retVal___ = MARKET_BUY_RESULT_ERROR;
 	if (HPMHooks.count.HP_npc_market_buylist_pre > 0) {
-		int (*preHookFunc) (struct map_session_data **sd, struct itemlist **item_list);
+		enum market_buy_result (*preHookFunc) (struct map_session_data **sd, struct itemlist **item_list);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_buylist_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_npc_market_buylist_pre[hIndex].func;
@@ -56707,7 +58368,7 @@ int HP_npc_market_buylist(struct map_session_data *sd, struct itemlist *item_lis
 		retVal___ = HPMHooks.source.npc.market_buylist(sd, item_list);
 	}
 	if (HPMHooks.count.HP_npc_market_buylist_post > 0) {
-		int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct itemlist *item_list);
+		enum market_buy_result (*postHookFunc) (enum market_buy_result retVal___, struct map_session_data *sd, struct itemlist *item_list);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_buylist_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_npc_market_buylist_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, sd, item_list);
@@ -56742,6 +58403,33 @@ int HP_npc_barter_buylist(struct map_session_data *sd, struct barteritemlist *it
 	}
 	return retVal___;
 }
+int HP_npc_expanded_barter_buylist(struct map_session_data *sd, struct barteritemlist *item_list) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_npc_expanded_barter_buylist_pre > 0) {
+		int (*preHookFunc) (struct map_session_data **sd, struct barteritemlist **item_list);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_expanded_barter_buylist_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_npc_expanded_barter_buylist_pre[hIndex].func;
+			retVal___ = preHookFunc(&sd, &item_list);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.npc.expanded_barter_buylist(sd, item_list);
+	}
+	if (HPMHooks.count.HP_npc_expanded_barter_buylist_post > 0) {
+		int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct barteritemlist *item_list);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_expanded_barter_buylist_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_npc_expanded_barter_buylist_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sd, item_list);
+		}
+	}
+	return retVal___;
+}
 bool HP_npc_trader_open(struct map_session_data *sd, struct npc_data *nd) {
 	int hIndex = 0;
 	bool retVal___ = false;
@@ -56977,6 +58665,110 @@ void HP_npc_barter_delfromsql_sub(const char *npcname, int itemId, int itemId2,
 	}
 	return;
 }
+void HP_npc_expanded_barter_fromsql(void) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_npc_expanded_barter_fromsql_pre > 0) {
+		void (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_expanded_barter_fromsql_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_npc_expanded_barter_fromsql_pre[hIndex].func;
+			preHookFunc();
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.npc.expanded_barter_fromsql();
+	}
+	if (HPMHooks.count.HP_npc_expanded_barter_fromsql_post > 0) {
+		void (*postHookFunc) (void);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_expanded_barter_fromsql_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_npc_expanded_barter_fromsql_post[hIndex].func;
+			postHookFunc();
+		}
+	}
+	return;
+}
+void HP_npc_expanded_barter_tosql(struct npc_data *nd, int index) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_npc_expanded_barter_tosql_pre > 0) {
+		void (*preHookFunc) (struct npc_data **nd, int *index);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_expanded_barter_tosql_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_npc_expanded_barter_tosql_pre[hIndex].func;
+			preHookFunc(&nd, &index);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.npc.expanded_barter_tosql(nd, index);
+	}
+	if (HPMHooks.count.HP_npc_expanded_barter_tosql_post > 0) {
+		void (*postHookFunc) (struct npc_data *nd, int index);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_expanded_barter_tosql_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_npc_expanded_barter_tosql_post[hIndex].func;
+			postHookFunc(nd, index);
+		}
+	}
+	return;
+}
+void HP_npc_expanded_barter_delfromsql(struct npc_data *nd, int index) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_npc_expanded_barter_delfromsql_pre > 0) {
+		void (*preHookFunc) (struct npc_data **nd, int *index);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_expanded_barter_delfromsql_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_npc_expanded_barter_delfromsql_pre[hIndex].func;
+			preHookFunc(&nd, &index);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.npc.expanded_barter_delfromsql(nd, index);
+	}
+	if (HPMHooks.count.HP_npc_expanded_barter_delfromsql_post > 0) {
+		void (*postHookFunc) (struct npc_data *nd, int index);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_expanded_barter_delfromsql_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_npc_expanded_barter_delfromsql_post[hIndex].func;
+			postHookFunc(nd, index);
+		}
+	}
+	return;
+}
+void HP_npc_expanded_barter_delfromsql_sub(const char *npcname, int itemId, int zeny, int currencyCount, struct npc_barter_currency *currency) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_npc_expanded_barter_delfromsql_sub_pre > 0) {
+		void (*preHookFunc) (const char **npcname, int *itemId, int *zeny, int *currencyCount, struct npc_barter_currency **currency);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_expanded_barter_delfromsql_sub_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_npc_expanded_barter_delfromsql_sub_pre[hIndex].func;
+			preHookFunc(&npcname, &itemId, &zeny, &currencyCount, &currency);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.npc.expanded_barter_delfromsql_sub(npcname, itemId, zeny, currencyCount, currency);
+	}
+	if (HPMHooks.count.HP_npc_expanded_barter_delfromsql_sub_post > 0) {
+		void (*postHookFunc) (const char *npcname, int itemId, int zeny, int currencyCount, struct npc_barter_currency *currency);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_expanded_barter_delfromsql_sub_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_npc_expanded_barter_delfromsql_sub_post[hIndex].func;
+			postHookFunc(npcname, itemId, zeny, currencyCount, currency);
+		}
+	}
+	return;
+}
 bool HP_npc_db_checkid(const int id) {
 	int hIndex = 0;
 	bool retVal___ = false;
@@ -57030,6 +58822,32 @@ void HP_npc_refresh(struct npc_data *nd) {
 	}
 	return;
 }
+void HP_npc_questinfo_clear(struct npc_data *nd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_npc_questinfo_clear_pre > 0) {
+		void (*preHookFunc) (struct npc_data **nd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_questinfo_clear_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_npc_questinfo_clear_pre[hIndex].func;
+			preHookFunc(&nd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.npc.questinfo_clear(nd);
+	}
+	if (HPMHooks.count.HP_npc_questinfo_clear_post > 0) {
+		void (*postHookFunc) (struct npc_data *nd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_npc_questinfo_clear_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_npc_questinfo_clear_post[hIndex].func;
+			postHookFunc(nd);
+		}
+	}
+	return;
+}
 int HP_npc_secure_timeout_timer(int tid, int64 tick, int id, intptr_t data) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -57058,6 +58876,58 @@ int HP_npc_secure_timeout_timer(int tid, int64 tick, int id, intptr_t data) {
 	return retVal___;
 }
 /* nullpo_interface */
+void HP_nullpo_init(void) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_nullpo_init_pre > 0) {
+		void (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_init_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_nullpo_init_pre[hIndex].func;
+			preHookFunc();
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.nullpo.init();
+	}
+	if (HPMHooks.count.HP_nullpo_init_post > 0) {
+		void (*postHookFunc) (void);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_init_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_nullpo_init_post[hIndex].func;
+			postHookFunc();
+		}
+	}
+	return;
+}
+void HP_nullpo_final(void) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_nullpo_final_pre > 0) {
+		void (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_final_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_nullpo_final_pre[hIndex].func;
+			preHookFunc();
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.nullpo.final();
+	}
+	if (HPMHooks.count.HP_nullpo_final_post > 0) {
+		void (*postHookFunc) (void);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_nullpo_final_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_nullpo_final_post[hIndex].func;
+			postHookFunc();
+		}
+	}
+	return;
+}
 void HP_nullpo_assert_report(const char *file, int line, const char *func, const char *targetname, const char *title) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_nullpo_assert_report_pre > 0) {
@@ -57912,33 +59782,6 @@ int HP_party_send_message(struct map_session_data *sd, const char *mes) {
 	}
 	return retVal___;
 }
-int HP_party_recv_message(int party_id, int account_id, const char *mes, int len) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_party_recv_message_pre > 0) {
-		int (*preHookFunc) (int *party_id, int *account_id, const char **mes, int *len);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_party_recv_message_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_party_recv_message_pre[hIndex].func;
-			retVal___ = preHookFunc(&party_id, &account_id, &mes, &len);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.party.recv_message(party_id, account_id, mes, len);
-	}
-	if (HPMHooks.count.HP_party_recv_message_post > 0) {
-		int (*postHookFunc) (int retVal___, int party_id, int account_id, const char *mes, int len);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_party_recv_message_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_party_recv_message_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, party_id, account_id, mes, len);
-		}
-	}
-	return retVal___;
-}
 int HP_party_skill_check(struct map_session_data *sd, int party_id, uint16 skill_id, uint16 skill_lv) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -60433,11 +62276,11 @@ int HP_pc_updateweightstatus(struct map_session_data *sd) {
 	}
 	return retVal___;
 }
-int HP_pc_addautobonus(struct s_autobonus *bonus, char max, const char *bonus_script, short rate, unsigned int dur, short atk_type, const char *o_script, unsigned short pos, bool onskill) {
+int HP_pc_addautobonus(struct s_autobonus *bonus, char max, const char *bonus_script, short rate, unsigned int dur, short atk_type, const char *o_script, unsigned int pos, bool onskill) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_pc_addautobonus_pre > 0) {
-		int (*preHookFunc) (struct s_autobonus **bonus, char *max, const char **bonus_script, short *rate, unsigned int *dur, short *atk_type, const char **o_script, unsigned short *pos, bool *onskill);
+		int (*preHookFunc) (struct s_autobonus **bonus, char *max, const char **bonus_script, short *rate, unsigned int *dur, short *atk_type, const char **o_script, unsigned int *pos, bool *onskill);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_addautobonus_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_pc_addautobonus_pre[hIndex].func;
@@ -60452,7 +62295,7 @@ int HP_pc_addautobonus(struct s_autobonus *bonus, char max, const char *bonus_sc
 		retVal___ = HPMHooks.source.pc.addautobonus(bonus, max, bonus_script, rate, dur, atk_type, o_script, pos, onskill);
 	}
 	if (HPMHooks.count.HP_pc_addautobonus_post > 0) {
-		int (*postHookFunc) (int retVal___, struct s_autobonus *bonus, char max, const char *bonus_script, short rate, unsigned int dur, short atk_type, const char *o_script, unsigned short pos, bool onskill);
+		int (*postHookFunc) (int retVal___, struct s_autobonus *bonus, char max, const char *bonus_script, short rate, unsigned int dur, short atk_type, const char *o_script, unsigned int pos, bool onskill);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_addautobonus_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_pc_addautobonus_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bonus, max, bonus_script, rate, dur, atk_type, o_script, pos, onskill);
@@ -61726,6 +63569,33 @@ int HP_pc_useitem(struct map_session_data *sd, int n) {
 	}
 	return retVal___;
 }
+int HP_pc_autocast_clear(struct map_session_data *sd) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_pc_autocast_clear_pre > 0) {
+		int (*preHookFunc) (struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_autocast_clear_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_pc_autocast_clear_pre[hIndex].func;
+			retVal___ = preHookFunc(&sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.pc.autocast_clear(sd);
+	}
+	if (HPMHooks.count.HP_pc_autocast_clear_post > 0) {
+		int (*postHookFunc) (int retVal___, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_autocast_clear_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_pc_autocast_clear_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sd);
+		}
+	}
+	return retVal___;
+}
 int HP_pc_skillatk_bonus(struct map_session_data *sd, uint16 skill_id) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -61993,6 +63863,58 @@ int HP_pc_jobchange(struct map_session_data *sd, int class, int upper) {
 	}
 	return retVal___;
 }
+void HP_pc_hide(struct map_session_data *sd, bool show_msg) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_pc_hide_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, bool *show_msg);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_hide_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_pc_hide_pre[hIndex].func;
+			preHookFunc(&sd, &show_msg);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.pc.hide(sd, show_msg);
+	}
+	if (HPMHooks.count.HP_pc_hide_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, bool show_msg);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_hide_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_pc_hide_post[hIndex].func;
+			postHookFunc(sd, show_msg);
+		}
+	}
+	return;
+}
+void HP_pc_unhide(struct map_session_data *sd, bool show_msg) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_pc_unhide_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, bool *show_msg);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_unhide_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_pc_unhide_pre[hIndex].func;
+			preHookFunc(&sd, &show_msg);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.pc.unhide(sd, show_msg);
+	}
+	if (HPMHooks.count.HP_pc_unhide_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, bool show_msg);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_unhide_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_pc_unhide_post[hIndex].func;
+			postHookFunc(sd, show_msg);
+		}
+	}
+	return;
+}
 int HP_pc_setoption(struct map_session_data *sd, int type) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -62099,14 +64021,14 @@ void HP_pc_setridingpeco(struct map_session_data *sd, bool flag) {
 	}
 	return;
 }
-void HP_pc_setmadogear(struct map_session_data *sd, bool flag) {
+void HP_pc_setmadogear(struct map_session_data *sd, bool flag, enum mado_type mtype) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_pc_setmadogear_pre > 0) {
-		void (*preHookFunc) (struct map_session_data **sd, bool *flag);
+		void (*preHookFunc) (struct map_session_data **sd, bool *flag, enum mado_type *mtype);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_setmadogear_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_pc_setmadogear_pre[hIndex].func;
-			preHookFunc(&sd, &flag);
+			preHookFunc(&sd, &flag, &mtype);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -62114,13 +64036,13 @@ void HP_pc_setmadogear(struct map_session_data *sd, bool flag) {
 		}
 	}
 	{
-		HPMHooks.source.pc.setmadogear(sd, flag);
+		HPMHooks.source.pc.setmadogear(sd, flag, mtype);
 	}
 	if (HPMHooks.count.HP_pc_setmadogear_post > 0) {
-		void (*postHookFunc) (struct map_session_data *sd, bool flag);
+		void (*postHookFunc) (struct map_session_data *sd, bool flag, enum mado_type mtype);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_setmadogear_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_pc_setmadogear_post[hIndex].func;
-			postHookFunc(sd, flag);
+			postHookFunc(sd, flag, mtype);
 		}
 	}
 	return;
@@ -63731,10 +65653,10 @@ int HP_pc_load_combo(struct map_session_data *sd) {
 	}
 	return retVal___;
 }
-void HP_pc_add_charm(struct map_session_data *sd, int interval, int max, int type) {
+void HP_pc_add_charm(struct map_session_data *sd, int interval, int max, enum spirit_charm_types type) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_pc_add_charm_pre > 0) {
-		void (*preHookFunc) (struct map_session_data **sd, int *interval, int *max, int *type);
+		void (*preHookFunc) (struct map_session_data **sd, int *interval, int *max, enum spirit_charm_types *type);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_add_charm_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_pc_add_charm_pre[hIndex].func;
@@ -63749,7 +65671,7 @@ void HP_pc_add_charm(struct map_session_data *sd, int interval, int max, int typ
 		HPMHooks.source.pc.add_charm(sd, interval, max, type);
 	}
 	if (HPMHooks.count.HP_pc_add_charm_post > 0) {
-		void (*postHookFunc) (struct map_session_data *sd, int interval, int max, int type);
+		void (*postHookFunc) (struct map_session_data *sd, int interval, int max, enum spirit_charm_types type);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_add_charm_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_pc_add_charm_post[hIndex].func;
 			postHookFunc(sd, interval, max, type);
@@ -63757,10 +65679,10 @@ void HP_pc_add_charm(struct map_session_data *sd, int interval, int max, int typ
 	}
 	return;
 }
-void HP_pc_del_charm(struct map_session_data *sd, int count, int type) {
+void HP_pc_del_charm(struct map_session_data *sd, int count, enum spirit_charm_types type) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_pc_del_charm_pre > 0) {
-		void (*preHookFunc) (struct map_session_data **sd, int *count, int *type);
+		void (*preHookFunc) (struct map_session_data **sd, int *count, enum spirit_charm_types *type);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_del_charm_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_pc_del_charm_pre[hIndex].func;
@@ -63775,7 +65697,7 @@ void HP_pc_del_charm(struct map_session_data *sd, int count, int type) {
 		HPMHooks.source.pc.del_charm(sd, count, type);
 	}
 	if (HPMHooks.count.HP_pc_del_charm_post > 0) {
-		void (*postHookFunc) (struct map_session_data *sd, int count, int type);
+		void (*postHookFunc) (struct map_session_data *sd, int count, enum spirit_charm_types type);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_del_charm_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_pc_del_charm_post[hIndex].func;
 			postHookFunc(sd, count, type);
@@ -65277,6 +67199,33 @@ int HP_pc_have_magnifier(struct map_session_data *sd) {
 	}
 	return retVal___;
 }
+int HP_pc_have_item_chain(struct map_session_data *sd, enum e_chain_cache chain_cache_id) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_pc_have_item_chain_pre > 0) {
+		int (*preHookFunc) (struct map_session_data **sd, enum e_chain_cache *chain_cache_id);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_have_item_chain_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_pc_have_item_chain_pre[hIndex].func;
+			retVal___ = preHookFunc(&sd, &chain_cache_id);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.pc.have_item_chain(sd, chain_cache_id);
+	}
+	if (HPMHooks.count.HP_pc_have_item_chain_post > 0) {
+		int (*postHookFunc) (int retVal___, struct map_session_data *sd, enum e_chain_cache chain_cache_id);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_have_item_chain_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_pc_have_item_chain_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sd, chain_cache_id);
+		}
+	}
+	return retVal___;
+}
 bool HP_pc_process_chat_message(struct map_session_data *sd, const char *message) {
 	int hIndex = 0;
 	bool retVal___ = false;
@@ -65304,6 +67253,66 @@ bool HP_pc_process_chat_message(struct map_session_data *sd, const char *message
 	}
 	return retVal___;
 }
+int HP_pc_wis_message_to_gm(const char *sender_name, int permission, const char *message) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_pc_wis_message_to_gm_pre > 0) {
+		int (*preHookFunc) (const char **sender_name, int *permission, const char **message);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_wis_message_to_gm_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_pc_wis_message_to_gm_pre[hIndex].func;
+			retVal___ = preHookFunc(&sender_name, &permission, &message);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.pc.wis_message_to_gm(sender_name, permission, message);
+	}
+	if (HPMHooks.count.HP_pc_wis_message_to_gm_post > 0) {
+		int (*postHookFunc) (int retVal___, const char *sender_name, int permission, const char *message);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_wis_message_to_gm_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_pc_wis_message_to_gm_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sender_name, permission, message);
+		}
+	}
+	return retVal___;
+}
+int HP_pc_wis_message_to_gm_sub(struct map_session_data *sd, va_list va) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_pc_wis_message_to_gm_sub_pre > 0) {
+		int (*preHookFunc) (struct map_session_data **sd, va_list va);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_wis_message_to_gm_sub_pre; hIndex++) {
+			va_list va___copy; va_copy(va___copy, va);
+			preHookFunc = HPMHooks.list.HP_pc_wis_message_to_gm_sub_pre[hIndex].func;
+			retVal___ = preHookFunc(&sd, va___copy);
+			va_end(va___copy);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		va_list va___copy; va_copy(va___copy, va);
+		retVal___ = HPMHooks.source.pc.wis_message_to_gm_sub(sd, va___copy);
+		va_end(va___copy);
+	}
+	if (HPMHooks.count.HP_pc_wis_message_to_gm_sub_post > 0) {
+		int (*postHookFunc) (int retVal___, struct map_session_data *sd, va_list va);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_wis_message_to_gm_sub_post; hIndex++) {
+			va_list va___copy; va_copy(va___copy, va);
+			postHookFunc = HPMHooks.list.HP_pc_wis_message_to_gm_sub_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sd, va___copy);
+			va_end(va___copy);
+		}
+	}
+	return retVal___;
+}
 void HP_pc_check_supernovice_call(struct map_session_data *sd, const char *message) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_pc_check_supernovice_call_pre > 0) {
@@ -65438,6 +67447,33 @@ bool HP_pc_expandInventory(struct map_session_data *sd, int adjustSize) {
 	}
 	return retVal___;
 }
+bool HP_pc_auto_exp_insurance(struct map_session_data *sd) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_pc_auto_exp_insurance_pre > 0) {
+		bool (*preHookFunc) (struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_auto_exp_insurance_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_pc_auto_exp_insurance_pre[hIndex].func;
+			retVal___ = preHookFunc(&sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.pc.auto_exp_insurance(sd);
+	}
+	if (HPMHooks.count.HP_pc_auto_exp_insurance_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_auto_exp_insurance_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_pc_auto_exp_insurance_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sd);
+		}
+	}
+	return retVal___;
+}
 /* pcre_interface */
 pcre* HP_libpcre_compile(const char *pattern, int options, const char **errptr, int *erroffset, const unsigned char *tableptr) {
 	int hIndex = 0;
@@ -65735,6 +67771,32 @@ int HP_pet_hungry_val(struct pet_data *pd) {
 	}
 	return retVal___;
 }
+void HP_pet_set_hunger(struct pet_data *pd, int value) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_pet_set_hunger_pre > 0) {
+		void (*preHookFunc) (struct pet_data **pd, int *value);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pet_set_hunger_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_pet_set_hunger_pre[hIndex].func;
+			preHookFunc(&pd, &value);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.pet.set_hunger(pd, value);
+	}
+	if (HPMHooks.count.HP_pet_set_hunger_post > 0) {
+		void (*postHookFunc) (struct pet_data *pd, int value);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pet_set_hunger_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_pet_set_hunger_post[hIndex].func;
+			postHookFunc(pd, value);
+		}
+	}
+	return;
+}
 void HP_pet_set_intimate(struct pet_data *pd, int value) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_pet_set_intimate_pre > 0) {
@@ -67553,14 +69615,42 @@ bool HP_quest_questinfo_validate_mercenary_class(struct map_session_data *sd, st
 	}
 	return retVal___;
 }
-void HP_quest_questinfo_vector_clear(int m) {
+/* refine_interface */
+int HP_refine_init(bool minimal) {
 	int hIndex = 0;
-	if (HPMHooks.count.HP_quest_questinfo_vector_clear_pre > 0) {
-		void (*preHookFunc) (int *m);
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_refine_init_pre > 0) {
+		int (*preHookFunc) (bool *minimal);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_quest_questinfo_vector_clear_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_quest_questinfo_vector_clear_pre[hIndex].func;
-			preHookFunc(&m);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_refine_init_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_refine_init_pre[hIndex].func;
+			retVal___ = preHookFunc(&minimal);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.refine.init(minimal);
+	}
+	if (HPMHooks.count.HP_refine_init_post > 0) {
+		int (*postHookFunc) (int retVal___, bool minimal);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_refine_init_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_refine_init_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, minimal);
+		}
+	}
+	return retVal___;
+}
+void HP_refine_final(void) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_refine_final_pre > 0) {
+		void (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_refine_final_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_refine_final_pre[hIndex].func;
+			preHookFunc();
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -67568,17 +69658,367 @@ void HP_quest_questinfo_vector_clear(int m) {
 		}
 	}
 	{
-		HPMHooks.source.quest.questinfo_vector_clear(m);
+		HPMHooks.source.refine.final();
 	}
-	if (HPMHooks.count.HP_quest_questinfo_vector_clear_post > 0) {
-		void (*postHookFunc) (int m);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_quest_questinfo_vector_clear_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_quest_questinfo_vector_clear_post[hIndex].func;
-			postHookFunc(m);
+	if (HPMHooks.count.HP_refine_final_post > 0) {
+		void (*postHookFunc) (void);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_refine_final_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_refine_final_post[hIndex].func;
+			postHookFunc();
 		}
 	}
 	return;
 }
+int HP_refine_get_refine_chance(enum refine_type wlv, int refine_level, enum refine_chance_type type) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_refine_get_refine_chance_pre > 0) {
+		int (*preHookFunc) (enum refine_type *wlv, int *refine_level, enum refine_chance_type *type);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_refine_get_refine_chance_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_refine_get_refine_chance_pre[hIndex].func;
+			retVal___ = preHookFunc(&wlv, &refine_level, &type);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.refine.get_refine_chance(wlv, refine_level, type);
+	}
+	if (HPMHooks.count.HP_refine_get_refine_chance_post > 0) {
+		int (*postHookFunc) (int retVal___, enum refine_type wlv, int refine_level, enum refine_chance_type type);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_refine_get_refine_chance_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_refine_get_refine_chance_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, wlv, refine_level, type);
+		}
+	}
+	return retVal___;
+}
+int HP_refine_get_bonus(enum refine_type equipment_type, int refine_level) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_refine_get_bonus_pre > 0) {
+		int (*preHookFunc) (enum refine_type *equipment_type, int *refine_level);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_refine_get_bonus_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_refine_get_bonus_pre[hIndex].func;
+			retVal___ = preHookFunc(&equipment_type, &refine_level);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.refine.get_bonus(equipment_type, refine_level);
+	}
+	if (HPMHooks.count.HP_refine_get_bonus_post > 0) {
+		int (*postHookFunc) (int retVal___, enum refine_type equipment_type, int refine_level);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_refine_get_bonus_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_refine_get_bonus_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, equipment_type, refine_level);
+		}
+	}
+	return retVal___;
+}
+int HP_refine_get_randombonus_max(enum refine_type equipment_type, int refine_level) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_refine_get_randombonus_max_pre > 0) {
+		int (*preHookFunc) (enum refine_type *equipment_type, int *refine_level);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_refine_get_randombonus_max_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_refine_get_randombonus_max_pre[hIndex].func;
+			retVal___ = preHookFunc(&equipment_type, &refine_level);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.refine.get_randombonus_max(equipment_type, refine_level);
+	}
+	if (HPMHooks.count.HP_refine_get_randombonus_max_post > 0) {
+		int (*postHookFunc) (int retVal___, enum refine_type equipment_type, int refine_level);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_refine_get_randombonus_max_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_refine_get_randombonus_max_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, equipment_type, refine_level);
+		}
+	}
+	return retVal___;
+}
+void HP_refine_refinery_add_item(struct map_session_data *sd, int item_index) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_refine_refinery_add_item_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, int *item_index);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_refine_refinery_add_item_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_refine_refinery_add_item_pre[hIndex].func;
+			preHookFunc(&sd, &item_index);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.refine.refinery_add_item(sd, item_index);
+	}
+	if (HPMHooks.count.HP_refine_refinery_add_item_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, int item_index);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_refine_refinery_add_item_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_refine_refinery_add_item_post[hIndex].func;
+			postHookFunc(sd, item_index);
+		}
+	}
+	return;
+}
+void HP_refine_refinery_refine_request(struct map_session_data *sd, int item_index, int material_id, bool use_blacksmith_blessing) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_refine_refinery_refine_request_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, int *item_index, int *material_id, bool *use_blacksmith_blessing);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_refine_refinery_refine_request_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_refine_refinery_refine_request_pre[hIndex].func;
+			preHookFunc(&sd, &item_index, &material_id, &use_blacksmith_blessing);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.refine.refinery_refine_request(sd, item_index, material_id, use_blacksmith_blessing);
+	}
+	if (HPMHooks.count.HP_refine_refinery_refine_request_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, int item_index, int material_id, bool use_blacksmith_blessing);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_refine_refinery_refine_request_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_refine_refinery_refine_request_post[hIndex].func;
+			postHookFunc(sd, item_index, material_id, use_blacksmith_blessing);
+		}
+	}
+	return;
+}
+/* refine_interface_private */
+int HP_PRIV__refine_readdb_refine_libconfig_sub(struct config_setting_t *r, const char *name, const char *source) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_PRIV__refine_readdb_refine_libconfig_sub_pre > 0) {
+		int (*preHookFunc) (struct config_setting_t **r, const char **name, const char **source);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__refine_readdb_refine_libconfig_sub_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_PRIV__refine_readdb_refine_libconfig_sub_pre[hIndex].func;
+			retVal___ = preHookFunc(&r, &name, &source);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.PRIV__refine.readdb_refine_libconfig_sub(r, name, source);
+	}
+	if (HPMHooks.count.HP_PRIV__refine_readdb_refine_libconfig_sub_post > 0) {
+		int (*postHookFunc) (int retVal___, struct config_setting_t *r, const char *name, const char *source);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__refine_readdb_refine_libconfig_sub_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_PRIV__refine_readdb_refine_libconfig_sub_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, r, name, source);
+		}
+	}
+	return retVal___;
+}
+int HP_PRIV__refine_readdb_refine_libconfig(const char *filename) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_PRIV__refine_readdb_refine_libconfig_pre > 0) {
+		int (*preHookFunc) (const char **filename);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__refine_readdb_refine_libconfig_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_PRIV__refine_readdb_refine_libconfig_pre[hIndex].func;
+			retVal___ = preHookFunc(&filename);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.PRIV__refine.readdb_refine_libconfig(filename);
+	}
+	if (HPMHooks.count.HP_PRIV__refine_readdb_refine_libconfig_post > 0) {
+		int (*postHookFunc) (int retVal___, const char *filename);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__refine_readdb_refine_libconfig_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_PRIV__refine_readdb_refine_libconfig_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, filename);
+		}
+	}
+	return retVal___;
+}
+bool HP_PRIV__refine_announce_behavior_string2enum(const char *str, unsigned int *result) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_PRIV__refine_announce_behavior_string2enum_pre > 0) {
+		bool (*preHookFunc) (const char **str, unsigned int **result);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__refine_announce_behavior_string2enum_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_PRIV__refine_announce_behavior_string2enum_pre[hIndex].func;
+			retVal___ = preHookFunc(&str, &result);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.PRIV__refine.announce_behavior_string2enum(str, result);
+	}
+	if (HPMHooks.count.HP_PRIV__refine_announce_behavior_string2enum_post > 0) {
+		bool (*postHookFunc) (bool retVal___, const char *str, unsigned int *result);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__refine_announce_behavior_string2enum_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_PRIV__refine_announce_behavior_string2enum_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, str, result);
+		}
+	}
+	return retVal___;
+}
+bool HP_PRIV__refine_failure_behavior_string2enum(const char *str, enum refine_ui_failure_behavior *result) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_PRIV__refine_failure_behavior_string2enum_pre > 0) {
+		bool (*preHookFunc) (const char **str, enum refine_ui_failure_behavior **result);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__refine_failure_behavior_string2enum_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_PRIV__refine_failure_behavior_string2enum_pre[hIndex].func;
+			retVal___ = preHookFunc(&str, &result);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.PRIV__refine.failure_behavior_string2enum(str, result);
+	}
+	if (HPMHooks.count.HP_PRIV__refine_failure_behavior_string2enum_post > 0) {
+		bool (*postHookFunc) (bool retVal___, const char *str, enum refine_ui_failure_behavior *result);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__refine_failure_behavior_string2enum_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_PRIV__refine_failure_behavior_string2enum_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, str, result);
+		}
+	}
+	return retVal___;
+}
+bool HP_PRIV__refine_readdb_refinery_ui_settings_items(const struct config_setting_t *elem, struct s_refine_requirement *req, const char *name, const char *source) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_PRIV__refine_readdb_refinery_ui_settings_items_pre > 0) {
+		bool (*preHookFunc) (const struct config_setting_t **elem, struct s_refine_requirement **req, const char **name, const char **source);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__refine_readdb_refinery_ui_settings_items_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_PRIV__refine_readdb_refinery_ui_settings_items_pre[hIndex].func;
+			retVal___ = preHookFunc(&elem, &req, &name, &source);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.PRIV__refine.readdb_refinery_ui_settings_items(elem, req, name, source);
+	}
+	if (HPMHooks.count.HP_PRIV__refine_readdb_refinery_ui_settings_items_post > 0) {
+		bool (*postHookFunc) (bool retVal___, const struct config_setting_t *elem, struct s_refine_requirement *req, const char *name, const char *source);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__refine_readdb_refinery_ui_settings_items_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_PRIV__refine_readdb_refinery_ui_settings_items_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, elem, req, name, source);
+		}
+	}
+	return retVal___;
+}
+bool HP_PRIV__refine_readdb_refinery_ui_settings_sub(const struct config_setting_t *elem, int type, const char *name, const char *source) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_PRIV__refine_readdb_refinery_ui_settings_sub_pre > 0) {
+		bool (*preHookFunc) (const struct config_setting_t **elem, int *type, const char **name, const char **source);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__refine_readdb_refinery_ui_settings_sub_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_PRIV__refine_readdb_refinery_ui_settings_sub_pre[hIndex].func;
+			retVal___ = preHookFunc(&elem, &type, &name, &source);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.PRIV__refine.readdb_refinery_ui_settings_sub(elem, type, name, source);
+	}
+	if (HPMHooks.count.HP_PRIV__refine_readdb_refinery_ui_settings_sub_post > 0) {
+		bool (*postHookFunc) (bool retVal___, const struct config_setting_t *elem, int type, const char *name, const char *source);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__refine_readdb_refinery_ui_settings_sub_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_PRIV__refine_readdb_refinery_ui_settings_sub_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, elem, type, name, source);
+		}
+	}
+	return retVal___;
+}
+int HP_PRIV__refine_readdb_refinery_ui_settings(const struct config_setting_t *r, int type, const char *name, const char *source) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_PRIV__refine_readdb_refinery_ui_settings_pre > 0) {
+		int (*preHookFunc) (const struct config_setting_t **r, int *type, const char **name, const char **source);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__refine_readdb_refinery_ui_settings_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_PRIV__refine_readdb_refinery_ui_settings_pre[hIndex].func;
+			retVal___ = preHookFunc(&r, &type, &name, &source);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.PRIV__refine.readdb_refinery_ui_settings(r, type, name, source);
+	}
+	if (HPMHooks.count.HP_PRIV__refine_readdb_refinery_ui_settings_post > 0) {
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *r, int type, const char *name, const char *source);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__refine_readdb_refinery_ui_settings_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_PRIV__refine_readdb_refinery_ui_settings_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, r, type, name, source);
+		}
+	}
+	return retVal___;
+}
+bool HP_PRIV__refine_is_refinable(struct map_session_data *sd, int item_index) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_PRIV__refine_is_refinable_pre > 0) {
+		bool (*preHookFunc) (struct map_session_data **sd, int *item_index);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__refine_is_refinable_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_PRIV__refine_is_refinable_pre[hIndex].func;
+			retVal___ = preHookFunc(&sd, &item_index);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.PRIV__refine.is_refinable(sd, item_index);
+	}
+	if (HPMHooks.count.HP_PRIV__refine_is_refinable_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int item_index);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_PRIV__refine_is_refinable_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_PRIV__refine_is_refinable_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sd, item_index);
+		}
+	}
+	return retVal___;
+}
 /* rnd_interface */
 void HP_rnd_init(void) {
 	int hIndex = 0;
@@ -68239,6 +70679,58 @@ void HP_rodex_clean(struct map_session_data *sd, int8 flag) {
 	}
 	return;
 }
+void HP_rodex_getZenyAck(struct map_session_data *sd, int64 mail_id, int8 opentype, int64 zeny) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_rodex_getZenyAck_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, int64 *mail_id, int8 *opentype, int64 *zeny);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_rodex_getZenyAck_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_rodex_getZenyAck_pre[hIndex].func;
+			preHookFunc(&sd, &mail_id, &opentype, &zeny);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.rodex.getZenyAck(sd, mail_id, opentype, zeny);
+	}
+	if (HPMHooks.count.HP_rodex_getZenyAck_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, int64 mail_id, int8 opentype, int64 zeny);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_rodex_getZenyAck_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_rodex_getZenyAck_post[hIndex].func;
+			postHookFunc(sd, mail_id, opentype, zeny);
+		}
+	}
+	return;
+}
+void HP_rodex_getItemsAck(struct map_session_data *sd, int64 mail_id, int8 opentype, int count, const struct rodex_item *items) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_rodex_getItemsAck_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, int64 *mail_id, int8 *opentype, int *count, const struct rodex_item **items);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_rodex_getItemsAck_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_rodex_getItemsAck_pre[hIndex].func;
+			preHookFunc(&sd, &mail_id, &opentype, &count, &items);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.rodex.getItemsAck(sd, mail_id, opentype, count, items);
+	}
+	if (HPMHooks.count.HP_rodex_getItemsAck_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, int64 mail_id, int8 opentype, int count, const struct rodex_item *items);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_rodex_getItemsAck_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_rodex_getItemsAck_post[hIndex].func;
+			postHookFunc(sd, mail_id, opentype, count, items);
+		}
+	}
+	return;
+}
 /* script_interface */
 void HP_script_init(bool minimal) {
 	int hIndex = 0;
@@ -73020,15 +75512,42 @@ bool HP_script_load_translation_addstring(const char *file, uint8 lang_id, const
 	}
 	return retVal___;
 }
-int HP_script_load_translation(const char *file, uint8 lang_id) {
+int HP_script_load_translation_file(const char *file, uint8 lang_id) {
 	int hIndex = 0;
 	int retVal___ = 0;
-	if (HPMHooks.count.HP_script_load_translation_pre > 0) {
+	if (HPMHooks.count.HP_script_load_translation_file_pre > 0) {
 		int (*preHookFunc) (const char **file, uint8 *lang_id);
 		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_load_translation_file_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_script_load_translation_file_pre[hIndex].func;
+			retVal___ = preHookFunc(&file, &lang_id);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.script.load_translation_file(file, lang_id);
+	}
+	if (HPMHooks.count.HP_script_load_translation_file_post > 0) {
+		int (*postHookFunc) (int retVal___, const char *file, uint8 lang_id);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_load_translation_file_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_script_load_translation_file_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, file, lang_id);
+		}
+	}
+	return retVal___;
+}
+int HP_script_load_translation(const char *directory, uint8 lang_id) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_script_load_translation_pre > 0) {
+		int (*preHookFunc) (const char **directory, uint8 *lang_id);
+		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_load_translation_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_script_load_translation_pre[hIndex].func;
-			retVal___ = preHookFunc(&file, &lang_id);
+			retVal___ = preHookFunc(&directory, &lang_id);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -73036,13 +75555,13 @@ int HP_script_load_translation(const char *file, uint8 lang_id) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.script.load_translation(file, lang_id);
+		retVal___ = HPMHooks.source.script.load_translation(directory, lang_id);
 	}
 	if (HPMHooks.count.HP_script_load_translation_post > 0) {
-		int (*postHookFunc) (int retVal___, const char *file, uint8 lang_id);
+		int (*postHookFunc) (int retVal___, const char *directory, uint8 lang_id);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_load_translation_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_script_load_translation_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, file, lang_id);
+			retVal___ = postHookFunc(retVal___, directory, lang_id);
 		}
 	}
 	return retVal___;
@@ -73160,15 +75679,15 @@ uint8 HP_script_add_language(const char *name) {
 	}
 	return retVal___;
 }
-const char* HP_script_get_translation_file_name(const char *file) {
+const char* HP_script_get_translation_dir_name(const char *directory) {
 	int hIndex = 0;
 	const char* retVal___ = NULL;
-	if (HPMHooks.count.HP_script_get_translation_file_name_pre > 0) {
-		const char* (*preHookFunc) (const char **file);
+	if (HPMHooks.count.HP_script_get_translation_dir_name_pre > 0) {
+		const char* (*preHookFunc) (const char **directory);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_translation_file_name_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_script_get_translation_file_name_pre[hIndex].func;
-			retVal___ = preHookFunc(&file);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_translation_dir_name_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_script_get_translation_dir_name_pre[hIndex].func;
+			retVal___ = preHookFunc(&directory);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -73176,13 +75695,13 @@ const char* HP_script_get_translation_file_name(const char *file) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.script.get_translation_file_name(file);
+		retVal___ = HPMHooks.source.script.get_translation_dir_name(directory);
 	}
-	if (HPMHooks.count.HP_script_get_translation_file_name_post > 0) {
-		const char* (*postHookFunc) (const char* retVal___, const char *file);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_translation_file_name_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_script_get_translation_file_name_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, file);
+	if (HPMHooks.count.HP_script_get_translation_dir_name_post > 0) {
+		const char* (*postHookFunc) (const char* retVal___, const char *directory);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_get_translation_dir_name_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_script_get_translation_dir_name_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, directory);
 		}
 	}
 	return retVal___;
@@ -73291,6 +75810,111 @@ void HP_script_run_item_unequip_script(struct map_session_data *sd, struct item_
 	}
 	return;
 }
+void HP_script_run_item_rental_end_script(struct map_session_data *sd, struct item_data *data, int oid) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_script_run_item_rental_end_script_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, struct item_data **data, int *oid);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_run_item_rental_end_script_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_script_run_item_rental_end_script_pre[hIndex].func;
+			preHookFunc(&sd, &data, &oid);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.script.run_item_rental_end_script(sd, data, oid);
+	}
+	if (HPMHooks.count.HP_script_run_item_rental_end_script_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, struct item_data *data, int oid);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_run_item_rental_end_script_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_script_run_item_rental_end_script_post[hIndex].func;
+			postHookFunc(sd, data, oid);
+		}
+	}
+	return;
+}
+void HP_script_run_item_rental_start_script(struct map_session_data *sd, struct item_data *data, int oid) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_script_run_item_rental_start_script_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, struct item_data **data, int *oid);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_run_item_rental_start_script_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_script_run_item_rental_start_script_pre[hIndex].func;
+			preHookFunc(&sd, &data, &oid);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.script.run_item_rental_start_script(sd, data, oid);
+	}
+	if (HPMHooks.count.HP_script_run_item_rental_start_script_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, struct item_data *data, int oid);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_run_item_rental_start_script_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_script_run_item_rental_start_script_post[hIndex].func;
+			postHookFunc(sd, data, oid);
+		}
+	}
+	return;
+}
+void HP_script_run_item_lapineddukddak_script(struct map_session_data *sd, struct item_data *data, int oid) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_script_run_item_lapineddukddak_script_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, struct item_data **data, int *oid);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_run_item_lapineddukddak_script_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_script_run_item_lapineddukddak_script_pre[hIndex].func;
+			preHookFunc(&sd, &data, &oid);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.script.run_item_lapineddukddak_script(sd, data, oid);
+	}
+	if (HPMHooks.count.HP_script_run_item_lapineddukddak_script_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, struct item_data *data, int oid);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_run_item_lapineddukddak_script_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_script_run_item_lapineddukddak_script_post[hIndex].func;
+			postHookFunc(sd, data, oid);
+		}
+	}
+	return;
+}
+bool HP_script_sellitemcurrency_add(struct npc_data *nd, struct script_state *st, int argIndex) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_script_sellitemcurrency_add_pre > 0) {
+		bool (*preHookFunc) (struct npc_data **nd, struct script_state **st, int *argIndex);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_sellitemcurrency_add_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_script_sellitemcurrency_add_pre[hIndex].func;
+			retVal___ = preHookFunc(&nd, &st, &argIndex);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.script.sellitemcurrency_add(nd, st, argIndex);
+	}
+	if (HPMHooks.count.HP_script_sellitemcurrency_add_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct npc_data *nd, struct script_state *st, int argIndex);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_sellitemcurrency_add_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_script_sellitemcurrency_add_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, nd, st, argIndex);
+		}
+	}
+	return retVal___;
+}
 /* searchstore_interface */
 bool HP_searchstore_open(struct map_session_data *sd, unsigned int uses, unsigned short effect) {
 	int hIndex = 0;
@@ -73529,15 +76153,15 @@ void HP_searchstore_clearremote(struct map_session_data *sd) {
 	}
 	return;
 }
-bool HP_searchstore_result(struct map_session_data *sd, unsigned int store_id, int account_id, const char *store_name, int nameid, unsigned short amount, unsigned int price, const int *card, unsigned char refine, const struct item_option *option) {
+bool HP_searchstore_result(struct map_session_data *sd, unsigned int store_id, int account_id, const char *store_name, int nameid, unsigned short amount, unsigned int price, const int *card, unsigned char refine_level, const struct item_option *option) {
 	int hIndex = 0;
 	bool retVal___ = false;
 	if (HPMHooks.count.HP_searchstore_result_pre > 0) {
-		bool (*preHookFunc) (struct map_session_data **sd, unsigned int *store_id, int *account_id, const char **store_name, int *nameid, unsigned short *amount, unsigned int *price, const int **card, unsigned char *refine, const struct item_option **option);
+		bool (*preHookFunc) (struct map_session_data **sd, unsigned int *store_id, int *account_id, const char **store_name, int *nameid, unsigned short *amount, unsigned int *price, const int **card, unsigned char *refine_level, const struct item_option **option);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_searchstore_result_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_searchstore_result_pre[hIndex].func;
-			retVal___ = preHookFunc(&sd, &store_id, &account_id, &store_name, &nameid, &amount, &price, &card, &refine, &option);
+			retVal___ = preHookFunc(&sd, &store_id, &account_id, &store_name, &nameid, &amount, &price, &card, &refine_level, &option);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -73545,13 +76169,13 @@ bool HP_searchstore_result(struct map_session_data *sd, unsigned int store_id, i
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.searchstore.result(sd, store_id, account_id, store_name, nameid, amount, price, card, refine, option);
+		retVal___ = HPMHooks.source.searchstore.result(sd, store_id, account_id, store_name, nameid, amount, price, card, refine_level, option);
 	}
 	if (HPMHooks.count.HP_searchstore_result_post > 0) {
-		bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, unsigned int store_id, int account_id, const char *store_name, int nameid, unsigned short amount, unsigned int price, const int *card, unsigned char refine, const struct item_option *option);
+		bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, unsigned int store_id, int account_id, const char *store_name, int nameid, unsigned short amount, unsigned int price, const int *card, unsigned char refine_level, const struct item_option *option);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_searchstore_result_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_searchstore_result_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, sd, store_id, account_id, store_name, nameid, amount, price, card, refine, option);
+			retVal___ = postHookFunc(retVal___, sd, store_id, account_id, store_name, nameid, amount, price, card, refine_level, option);
 		}
 	}
 	return retVal___;
@@ -75368,11 +77992,11 @@ int HP_skill_counter_additional_effect(struct block_list *src, struct block_list
 	}
 	return retVal___;
 }
-int HP_skill_blown(struct block_list *src, struct block_list *target, int count, int8 dir, int flag) {
+int HP_skill_blown(struct block_list *src, struct block_list *target, int count, enum unit_dir dir, int flag) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_skill_blown_pre > 0) {
-		int (*preHookFunc) (struct block_list **src, struct block_list **target, int *count, int8 *dir, int *flag);
+		int (*preHookFunc) (struct block_list **src, struct block_list **target, int *count, enum unit_dir *dir, int *flag);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_blown_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_skill_blown_pre[hIndex].func;
@@ -75387,7 +78011,7 @@ int HP_skill_blown(struct block_list *src, struct block_list *target, int count,
 		retVal___ = HPMHooks.source.skill.blown(src, target, count, dir, flag);
 	}
 	if (HPMHooks.count.HP_skill_blown_post > 0) {
-		int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, int count, int8 dir, int flag);
+		int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *target, int count, enum unit_dir dir, int flag);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_blown_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_skill_blown_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, src, target, count, dir, flag);
@@ -76504,6 +79128,32 @@ int HP_skill_not_ok_mercenary(uint16 skill_id, struct mercenary_data *md) {
 	}
 	return retVal___;
 }
+void HP_skill_validate_autocast_data(struct map_session_data *sd, int skill_id, int skill_lv) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_skill_validate_autocast_data_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, int *skill_id, int *skill_lv);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_validate_autocast_data_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_skill_validate_autocast_data_pre[hIndex].func;
+			preHookFunc(&sd, &skill_id, &skill_lv);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.skill.validate_autocast_data(sd, skill_id, skill_lv);
+	}
+	if (HPMHooks.count.HP_skill_validate_autocast_data_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, int skill_id, int skill_lv);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_validate_autocast_data_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_skill_validate_autocast_data_post[hIndex].func;
+			postHookFunc(sd, skill_id, skill_lv);
+		}
+	}
+	return;
+}
 int HP_skill_chastle_mob_changetarget(struct block_list *bl, va_list ap) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -77671,10 +80321,10 @@ int HP_skill_check_condition_mob_master_sub(struct block_list *bl, va_list ap) {
 	}
 	return retVal___;
 }
-void HP_skill_brandishspear_first(struct square *tc, uint8 dir, int16 x, int16 y) {
+void HP_skill_brandishspear_first(struct square *tc, enum unit_dir dir, int16 x, int16 y) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_skill_brandishspear_first_pre > 0) {
-		void (*preHookFunc) (struct square **tc, uint8 *dir, int16 *x, int16 *y);
+		void (*preHookFunc) (struct square **tc, enum unit_dir *dir, int16 *x, int16 *y);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_brandishspear_first_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_skill_brandishspear_first_pre[hIndex].func;
@@ -77689,7 +80339,7 @@ void HP_skill_brandishspear_first(struct square *tc, uint8 dir, int16 x, int16 y
 		HPMHooks.source.skill.brandishspear_first(tc, dir, x, y);
 	}
 	if (HPMHooks.count.HP_skill_brandishspear_first_post > 0) {
-		void (*postHookFunc) (struct square *tc, uint8 dir, int16 x, int16 y);
+		void (*postHookFunc) (struct square *tc, enum unit_dir dir, int16 x, int16 y);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_brandishspear_first_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_skill_brandishspear_first_post[hIndex].func;
 			postHookFunc(tc, dir, x, y);
@@ -77697,10 +80347,10 @@ void HP_skill_brandishspear_first(struct square *tc, uint8 dir, int16 x, int16 y
 	}
 	return;
 }
-void HP_skill_brandishspear_dir(struct square *tc, uint8 dir, int are) {
+void HP_skill_brandishspear_dir(struct square *tc, enum unit_dir dir, int are) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_skill_brandishspear_dir_pre > 0) {
-		void (*preHookFunc) (struct square **tc, uint8 *dir, int *are);
+		void (*preHookFunc) (struct square **tc, enum unit_dir *dir, int *are);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_brandishspear_dir_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_skill_brandishspear_dir_pre[hIndex].func;
@@ -77715,7 +80365,7 @@ void HP_skill_brandishspear_dir(struct square *tc, uint8 dir, int are) {
 		HPMHooks.source.skill.brandishspear_dir(tc, dir, are);
 	}
 	if (HPMHooks.count.HP_skill_brandishspear_dir_post > 0) {
-		void (*postHookFunc) (struct square *tc, uint8 dir, int are);
+		void (*postHookFunc) (struct square *tc, enum unit_dir dir, int are);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_brandishspear_dir_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_skill_brandishspear_dir_post[hIndex].func;
 			postHookFunc(tc, dir, are);
@@ -79632,10 +82282,10 @@ int HP_skill_attack_dir_unknown(int *attack_type, struct block_list *src, struct
 	}
 	return retVal___;
 }
-void HP_skill_attack_blow_unknown(int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *type, struct Damage *dmg, int64 *damage, int8 *dir) {
+void HP_skill_attack_blow_unknown(int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *type, struct Damage *dmg, int64 *damage, enum unit_dir *dir) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_skill_attack_blow_unknown_pre > 0) {
-		void (*preHookFunc) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag, int **type, struct Damage **dmg, int64 **damage, int8 **dir);
+		void (*preHookFunc) (int **attack_type, struct block_list **src, struct block_list **dsrc, struct block_list **bl, uint16 **skill_id, uint16 **skill_lv, int64 **tick, int **flag, int **type, struct Damage **dmg, int64 **damage, enum unit_dir **dir);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_attack_blow_unknown_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_skill_attack_blow_unknown_pre[hIndex].func;
@@ -79650,7 +82300,7 @@ void HP_skill_attack_blow_unknown(int *attack_type, struct block_list *src, stru
 		HPMHooks.source.skill.attack_blow_unknown(attack_type, src, dsrc, bl, skill_id, skill_lv, tick, flag, type, dmg, damage, dir);
 	}
 	if (HPMHooks.count.HP_skill_attack_blow_unknown_post > 0) {
-		void (*postHookFunc) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *type, struct Damage *dmg, int64 *damage, int8 *dir);
+		void (*postHookFunc) (int *attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 *skill_id, uint16 *skill_lv, int64 *tick, int *flag, int *type, struct Damage *dmg, int64 *damage, enum unit_dir *dir);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_skill_attack_blow_unknown_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_skill_attack_blow_unknown_post[hIndex].func;
 			postHookFunc(attack_type, src, dsrc, bl, skill_id, skill_lv, tick, flag, type, dmg, damage, dir);
@@ -80816,6 +83466,33 @@ void HP_sockt_flush_fifos(void) {
 	}
 	return;
 }
+int HP_sockt_connect_client(int listen_fd) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_sockt_connect_client_pre > 0) {
+		int (*preHookFunc) (int *listen_fd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_sockt_connect_client_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_sockt_connect_client_pre[hIndex].func;
+			retVal___ = preHookFunc(&listen_fd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.sockt.connect_client(listen_fd);
+	}
+	if (HPMHooks.count.HP_sockt_connect_client_post > 0) {
+		int (*postHookFunc) (int retVal___, int listen_fd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_sockt_connect_client_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_sockt_connect_client_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, listen_fd);
+		}
+	}
+	return retVal___;
+}
 void HP_sockt_set_nonblocking(int fd, unsigned long yes) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_sockt_set_nonblocking_pre > 0) {
@@ -82088,33 +84765,6 @@ void HP_status_final(void) {
 	}
 	return;
 }
-int HP_status_get_refine_chance(enum refine_type wlv, int refine, enum refine_chance_type type) {
-	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_status_get_refine_chance_pre > 0) {
-		int (*preHookFunc) (enum refine_type *wlv, int *refine, enum refine_chance_type *type);
-		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_refine_chance_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_status_get_refine_chance_pre[hIndex].func;
-			retVal___ = preHookFunc(&wlv, &refine, &type);
-		}
-		if (*HPMforce_return) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.status.get_refine_chance(wlv, refine, type);
-	}
-	if (HPMHooks.count.HP_status_get_refine_chance_post > 0) {
-		int (*postHookFunc) (int retVal___, enum refine_type wlv, int refine, enum refine_chance_type type);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_refine_chance_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_status_get_refine_chance_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, wlv, refine, type);
-		}
-	}
-	return retVal___;
-}
 sc_type HP_status_skill2sc(int skill_id) {
 	int hIndex = 0;
 	sc_type retVal___ = SC_NONE;
@@ -82196,14 +84846,14 @@ unsigned int HP_status_sc2scb_flag(sc_type sc) {
 	}
 	return retVal___;
 }
-int HP_status_type2relevant_bl_types(int type) {
+int HP_status_get_sc_relevant_bl_types(sc_type type) {
 	int hIndex = 0;
 	int retVal___ = 0;
-	if (HPMHooks.count.HP_status_type2relevant_bl_types_pre > 0) {
-		int (*preHookFunc) (int *type);
+	if (HPMHooks.count.HP_status_get_sc_relevant_bl_types_pre > 0) {
+		int (*preHookFunc) (sc_type *type);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_type2relevant_bl_types_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_status_type2relevant_bl_types_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_sc_relevant_bl_types_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_status_get_sc_relevant_bl_types_pre[hIndex].func;
 			retVal___ = preHookFunc(&type);
 		}
 		if (*HPMforce_return) {
@@ -82212,12 +84862,12 @@ int HP_status_type2relevant_bl_types(int type) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.status.type2relevant_bl_types(type);
+		retVal___ = HPMHooks.source.status.get_sc_relevant_bl_types(type);
 	}
-	if (HPMHooks.count.HP_status_type2relevant_bl_types_post > 0) {
-		int (*postHookFunc) (int retVal___, int type);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_type2relevant_bl_types_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_status_type2relevant_bl_types_post[hIndex].func;
+	if (HPMHooks.count.HP_status_get_sc_relevant_bl_types_post > 0) {
+		int (*postHookFunc) (int retVal___, sc_type type);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_sc_relevant_bl_types_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_status_get_sc_relevant_bl_types_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, type);
 		}
 	}
@@ -82250,6 +84900,33 @@ int HP_status_get_sc_type(sc_type idx) {
 	}
 	return retVal___;
 }
+int HP_status_get_sc_icon(sc_type type) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_status_get_sc_icon_pre > 0) {
+		int (*preHookFunc) (sc_type *type);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_sc_icon_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_status_get_sc_icon_pre[hIndex].func;
+			retVal___ = preHookFunc(&type);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.status.get_sc_icon(type);
+	}
+	if (HPMHooks.count.HP_status_get_sc_icon_post > 0) {
+		int (*postHookFunc) (int retVal___, sc_type type);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_get_sc_icon_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_status_get_sc_icon_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, type);
+		}
+	}
+	return retVal___;
+}
 int HP_status_damage(struct block_list *src, struct block_list *target, int64 hp, int64 sp, int walkdelay, int flag) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -83058,6 +85735,33 @@ int HP_status_change_start(struct block_list *src, struct block_list *bl, enum s
 	}
 	return retVal___;
 }
+int HP_status_change_start_sub(struct block_list *src, struct block_list *bl, enum sc_type type, int rate, int val1, int val2, int val3, int val4, int tick, int total_tick, int flag) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_status_change_start_sub_pre > 0) {
+		int (*preHookFunc) (struct block_list **src, struct block_list **bl, enum sc_type *type, int *rate, int *val1, int *val2, int *val3, int *val4, int *tick, int *total_tick, int *flag);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_change_start_sub_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_status_change_start_sub_pre[hIndex].func;
+			retVal___ = preHookFunc(&src, &bl, &type, &rate, &val1, &val2, &val3, &val4, &tick, &total_tick, &flag);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.status.change_start_sub(src, bl, type, rate, val1, val2, val3, val4, tick, total_tick, flag);
+	}
+	if (HPMHooks.count.HP_status_change_start_sub_post > 0) {
+		int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *bl, enum sc_type type, int rate, int val1, int val2, int val3, int val4, int tick, int total_tick, int flag);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_change_start_sub_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_status_change_start_sub_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, src, bl, type, rate, val1, val2, val3, val4, tick, total_tick, flag);
+		}
+	}
+	return retVal___;
+}
 int HP_status_change_end_(struct block_list *bl, enum sc_type type, int tid, const char *file, int line) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -83272,15 +85976,15 @@ void HP_status_change_start_display(struct map_session_data *sd, enum sc_type ty
 	}
 	return;
 }
-bool HP_status_change_start_unknown_sc(struct block_list *src, struct block_list *bl, enum sc_type type, int calc_flag, int rate, int val1, int val2, int val3, int val4, int tick, int flag) {
+bool HP_status_change_start_unknown_sc(struct block_list *src, struct block_list *bl, enum sc_type type, int calc_flag, int rate, int val1, int val2, int val3, int val4, int total_tick, int flag) {
 	int hIndex = 0;
 	bool retVal___ = false;
 	if (HPMHooks.count.HP_status_change_start_unknown_sc_pre > 0) {
-		bool (*preHookFunc) (struct block_list **src, struct block_list **bl, enum sc_type *type, int *calc_flag, int *rate, int *val1, int *val2, int *val3, int *val4, int *tick, int *flag);
+		bool (*preHookFunc) (struct block_list **src, struct block_list **bl, enum sc_type *type, int *calc_flag, int *rate, int *val1, int *val2, int *val3, int *val4, int *total_tick, int *flag);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_change_start_unknown_sc_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_change_start_unknown_sc_pre[hIndex].func;
-			retVal___ = preHookFunc(&src, &bl, &type, &calc_flag, &rate, &val1, &val2, &val3, &val4, &tick, &flag);
+			retVal___ = preHookFunc(&src, &bl, &type, &calc_flag, &rate, &val1, &val2, &val3, &val4, &total_tick, &flag);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -83288,13 +85992,13 @@ bool HP_status_change_start_unknown_sc(struct block_list *src, struct block_list
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.status.change_start_unknown_sc(src, bl, type, calc_flag, rate, val1, val2, val3, val4, tick, flag);
+		retVal___ = HPMHooks.source.status.change_start_unknown_sc(src, bl, type, calc_flag, rate, val1, val2, val3, val4, total_tick, flag);
 	}
 	if (HPMHooks.count.HP_status_change_start_unknown_sc_post > 0) {
-		bool (*postHookFunc) (bool retVal___, struct block_list *src, struct block_list *bl, enum sc_type type, int calc_flag, int rate, int val1, int val2, int val3, int val4, int tick, int flag);
+		bool (*postHookFunc) (bool retVal___, struct block_list *src, struct block_list *bl, enum sc_type type, int calc_flag, int rate, int val1, int val2, int val3, int val4, int total_tick, int flag);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_change_start_unknown_sc_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_change_start_unknown_sc_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, src, bl, type, calc_flag, rate, val1, val2, val3, val4, tick, flag);
+			retVal___ = postHookFunc(retVal___, src, bl, type, calc_flag, rate, val1, val2, val3, val4, total_tick, flag);
 		}
 	}
 	return retVal___;
@@ -83947,11 +86651,11 @@ short HP_status_calc_mdef2(struct block_list *bl, struct status_change *sc, int
 	}
 	return retVal___;
 }
-unsigned short HP_status_calc_batk(struct block_list *bl, struct status_change *sc, int batk, bool viewable) {
+int HP_status_calc_batk(struct block_list *bl, struct status_change *sc, int batk, bool viewable) {
 	int hIndex = 0;
-	unsigned short retVal___ = 0;
+	int retVal___ = 0;
 	if (HPMHooks.count.HP_status_calc_batk_pre > 0) {
-		unsigned short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *batk, bool *viewable);
+		int (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *batk, bool *viewable);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_batk_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_calc_batk_pre[hIndex].func;
@@ -83966,7 +86670,7 @@ unsigned short HP_status_calc_batk(struct block_list *bl, struct status_change *
 		retVal___ = HPMHooks.source.status.calc_batk(bl, sc, batk, viewable);
 	}
 	if (HPMHooks.count.HP_status_calc_batk_post > 0) {
-		unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int batk, bool viewable);
+		int (*postHookFunc) (int retVal___, struct block_list *bl, struct status_change *sc, int batk, bool viewable);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_batk_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_calc_batk_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl, sc, batk, viewable);
@@ -83974,11 +86678,11 @@ unsigned short HP_status_calc_batk(struct block_list *bl, struct status_change *
 	}
 	return retVal___;
 }
-unsigned short HP_status_base_matk(struct block_list *bl, const struct status_data *st, int level) {
+int HP_status_base_matk(struct block_list *bl, const struct status_data *st, int level) {
 	int hIndex = 0;
-	unsigned short retVal___ = 0;
+	int retVal___ = 0;
 	if (HPMHooks.count.HP_status_base_matk_pre > 0) {
-		unsigned short (*preHookFunc) (struct block_list **bl, const struct status_data **st, int *level);
+		int (*preHookFunc) (struct block_list **bl, const struct status_data **st, int *level);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_base_matk_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_base_matk_pre[hIndex].func;
@@ -83993,7 +86697,7 @@ unsigned short HP_status_base_matk(struct block_list *bl, const struct status_da
 		retVal___ = HPMHooks.source.status.base_matk(bl, st, level);
 	}
 	if (HPMHooks.count.HP_status_base_matk_post > 0) {
-		unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, const struct status_data *st, int level);
+		int (*postHookFunc) (int retVal___, struct block_list *bl, const struct status_data *st, int level);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_base_matk_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_base_matk_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl, st, level);
@@ -84241,11 +86945,11 @@ int HP_status_base_amotion_pc(struct map_session_data *sd, struct status_data *s
 	}
 	return retVal___;
 }
-unsigned short HP_status_base_atk(const struct block_list *bl, const struct status_data *st) {
+int HP_status_base_atk(const struct block_list *bl, const struct status_data *st) {
 	int hIndex = 0;
-	unsigned short retVal___ = 0;
+	int retVal___ = 0;
 	if (HPMHooks.count.HP_status_base_atk_pre > 0) {
-		unsigned short (*preHookFunc) (const struct block_list **bl, const struct status_data **st);
+		int (*preHookFunc) (const struct block_list **bl, const struct status_data **st);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_base_atk_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_base_atk_pre[hIndex].func;
@@ -84260,7 +86964,7 @@ unsigned short HP_status_base_atk(const struct block_list *bl, const struct stat
 		retVal___ = HPMHooks.source.status.base_atk(bl, st);
 	}
 	if (HPMHooks.count.HP_status_base_atk_post > 0) {
-		unsigned short (*postHookFunc) (unsigned short retVal___, const struct block_list *bl, const struct status_data *st);
+		int (*postHookFunc) (int retVal___, const struct block_list *bl, const struct status_data *st);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_base_atk_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_base_atk_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl, st);
@@ -84565,11 +87269,11 @@ unsigned short HP_status_calc_luk(struct block_list *bl, struct status_change *s
 	}
 	return retVal___;
 }
-unsigned short HP_status_calc_watk(struct block_list *bl, struct status_change *sc, int watk, bool viewable) {
+int HP_status_calc_watk(struct block_list *bl, struct status_change *sc, int watk, bool viewable) {
 	int hIndex = 0;
-	unsigned short retVal___ = 0;
+	int retVal___ = 0;
 	if (HPMHooks.count.HP_status_calc_watk_pre > 0) {
-		unsigned short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *watk, bool *viewable);
+		int (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *watk, bool *viewable);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_watk_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_calc_watk_pre[hIndex].func;
@@ -84584,7 +87288,7 @@ unsigned short HP_status_calc_watk(struct block_list *bl, struct status_change *
 		retVal___ = HPMHooks.source.status.calc_watk(bl, sc, watk, viewable);
 	}
 	if (HPMHooks.count.HP_status_calc_watk_post > 0) {
-		unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int watk, bool viewable);
+		int (*postHookFunc) (int retVal___, struct block_list *bl, struct status_change *sc, int watk, bool viewable);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_watk_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_calc_watk_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl, sc, watk, viewable);
@@ -84592,11 +87296,11 @@ unsigned short HP_status_calc_watk(struct block_list *bl, struct status_change *
 	}
 	return retVal___;
 }
-unsigned short HP_status_calc_matk(struct block_list *bl, struct status_change *sc, int matk, bool viewable) {
+int HP_status_calc_matk(struct block_list *bl, struct status_change *sc, int matk, bool viewable) {
 	int hIndex = 0;
-	unsigned short retVal___ = 0;
+	int retVal___ = 0;
 	if (HPMHooks.count.HP_status_calc_matk_pre > 0) {
-		unsigned short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *matk, bool *viewable);
+		int (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *matk, bool *viewable);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_matk_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_calc_matk_pre[hIndex].func;
@@ -84611,7 +87315,7 @@ unsigned short HP_status_calc_matk(struct block_list *bl, struct status_change *
 		retVal___ = HPMHooks.source.status.calc_matk(bl, sc, matk, viewable);
 	}
 	if (HPMHooks.count.HP_status_calc_matk_post > 0) {
-		unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int matk, bool viewable);
+		int (*postHookFunc) (int retVal___, struct block_list *bl, struct status_change *sc, int matk, bool viewable);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_matk_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_calc_matk_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl, sc, matk, viewable);
@@ -84619,11 +87323,11 @@ unsigned short HP_status_calc_matk(struct block_list *bl, struct status_change *
 	}
 	return retVal___;
 }
-signed short HP_status_calc_hit(struct block_list *bl, struct status_change *sc, int hit, bool viewable) {
+signed int HP_status_calc_hit(struct block_list *bl, struct status_change *sc, int hit, bool viewable) {
 	int hIndex = 0;
-	signed short retVal___ = 0;
+	signed int retVal___ = 0;
 	if (HPMHooks.count.HP_status_calc_hit_pre > 0) {
-		signed short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *hit, bool *viewable);
+		signed int (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *hit, bool *viewable);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_hit_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_calc_hit_pre[hIndex].func;
@@ -84638,7 +87342,7 @@ signed short HP_status_calc_hit(struct block_list *bl, struct status_change *sc,
 		retVal___ = HPMHooks.source.status.calc_hit(bl, sc, hit, viewable);
 	}
 	if (HPMHooks.count.HP_status_calc_hit_post > 0) {
-		signed short (*postHookFunc) (signed short retVal___, struct block_list *bl, struct status_change *sc, int hit, bool viewable);
+		signed int (*postHookFunc) (signed int retVal___, struct block_list *bl, struct status_change *sc, int hit, bool viewable);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_hit_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_calc_hit_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl, sc, hit, viewable);
@@ -84646,11 +87350,11 @@ signed short HP_status_calc_hit(struct block_list *bl, struct status_change *sc,
 	}
 	return retVal___;
 }
-signed short HP_status_calc_critical(struct block_list *bl, struct status_change *sc, int critical, bool viewable) {
+signed int HP_status_calc_critical(struct block_list *bl, struct status_change *sc, int critical, bool viewable) {
 	int hIndex = 0;
-	signed short retVal___ = 0;
+	signed int retVal___ = 0;
 	if (HPMHooks.count.HP_status_calc_critical_pre > 0) {
-		signed short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *critical, bool *viewable);
+		signed int (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *critical, bool *viewable);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_critical_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_calc_critical_pre[hIndex].func;
@@ -84665,7 +87369,7 @@ signed short HP_status_calc_critical(struct block_list *bl, struct status_change
 		retVal___ = HPMHooks.source.status.calc_critical(bl, sc, critical, viewable);
 	}
 	if (HPMHooks.count.HP_status_calc_critical_post > 0) {
-		signed short (*postHookFunc) (signed short retVal___, struct block_list *bl, struct status_change *sc, int critical, bool viewable);
+		signed int (*postHookFunc) (signed int retVal___, struct block_list *bl, struct status_change *sc, int critical, bool viewable);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_critical_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_calc_critical_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl, sc, critical, viewable);
@@ -84673,11 +87377,11 @@ signed short HP_status_calc_critical(struct block_list *bl, struct status_change
 	}
 	return retVal___;
 }
-signed short HP_status_calc_flee(struct block_list *bl, struct status_change *sc, int flee, bool viewable) {
+signed int HP_status_calc_flee(struct block_list *bl, struct status_change *sc, int flee, bool viewable) {
 	int hIndex = 0;
-	signed short retVal___ = 0;
+	signed int retVal___ = 0;
 	if (HPMHooks.count.HP_status_calc_flee_pre > 0) {
-		signed short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *flee, bool *viewable);
+		signed int (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *flee, bool *viewable);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_flee_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_calc_flee_pre[hIndex].func;
@@ -84692,7 +87396,7 @@ signed short HP_status_calc_flee(struct block_list *bl, struct status_change *sc
 		retVal___ = HPMHooks.source.status.calc_flee(bl, sc, flee, viewable);
 	}
 	if (HPMHooks.count.HP_status_calc_flee_post > 0) {
-		signed short (*postHookFunc) (signed short retVal___, struct block_list *bl, struct status_change *sc, int flee, bool viewable);
+		signed int (*postHookFunc) (signed int retVal___, struct block_list *bl, struct status_change *sc, int flee, bool viewable);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_flee_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_calc_flee_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl, sc, flee, viewable);
@@ -84700,11 +87404,11 @@ signed short HP_status_calc_flee(struct block_list *bl, struct status_change *sc
 	}
 	return retVal___;
 }
-signed short HP_status_calc_flee2(struct block_list *bl, struct status_change *sc, int flee2, bool viewable) {
+signed int HP_status_calc_flee2(struct block_list *bl, struct status_change *sc, int flee2, bool viewable) {
 	int hIndex = 0;
-	signed short retVal___ = 0;
+	signed int retVal___ = 0;
 	if (HPMHooks.count.HP_status_calc_flee2_pre > 0) {
-		signed short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *flee2, bool *viewable);
+		signed int (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *flee2, bool *viewable);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_flee2_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_calc_flee2_pre[hIndex].func;
@@ -84719,7 +87423,7 @@ signed short HP_status_calc_flee2(struct block_list *bl, struct status_change *s
 		retVal___ = HPMHooks.source.status.calc_flee2(bl, sc, flee2, viewable);
 	}
 	if (HPMHooks.count.HP_status_calc_flee2_post > 0) {
-		signed short (*postHookFunc) (signed short retVal___, struct block_list *bl, struct status_change *sc, int flee2, bool viewable);
+		signed int (*postHookFunc) (signed int retVal___, struct block_list *bl, struct status_change *sc, int flee2, bool viewable);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_flee2_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_calc_flee2_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl, sc, flee2, viewable);
@@ -84997,11 +87701,11 @@ uint32 HP_status_calc_mode(const struct block_list *bl, const struct status_chan
 	}
 	return retVal___;
 }
-unsigned short HP_status_calc_ematk(struct block_list *bl, struct status_change *sc, int matk) {
+int HP_status_calc_ematk(struct block_list *bl, struct status_change *sc, int matk) {
 	int hIndex = 0;
-	unsigned short retVal___ = 0;
+	int retVal___ = 0;
 	if (HPMHooks.count.HP_status_calc_ematk_pre > 0) {
-		unsigned short (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *matk);
+		int (*preHookFunc) (struct block_list **bl, struct status_change **sc, int *matk);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_ematk_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_calc_ematk_pre[hIndex].func;
@@ -85016,7 +87720,7 @@ unsigned short HP_status_calc_ematk(struct block_list *bl, struct status_change
 		retVal___ = HPMHooks.source.status.calc_ematk(bl, sc, matk);
 	}
 	if (HPMHooks.count.HP_status_calc_ematk_post > 0) {
-		unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int matk);
+		int (*postHookFunc) (int retVal___, struct block_list *bl, struct status_change *sc, int matk);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_ematk_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_calc_ematk_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl, sc, matk);
@@ -85216,15 +87920,15 @@ bool HP_status_readdb_sizefix(char *fields[], int columns, int current) {
 	}
 	return retVal___;
 }
-int HP_status_readdb_refine_libconfig(const char *filename) {
+bool HP_status_read_scdb_libconfig(void) {
 	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_status_readdb_refine_libconfig_pre > 0) {
-		int (*preHookFunc) (const char **filename);
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_status_read_scdb_libconfig_pre > 0) {
+		bool (*preHookFunc) (void);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_refine_libconfig_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_status_readdb_refine_libconfig_pre[hIndex].func;
-			retVal___ = preHookFunc(&filename);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_pre[hIndex].func;
+			retVal___ = preHookFunc();
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -85232,26 +87936,26 @@ int HP_status_readdb_refine_libconfig(const char *filename) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.status.readdb_refine_libconfig(filename);
+		retVal___ = HPMHooks.source.status.read_scdb_libconfig();
 	}
-	if (HPMHooks.count.HP_status_readdb_refine_libconfig_post > 0) {
-		int (*postHookFunc) (int retVal___, const char *filename);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_refine_libconfig_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_status_readdb_refine_libconfig_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, filename);
+	if (HPMHooks.count.HP_status_read_scdb_libconfig_post > 0) {
+		bool (*postHookFunc) (bool retVal___);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___);
 		}
 	}
 	return retVal___;
 }
-int HP_status_readdb_refine_libconfig_sub(struct config_setting_t *r, const char *name, const char *source) {
+bool HP_status_read_scdb_libconfig_sub(struct config_setting_t *it, int idx, const char *source) {
 	int hIndex = 0;
-	int retVal___ = 0;
-	if (HPMHooks.count.HP_status_readdb_refine_libconfig_sub_pre > 0) {
-		int (*preHookFunc) (struct config_setting_t **r, const char **name, const char **source);
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_pre > 0) {
+		bool (*preHookFunc) (struct config_setting_t **it, int *idx, const char **source);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_refine_libconfig_sub_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_status_readdb_refine_libconfig_sub_pre[hIndex].func;
-			retVal___ = preHookFunc(&r, &name, &source);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_pre[hIndex].func;
+			retVal___ = preHookFunc(&it, &idx, &source);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -85259,26 +87963,26 @@ int HP_status_readdb_refine_libconfig_sub(struct config_setting_t *r, const char
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.status.readdb_refine_libconfig_sub(r, name, source);
+		retVal___ = HPMHooks.source.status.read_scdb_libconfig_sub(it, idx, source);
 	}
-	if (HPMHooks.count.HP_status_readdb_refine_libconfig_sub_post > 0) {
-		int (*postHookFunc) (int retVal___, struct config_setting_t *r, const char *name, const char *source);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_refine_libconfig_sub_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_status_readdb_refine_libconfig_sub_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, r, name, source);
+	if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct config_setting_t *it, int idx, const char *source);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, it, idx, source);
 		}
 	}
 	return retVal___;
 }
-bool HP_status_readdb_scconfig(char *fields[], int columns, int current) {
+bool HP_status_read_scdb_libconfig_sub_flag(struct config_setting_t *it, int type, const char *source) {
 	int hIndex = 0;
 	bool retVal___ = false;
-	if (HPMHooks.count.HP_status_readdb_scconfig_pre > 0) {
-		bool (*preHookFunc) (char **fields[], int *columns, int *current);
+	if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_pre > 0) {
+		bool (*preHookFunc) (struct config_setting_t **it, int *type, const char **source);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_scconfig_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_status_readdb_scconfig_pre[hIndex].func;
-			retVal___ = preHookFunc(&fields, &columns, &current);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_flag_pre[hIndex].func;
+			retVal___ = preHookFunc(&it, &type, &source);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -85286,13 +87990,40 @@ bool HP_status_readdb_scconfig(char *fields[], int columns, int current) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.status.readdb_scconfig(fields, columns, current);
+		retVal___ = HPMHooks.source.status.read_scdb_libconfig_sub_flag(it, type, source);
 	}
-	if (HPMHooks.count.HP_status_readdb_scconfig_post > 0) {
-		bool (*postHookFunc) (bool retVal___, char *fields[], int columns, int current);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_scconfig_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_status_readdb_scconfig_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, fields, columns, current);
+	if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct config_setting_t *it, int type, const char *source);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_flag_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, it, type, source);
+		}
+	}
+	return retVal___;
+}
+bool HP_status_read_scdb_libconfig_sub_flag_additional(struct config_setting_t *it, int type, const char *source) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_additional_pre > 0) {
+		bool (*preHookFunc) (struct config_setting_t **it, int *type, const char **source);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_additional_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_flag_additional_pre[hIndex].func;
+			retVal___ = preHookFunc(&it, &type, &source);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.status.read_scdb_libconfig_sub_flag_additional(it, type, source);
+	}
+	if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_additional_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct config_setting_t *it, int type, const char *source);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_additional_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_flag_additional_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, it, type, source);
 		}
 	}
 	return retVal___;
@@ -85349,14 +88080,14 @@ void HP_status_read_job_db_sub(int idx, const char *name, struct config_setting_
 	}
 	return;
 }
-void HP_status_set_sc(uint16 skill_id, sc_type sc, int icon, unsigned int flag) {
+void HP_status_set_sc(uint16 skill_id, sc_type sc, unsigned int flag) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_status_set_sc_pre > 0) {
-		void (*preHookFunc) (uint16 *skill_id, sc_type *sc, int *icon, unsigned int *flag);
+		void (*preHookFunc) (uint16 *skill_id, sc_type *sc, unsigned int *flag);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_set_sc_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_set_sc_pre[hIndex].func;
-			preHookFunc(&skill_id, &sc, &icon, &flag);
+			preHookFunc(&skill_id, &sc, &flag);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -85364,13 +88095,13 @@ void HP_status_set_sc(uint16 skill_id, sc_type sc, int icon, unsigned int flag)
 		}
 	}
 	{
-		HPMHooks.source.status.set_sc(skill_id, sc, icon, flag);
+		HPMHooks.source.status.set_sc(skill_id, sc, flag);
 	}
 	if (HPMHooks.count.HP_status_set_sc_post > 0) {
-		void (*postHookFunc) (uint16 skill_id, sc_type sc, int icon, unsigned int flag);
+		void (*postHookFunc) (uint16 skill_id, sc_type sc, unsigned int flag);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_set_sc_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_set_sc_post[hIndex].func;
-			postHookFunc(skill_id, sc, icon, flag);
+			postHookFunc(skill_id, sc, flag);
 		}
 	}
 	return;
@@ -85401,11 +88132,11 @@ void HP_status_copy(struct status_data *a, const struct status_data *b) {
 	}
 	return;
 }
-unsigned short HP_status_base_matk_min(const struct status_data *st) {
+int HP_status_base_matk_min(const struct status_data *st) {
 	int hIndex = 0;
-	unsigned short retVal___ = 0;
+	int retVal___ = 0;
 	if (HPMHooks.count.HP_status_base_matk_min_pre > 0) {
-		unsigned short (*preHookFunc) (const struct status_data **st);
+		int (*preHookFunc) (const struct status_data **st);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_base_matk_min_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_base_matk_min_pre[hIndex].func;
@@ -85420,7 +88151,7 @@ unsigned short HP_status_base_matk_min(const struct status_data *st) {
 		retVal___ = HPMHooks.source.status.base_matk_min(st);
 	}
 	if (HPMHooks.count.HP_status_base_matk_min_post > 0) {
-		unsigned short (*postHookFunc) (unsigned short retVal___, const struct status_data *st);
+		int (*postHookFunc) (int retVal___, const struct status_data *st);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_base_matk_min_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_base_matk_min_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, st);
@@ -85428,11 +88159,11 @@ unsigned short HP_status_base_matk_min(const struct status_data *st) {
 	}
 	return retVal___;
 }
-unsigned short HP_status_base_matk_max(const struct status_data *st) {
+int HP_status_base_matk_max(const struct status_data *st) {
 	int hIndex = 0;
-	unsigned short retVal___ = 0;
+	int retVal___ = 0;
 	if (HPMHooks.count.HP_status_base_matk_max_pre > 0) {
-		unsigned short (*preHookFunc) (const struct status_data **st);
+		int (*preHookFunc) (const struct status_data **st);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_base_matk_max_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_base_matk_max_pre[hIndex].func;
@@ -85447,7 +88178,7 @@ unsigned short HP_status_base_matk_max(const struct status_data *st) {
 		retVal___ = HPMHooks.source.status.base_matk_max(st);
 	}
 	if (HPMHooks.count.HP_status_base_matk_max_post > 0) {
-		unsigned short (*postHookFunc) (unsigned short retVal___, const struct status_data *st);
+		int (*postHookFunc) (int retVal___, const struct status_data *st);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_base_matk_max_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_base_matk_max_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, st);
@@ -86488,6 +89219,244 @@ bool HP_strlib_bin2hex_(char *output, const unsigned char *input, size_t count)
 	}
 	return retVal___;
 }
+/* stylist_interface */
+void HP_stylist_init(bool minimal) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_stylist_init_pre > 0) {
+		void (*preHookFunc) (bool *minimal);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_init_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_stylist_init_pre[hIndex].func;
+			preHookFunc(&minimal);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.stylist.init(minimal);
+	}
+	if (HPMHooks.count.HP_stylist_init_post > 0) {
+		void (*postHookFunc) (bool minimal);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_init_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_stylist_init_post[hIndex].func;
+			postHookFunc(minimal);
+		}
+	}
+	return;
+}
+void HP_stylist_final(void) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_stylist_final_pre > 0) {
+		void (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_final_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_stylist_final_pre[hIndex].func;
+			preHookFunc();
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.stylist.final();
+	}
+	if (HPMHooks.count.HP_stylist_final_post > 0) {
+		void (*postHookFunc) (void);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_final_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_stylist_final_post[hIndex].func;
+			postHookFunc();
+		}
+	}
+	return;
+}
+void HP_stylist_vector_init(void) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_stylist_vector_init_pre > 0) {
+		void (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_vector_init_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_stylist_vector_init_pre[hIndex].func;
+			preHookFunc();
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.stylist.vector_init();
+	}
+	if (HPMHooks.count.HP_stylist_vector_init_post > 0) {
+		void (*postHookFunc) (void);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_vector_init_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_stylist_vector_init_post[hIndex].func;
+			postHookFunc();
+		}
+	}
+	return;
+}
+void HP_stylist_vector_clear(void) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_stylist_vector_clear_pre > 0) {
+		void (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_vector_clear_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_stylist_vector_clear_pre[hIndex].func;
+			preHookFunc();
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.stylist.vector_clear();
+	}
+	if (HPMHooks.count.HP_stylist_vector_clear_post > 0) {
+		void (*postHookFunc) (void);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_vector_clear_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_stylist_vector_clear_post[hIndex].func;
+			postHookFunc();
+		}
+	}
+	return;
+}
+bool HP_stylist_read_db_libconfig(void) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_stylist_read_db_libconfig_pre > 0) {
+		bool (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_read_db_libconfig_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_stylist_read_db_libconfig_pre[hIndex].func;
+			retVal___ = preHookFunc();
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.stylist.read_db_libconfig();
+	}
+	if (HPMHooks.count.HP_stylist_read_db_libconfig_post > 0) {
+		bool (*postHookFunc) (bool retVal___);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_read_db_libconfig_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_stylist_read_db_libconfig_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___);
+		}
+	}
+	return retVal___;
+}
+bool HP_stylist_read_db_libconfig_sub(struct config_setting_t *it, int idx, const char *source) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_stylist_read_db_libconfig_sub_pre > 0) {
+		bool (*preHookFunc) (struct config_setting_t **it, int *idx, const char **source);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_read_db_libconfig_sub_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_stylist_read_db_libconfig_sub_pre[hIndex].func;
+			retVal___ = preHookFunc(&it, &idx, &source);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.stylist.read_db_libconfig_sub(it, idx, source);
+	}
+	if (HPMHooks.count.HP_stylist_read_db_libconfig_sub_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct config_setting_t *it, int idx, const char *source);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_read_db_libconfig_sub_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_stylist_read_db_libconfig_sub_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, it, idx, source);
+		}
+	}
+	return retVal___;
+}
+void HP_stylist_request_style_change(struct map_session_data *sd, int type, int16 idx, bool isitem) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_stylist_request_style_change_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, int *type, int16 *idx, bool *isitem);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_request_style_change_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_stylist_request_style_change_pre[hIndex].func;
+			preHookFunc(&sd, &type, &idx, &isitem);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.stylist.request_style_change(sd, type, idx, isitem);
+	}
+	if (HPMHooks.count.HP_stylist_request_style_change_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, int type, int16 idx, bool isitem);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_request_style_change_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_stylist_request_style_change_post[hIndex].func;
+			postHookFunc(sd, type, idx, isitem);
+		}
+	}
+	return;
+}
+bool HP_stylist_validate_requirements(struct map_session_data *sd, int type, int16 idx) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_stylist_validate_requirements_pre > 0) {
+		bool (*preHookFunc) (struct map_session_data **sd, int *type, int16 *idx);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_validate_requirements_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_stylist_validate_requirements_pre[hIndex].func;
+			retVal___ = preHookFunc(&sd, &type, &idx);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.stylist.validate_requirements(sd, type, idx);
+	}
+	if (HPMHooks.count.HP_stylist_validate_requirements_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int type, int16 idx);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_validate_requirements_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_stylist_validate_requirements_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sd, type, idx);
+		}
+	}
+	return retVal___;
+}
+void HP_stylist_send_rodexitem(struct map_session_data *sd, int itemid) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_stylist_send_rodexitem_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, int *itemid);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_send_rodexitem_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_stylist_send_rodexitem_pre[hIndex].func;
+			preHookFunc(&sd, &itemid);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.stylist.send_rodexitem(sd, itemid);
+	}
+	if (HPMHooks.count.HP_stylist_send_rodexitem_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, int itemid);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_stylist_send_rodexitem_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_stylist_send_rodexitem_post[hIndex].func;
+			postHookFunc(sd, itemid);
+		}
+	}
+	return;
+}
 /* sv_interface */
 int HP_sv_parse_next(struct s_svstate *svstate) {
 	int hIndex = 0;
@@ -88124,6 +91093,33 @@ struct unit_data* HP_unit_bl2ud(struct block_list *bl) {
 	}
 	return retVal___;
 }
+const struct unit_data* HP_unit_cbl2ud(const struct block_list *bl) {
+	int hIndex = 0;
+	const struct unit_data* retVal___ = NULL;
+	if (HPMHooks.count.HP_unit_cbl2ud_pre > 0) {
+		const struct unit_data* (*preHookFunc) (const struct block_list **bl);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_cbl2ud_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_unit_cbl2ud_pre[hIndex].func;
+			retVal___ = preHookFunc(&bl);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.unit.cbl2ud(bl);
+	}
+	if (HPMHooks.count.HP_unit_cbl2ud_post > 0) {
+		const struct unit_data* (*postHookFunc) (const struct unit_data* retVal___, const struct block_list *bl);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_cbl2ud_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_unit_cbl2ud_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, bl);
+		}
+	}
+	return retVal___;
+}
 struct unit_data* HP_unit_bl2ud2(struct block_list *bl) {
 	int hIndex = 0;
 	struct unit_data* retVal___ = NULL;
@@ -88204,14 +91200,14 @@ int HP_unit_attack_timer(int tid, int64 tick, int id, intptr_t data) {
 	}
 	return retVal___;
 }
-int HP_unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) {
+int HP_unit_walk_toxy_timer(int tid, int64 tick, int id, intptr_t data) {
 	int hIndex = 0;
 	int retVal___ = 0;
-	if (HPMHooks.count.HP_unit_walktoxy_timer_pre > 0) {
+	if (HPMHooks.count.HP_unit_walk_toxy_timer_pre > 0) {
 		int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktoxy_timer_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_unit_walktoxy_timer_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_walk_toxy_timer_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_unit_walk_toxy_timer_pre[hIndex].func;
 			retVal___ = preHookFunc(&tid, &tick, &id, &data);
 		}
 		if (*HPMforce_return) {
@@ -88220,25 +91216,25 @@ int HP_unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.unit.walktoxy_timer(tid, tick, id, data);
+		retVal___ = HPMHooks.source.unit.walk_toxy_timer(tid, tick, id, data);
 	}
-	if (HPMHooks.count.HP_unit_walktoxy_timer_post > 0) {
+	if (HPMHooks.count.HP_unit_walk_toxy_timer_post > 0) {
 		int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktoxy_timer_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_unit_walktoxy_timer_post[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_walk_toxy_timer_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_unit_walk_toxy_timer_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, tid, tick, id, data);
 		}
 	}
 	return retVal___;
 }
-int HP_unit_walktoxy_sub(struct block_list *bl) {
+int HP_unit_walk_toxy_sub(struct block_list *bl) {
 	int hIndex = 0;
 	int retVal___ = 0;
-	if (HPMHooks.count.HP_unit_walktoxy_sub_pre > 0) {
+	if (HPMHooks.count.HP_unit_walk_toxy_sub_pre > 0) {
 		int (*preHookFunc) (struct block_list **bl);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktoxy_sub_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_unit_walktoxy_sub_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_walk_toxy_sub_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_unit_walk_toxy_sub_pre[hIndex].func;
 			retVal___ = preHookFunc(&bl);
 		}
 		if (*HPMforce_return) {
@@ -88247,25 +91243,25 @@ int HP_unit_walktoxy_sub(struct block_list *bl) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.unit.walktoxy_sub(bl);
+		retVal___ = HPMHooks.source.unit.walk_toxy_sub(bl);
 	}
-	if (HPMHooks.count.HP_unit_walktoxy_sub_post > 0) {
+	if (HPMHooks.count.HP_unit_walk_toxy_sub_post > 0) {
 		int (*postHookFunc) (int retVal___, struct block_list *bl);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktoxy_sub_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_unit_walktoxy_sub_post[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_walk_toxy_sub_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_unit_walk_toxy_sub_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl);
 		}
 	}
 	return retVal___;
 }
-int HP_unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) {
+int HP_unit_delay_walk_toxy_timer(int tid, int64 tick, int id, intptr_t data) {
 	int hIndex = 0;
 	int retVal___ = 0;
-	if (HPMHooks.count.HP_unit_delay_walktoxy_timer_pre > 0) {
+	if (HPMHooks.count.HP_unit_delay_walk_toxy_timer_pre > 0) {
 		int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_delay_walktoxy_timer_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_unit_delay_walktoxy_timer_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_delay_walk_toxy_timer_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_unit_delay_walk_toxy_timer_pre[hIndex].func;
 			retVal___ = preHookFunc(&tid, &tick, &id, &data);
 		}
 		if (*HPMforce_return) {
@@ -88274,25 +91270,25 @@ int HP_unit_delay_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.unit.delay_walktoxy_timer(tid, tick, id, data);
+		retVal___ = HPMHooks.source.unit.delay_walk_toxy_timer(tid, tick, id, data);
 	}
-	if (HPMHooks.count.HP_unit_delay_walktoxy_timer_post > 0) {
+	if (HPMHooks.count.HP_unit_delay_walk_toxy_timer_post > 0) {
 		int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_delay_walktoxy_timer_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_unit_delay_walktoxy_timer_post[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_delay_walk_toxy_timer_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_unit_delay_walk_toxy_timer_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, tid, tick, id, data);
 		}
 	}
 	return retVal___;
 }
-int HP_unit_walktoxy(struct block_list *bl, short x, short y, int flag) {
+int HP_unit_walk_toxy(struct block_list *bl, short x, short y, int flag) {
 	int hIndex = 0;
 	int retVal___ = 0;
-	if (HPMHooks.count.HP_unit_walktoxy_pre > 0) {
+	if (HPMHooks.count.HP_unit_walk_toxy_pre > 0) {
 		int (*preHookFunc) (struct block_list **bl, short *x, short *y, int *flag);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktoxy_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_unit_walktoxy_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_walk_toxy_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_unit_walk_toxy_pre[hIndex].func;
 			retVal___ = preHookFunc(&bl, &x, &y, &flag);
 		}
 		if (*HPMforce_return) {
@@ -88301,25 +91297,25 @@ int HP_unit_walktoxy(struct block_list *bl, short x, short y, int flag) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.unit.walktoxy(bl, x, y, flag);
+		retVal___ = HPMHooks.source.unit.walk_toxy(bl, x, y, flag);
 	}
-	if (HPMHooks.count.HP_unit_walktoxy_post > 0) {
+	if (HPMHooks.count.HP_unit_walk_toxy_post > 0) {
 		int (*postHookFunc) (int retVal___, struct block_list *bl, short x, short y, int flag);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktoxy_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_unit_walktoxy_post[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_walk_toxy_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_unit_walk_toxy_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl, x, y, flag);
 		}
 	}
 	return retVal___;
 }
-int HP_unit_walktobl_sub(int tid, int64 tick, int id, intptr_t data) {
+int HP_unit_walktobl_timer(int tid, int64 tick, int id, intptr_t data) {
 	int hIndex = 0;
 	int retVal___ = 0;
-	if (HPMHooks.count.HP_unit_walktobl_sub_pre > 0) {
+	if (HPMHooks.count.HP_unit_walktobl_timer_pre > 0) {
 		int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktobl_sub_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_unit_walktobl_sub_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktobl_timer_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_unit_walktobl_timer_pre[hIndex].func;
 			retVal___ = preHookFunc(&tid, &tick, &id, &data);
 		}
 		if (*HPMforce_return) {
@@ -88328,12 +91324,12 @@ int HP_unit_walktobl_sub(int tid, int64 tick, int id, intptr_t data) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.unit.walktobl_sub(tid, tick, id, data);
+		retVal___ = HPMHooks.source.unit.walktobl_timer(tid, tick, id, data);
 	}
-	if (HPMHooks.count.HP_unit_walktobl_sub_post > 0) {
+	if (HPMHooks.count.HP_unit_walktobl_timer_post > 0) {
 		int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktobl_sub_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_unit_walktobl_sub_post[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_walktobl_timer_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_unit_walktobl_timer_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, tid, tick, id, data);
 		}
 	}
@@ -88473,14 +91469,14 @@ int HP_unit_movepos(struct block_list *bl, short dst_x, short dst_y, int easy, b
 	}
 	return retVal___;
 }
-int HP_unit_setdir(struct block_list *bl, unsigned char dir) {
+int HP_unit_set_dir(struct block_list *bl, enum unit_dir dir) {
 	int hIndex = 0;
 	int retVal___ = 0;
-	if (HPMHooks.count.HP_unit_setdir_pre > 0) {
-		int (*preHookFunc) (struct block_list **bl, unsigned char *dir);
+	if (HPMHooks.count.HP_unit_set_dir_pre > 0) {
+		int (*preHookFunc) (struct block_list **bl, enum unit_dir *dir);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_setdir_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_unit_setdir_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_set_dir_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_unit_set_dir_pre[hIndex].func;
 			retVal___ = preHookFunc(&bl, &dir);
 		}
 		if (*HPMforce_return) {
@@ -88489,22 +91485,22 @@ int HP_unit_setdir(struct block_list *bl, unsigned char dir) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.unit.setdir(bl, dir);
+		retVal___ = HPMHooks.source.unit.set_dir(bl, dir);
 	}
-	if (HPMHooks.count.HP_unit_setdir_post > 0) {
-		int (*postHookFunc) (int retVal___, struct block_list *bl, unsigned char dir);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_setdir_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_unit_setdir_post[hIndex].func;
+	if (HPMHooks.count.HP_unit_set_dir_post > 0) {
+		int (*postHookFunc) (int retVal___, struct block_list *bl, enum unit_dir dir);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_set_dir_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_unit_set_dir_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl, dir);
 		}
 	}
 	return retVal___;
 }
-uint8 HP_unit_getdir(struct block_list *bl) {
+enum unit_dir HP_unit_getdir(const struct block_list *bl) {
 	int hIndex = 0;
-	uint8 retVal___ = 0;
+	enum unit_dir retVal___ = UNIT_DIR_UNDEFINED;
 	if (HPMHooks.count.HP_unit_getdir_pre > 0) {
-		uint8 (*preHookFunc) (struct block_list **bl);
+		enum unit_dir (*preHookFunc) (const struct block_list **bl);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_getdir_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_unit_getdir_pre[hIndex].func;
@@ -88519,7 +91515,7 @@ uint8 HP_unit_getdir(struct block_list *bl) {
 		retVal___ = HPMHooks.source.unit.getdir(bl);
 	}
 	if (HPMHooks.count.HP_unit_getdir_post > 0) {
-		uint8 (*postHookFunc) (uint8 retVal___, struct block_list *bl);
+		enum unit_dir (*postHookFunc) (enum unit_dir retVal___, const struct block_list *bl);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_getdir_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_unit_getdir_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl);
@@ -88581,6 +91577,33 @@ int HP_unit_warp(struct block_list *bl, short m, short x, short y, enum clr_type
 	}
 	return retVal___;
 }
+int HP_unit_warpto_master(struct block_list *master_bl, struct block_list *slave_bl) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_unit_warpto_master_pre > 0) {
+		int (*preHookFunc) (struct block_list **master_bl, struct block_list **slave_bl);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_warpto_master_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_unit_warpto_master_pre[hIndex].func;
+			retVal___ = preHookFunc(&master_bl, &slave_bl);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.unit.warpto_master(master_bl, slave_bl);
+	}
+	if (HPMHooks.count.HP_unit_warpto_master_post > 0) {
+		int (*postHookFunc) (int retVal___, struct block_list *master_bl, struct block_list *slave_bl);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_warpto_master_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_unit_warpto_master_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, master_bl, slave_bl);
+		}
+	}
+	return retVal___;
+}
 int HP_unit_stop_walking(struct block_list *bl, int type) {
 	int hIndex = 0;
 	int retVal___ = 0;
@@ -88635,14 +91658,14 @@ int HP_unit_skilluse_id(struct block_list *src, int target_id, uint16 skill_id,
 	}
 	return retVal___;
 }
-int HP_unit_step_timer(int tid, int64 tick, int id, intptr_t data) {
+int HP_unit_steptimer(int tid, int64 tick, int id, intptr_t data) {
 	int hIndex = 0;
 	int retVal___ = 0;
-	if (HPMHooks.count.HP_unit_step_timer_pre > 0) {
+	if (HPMHooks.count.HP_unit_steptimer_pre > 0) {
 		int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_step_timer_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_unit_step_timer_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_steptimer_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_unit_steptimer_pre[hIndex].func;
 			retVal___ = preHookFunc(&tid, &tick, &id, &data);
 		}
 		if (*HPMforce_return) {
@@ -88651,12 +91674,12 @@ int HP_unit_step_timer(int tid, int64 tick, int id, intptr_t data) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.unit.step_timer(tid, tick, id, data);
+		retVal___ = HPMHooks.source.unit.steptimer(tid, tick, id, data);
 	}
-	if (HPMHooks.count.HP_unit_step_timer_post > 0) {
+	if (HPMHooks.count.HP_unit_steptimer_post > 0) {
 		int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_step_timer_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_unit_step_timer_post[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_steptimer_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_unit_steptimer_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, tid, tick, id, data);
 		}
 	}
@@ -89065,11 +92088,11 @@ bool HP_unit_can_reach_bl(struct block_list *bl, struct block_list *tbl, int ran
 	}
 	return retVal___;
 }
-int HP_unit_calc_pos(struct block_list *bl, int tx, int ty, uint8 dir) {
+int HP_unit_calc_pos(struct block_list *bl, int tx, int ty, enum unit_dir dir) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_unit_calc_pos_pre > 0) {
-		int (*preHookFunc) (struct block_list **bl, int *tx, int *ty, uint8 *dir);
+		int (*preHookFunc) (struct block_list **bl, int *tx, int *ty, enum unit_dir *dir);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_calc_pos_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_unit_calc_pos_pre[hIndex].func;
@@ -89084,7 +92107,7 @@ int HP_unit_calc_pos(struct block_list *bl, int tx, int ty, uint8 dir) {
 		retVal___ = HPMHooks.source.unit.calc_pos(bl, tx, ty, dir);
 	}
 	if (HPMHooks.count.HP_unit_calc_pos_post > 0) {
-		int (*postHookFunc) (int retVal___, struct block_list *bl, int tx, int ty, uint8 dir);
+		int (*postHookFunc) (int retVal___, struct block_list *bl, int tx, int ty, enum unit_dir dir);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_calc_pos_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_unit_calc_pos_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl, tx, ty, dir);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.sources.inc b/src/plugins/HPMHooking/HPMHooking_map.sources.inc
index 7a3c5b9a7..e49a6b166 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.sources.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.sources.inc
@@ -2,7 +2,7 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2013-2019  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
@@ -73,6 +73,8 @@ HPMHooks.source.pc = *pc;
 HPMHooks.source.libpcre = *libpcre;
 HPMHooks.source.pet = *pet;
 HPMHooks.source.quest = *quest;
+HPMHooks.source.refine = *refine;
+HPMHooks.source.PRIV__refine = *refine->p;
 HPMHooks.source.rnd = *rnd;
 HPMHooks.source.rodex = *rodex;
 HPMHooks.source.script = *script;
@@ -85,6 +87,7 @@ HPMHooks.source.status = *status;
 HPMHooks.source.storage = *storage;
 HPMHooks.source.StrBuf = *StrBuf;
 HPMHooks.source.strlib = *strlib;
+HPMHooks.source.stylist = *stylist;
 HPMHooks.source.sv = *sv;
 HPMHooks.source.sysinfo = *sysinfo;
 HPMHooks.source.thread = *thread;