HPM Hooks Update

1 files changed, 124 insertions, 64 deletions

diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 8aa1c6512..e1d9af73a 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -436,8 +436,10 @@ typedef bool (*HPMHOOK_pre_chr_char_slotchange) (struct char_session_data **sd,
 typedef bool (*HPMHOOK_post_chr_char_slotchange) (bool retVal___, struct char_session_data *sd, int fd, unsigned short from, unsigned short to);
 typedef int (*HPMHOOK_pre_chr_rename_char_sql) (struct char_session_data **sd, int *char_id);
 typedef int (*HPMHOOK_post_chr_rename_char_sql) (int retVal___, struct char_session_data *sd, int char_id);
-typedef int (*HPMHOOK_pre_chr_check_char_name) (char **name, char **esc_name);
-typedef int (*HPMHOOK_post_chr_check_char_name) (int retVal___, char *name, char *esc_name);
+typedef bool (*HPMHOOK_pre_chr_name_exists) (const char **name, const char **esc_name);
+typedef bool (*HPMHOOK_post_chr_name_exists) (bool retVal___, const char *name, const char *esc_name);
+typedef int (*HPMHOOK_pre_chr_check_char_name) (const char **name, const char **esc_name);
+typedef int (*HPMHOOK_post_chr_check_char_name) (int retVal___, const char *name, const char *esc_name);
 typedef int (*HPMHOOK_pre_chr_make_new_char_sql) (struct char_session_data **sd, const char **name_, int *str, int *agi, int *vit, int *int_, int *dex, int *luk, int *slot, int *hair_color, int *hair_style, short *starting_job, uint8 *sex);
 typedef int (*HPMHOOK_post_chr_make_new_char_sql) (int retVal___, struct char_session_data *sd, const char *name_, int str, int agi, int vit, int int_, int dex, int luk, int slot, int hair_color, int hair_style, short starting_job, uint8 sex);
 typedef int (*HPMHOOK_pre_chr_divorce_char_sql) (int *partner_id1, int *partner_id2);
@@ -3022,6 +3024,14 @@ typedef void (*HPMHOOK_pre_inter_elemental_sql_final) (void);
 typedef void (*HPMHOOK_post_inter_elemental_sql_final) (void);
 typedef int (*HPMHOOK_pre_inter_elemental_parse_frommap) (int *fd);
 typedef int (*HPMHOOK_post_inter_elemental_parse_frommap) (int retVal___, int fd);
+typedef bool (*HPMHOOK_pre_inter_elemental_create) (struct s_elemental **ele);
+typedef bool (*HPMHOOK_post_inter_elemental_create) (bool retVal___, struct s_elemental *ele);
+typedef bool (*HPMHOOK_pre_inter_elemental_save) (const struct s_elemental **ele);
+typedef bool (*HPMHOOK_post_inter_elemental_save) (bool retVal___, const struct s_elemental *ele);
+typedef bool (*HPMHOOK_pre_inter_elemental_load) (int *ele_id, int *char_id, struct s_elemental **ele);
+typedef bool (*HPMHOOK_post_inter_elemental_load) (bool retVal___, int ele_id, int char_id, struct s_elemental *ele);
+typedef bool (*HPMHOOK_pre_inter_elemental_delete) (int *ele_id);
+typedef bool (*HPMHOOK_post_inter_elemental_delete) (bool retVal___, int ele_id);
 #endif // CHAR_INT_ELEMENTAL_H
 #ifdef CHAR_INT_GUILD_H /* inter_guild */
 typedef int (*HPMHOOK_pre_inter_guild_save_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
@@ -3064,10 +3074,38 @@ typedef int (*HPMHOOK_pre_inter_guild_charname_changed) (int *guild_id, int *acc
 typedef int (*HPMHOOK_post_inter_guild_charname_changed) (int retVal___, int guild_id, int account_id, int char_id, char *name);
 typedef int (*HPMHOOK_pre_inter_guild_parse_frommap) (int *fd);
 typedef int (*HPMHOOK_post_inter_guild_parse_frommap) (int retVal___, int fd);
-typedef int (*HPMHOOK_pre_inter_guild_leave) (int *guild_id, int *account_id, int *char_id);
-typedef int (*HPMHOOK_post_inter_guild_leave) (int retVal___, int guild_id, int account_id, int char_id);
 typedef int (*HPMHOOK_pre_inter_guild_broken) (int *guild_id);
 typedef int (*HPMHOOK_post_inter_guild_broken) (int retVal___, int guild_id);
+typedef struct guild* (*HPMHOOK_pre_inter_guild_create) (const char **name, const struct guild_member **master);
+typedef struct guild* (*HPMHOOK_post_inter_guild_create) (struct guild* retVal___, const char *name, const struct guild_member *master);
+typedef bool (*HPMHOOK_pre_inter_guild_add_member) (int *guild_id, const struct guild_member **member);
+typedef bool (*HPMHOOK_post_inter_guild_add_member) (bool retVal___, int guild_id, const struct guild_member *member);
+typedef bool (*HPMHOOK_pre_inter_guild_leave) (int *guild_id, int *account_id, int *char_id, int *flag, const char **mes, int *map_fd);
+typedef bool (*HPMHOOK_post_inter_guild_leave) (bool retVal___, int guild_id, int account_id, int char_id, int flag, const char *mes, int map_fd);
+typedef bool (*HPMHOOK_pre_inter_guild_update_member_info_short) (int *guild_id, int *account_id, int *char_id, int *online, int *lv, int16 *class);
+typedef bool (*HPMHOOK_post_inter_guild_update_member_info_short) (bool retVal___, int guild_id, int account_id, int char_id, int online, int lv, int16 class);
+typedef bool (*HPMHOOK_pre_inter_guild_update_member_info) (int *guild_id, int *account_id, int *char_id, int *type, const char **data, int *len);
+typedef bool (*HPMHOOK_post_inter_guild_update_member_info) (bool retVal___, int guild_id, int account_id, int char_id, int type, const char *data, int len);
+typedef bool (*HPMHOOK_pre_inter_guild_disband) (int *guild_id);
+typedef bool (*HPMHOOK_post_inter_guild_disband) (bool retVal___, int guild_id);
+typedef bool (*HPMHOOK_pre_inter_guild_update_basic_info) (int *guild_id, int *type, const void **data, int *len);
+typedef bool (*HPMHOOK_post_inter_guild_update_basic_info) (bool retVal___, int guild_id, int type, const void *data, int len);
+typedef bool (*HPMHOOK_pre_inter_guild_update_position) (int *guild_id, int *idx, const struct guild_position **p);
+typedef bool (*HPMHOOK_post_inter_guild_update_position) (bool retVal___, int guild_id, int idx, const struct guild_position *p);
+typedef bool (*HPMHOOK_pre_inter_guild_use_skill_point) (int *guild_id, uint16 *skill_id, int *account_id, int *max);
+typedef bool (*HPMHOOK_post_inter_guild_use_skill_point) (bool retVal___, int guild_id, uint16 skill_id, int account_id, int max);
+typedef bool (*HPMHOOK_pre_inter_guild_remove_alliance) (struct guild **g, int *guild_id, int *account_id1, int *account_id2, int *flag);
+typedef bool (*HPMHOOK_post_inter_guild_remove_alliance) (bool retVal___, struct guild *g, int guild_id, int account_id1, int account_id2, int flag);
+typedef bool (*HPMHOOK_pre_inter_guild_change_alliance) (int *guild_id1, int *guild_id2, int *account_id1, int *account_id2, int *flag);
+typedef bool (*HPMHOOK_post_inter_guild_change_alliance) (bool retVal___, int guild_id1, int guild_id2, int account_id1, int account_id2, int flag);
+typedef bool (*HPMHOOK_pre_inter_guild_update_notice) (int *guild_id, const char **mes1, const char **mes2);
+typedef bool (*HPMHOOK_post_inter_guild_update_notice) (bool retVal___, int guild_id, const char *mes1, const char *mes2);
+typedef bool (*HPMHOOK_pre_inter_guild_update_emblem) (int *len, int *guild_id, const char **data);
+typedef bool (*HPMHOOK_post_inter_guild_update_emblem) (bool retVal___, int len, int guild_id, const char *data);
+typedef bool (*HPMHOOK_pre_inter_guild_update_castle_data) (int *castle_id, int *index, int *value);
+typedef bool (*HPMHOOK_post_inter_guild_update_castle_data) (bool retVal___, int castle_id, int index, int value);
+typedef bool (*HPMHOOK_pre_inter_guild_change_leader) (int *guild_id, const char **name, int *len);
+typedef bool (*HPMHOOK_post_inter_guild_change_leader) (bool retVal___, int guild_id, const char *name, int len);
 #endif // CHAR_INT_GUILD_H
 #ifdef CHAR_INT_HOMUN_H /* inter_homunculus */
 typedef int (*HPMHOOK_pre_inter_homunculus_sql_init) (void);
@@ -3076,6 +3114,16 @@ typedef void (*HPMHOOK_pre_inter_homunculus_sql_final) (void);
 typedef void (*HPMHOOK_post_inter_homunculus_sql_final) (void);
 typedef int (*HPMHOOK_pre_inter_homunculus_parse_frommap) (int *fd);
 typedef int (*HPMHOOK_post_inter_homunculus_parse_frommap) (int retVal___, int fd);
+typedef bool (*HPMHOOK_pre_inter_homunculus_create) (struct s_homunculus **hd);
+typedef bool (*HPMHOOK_post_inter_homunculus_create) (bool retVal___, struct s_homunculus *hd);
+typedef bool (*HPMHOOK_pre_inter_homunculus_save) (const struct s_homunculus **hd);
+typedef bool (*HPMHOOK_post_inter_homunculus_save) (bool retVal___, const struct s_homunculus *hd);
+typedef bool (*HPMHOOK_pre_inter_homunculus_load) (int *homun_id, struct s_homunculus **hd);
+typedef bool (*HPMHOOK_post_inter_homunculus_load) (bool retVal___, int homun_id, struct s_homunculus *hd);
+typedef bool (*HPMHOOK_pre_inter_homunculus_delete) (int *homun_id);
+typedef bool (*HPMHOOK_post_inter_homunculus_delete) (bool retVal___, int homun_id);
+typedef bool (*HPMHOOK_pre_inter_homunculus_rename) (const char **name);
+typedef bool (*HPMHOOK_post_inter_homunculus_rename) (bool retVal___, const char *name);
 #endif // CHAR_INT_HOMUN_H
 #ifdef CHAR_INTER_H /* inter */
 typedef const char* (*HPMHOOK_pre_inter_msg_txt) (int *msg_number);
@@ -3114,6 +3162,16 @@ typedef bool (*HPMHOOK_pre_inter_config_read_log) (const char **filename, const
 typedef bool (*HPMHOOK_post_inter_config_read_log) (bool retVal___, const char *filename, const struct config_t *config, bool imported);
 typedef bool (*HPMHOOK_pre_inter_config_read_connection) (const char **filename, const struct config_t **config, bool *imported);
 typedef bool (*HPMHOOK_post_inter_config_read_connection) (bool retVal___, const char *filename, const struct config_t *config, bool imported);
+typedef void (*HPMHOOK_pre_inter_accinfo) (int *u_fd, int *aid, int *castergroup, const char **query, int *map_fd);
+typedef void (*HPMHOOK_post_inter_accinfo) (int u_fd, int aid, int castergroup, const char *query, int map_fd);
+typedef void (*HPMHOOK_pre_inter_accinfo2) (bool *success, int *map_fd, int *u_fd, int *u_aid, int *account_id, const char **userid, const char **user_pass, const char **email, const char **last_ip, const char **lastlogin, const char **pin_code, const char **birthdate, int *group_id, int *logincount, int *state);
+typedef void (*HPMHOOK_post_inter_accinfo2) (bool success, int map_fd, int u_fd, int u_aid, int account_id, const char *userid, const char *user_pass, const char *email, const char *last_ip, const char *lastlogin, const char *pin_code, const char *birthdate, int group_id, int logincount, int state);
+typedef struct WisData* (*HPMHOOK_pre_inter_add_wisdata) (int *fd, const unsigned char **src, const unsigned char **dst, const unsigned char **msg, int *msg_len);
+typedef struct WisData* (*HPMHOOK_post_inter_add_wisdata) (struct WisData* retVal___, int fd, const unsigned char *src, const unsigned char *dst, const unsigned char *msg, int msg_len);
+typedef struct WisData* (*HPMHOOK_pre_inter_get_wisdata) (int *id);
+typedef struct WisData* (*HPMHOOK_post_inter_get_wisdata) (struct WisData* retVal___, int id);
+typedef void (*HPMHOOK_pre_inter_remove_wisdata) (int *id);
+typedef void (*HPMHOOK_post_inter_remove_wisdata) (int id);
 #endif // CHAR_INTER_H
 #ifdef CHAR_INT_MAIL_H /* inter_mail */
 typedef int (*HPMHOOK_pre_inter_mail_sql_init) (void);
@@ -3132,6 +3190,16 @@ typedef bool (*HPMHOOK_pre_inter_mail_DeleteAttach) (int *mail_id);
 typedef bool (*HPMHOOK_post_inter_mail_DeleteAttach) (bool retVal___, int mail_id);
 typedef void (*HPMHOOK_pre_inter_mail_sendmail) (int *send_id, const char **send_name, int *dest_id, const char **dest_name, const char **title, const char **body, int *zeny, struct item **item);
 typedef void (*HPMHOOK_post_inter_mail_sendmail) (int send_id, const char *send_name, int dest_id, const char *dest_name, const char *title, const char *body, int zeny, struct item *item);
+typedef bool (*HPMHOOK_pre_inter_mail_mark_read) (int *mail_id);
+typedef bool (*HPMHOOK_post_inter_mail_mark_read) (bool retVal___, int mail_id);
+typedef bool (*HPMHOOK_pre_inter_mail_get_attachment) (int *char_id, int *mail_id, struct mail_message **msg);
+typedef bool (*HPMHOOK_post_inter_mail_get_attachment) (bool retVal___, int char_id, int mail_id, struct mail_message *msg);
+typedef bool (*HPMHOOK_pre_inter_mail_delete) (int *char_id, int *mail_id);
+typedef bool (*HPMHOOK_post_inter_mail_delete) (bool retVal___, int char_id, int mail_id);
+typedef bool (*HPMHOOK_pre_inter_mail_return_message) (int *char_id, int *mail_id, int **new_mail);
+typedef bool (*HPMHOOK_post_inter_mail_return_message) (bool retVal___, int char_id, int mail_id, int *new_mail);
+typedef bool (*HPMHOOK_pre_inter_mail_send) (int *account_id, struct mail_message **msg);
+typedef bool (*HPMHOOK_post_inter_mail_send) (bool retVal___, int account_id, struct mail_message *msg);
 #endif // CHAR_INT_MAIL_H
 #ifdef CHAR_INT_MERCENARY_H /* inter_mercenary */
 typedef bool (*HPMHOOK_pre_inter_mercenary_owner_fromsql) (int *char_id, struct mmo_charstatus **status);
@@ -3146,6 +3214,14 @@ typedef void (*HPMHOOK_pre_inter_mercenary_sql_final) (void);
 typedef void (*HPMHOOK_post_inter_mercenary_sql_final) (void);
 typedef int (*HPMHOOK_pre_inter_mercenary_parse_frommap) (int *fd);
 typedef int (*HPMHOOK_post_inter_mercenary_parse_frommap) (int retVal___, int fd);
+typedef bool (*HPMHOOK_pre_inter_mercenary_create) (struct s_mercenary **merc);
+typedef bool (*HPMHOOK_post_inter_mercenary_create) (bool retVal___, struct s_mercenary *merc);
+typedef bool (*HPMHOOK_pre_inter_mercenary_save) (const struct s_mercenary **merc);
+typedef bool (*HPMHOOK_post_inter_mercenary_save) (bool retVal___, const struct s_mercenary *merc);
+typedef bool (*HPMHOOK_pre_inter_mercenary_load) (int *merc_id, int *char_id, struct s_mercenary **merc);
+typedef bool (*HPMHOOK_post_inter_mercenary_load) (bool retVal___, int merc_id, int char_id, struct s_mercenary *merc);
+typedef bool (*HPMHOOK_pre_inter_mercenary_delete) (int *merc_id);
+typedef bool (*HPMHOOK_post_inter_mercenary_delete) (bool retVal___, int merc_id);
 #endif // CHAR_INT_MERCENARY_H
 #ifdef CHAR_INT_PARTY_H /* inter_party */
 typedef int (*HPMHOOK_pre_inter_party_check_lv) (struct party_data **p);
@@ -3168,12 +3244,24 @@ typedef int (*HPMHOOK_pre_inter_party_check_empty) (struct party_data **p);
 typedef int (*HPMHOOK_post_inter_party_check_empty) (int retVal___, struct party_data *p);
 typedef int (*HPMHOOK_pre_inter_party_parse_frommap) (int *fd);
 typedef int (*HPMHOOK_post_inter_party_parse_frommap) (int retVal___, int fd);
-typedef int (*HPMHOOK_pre_inter_party_leave) (int *party_id, int *account_id, int *char_id);
-typedef int (*HPMHOOK_post_inter_party_leave) (int retVal___, int party_id, int account_id, int char_id);
+typedef bool (*HPMHOOK_pre_inter_party_leave) (int *party_id, int *account_id, int *char_id);
+typedef bool (*HPMHOOK_post_inter_party_leave) (bool retVal___, int party_id, int account_id, int char_id);
 typedef int (*HPMHOOK_pre_inter_party_CharOnline) (int *char_id, int *party_id);
 typedef int (*HPMHOOK_post_inter_party_CharOnline) (int retVal___, int char_id, int party_id);
 typedef int (*HPMHOOK_pre_inter_party_CharOffline) (int *char_id, int *party_id);
 typedef int (*HPMHOOK_post_inter_party_CharOffline) (int retVal___, int char_id, int party_id);
+typedef struct party_data* (*HPMHOOK_pre_inter_party_create) (const char **name, int *item, int *item2, const struct party_member **leader);
+typedef struct party_data* (*HPMHOOK_post_inter_party_create) (struct party_data* retVal___, const char *name, int item, int item2, const struct party_member *leader);
+typedef bool (*HPMHOOK_pre_inter_party_add_member) (int *party_id, const struct party_member **member);
+typedef bool (*HPMHOOK_post_inter_party_add_member) (bool retVal___, int party_id, const struct party_member *member);
+typedef bool (*HPMHOOK_pre_inter_party_change_option) (int *party_id, int *account_id, int *exp, int *item, int *map_fd);
+typedef bool (*HPMHOOK_post_inter_party_change_option) (bool retVal___, int party_id, int account_id, int exp, int item, int map_fd);
+typedef bool (*HPMHOOK_pre_inter_party_change_map) (int *party_id, int *account_id, int *char_id, unsigned short *map, int *online, unsigned int *lv);
+typedef bool (*HPMHOOK_post_inter_party_change_map) (bool retVal___, int party_id, int account_id, int char_id, unsigned short map, int online, unsigned int lv);
+typedef bool (*HPMHOOK_pre_inter_party_disband) (int *party_id);
+typedef bool (*HPMHOOK_post_inter_party_disband) (bool retVal___, int party_id);
+typedef bool (*HPMHOOK_pre_inter_party_change_leader) (int *party_id, int *account_id, int *char_id);
+typedef bool (*HPMHOOK_post_inter_party_change_leader) (bool retVal___, int party_id, int account_id, int char_id);
 #endif // CHAR_INT_PARTY_H
 #ifdef CHAR_INT_PET_H /* inter_pet */
 typedef int (*HPMHOOK_pre_inter_pet_tosql) (const struct s_pet **p);
@@ -3188,10 +3276,24 @@ typedef int (*HPMHOOK_pre_inter_pet_delete_) (int *pet_id);
 typedef int (*HPMHOOK_post_inter_pet_delete_) (int retVal___, int pet_id);
 typedef int (*HPMHOOK_pre_inter_pet_parse_frommap) (int *fd);
 typedef int (*HPMHOOK_post_inter_pet_parse_frommap) (int retVal___, int fd);
+typedef struct s_pet* (*HPMHOOK_pre_inter_pet_create) (int *account_id, int *char_id, short *pet_class, short *pet_lv, short *pet_egg_id, short *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, const char **pet_name);
+typedef struct s_pet* (*HPMHOOK_post_inter_pet_create) (struct s_pet* retVal___, int account_id, int char_id, short pet_class, short pet_lv, short pet_egg_id, short pet_equip, short intimate, short hungry, char rename_flag, char incubate, const char *pet_name);
+typedef struct s_pet* (*HPMHOOK_pre_inter_pet_load) (int *account_id, int *char_id, int *pet_id);
+typedef struct s_pet* (*HPMHOOK_post_inter_pet_load) (struct s_pet* retVal___, int account_id, int char_id, int pet_id);
 #endif // CHAR_INT_PET_H
 #ifdef CHAR_INT_QUEST_H /* inter_quest */
 typedef int (*HPMHOOK_pre_inter_quest_parse_frommap) (int *fd);
 typedef int (*HPMHOOK_post_inter_quest_parse_frommap) (int retVal___, int fd);
+typedef struct quest* (*HPMHOOK_pre_inter_quest_fromsql) (int *char_id, int **count);
+typedef struct quest* (*HPMHOOK_post_inter_quest_fromsql) (struct quest* retVal___, int char_id, int *count);
+typedef bool (*HPMHOOK_pre_inter_quest_delete) (int *char_id, int *quest_id);
+typedef bool (*HPMHOOK_post_inter_quest_delete) (bool retVal___, int char_id, int quest_id);
+typedef bool (*HPMHOOK_pre_inter_quest_add) (int *char_id, struct quest *qd);
+typedef bool (*HPMHOOK_post_inter_quest_add) (bool retVal___, int char_id, struct quest qd);
+typedef bool (*HPMHOOK_pre_inter_quest_update) (int *char_id, struct quest *qd);
+typedef bool (*HPMHOOK_post_inter_quest_update) (bool retVal___, int char_id, struct quest qd);
+typedef bool (*HPMHOOK_pre_inter_quest_save) (int *char_id, const struct quest **new_qd, int *new_n);
+typedef bool (*HPMHOOK_post_inter_quest_save) (bool retVal___, int char_id, const struct quest *new_qd, int new_n);
 #endif // CHAR_INT_QUEST_H
 #ifdef CHAR_INT_RODEX_H /* inter_rodex */
 typedef int (*HPMHOOK_pre_inter_rodex_sql_init) (void);
@@ -3208,14 +3310,16 @@ typedef bool (*HPMHOOK_pre_inter_rodex_checkname) (const char **name, int **targ
 typedef bool (*HPMHOOK_post_inter_rodex_checkname) (bool retVal___, const char *name, int *target_char_id, short *target_class, int *target_level);
 typedef int64 (*HPMHOOK_pre_inter_rodex_savemessage) (struct rodex_message **msg);
 typedef int64 (*HPMHOOK_post_inter_rodex_savemessage) (int64 retVal___, struct rodex_message *msg);
+typedef bool (*HPMHOOK_pre_inter_rodex_updatemail) (int64 *mail_id, int8 *flag);
+typedef bool (*HPMHOOK_post_inter_rodex_updatemail) (bool retVal___, int64 mail_id, int8 flag);
 #endif // CHAR_INT_RODEX_H
 #ifdef CHAR_INT_STORAGE_H /* inter_storage */
 typedef int (*HPMHOOK_pre_inter_storage_tosql) (int *account_id, const struct storage_data **p);
 typedef int (*HPMHOOK_post_inter_storage_tosql) (int retVal___, int account_id, const struct storage_data *p);
 typedef int (*HPMHOOK_pre_inter_storage_fromsql) (int *account_id, struct storage_data **p);
 typedef int (*HPMHOOK_post_inter_storage_fromsql) (int retVal___, int account_id, struct storage_data *p);
-typedef int (*HPMHOOK_pre_inter_storage_guild_storage_tosql) (int *guild_id, const struct guild_storage **p);
-typedef int (*HPMHOOK_post_inter_storage_guild_storage_tosql) (int retVal___, int guild_id, const struct guild_storage *p);
+typedef bool (*HPMHOOK_pre_inter_storage_guild_storage_tosql) (int *guild_id, const struct guild_storage **p);
+typedef bool (*HPMHOOK_post_inter_storage_guild_storage_tosql) (bool retVal___, int guild_id, const struct guild_storage *p);
 typedef int (*HPMHOOK_pre_inter_storage_guild_storage_fromsql) (int *guild_id, struct guild_storage **p);
 typedef int (*HPMHOOK_post_inter_storage_guild_storage_fromsql) (int retVal___, int guild_id, struct guild_storage *p);
 typedef int (*HPMHOOK_pre_inter_storage_sql_init) (void);
@@ -3228,6 +3332,8 @@ typedef int (*HPMHOOK_pre_inter_storage_guild_storage_delete) (int *guild_id);
 typedef int (*HPMHOOK_post_inter_storage_guild_storage_delete) (int retVal___, int guild_id);
 typedef int (*HPMHOOK_pre_inter_storage_parse_frommap) (int *fd);
 typedef int (*HPMHOOK_post_inter_storage_parse_frommap) (int retVal___, int fd);
+typedef bool (*HPMHOOK_pre_inter_storage_retrieve_bound_items) (int *char_id, int *account_id, int *guild_id);
+typedef bool (*HPMHOOK_post_inter_storage_retrieve_bound_items) (bool retVal___, int char_id, int account_id, int guild_id);
 #endif // CHAR_INT_STORAGE_H
 #ifdef MAP_INTIF_H /* intif */
 typedef int (*HPMHOOK_pre_intif_parse) (int *fd);
@@ -4468,14 +4574,6 @@ typedef void (*HPMHOOK_pre_mapif_auction_bid) (int *fd, int *char_id, int *bid,
 typedef void (*HPMHOOK_post_mapif_auction_bid) (int fd, int char_id, int bid, unsigned char result);
 typedef void (*HPMHOOK_pre_mapif_parse_auction_bid) (int *fd);
 typedef void (*HPMHOOK_post_mapif_parse_auction_bid) (int fd);
-typedef bool (*HPMHOOK_pre_mapif_elemental_create) (struct s_elemental **ele);
-typedef bool (*HPMHOOK_post_mapif_elemental_create) (bool retVal___, struct s_elemental *ele);
-typedef bool (*HPMHOOK_pre_mapif_elemental_save) (const struct s_elemental **ele);
-typedef bool (*HPMHOOK_post_mapif_elemental_save) (bool retVal___, const struct s_elemental *ele);
-typedef bool (*HPMHOOK_pre_mapif_elemental_load) (int *ele_id, int *char_id, struct s_elemental **ele);
-typedef bool (*HPMHOOK_post_mapif_elemental_load) (bool retVal___, int ele_id, int char_id, struct s_elemental *ele);
-typedef bool (*HPMHOOK_pre_mapif_elemental_delete) (int *ele_id);
-typedef bool (*HPMHOOK_post_mapif_elemental_delete) (bool retVal___, int ele_id);
 typedef void (*HPMHOOK_pre_mapif_elemental_send) (int *fd, struct s_elemental **ele, unsigned char *flag);
 typedef void (*HPMHOOK_post_mapif_elemental_send) (int fd, struct s_elemental *ele, unsigned char flag);
 typedef void (*HPMHOOK_pre_mapif_parse_elemental_create) (int *fd, const struct s_elemental **ele);
@@ -4546,8 +4644,6 @@ typedef int (*HPMHOOK_pre_mapif_parse_GuildPosition) (int *fd, int *guild_id, in
 typedef int (*HPMHOOK_post_mapif_parse_GuildPosition) (int retVal___, int fd, int guild_id, int idx, const struct guild_position *p);
 typedef int (*HPMHOOK_pre_mapif_parse_GuildSkillUp) (int *fd, int *guild_id, uint16 *skill_id, int *account_id, int *max);
 typedef int (*HPMHOOK_post_mapif_parse_GuildSkillUp) (int retVal___, int fd, int guild_id, uint16 skill_id, int account_id, int max);
-typedef int (*HPMHOOK_pre_mapif_parse_GuildDeleteAlliance) (struct guild **g, int *guild_id, int *account_id1, int *account_id2, int *flag);
-typedef int (*HPMHOOK_post_mapif_parse_GuildDeleteAlliance) (int retVal___, struct guild *g, int guild_id, int account_id1, int account_id2, int flag);
 typedef int (*HPMHOOK_pre_mapif_parse_GuildAlliance) (int *fd, int *guild_id1, int *guild_id2, int *account_id1, int *account_id2, int *flag);
 typedef int (*HPMHOOK_post_mapif_parse_GuildAlliance) (int retVal___, int fd, int guild_id1, int guild_id2, int account_id1, int account_id2, int flag);
 typedef int (*HPMHOOK_pre_mapif_parse_GuildNotice) (int *fd, int *guild_id, const char **mes1, const char **mes2);
@@ -4570,16 +4666,6 @@ typedef void (*HPMHOOK_pre_mapif_homunculus_saved) (int *fd, int *account_id, bo
 typedef void (*HPMHOOK_post_mapif_homunculus_saved) (int fd, int account_id, bool flag);
 typedef void (*HPMHOOK_pre_mapif_homunculus_renamed) (int *fd, int *account_id, int *char_id, unsigned char *flag, const char **name);
 typedef void (*HPMHOOK_post_mapif_homunculus_renamed) (int fd, int account_id, int char_id, unsigned char flag, const char *name);
-typedef bool (*HPMHOOK_pre_mapif_homunculus_create) (struct s_homunculus **hd);
-typedef bool (*HPMHOOK_post_mapif_homunculus_create) (bool retVal___, struct s_homunculus *hd);
-typedef bool (*HPMHOOK_pre_mapif_homunculus_save) (const struct s_homunculus **hd);
-typedef bool (*HPMHOOK_post_mapif_homunculus_save) (bool retVal___, const struct s_homunculus *hd);
-typedef bool (*HPMHOOK_pre_mapif_homunculus_load) (int *homun_id, struct s_homunculus **hd);
-typedef bool (*HPMHOOK_post_mapif_homunculus_load) (bool retVal___, int homun_id, struct s_homunculus *hd);
-typedef bool (*HPMHOOK_pre_mapif_homunculus_delete) (int *homun_id);
-typedef bool (*HPMHOOK_post_mapif_homunculus_delete) (bool retVal___, int homun_id);
-typedef bool (*HPMHOOK_pre_mapif_homunculus_rename) (const char **name);
-typedef bool (*HPMHOOK_post_mapif_homunculus_rename) (bool retVal___, const char *name);
 typedef void (*HPMHOOK_pre_mapif_parse_homunculus_create) (int *fd, int *len, int *account_id, const struct s_homunculus **phd);
 typedef void (*HPMHOOK_post_mapif_parse_homunculus_create) (int fd, int len, int account_id, const struct s_homunculus *phd);
 typedef void (*HPMHOOK_pre_mapif_parse_homunculus_delete) (int *fd, int *homun_id);
@@ -4598,8 +4684,6 @@ typedef void (*HPMHOOK_pre_mapif_parse_mail_read) (int *fd);
 typedef void (*HPMHOOK_post_mapif_parse_mail_read) (int fd);
 typedef void (*HPMHOOK_pre_mapif_mail_sendattach) (int *fd, int *char_id, struct mail_message **msg);
 typedef void (*HPMHOOK_post_mapif_mail_sendattach) (int fd, int char_id, struct mail_message *msg);
-typedef void (*HPMHOOK_pre_mapif_mail_getattach) (int *fd, int *char_id, int *mail_id);
-typedef void (*HPMHOOK_post_mapif_mail_getattach) (int fd, int char_id, int mail_id);
 typedef void (*HPMHOOK_pre_mapif_parse_mail_getattach) (int *fd);
 typedef void (*HPMHOOK_post_mapif_parse_mail_getattach) (int fd);
 typedef void (*HPMHOOK_pre_mapif_mail_delete) (int *fd, int *char_id, int *mail_id, bool *failed);
@@ -4616,14 +4700,6 @@ typedef void (*HPMHOOK_pre_mapif_mail_send) (int *fd, struct mail_message **msg)
 typedef void (*HPMHOOK_post_mapif_mail_send) (int fd, struct mail_message *msg);
 typedef void (*HPMHOOK_pre_mapif_parse_mail_send) (int *fd);
 typedef void (*HPMHOOK_post_mapif_parse_mail_send) (int fd);
-typedef bool (*HPMHOOK_pre_mapif_mercenary_create) (struct s_mercenary **merc);
-typedef bool (*HPMHOOK_post_mapif_mercenary_create) (bool retVal___, struct s_mercenary *merc);
-typedef bool (*HPMHOOK_pre_mapif_mercenary_save) (const struct s_mercenary **merc);
-typedef bool (*HPMHOOK_post_mapif_mercenary_save) (bool retVal___, const struct s_mercenary *merc);
-typedef bool (*HPMHOOK_pre_mapif_mercenary_load) (int *merc_id, int *char_id, struct s_mercenary **merc);
-typedef bool (*HPMHOOK_post_mapif_mercenary_load) (bool retVal___, int merc_id, int char_id, struct s_mercenary *merc);
-typedef bool (*HPMHOOK_pre_mapif_mercenary_delete) (int *merc_id);
-typedef bool (*HPMHOOK_post_mapif_mercenary_delete) (bool retVal___, int merc_id);
 typedef void (*HPMHOOK_pre_mapif_mercenary_send) (int *fd, struct s_mercenary **merc, unsigned char *flag);
 typedef void (*HPMHOOK_post_mapif_mercenary_send) (int fd, struct s_mercenary *merc, unsigned char flag);
 typedef void (*HPMHOOK_pre_mapif_parse_mercenary_create) (int *fd, const struct s_mercenary **merc);
@@ -4684,10 +4760,6 @@ typedef int (*HPMHOOK_pre_mapif_save_pet_ack) (int *fd, int *account_id, int *fl
 typedef int (*HPMHOOK_post_mapif_save_pet_ack) (int retVal___, int fd, int account_id, int flag);
 typedef int (*HPMHOOK_pre_mapif_delete_pet_ack) (int *fd, int *flag);
 typedef int (*HPMHOOK_post_mapif_delete_pet_ack) (int retVal___, int fd, int flag);
-typedef int (*HPMHOOK_pre_mapif_create_pet) (int *fd, int *account_id, int *char_id, short *pet_class, short *pet_lv, short *pet_egg_id, short *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, const char **pet_name);
-typedef int (*HPMHOOK_post_mapif_create_pet) (int retVal___, int fd, int account_id, int char_id, short pet_class, short pet_lv, short pet_egg_id, short pet_equip, short intimate, short hungry, char rename_flag, char incubate, const char *pet_name);
-typedef int (*HPMHOOK_pre_mapif_load_pet) (int *fd, int *account_id, int *char_id, int *pet_id);
-typedef int (*HPMHOOK_post_mapif_load_pet) (int retVal___, int fd, int account_id, int char_id, int pet_id);
 typedef int (*HPMHOOK_pre_mapif_save_pet) (int *fd, int *account_id, const struct s_pet **data);
 typedef int (*HPMHOOK_post_mapif_save_pet) (int retVal___, int fd, int account_id, const struct s_pet *data);
 typedef int (*HPMHOOK_pre_mapif_delete_pet) (int *fd, int *pet_id);
@@ -4700,14 +4772,6 @@ typedef int (*HPMHOOK_pre_mapif_parse_SavePet) (int *fd);
 typedef int (*HPMHOOK_post_mapif_parse_SavePet) (int retVal___, int fd);
 typedef int (*HPMHOOK_pre_mapif_parse_DeletePet) (int *fd);
 typedef int (*HPMHOOK_post_mapif_parse_DeletePet) (int retVal___, int fd);
-typedef struct quest* (*HPMHOOK_pre_mapif_quests_fromsql) (int *char_id, int **count);
-typedef struct quest* (*HPMHOOK_post_mapif_quests_fromsql) (struct quest* retVal___, int char_id, int *count);
-typedef bool (*HPMHOOK_pre_mapif_quest_delete) (int *char_id, int *quest_id);
-typedef bool (*HPMHOOK_post_mapif_quest_delete) (bool retVal___, int char_id, int quest_id);
-typedef bool (*HPMHOOK_pre_mapif_quest_add) (int *char_id, struct quest *qd);
-typedef bool (*HPMHOOK_post_mapif_quest_add) (bool retVal___, int char_id, struct quest qd);
-typedef bool (*HPMHOOK_pre_mapif_quest_update) (int *char_id, struct quest *qd);
-typedef bool (*HPMHOOK_post_mapif_quest_update) (bool retVal___, int char_id, struct quest qd);
 typedef void (*HPMHOOK_pre_mapif_quest_save_ack) (int *fd, int *char_id, bool *success);
 typedef void (*HPMHOOK_post_mapif_quest_save_ack) (int fd, int char_id, bool success);
 typedef int (*HPMHOOK_pre_mapif_parse_quest_save) (int *fd);
@@ -4716,22 +4780,22 @@ typedef void (*HPMHOOK_pre_mapif_send_quests) (int *fd, int *char_id, struct que
 typedef void (*HPMHOOK_post_mapif_send_quests) (int fd, int char_id, struct quest *tmp_questlog, int num_quests);
 typedef int (*HPMHOOK_pre_mapif_parse_quest_load) (int *fd);
 typedef int (*HPMHOOK_post_mapif_parse_quest_load) (int retVal___, int fd);
-typedef int (*HPMHOOK_pre_mapif_parse_rodex_requestinbox) (int *fd);
-typedef int (*HPMHOOK_post_mapif_parse_rodex_requestinbox) (int retVal___, int fd);
+typedef void (*HPMHOOK_pre_mapif_parse_rodex_requestinbox) (int *fd);
+typedef void (*HPMHOOK_post_mapif_parse_rodex_requestinbox) (int fd);
 typedef void (*HPMHOOK_pre_mapif_rodex_sendinbox) (int *fd, int *char_id, int8 *opentype, int8 *flag, int *count, int64 *mail_id, struct rodex_maillist **mails);
 typedef void (*HPMHOOK_post_mapif_rodex_sendinbox) (int fd, int char_id, int8 opentype, int8 flag, int count, int64 mail_id, struct rodex_maillist *mails);
-typedef int (*HPMHOOK_pre_mapif_parse_rodex_checkhasnew) (int *fd);
-typedef int (*HPMHOOK_post_mapif_parse_rodex_checkhasnew) (int retVal___, int fd);
+typedef void (*HPMHOOK_pre_mapif_parse_rodex_checkhasnew) (int *fd);
+typedef void (*HPMHOOK_post_mapif_parse_rodex_checkhasnew) (int fd);
 typedef void (*HPMHOOK_pre_mapif_rodex_sendhasnew) (int *fd, int *char_id, bool *has_new);
 typedef void (*HPMHOOK_post_mapif_rodex_sendhasnew) (int fd, int char_id, bool has_new);
-typedef int (*HPMHOOK_pre_mapif_parse_rodex_updatemail) (int *fd);
-typedef int (*HPMHOOK_post_mapif_parse_rodex_updatemail) (int retVal___, int fd);
-typedef int (*HPMHOOK_pre_mapif_parse_rodex_send) (int *fd);
-typedef int (*HPMHOOK_post_mapif_parse_rodex_send) (int retVal___, int fd);
+typedef void (*HPMHOOK_pre_mapif_parse_rodex_updatemail) (int *fd);
+typedef void (*HPMHOOK_post_mapif_parse_rodex_updatemail) (int fd);
+typedef void (*HPMHOOK_pre_mapif_parse_rodex_send) (int *fd);
+typedef void (*HPMHOOK_post_mapif_parse_rodex_send) (int fd);
 typedef void (*HPMHOOK_pre_mapif_rodex_send) (int *fd, int *sender_id, int *receiver_id, int *receiver_accountid, bool *result);
 typedef void (*HPMHOOK_post_mapif_rodex_send) (int fd, int sender_id, int receiver_id, int receiver_accountid, bool result);
-typedef int (*HPMHOOK_pre_mapif_parse_rodex_checkname) (int *fd);
-typedef int (*HPMHOOK_post_mapif_parse_rodex_checkname) (int retVal___, int fd);
+typedef void (*HPMHOOK_pre_mapif_parse_rodex_checkname) (int *fd);
+typedef void (*HPMHOOK_post_mapif_parse_rodex_checkname) (int fd);
 typedef void (*HPMHOOK_pre_mapif_rodex_checkname) (int *fd, int *reqchar_id, int *target_char_id, short *target_class, int *target_level, char **name);
 typedef void (*HPMHOOK_post_mapif_rodex_checkname) (int fd, int reqchar_id, int target_char_id, short target_class, int target_level, char *name);
 typedef int (*HPMHOOK_pre_mapif_load_guild_storage) (int *fd, int *account_id, int *guild_id, char *flag);
@@ -4752,14 +4816,10 @@ typedef void (*HPMHOOK_pre_mapif_sAccountStorageSaveAck) (int *fd, int *account_
 typedef void (*HPMHOOK_post_mapif_sAccountStorageSaveAck) (int fd, int account_id, bool save);
 typedef int (*HPMHOOK_pre_mapif_itembound_ack) (int *fd, int *aid, int *guild_id);
 typedef int (*HPMHOOK_post_mapif_itembound_ack) (int retVal___, int fd, int aid, int guild_id);
-typedef int (*HPMHOOK_pre_mapif_parse_ItemBoundRetrieve_sub) (int *fd);
-typedef int (*HPMHOOK_post_mapif_parse_ItemBoundRetrieve_sub) (int retVal___, int fd);
 typedef void (*HPMHOOK_pre_mapif_parse_ItemBoundRetrieve) (int *fd);
 typedef void (*HPMHOOK_post_mapif_parse_ItemBoundRetrieve) (int fd);
 typedef void (*HPMHOOK_pre_mapif_parse_accinfo) (int *fd);
 typedef void (*HPMHOOK_post_mapif_parse_accinfo) (int fd);
-typedef void (*HPMHOOK_pre_mapif_parse_accinfo2) (bool *success, int *map_fd, int *u_fd, int *u_aid, int *account_id, const char **userid, const char **user_pass, const char **email, const char **last_ip, const char **lastlogin, const char **pin_code, const char **birthdate, int *group_id, int *logincount, int *state);
-typedef void (*HPMHOOK_post_mapif_parse_accinfo2) (bool success, int map_fd, int u_fd, int u_aid, int account_id, const char *userid, const char *user_pass, const char *email, const char *last_ip, const char *lastlogin, const char *pin_code, const char *birthdate, int group_id, int logincount, int state);
 typedef int (*HPMHOOK_pre_mapif_broadcast) (const unsigned char **mes, int *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, int *sfd);
 typedef int (*HPMHOOK_post_mapif_broadcast) (int retVal___, const unsigned char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, int sfd);
 typedef int (*HPMHOOK_pre_mapif_wis_message) (struct WisData **wd);