Update HPM.

5 files changed, 190 insertions, 16 deletions

diff --git a/src/common/HPMDataCheck.h b/src/common/HPMDataCheck.h
index 28c6e3b1d..31bce72b2 100644
--- a/src/common/HPMDataCheck.h
+++ b/src/common/HPMDataCheck.h
@@ -626,6 +626,7 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 		{ "PACKET_CZ_REQ_REFRESH_MAIL_LIST", sizeof(struct PACKET_CZ_REQ_REFRESH_MAIL_LIST), SERVER_TYPE_MAP },
 		{ "PACKET_CZ_REQ_REMOVE_ITEM_MAIL", sizeof(struct PACKET_CZ_REQ_REMOVE_ITEM_MAIL), SERVER_TYPE_MAP },
 		{ "PACKET_CZ_REQ_STYLE_CHANGE", sizeof(struct PACKET_CZ_REQ_STYLE_CHANGE), SERVER_TYPE_MAP },
+		{ "PACKET_CZ_REQ_STYLE_CHANGE2", sizeof(struct PACKET_CZ_REQ_STYLE_CHANGE2), SERVER_TYPE_MAP },
 		{ "PACKET_CZ_REQ_TRADE_BUYING_STORE", sizeof(struct PACKET_CZ_REQ_TRADE_BUYING_STORE), SERVER_TYPE_MAP },
 		{ "PACKET_CZ_REQ_TRADE_BUYING_STORE_sub", sizeof(struct PACKET_CZ_REQ_TRADE_BUYING_STORE_sub), SERVER_TYPE_MAP },
 		{ "PACKET_CZ_REQ_ZENY_FROM_MAIL", sizeof(struct PACKET_CZ_REQ_ZENY_FROM_MAIL), SERVER_TYPE_MAP },
@@ -634,11 +635,16 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 		{ "PACKET_CZ_SEARCH_STORE_INFO_item", sizeof(struct PACKET_CZ_SEARCH_STORE_INFO_item), SERVER_TYPE_MAP },
 		{ "PACKET_CZ_SEND_MAIL", sizeof(struct PACKET_CZ_SEND_MAIL), SERVER_TYPE_MAP },
 		{ "PACKET_CZ_SSILIST_ITEM_CLICK", sizeof(struct PACKET_CZ_SSILIST_ITEM_CLICK), SERVER_TYPE_MAP },
+		{ "PACKET_ZC_ACK_BAN_GUILD1", sizeof(struct PACKET_ZC_ACK_BAN_GUILD1), SERVER_TYPE_MAP },
+		{ "PACKET_ZC_ACK_BAN_GUILD2", sizeof(struct PACKET_ZC_ACK_BAN_GUILD2), SERVER_TYPE_MAP },
+		{ "PACKET_ZC_ACK_BAN_GUILD3", sizeof(struct PACKET_ZC_ACK_BAN_GUILD3), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_ACK_CLAN_LEAVE", sizeof(struct PACKET_ZC_ACK_CLAN_LEAVE), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_ACK_DELETE_MAIL", sizeof(struct PACKET_ZC_ACK_DELETE_MAIL), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_ACK_ITEM_FROM_MAIL", sizeof(struct PACKET_ZC_ACK_ITEM_FROM_MAIL), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_ACK_ITEMLIST_BUYING_STORE", sizeof(struct PACKET_ZC_ACK_ITEMLIST_BUYING_STORE), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_ACK_ITEMLIST_BUYING_STORE_sub", sizeof(struct PACKET_ZC_ACK_ITEMLIST_BUYING_STORE_sub), SERVER_TYPE_MAP },
+		{ "PACKET_ZC_ACK_LEAVE_GUILD1", sizeof(struct PACKET_ZC_ACK_LEAVE_GUILD1), SERVER_TYPE_MAP },
+		{ "PACKET_ZC_ACK_LEAVE_GUILD2", sizeof(struct PACKET_ZC_ACK_LEAVE_GUILD2), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_ACK_OPEN_WRITE_MAIL", sizeof(struct PACKET_ZC_ACK_OPEN_WRITE_MAIL), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_ACK_REMOVE_ITEM_MAIL", sizeof(struct PACKET_ZC_ACK_REMOVE_ITEM_MAIL), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_ACK_REQMAKINGITEM", sizeof(struct PACKET_ZC_ACK_REQMAKINGITEM), SERVER_TYPE_MAP },
@@ -660,9 +666,12 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 		{ "PACKET_ZC_FEED_MER", sizeof(struct PACKET_ZC_FEED_MER), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_FEED_PET", sizeof(struct PACKET_ZC_FEED_PET), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_FORMATSTRING_MSG", sizeof(struct PACKET_ZC_FORMATSTRING_MSG), SERVER_TYPE_MAP },
+		{ "PACKET_ZC_FORMATSTRING_MSG_COLOR", sizeof(struct PACKET_ZC_FORMATSTRING_MSG_COLOR), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_GROUP_ISALIVE", sizeof(struct PACKET_ZC_GROUP_ISALIVE), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_GROUP_LIST", sizeof(struct PACKET_ZC_GROUP_LIST), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_GROUP_LIST_SUB", sizeof(struct PACKET_ZC_GROUP_LIST_SUB), SERVER_TYPE_MAP },
+		{ "PACKET_ZC_GUILD_POSITION", sizeof(struct PACKET_ZC_GUILD_POSITION), SERVER_TYPE_MAP },
+		{ "PACKET_ZC_INVENTORY_MOVE_FAILED", sizeof(struct PACKET_ZC_INVENTORY_MOVE_FAILED), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_ITEM_ENTRY", sizeof(struct PACKET_ZC_ITEM_ENTRY), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_ITEM_PICKUP_PARTY", sizeof(struct PACKET_ZC_ITEM_PICKUP_PARTY), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_MAIL_LIST", sizeof(struct PACKET_ZC_MAIL_LIST), SERVER_TYPE_MAP },
diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 0c63a98b6..c5de44fa9 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -1116,6 +1116,8 @@ typedef void (*HPMHOOK_pre_clif_delitem) (struct map_session_data **sd, int *n,
 typedef void (*HPMHOOK_post_clif_delitem) (struct map_session_data *sd, int n, int amount, short reason);
 typedef void (*HPMHOOK_pre_clif_takeitem) (struct block_list **src, struct block_list **dst);
 typedef void (*HPMHOOK_post_clif_takeitem) (struct block_list *src, struct block_list *dst);
+typedef void (*HPMHOOK_pre_clif_item_movefailed) (struct map_session_data **sd, int *n);
+typedef void (*HPMHOOK_post_clif_item_movefailed) (struct map_session_data *sd, int n);
 typedef void (*HPMHOOK_pre_clif_item_equip) (short *idx, struct EQUIPITEM_INFO **p, struct item **i, struct item_data **id, int *eqp_pos);
 typedef void (*HPMHOOK_post_clif_item_equip) (short idx, struct EQUIPITEM_INFO *p, struct item *i, struct item_data *id, int eqp_pos);
 typedef void (*HPMHOOK_pre_clif_item_normal) (short *idx, struct NORMALITEM_INFO **p, struct item **i, struct item_data **id);
@@ -1566,6 +1568,8 @@ typedef void (*HPMHOOK_pre_clif_msgtable_skill) (struct map_session_data **sd, u
 typedef void (*HPMHOOK_post_clif_msgtable_skill) (struct map_session_data *sd, uint16 skill_id, enum clif_messages msg_id);
 typedef void (*HPMHOOK_pre_clif_msgtable_str) (struct map_session_data **sd, enum clif_messages *p1, const char **value);
 typedef void (*HPMHOOK_post_clif_msgtable_str) (struct map_session_data *sd, enum clif_messages p1, const char *value);
+typedef void (*HPMHOOK_pre_clif_msgtable_str_color) (struct map_session_data **sd, enum clif_messages *p1, const char **value, uint32 *color);
+typedef void (*HPMHOOK_post_clif_msgtable_str_color) (struct map_session_data *sd, enum clif_messages p1, const char *value, uint32 color);
 typedef void (*HPMHOOK_pre_clif_msgtable_color) (struct map_session_data **sd, enum clif_messages *p1, uint32 *color);
 typedef void (*HPMHOOK_post_clif_msgtable_color) (struct map_session_data *sd, enum clif_messages p1, uint32 color);
 typedef void (*HPMHOOK_pre_clif_message) (const int *fd, const char **mes);
@@ -1690,10 +1694,10 @@ typedef void (*HPMHOOK_pre_clif_guild_invite) (struct map_session_data **sd, str
 typedef void (*HPMHOOK_post_clif_guild_invite) (struct map_session_data *sd, struct guild *g);
 typedef void (*HPMHOOK_pre_clif_guild_inviteack) (struct map_session_data **sd, int *flag);
 typedef void (*HPMHOOK_post_clif_guild_inviteack) (struct map_session_data *sd, int flag);
-typedef void (*HPMHOOK_pre_clif_guild_leave) (struct map_session_data **sd, const char **name, const char **mes);
-typedef void (*HPMHOOK_post_clif_guild_leave) (struct map_session_data *sd, const char *name, const char *mes);
-typedef void (*HPMHOOK_pre_clif_guild_expulsion) (struct map_session_data **sd, const char **name, const char **mes, int *account_id);
-typedef void (*HPMHOOK_post_clif_guild_expulsion) (struct map_session_data *sd, const char *name, const char *mes, int account_id);
+typedef void (*HPMHOOK_pre_clif_guild_leave) (struct map_session_data **sd, const char **name, int *char_id, const char **mes);
+typedef void (*HPMHOOK_post_clif_guild_leave) (struct map_session_data *sd, const char *name, int char_id, const char *mes);
+typedef void (*HPMHOOK_pre_clif_guild_expulsion) (struct map_session_data **sd, const char **name, int *char_id, const char **mes, int *account_id);
+typedef void (*HPMHOOK_post_clif_guild_expulsion) (struct map_session_data *sd, const char *name, int char_id, const char *mes, int account_id);
 typedef void (*HPMHOOK_pre_clif_guild_positionchanged) (struct guild **g, int *idx);
 typedef void (*HPMHOOK_post_clif_guild_positionchanged) (struct guild *g, int idx);
 typedef void (*HPMHOOK_pre_clif_guild_memberpositionchanged) (struct guild **g, int *idx);
@@ -1728,6 +1732,10 @@ typedef void (*HPMHOOK_pre_clif_guild_positioninfolist) (struct map_session_data
 typedef void (*HPMHOOK_post_clif_guild_positioninfolist) (struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_guild_expulsionlist) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_guild_expulsionlist) (struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_guild_set_position) (struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_guild_set_position) (struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_guild_position_selected) (struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_guild_position_selected) (struct map_session_data *sd);
 typedef bool (*HPMHOOK_pre_clif_validate_emblem) (const uint8 **emblem, unsigned long *emblem_len);
 typedef bool (*HPMHOOK_post_clif_validate_emblem) (bool retVal___, const uint8 *emblem, unsigned long emblem_len);
 typedef void (*HPMHOOK_pre_clif_bg_hp) (struct map_session_data **sd);
@@ -2580,6 +2588,8 @@ typedef void (*HPMHOOK_pre_clif_stylist_send_rodexitem) (struct map_session_data
 typedef void (*HPMHOOK_post_clif_stylist_send_rodexitem) (struct map_session_data *sd, int itemid);
 typedef void (*HPMHOOK_pre_clif_pReqStyleChange) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pReqStyleChange) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pReqStyleChange2) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pReqStyleChange2) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_cz_req_style_change_sub) (struct map_session_data **sd, int *type, int16 *idx, bool *isitem);
 typedef void (*HPMHOOK_post_clif_cz_req_style_change_sub) (struct map_session_data *sd, int type, int16 idx, bool isitem);
 typedef void (*HPMHOOK_pre_clif_style_change_response) (struct map_session_data **sd, enum stylist_shop *flag);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index c4394d7f4..d875ab6e2 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -708,6 +708,8 @@ struct {
 	struct HPMHookPoint *HP_clif_delitem_post;
 	struct HPMHookPoint *HP_clif_takeitem_pre;
 	struct HPMHookPoint *HP_clif_takeitem_post;
+	struct HPMHookPoint *HP_clif_item_movefailed_pre;
+	struct HPMHookPoint *HP_clif_item_movefailed_post;
 	struct HPMHookPoint *HP_clif_item_equip_pre;
 	struct HPMHookPoint *HP_clif_item_equip_post;
 	struct HPMHookPoint *HP_clif_item_normal_pre;
@@ -1158,6 +1160,8 @@ struct {
 	struct HPMHookPoint *HP_clif_msgtable_skill_post;
 	struct HPMHookPoint *HP_clif_msgtable_str_pre;
 	struct HPMHookPoint *HP_clif_msgtable_str_post;
+	struct HPMHookPoint *HP_clif_msgtable_str_color_pre;
+	struct HPMHookPoint *HP_clif_msgtable_str_color_post;
 	struct HPMHookPoint *HP_clif_msgtable_color_pre;
 	struct HPMHookPoint *HP_clif_msgtable_color_post;
 	struct HPMHookPoint *HP_clif_message_pre;
@@ -1320,6 +1324,10 @@ struct {
 	struct HPMHookPoint *HP_clif_guild_positioninfolist_post;
 	struct HPMHookPoint *HP_clif_guild_expulsionlist_pre;
 	struct HPMHookPoint *HP_clif_guild_expulsionlist_post;
+	struct HPMHookPoint *HP_clif_guild_set_position_pre;
+	struct HPMHookPoint *HP_clif_guild_set_position_post;
+	struct HPMHookPoint *HP_clif_guild_position_selected_pre;
+	struct HPMHookPoint *HP_clif_guild_position_selected_post;
 	struct HPMHookPoint *HP_clif_validate_emblem_pre;
 	struct HPMHookPoint *HP_clif_validate_emblem_post;
 	struct HPMHookPoint *HP_clif_bg_hp_pre;
@@ -2172,6 +2180,8 @@ struct {
 	struct HPMHookPoint *HP_clif_stylist_send_rodexitem_post;
 	struct HPMHookPoint *HP_clif_pReqStyleChange_pre;
 	struct HPMHookPoint *HP_clif_pReqStyleChange_post;
+	struct HPMHookPoint *HP_clif_pReqStyleChange2_pre;
+	struct HPMHookPoint *HP_clif_pReqStyleChange2_post;
 	struct HPMHookPoint *HP_clif_cz_req_style_change_sub_pre;
 	struct HPMHookPoint *HP_clif_cz_req_style_change_sub_post;
 	struct HPMHookPoint *HP_clif_style_change_response_pre;
@@ -7259,6 +7269,8 @@ struct {
 	int HP_clif_delitem_post;
 	int HP_clif_takeitem_pre;
 	int HP_clif_takeitem_post;
+	int HP_clif_item_movefailed_pre;
+	int HP_clif_item_movefailed_post;
 	int HP_clif_item_equip_pre;
 	int HP_clif_item_equip_post;
 	int HP_clif_item_normal_pre;
@@ -7709,6 +7721,8 @@ struct {
 	int HP_clif_msgtable_skill_post;
 	int HP_clif_msgtable_str_pre;
 	int HP_clif_msgtable_str_post;
+	int HP_clif_msgtable_str_color_pre;
+	int HP_clif_msgtable_str_color_post;
 	int HP_clif_msgtable_color_pre;
 	int HP_clif_msgtable_color_post;
 	int HP_clif_message_pre;
@@ -7871,6 +7885,10 @@ struct {
 	int HP_clif_guild_positioninfolist_post;
 	int HP_clif_guild_expulsionlist_pre;
 	int HP_clif_guild_expulsionlist_post;
+	int HP_clif_guild_set_position_pre;
+	int HP_clif_guild_set_position_post;
+	int HP_clif_guild_position_selected_pre;
+	int HP_clif_guild_position_selected_post;
 	int HP_clif_validate_emblem_pre;
 	int HP_clif_validate_emblem_post;
 	int HP_clif_bg_hp_pre;
@@ -8723,6 +8741,8 @@ struct {
 	int HP_clif_stylist_send_rodexitem_post;
 	int HP_clif_pReqStyleChange_pre;
 	int HP_clif_pReqStyleChange_post;
+	int HP_clif_pReqStyleChange2_pre;
+	int HP_clif_pReqStyleChange2_post;
 	int HP_clif_cz_req_style_change_sub_pre;
 	int HP_clif_cz_req_style_change_sub_post;
 	int HP_clif_style_change_response_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index e5584cc43..0088847b1 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -378,6 +378,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->dropitem, HP_clif_dropitem) },
 	{ HP_POP(clif->delitem, HP_clif_delitem) },
 	{ HP_POP(clif->takeitem, HP_clif_takeitem) },
+	{ HP_POP(clif->item_movefailed, HP_clif_item_movefailed) },
 	{ HP_POP(clif->item_equip, HP_clif_item_equip) },
 	{ HP_POP(clif->item_normal, HP_clif_item_normal) },
 	{ HP_POP(clif->arrowequip, HP_clif_arrowequip) },
@@ -603,6 +604,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->msgtable_num, HP_clif_msgtable_num) },
 	{ HP_POP(clif->msgtable_skill, HP_clif_msgtable_skill) },
 	{ HP_POP(clif->msgtable_str, HP_clif_msgtable_str) },
+	{ HP_POP(clif->msgtable_str_color, HP_clif_msgtable_str_color) },
 	{ HP_POP(clif->msgtable_color, HP_clif_msgtable_color) },
 	{ HP_POP(clif->message, HP_clif_message) },
 	{ HP_POP(clif->messageln, HP_clif_messageln) },
@@ -684,6 +686,8 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->guild_positionnamelist, HP_clif_guild_positionnamelist) },
 	{ HP_POP(clif->guild_positioninfolist, HP_clif_guild_positioninfolist) },
 	{ HP_POP(clif->guild_expulsionlist, HP_clif_guild_expulsionlist) },
+	{ HP_POP(clif->guild_set_position, HP_clif_guild_set_position) },
+	{ HP_POP(clif->guild_position_selected, HP_clif_guild_position_selected) },
 	{ HP_POP(clif->validate_emblem, HP_clif_validate_emblem) },
 	{ HP_POP(clif->bg_hp, HP_clif_bg_hp) },
 	{ HP_POP(clif->bg_xy, HP_clif_bg_xy) },
@@ -1110,6 +1114,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->style_change_validate_requirements, HP_clif_style_change_validate_requirements) },
 	{ HP_POP(clif->stylist_send_rodexitem, HP_clif_stylist_send_rodexitem) },
 	{ HP_POP(clif->pReqStyleChange, HP_clif_pReqStyleChange) },
+	{ HP_POP(clif->pReqStyleChange2, HP_clif_pReqStyleChange2) },
 	{ HP_POP(clif->cz_req_style_change_sub, HP_clif_cz_req_style_change_sub) },
 	{ HP_POP(clif->style_change_response, HP_clif_style_change_response) },
 	{ HP_POP(clif->pPetEvolution, HP_clif_pPetEvolution) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index f2ce1505c..3b21eb3e6 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -9213,6 +9213,32 @@ void HP_clif_takeitem(struct block_list *src, struct block_list *dst) {
 	}
 	return;
 }
+void HP_clif_item_movefailed(struct map_session_data *sd, int n) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_item_movefailed_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, int *n);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_movefailed_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_item_movefailed_pre[hIndex].func;
+			preHookFunc(&sd, &n);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.item_movefailed(sd, n);
+	}
+	if (HPMHooks.count.HP_clif_item_movefailed_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, int n);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_item_movefailed_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_item_movefailed_post[hIndex].func;
+			postHookFunc(sd, n);
+		}
+	}
+	return;
+}
 void HP_clif_item_equip(short idx, struct EQUIPITEM_INFO *p, struct item *i, struct item_data *id, int eqp_pos) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_item_equip_pre > 0) {
@@ -15105,6 +15131,32 @@ void HP_clif_msgtable_str(struct map_session_data *sd, enum clif_messages p1, co
 	}
 	return;
 }
+void HP_clif_msgtable_str_color(struct map_session_data *sd, enum clif_messages p1, const char *value, uint32 color) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_msgtable_str_color_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, enum clif_messages *p1, const char **value, uint32 *color);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_msgtable_str_color_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_msgtable_str_color_pre[hIndex].func;
+			preHookFunc(&sd, &p1, &value, &color);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.msgtable_str_color(sd, p1, value, color);
+	}
+	if (HPMHooks.count.HP_clif_msgtable_str_color_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, enum clif_messages p1, const char *value, uint32 color);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_msgtable_str_color_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_msgtable_str_color_post[hIndex].func;
+			postHookFunc(sd, p1, value, color);
+		}
+	}
+	return;
+}
 void HP_clif_msgtable_color(struct map_session_data *sd, enum clif_messages p1, uint32 color) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_msgtable_color_pre > 0) {
@@ -16719,14 +16771,14 @@ void HP_clif_guild_inviteack(struct map_session_data *sd, int flag) {
 	}
 	return;
 }
-void HP_clif_guild_leave(struct map_session_data *sd, const char *name, const char *mes) {
+void HP_clif_guild_leave(struct map_session_data *sd, const char *name, int char_id, const char *mes) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_guild_leave_pre > 0) {
-		void (*preHookFunc) (struct map_session_data **sd, const char **name, const char **mes);
+		void (*preHookFunc) (struct map_session_data **sd, const char **name, int *char_id, const char **mes);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_leave_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_clif_guild_leave_pre[hIndex].func;
-			preHookFunc(&sd, &name, &mes);
+			preHookFunc(&sd, &name, &char_id, &mes);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -16734,25 +16786,25 @@ void HP_clif_guild_leave(struct map_session_data *sd, const char *name, const ch
 		}
 	}
 	{
-		HPMHooks.source.clif.guild_leave(sd, name, mes);
+		HPMHooks.source.clif.guild_leave(sd, name, char_id, mes);
 	}
 	if (HPMHooks.count.HP_clif_guild_leave_post > 0) {
-		void (*postHookFunc) (struct map_session_data *sd, const char *name, const char *mes);
+		void (*postHookFunc) (struct map_session_data *sd, const char *name, int char_id, const char *mes);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_leave_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_clif_guild_leave_post[hIndex].func;
-			postHookFunc(sd, name, mes);
+			postHookFunc(sd, name, char_id, mes);
 		}
 	}
 	return;
 }
-void HP_clif_guild_expulsion(struct map_session_data *sd, const char *name, const char *mes, int account_id) {
+void HP_clif_guild_expulsion(struct map_session_data *sd, const char *name, int char_id, const char *mes, int account_id) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_guild_expulsion_pre > 0) {
-		void (*preHookFunc) (struct map_session_data **sd, const char **name, const char **mes, int *account_id);
+		void (*preHookFunc) (struct map_session_data **sd, const char **name, int *char_id, const char **mes, int *account_id);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_expulsion_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_clif_guild_expulsion_pre[hIndex].func;
-			preHookFunc(&sd, &name, &mes, &account_id);
+			preHookFunc(&sd, &name, &char_id, &mes, &account_id);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -16760,13 +16812,13 @@ void HP_clif_guild_expulsion(struct map_session_data *sd, const char *name, cons
 		}
 	}
 	{
-		HPMHooks.source.clif.guild_expulsion(sd, name, mes, account_id);
+		HPMHooks.source.clif.guild_expulsion(sd, name, char_id, mes, account_id);
 	}
 	if (HPMHooks.count.HP_clif_guild_expulsion_post > 0) {
-		void (*postHookFunc) (struct map_session_data *sd, const char *name, const char *mes, int account_id);
+		void (*postHookFunc) (struct map_session_data *sd, const char *name, int char_id, const char *mes, int account_id);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_expulsion_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_clif_guild_expulsion_post[hIndex].func;
-			postHookFunc(sd, name, mes, account_id);
+			postHookFunc(sd, name, char_id, mes, account_id);
 		}
 	}
 	return;
@@ -17213,6 +17265,58 @@ void HP_clif_guild_expulsionlist(struct map_session_data *sd) {
 	}
 	return;
 }
+void HP_clif_guild_set_position(struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_guild_set_position_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_set_position_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_guild_set_position_pre[hIndex].func;
+			preHookFunc(&sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.guild_set_position(sd);
+	}
+	if (HPMHooks.count.HP_clif_guild_set_position_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_set_position_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_guild_set_position_post[hIndex].func;
+			postHookFunc(sd);
+		}
+	}
+	return;
+}
+void HP_clif_guild_position_selected(struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_guild_position_selected_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_position_selected_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_guild_position_selected_pre[hIndex].func;
+			preHookFunc(&sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.guild_position_selected(sd);
+	}
+	if (HPMHooks.count.HP_clif_guild_position_selected_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_guild_position_selected_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_guild_position_selected_post[hIndex].func;
+			postHookFunc(sd);
+		}
+	}
+	return;
+}
 bool HP_clif_validate_emblem(const uint8 *emblem, unsigned long emblem_len) {
 	int hIndex = 0;
 	bool retVal___ = false;
@@ -28314,6 +28418,32 @@ void HP_clif_pReqStyleChange(int fd, struct map_session_data *sd) {
 	}
 	return;
 }
+void HP_clif_pReqStyleChange2(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pReqStyleChange2_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReqStyleChange2_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pReqStyleChange2_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pReqStyleChange2(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pReqStyleChange2_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReqStyleChange2_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pReqStyleChange2_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
 void HP_clif_cz_req_style_change_sub(struct map_session_data *sd, int type, int16 idx, bool isitem) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_cz_req_style_change_sub_pre > 0) {