HPM Hooks Update

Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>

5 files changed, 484 insertions, 60 deletions

diff --git a/src/common/HPMDataCheck.h b/src/common/HPMDataCheck.h
index 970e2449d..43dc9ee5c 100644
--- a/src/common/HPMDataCheck.h
+++ b/src/common/HPMDataCheck.h
@@ -9,7 +9,11 @@
 
 HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 	#ifdef CHAR_CHAR_H
+		{ "char_auth_node", sizeof(struct char_auth_node), SERVER_TYPE_CHAR },
 		{ "char_interface", sizeof(struct char_interface), SERVER_TYPE_CHAR },
+		{ "char_session_data", sizeof(struct char_session_data), SERVER_TYPE_CHAR },
+		{ "mmo_map_server", sizeof(struct mmo_map_server), SERVER_TYPE_CHAR },
+		{ "online_char_data", sizeof(struct online_char_data), SERVER_TYPE_CHAR },
 	#else
 		#define CHAR_CHAR_H
 	#endif // CHAR_CHAR_H
@@ -94,10 +98,24 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 	#else
 		#define COMMON_CONF_H
 	#endif // COMMON_CONF_H
+	#ifdef COMMON_CONSOLE_H
+		{ "CParseEntry", sizeof(struct CParseEntry), SERVER_TYPE_ALL },
+		{ "console_interface", sizeof(struct console_interface), SERVER_TYPE_ALL },
+	#else
+		#define COMMON_CONSOLE_H
+	#endif // COMMON_CONSOLE_H
+	#ifdef COMMON_CORE_H
+		{ "CmdlineArgData", sizeof(struct CmdlineArgData), SERVER_TYPE_ALL },
+		{ "cmdline_interface", sizeof(struct cmdline_interface), SERVER_TYPE_ALL },
+	#else
+		#define COMMON_CORE_H
+	#endif // COMMON_CORE_H
 	#ifdef COMMON_DB_H
 		{ "DBData", sizeof(struct DBData), SERVER_TYPE_ALL },
 		{ "DBIterator", sizeof(struct DBIterator), SERVER_TYPE_ALL },
 		{ "DBMap", sizeof(struct DBMap), SERVER_TYPE_ALL },
+		{ "db_interface", sizeof(struct db_interface), SERVER_TYPE_ALL },
+		{ "linkdb_node", sizeof(struct linkdb_node), SERVER_TYPE_ALL },
 	#else
 		#define COMMON_DB_H
 	#endif // COMMON_DB_H
@@ -111,24 +129,85 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 	#else
 		#define COMMON_ERS_H
 	#endif // COMMON_ERS_H
+	#ifdef COMMON_HPMI_H
+		{ "HPMi_interface", sizeof(struct HPMi_interface), SERVER_TYPE_ALL },
+		{ "hplugin_info", sizeof(struct hplugin_info), SERVER_TYPE_ALL },
+		{ "s_HPMDataCheck", sizeof(struct s_HPMDataCheck), SERVER_TYPE_ALL },
+	#else
+		#define COMMON_HPMI_H
+	#endif // COMMON_HPMI_H
+	#ifdef COMMON_MALLOC_H
+		{ "malloc_interface", sizeof(struct malloc_interface), SERVER_TYPE_ALL },
+	#else
+		#define COMMON_MALLOC_H
+	#endif // COMMON_MALLOC_H
 	#ifdef COMMON_MAPINDEX_H
 		{ "mapindex_interface", sizeof(struct mapindex_interface), SERVER_TYPE_ALL },
 	#else
 		#define COMMON_MAPINDEX_H
 	#endif // COMMON_MAPINDEX_H
 	#ifdef COMMON_MMO_H
+		{ "auction_data", sizeof(struct auction_data), SERVER_TYPE_ALL },
+		{ "fame_list", sizeof(struct fame_list), SERVER_TYPE_ALL },
+		{ "guild", sizeof(struct guild), SERVER_TYPE_ALL },
+		{ "guild_alliance", sizeof(struct guild_alliance), SERVER_TYPE_ALL },
+		{ "guild_castle", sizeof(struct guild_castle), SERVER_TYPE_ALL },
+		{ "guild_expulsion", sizeof(struct guild_expulsion), SERVER_TYPE_ALL },
+		{ "guild_member", sizeof(struct guild_member), SERVER_TYPE_ALL },
+		{ "guild_position", sizeof(struct guild_position), SERVER_TYPE_ALL },
+		{ "guild_skill", sizeof(struct guild_skill), SERVER_TYPE_ALL },
+		{ "guild_storage", sizeof(struct guild_storage), SERVER_TYPE_ALL },
+		{ "hotkey", sizeof(struct hotkey), SERVER_TYPE_ALL },
+		{ "item", sizeof(struct item), SERVER_TYPE_ALL },
+		{ "mail_data", sizeof(struct mail_data), SERVER_TYPE_ALL },
+		{ "mail_message", sizeof(struct mail_message), SERVER_TYPE_ALL },
+		{ "mmo_charstatus", sizeof(struct mmo_charstatus), SERVER_TYPE_ALL },
+		{ "party", sizeof(struct party), SERVER_TYPE_ALL },
+		{ "party_member", sizeof(struct party_member), SERVER_TYPE_ALL },
+		{ "point", sizeof(struct point), SERVER_TYPE_ALL },
 		{ "quest", sizeof(struct quest), SERVER_TYPE_ALL },
+		{ "s_elemental", sizeof(struct s_elemental), SERVER_TYPE_ALL },
+		{ "s_friend", sizeof(struct s_friend), SERVER_TYPE_ALL },
+		{ "s_homunculus", sizeof(struct s_homunculus), SERVER_TYPE_ALL },
+		{ "s_mercenary", sizeof(struct s_mercenary), SERVER_TYPE_ALL },
+		{ "s_pet", sizeof(struct s_pet), SERVER_TYPE_ALL },
+		{ "s_skill", sizeof(struct s_skill), SERVER_TYPE_ALL },
+		{ "script_reg_num", sizeof(struct script_reg_num), SERVER_TYPE_ALL },
+		{ "script_reg_state", sizeof(struct script_reg_state), SERVER_TYPE_ALL },
+		{ "script_reg_str", sizeof(struct script_reg_str), SERVER_TYPE_ALL },
+		{ "status_change_data", sizeof(struct status_change_data), SERVER_TYPE_ALL },
+		{ "storage_data", sizeof(struct storage_data), SERVER_TYPE_ALL },
 	#else
 		#define COMMON_MMO_H
 	#endif // COMMON_MMO_H
+	#ifdef COMMON_NULLPO_H
+		{ "nullpo_interface", sizeof(struct nullpo_interface), SERVER_TYPE_ALL },
+	#else
+		#define COMMON_NULLPO_H
+	#endif // COMMON_NULLPO_H
 	#ifdef COMMON_SOCKET_H
+		{ "hSockOpt", sizeof(struct hSockOpt), SERVER_TYPE_ALL },
+		{ "socket_data", sizeof(struct socket_data), SERVER_TYPE_ALL },
 		{ "socket_interface", sizeof(struct socket_interface), SERVER_TYPE_ALL },
 	#else
 		#define COMMON_SOCKET_H
 	#endif // COMMON_SOCKET_H
+	#ifdef COMMON_SPINLOCK_H
+		{ "SPIN_LOCK", sizeof(struct SPIN_LOCK), SERVER_TYPE_ALL },
+	#else
+		#define COMMON_SPINLOCK_H
+	#endif // COMMON_SPINLOCK_H
+	#ifdef COMMON_SQL_H
+		{ "sql_interface", sizeof(struct sql_interface), SERVER_TYPE_ALL },
+	#else
+		#define COMMON_SQL_H
+	#endif // COMMON_SQL_H
 	#ifdef COMMON_STRLIB_H
 		{ "StringBuf", sizeof(struct StringBuf), SERVER_TYPE_ALL },
 		{ "s_svstate", sizeof(struct s_svstate), SERVER_TYPE_ALL },
+		{ "stringbuf_interface", sizeof(struct stringbuf_interface), SERVER_TYPE_ALL },
+		{ "strlib_interface", sizeof(struct strlib_interface), SERVER_TYPE_ALL },
+		{ "sv_interface", sizeof(struct sv_interface), SERVER_TYPE_ALL },
 	#else
 		#define COMMON_STRLIB_H
 	#endif // COMMON_STRLIB_H
@@ -137,97 +216,442 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 	#else
 		#define COMMON_SYSINFO_H
 	#endif // COMMON_SYSINFO_H
+	#ifdef COMMON_TIMER_H
+		{ "TimerData", sizeof(struct TimerData), SERVER_TYPE_ALL },
+		{ "timer_interface", sizeof(struct timer_interface), SERVER_TYPE_ALL },
+	#else
+		#define COMMON_TIMER_H
+	#endif // COMMON_TIMER_H
+	#ifdef COMMON_UTILS_H
+		{ "HCache_interface", sizeof(struct HCache_interface), SERVER_TYPE_ALL },
+	#else
+		#define COMMON_UTILS_H
+	#endif // COMMON_UTILS_H
+	#ifdef LOGIN_ACCOUNT_H
+		{ "Account_engine", sizeof(struct Account_engine), SERVER_TYPE_LOGIN },
+		{ "AccountDB", sizeof(struct AccountDB), SERVER_TYPE_LOGIN },
+		{ "AccountDBIterator", sizeof(struct AccountDBIterator), SERVER_TYPE_LOGIN },
+		{ "mmo_account", sizeof(struct mmo_account), SERVER_TYPE_LOGIN },
+	#else
+		#define LOGIN_ACCOUNT_H
+	#endif // LOGIN_ACCOUNT_H
 	#ifdef LOGIN_LOGIN_H
+		{ "Login_Config", sizeof(struct Login_Config), SERVER_TYPE_LOGIN },
+		{ "client_hash_node", sizeof(struct client_hash_node), SERVER_TYPE_LOGIN },
+		{ "login_auth_node", sizeof(struct login_auth_node), SERVER_TYPE_LOGIN },
 		{ "login_interface", sizeof(struct login_interface), SERVER_TYPE_LOGIN },
+		{ "login_session_data", sizeof(struct login_session_data), SERVER_TYPE_LOGIN },
+		{ "mmo_char_server", sizeof(struct mmo_char_server), SERVER_TYPE_LOGIN },
+		{ "online_login_data", sizeof(struct online_login_data), SERVER_TYPE_LOGIN },
 	#else
 		#define LOGIN_LOGIN_H
 	#endif // LOGIN_LOGIN_H
 	#ifdef MAP_ATCOMMAND_H
 		{ "AliasInfo", sizeof(struct AliasInfo), SERVER_TYPE_MAP },
+		{ "AtCommandInfo", sizeof(struct AtCommandInfo), SERVER_TYPE_MAP },
+		{ "atcmd_binding_data", sizeof(struct atcmd_binding_data), SERVER_TYPE_MAP },
 		{ "atcommand_interface", sizeof(struct atcommand_interface), SERVER_TYPE_MAP },
 	#else
 		#define MAP_ATCOMMAND_H
 	#endif // MAP_ATCOMMAND_H
+	#ifdef MAP_BATTLEGROUND_H
+		{ "battleground_data", sizeof(struct battleground_data), SERVER_TYPE_MAP },
+		{ "battleground_interface", sizeof(struct battleground_interface), SERVER_TYPE_MAP },
+		{ "battleground_member_data", sizeof(struct battleground_member_data), SERVER_TYPE_MAP },
+		{ "bg_arena", sizeof(struct bg_arena), SERVER_TYPE_MAP },
+	#else
+		#define MAP_BATTLEGROUND_H
+	#endif // MAP_BATTLEGROUND_H
 	#ifdef MAP_BATTLE_H
+		{ "Battle_Config", sizeof(struct Battle_Config), SERVER_TYPE_MAP },
 		{ "Damage", sizeof(struct Damage), SERVER_TYPE_MAP },
 		{ "battle_interface", sizeof(struct battle_interface), SERVER_TYPE_MAP },
+		{ "delay_damage", sizeof(struct delay_damage), SERVER_TYPE_MAP },
 	#else
 		#define MAP_BATTLE_H
 	#endif // MAP_BATTLE_H
 	#ifdef MAP_BUYINGSTORE_H
 		{ "buyingstore_interface", sizeof(struct buyingstore_interface), SERVER_TYPE_MAP },
+		{ "s_buyingstore", sizeof(struct s_buyingstore), SERVER_TYPE_MAP },
 		{ "s_buyingstore_item", sizeof(struct s_buyingstore_item), SERVER_TYPE_MAP },
 	#else
 		#define MAP_BUYINGSTORE_H
 	#endif // MAP_BUYINGSTORE_H
 	#ifdef MAP_CHANNEL_H
 		{ "Channel_Config", sizeof(struct Channel_Config), SERVER_TYPE_MAP },
+		{ "channel_ban_entry", sizeof(struct channel_ban_entry), SERVER_TYPE_MAP },
+		{ "channel_data", sizeof(struct channel_data), SERVER_TYPE_MAP },
+		{ "channel_interface", sizeof(struct channel_interface), SERVER_TYPE_MAP },
 	#else
 		#define MAP_CHANNEL_H
 	#endif // MAP_CHANNEL_H
+	#ifdef MAP_CHAT_H
+		{ "chat_data", sizeof(struct chat_data), SERVER_TYPE_MAP },
+		{ "chat_interface", sizeof(struct chat_interface), SERVER_TYPE_MAP },
+	#else
+		#define MAP_CHAT_H
+	#endif // MAP_CHAT_H
 	#ifdef MAP_CHRIF_H
 		{ "auth_node", sizeof(struct auth_node), SERVER_TYPE_MAP },
+		{ "chrif_interface", sizeof(struct chrif_interface), SERVER_TYPE_MAP },
 	#else
 		#define MAP_CHRIF_H
 	#endif // MAP_CHRIF_H
 	#ifdef MAP_CLIF_H
+		{ "cdelayed_damage", sizeof(struct cdelayed_damage), SERVER_TYPE_MAP },
 		{ "clif_interface", sizeof(struct clif_interface), SERVER_TYPE_MAP },
+		{ "hCSData", sizeof(struct hCSData), SERVER_TYPE_MAP },
+		{ "s_packet_db", sizeof(struct s_packet_db), SERVER_TYPE_MAP },
 	#else
 		#define MAP_CLIF_H
 	#endif // MAP_CLIF_H
+	#ifdef MAP_DUEL_H
+		{ "duel", sizeof(struct duel), SERVER_TYPE_MAP },
+		{ "duel_interface", sizeof(struct duel_interface), SERVER_TYPE_MAP },
+	#else
+		#define MAP_DUEL_H
+	#endif // MAP_DUEL_H
 	#ifdef MAP_ELEMENTAL_H
+		{ "elemental_data", sizeof(struct elemental_data), SERVER_TYPE_MAP },
+		{ "elemental_interface", sizeof(struct elemental_interface), SERVER_TYPE_MAP },
 		{ "elemental_skill", sizeof(struct elemental_skill), SERVER_TYPE_MAP },
+		{ "s_elemental_db", sizeof(struct s_elemental_db), SERVER_TYPE_MAP },
 	#else
 		#define MAP_ELEMENTAL_H
 	#endif // MAP_ELEMENTAL_H
 	#ifdef MAP_GUILD_H
 		{ "eventlist", sizeof(struct eventlist), SERVER_TYPE_MAP },
 		{ "guardian_data", sizeof(struct guardian_data), SERVER_TYPE_MAP },
+		{ "guild_expcache", sizeof(struct guild_expcache), SERVER_TYPE_MAP },
+		{ "guild_interface", sizeof(struct guild_interface), SERVER_TYPE_MAP },
+		{ "s_guild_skill_tree", sizeof(struct s_guild_skill_tree), SERVER_TYPE_MAP },
 	#else
 		#define MAP_GUILD_H
 	#endif // MAP_GUILD_H
+	#ifdef MAP_HOMUNCULUS_H
+		{ "h_stats", sizeof(struct h_stats), SERVER_TYPE_MAP },
+		{ "homun_data", sizeof(struct homun_data), SERVER_TYPE_MAP },
+		{ "homun_skill_tree_entry", sizeof(struct homun_skill_tree_entry), SERVER_TYPE_MAP },
+		{ "homunculus_interface", sizeof(struct homunculus_interface), SERVER_TYPE_MAP },
+		{ "s_homunculus_db", sizeof(struct s_homunculus_db), SERVER_TYPE_MAP },
+	#else
+		#define MAP_HOMUNCULUS_H
+	#endif // MAP_HOMUNCULUS_H
+	#ifdef MAP_INSTANCE_H
+		{ "instance_data", sizeof(struct instance_data), SERVER_TYPE_MAP },
+		{ "instance_interface", sizeof(struct instance_interface), SERVER_TYPE_MAP },
+	#else
+		#define MAP_INSTANCE_H
+	#endif // MAP_INSTANCE_H
+	#ifdef MAP_INTIF_H
+		{ "intif_interface", sizeof(struct intif_interface), SERVER_TYPE_MAP },
+	#else
+		#define MAP_INTIF_H
+	#endif // MAP_INTIF_H
+	#ifdef MAP_IRC_BOT_H
+		{ "irc_bot_interface", sizeof(struct irc_bot_interface), SERVER_TYPE_MAP },
+		{ "irc_func", sizeof(struct irc_func), SERVER_TYPE_MAP },
+	#else
+		#define MAP_IRC_BOT_H
+	#endif // MAP_IRC_BOT_H
+	#ifdef MAP_ITEMDB_H
+		{ "item_chain", sizeof(struct item_chain), SERVER_TYPE_MAP },
+		{ "item_chain_entry", sizeof(struct item_chain_entry), SERVER_TYPE_MAP },
+		{ "item_combo", sizeof(struct item_combo), SERVER_TYPE_MAP },
+		{ "item_data", sizeof(struct item_data), SERVER_TYPE_MAP },
+		{ "item_group", sizeof(struct item_group), SERVER_TYPE_MAP },
+		{ "item_package", sizeof(struct item_package), SERVER_TYPE_MAP },
+		{ "item_package_must_entry", sizeof(struct item_package_must_entry), SERVER_TYPE_MAP },
+		{ "item_package_rand_entry", sizeof(struct item_package_rand_entry), SERVER_TYPE_MAP },
+		{ "item_package_rand_group", sizeof(struct item_package_rand_group), SERVER_TYPE_MAP },
+		{ "itemdb_interface", sizeof(struct itemdb_interface), SERVER_TYPE_MAP },
+	#else
+		#define MAP_ITEMDB_H
+	#endif // MAP_ITEMDB_H
+	#ifdef MAP_LOG_H
+		{ "log_interface", sizeof(struct log_interface), SERVER_TYPE_MAP },
+	#else
+		#define MAP_LOG_H
+	#endif // MAP_LOG_H
+	#ifdef MAP_MAIL_H
+		{ "mail_interface", sizeof(struct mail_interface), SERVER_TYPE_MAP },
+	#else
+		#define MAP_MAIL_H
+	#endif // MAP_MAIL_H
 	#ifdef MAP_MAPREG_H
+		{ "mapreg_interface", sizeof(struct mapreg_interface), SERVER_TYPE_MAP },
 		{ "mapreg_save", sizeof(struct mapreg_save), SERVER_TYPE_MAP },
 	#else
 		#define MAP_MAPREG_H
 	#endif // MAP_MAPREG_H
 	#ifdef MAP_MAP_H
+		{ "block_list", sizeof(struct block_list), SERVER_TYPE_MAP },
+		{ "charid2nick", sizeof(struct charid2nick), SERVER_TYPE_MAP },
+		{ "charid_request", sizeof(struct charid_request), SERVER_TYPE_MAP },
+		{ "flooritem_data", sizeof(struct flooritem_data), SERVER_TYPE_MAP },
+		{ "iwall_data", sizeof(struct iwall_data), SERVER_TYPE_MAP },
+		{ "map_cache_main_header", sizeof(struct map_cache_main_header), SERVER_TYPE_MAP },
+		{ "map_cache_map_info", sizeof(struct map_cache_map_info), SERVER_TYPE_MAP },
+		{ "map_data", sizeof(struct map_data), SERVER_TYPE_MAP },
 		{ "map_data_other_server", sizeof(struct map_data_other_server), SERVER_TYPE_MAP },
+		{ "map_drop_list", sizeof(struct map_drop_list), SERVER_TYPE_MAP },
+		{ "map_interface", sizeof(struct map_interface), SERVER_TYPE_MAP },
+		{ "map_zone_data", sizeof(struct map_zone_data), SERVER_TYPE_MAP },
+		{ "map_zone_disabled_command_entry", sizeof(struct map_zone_disabled_command_entry), SERVER_TYPE_MAP },
+		{ "map_zone_disabled_skill_entry", sizeof(struct map_zone_disabled_skill_entry), SERVER_TYPE_MAP },
+		{ "map_zone_skill_damage_cap_entry", sizeof(struct map_zone_skill_damage_cap_entry), SERVER_TYPE_MAP },
+		{ "mapcell", sizeof(struct mapcell), SERVER_TYPE_MAP },
+		{ "mapflag_skill_adjust", sizeof(struct mapflag_skill_adjust), SERVER_TYPE_MAP },
+		{ "mapit_interface", sizeof(struct mapit_interface), SERVER_TYPE_MAP },
+		{ "questinfo", sizeof(struct questinfo), SERVER_TYPE_MAP },
+		{ "spawn_data", sizeof(struct spawn_data), SERVER_TYPE_MAP },
 	#else
 		#define MAP_MAP_H
 	#endif // MAP_MAP_H
+	#ifdef MAP_MERCENARY_H
+		{ "mercenary_data", sizeof(struct mercenary_data), SERVER_TYPE_MAP },
+		{ "mercenary_interface", sizeof(struct mercenary_interface), SERVER_TYPE_MAP },
+		{ "s_mercenary_db", sizeof(struct s_mercenary_db), SERVER_TYPE_MAP },
+	#else
+		#define MAP_MERCENARY_H
+	#endif // MAP_MERCENARY_H
+	#ifdef MAP_MOB_H
+		{ "item_drop", sizeof(struct item_drop), SERVER_TYPE_MAP },
+		{ "item_drop_list", sizeof(struct item_drop_list), SERVER_TYPE_MAP },
+		{ "mob_chat", sizeof(struct mob_chat), SERVER_TYPE_MAP },
+		{ "mob_data", sizeof(struct mob_data), SERVER_TYPE_MAP },
+		{ "mob_db", sizeof(struct mob_db), SERVER_TYPE_MAP },
+		{ "mob_interface", sizeof(struct mob_interface), SERVER_TYPE_MAP },
+		{ "mob_skill", sizeof(struct mob_skill), SERVER_TYPE_MAP },
+		{ "spawn_info", sizeof(struct spawn_info), SERVER_TYPE_MAP },
+	#else
+		#define MAP_MOB_H
+	#endif // MAP_MOB_H
+	#ifdef MAP_NPC_H
+		{ "event_data", sizeof(struct event_data), SERVER_TYPE_MAP },
+		{ "npc_data", sizeof(struct npc_data), SERVER_TYPE_MAP },
+		{ "npc_interface", sizeof(struct npc_interface), SERVER_TYPE_MAP },
+		{ "npc_item_list", sizeof(struct npc_item_list), SERVER_TYPE_MAP },
+		{ "npc_label_list", sizeof(struct npc_label_list), SERVER_TYPE_MAP },
+		{ "npc_path_data", sizeof(struct npc_path_data), SERVER_TYPE_MAP },
+		{ "npc_shop_data", sizeof(struct npc_shop_data), SERVER_TYPE_MAP },
+		{ "npc_src_list", sizeof(struct npc_src_list), SERVER_TYPE_MAP },
+		{ "npc_timerevent_list", sizeof(struct npc_timerevent_list), SERVER_TYPE_MAP },
+	#else
+		#define MAP_NPC_H
+	#endif // MAP_NPC_H
 	#ifdef MAP_PACKETS_STRUCT_H
+		{ "EQUIPITEM_INFO", sizeof(struct EQUIPITEM_INFO), SERVER_TYPE_MAP },
 		{ "EQUIPSLOTINFO", sizeof(struct EQUIPSLOTINFO), SERVER_TYPE_MAP },
+		{ "NORMALITEM_INFO", sizeof(struct NORMALITEM_INFO), SERVER_TYPE_MAP },
+		{ "packet_additem", sizeof(struct packet_additem), SERVER_TYPE_MAP },
+		{ "packet_authok", sizeof(struct packet_authok), SERVER_TYPE_MAP },
+		{ "packet_banking_check", sizeof(struct packet_banking_check), SERVER_TYPE_MAP },
+		{ "packet_banking_deposit_ack", sizeof(struct packet_banking_deposit_ack), SERVER_TYPE_MAP },
+		{ "packet_banking_deposit_req", sizeof(struct packet_banking_deposit_req), SERVER_TYPE_MAP },
+		{ "packet_banking_withdraw_ack", sizeof(struct packet_banking_withdraw_ack), SERVER_TYPE_MAP },
+		{ "packet_banking_withdraw_req", sizeof(struct packet_banking_withdraw_req), SERVER_TYPE_MAP },
+		{ "packet_bgqueue_ack", sizeof(struct packet_bgqueue_ack), SERVER_TYPE_MAP },
+		{ "packet_bgqueue_battlebegin_ack", sizeof(struct packet_bgqueue_battlebegin_ack), SERVER_TYPE_MAP },
+		{ "packet_bgqueue_battlebegins", sizeof(struct packet_bgqueue_battlebegins), SERVER_TYPE_MAP },
+		{ "packet_bgqueue_checkstate", sizeof(struct packet_bgqueue_checkstate), SERVER_TYPE_MAP },
+		{ "packet_bgqueue_notice_delete", sizeof(struct packet_bgqueue_notice_delete), SERVER_TYPE_MAP },
+		{ "packet_bgqueue_notify_entry", sizeof(struct packet_bgqueue_notify_entry), SERVER_TYPE_MAP },
+		{ "packet_bgqueue_register", sizeof(struct packet_bgqueue_register), SERVER_TYPE_MAP },
+		{ "packet_bgqueue_revoke_req", sizeof(struct packet_bgqueue_revoke_req), SERVER_TYPE_MAP },
+		{ "packet_bgqueue_update_info", sizeof(struct packet_bgqueue_update_info), SERVER_TYPE_MAP },
+		{ "packet_cart_additem_ack", sizeof(struct packet_cart_additem_ack), SERVER_TYPE_MAP },
+		{ "packet_damage", sizeof(struct packet_damage), SERVER_TYPE_MAP },
+		{ "packet_dropflooritem", sizeof(struct packet_dropflooritem), SERVER_TYPE_MAP },
+		{ "packet_equip_item", sizeof(struct packet_equip_item), SERVER_TYPE_MAP },
+		{ "packet_equipitem_ack", sizeof(struct packet_equipitem_ack), SERVER_TYPE_MAP },
+		{ "packet_gm_monster_item", sizeof(struct packet_gm_monster_item), SERVER_TYPE_MAP },
+		{ "packet_graffiti_entry", sizeof(struct packet_graffiti_entry), SERVER_TYPE_MAP },
+		{ "packet_idle_unit", sizeof(struct packet_idle_unit), SERVER_TYPE_MAP },
+		{ "packet_idle_unit2", sizeof(struct packet_idle_unit2), SERVER_TYPE_MAP },
+		{ "packet_item_drop_announce", sizeof(struct packet_item_drop_announce), SERVER_TYPE_MAP },
+		{ "packet_itemlist_equip", sizeof(struct packet_itemlist_equip), SERVER_TYPE_MAP },
+		{ "packet_itemlist_normal", sizeof(struct packet_itemlist_normal), SERVER_TYPE_MAP },
+		{ "packet_maptypeproperty2", sizeof(struct packet_maptypeproperty2), SERVER_TYPE_MAP },
+		{ "packet_monster_hp", sizeof(struct packet_monster_hp), SERVER_TYPE_MAP },
+		{ "packet_notify_bounditem", sizeof(struct packet_notify_bounditem), SERVER_TYPE_MAP },
+		{ "packet_npc_market_open", sizeof(struct packet_npc_market_open), SERVER_TYPE_MAP },
+		{ "packet_npc_market_purchase", sizeof(struct packet_npc_market_purchase), SERVER_TYPE_MAP },
+		{ "packet_npc_market_result_ack", sizeof(struct packet_npc_market_result_ack), SERVER_TYPE_MAP },
+		{ "packet_package_item_announce", sizeof(struct packet_package_item_announce), SERVER_TYPE_MAP },
+		{ "packet_party_leader_changed", sizeof(struct packet_party_leader_changed), SERVER_TYPE_MAP },
+		{ "packet_roulette_close_ack", sizeof(struct packet_roulette_close_ack), SERVER_TYPE_MAP },
+		{ "packet_roulette_generate_ack", sizeof(struct packet_roulette_generate_ack), SERVER_TYPE_MAP },
+		{ "packet_roulette_info_ack", sizeof(struct packet_roulette_info_ack), SERVER_TYPE_MAP },
+		{ "packet_roulette_itemrecv_ack", sizeof(struct packet_roulette_itemrecv_ack), SERVER_TYPE_MAP },
+		{ "packet_roulette_itemrecv_req", sizeof(struct packet_roulette_itemrecv_req), SERVER_TYPE_MAP },
+		{ "packet_roulette_open_ack", sizeof(struct packet_roulette_open_ack), SERVER_TYPE_MAP },
+		{ "packet_sc_notick", sizeof(struct packet_sc_notick), SERVER_TYPE_MAP },
+		{ "packet_script_clear", sizeof(struct packet_script_clear), SERVER_TYPE_MAP },
+		{ "packet_skill_entry", sizeof(struct packet_skill_entry), SERVER_TYPE_MAP },
+		{ "packet_spawn_unit", sizeof(struct packet_spawn_unit), SERVER_TYPE_MAP },
+		{ "packet_spawn_unit2", sizeof(struct packet_spawn_unit2), SERVER_TYPE_MAP },
+		{ "packet_status_change", sizeof(struct packet_status_change), SERVER_TYPE_MAP },
+		{ "packet_status_change2", sizeof(struct packet_status_change2), SERVER_TYPE_MAP },
+		{ "packet_status_change_end", sizeof(struct packet_status_change_end), SERVER_TYPE_MAP },
+		{ "packet_storelist_equip", sizeof(struct packet_storelist_equip), SERVER_TYPE_MAP },
+		{ "packet_storelist_normal", sizeof(struct packet_storelist_normal), SERVER_TYPE_MAP },
+		{ "packet_unequipitem_ack", sizeof(struct packet_unequipitem_ack), SERVER_TYPE_MAP },
+		{ "packet_unit_walking", sizeof(struct packet_unit_walking), SERVER_TYPE_MAP },
+		{ "packet_viewequip_ack", sizeof(struct packet_viewequip_ack), SERVER_TYPE_MAP },
+		{ "packet_wis_end", sizeof(struct packet_wis_end), SERVER_TYPE_MAP },
 	#else
 		#define MAP_PACKETS_STRUCT_H
 	#endif // MAP_PACKETS_STRUCT_H
+	#ifdef MAP_PARTY_H
+		{ "party_booking_ad_info", sizeof(struct party_booking_ad_info), SERVER_TYPE_MAP },
+		{ "party_booking_detail", sizeof(struct party_booking_detail), SERVER_TYPE_MAP },
+		{ "party_data", sizeof(struct party_data), SERVER_TYPE_MAP },
+		{ "party_interface", sizeof(struct party_interface), SERVER_TYPE_MAP },
+		{ "party_member_data", sizeof(struct party_member_data), SERVER_TYPE_MAP },
+	#else
+		#define MAP_PARTY_H
+	#endif // MAP_PARTY_H
+	#ifdef MAP_PATH_H
+		{ "path_interface", sizeof(struct path_interface), SERVER_TYPE_MAP },
+		{ "shootpath_data", sizeof(struct shootpath_data), SERVER_TYPE_MAP },
+		{ "walkpath_data", sizeof(struct walkpath_data), SERVER_TYPE_MAP },
+	#else
+		#define MAP_PATH_H
+	#endif // MAP_PATH_H
+	#ifdef MAP_PC_GROUPS_H
+		{ "GroupSettings", sizeof(struct GroupSettings), SERVER_TYPE_MAP },
+		{ "pc_groups_interface", sizeof(struct pc_groups_interface), SERVER_TYPE_MAP },
+		{ "pc_groups_new_permission", sizeof(struct pc_groups_new_permission), SERVER_TYPE_MAP },
+		{ "pc_groups_permission_table", sizeof(struct pc_groups_permission_table), SERVER_TYPE_MAP },
+	#else
+		#define MAP_PC_GROUPS_H
+	#endif // MAP_PC_GROUPS_H
 	#ifdef MAP_PC_H
 		{ "autotrade_vending", sizeof(struct autotrade_vending), SERVER_TYPE_MAP },
 		{ "item_cd", sizeof(struct item_cd), SERVER_TYPE_MAP },
+		{ "map_session_data", sizeof(struct map_session_data), SERVER_TYPE_MAP },
+		{ "pc_combos", sizeof(struct pc_combos), SERVER_TYPE_MAP },
+		{ "pc_interface", sizeof(struct pc_interface), SERVER_TYPE_MAP },
+		{ "s_add_drop", sizeof(struct s_add_drop), SERVER_TYPE_MAP },
 		{ "s_addeffect", sizeof(struct s_addeffect), SERVER_TYPE_MAP },
+		{ "s_addeffectonskill", sizeof(struct s_addeffectonskill), SERVER_TYPE_MAP },
+		{ "s_autobonus", sizeof(struct s_autobonus), SERVER_TYPE_MAP },
+		{ "s_autospell", sizeof(struct s_autospell), SERVER_TYPE_MAP },
+		{ "sg_data", sizeof(struct sg_data), SERVER_TYPE_MAP },
+		{ "skill_tree_entry", sizeof(struct skill_tree_entry), SERVER_TYPE_MAP },
+		{ "weapon_data", sizeof(struct weapon_data), SERVER_TYPE_MAP },
 	#else
 		#define MAP_PC_H
 	#endif // MAP_PC_H
+	#ifdef MAP_PET_H
+		{ "pet_bonus", sizeof(struct pet_bonus), SERVER_TYPE_MAP },
+		{ "pet_data", sizeof(struct pet_data), SERVER_TYPE_MAP },
+		{ "pet_interface", sizeof(struct pet_interface), SERVER_TYPE_MAP },
+		{ "pet_loot", sizeof(struct pet_loot), SERVER_TYPE_MAP },
+		{ "pet_recovery", sizeof(struct pet_recovery), SERVER_TYPE_MAP },
+		{ "pet_skill_attack", sizeof(struct pet_skill_attack), SERVER_TYPE_MAP },
+		{ "pet_skill_support", sizeof(struct pet_skill_support), SERVER_TYPE_MAP },
+		{ "s_pet_db", sizeof(struct s_pet_db), SERVER_TYPE_MAP },
+	#else
+		#define MAP_PET_H
+	#endif // MAP_PET_H
+	#ifdef MAP_QUEST_H
+		{ "quest_db", sizeof(struct quest_db), SERVER_TYPE_MAP },
+		{ "quest_dropitem", sizeof(struct quest_dropitem), SERVER_TYPE_MAP },
+		{ "quest_interface", sizeof(struct quest_interface), SERVER_TYPE_MAP },
+		{ "quest_objective", sizeof(struct quest_objective), SERVER_TYPE_MAP },
+	#else
+		#define MAP_QUEST_H
+	#endif // MAP_QUEST_H
 	#ifdef MAP_SCRIPT_H
 		{ "Script_Config", sizeof(struct Script_Config), SERVER_TYPE_MAP },
+		{ "casecheck_data", sizeof(struct casecheck_data), SERVER_TYPE_MAP },
+		{ "hQueue", sizeof(struct hQueue), SERVER_TYPE_MAP },
+		{ "hQueueIterator", sizeof(struct hQueueIterator), SERVER_TYPE_MAP },
 		{ "reg_db", sizeof(struct reg_db), SERVER_TYPE_MAP },
+		{ "script_array", sizeof(struct script_array), SERVER_TYPE_MAP },
+		{ "script_code", sizeof(struct script_code), SERVER_TYPE_MAP },
+		{ "script_data", sizeof(struct script_data), SERVER_TYPE_MAP },
+		{ "script_function", sizeof(struct script_function), SERVER_TYPE_MAP },
 		{ "script_interface", sizeof(struct script_interface), SERVER_TYPE_MAP },
+		{ "script_label_entry", sizeof(struct script_label_entry), SERVER_TYPE_MAP },
+		{ "script_retinfo", sizeof(struct script_retinfo), SERVER_TYPE_MAP },
+		{ "script_stack", sizeof(struct script_stack), SERVER_TYPE_MAP },
+		{ "script_state", sizeof(struct script_state), SERVER_TYPE_MAP },
+		{ "script_string_buf", sizeof(struct script_string_buf), SERVER_TYPE_MAP },
+		{ "script_syntax_data", sizeof(struct script_syntax_data), SERVER_TYPE_MAP },
+		{ "str_data_struct", sizeof(struct str_data_struct), SERVER_TYPE_MAP },
+		{ "string_translation", sizeof(struct string_translation), SERVER_TYPE_MAP },
 	#else
 		#define MAP_SCRIPT_H
 	#endif // MAP_SCRIPT_H
 	#ifdef MAP_SEARCHSTORE_H
+		{ "s_search_store_info", sizeof(struct s_search_store_info), SERVER_TYPE_MAP },
+		{ "s_search_store_info_item", sizeof(struct s_search_store_info_item), SERVER_TYPE_MAP },
 		{ "searchstore_interface", sizeof(struct searchstore_interface), SERVER_TYPE_MAP },
 	#else
 		#define MAP_SEARCHSTORE_H
 	#endif // MAP_SEARCHSTORE_H
 	#ifdef MAP_SKILL_H
+		{ "s_skill_abra_db", sizeof(struct s_skill_abra_db), SERVER_TYPE_MAP },
+		{ "s_skill_arrow_db", sizeof(struct s_skill_arrow_db), SERVER_TYPE_MAP },
+		{ "s_skill_changematerial_db", sizeof(struct s_skill_changematerial_db), SERVER_TYPE_MAP },
+		{ "s_skill_db", sizeof(struct s_skill_db), SERVER_TYPE_MAP },
+		{ "s_skill_improvise_db", sizeof(struct s_skill_improvise_db), SERVER_TYPE_MAP },
+		{ "s_skill_magicmushroom_db", sizeof(struct s_skill_magicmushroom_db), SERVER_TYPE_MAP },
+		{ "s_skill_produce_db", sizeof(struct s_skill_produce_db), SERVER_TYPE_MAP },
+		{ "s_skill_spellbook_db", sizeof(struct s_skill_spellbook_db), SERVER_TYPE_MAP },
+		{ "s_skill_unit_layout", sizeof(struct s_skill_unit_layout), SERVER_TYPE_MAP },
 		{ "skill_cd", sizeof(struct skill_cd), SERVER_TYPE_MAP },
+		{ "skill_cd_entry", sizeof(struct skill_cd_entry), SERVER_TYPE_MAP },
 		{ "skill_condition", sizeof(struct skill_condition), SERVER_TYPE_MAP },
 		{ "skill_interface", sizeof(struct skill_interface), SERVER_TYPE_MAP },
+		{ "skill_timerskill", sizeof(struct skill_timerskill), SERVER_TYPE_MAP },
+		{ "skill_unit", sizeof(struct skill_unit), SERVER_TYPE_MAP },
+		{ "skill_unit_group", sizeof(struct skill_unit_group), SERVER_TYPE_MAP },
+		{ "skill_unit_group_tickset", sizeof(struct skill_unit_group_tickset), SERVER_TYPE_MAP },
 		{ "skill_unit_save", sizeof(struct skill_unit_save), SERVER_TYPE_MAP },
 	#else
 		#define MAP_SKILL_H
 	#endif // MAP_SKILL_H
+	#ifdef MAP_STATUS_H
+		{ "regen_data", sizeof(struct regen_data), SERVER_TYPE_MAP },
+		{ "regen_data_sub", sizeof(struct regen_data_sub), SERVER_TYPE_MAP },
+		{ "s_refine_info", sizeof(struct s_refine_info), SERVER_TYPE_MAP },
+		{ "sc_display_entry", sizeof(struct sc_display_entry), SERVER_TYPE_MAP },
+		{ "status_change", sizeof(struct status_change), SERVER_TYPE_MAP },
+		{ "status_change_entry", sizeof(struct status_change_entry), SERVER_TYPE_MAP },
+		{ "status_data", sizeof(struct status_data), SERVER_TYPE_MAP },
+		{ "status_interface", sizeof(struct status_interface), SERVER_TYPE_MAP },
+		{ "weapon_atk", sizeof(struct weapon_atk), SERVER_TYPE_MAP },
+	#else
+		#define MAP_STATUS_H
+	#endif // MAP_STATUS_H
+	#ifdef MAP_STORAGE_H
+		{ "guild_storage_interface", sizeof(struct guild_storage_interface), SERVER_TYPE_MAP },
+		{ "storage_interface", sizeof(struct storage_interface), SERVER_TYPE_MAP },
+	#else
+		#define MAP_STORAGE_H
+	#endif // MAP_STORAGE_H
+	#ifdef MAP_TRADE_H
+		{ "trade_interface", sizeof(struct trade_interface), SERVER_TYPE_MAP },
+	#else
+		#define MAP_TRADE_H
+	#endif // MAP_TRADE_H
+	#ifdef MAP_UNIT_H
+		{ "unit_data", sizeof(struct unit_data), SERVER_TYPE_MAP },
+		{ "unit_interface", sizeof(struct unit_interface), SERVER_TYPE_MAP },
+		{ "view_data", sizeof(struct view_data), SERVER_TYPE_MAP },
+	#else
+		#define MAP_UNIT_H
+	#endif // MAP_UNIT_H
+	#ifdef MAP_VENDING_H
+		{ "s_vending", sizeof(struct s_vending), SERVER_TYPE_MAP },
+		{ "vending_interface", sizeof(struct vending_interface), SERVER_TYPE_MAP },
+	#else
+		#define MAP_VENDING_H
+	#endif // MAP_VENDING_H
 };
 HPExport unsigned int HPMDataCheckLen = ARRAYLENGTH(HPMDataCheck);
 HPExport int HPMDataCheckVer = 1;
diff --git a/src/plugins/HPMHooking/HPMHooking_char.GetSymbol.inc b/src/plugins/HPMHooking/HPMHooking_char.GetSymbol.inc
index 6d6db24ae..af7df2980 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.GetSymbol.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.GetSymbol.inc
@@ -4,19 +4,19 @@
 // NOTE: This file was auto-generated and should never be manually edited,
 //       as it will get overwritten.
 
-if( !(chr = GET_SYMBOL("chr") ) ) return false;
-if( !(geoip = GET_SYMBOL("geoip") ) ) return false;
-if( !(inter_auction = GET_SYMBOL("inter_auction") ) ) return false;
-if( !(inter_elemental = GET_SYMBOL("inter_elemental") ) ) return false;
-if( !(inter_guild = GET_SYMBOL("inter_guild") ) ) return false;
-if( !(inter_homunculus = GET_SYMBOL("inter_homunculus") ) ) return false;
-if( !(inter = GET_SYMBOL("inter") ) ) return false;
-if( !(inter_mail = GET_SYMBOL("inter_mail") ) ) return false;
-if( !(inter_mercenary = GET_SYMBOL("inter_mercenary") ) ) return false;
-if( !(inter_party = GET_SYMBOL("inter_party") ) ) return false;
-if( !(inter_pet = GET_SYMBOL("inter_pet") ) ) return false;
-if( !(inter_quest = GET_SYMBOL("inter_quest") ) ) return false;
-if( !(inter_storage = GET_SYMBOL("inter_storage") ) ) return false;
-if( !(loginif = GET_SYMBOL("loginif") ) ) return false;
-if( !(mapif = GET_SYMBOL("mapif") ) ) return false;
-if( !(pincode = GET_SYMBOL("pincode") ) ) return false;
+if( !(chr = GET_SYMBOL("chr") ) ) return "chr";
+if( !(geoip = GET_SYMBOL("geoip") ) ) return "geoip";
+if( !(inter_auction = GET_SYMBOL("inter_auction") ) ) return "inter_auction";
+if( !(inter_elemental = GET_SYMBOL("inter_elemental") ) ) return "inter_elemental";
+if( !(inter_guild = GET_SYMBOL("inter_guild") ) ) return "inter_guild";
+if( !(inter_homunculus = GET_SYMBOL("inter_homunculus") ) ) return "inter_homunculus";
+if( !(inter = GET_SYMBOL("inter") ) ) return "inter";
+if( !(inter_mail = GET_SYMBOL("inter_mail") ) ) return "inter_mail";
+if( !(inter_mercenary = GET_SYMBOL("inter_mercenary") ) ) return "inter_mercenary";
+if( !(inter_party = GET_SYMBOL("inter_party") ) ) return "inter_party";
+if( !(inter_pet = GET_SYMBOL("inter_pet") ) ) return "inter_pet";
+if( !(inter_quest = GET_SYMBOL("inter_quest") ) ) return "inter_quest";
+if( !(inter_storage = GET_SYMBOL("inter_storage") ) ) return "inter_storage";
+if( !(loginif = GET_SYMBOL("loginif") ) ) return "loginif";
+if( !(mapif = GET_SYMBOL("mapif") ) ) return "mapif";
+if( !(pincode = GET_SYMBOL("pincode") ) ) return "pincode";
diff --git a/src/plugins/HPMHooking/HPMHooking_login.GetSymbol.inc b/src/plugins/HPMHooking/HPMHooking_login.GetSymbol.inc
index 3348b5cde..fd9eeba8c 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.GetSymbol.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.GetSymbol.inc
@@ -4,4 +4,4 @@
 // NOTE: This file was auto-generated and should never be manually edited,
 //       as it will get overwritten.
 
-if( !(login = GET_SYMBOL("login") ) ) return false;
+if( !(login = GET_SYMBOL("login") ) ) return "login";
diff --git a/src/plugins/HPMHooking/HPMHooking_map.GetSymbol.inc b/src/plugins/HPMHooking/HPMHooking_map.GetSymbol.inc
index 6b1b84c69..88fe7745a 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.GetSymbol.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.GetSymbol.inc
@@ -4,42 +4,42 @@
 // NOTE: This file was auto-generated and should never be manually edited,
 //       as it will get overwritten.
 
-if( !(atcommand = GET_SYMBOL("atcommand") ) ) return false;
-if( !(battle = GET_SYMBOL("battle") ) ) return false;
-if( !(bg = GET_SYMBOL("battlegrounds") ) ) return false;
-if( !(buyingstore = GET_SYMBOL("buyingstore") ) ) return false;
-if( !(channel = GET_SYMBOL("channel") ) ) return false;
-if( !(chat = GET_SYMBOL("chat") ) ) return false;
-if( !(chrif = GET_SYMBOL("chrif") ) ) return false;
-if( !(clif = GET_SYMBOL("clif") ) ) return false;
-if( !(duel = GET_SYMBOL("duel") ) ) return false;
-if( !(elemental = GET_SYMBOL("elemental") ) ) return false;
-if( !(guild = GET_SYMBOL("guild") ) ) return false;
-if( !(gstorage = GET_SYMBOL("gstorage") ) ) return false;
-if( !(homun = GET_SYMBOL("homun") ) ) return false;
-if( !(instance = GET_SYMBOL("instance") ) ) return false;
-if( !(intif = GET_SYMBOL("intif") ) ) return false;
-if( !(ircbot = GET_SYMBOL("ircbot") ) ) return false;
-if( !(itemdb = GET_SYMBOL("itemdb") ) ) return false;
-if( !(logs = GET_SYMBOL("logs") ) ) return false;
-if( !(mail = GET_SYMBOL("mail") ) ) return false;
-if( !(map = GET_SYMBOL("map") ) ) return false;
-if( !(mapit = GET_SYMBOL("mapit") ) ) return false;
-if( !(mapreg = GET_SYMBOL("mapreg") ) ) return false;
-if( !(mercenary = GET_SYMBOL("mercenary") ) ) return false;
-if( !(mob = GET_SYMBOL("mob") ) ) return false;
-if( !(npc = GET_SYMBOL("npc") ) ) return false;
-if( !(party = GET_SYMBOL("party") ) ) return false;
-if( !(path = GET_SYMBOL("path") ) ) return false;
-if( !(pcg = GET_SYMBOL("pc_groups") ) ) return false;
-if( !(pc = GET_SYMBOL("pc") ) ) return false;
-if( !(pet = GET_SYMBOL("pet") ) ) return false;
-if( !(quest = GET_SYMBOL("quest") ) ) return false;
-if( !(script = GET_SYMBOL("script") ) ) return false;
-if( !(searchstore = GET_SYMBOL("searchstore") ) ) return false;
-if( !(skill = GET_SYMBOL("skill") ) ) return false;
-if( !(status = GET_SYMBOL("status") ) ) return false;
-if( !(storage = GET_SYMBOL("storage") ) ) return false;
-if( !(trade = GET_SYMBOL("trade") ) ) return false;
-if( !(unit = GET_SYMBOL("unit") ) ) return false;
-if( !(vending = GET_SYMBOL("vending") ) ) return false;
+if( !(atcommand = GET_SYMBOL("atcommand") ) ) return "atcommand";
+if( !(battle = GET_SYMBOL("battle") ) ) return "battle";
+if( !(bg = GET_SYMBOL("battlegrounds") ) ) return "battlegrounds";
+if( !(buyingstore = GET_SYMBOL("buyingstore") ) ) return "buyingstore";
+if( !(channel = GET_SYMBOL("channel") ) ) return "channel";
+if( !(chat = GET_SYMBOL("chat") ) ) return "chat";
+if( !(chrif = GET_SYMBOL("chrif") ) ) return "chrif";
+if( !(clif = GET_SYMBOL("clif") ) ) return "clif";
+if( !(duel = GET_SYMBOL("duel") ) ) return "duel";
+if( !(elemental = GET_SYMBOL("elemental") ) ) return "elemental";
+if( !(guild = GET_SYMBOL("guild") ) ) return "guild";
+if( !(gstorage = GET_SYMBOL("gstorage") ) ) return "gstorage";
+if( !(homun = GET_SYMBOL("homun") ) ) return "homun";
+if( !(instance = GET_SYMBOL("instance") ) ) return "instance";
+if( !(intif = GET_SYMBOL("intif") ) ) return "intif";
+if( !(ircbot = GET_SYMBOL("ircbot") ) ) return "ircbot";
+if( !(itemdb = GET_SYMBOL("itemdb") ) ) return "itemdb";
+if( !(logs = GET_SYMBOL("logs") ) ) return "logs";
+if( !(mail = GET_SYMBOL("mail") ) ) return "mail";
+if( !(map = GET_SYMBOL("map") ) ) return "map";
+if( !(mapit = GET_SYMBOL("mapit") ) ) return "mapit";
+if( !(mapreg = GET_SYMBOL("mapreg") ) ) return "mapreg";
+if( !(mercenary = GET_SYMBOL("mercenary") ) ) return "mercenary";
+if( !(mob = GET_SYMBOL("mob") ) ) return "mob";
+if( !(npc = GET_SYMBOL("npc") ) ) return "npc";
+if( !(party = GET_SYMBOL("party") ) ) return "party";
+if( !(path = GET_SYMBOL("path") ) ) return "path";
+if( !(pcg = GET_SYMBOL("pc_groups") ) ) return "pc_groups";
+if( !(pc = GET_SYMBOL("pc") ) ) return "pc";
+if( !(pet = GET_SYMBOL("pet") ) ) return "pet";
+if( !(quest = GET_SYMBOL("quest") ) ) return "quest";
+if( !(script = GET_SYMBOL("script") ) ) return "script";
+if( !(searchstore = GET_SYMBOL("searchstore") ) ) return "searchstore";
+if( !(skill = GET_SYMBOL("skill") ) ) return "skill";
+if( !(status = GET_SYMBOL("status") ) ) return "status";
+if( !(storage = GET_SYMBOL("storage") ) ) return "storage";
+if( !(trade = GET_SYMBOL("trade") ) ) return "trade";
+if( !(unit = GET_SYMBOL("unit") ) ) return "unit";
+if( !(vending = GET_SYMBOL("vending") ) ) return "vending";
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index eac60b8f4..c623747aa 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -12589,11 +12589,11 @@ void HP_clif_messageln(const int fd, const char *mes) {
 	}
 	return;
 }
-void(*) bool HP_clif_process_message(struct map_session_data *sd, int format, char **name_, size_t *namelen_, char **message_, size_t *messagelen_) {
+bool HP_clif_process_message(struct map_session_data *sd, int format, char **name_, size_t *namelen_, char **message_, size_t *messagelen_) {
 	int hIndex = 0;
-	void(*) bool retVal___ = NULL;
+	bool retVal___ = false;
 	if( HPMHooks.count.HP_clif_process_message_pre ) {
-		void(*) bool (*preHookFunc) (struct map_session_data *sd, int *format, char **name_, size_t *namelen_, char **message_, size_t *messagelen_);
+		bool (*preHookFunc) (struct map_session_data *sd, int *format, char **name_, size_t *namelen_, char **message_, size_t *messagelen_);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_process_message_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_clif_process_message_pre[hIndex].func;
@@ -12608,7 +12608,7 @@ void(*) bool HP_clif_process_message(struct map_session_data *sd, int format, ch
 		retVal___ = HPMHooks.source.clif.process_message(sd, format, name_, namelen_, message_, messagelen_);
 	}
 	if( HPMHooks.count.HP_clif_process_message_post ) {
-		void(*) bool (*postHookFunc) (void(*) bool retVal___, struct map_session_data *sd, int *format, char **name_, size_t *namelen_, char **message_, size_t *messagelen_);
+		bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *format, char **name_, size_t *namelen_, char **message_, size_t *messagelen_);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_process_message_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_clif_process_message_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, sd, &format, name_, namelen_, message_, messagelen_);