diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 6a73684f00d..d009d9b8579 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -9036,8 +9036,8 @@ typedef void (*HPMHOOK_pre_status_final) (void);
 typedef void (*HPMHOOK_post_status_final) (void);
 typedef int (*HPMHOOK_pre_status_sc2skill) (sc_type *sc);
 typedef int (*HPMHOOK_post_status_sc2skill) (int retVal___, sc_type sc);
-typedef enum scb_flag (*HPMHOOK_pre_status_sc2scb_flag) (sc_type *sc);
-typedef enum scb_flag (*HPMHOOK_post_status_sc2scb_flag) (enum scb_flag retVal___, sc_type sc);
+typedef e_scb_flag (*HPMHOOK_pre_status_sc2scb_flag) (sc_type *sc);
+typedef e_scb_flag (*HPMHOOK_post_status_sc2scb_flag) (e_scb_flag retVal___, sc_type sc);
 typedef int (*HPMHOOK_pre_status_get_sc_relevant_bl_types) (sc_type *type);
 typedef int (*HPMHOOK_post_status_get_sc_relevant_bl_types) (int retVal___, sc_type type);
 typedef int (*HPMHOOK_pre_status_get_sc_type) (sc_type *idx);
@@ -9122,8 +9122,8 @@ typedef int (*HPMHOOK_pre_status_get_val_flag) (enum sc_type *type);
 typedef int (*HPMHOOK_post_status_get_val_flag) (int retVal___, enum sc_type type);
 typedef void (*HPMHOOK_pre_status_change_start_display) (struct map_session_data **sd, enum sc_type *type, int *val1, int *val2, int *val3, int *val4);
 typedef void (*HPMHOOK_post_status_change_start_display) (struct map_session_data *sd, enum sc_type type, int val1, int val2, int val3, int val4);
-typedef bool (*HPMHOOK_pre_status_change_start_unknown_sc) (struct block_list **src, struct block_list **bl, enum sc_type *type, enum scb_flag *calc_flag, int *rate, int *val1, int *val2, int *val3, int *val4, int *total_tick, int *flag);
-typedef bool (*HPMHOOK_post_status_change_start_unknown_sc) (bool retVal___, struct block_list *src, struct block_list *bl, enum sc_type type, enum scb_flag calc_flag, int rate, int val1, int val2, int val3, int val4, int total_tick, int flag);
+typedef bool (*HPMHOOK_pre_status_change_start_unknown_sc) (struct block_list **src, struct block_list **bl, enum sc_type *type, e_scb_flag *calc_flag, int *rate, int *val1, int *val2, int *val3, int *val4, int *total_tick, int *flag);
+typedef bool (*HPMHOOK_post_status_change_start_unknown_sc) (bool retVal___, struct block_list *src, struct block_list *bl, enum sc_type type, e_scb_flag calc_flag, int rate, int val1, int val2, int val3, int val4, int total_tick, int flag);
 typedef int (*HPMHOOK_pre_status_kaahi_heal_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
 typedef int (*HPMHOOK_post_status_kaahi_heal_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
 typedef int (*HPMHOOK_pre_status_change_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
@@ -9134,8 +9134,8 @@ typedef int (*HPMHOOK_pre_status_change_clear) (struct block_list **bl, int *typ
 typedef int (*HPMHOOK_post_status_change_clear) (int retVal___, struct block_list *bl, int type);
 typedef int (*HPMHOOK_pre_status_change_clear_buffs) (struct block_list **bl, int *type);
 typedef int (*HPMHOOK_post_status_change_clear_buffs) (int retVal___, struct block_list *bl, int type);
-typedef void (*HPMHOOK_pre_status_calc_bl_) (struct block_list **bl, enum scb_flag *flag, enum e_status_calc_opt *opt);
-typedef void (*HPMHOOK_post_status_calc_bl_) (struct block_list *bl, enum scb_flag flag, enum e_status_calc_opt opt);
+typedef void (*HPMHOOK_pre_status_calc_bl_) (struct block_list **bl, e_scb_flag *flag, enum e_status_calc_opt *opt);
+typedef void (*HPMHOOK_post_status_calc_bl_) (struct block_list *bl, e_scb_flag flag, enum e_status_calc_opt opt);
 typedef int (*HPMHOOK_pre_status_calc_mob_) (struct mob_data **md, enum e_status_calc_opt *opt);
 typedef int (*HPMHOOK_post_status_calc_mob_) (int retVal___, struct mob_data *md, enum e_status_calc_opt opt);
 typedef int (*HPMHOOK_pre_status_calc_pet_) (struct pet_data **pd, enum e_status_calc_opt *opt);
@@ -9278,8 +9278,8 @@ typedef uint32 (*HPMHOOK_pre_status_calc_mode) (const struct block_list **bl, co
 typedef uint32 (*HPMHOOK_post_status_calc_mode) (uint32 retVal___, const struct block_list *bl, const struct status_change *sc, uint32 mode);
 typedef int (*HPMHOOK_pre_status_calc_ematk) (struct block_list **bl, struct status_change **sc, int *matk);
 typedef int (*HPMHOOK_post_status_calc_ematk) (int retVal___, struct block_list *bl, struct status_change *sc, int matk);
-typedef void (*HPMHOOK_pre_status_calc_bl_main) (struct block_list **bl, enum scb_flag *flag);
-typedef void (*HPMHOOK_post_status_calc_bl_main) (struct block_list *bl, enum scb_flag flag);
+typedef void (*HPMHOOK_pre_status_calc_bl_main) (struct block_list **bl, e_scb_flag *flag);
+typedef void (*HPMHOOK_post_status_calc_bl_main) (struct block_list *bl, e_scb_flag flag);
 typedef void (*HPMHOOK_pre_status_display_add) (struct map_session_data **sd, enum sc_type *type, int *dval1, int *dval2, int *dval3);
 typedef void (*HPMHOOK_post_status_display_add) (struct map_session_data *sd, enum sc_type type, int dval1, int dval2, int dval3);
 typedef void (*HPMHOOK_pre_status_display_remove) (struct map_session_data **sd, enum sc_type *type);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index e5c0ee65e27..0ebb8ceb515 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -92907,11 +92907,11 @@ int HP_status_sc2skill(sc_type sc) {
 	}
 	return retVal___;
 }
-enum scb_flag HP_status_sc2scb_flag(sc_type sc) {
+e_scb_flag HP_status_sc2scb_flag(sc_type sc) {
 	int hIndex = 0;
-	enum scb_flag retVal___ = SCB_NONE;
+	e_scb_flag retVal___ = SCB_NONE;
 	if (HPMHooks.count.HP_status_sc2scb_flag_pre > 0) {
-		enum scb_flag (*preHookFunc) (sc_type *sc);
+		e_scb_flag (*preHookFunc) (sc_type *sc);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_sc2scb_flag_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_sc2scb_flag_pre[hIndex].func;
@@ -92926,7 +92926,7 @@ enum scb_flag HP_status_sc2scb_flag(sc_type sc) {
 		retVal___ = HPMHooks.source.status.sc2scb_flag(sc);
 	}
 	if (HPMHooks.count.HP_status_sc2scb_flag_post > 0) {
-		enum scb_flag (*postHookFunc) (enum scb_flag retVal___, sc_type sc);
+		e_scb_flag (*postHookFunc) (e_scb_flag retVal___, sc_type sc);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_sc2scb_flag_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_sc2scb_flag_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, sc);
@@ -94064,11 +94064,11 @@ void HP_status_change_start_display(struct map_session_data *sd, enum sc_type ty
 	}
 	return;
 }
-bool HP_status_change_start_unknown_sc(struct block_list *src, struct block_list *bl, enum sc_type type, enum scb_flag calc_flag, int rate, int val1, int val2, int val3, int val4, int total_tick, int flag) {
+bool HP_status_change_start_unknown_sc(struct block_list *src, struct block_list *bl, enum sc_type type, e_scb_flag calc_flag, int rate, int val1, int val2, int val3, int val4, int total_tick, int flag) {
 	int hIndex = 0;
 	bool retVal___ = false;
 	if (HPMHooks.count.HP_status_change_start_unknown_sc_pre > 0) {
-		bool (*preHookFunc) (struct block_list **src, struct block_list **bl, enum sc_type *type, enum scb_flag *calc_flag, int *rate, int *val1, int *val2, int *val3, int *val4, int *total_tick, int *flag);
+		bool (*preHookFunc) (struct block_list **src, struct block_list **bl, enum sc_type *type, e_scb_flag *calc_flag, int *rate, int *val1, int *val2, int *val3, int *val4, int *total_tick, int *flag);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_change_start_unknown_sc_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_change_start_unknown_sc_pre[hIndex].func;
@@ -94083,7 +94083,7 @@ bool HP_status_change_start_unknown_sc(struct block_list *src, struct block_list
 		retVal___ = HPMHooks.source.status.change_start_unknown_sc(src, bl, type, calc_flag, rate, val1, val2, val3, val4, total_tick, flag);
 	}
 	if (HPMHooks.count.HP_status_change_start_unknown_sc_post > 0) {
-		bool (*postHookFunc) (bool retVal___, struct block_list *src, struct block_list *bl, enum sc_type type, enum scb_flag calc_flag, int rate, int val1, int val2, int val3, int val4, int total_tick, int flag);
+		bool (*postHookFunc) (bool retVal___, struct block_list *src, struct block_list *bl, enum sc_type type, e_scb_flag calc_flag, int rate, int val1, int val2, int val3, int val4, int total_tick, int flag);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_change_start_unknown_sc_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_change_start_unknown_sc_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, src, bl, type, calc_flag, rate, val1, val2, val3, val4, total_tick, flag);
@@ -94232,10 +94232,10 @@ int HP_status_change_clear_buffs(struct block_list *bl, int type) {
 	}
 	return retVal___;
 }
-void HP_status_calc_bl_(struct block_list *bl, enum scb_flag flag, enum e_status_calc_opt opt) {
+void HP_status_calc_bl_(struct block_list *bl, e_scb_flag flag, enum e_status_calc_opt opt) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_status_calc_bl__pre > 0) {
-		void (*preHookFunc) (struct block_list **bl, enum scb_flag *flag, enum e_status_calc_opt *opt);
+		void (*preHookFunc) (struct block_list **bl, e_scb_flag *flag, enum e_status_calc_opt *opt);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_bl__pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_calc_bl__pre[hIndex].func;
@@ -94250,7 +94250,7 @@ void HP_status_calc_bl_(struct block_list *bl, enum scb_flag flag, enum e_status
 		HPMHooks.source.status.calc_bl_(bl, flag, opt);
 	}
 	if (HPMHooks.count.HP_status_calc_bl__post > 0) {
-		void (*postHookFunc) (struct block_list *bl, enum scb_flag flag, enum e_status_calc_opt opt);
+		void (*postHookFunc) (struct block_list *bl, e_scb_flag flag, enum e_status_calc_opt opt);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_bl__post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_calc_bl__post[hIndex].func;
 			postHookFunc(bl, flag, opt);
@@ -96160,10 +96160,10 @@ int HP_status_calc_ematk(struct block_list *bl, struct status_change *sc, int ma
 	}
 	return retVal___;
 }
-void HP_status_calc_bl_main(struct block_list *bl, enum scb_flag flag) {
+void HP_status_calc_bl_main(struct block_list *bl, e_scb_flag flag) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_status_calc_bl_main_pre > 0) {
-		void (*preHookFunc) (struct block_list **bl, enum scb_flag *flag);
+		void (*preHookFunc) (struct block_list **bl, e_scb_flag *flag);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_bl_main_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_status_calc_bl_main_pre[hIndex].func;
@@ -96178,7 +96178,7 @@ void HP_status_calc_bl_main(struct block_list *bl, enum scb_flag flag) {
 		HPMHooks.source.status.calc_bl_main(bl, flag);
 	}
 	if (HPMHooks.count.HP_status_calc_bl_main_post > 0) {
-		void (*postHookFunc) (struct block_list *bl, enum scb_flag flag);
+		void (*postHookFunc) (struct block_list *bl, e_scb_flag flag);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_bl_main_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_status_calc_bl_main_post[hIndex].func;
 			postHookFunc(bl, flag);