Update HPM

6 files changed, 78 insertions, 73 deletions

diff --git a/src/common/HPMDataCheck.h b/src/common/HPMDataCheck.h
index 0e9be9b60..4bf396250 100644
--- a/src/common/HPMDataCheck.h
+++ b/src/common/HPMDataCheck.h
@@ -132,6 +132,11 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 	#else
 		#define CHAR_MAPIF_H
 	#endif // CHAR_MAPIF_H
+	#ifdef CHAR_PACKETS_HC_STRUCT_H
+		{ "PACKET_HC_ACK_CHARINFO_PER_PAGE", sizeof(struct PACKET_HC_ACK_CHARINFO_PER_PAGE), SERVER_TYPE_CHAR },
+	#else
+		#define CHAR_PACKETS_HC_STRUCT_H
+	#endif // CHAR_PACKETS_HC_STRUCT_H
 	#ifdef CHAR_PINCODE_H
 		{ "pincode_interface", sizeof(struct pincode_interface), SERVER_TYPE_CHAR },
 	#else
diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 9b913331a..92a59475b 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -538,8 +538,8 @@ typedef int (*HPMHOOK_pre_chr_memitemdata_to_sql) (const struct item *items[], i
 typedef int (*HPMHOOK_post_chr_memitemdata_to_sql) (int retVal___, const struct item items[], int id, enum inventory_table_type table);
 typedef int (*HPMHOOK_pre_chr_mmo_gender) (const struct char_session_data **sd, const struct mmo_charstatus **p, char *sex);
 typedef int (*HPMHOOK_post_chr_mmo_gender) (int retVal___, const struct char_session_data *sd, const struct mmo_charstatus *p, char sex);
-typedef int (*HPMHOOK_pre_chr_mmo_chars_fromsql) (struct char_session_data **sd, uint8 **buf);
-typedef int (*HPMHOOK_post_chr_mmo_chars_fromsql) (int retVal___, struct char_session_data *sd, uint8 *buf);
+typedef int (*HPMHOOK_pre_chr_mmo_chars_fromsql) (struct char_session_data **sd, uint8 **buf, int **count);
+typedef int (*HPMHOOK_post_chr_mmo_chars_fromsql) (int retVal___, struct char_session_data *sd, uint8 *buf, int *count);
 typedef int (*HPMHOOK_pre_chr_mmo_char_fromsql) (int *char_id, struct mmo_charstatus **p, bool *load_everything);
 typedef int (*HPMHOOK_post_chr_mmo_char_fromsql) (int retVal___, int char_id, struct mmo_charstatus *p, bool load_everything);
 typedef int (*HPMHOOK_pre_chr_mmo_char_sql_init) (void);
@@ -560,8 +560,8 @@ typedef int (*HPMHOOK_pre_chr_count_users) (void);
 typedef int (*HPMHOOK_post_chr_count_users) (int retVal___);
 typedef int (*HPMHOOK_pre_chr_mmo_char_tobuf) (uint8 **buffer, struct mmo_charstatus **p);
 typedef int (*HPMHOOK_post_chr_mmo_char_tobuf) (int retVal___, uint8 *buffer, struct mmo_charstatus *p);
-typedef void (*HPMHOOK_pre_chr_mmo_char_send099d) (int *fd, struct char_session_data **sd);
-typedef void (*HPMHOOK_post_chr_mmo_char_send099d) (int fd, struct char_session_data *sd);
+typedef void (*HPMHOOK_pre_chr_send_HC_ACK_CHARINFO_PER_PAGE) (int *fd, struct char_session_data **sd);
+typedef void (*HPMHOOK_post_chr_send_HC_ACK_CHARINFO_PER_PAGE) (int fd, struct char_session_data *sd);
 typedef void (*HPMHOOK_pre_chr_mmo_char_send_ban_list) (int *fd, struct char_session_data **sd);
 typedef void (*HPMHOOK_post_chr_mmo_char_send_ban_list) (int fd, struct char_session_data *sd);
 typedef void (*HPMHOOK_pre_chr_mmo_char_send_slots_info) (int *fd, struct char_session_data **sd);
@@ -1160,12 +1160,12 @@ typedef void (*HPMHOOK_pre_clif_package_announce) (struct map_session_data **sd,
 typedef void (*HPMHOOK_post_clif_package_announce) (struct map_session_data *sd, int nameid, int containerid);
 typedef void (*HPMHOOK_pre_clif_item_drop_announce) (struct map_session_data **sd, int *nameid, char **monsterName);
 typedef void (*HPMHOOK_post_clif_item_drop_announce) (struct map_session_data *sd, int nameid, char *monsterName);
-typedef void (*HPMHOOK_pre_clif_clearunit_single) (int *id, clr_type *type, int *fd);
-typedef void (*HPMHOOK_post_clif_clearunit_single) (int id, clr_type type, int fd);
-typedef void (*HPMHOOK_pre_clif_clearunit_area) (struct block_list **bl, clr_type *type);
-typedef void (*HPMHOOK_post_clif_clearunit_area) (struct block_list *bl, clr_type type);
-typedef void (*HPMHOOK_pre_clif_clearunit_delayed) (struct block_list **bl, clr_type *type, int64 *tick);
-typedef void (*HPMHOOK_post_clif_clearunit_delayed) (struct block_list *bl, clr_type type, int64 tick);
+typedef void (*HPMHOOK_pre_clif_clearunit_single) (int *id, enum clr_type *type, int *fd);
+typedef void (*HPMHOOK_post_clif_clearunit_single) (int id, enum clr_type type, int fd);
+typedef void (*HPMHOOK_pre_clif_clearunit_area) (struct block_list **bl, enum clr_type *type);
+typedef void (*HPMHOOK_post_clif_clearunit_area) (struct block_list *bl, enum clr_type type);
+typedef void (*HPMHOOK_pre_clif_clearunit_delayed) (struct block_list **bl, enum clr_type *type, int64 *tick);
+typedef void (*HPMHOOK_post_clif_clearunit_delayed) (struct block_list *bl, enum clr_type type, int64 tick);
 typedef void (*HPMHOOK_pre_clif_walkok) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_walkok) (struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_move) (struct unit_data **ud);
@@ -5858,8 +5858,8 @@ typedef int (*HPMHOOK_pre_pc_setrestartvalue) (struct map_session_data **sd, int
 typedef int (*HPMHOOK_post_pc_setrestartvalue) (int retVal___, struct map_session_data *sd, int type);
 typedef int (*HPMHOOK_pre_pc_makesavestatus) (struct map_session_data **sd);
 typedef int (*HPMHOOK_post_pc_makesavestatus) (int retVal___, struct map_session_data *sd);
-typedef void (*HPMHOOK_pre_pc_respawn) (struct map_session_data **sd, clr_type *clrtype);
-typedef void (*HPMHOOK_post_pc_respawn) (struct map_session_data *sd, clr_type clrtype);
+typedef void (*HPMHOOK_pre_pc_respawn) (struct map_session_data **sd, enum clr_type *clrtype);
+typedef void (*HPMHOOK_post_pc_respawn) (struct map_session_data *sd, enum clr_type clrtype);
 typedef int (*HPMHOOK_pre_pc_setnewpc) (struct map_session_data **sd, int *account_id, int *char_id, int *login_id1, unsigned int *client_tick, int *sex, int *fd);
 typedef int (*HPMHOOK_post_pc_setnewpc) (int retVal___, struct map_session_data *sd, int account_id, int char_id, int login_id1, unsigned int client_tick, int sex, int fd);
 typedef bool (*HPMHOOK_pre_pc_authok) (struct map_session_data **sd, int *login_id2, time_t *expiration_time, int *group_id, const struct mmo_charstatus **st, bool *changing_mapservers);
@@ -5894,12 +5894,12 @@ typedef int (*HPMHOOK_pre_pc_calc_skilltree_normalize_job) (struct map_session_d
 typedef int (*HPMHOOK_post_pc_calc_skilltree_normalize_job) (int retVal___, struct map_session_data *sd);
 typedef int (*HPMHOOK_pre_pc_clean_skilltree) (struct map_session_data **sd);
 typedef int (*HPMHOOK_post_pc_clean_skilltree) (int retVal___, struct map_session_data *sd);
-typedef int (*HPMHOOK_pre_pc_setpos) (struct map_session_data **sd, unsigned short *map_index, int *x, int *y, clr_type *clrtype);
-typedef int (*HPMHOOK_post_pc_setpos) (int retVal___, struct map_session_data *sd, unsigned short map_index, int x, int y, clr_type clrtype);
+typedef int (*HPMHOOK_pre_pc_setpos) (struct map_session_data **sd, unsigned short *map_index, int *x, int *y, enum clr_type *clrtype);
+typedef int (*HPMHOOK_post_pc_setpos) (int retVal___, struct map_session_data *sd, unsigned short map_index, int x, int y, enum clr_type clrtype);
 typedef int (*HPMHOOK_pre_pc_setsavepoint) (struct map_session_data **sd, short *map_index, int *x, int *y);
 typedef int (*HPMHOOK_post_pc_setsavepoint) (int retVal___, struct map_session_data *sd, short map_index, int x, int y);
-typedef int (*HPMHOOK_pre_pc_randomwarp) (struct map_session_data **sd, clr_type *type);
-typedef int (*HPMHOOK_post_pc_randomwarp) (int retVal___, struct map_session_data *sd, clr_type type);
+typedef int (*HPMHOOK_pre_pc_randomwarp) (struct map_session_data **sd, enum clr_type *type);
+typedef int (*HPMHOOK_post_pc_randomwarp) (int retVal___, struct map_session_data *sd, enum clr_type type);
 typedef int (*HPMHOOK_pre_pc_memo) (struct map_session_data **sd, int *pos);
 typedef int (*HPMHOOK_post_pc_memo) (int retVal___, struct map_session_data *sd, int pos);
 typedef int (*HPMHOOK_pre_pc_checkadditem) (struct map_session_data **sd, int *nameid, int *amount);
@@ -8088,8 +8088,8 @@ typedef uint8 (*HPMHOOK_pre_unit_getdir) (struct block_list **bl);
 typedef uint8 (*HPMHOOK_post_unit_getdir) (uint8 retVal___, struct block_list *bl);
 typedef int (*HPMHOOK_pre_unit_blown) (struct block_list **bl, int *dx, int *dy, int *count, int *flag);
 typedef int (*HPMHOOK_post_unit_blown) (int retVal___, struct block_list *bl, int dx, int dy, int count, int flag);
-typedef int (*HPMHOOK_pre_unit_warp) (struct block_list **bl, short *m, short *x, short *y, clr_type *type);
-typedef int (*HPMHOOK_post_unit_warp) (int retVal___, struct block_list *bl, short m, short x, short y, clr_type type);
+typedef int (*HPMHOOK_pre_unit_warp) (struct block_list **bl, short *m, short *x, short *y, enum clr_type *type);
+typedef int (*HPMHOOK_post_unit_warp) (int retVal___, struct block_list *bl, short m, short x, short y, enum clr_type type);
 typedef int (*HPMHOOK_pre_unit_stop_walking) (struct block_list **bl, int *type);
 typedef int (*HPMHOOK_post_unit_stop_walking) (int retVal___, struct block_list *bl, int type);
 typedef int (*HPMHOOK_pre_unit_skilluse_id) (struct block_list **src, int *target_id, uint16 *skill_id, uint16 *skill_lv);
@@ -8140,14 +8140,14 @@ typedef int (*HPMHOOK_pre_unit_fixdamage) (struct block_list **src, struct block
 typedef int (*HPMHOOK_post_unit_fixdamage) (int retVal___, struct block_list *src, struct block_list *target, int sdelay, int ddelay, int64 damage, short div, unsigned char type, int64 damage2);
 typedef int (*HPMHOOK_pre_unit_changeviewsize) (struct block_list **bl, short *size);
 typedef int (*HPMHOOK_post_unit_changeviewsize) (int retVal___, struct block_list *bl, short size);
-typedef int (*HPMHOOK_pre_unit_remove_map) (struct block_list **bl, clr_type *clrtype, const char **file, int *line, const char **func);
-typedef int (*HPMHOOK_post_unit_remove_map) (int retVal___, struct block_list *bl, clr_type clrtype, const char *file, int line, const char *func);
-typedef void (*HPMHOOK_pre_unit_remove_map_pc) (struct map_session_data **sd, clr_type *clrtype);
-typedef void (*HPMHOOK_post_unit_remove_map_pc) (struct map_session_data *sd, clr_type clrtype);
+typedef int (*HPMHOOK_pre_unit_remove_map) (struct block_list **bl, enum clr_type *clrtype, const char **file, int *line, const char **func);
+typedef int (*HPMHOOK_post_unit_remove_map) (int retVal___, struct block_list *bl, enum clr_type clrtype, const char *file, int line, const char *func);
+typedef void (*HPMHOOK_pre_unit_remove_map_pc) (struct map_session_data **sd, enum clr_type *clrtype);
+typedef void (*HPMHOOK_post_unit_remove_map_pc) (struct map_session_data *sd, enum clr_type clrtype);
 typedef void (*HPMHOOK_pre_unit_free_pc) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_unit_free_pc) (struct map_session_data *sd);
-typedef int (*HPMHOOK_pre_unit_free) (struct block_list **bl, clr_type *clrtype);
-typedef int (*HPMHOOK_post_unit_free) (int retVal___, struct block_list *bl, clr_type clrtype);
+typedef int (*HPMHOOK_pre_unit_free) (struct block_list **bl, enum clr_type *clrtype);
+typedef int (*HPMHOOK_post_unit_free) (int retVal___, struct block_list *bl, enum clr_type clrtype);
 #endif // MAP_UNIT_H
 #ifdef MAP_VENDING_H /* vending */
 typedef void (*HPMHOOK_pre_vending_init) (bool *minimal);
diff --git a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
index d5babae97..3bbfc8670 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
@@ -90,8 +90,8 @@ struct {
 	struct HPMHookPoint *HP_chr_count_users_post;
 	struct HPMHookPoint *HP_chr_mmo_char_tobuf_pre;
 	struct HPMHookPoint *HP_chr_mmo_char_tobuf_post;
-	struct HPMHookPoint *HP_chr_mmo_char_send099d_pre;
-	struct HPMHookPoint *HP_chr_mmo_char_send099d_post;
+	struct HPMHookPoint *HP_chr_send_HC_ACK_CHARINFO_PER_PAGE_pre;
+	struct HPMHookPoint *HP_chr_send_HC_ACK_CHARINFO_PER_PAGE_post;
 	struct HPMHookPoint *HP_chr_mmo_char_send_ban_list_pre;
 	struct HPMHookPoint *HP_chr_mmo_char_send_ban_list_post;
 	struct HPMHookPoint *HP_chr_mmo_char_send_slots_info_pre;
@@ -1725,8 +1725,8 @@ struct {
 	int HP_chr_count_users_post;
 	int HP_chr_mmo_char_tobuf_pre;
 	int HP_chr_mmo_char_tobuf_post;
-	int HP_chr_mmo_char_send099d_pre;
-	int HP_chr_mmo_char_send099d_post;
+	int HP_chr_send_HC_ACK_CHARINFO_PER_PAGE_pre;
+	int HP_chr_send_HC_ACK_CHARINFO_PER_PAGE_post;
 	int HP_chr_mmo_char_send_ban_list_pre;
 	int HP_chr_mmo_char_send_ban_list_post;
 	int HP_chr_mmo_char_send_slots_info_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
index 55f2df4ce..96f210386 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
@@ -60,7 +60,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(chr->divorce_char_sql, HP_chr_divorce_char_sql) },
 	{ HP_POP(chr->count_users, HP_chr_count_users) },
 	{ HP_POP(chr->mmo_char_tobuf, HP_chr_mmo_char_tobuf) },
-	{ HP_POP(chr->mmo_char_send099d, HP_chr_mmo_char_send099d) },
+	{ HP_POP(chr->send_HC_ACK_CHARINFO_PER_PAGE, HP_chr_send_HC_ACK_CHARINFO_PER_PAGE) },
 	{ HP_POP(chr->mmo_char_send_ban_list, HP_chr_mmo_char_send_ban_list) },
 	{ HP_POP(chr->mmo_char_send_slots_info, HP_chr_mmo_char_send_slots_info) },
 	{ HP_POP(chr->mmo_char_send_characters, HP_chr_mmo_char_send_characters) },
diff --git a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
index 5f20fd224..dc0256ff3 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
@@ -609,15 +609,15 @@ int HP_chr_mmo_gender(const struct char_session_data *sd, const struct mmo_chars
 	}
 	return retVal___;
 }
-int HP_chr_mmo_chars_fromsql(struct char_session_data *sd, uint8 *buf) {
+int HP_chr_mmo_chars_fromsql(struct char_session_data *sd, uint8 *buf, int *count) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_chr_mmo_chars_fromsql_pre > 0) {
-		int (*preHookFunc) (struct char_session_data **sd, uint8 **buf);
+		int (*preHookFunc) (struct char_session_data **sd, uint8 **buf, int **count);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_chars_fromsql_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_chr_mmo_chars_fromsql_pre[hIndex].func;
-			retVal___ = preHookFunc(&sd, &buf);
+			retVal___ = preHookFunc(&sd, &buf, &count);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -625,13 +625,13 @@ int HP_chr_mmo_chars_fromsql(struct char_session_data *sd, uint8 *buf) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.chr.mmo_chars_fromsql(sd, buf);
+		retVal___ = HPMHooks.source.chr.mmo_chars_fromsql(sd, buf, count);
 	}
 	if (HPMHooks.count.HP_chr_mmo_chars_fromsql_post > 0) {
-		int (*postHookFunc) (int retVal___, struct char_session_data *sd, uint8 *buf);
+		int (*postHookFunc) (int retVal___, struct char_session_data *sd, uint8 *buf, int *count);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_chars_fromsql_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_chr_mmo_chars_fromsql_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, sd, buf);
+			retVal___ = postHookFunc(retVal___, sd, buf, count);
 		}
 	}
 	return retVal___;
@@ -906,13 +906,13 @@ int HP_chr_mmo_char_tobuf(uint8 *buffer, struct mmo_charstatus *p) {
 	}
 	return retVal___;
 }
-void HP_chr_mmo_char_send099d(int fd, struct char_session_data *sd) {
+void HP_chr_send_HC_ACK_CHARINFO_PER_PAGE(int fd, struct char_session_data *sd) {
 	int hIndex = 0;
-	if (HPMHooks.count.HP_chr_mmo_char_send099d_pre > 0) {
+	if (HPMHooks.count.HP_chr_send_HC_ACK_CHARINFO_PER_PAGE_pre > 0) {
 		void (*preHookFunc) (int *fd, struct char_session_data **sd);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_char_send099d_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_chr_mmo_char_send099d_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_chr_send_HC_ACK_CHARINFO_PER_PAGE_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_chr_send_HC_ACK_CHARINFO_PER_PAGE_pre[hIndex].func;
 			preHookFunc(&fd, &sd);
 		}
 		if (*HPMforce_return) {
@@ -921,12 +921,12 @@ void HP_chr_mmo_char_send099d(int fd, struct char_session_data *sd) {
 		}
 	}
 	{
-		HPMHooks.source.chr.mmo_char_send099d(fd, sd);
+		HPMHooks.source.chr.send_HC_ACK_CHARINFO_PER_PAGE(fd, sd);
 	}
-	if (HPMHooks.count.HP_chr_mmo_char_send099d_post > 0) {
+	if (HPMHooks.count.HP_chr_send_HC_ACK_CHARINFO_PER_PAGE_post > 0) {
 		void (*postHookFunc) (int fd, struct char_session_data *sd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_chr_mmo_char_send099d_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_chr_mmo_char_send099d_post[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_chr_send_HC_ACK_CHARINFO_PER_PAGE_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_chr_send_HC_ACK_CHARINFO_PER_PAGE_post[hIndex].func;
 			postHookFunc(fd, sd);
 		}
 	}
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index 2306d72aa..cda212a38 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -9786,10 +9786,10 @@ void HP_clif_item_drop_announce(struct map_session_data *sd, int nameid, char *m
 	}
 	return;
 }
-void HP_clif_clearunit_single(int id, clr_type type, int fd) {
+void HP_clif_clearunit_single(int id, enum clr_type type, int fd) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_clearunit_single_pre > 0) {
-		void (*preHookFunc) (int *id, clr_type *type, int *fd);
+		void (*preHookFunc) (int *id, enum clr_type *type, int *fd);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearunit_single_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_clif_clearunit_single_pre[hIndex].func;
@@ -9804,7 +9804,7 @@ void HP_clif_clearunit_single(int id, clr_type type, int fd) {
 		HPMHooks.source.clif.clearunit_single(id, type, fd);
 	}
 	if (HPMHooks.count.HP_clif_clearunit_single_post > 0) {
-		void (*postHookFunc) (int id, clr_type type, int fd);
+		void (*postHookFunc) (int id, enum clr_type type, int fd);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearunit_single_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_clif_clearunit_single_post[hIndex].func;
 			postHookFunc(id, type, fd);
@@ -9812,10 +9812,10 @@ void HP_clif_clearunit_single(int id, clr_type type, int fd) {
 	}
 	return;
 }
-void HP_clif_clearunit_area(struct block_list *bl, clr_type type) {
+void HP_clif_clearunit_area(struct block_list *bl, enum clr_type type) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_clearunit_area_pre > 0) {
-		void (*preHookFunc) (struct block_list **bl, clr_type *type);
+		void (*preHookFunc) (struct block_list **bl, enum clr_type *type);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearunit_area_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_clif_clearunit_area_pre[hIndex].func;
@@ -9830,7 +9830,7 @@ void HP_clif_clearunit_area(struct block_list *bl, clr_type type) {
 		HPMHooks.source.clif.clearunit_area(bl, type);
 	}
 	if (HPMHooks.count.HP_clif_clearunit_area_post > 0) {
-		void (*postHookFunc) (struct block_list *bl, clr_type type);
+		void (*postHookFunc) (struct block_list *bl, enum clr_type type);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearunit_area_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_clif_clearunit_area_post[hIndex].func;
 			postHookFunc(bl, type);
@@ -9838,10 +9838,10 @@ void HP_clif_clearunit_area(struct block_list *bl, clr_type type) {
 	}
 	return;
 }
-void HP_clif_clearunit_delayed(struct block_list *bl, clr_type type, int64 tick) {
+void HP_clif_clearunit_delayed(struct block_list *bl, enum clr_type type, int64 tick) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_clearunit_delayed_pre > 0) {
-		void (*preHookFunc) (struct block_list **bl, clr_type *type, int64 *tick);
+		void (*preHookFunc) (struct block_list **bl, enum clr_type *type, int64 *tick);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearunit_delayed_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_clif_clearunit_delayed_pre[hIndex].func;
@@ -9856,7 +9856,7 @@ void HP_clif_clearunit_delayed(struct block_list *bl, clr_type type, int64 tick)
 		HPMHooks.source.clif.clearunit_delayed(bl, type, tick);
 	}
 	if (HPMHooks.count.HP_clif_clearunit_delayed_post > 0) {
-		void (*postHookFunc) (struct block_list *bl, clr_type type, int64 tick);
+		void (*postHookFunc) (struct block_list *bl, enum clr_type type, int64 tick);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_clearunit_delayed_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_clif_clearunit_delayed_post[hIndex].func;
 			postHookFunc(bl, type, tick);
@@ -58749,10 +58749,10 @@ int HP_pc_makesavestatus(struct map_session_data *sd) {
 	}
 	return retVal___;
 }
-void HP_pc_respawn(struct map_session_data *sd, clr_type clrtype) {
+void HP_pc_respawn(struct map_session_data *sd, enum clr_type clrtype) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_pc_respawn_pre > 0) {
-		void (*preHookFunc) (struct map_session_data **sd, clr_type *clrtype);
+		void (*preHookFunc) (struct map_session_data **sd, enum clr_type *clrtype);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_respawn_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_pc_respawn_pre[hIndex].func;
@@ -58767,7 +58767,7 @@ void HP_pc_respawn(struct map_session_data *sd, clr_type clrtype) {
 		HPMHooks.source.pc.respawn(sd, clrtype);
 	}
 	if (HPMHooks.count.HP_pc_respawn_post > 0) {
-		void (*postHookFunc) (struct map_session_data *sd, clr_type clrtype);
+		void (*postHookFunc) (struct map_session_data *sd, enum clr_type clrtype);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_respawn_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_pc_respawn_post[hIndex].func;
 			postHookFunc(sd, clrtype);
@@ -59231,11 +59231,11 @@ int HP_pc_clean_skilltree(struct map_session_data *sd) {
 	}
 	return retVal___;
 }
-int HP_pc_setpos(struct map_session_data *sd, unsigned short map_index, int x, int y, clr_type clrtype) {
+int HP_pc_setpos(struct map_session_data *sd, unsigned short map_index, int x, int y, enum clr_type clrtype) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_pc_setpos_pre > 0) {
-		int (*preHookFunc) (struct map_session_data **sd, unsigned short *map_index, int *x, int *y, clr_type *clrtype);
+		int (*preHookFunc) (struct map_session_data **sd, unsigned short *map_index, int *x, int *y, enum clr_type *clrtype);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_setpos_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_pc_setpos_pre[hIndex].func;
@@ -59250,7 +59250,7 @@ int HP_pc_setpos(struct map_session_data *sd, unsigned short map_index, int x, i
 		retVal___ = HPMHooks.source.pc.setpos(sd, map_index, x, y, clrtype);
 	}
 	if (HPMHooks.count.HP_pc_setpos_post > 0) {
-		int (*postHookFunc) (int retVal___, struct map_session_data *sd, unsigned short map_index, int x, int y, clr_type clrtype);
+		int (*postHookFunc) (int retVal___, struct map_session_data *sd, unsigned short map_index, int x, int y, enum clr_type clrtype);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_setpos_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_pc_setpos_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, sd, map_index, x, y, clrtype);
@@ -59285,11 +59285,11 @@ int HP_pc_setsavepoint(struct map_session_data *sd, short map_index, int x, int
 	}
 	return retVal___;
 }
-int HP_pc_randomwarp(struct map_session_data *sd, clr_type type) {
+int HP_pc_randomwarp(struct map_session_data *sd, enum clr_type type) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_pc_randomwarp_pre > 0) {
-		int (*preHookFunc) (struct map_session_data **sd, clr_type *type);
+		int (*preHookFunc) (struct map_session_data **sd, enum clr_type *type);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_randomwarp_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_pc_randomwarp_pre[hIndex].func;
@@ -59304,7 +59304,7 @@ int HP_pc_randomwarp(struct map_session_data *sd, clr_type type) {
 		retVal___ = HPMHooks.source.pc.randomwarp(sd, type);
 	}
 	if (HPMHooks.count.HP_pc_randomwarp_post > 0) {
-		int (*postHookFunc) (int retVal___, struct map_session_data *sd, clr_type type);
+		int (*postHookFunc) (int retVal___, struct map_session_data *sd, enum clr_type type);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_randomwarp_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_pc_randomwarp_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, sd, type);
@@ -87973,11 +87973,11 @@ int HP_unit_blown(struct block_list *bl, int dx, int dy, int count, int flag) {
 	}
 	return retVal___;
 }
-int HP_unit_warp(struct block_list *bl, short m, short x, short y, clr_type type) {
+int HP_unit_warp(struct block_list *bl, short m, short x, short y, enum clr_type type) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_unit_warp_pre > 0) {
-		int (*preHookFunc) (struct block_list **bl, short *m, short *x, short *y, clr_type *type);
+		int (*preHookFunc) (struct block_list **bl, short *m, short *x, short *y, enum clr_type *type);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_warp_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_unit_warp_pre[hIndex].func;
@@ -87992,7 +87992,7 @@ int HP_unit_warp(struct block_list *bl, short m, short x, short y, clr_type type
 		retVal___ = HPMHooks.source.unit.warp(bl, m, x, y, type);
 	}
 	if (HPMHooks.count.HP_unit_warp_post > 0) {
-		int (*postHookFunc) (int retVal___, struct block_list *bl, short m, short x, short y, clr_type type);
+		int (*postHookFunc) (int retVal___, struct block_list *bl, short m, short x, short y, enum clr_type type);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_warp_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_unit_warp_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl, m, x, y, type);
@@ -88672,11 +88672,11 @@ int HP_unit_changeviewsize(struct block_list *bl, short size) {
 	}
 	return retVal___;
 }
-int HP_unit_remove_map(struct block_list *bl, clr_type clrtype, const char *file, int line, const char *func) {
+int HP_unit_remove_map(struct block_list *bl, enum clr_type clrtype, const char *file, int line, const char *func) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_unit_remove_map_pre > 0) {
-		int (*preHookFunc) (struct block_list **bl, clr_type *clrtype, const char **file, int *line, const char **func);
+		int (*preHookFunc) (struct block_list **bl, enum clr_type *clrtype, const char **file, int *line, const char **func);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_remove_map_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_unit_remove_map_pre[hIndex].func;
@@ -88691,7 +88691,7 @@ int HP_unit_remove_map(struct block_list *bl, clr_type clrtype, const char *file
 		retVal___ = HPMHooks.source.unit.remove_map(bl, clrtype, file, line, func);
 	}
 	if (HPMHooks.count.HP_unit_remove_map_post > 0) {
-		int (*postHookFunc) (int retVal___, struct block_list *bl, clr_type clrtype, const char *file, int line, const char *func);
+		int (*postHookFunc) (int retVal___, struct block_list *bl, enum clr_type clrtype, const char *file, int line, const char *func);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_remove_map_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_unit_remove_map_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl, clrtype, file, line, func);
@@ -88699,10 +88699,10 @@ int HP_unit_remove_map(struct block_list *bl, clr_type clrtype, const char *file
 	}
 	return retVal___;
 }
-void HP_unit_remove_map_pc(struct map_session_data *sd, clr_type clrtype) {
+void HP_unit_remove_map_pc(struct map_session_data *sd, enum clr_type clrtype) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_unit_remove_map_pc_pre > 0) {
-		void (*preHookFunc) (struct map_session_data **sd, clr_type *clrtype);
+		void (*preHookFunc) (struct map_session_data **sd, enum clr_type *clrtype);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_remove_map_pc_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_unit_remove_map_pc_pre[hIndex].func;
@@ -88717,7 +88717,7 @@ void HP_unit_remove_map_pc(struct map_session_data *sd, clr_type clrtype) {
 		HPMHooks.source.unit.remove_map_pc(sd, clrtype);
 	}
 	if (HPMHooks.count.HP_unit_remove_map_pc_post > 0) {
-		void (*postHookFunc) (struct map_session_data *sd, clr_type clrtype);
+		void (*postHookFunc) (struct map_session_data *sd, enum clr_type clrtype);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_remove_map_pc_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_unit_remove_map_pc_post[hIndex].func;
 			postHookFunc(sd, clrtype);
@@ -88751,11 +88751,11 @@ void HP_unit_free_pc(struct map_session_data *sd) {
 	}
 	return;
 }
-int HP_unit_free(struct block_list *bl, clr_type clrtype) {
+int HP_unit_free(struct block_list *bl, enum clr_type clrtype) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if (HPMHooks.count.HP_unit_free_pre > 0) {
-		int (*preHookFunc) (struct block_list **bl, clr_type *clrtype);
+		int (*preHookFunc) (struct block_list **bl, enum clr_type *clrtype);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_free_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_unit_free_pre[hIndex].func;
@@ -88770,7 +88770,7 @@ int HP_unit_free(struct block_list *bl, clr_type clrtype) {
 		retVal___ = HPMHooks.source.unit.free(bl, clrtype);
 	}
 	if (HPMHooks.count.HP_unit_free_post > 0) {
-		int (*postHookFunc) (int retVal___, struct block_list *bl, clr_type clrtype);
+		int (*postHookFunc) (int retVal___, struct block_list *bl, enum clr_type clrtype);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_unit_free_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_unit_free_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, bl, clrtype);