This is Hercules v2019.08.25r12.4+1

7 files changed, 124 insertions, 1109 deletions

diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 24958711e..b218988b6 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -1712,6 +1712,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);
@@ -2050,8 +2052,8 @@ typedef int (*HPMHOOK_pre_clif_delay_damage_sub) (int *tid, int64 *tick, int *id
 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);
@@ -3008,8 +3010,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);
@@ -3428,10 +3428,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);
@@ -3448,12 +3444,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);
@@ -3626,16 +3616,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);
@@ -3662,8 +3642,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);
@@ -3678,8 +3656,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);
@@ -3786,14 +3762,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);
@@ -3822,8 +3790,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);
@@ -3836,8 +3802,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);
@@ -4920,8 +4884,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);
@@ -4952,8 +4914,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);
@@ -5048,8 +5008,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);
@@ -5064,8 +5022,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);
@@ -5142,26 +5098,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);
@@ -5782,8 +5722,8 @@ 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 bool (*HPMHOOK_pre_npc_trader_open) (struct map_session_data **sd, struct npc_data **nd);
@@ -5882,8 +5822,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);
@@ -6074,8 +6012,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);
@@ -6436,6 +6374,10 @@ 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 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);
diff --git a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
index 9302a8d19..a5f65654e 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
@@ -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;
@@ -1032,8 +1022,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;
@@ -1064,8 +1052,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;
@@ -1160,8 +1146,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;
@@ -1176,8 +1160,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;
@@ -1254,26 +1236,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;
@@ -2257,10 +2223,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;
@@ -2277,12 +2239,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;
@@ -2679,8 +2635,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;
@@ -2711,8 +2665,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;
@@ -2807,8 +2759,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;
@@ -2823,8 +2773,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;
@@ -2901,26 +2849,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;
diff --git a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
index 60162c1a8..efd72b670 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
@@ -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) },
@@ -554,7 +549,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) },
@@ -570,7 +564,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) },
@@ -618,7 +611,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) },
@@ -626,7 +618,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) },
@@ -665,16 +656,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) },
diff --git a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
index 2b7e25e5d..7ce54d288 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
@@ -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;
@@ -13498,33 +13358,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;
@@ -13930,33 +13763,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;
@@ -15195,33 +15001,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;
@@ -15410,33 +15189,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;
@@ -16447,113 +16199,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;
@@ -16608,114 +16253,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;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index ad49bacb4..2faafacc5 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -1302,6 +1302,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;
@@ -2572,8 +2574,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;
@@ -2816,16 +2816,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;
@@ -2852,8 +2842,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;
@@ -2868,8 +2856,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;
@@ -2976,14 +2962,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;
@@ -3012,8 +2990,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;
@@ -3026,8 +3002,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;
@@ -4438,8 +4412,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;
@@ -4986,6 +4958,10 @@ struct {
 	struct HPMHookPoint *HP_pc_have_magnifier_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;
@@ -8097,6 +8073,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;
@@ -9367,8 +9345,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;
@@ -9611,16 +9587,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;
@@ -9647,8 +9613,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;
@@ -9663,8 +9627,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;
@@ -9771,14 +9733,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;
@@ -9807,8 +9761,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;
@@ -9821,8 +9773,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;
@@ -11233,8 +11183,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;
@@ -11781,6 +11729,10 @@ struct {
 	int HP_pc_have_magnifier_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;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index 474bcfb14..cfc6984dc 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -675,6 +675,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) },
@@ -1319,7 +1320,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) },
@@ -1445,11 +1445,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) },
@@ -1463,7 +1458,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) },
@@ -1471,7 +1465,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) },
@@ -1525,10 +1518,6 @@ struct HookingPointData HookingPoints[] = {
 	{ 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) },
@@ -1543,14 +1532,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) },
@@ -2274,7 +2261,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) },
@@ -2551,6 +2537,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(pc->update_idle_time, HP_pc_update_idle_time) },
 	{ HP_POP(pc->have_magnifier, HP_pc_have_magnifier) },
 	{ 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) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index 8817c34cc..f74e08187 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -16980,6 +16980,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) {
@@ -21386,10 +21412,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;
@@ -21404,7 +21430,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);
@@ -33641,33 +33667,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;
@@ -36969,141 +36968,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;
@@ -37453,33 +37317,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;
@@ -37669,33 +37506,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;
@@ -39120,117 +38930,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) {
@@ -39595,32 +39294,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) {
@@ -39777,32 +39450,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) {
@@ -57721,11 +57368,12 @@ 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) {
+/* Unknown return type 'enum market_buy_result'. Initializing to '0'. */
 	int hIndex = 0;
-	int retVal___ = 0;
+	enum market_buy_result retVal___ = 0;
 	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;
@@ -57740,7 +57388,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);
@@ -58971,33 +58619,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;
@@ -61492,11 +61113,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;
@@ -61511,7 +61132,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);
@@ -66363,6 +65984,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) {