Update HPM.

4 files changed, 364 insertions, 0 deletions

diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 92a59475b..7cca3ed6c 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -1338,6 +1338,18 @@ typedef void (*HPMHOOK_pre_clif_cartList) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_cartList) (struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_cartItems) (struct map_session_data **sd, enum inventory_type *type);
 typedef void (*HPMHOOK_post_clif_cartItems) (struct map_session_data *sd, enum inventory_type type);
+typedef void (*HPMHOOK_pre_clif_inventoryExpansionInfo) (struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_inventoryExpansionInfo) (struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_inventoryExpandAck) (struct map_session_data **sd, enum expand_inventory *result, int *itemId);
+typedef void (*HPMHOOK_post_clif_inventoryExpandAck) (struct map_session_data *sd, enum expand_inventory result, int itemId);
+typedef void (*HPMHOOK_pre_clif_inventoryExpandResult) (struct map_session_data **sd, enum expand_inventory_result *result);
+typedef void (*HPMHOOK_post_clif_inventoryExpandResult) (struct map_session_data *sd, enum expand_inventory_result result);
+typedef void (*HPMHOOK_pre_clif_pInventoryExpansion) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pInventoryExpansion) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pInventoryExpansionConfirmed) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pInventoryExpansionConfirmed) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pInventoryExpansionRejected) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pInventoryExpansionRejected) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_favorite_item) (struct map_session_data **sd, unsigned short *index);
 typedef void (*HPMHOOK_post_clif_favorite_item) (struct map_session_data *sd, unsigned short index);
 typedef void (*HPMHOOK_pre_clif_clearcart) (int *fd);
@@ -2128,8 +2140,14 @@ typedef void (*HPMHOOK_pre_clif_pStatusUp) (int *fd, struct map_session_data **s
 typedef void (*HPMHOOK_post_clif_pStatusUp) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_pSkillUp) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pSkillUp) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_useSkillToIdReal) (int *fd, struct map_session_data **sd, int *skill_id, int *skill_lv, int *target_id);
+typedef void (*HPMHOOK_post_clif_useSkillToIdReal) (int fd, struct map_session_data *sd, int skill_id, int skill_lv, int target_id);
 typedef void (*HPMHOOK_pre_clif_pUseSkillToId) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pUseSkillToId) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pStartUseSkillToId) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pStartUseSkillToId) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pStopUseSkillToId) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pStopUseSkillToId) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_pUseSkillToId_homun) (struct homun_data **hd, struct map_session_data **sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, int *target_id);
 typedef void (*HPMHOOK_post_clif_pUseSkillToId_homun) (struct homun_data *hd, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, int target_id);
 typedef void (*HPMHOOK_pre_clif_pUseSkillToId_mercenary) (struct mercenary_data **md, struct map_session_data **sd, int64 *tick, uint16 *skill_id, uint16 *skill_lv, int *target_id);
@@ -2636,6 +2654,8 @@ typedef void (*HPMHOOK_pre_clif_item_preview) (struct map_session_data **sd, int
 typedef void (*HPMHOOK_post_clif_item_preview) (struct map_session_data *sd, int n);
 typedef bool (*HPMHOOK_pre_clif_enchant_equipment) (struct map_session_data **sd, enum equip_pos *pos, int *cardSlot, int *cardId);
 typedef bool (*HPMHOOK_post_clif_enchant_equipment) (bool retVal___, struct map_session_data *sd, enum equip_pos pos, int cardSlot, int cardId);
+typedef void (*HPMHOOK_pre_clif_pReqRemainTime) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pReqRemainTime) (int fd, struct map_session_data *sd);
 #endif // MAP_CLIF_H
 #ifdef COMMON_CORE_H /* cmdline */
 typedef void (*HPMHOOK_pre_cmdline_init) (void);
@@ -6312,6 +6332,8 @@ typedef bool (*HPMHOOK_pre_pc_isDeathPenaltyJob) (uint16 *job);
 typedef bool (*HPMHOOK_post_pc_isDeathPenaltyJob) (bool retVal___, uint16 job);
 typedef bool (*HPMHOOK_pre_pc_has_second_costume) (struct map_session_data **sd);
 typedef bool (*HPMHOOK_post_pc_has_second_costume) (bool retVal___, struct map_session_data *sd);
+typedef bool (*HPMHOOK_pre_pc_expandInventory) (struct map_session_data **sd, int *adjustSize);
+typedef bool (*HPMHOOK_post_pc_expandInventory) (bool retVal___, struct map_session_data *sd, int adjustSize);
 #endif // MAP_PC_H
 #ifdef MAP_NPC_H /* libpcre */
 typedef pcre* (*HPMHOOK_pre_libpcre_compile) (const char **pattern, int *options, const char ***errptr, int **erroffset, const unsigned char **tableptr);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index 1a45e836c..0220a7956 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -930,6 +930,18 @@ struct {
 	struct HPMHookPoint *HP_clif_cartList_post;
 	struct HPMHookPoint *HP_clif_cartItems_pre;
 	struct HPMHookPoint *HP_clif_cartItems_post;
+	struct HPMHookPoint *HP_clif_inventoryExpansionInfo_pre;
+	struct HPMHookPoint *HP_clif_inventoryExpansionInfo_post;
+	struct HPMHookPoint *HP_clif_inventoryExpandAck_pre;
+	struct HPMHookPoint *HP_clif_inventoryExpandAck_post;
+	struct HPMHookPoint *HP_clif_inventoryExpandResult_pre;
+	struct HPMHookPoint *HP_clif_inventoryExpandResult_post;
+	struct HPMHookPoint *HP_clif_pInventoryExpansion_pre;
+	struct HPMHookPoint *HP_clif_pInventoryExpansion_post;
+	struct HPMHookPoint *HP_clif_pInventoryExpansionConfirmed_pre;
+	struct HPMHookPoint *HP_clif_pInventoryExpansionConfirmed_post;
+	struct HPMHookPoint *HP_clif_pInventoryExpansionRejected_pre;
+	struct HPMHookPoint *HP_clif_pInventoryExpansionRejected_post;
 	struct HPMHookPoint *HP_clif_favorite_item_pre;
 	struct HPMHookPoint *HP_clif_favorite_item_post;
 	struct HPMHookPoint *HP_clif_clearcart_pre;
@@ -1720,8 +1732,14 @@ struct {
 	struct HPMHookPoint *HP_clif_pStatusUp_post;
 	struct HPMHookPoint *HP_clif_pSkillUp_pre;
 	struct HPMHookPoint *HP_clif_pSkillUp_post;
+	struct HPMHookPoint *HP_clif_useSkillToIdReal_pre;
+	struct HPMHookPoint *HP_clif_useSkillToIdReal_post;
 	struct HPMHookPoint *HP_clif_pUseSkillToId_pre;
 	struct HPMHookPoint *HP_clif_pUseSkillToId_post;
+	struct HPMHookPoint *HP_clif_pStartUseSkillToId_pre;
+	struct HPMHookPoint *HP_clif_pStartUseSkillToId_post;
+	struct HPMHookPoint *HP_clif_pStopUseSkillToId_pre;
+	struct HPMHookPoint *HP_clif_pStopUseSkillToId_post;
 	struct HPMHookPoint *HP_clif_pUseSkillToId_homun_pre;
 	struct HPMHookPoint *HP_clif_pUseSkillToId_homun_post;
 	struct HPMHookPoint *HP_clif_pUseSkillToId_mercenary_pre;
@@ -2228,6 +2246,8 @@ struct {
 	struct HPMHookPoint *HP_clif_item_preview_post;
 	struct HPMHookPoint *HP_clif_enchant_equipment_pre;
 	struct HPMHookPoint *HP_clif_enchant_equipment_post;
+	struct HPMHookPoint *HP_clif_pReqRemainTime_pre;
+	struct HPMHookPoint *HP_clif_pReqRemainTime_post;
 	struct HPMHookPoint *HP_cmdline_init_pre;
 	struct HPMHookPoint *HP_cmdline_init_post;
 	struct HPMHookPoint *HP_cmdline_final_pre;
@@ -4872,6 +4892,8 @@ struct {
 	struct HPMHookPoint *HP_pc_isDeathPenaltyJob_post;
 	struct HPMHookPoint *HP_pc_has_second_costume_pre;
 	struct HPMHookPoint *HP_pc_has_second_costume_post;
+	struct HPMHookPoint *HP_pc_expandInventory_pre;
+	struct HPMHookPoint *HP_pc_expandInventory_post;
 	struct HPMHookPoint *HP_libpcre_compile_pre;
 	struct HPMHookPoint *HP_libpcre_compile_post;
 	struct HPMHookPoint *HP_libpcre_study_pre;
@@ -7555,6 +7577,18 @@ struct {
 	int HP_clif_cartList_post;
 	int HP_clif_cartItems_pre;
 	int HP_clif_cartItems_post;
+	int HP_clif_inventoryExpansionInfo_pre;
+	int HP_clif_inventoryExpansionInfo_post;
+	int HP_clif_inventoryExpandAck_pre;
+	int HP_clif_inventoryExpandAck_post;
+	int HP_clif_inventoryExpandResult_pre;
+	int HP_clif_inventoryExpandResult_post;
+	int HP_clif_pInventoryExpansion_pre;
+	int HP_clif_pInventoryExpansion_post;
+	int HP_clif_pInventoryExpansionConfirmed_pre;
+	int HP_clif_pInventoryExpansionConfirmed_post;
+	int HP_clif_pInventoryExpansionRejected_pre;
+	int HP_clif_pInventoryExpansionRejected_post;
 	int HP_clif_favorite_item_pre;
 	int HP_clif_favorite_item_post;
 	int HP_clif_clearcart_pre;
@@ -8345,8 +8379,14 @@ struct {
 	int HP_clif_pStatusUp_post;
 	int HP_clif_pSkillUp_pre;
 	int HP_clif_pSkillUp_post;
+	int HP_clif_useSkillToIdReal_pre;
+	int HP_clif_useSkillToIdReal_post;
 	int HP_clif_pUseSkillToId_pre;
 	int HP_clif_pUseSkillToId_post;
+	int HP_clif_pStartUseSkillToId_pre;
+	int HP_clif_pStartUseSkillToId_post;
+	int HP_clif_pStopUseSkillToId_pre;
+	int HP_clif_pStopUseSkillToId_post;
 	int HP_clif_pUseSkillToId_homun_pre;
 	int HP_clif_pUseSkillToId_homun_post;
 	int HP_clif_pUseSkillToId_mercenary_pre;
@@ -8853,6 +8893,8 @@ struct {
 	int HP_clif_item_preview_post;
 	int HP_clif_enchant_equipment_pre;
 	int HP_clif_enchant_equipment_post;
+	int HP_clif_pReqRemainTime_pre;
+	int HP_clif_pReqRemainTime_post;
 	int HP_cmdline_init_pre;
 	int HP_cmdline_init_post;
 	int HP_cmdline_final_pre;
@@ -11497,6 +11539,8 @@ struct {
 	int HP_pc_isDeathPenaltyJob_post;
 	int HP_pc_has_second_costume_pre;
 	int HP_pc_has_second_costume_post;
+	int HP_pc_expandInventory_pre;
+	int HP_pc_expandInventory_post;
 	int HP_libpcre_compile_pre;
 	int HP_libpcre_compile_post;
 	int HP_libpcre_study_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index 2e7b73cf7..c3fe751ad 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -489,6 +489,12 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->equipItems, HP_clif_equipItems) },
 	{ HP_POP(clif->cartList, HP_clif_cartList) },
 	{ HP_POP(clif->cartItems, HP_clif_cartItems) },
+	{ HP_POP(clif->inventoryExpansionInfo, HP_clif_inventoryExpansionInfo) },
+	{ HP_POP(clif->inventoryExpandAck, HP_clif_inventoryExpandAck) },
+	{ HP_POP(clif->inventoryExpandResult, HP_clif_inventoryExpandResult) },
+	{ HP_POP(clif->pInventoryExpansion, HP_clif_pInventoryExpansion) },
+	{ HP_POP(clif->pInventoryExpansionConfirmed, HP_clif_pInventoryExpansionConfirmed) },
+	{ HP_POP(clif->pInventoryExpansionRejected, HP_clif_pInventoryExpansionRejected) },
 	{ HP_POP(clif->favorite_item, HP_clif_favorite_item) },
 	{ HP_POP(clif->clearcart, HP_clif_clearcart) },
 	{ HP_POP(clif->item_identify_list, HP_clif_item_identify_list) },
@@ -884,7 +890,10 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->pChangeCart, HP_clif_pChangeCart) },
 	{ HP_POP(clif->pStatusUp, HP_clif_pStatusUp) },
 	{ HP_POP(clif->pSkillUp, HP_clif_pSkillUp) },
+	{ HP_POP(clif->useSkillToIdReal, HP_clif_useSkillToIdReal) },
 	{ HP_POP(clif->pUseSkillToId, HP_clif_pUseSkillToId) },
+	{ HP_POP(clif->pStartUseSkillToId, HP_clif_pStartUseSkillToId) },
+	{ HP_POP(clif->pStopUseSkillToId, HP_clif_pStopUseSkillToId) },
 	{ HP_POP(clif->pUseSkillToId_homun, HP_clif_pUseSkillToId_homun) },
 	{ HP_POP(clif->pUseSkillToId_mercenary, HP_clif_pUseSkillToId_mercenary) },
 	{ HP_POP(clif->pUseSkillToPos, HP_clif_pUseSkillToPos) },
@@ -1138,6 +1147,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->camera_change, HP_clif_camera_change) },
 	{ HP_POP(clif->item_preview, HP_clif_item_preview) },
 	{ HP_POP(clif->enchant_equipment, HP_clif_enchant_equipment) },
+	{ HP_POP(clif->pReqRemainTime, HP_clif_pReqRemainTime) },
 /* cmdline_interface */
 	{ HP_POP(cmdline->init, HP_cmdline_init) },
 	{ HP_POP(cmdline->final, HP_cmdline_final) },
@@ -2494,6 +2504,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(pc->check_basicskill, HP_pc_check_basicskill) },
 	{ HP_POP(pc->isDeathPenaltyJob, HP_pc_isDeathPenaltyJob) },
 	{ HP_POP(pc->has_second_costume, HP_pc_has_second_costume) },
+	{ HP_POP(pc->expandInventory, HP_pc_expandInventory) },
 /* pcre_interface */
 	{ HP_POP(libpcre->compile, HP_libpcre_compile) },
 	{ HP_POP(libpcre->study, HP_libpcre_study) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index cda212a38..6fab14490 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -12125,6 +12125,162 @@ void HP_clif_cartItems(struct map_session_data *sd, enum inventory_type type) {
 	}
 	return;
 }
+void HP_clif_inventoryExpansionInfo(struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_inventoryExpansionInfo_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_inventoryExpansionInfo_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_inventoryExpansionInfo_pre[hIndex].func;
+			preHookFunc(&sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.inventoryExpansionInfo(sd);
+	}
+	if (HPMHooks.count.HP_clif_inventoryExpansionInfo_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_inventoryExpansionInfo_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_inventoryExpansionInfo_post[hIndex].func;
+			postHookFunc(sd);
+		}
+	}
+	return;
+}
+void HP_clif_inventoryExpandAck(struct map_session_data *sd, enum expand_inventory result, int itemId) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_inventoryExpandAck_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, enum expand_inventory *result, int *itemId);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_inventoryExpandAck_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_inventoryExpandAck_pre[hIndex].func;
+			preHookFunc(&sd, &result, &itemId);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.inventoryExpandAck(sd, result, itemId);
+	}
+	if (HPMHooks.count.HP_clif_inventoryExpandAck_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, enum expand_inventory result, int itemId);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_inventoryExpandAck_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_inventoryExpandAck_post[hIndex].func;
+			postHookFunc(sd, result, itemId);
+		}
+	}
+	return;
+}
+void HP_clif_inventoryExpandResult(struct map_session_data *sd, enum expand_inventory_result result) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_inventoryExpandResult_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, enum expand_inventory_result *result);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_inventoryExpandResult_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_inventoryExpandResult_pre[hIndex].func;
+			preHookFunc(&sd, &result);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.inventoryExpandResult(sd, result);
+	}
+	if (HPMHooks.count.HP_clif_inventoryExpandResult_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, enum expand_inventory_result result);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_inventoryExpandResult_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_inventoryExpandResult_post[hIndex].func;
+			postHookFunc(sd, result);
+		}
+	}
+	return;
+}
+void HP_clif_pInventoryExpansion(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pInventoryExpansion_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pInventoryExpansion_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pInventoryExpansion_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pInventoryExpansion(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pInventoryExpansion_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pInventoryExpansion_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pInventoryExpansion_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_pInventoryExpansionConfirmed(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pInventoryExpansionConfirmed_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pInventoryExpansionConfirmed_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pInventoryExpansionConfirmed_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pInventoryExpansionConfirmed(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pInventoryExpansionConfirmed_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pInventoryExpansionConfirmed_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pInventoryExpansionConfirmed_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_pInventoryExpansionRejected(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pInventoryExpansionRejected_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pInventoryExpansionRejected_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pInventoryExpansionRejected_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pInventoryExpansionRejected(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pInventoryExpansionRejected_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pInventoryExpansionRejected_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pInventoryExpansionRejected_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
 void HP_clif_favorite_item(struct map_session_data *sd, unsigned short index) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_favorite_item_pre > 0) {
@@ -22430,6 +22586,32 @@ void HP_clif_pSkillUp(int fd, struct map_session_data *sd) {
 	}
 	return;
 }
+void HP_clif_useSkillToIdReal(int fd, struct map_session_data *sd, int skill_id, int skill_lv, int target_id) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_useSkillToIdReal_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd, int *skill_id, int *skill_lv, int *target_id);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_useSkillToIdReal_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_useSkillToIdReal_pre[hIndex].func;
+			preHookFunc(&fd, &sd, &skill_id, &skill_lv, &target_id);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.useSkillToIdReal(fd, sd, skill_id, skill_lv, target_id);
+	}
+	if (HPMHooks.count.HP_clif_useSkillToIdReal_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd, int skill_id, int skill_lv, int target_id);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_useSkillToIdReal_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_useSkillToIdReal_post[hIndex].func;
+			postHookFunc(fd, sd, skill_id, skill_lv, target_id);
+		}
+	}
+	return;
+}
 void HP_clif_pUseSkillToId(int fd, struct map_session_data *sd) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_pUseSkillToId_pre > 0) {
@@ -22456,6 +22638,58 @@ void HP_clif_pUseSkillToId(int fd, struct map_session_data *sd) {
 	}
 	return;
 }
+void HP_clif_pStartUseSkillToId(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pStartUseSkillToId_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pStartUseSkillToId_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pStartUseSkillToId_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pStartUseSkillToId(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pStartUseSkillToId_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pStartUseSkillToId_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pStartUseSkillToId_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_pStopUseSkillToId(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pStopUseSkillToId_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pStopUseSkillToId_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pStopUseSkillToId_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pStopUseSkillToId(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pStopUseSkillToId_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pStopUseSkillToId_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pStopUseSkillToId_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
 void HP_clif_pUseSkillToId_homun(struct homun_data *hd, struct map_session_data *sd, int64 tick, uint16 skill_id, uint16 skill_lv, int target_id) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_pUseSkillToId_homun_pre > 0) {
@@ -29044,6 +29278,32 @@ bool HP_clif_enchant_equipment(struct map_session_data *sd, enum equip_pos pos,
 	}
 	return retVal___;
 }
+void HP_clif_pReqRemainTime(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pReqRemainTime_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReqRemainTime_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pReqRemainTime_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pReqRemainTime(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pReqRemainTime_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pReqRemainTime_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pReqRemainTime_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
 /* cmdline_interface */
 void HP_cmdline_init(void) {
 	int hIndex = 0;
@@ -64857,6 +65117,33 @@ bool HP_pc_has_second_costume(struct map_session_data *sd) {
 	}
 	return retVal___;
 }
+bool HP_pc_expandInventory(struct map_session_data *sd, int adjustSize) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_pc_expandInventory_pre > 0) {
+		bool (*preHookFunc) (struct map_session_data **sd, int *adjustSize);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_expandInventory_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_pc_expandInventory_pre[hIndex].func;
+			retVal___ = preHookFunc(&sd, &adjustSize);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.pc.expandInventory(sd, adjustSize);
+	}
+	if (HPMHooks.count.HP_pc_expandInventory_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int adjustSize);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_expandInventory_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_pc_expandInventory_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sd, adjustSize);
+		}
+	}
+	return retVal___;
+}
 /* pcre_interface */
 pcre* HP_libpcre_compile(const char *pattern, int options, const char **errptr, int *erroffset, const unsigned char *tableptr) {
 	int hIndex = 0;