HPM Hooks Update

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

7 files changed, 0 insertions, 338 deletions

diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index efc7f8fed..7be45d52a 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -3008,8 +3008,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);
@@ -3642,8 +3640,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);
@@ -3658,8 +3654,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);
@@ -3794,8 +3788,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);
@@ -3808,8 +3800,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);
@@ -4892,8 +4882,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);
@@ -4924,8 +4912,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);
@@ -5020,8 +5006,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);
@@ -5036,8 +5020,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);
@@ -5838,8 +5820,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);
diff --git a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
index 5751efef9..a5f65654e 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
@@ -1022,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;
@@ -1054,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;
@@ -1150,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;
@@ -1166,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;
@@ -2643,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;
@@ -2675,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;
@@ -2771,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;
@@ -2787,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;
diff --git a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
index e2defd993..efd72b670 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
@@ -549,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) },
@@ -565,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) },
@@ -613,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) },
@@ -621,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) },
diff --git a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
index 84c4e2243..7ce54d288 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
@@ -13358,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;
@@ -13790,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;
@@ -15055,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;
@@ -15270,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;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index d366300fc..4eb48f3e2 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -2572,8 +2572,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;
@@ -2842,8 +2840,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;
@@ -2858,8 +2854,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;
@@ -2994,8 +2988,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;
@@ -3008,8 +3000,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;
@@ -4420,8 +4410,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;
@@ -9353,8 +9341,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;
@@ -9623,8 +9609,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;
@@ -9639,8 +9623,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;
@@ -9775,8 +9757,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;
@@ -9789,8 +9769,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;
@@ -11201,8 +11179,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;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index 41cceb460..202778cd9 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -1319,7 +1319,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) },
@@ -1458,7 +1457,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) },
@@ -1466,7 +1464,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) },
@@ -1534,14 +1531,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) },
@@ -2265,7 +2260,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) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index 771754b13..35d5b8419 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -33641,33 +33641,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;
@@ -37318,33 +37291,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;
@@ -37534,33 +37480,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;
@@ -39349,32 +39268,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) {
@@ -39531,32 +39424,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) {
@@ -58725,33 +58592,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;