Fixed Bug #7744

Adjusted missing #ifdef behavior to be friendly to the hooking.
http://hercules.ws/board/tracker/issue-7744-compiler-error-on-hpm-hooking-after-undefined-packetver-re/

Signed-off-by: shennetsind <ind@henn.et>

13 files changed, 2688 insertions, 2277 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index f6c2ef4d0..e730823be 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -860,9 +860,9 @@ static int clif_setlevel(struct block_list* bl) {
 	}
 	return lv;
 }
-#if PACKETVER < 20091103
 /* for 'packetver < 20091103' 0x78 non-pc-looking unit handling */
 void clif_set_unit_idle2(struct block_list* bl, struct map_session_data *tsd, enum send_target target) {
+#if PACKETVER < 20091103
 	struct map_session_data* sd;
 	struct status_change* sc = status->get_sc(bl);
 	struct view_data* vd = status->get_viewdata(bl);
@@ -907,8 +907,10 @@ void clif_set_unit_idle2(struct block_list* bl, struct map_session_data *tsd, en
 	p.clevel = clif_setlevel(bl);
 	
 	clif->send(&p,sizeof(p),tsd?&tsd->bl:bl,target);
-}
+#else
+	return;
 #endif
+}
 /*==========================================
  * Prepares 'unit standing' packet
  *------------------------------------------*/
@@ -996,9 +998,9 @@ void clif_set_unit_idle(struct block_list* bl, struct map_session_data *tsd, enu
 	}
 	
 }
-#if PACKETVER < 20091103
 /* for 'packetver < 20091103' 0x7c non-pc-looking unit handling */
 void clif_spawn_unit2(struct block_list* bl, enum send_target target) {
+#if PACKETVER < 20091103
 	struct map_session_data* sd;
 	struct status_change* sc = status->get_sc(bl);
 	struct view_data* vd = status->get_viewdata(bl);
@@ -1037,8 +1039,10 @@ void clif_spawn_unit2(struct block_list* bl, enum send_target target) {
 	p.xSize = p.ySize = (sd) ? 5 : 0;
 
 	clif->send(&p,sizeof(p),bl,target);
-}
+#else
+	return;
 #endif
+}
 void clif_spawn_unit(struct block_list* bl, enum send_target target) {
 	struct map_session_data* sd;
 	struct status_change* sc = status->get_sc(bl);
@@ -12369,7 +12373,7 @@ void clif_parse_PartyBookingRegisterReq(int fd, struct map_session_data* sd)
 	short level = RFIFOW(fd,2);
 	const char *notice = (const char*)RFIFOP(fd, 4);
 
-	party->booking_register(sd, level, notice);
+	party->recruit_register(sd, level, notice);
 }
 
 /// Party booking search results (ZC_PARTY_RECRUIT_ACK_SEARCH).
@@ -12426,7 +12430,7 @@ void clif_parse_PartyBookingSearchReq(int fd, struct map_session_data* sd)
 	unsigned long lastindex = RFIFOL(fd, 6);
 	short resultcount = RFIFOW(fd, 10);
 
-	party->booking_search(sd, level, mapid, lastindex, resultcount);
+	party->recruit_search(sd, level, mapid, lastindex, resultcount);
 }
 
 /// Request to delete own party booking advertisment (CZ_PARTY_RECRUIT_REQ_DELETE).
@@ -12462,7 +12466,7 @@ void clif_parse_PartyBookingUpdateReq(int fd, struct map_session_data *sd)
 
 	notice = (const char*)RFIFOP(fd, 2);
 	
-	party->booking_update(sd, notice);
+	party->recruit_update(sd, notice);
 }
 
 /// Notification about new party booking advertisment (ZC_PARTY_RECRUIT_NOTIFY_INSERT).
@@ -17984,10 +17988,8 @@ void clif_defaults(void) {
 	clif->clearunit_delayed_sub = clif_clearunit_delayed_sub;
 	clif->set_unit_idle = clif_set_unit_idle;
 	clif->spawn_unit = clif_spawn_unit;
-#if PACKETVER < 20091103
 	clif->spawn_unit2 = clif_spawn_unit2;
 	clif->set_unit_idle2 = clif_set_unit_idle2;
-#endif
 	clif->set_unit_walking = clif_set_unit_walking;
 	clif->calc_walkdelay = clif_calc_walkdelay;
 	clif->getareachar_skillunit = clif_getareachar_skillunit;
@@ -18343,13 +18345,11 @@ void clif_defaults(void) {
 	clif->PartyBookingDeleteNotify = clif_PartyBookingDeleteNotify;
 	clif->PartyBookingInsertNotify = clif_PartyBookingInsertNotify;
 	/* Group Search System Update */
-#ifdef PARTY_RECRUIT
 	clif->PartyBookingVolunteerInfo = clif_PartyBookingVolunteerInfo;
 	clif->PartyBookingRefuseVolunteer = clif_PartyBookingRefuseVolunteer;
 	clif->PartyBookingCancelVolunteer = clif_PartyBookingCancelVolunteer;
 	clif->PartyBookingAddFilteringList = clif_PartyBookingAddFilteringList;
 	clif->PartyBookingSubFilteringList = clif_PartyBookingSubFilteringList;
-#endif
 	/* buying store-related */
 	clif->buyingstore_open = clif_buyingstore_open;
 	clif->buyingstore_open_failed = clif_buyingstore_open_failed;
@@ -18613,11 +18613,9 @@ void clif_defaults(void) {
 	clif->pPartyTick = clif_parse_PartyTick;
 	clif->pGuildInvite2 = clif_parse_GuildInvite2;
 	/* Group Search System Update */
-#ifdef PARTY_RECRUIT
 	clif->pPartyBookingAddFilter = clif_parse_PartyBookingAddFilteringList;
 	clif->pPartyBookingSubFilter = clif_parse_PartyBookingSubFilteringList;
 	clif->pPartyBookingReqVolunteer = clif_parse_PartyBookingReqVolunteer;
 	clif->pPartyBookingRefuseVolunteer = clif_parse_PartyBookingRefuseVolunteer;
 	clif->pPartyBookingCancelVolunteer = clif_parse_PartyBookingCancelVolunteer;
-#endif
 }
diff --git a/src/map/clif.h b/src/map/clif.h
index 1e054db1d..31808ddcc 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -546,10 +546,8 @@ struct clif_interface {
 	int (*clearunit_delayed_sub) (int tid, unsigned int tick, int id, intptr_t data);
 	void (*set_unit_idle) (struct block_list* bl, struct map_session_data *tsd,enum send_target target);
 	void (*spawn_unit) (struct block_list* bl, enum send_target target);
-#if PACKETVER < 20091103
 	void (*spawn_unit2) (struct block_list* bl, enum send_target target);
 	void (*set_unit_idle2) (struct block_list* bl, struct map_session_data *tsd, enum send_target target);
-#endif
 	void (*set_unit_walking) (struct block_list* bl, struct map_session_data *tsd,struct unit_data* ud, enum send_target target);
 	int (*calc_walkdelay) (struct block_list *bl,int delay, int type, int damage, int div_);
 	void (*getareachar_skillunit) (struct map_session_data *sd, struct skill_unit *su);
@@ -905,13 +903,11 @@ struct clif_interface {
 	void (*PartyBookingDeleteNotify) (struct map_session_data* sd, int index);
 	void (*PartyBookingInsertNotify) (struct map_session_data* sd, struct party_booking_ad_info* pb_ad);
 	/* Group Search System Update */
-#ifdef PARTY_RECRUIT
 	void (*PartyBookingVolunteerInfo) (int index, struct map_session_data *sd);
 	void (*PartyBookingRefuseVolunteer) (unsigned long aid, struct map_session_data *sd);
 	void (*PartyBookingCancelVolunteer) (int index, struct map_session_data *sd);
 	void (*PartyBookingAddFilteringList) (int index, struct map_session_data *sd);
 	void (*PartyBookingSubFilteringList) (int gid, struct map_session_data *sd);
-#endif
 	/* buying store-related */
 	void (*buyingstore_open) (struct map_session_data* sd);
 	void (*buyingstore_open_failed) (struct map_session_data* sd, unsigned short result, unsigned int weight);
@@ -1173,13 +1169,11 @@ struct clif_interface {
 	void (*pPartyTick) (int fd, struct map_session_data *sd);
 	void (*pGuildInvite2) (int fd, struct map_session_data *sd);
 	/* Group Search System Update */
-#ifdef PARTY_RECRUIT
 	void (*pPartyBookingAddFilter) (int fd, struct map_session_data *sd);
 	void (*pPartyBookingSubFilter) (int fd, struct map_session_data *sd);
 	void (*pPartyBookingReqVolunteer) (int fd, struct map_session_data *sd);
 	void (*pPartyBookingRefuseVolunteer) (int fd, struct map_session_data *sd);
 	void (*pPartyBookingCancelVolunteer) (int fd, struct map_session_data *sd);
-#endif
 };
 
 struct clif_interface *clif;
diff --git a/src/map/map.c b/src/map/map.c
index 0c684542d..d920875ee 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -137,26 +137,32 @@ int map_freeblock_timer(int tid, unsigned int tick, int id, intptr_t data) {
 	return 0;
 }
 
-#ifdef CELL_NOSTACK
 /*==========================================
  * These pair of functions update the counter of how many objects
  * lie on a tile.
  *------------------------------------------*/
 void map_addblcell(struct block_list *bl) {
+#ifdef CELL_NOSTACK
 	if( bl->m < 0 || bl->x < 0 || bl->x >= map->list[bl->m].xs
 	              || bl->y < 0 || bl->y >= map->list[bl->m].ys
 	              || !(bl->type&BL_CHAR) )
 		return;
 	map->list[bl->m].cell[bl->x+bl->y*map->list[bl->m].xs].cell_bl++;
+#else
+	return;
+#endif
 }
 
 void map_delblcell(struct block_list *bl) {
+#ifdef CELL_NOSTACK
 	if( bl->m < 0 || bl->x < 0 || bl->x >= map->list[bl->m].xs
 	              || bl->y < 0 || bl->y >= map->list[bl->m].ys
 	              || !(bl->type&BL_CHAR) )
 	map->list[bl->m].cell[bl->x+bl->y*map->list[bl->m].xs].cell_bl--;
-}
+#else
+	return;
 #endif
+}
 
 /*==========================================
  * Adds a block to the map.
@@ -5792,10 +5798,8 @@ void map_defaults(void) {
 	map->versionscreen = map_versionscreen;
 	map->arg_next_value = map_arg_next_value;
 
-#ifdef CELL_NOSTACK
 	map->addblcell = map_addblcell;
 	map->delblcell = map_delblcell;
-#endif
 
 	/**
 	 * mapit interface
diff --git a/src/map/map.h b/src/map/map.h
index 67fdfcf96..29c1dfecc 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -1018,10 +1018,8 @@ struct map_interface {
 	void (*helpscreen) (bool do_exit);
 	void (*versionscreen) (bool do_exit);
 	bool (*arg_next_value) (const char *option, int i, int argc);
-#ifdef CELL_NOSTACK
 	void (*addblcell) (struct block_list *bl);
 	void (*delblcell) (struct block_list *bl);
-#endif
 };
 
 struct map_interface *map;
diff --git a/src/map/npc.c b/src/map/npc.c
index a28724238..c52dce325 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -212,11 +212,11 @@ struct npc_data* npc_name2id(const char* name)
 /**
  * For the Secure NPC Timeout option (check config/Secure.h) [RR]
  **/
-#ifdef SECURE_NPCTIMEOUT
 /**
  * Timer to check for idle time and timeout the dialog if necessary
  **/
 int npc_rr_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t data) {
+#ifdef SECURE_NPCTIMEOUT
 	struct map_session_data* sd = NULL;
 	unsigned int timeout = NPC_SECURE_TIMEOUT_NEXT;
 	if( (sd = map->id2sd(id)) == NULL || !sd->npc_id ) {
@@ -251,9 +251,9 @@ int npc_rr_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t dat
 		sd->npc_idle_timer = INVALID_TIMER;
 	} else //Create a new instance of ourselves to continue
 		sd->npc_idle_timer = timer->add(timer->gettick() + (SECURE_NPCTIMEOUT_INTERVAL*1000),npc->secure_timeout_timer,sd->bl.id,0);
+#endif
 	return 0;
 }
-#endif
 
 /*==========================================
  * Dequeue event and add timer for execution (100ms)
@@ -4072,7 +4072,5 @@ void npc_defaults(void) {
 	npc->do_clear_npc = do_clear_npc;
 	npc->debug_warps_sub = npc_debug_warps_sub;
 	npc->debug_warps = npc_debug_warps;
-#ifdef SECURE_NPCTIMEOUT
 	npc->secure_timeout_timer = npc_rr_secure_timeout_timer;
-#endif
 }
diff --git a/src/map/npc.h b/src/map/npc.h
index 3c273fffb..f809cb19c 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -229,9 +229,7 @@ struct npc_interface {
 	/**
 	 * For the Secure NPC Timeout option (check config/Secure.h) [RR]
 	 **/
-#ifdef SECURE_NPCTIMEOUT
 	int (*secure_timeout_timer) (int tid, unsigned int tick, int id, intptr_t data);
-#endif
 };
 
 struct npc_interface *npc;
diff --git a/src/map/party.c b/src/map/party.c
index 1694adf2c..7db6b8e10 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -1108,16 +1108,9 @@ struct party_booking_ad_info* create_party_booking_data(void) {
 	return pb_ad;
 }
 
-#ifndef PARTY_RECRUIT
-void party_booking_register(struct map_session_data *sd, short level, short mapid, short* job)
-#else
-void party_booking_register(struct map_session_data *sd, short level, const char *notice)
-#endif
-{
+void party_recruit_register(struct map_session_data *sd, short level, const char *notice) {
+#ifdef PARTY_RECRUIT
 	struct party_booking_ad_info *pb_ad;
-#ifndef PARTY_RECRUIT
- 	int i;
-#endif
 
 	pb_ad = (struct party_booking_ad_info*)idb_get(party->booking_db, sd->status.char_id);
 
@@ -1135,30 +1128,52 @@ void party_booking_register(struct map_session_data *sd, short level, const char
 	memcpy(pb_ad->charname,sd->status.name,NAME_LENGTH);
 	pb_ad->expiretime = (int)time(NULL);
  	pb_ad->p_detail.level = level;
+	safestrncpy(pb_ad->p_detail.notice, notice, PB_NOTICE_LENGTH);
+
+	clif->PartyBookingRegisterAck(sd, 0);
+	clif->PartyBookingInsertNotify(sd, pb_ad); // Notice
+#else
+	return;
+#endif
+}
+
+void party_booking_register(struct map_session_data *sd, short level, short mapid, short* job) {
 #ifndef PARTY_RECRUIT
+	struct party_booking_ad_info *pb_ad;
+ 	int i;
+	
+	pb_ad = (struct party_booking_ad_info*)idb_get(party->booking_db, sd->status.char_id);
+	
+	if( pb_ad == NULL )
+	{
+		pb_ad = party->create_booking_data();
+		idb_put(party->booking_db, sd->status.char_id, pb_ad);
+	}
+	else
+	{// already registered
+		clif->PartyBookingRegisterAck(sd, 2);
+		return;
+	}
+	
+	memcpy(pb_ad->charname,sd->status.name,NAME_LENGTH);
+	pb_ad->expiretime = (int)time(NULL);
+ 	pb_ad->p_detail.level = level;
 	pb_ad->p_detail.mapid = mapid;
-
+	
 	for(i=0;i<PARTY_BOOKING_JOBS;i++)
 		if(job[i] != 0xFF)
 			pb_ad->p_detail.job[i] = job[i];
 		else pb_ad->p_detail.job[i] = -1;
-#else
-	safestrncpy(pb_ad->p_detail.notice, notice, PB_NOTICE_LENGTH);
-#endif
-
+	
 	clif->PartyBookingRegisterAck(sd, 0);
 	clif->PartyBookingInsertNotify(sd, pb_ad); // Notice
-}
-
-#ifndef PARTY_RECRUIT
-void party_booking_update(struct map_session_data *sd, short* job)
 #else
-void party_booking_update(struct map_session_data *sd, const char *notice)
-#endif
-{
-#ifndef PARTY_RECRUIT
-	int i;
+	return;
 #endif
+}
+
+void party_recruit_update(struct map_session_data *sd, const char *notice) {
+#ifdef PARTY_RECRUIT
 	struct party_booking_ad_info *pb_ad;
 
 	pb_ad = (struct party_booking_ad_info*)idb_get(party->booking_db, sd->status.char_id);
@@ -1168,30 +1183,42 @@ void party_booking_update(struct map_session_data *sd, const char *notice)
 
 	pb_ad->expiretime = (int)time(NULL);// Update time.
 
-#ifndef PARTY_RECRUIT
-	for(i=0;i<PARTY_BOOKING_JOBS;i++)
-		if(job[i] != 0xFF)
-			pb_ad->p_detail.job[i] = job[i];
-		else pb_ad->p_detail.job[i] = -1;
-#else
 	if (notice != NULL) {
 		safestrncpy(pb_ad->p_detail.notice, notice, PB_NOTICE_LENGTH);
 	}
-#endif
 
 	clif->PartyBookingUpdateNotify(sd, pb_ad);
-}
-
-#ifndef PARTY_RECRUIT
-void party_booking_search(struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount)
 #else
-void party_booking_search(struct map_session_data *sd, short level, short mapid, unsigned long lastindex, short resultcount)
+	return;
 #endif
-{
-	struct party_booking_ad_info *pb_ad;
+}
+void party_booking_update(struct map_session_data *sd, short* job) {
 #ifndef PARTY_RECRUIT
 	int i;
+	struct party_booking_ad_info *pb_ad;
+	
+	pb_ad = (struct party_booking_ad_info*)idb_get(party->booking_db, sd->status.char_id);
+	
+	if( pb_ad == NULL )
+		return;
+	
+	pb_ad->expiretime = (int)time(NULL);// Update time.
+	
+	for(i=0;i<PARTY_BOOKING_JOBS;i++)
+		if(job[i] != 0xFF)
+			pb_ad->p_detail.job[i] = job[i];
+		else pb_ad->p_detail.job[i] = -1;
+	
+	clif->PartyBookingUpdateNotify(sd, pb_ad);
+#else
+	return;
 #endif
+}
+
+
+void party_recruit_search(struct map_session_data *sd, short level, short mapid, unsigned long lastindex, short resultcount) {
+#ifdef PARTY_RECRUIT
+	struct party_booking_ad_info *pb_ad;
 	int count = 0;
 	struct party_booking_ad_info* result_list[PARTY_BOOKING_RESULTS];
 	bool more_result = false;
@@ -1201,18 +1228,42 @@ void party_booking_search(struct map_session_data *sd, short level, short mapid,
 
 	for( pb_ad = dbi_first(iter); dbi_exists(iter); pb_ad = dbi_next(iter) )
 	{
-#ifndef PARTY_RECRUIT
-		if (pb_ad->index < lastindex || (level && (pb_ad->p_detail.level < level-15 || pb_ad->p_detail.level > level)))
-			continue;
-#else
 		if ((level && (pb_ad->p_detail.level < level-15 || pb_ad->p_detail.level > level)))
 			continue;
-#endif
 		if (count >= PARTY_BOOKING_RESULTS){
 			more_result = true;
 			break;
 		}
+		result_list[count] = pb_ad;
+		if( result_list[count] )
+		{
+			count++;
+		}
+	}
+	dbi_destroy(iter);
+	clif->PartyBookingSearchAck(sd->fd, result_list, count, more_result);
+#else
+	return;
+#endif
+}
+void party_booking_search(struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount) {
 #ifndef PARTY_RECRUIT
+	struct party_booking_ad_info *pb_ad;
+	int i;
+	int count = 0;
+	struct party_booking_ad_info* result_list[PARTY_BOOKING_RESULTS];
+	bool more_result = false;
+	DBIterator* iter = db_iterator(party->booking_db);
+	
+	memset(result_list, 0, sizeof(result_list));
+	
+	for( pb_ad = dbi_first(iter); dbi_exists(iter); pb_ad = dbi_next(iter) ) {
+		if (pb_ad->index < lastindex || (level && (pb_ad->p_detail.level < level-15 || pb_ad->p_detail.level > level)))
+			continue;
+		if (count >= PARTY_BOOKING_RESULTS){
+			more_result = true;
+			break;
+		}
 		if (mapid == 0 && job == -1)
 			result_list[count] = pb_ad;
 		else if (mapid == 0) {
@@ -1223,9 +1274,6 @@ void party_booking_search(struct map_session_data *sd, short level, short mapid,
 			if (pb_ad->p_detail.mapid == mapid)
 				result_list[count] = pb_ad;
 		}
-#else
-		result_list[count] = pb_ad;
-#endif
 		if( result_list[count] )
 		{
 			count++;
@@ -1233,8 +1281,12 @@ void party_booking_search(struct map_session_data *sd, short level, short mapid,
 	}
 	dbi_destroy(iter);
 	clif->PartyBookingSearchAck(sd->fd, result_list, count, more_result);
+#else
+	return;
+#endif
 }
 
+
 bool party_booking_delete(struct map_session_data *sd)
 {
 	struct party_booking_ad_info* pb_ad;
@@ -1309,6 +1361,9 @@ void party_defaults(void) {
 	party->booking_register = party_booking_register;
 	party->booking_update = party_booking_update;
 	party->booking_search = party_booking_search;
+	party->recruit_register = party_recruit_register;
+	party->recruit_update = party_recruit_update;
+	party->recruit_search = party_recruit_search;
 	party->booking_delete = party_booking_delete;
 	party->vforeachsamemap = party_vforeachsamemap;
 	party->foreachsamemap = party_foreachsamemap;
diff --git a/src/map/party.h b/src/map/party.h
index 570c7bd11..208edb846 100644
--- a/src/map/party.h
+++ b/src/map/party.h
@@ -34,6 +34,8 @@ struct party_data {
 	} state;
 };
 
+#define PB_NOTICE_LENGTH (36 + 1)
+
 #ifndef PARTY_RECRUIT
 struct party_booking_detail {
 	short level;
@@ -48,7 +50,6 @@ struct party_booking_ad_info {
 	struct party_booking_detail p_detail;
 };
 #else /* PARTY_RECRUIT */
-#define PB_NOTICE_LENGTH (36 + 1)
 struct party_booking_detail {
 	short level;
 	char notice[PB_NOTICE_LENGTH];
@@ -111,15 +112,13 @@ struct party_interface {
 	/*==========================================
 	 * Party Booking in KRO [Spiria]
 	 *------------------------------------------*/
-#ifndef PARTY_RECRUIT
 	void (*booking_register) (struct map_session_data *sd, short level, short mapid, short* job);
 	void (*booking_update) (struct map_session_data *sd, short* job);
 	void (*booking_search) (struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount);
-#else /* PARTY_RECRUIT */
-	void (*booking_register) (struct map_session_data *sd, short level, const char *notice);
-	void (*booking_update) (struct map_session_data *sd, const char *notice);
-	void (*booking_search) (struct map_session_data *sd, short level, short mapid, unsigned long lastindex, short resultcount);
-#endif
+	/* PARTY_RECRUIT */
+	void (*recruit_register) (struct map_session_data *sd, short level, const char *notice);
+	void (*recruit_update) (struct map_session_data *sd, const char *notice);
+	void (*recruit_search) (struct map_session_data *sd, short level, short mapid, unsigned long lastindex, short resultcount);
 	bool (*booking_delete) (struct map_session_data *sd);
 	/* */
 	int (*vforeachsamemap) (int (*func)(struct block_list *,va_list),struct map_session_data *sd,int range, va_list ap);
diff --git a/src/map/status.c b/src/map/status.c
index 6953312f8..6b2edc9ac 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1911,9 +1911,14 @@ unsigned short status_base_atk(const struct block_list *bl, const struct status_
 
 static inline unsigned short status_base_matk_min(const struct status_data *st){ return st->int_+(st->int_/7)*(st->int_/7); }
 static inline unsigned short status_base_matk_max(const struct status_data *st){ return st->int_+(st->int_/5)*(st->int_/5); }
+
+unsigned short status_base_matk(const struct status_data *st, int level) {
 #ifdef RENEWAL
-unsigned short status_base_matk(const struct status_data *st, int level){ return st->int_+(st->int_/2)+(st->dex/5)+(st->luk/3)+(level/4); }
+	return st->int_+(st->int_/2)+(st->dex/5)+(st->luk/3)+(level/4);
+#else
+	return 0;
 #endif
+}
 
 //Fills in the misc data that can be calculated from the other status info (except for level)
 void status_calc_misc(struct block_list *bl, struct status_data *st, int level) {
@@ -4514,9 +4519,8 @@ unsigned short status_calc_watk(struct block_list *bl, struct status_change *sc,
 
 	return (unsigned short)cap_value(watk,0,USHRT_MAX);
 }
+unsigned short status_calc_ematk(struct block_list *bl, struct status_change *sc, int matk) {
 #ifdef RENEWAL
-unsigned short status_calc_ematk(struct block_list *bl, struct status_change *sc, int matk)
-{
 
 	if (!sc || !sc->count)
 		return cap_value(matk,0,USHRT_MAX);
@@ -4539,8 +4543,10 @@ unsigned short status_calc_ematk(struct block_list *bl, struct status_change *sc
 	if(sc->data[SC_IZAYOI])
 		matk += 25 * sc->data[SC_IZAYOI]->val1;
 	return (unsigned short)cap_value(matk,0,USHRT_MAX);
-}
+#else
+	return 0;
 #endif
+}
 unsigned short status_calc_matk(struct block_list *bl, struct status_change *sc, int matk, bool viewable)
 {
 	if(!sc || !sc->count)
@@ -5202,11 +5208,10 @@ unsigned short status_calc_speed(struct block_list *bl, struct status_change *sc
 	return (short)cap_value(speed,10,USHRT_MAX);
 }
 
-#ifdef RENEWAL_ASPD
 // flag&1 - fixed value [malufett]
 // flag&2 - percentage value
-short status_calc_aspd(struct block_list *bl, struct status_change *sc, short flag)
-{
+short status_calc_aspd(struct block_list *bl, struct status_change *sc, short flag) {
+#ifdef RENEWAL_ASPD
 	int i, pots = 0, skills1 = 0, skills2 = 0;
 
 	if(!sc || !sc->count)
@@ -5318,8 +5323,10 @@ short status_calc_aspd(struct block_list *bl, struct status_change *sc, short fl
 		}
 	}
 	return ( flag&1? (skills1 + pots) : skills2 );
-}
+#else
+	return 0;
 #endif
+}
 
 short status_calc_fix_aspd(struct block_list *bl, struct status_change *sc, int aspd) {
 	if (!sc || !sc->count)
@@ -10768,8 +10775,8 @@ int status_change_timer_sub(struct block_list* bl, va_list ap) {
 
 int status_get_total_def(struct block_list *src) { return status->get_status_data(src)->def2 + (short)status->get_def(src); }
 int status_get_total_mdef(struct block_list *src) { return status->get_status_data(src)->mdef2 + (short)status_get_mdef(src); }
-#ifdef RENEWAL
 int status_get_weapon_atk(struct block_list *bl, struct weapon_atk *watk, int flag) {
+#ifdef RENEWAL
 	int min = 0, max = 0, dstr;
 	float strdex_bonus, variance;
 	struct status_change *sc = status->get_sc(bl);
@@ -10803,8 +10810,10 @@ int status_get_weapon_atk(struct block_list *bl, struct weapon_atk *watk, int fl
 	max = status->calc_watk(bl, sc, max, false);
 
 	return max;
-}
+#else
+	return 0;
 #endif
+}
 
 #define GETRANDMATK(st) do {\
 	if( (st)->matk_max > (st)->matk_min ) \
@@ -11552,10 +11561,8 @@ void status_defaults(void) {
 	status->calc_mdef = status_calc_mdef;
 	status->calc_mdef2 = status_calc_mdef2;
 	status->calc_batk = status_calc_batk;
-#ifdef RENEWAL
 	status->base_matk = status_base_matk;
 	status->get_weapon_atk = status_get_weapon_atk;
-#endif
 	status->get_total_mdef = status_get_total_mdef;
 	status->get_total_def = status_get_total_def;
 
@@ -11588,18 +11595,14 @@ void status_defaults(void) {
 	status->calc_speed = status_calc_speed;
 	status->calc_aspd_rate = status_calc_aspd_rate;
 	status->calc_dmotion = status_calc_dmotion;
-#ifdef RENEWAL_ASPD
 	status->calc_aspd = status_calc_aspd;
-#endif
 	status->calc_fix_aspd = status_calc_fix_aspd;
 	status->calc_maxhp = status_calc_maxhp;
 	status->calc_maxsp = status_calc_maxsp;
 	status->calc_element = status_calc_element;
 	status->calc_element_lv = status_calc_element_lv;
 	status->calc_mode = status_calc_mode;
-#ifdef RENEWAL
 	status->calc_ematk = status_calc_ematk;
-#endif
 	status->calc_bl_main = status_calc_bl_main;
 	status->display_add = status_display_add;
 	status->display_remove = status_display_remove;
diff --git a/src/map/status.h b/src/map/status.h
index d1e78b0b7..c7518a213 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -1893,10 +1893,8 @@ struct status_interface {
 	defType (*calc_mdef) (struct block_list *bl, struct status_change *sc, int mdef, bool viewable);
 	short (*calc_mdef2) (struct block_list *bl, struct status_change *sc, int mdef2, bool viewable);
 	unsigned short (*calc_batk)(struct block_list *bl, struct status_change *sc, int batk, bool viewable);
-#ifdef RENEWAL
 	unsigned short (*base_matk) (const struct status_data *st, int level);
 	int (*get_weapon_atk) (struct block_list *src, struct weapon_atk *watk, int flag);
-#endif
 	int (*get_total_mdef) (struct block_list *src);
 	int (*get_total_def) (struct block_list *src);
 	int (*get_matk) (struct block_list *src, int flag);
@@ -1925,18 +1923,14 @@ struct status_interface {
 	unsigned short (*calc_speed) (struct block_list *bl, struct status_change *sc, int speed);
 	short (*calc_aspd_rate) (struct block_list *bl, struct status_change *sc, int aspd_rate);
 	unsigned short (*calc_dmotion) (struct block_list *bl, struct status_change *sc, int dmotion);
-#ifdef RENEWAL_ASPD
 	short (*calc_aspd) (struct block_list *bl, struct status_change *sc, short flag);
-#endif
 	short (*calc_fix_aspd) (struct block_list *bl, struct status_change *sc, int aspd);
 	unsigned int (*calc_maxhp) (struct block_list *bl, struct status_change *sc, uint64 maxhp);
 	unsigned int (*calc_maxsp) (struct block_list *bl, struct status_change *sc, unsigned int maxsp);
 	unsigned char (*calc_element) (struct block_list *bl, struct status_change *sc, int element);
 	unsigned char (*calc_element_lv) (struct block_list *bl, struct status_change *sc, int lv);
 	unsigned short (*calc_mode) (struct block_list *bl, struct status_change *sc, int mode);
-#ifdef RENEWAL
 	unsigned short (*calc_ematk) (struct block_list *bl, struct status_change *sc, int matk);
-#endif
 	void (*calc_bl_main) (struct block_list *bl, int flag);
 	void (*display_add) (struct map_session_data *sd, enum sc_type type, int dval1, int dval2, int dval3);
 	void (*display_remove) (struct map_session_data *sd, enum sc_type type);
diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
index c73747a10..caf5dd324 100644
--- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
@@ -499,6 +499,10 @@ struct HPMHookPoint *HP_clif_set_unit_idle_pre;
 struct HPMHookPoint *HP_clif_set_unit_idle_post;
 struct HPMHookPoint *HP_clif_spawn_unit_pre;
 struct HPMHookPoint *HP_clif_spawn_unit_post;
+struct HPMHookPoint *HP_clif_spawn_unit2_pre;
+struct HPMHookPoint *HP_clif_spawn_unit2_post;
+struct HPMHookPoint *HP_clif_set_unit_idle2_pre;
+struct HPMHookPoint *HP_clif_set_unit_idle2_post;
 struct HPMHookPoint *HP_clif_set_unit_walking_pre;
 struct HPMHookPoint *HP_clif_set_unit_walking_post;
 struct HPMHookPoint *HP_clif_calc_walkdelay_pre;
@@ -2797,6 +2801,10 @@ struct HPMHookPoint *HP_map_versionscreen_pre;
 struct HPMHookPoint *HP_map_versionscreen_post;
 struct HPMHookPoint *HP_map_arg_next_value_pre;
 struct HPMHookPoint *HP_map_arg_next_value_post;
+struct HPMHookPoint *HP_map_addblcell_pre;
+struct HPMHookPoint *HP_map_addblcell_post;
+struct HPMHookPoint *HP_map_delblcell_pre;
+struct HPMHookPoint *HP_map_delblcell_post;
 struct HPMHookPoint *HP_mapit_alloc_pre;
 struct HPMHookPoint *HP_mapit_alloc_post;
 struct HPMHookPoint *HP_mapit_free_pre;
@@ -3243,6 +3251,8 @@ struct HPMHookPoint *HP_npc_debug_warps_sub_pre;
 struct HPMHookPoint *HP_npc_debug_warps_sub_post;
 struct HPMHookPoint *HP_npc_debug_warps_pre;
 struct HPMHookPoint *HP_npc_debug_warps_post;
+struct HPMHookPoint *HP_npc_secure_timeout_timer_pre;
+struct HPMHookPoint *HP_npc_secure_timeout_timer_post;
 struct HPMHookPoint *HP_party_init_pre;
 struct HPMHookPoint *HP_party_init_post;
 struct HPMHookPoint *HP_party_final_pre;
@@ -3317,6 +3327,12 @@ struct HPMHookPoint *HP_party_booking_update_pre;
 struct HPMHookPoint *HP_party_booking_update_post;
 struct HPMHookPoint *HP_party_booking_search_pre;
 struct HPMHookPoint *HP_party_booking_search_post;
+struct HPMHookPoint *HP_party_recruit_register_pre;
+struct HPMHookPoint *HP_party_recruit_register_post;
+struct HPMHookPoint *HP_party_recruit_update_pre;
+struct HPMHookPoint *HP_party_recruit_update_post;
+struct HPMHookPoint *HP_party_recruit_search_pre;
+struct HPMHookPoint *HP_party_recruit_search_post;
 struct HPMHookPoint *HP_party_booking_delete_pre;
 struct HPMHookPoint *HP_party_booking_delete_post;
 struct HPMHookPoint *HP_party_vforeachsamemap_pre;
@@ -4571,6 +4587,10 @@ struct HPMHookPoint *HP_status_calc_mdef2_pre;
 struct HPMHookPoint *HP_status_calc_mdef2_post;
 struct HPMHookPoint *HP_status_calc_batk_pre;
 struct HPMHookPoint *HP_status_calc_batk_post;
+struct HPMHookPoint *HP_status_base_matk_pre;
+struct HPMHookPoint *HP_status_base_matk_post;
+struct HPMHookPoint *HP_status_get_weapon_atk_pre;
+struct HPMHookPoint *HP_status_get_weapon_atk_post;
 struct HPMHookPoint *HP_status_get_total_mdef_pre;
 struct HPMHookPoint *HP_status_get_total_mdef_post;
 struct HPMHookPoint *HP_status_get_total_def_pre;
@@ -4625,6 +4645,8 @@ struct HPMHookPoint *HP_status_calc_aspd_rate_pre;
 struct HPMHookPoint *HP_status_calc_aspd_rate_post;
 struct HPMHookPoint *HP_status_calc_dmotion_pre;
 struct HPMHookPoint *HP_status_calc_dmotion_post;
+struct HPMHookPoint *HP_status_calc_aspd_pre;
+struct HPMHookPoint *HP_status_calc_aspd_post;
 struct HPMHookPoint *HP_status_calc_fix_aspd_pre;
 struct HPMHookPoint *HP_status_calc_fix_aspd_post;
 struct HPMHookPoint *HP_status_calc_maxhp_pre;
@@ -4637,6 +4659,8 @@ struct HPMHookPoint *HP_status_calc_element_lv_pre;
 struct HPMHookPoint *HP_status_calc_element_lv_post;
 struct HPMHookPoint *HP_status_calc_mode_pre;
 struct HPMHookPoint *HP_status_calc_mode_post;
+struct HPMHookPoint *HP_status_calc_ematk_pre;
+struct HPMHookPoint *HP_status_calc_ematk_post;
 struct HPMHookPoint *HP_status_calc_bl_main_pre;
 struct HPMHookPoint *HP_status_calc_bl_main_post;
 struct HPMHookPoint *HP_status_display_add_pre;
@@ -5311,6 +5335,10 @@ int HP_clif_set_unit_idle_pre;
 int HP_clif_set_unit_idle_post;
 int HP_clif_spawn_unit_pre;
 int HP_clif_spawn_unit_post;
+int HP_clif_spawn_unit2_pre;
+int HP_clif_spawn_unit2_post;
+int HP_clif_set_unit_idle2_pre;
+int HP_clif_set_unit_idle2_post;
 int HP_clif_set_unit_walking_pre;
 int HP_clif_set_unit_walking_post;
 int HP_clif_calc_walkdelay_pre;
@@ -7609,6 +7637,10 @@ int HP_map_versionscreen_pre;
 int HP_map_versionscreen_post;
 int HP_map_arg_next_value_pre;
 int HP_map_arg_next_value_post;
+int HP_map_addblcell_pre;
+int HP_map_addblcell_post;
+int HP_map_delblcell_pre;
+int HP_map_delblcell_post;
 int HP_mapit_alloc_pre;
 int HP_mapit_alloc_post;
 int HP_mapit_free_pre;
@@ -8055,6 +8087,8 @@ int HP_npc_debug_warps_sub_pre;
 int HP_npc_debug_warps_sub_post;
 int HP_npc_debug_warps_pre;
 int HP_npc_debug_warps_post;
+int HP_npc_secure_timeout_timer_pre;
+int HP_npc_secure_timeout_timer_post;
 int HP_party_init_pre;
 int HP_party_init_post;
 int HP_party_final_pre;
@@ -8129,6 +8163,12 @@ int HP_party_booking_update_pre;
 int HP_party_booking_update_post;
 int HP_party_booking_search_pre;
 int HP_party_booking_search_post;
+int HP_party_recruit_register_pre;
+int HP_party_recruit_register_post;
+int HP_party_recruit_update_pre;
+int HP_party_recruit_update_post;
+int HP_party_recruit_search_pre;
+int HP_party_recruit_search_post;
 int HP_party_booking_delete_pre;
 int HP_party_booking_delete_post;
 int HP_party_vforeachsamemap_pre;
@@ -9383,6 +9423,10 @@ int HP_status_calc_mdef2_pre;
 int HP_status_calc_mdef2_post;
 int HP_status_calc_batk_pre;
 int HP_status_calc_batk_post;
+int HP_status_base_matk_pre;
+int HP_status_base_matk_post;
+int HP_status_get_weapon_atk_pre;
+int HP_status_get_weapon_atk_post;
 int HP_status_get_total_mdef_pre;
 int HP_status_get_total_mdef_post;
 int HP_status_get_total_def_pre;
@@ -9437,6 +9481,8 @@ int HP_status_calc_aspd_rate_pre;
 int HP_status_calc_aspd_rate_post;
 int HP_status_calc_dmotion_pre;
 int HP_status_calc_dmotion_post;
+int HP_status_calc_aspd_pre;
+int HP_status_calc_aspd_post;
 int HP_status_calc_fix_aspd_pre;
 int HP_status_calc_fix_aspd_post;
 int HP_status_calc_maxhp_pre;
@@ -9449,6 +9495,8 @@ int HP_status_calc_element_lv_pre;
 int HP_status_calc_element_lv_post;
 int HP_status_calc_mode_pre;
 int HP_status_calc_mode_post;
+int HP_status_calc_ematk_pre;
+int HP_status_calc_ematk_post;
 int HP_status_calc_bl_main_pre;
 int HP_status_calc_bl_main_post;
 int HP_status_display_add_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
index 69f6e287a..e356f2b18 100644
--- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
@@ -256,2190 +256,2202 @@ struct HookingPointData HookingPoints[] = {
 { HP_POP(clif->clearunit_delayed_sub), HP_POP2(HP_clif_clearunit_delayed_sub), 494 },
 { HP_POP(clif->set_unit_idle), HP_POP2(HP_clif_set_unit_idle), 496 },
 { HP_POP(clif->spawn_unit), HP_POP2(HP_clif_spawn_unit), 498 },
-{ HP_POP(clif->set_unit_walking), HP_POP2(HP_clif_set_unit_walking), 500 },
-{ HP_POP(clif->calc_walkdelay), HP_POP2(HP_clif_calc_walkdelay), 502 },
-{ HP_POP(clif->getareachar_skillunit), HP_POP2(HP_clif_getareachar_skillunit), 504 },
-{ HP_POP(clif->getareachar_unit), HP_POP2(HP_clif_getareachar_unit), 506 },
-{ HP_POP(clif->clearchar_skillunit), HP_POP2(HP_clif_clearchar_skillunit), 508 },
-{ HP_POP(clif->getareachar), HP_POP2(HP_clif_getareachar), 510 },
-{ HP_POP(clif->spawn), HP_POP2(HP_clif_spawn), 512 },
-{ HP_POP(clif->changemap), HP_POP2(HP_clif_changemap), 514 },
-{ HP_POP(clif->changemapcell), HP_POP2(HP_clif_changemapcell), 516 },
-{ HP_POP(clif->map_property), HP_POP2(HP_clif_map_property), 518 },
-{ HP_POP(clif->pvpset), HP_POP2(HP_clif_pvpset), 520 },
-{ HP_POP(clif->map_property_mapall), HP_POP2(HP_clif_map_property_mapall), 522 },
-{ HP_POP(clif->bossmapinfo), HP_POP2(HP_clif_bossmapinfo), 524 },
-{ HP_POP(clif->map_type), HP_POP2(HP_clif_map_type), 526 },
-{ HP_POP(clif->maptypeproperty2), HP_POP2(HP_clif_maptypeproperty2), 528 },
-{ HP_POP(clif->changemapserver), HP_POP2(HP_clif_changemapserver), 530 },
-{ HP_POP(clif->npcbuysell), HP_POP2(HP_clif_npcbuysell), 532 },
-{ HP_POP(clif->buylist), HP_POP2(HP_clif_buylist), 534 },
-{ HP_POP(clif->selllist), HP_POP2(HP_clif_selllist), 536 },
-{ HP_POP(clif->cashshop_show), HP_POP2(HP_clif_cashshop_show), 538 },
-{ HP_POP(clif->npc_buy_result), HP_POP2(HP_clif_npc_buy_result), 540 },
-{ HP_POP(clif->npc_sell_result), HP_POP2(HP_clif_npc_sell_result), 542 },
-{ HP_POP(clif->cashshop_ack), HP_POP2(HP_clif_cashshop_ack), 544 },
-{ HP_POP(clif->scriptmes), HP_POP2(HP_clif_scriptmes), 546 },
-{ HP_POP(clif->scriptnext), HP_POP2(HP_clif_scriptnext), 548 },
-{ HP_POP(clif->scriptclose), HP_POP2(HP_clif_scriptclose), 550 },
-{ HP_POP(clif->scriptmenu), HP_POP2(HP_clif_scriptmenu), 552 },
-{ HP_POP(clif->scriptinput), HP_POP2(HP_clif_scriptinput), 554 },
-{ HP_POP(clif->scriptinputstr), HP_POP2(HP_clif_scriptinputstr), 556 },
-{ HP_POP(clif->cutin), HP_POP2(HP_clif_cutin), 558 },
-{ HP_POP(clif->sendfakenpc), HP_POP2(HP_clif_sendfakenpc), 560 },
-{ HP_POP(clif->scriptclear), HP_POP2(HP_clif_scriptclear), 562 },
-{ HP_POP(clif->viewpoint), HP_POP2(HP_clif_viewpoint), 564 },
-{ HP_POP(clif->damage), HP_POP2(HP_clif_damage), 566 },
-{ HP_POP(clif->sitting), HP_POP2(HP_clif_sitting), 568 },
-{ HP_POP(clif->standing), HP_POP2(HP_clif_standing), 570 },
-{ HP_POP(clif->arrow_create_list), HP_POP2(HP_clif_arrow_create_list), 572 },
-{ HP_POP(clif->refresh), HP_POP2(HP_clif_refresh), 574 },
-{ HP_POP(clif->fame_blacksmith), HP_POP2(HP_clif_fame_blacksmith), 576 },
-{ HP_POP(clif->fame_alchemist), HP_POP2(HP_clif_fame_alchemist), 578 },
-{ HP_POP(clif->fame_taekwon), HP_POP2(HP_clif_fame_taekwon), 580 },
-{ HP_POP(clif->ranklist), HP_POP2(HP_clif_ranklist), 582 },
-{ HP_POP(clif->update_rankingpoint), HP_POP2(HP_clif_update_rankingpoint), 584 },
-{ HP_POP(clif->pRanklist), HP_POP2(HP_clif_pRanklist), 586 },
-{ HP_POP(clif->hotkeys), HP_POP2(HP_clif_hotkeys), 588 },
-{ HP_POP(clif->insight), HP_POP2(HP_clif_insight), 590 },
-{ HP_POP(clif->outsight), HP_POP2(HP_clif_outsight), 592 },
-{ HP_POP(clif->skillcastcancel), HP_POP2(HP_clif_skillcastcancel), 594 },
-{ HP_POP(clif->skill_fail), HP_POP2(HP_clif_skill_fail), 596 },
-{ HP_POP(clif->skill_cooldown), HP_POP2(HP_clif_skill_cooldown), 598 },
-{ HP_POP(clif->skill_memomessage), HP_POP2(HP_clif_skill_memomessage), 600 },
-{ HP_POP(clif->skill_mapinfomessage), HP_POP2(HP_clif_skill_mapinfomessage), 602 },
-{ HP_POP(clif->skill_produce_mix_list), HP_POP2(HP_clif_skill_produce_mix_list), 604 },
-{ HP_POP(clif->cooking_list), HP_POP2(HP_clif_cooking_list), 606 },
-{ HP_POP(clif->autospell), HP_POP2(HP_clif_autospell), 608 },
-{ HP_POP(clif->combo_delay), HP_POP2(HP_clif_combo_delay), 610 },
-{ HP_POP(clif->status_change), HP_POP2(HP_clif_status_change), 612 },
-{ HP_POP(clif->insert_card), HP_POP2(HP_clif_insert_card), 614 },
-{ HP_POP(clif->inventorylist), HP_POP2(HP_clif_inventorylist), 616 },
-{ HP_POP(clif->equiplist), HP_POP2(HP_clif_equiplist), 618 },
-{ HP_POP(clif->cartlist), HP_POP2(HP_clif_cartlist), 620 },
-{ HP_POP(clif->favorite_item), HP_POP2(HP_clif_favorite_item), 622 },
-{ HP_POP(clif->clearcart), HP_POP2(HP_clif_clearcart), 624 },
-{ HP_POP(clif->item_identify_list), HP_POP2(HP_clif_item_identify_list), 626 },
-{ HP_POP(clif->item_identified), HP_POP2(HP_clif_item_identified), 628 },
-{ HP_POP(clif->item_repair_list), HP_POP2(HP_clif_item_repair_list), 630 },
-{ HP_POP(clif->item_repaireffect), HP_POP2(HP_clif_item_repaireffect), 632 },
-{ HP_POP(clif->item_damaged), HP_POP2(HP_clif_item_damaged), 634 },
-{ HP_POP(clif->item_refine_list), HP_POP2(HP_clif_item_refine_list), 636 },
-{ HP_POP(clif->item_skill), HP_POP2(HP_clif_item_skill), 638 },
-{ HP_POP(clif->mvp_item), HP_POP2(HP_clif_mvp_item), 640 },
-{ HP_POP(clif->mvp_exp), HP_POP2(HP_clif_mvp_exp), 642 },
-{ HP_POP(clif->mvp_noitem), HP_POP2(HP_clif_mvp_noitem), 644 },
-{ HP_POP(clif->changed_dir), HP_POP2(HP_clif_changed_dir), 646 },
-{ HP_POP(clif->charnameack), HP_POP2(HP_clif_charnameack), 648 },
-{ HP_POP(clif->monster_hp_bar), HP_POP2(HP_clif_monster_hp_bar), 650 },
-{ HP_POP(clif->hpmeter), HP_POP2(HP_clif_hpmeter), 652 },
-{ HP_POP(clif->hpmeter_single), HP_POP2(HP_clif_hpmeter_single), 654 },
-{ HP_POP(clif->hpmeter_sub), HP_POP2(HP_clif_hpmeter_sub), 656 },
-{ HP_POP(clif->upgrademessage), HP_POP2(HP_clif_upgrademessage), 658 },
-{ HP_POP(clif->get_weapon_view), HP_POP2(HP_clif_get_weapon_view), 660 },
-{ HP_POP(clif->gospel_info), HP_POP2(HP_clif_gospel_info), 662 },
-{ HP_POP(clif->feel_req), HP_POP2(HP_clif_feel_req), 664 },
-{ HP_POP(clif->starskill), HP_POP2(HP_clif_starskill), 666 },
-{ HP_POP(clif->feel_info), HP_POP2(HP_clif_feel_info), 668 },
-{ HP_POP(clif->hate_info), HP_POP2(HP_clif_hate_info), 670 },
-{ HP_POP(clif->mission_info), HP_POP2(HP_clif_mission_info), 672 },
-{ HP_POP(clif->feel_hate_reset), HP_POP2(HP_clif_feel_hate_reset), 674 },
-{ HP_POP(clif->partytickack), HP_POP2(HP_clif_partytickack), 676 },
-{ HP_POP(clif->equiptickack), HP_POP2(HP_clif_equiptickack), 678 },
-{ HP_POP(clif->viewequip_ack), HP_POP2(HP_clif_viewequip_ack), 680 },
-{ HP_POP(clif->viewequip_fail), HP_POP2(HP_clif_viewequip_fail), 682 },
-{ HP_POP(clif->equpcheckbox), HP_POP2(HP_clif_equpcheckbox), 684 },
-{ HP_POP(clif->displayexp), HP_POP2(HP_clif_displayexp), 686 },
-{ HP_POP(clif->font), HP_POP2(HP_clif_font), 688 },
-{ HP_POP(clif->progressbar), HP_POP2(HP_clif_progressbar), 690 },
-{ HP_POP(clif->progressbar_abort), HP_POP2(HP_clif_progressbar_abort), 692 },
-{ HP_POP(clif->showdigit), HP_POP2(HP_clif_showdigit), 694 },
-{ HP_POP(clif->elementalconverter_list), HP_POP2(HP_clif_elementalconverter_list), 696 },
-{ HP_POP(clif->spellbook_list), HP_POP2(HP_clif_spellbook_list), 698 },
-{ HP_POP(clif->magicdecoy_list), HP_POP2(HP_clif_magicdecoy_list), 700 },
-{ HP_POP(clif->poison_list), HP_POP2(HP_clif_poison_list), 702 },
-{ HP_POP(clif->autoshadowspell_list), HP_POP2(HP_clif_autoshadowspell_list), 704 },
-{ HP_POP(clif->skill_itemlistwindow), HP_POP2(HP_clif_skill_itemlistwindow), 706 },
-{ HP_POP(clif->sc_load), HP_POP2(HP_clif_sc_load), 708 },
-{ HP_POP(clif->sc_end), HP_POP2(HP_clif_sc_end), 710 },
-{ HP_POP(clif->initialstatus), HP_POP2(HP_clif_initialstatus), 712 },
-{ HP_POP(clif->cooldown_list), HP_POP2(HP_clif_cooldown_list), 714 },
-{ HP_POP(clif->updatestatus), HP_POP2(HP_clif_updatestatus), 716 },
-{ HP_POP(clif->changestatus), HP_POP2(HP_clif_changestatus), 718 },
-{ HP_POP(clif->statusupack), HP_POP2(HP_clif_statusupack), 720 },
-{ HP_POP(clif->movetoattack), HP_POP2(HP_clif_movetoattack), 722 },
-{ HP_POP(clif->solved_charname), HP_POP2(HP_clif_solved_charname), 724 },
-{ HP_POP(clif->charnameupdate), HP_POP2(HP_clif_charnameupdate), 726 },
-{ HP_POP(clif->delayquit), HP_POP2(HP_clif_delayquit), 728 },
-{ HP_POP(clif->getareachar_pc), HP_POP2(HP_clif_getareachar_pc), 730 },
-{ HP_POP(clif->disconnect_ack), HP_POP2(HP_clif_disconnect_ack), 732 },
-{ HP_POP(clif->PVPInfo), HP_POP2(HP_clif_PVPInfo), 734 },
-{ HP_POP(clif->blacksmith), HP_POP2(HP_clif_blacksmith), 736 },
-{ HP_POP(clif->alchemist), HP_POP2(HP_clif_alchemist), 738 },
-{ HP_POP(clif->taekwon), HP_POP2(HP_clif_taekwon), 740 },
-{ HP_POP(clif->ranking_pk), HP_POP2(HP_clif_ranking_pk), 742 },
-{ HP_POP(clif->quitsave), HP_POP2(HP_clif_quitsave), 744 },
-{ HP_POP(clif->misceffect), HP_POP2(HP_clif_misceffect), 746 },
-{ HP_POP(clif->changeoption), HP_POP2(HP_clif_changeoption), 748 },
-{ HP_POP(clif->changeoption2), HP_POP2(HP_clif_changeoption2), 750 },
-{ HP_POP(clif->emotion), HP_POP2(HP_clif_emotion), 752 },
-{ HP_POP(clif->talkiebox), HP_POP2(HP_clif_talkiebox), 754 },
-{ HP_POP(clif->wedding_effect), HP_POP2(HP_clif_wedding_effect), 756 },
-{ HP_POP(clif->divorced), HP_POP2(HP_clif_divorced), 758 },
-{ HP_POP(clif->callpartner), HP_POP2(HP_clif_callpartner), 760 },
-{ HP_POP(clif->skill_damage), HP_POP2(HP_clif_skill_damage), 762 },
-{ HP_POP(clif->skill_nodamage), HP_POP2(HP_clif_skill_nodamage), 764 },
-{ HP_POP(clif->skill_poseffect), HP_POP2(HP_clif_skill_poseffect), 766 },
-{ HP_POP(clif->skill_estimation), HP_POP2(HP_clif_skill_estimation), 768 },
-{ HP_POP(clif->skill_warppoint), HP_POP2(HP_clif_skill_warppoint), 770 },
-{ HP_POP(clif->skillcasting), HP_POP2(HP_clif_skillcasting), 772 },
-{ HP_POP(clif->produce_effect), HP_POP2(HP_clif_produce_effect), 774 },
-{ HP_POP(clif->devotion), HP_POP2(HP_clif_devotion), 776 },
-{ HP_POP(clif->spiritball), HP_POP2(HP_clif_spiritball), 778 },
-{ HP_POP(clif->spiritball_single), HP_POP2(HP_clif_spiritball_single), 780 },
-{ HP_POP(clif->bladestop), HP_POP2(HP_clif_bladestop), 782 },
-{ HP_POP(clif->mvp_effect), HP_POP2(HP_clif_mvp_effect), 784 },
-{ HP_POP(clif->heal), HP_POP2(HP_clif_heal), 786 },
-{ HP_POP(clif->resurrection), HP_POP2(HP_clif_resurrection), 788 },
-{ HP_POP(clif->refine), HP_POP2(HP_clif_refine), 790 },
-{ HP_POP(clif->weather), HP_POP2(HP_clif_weather), 792 },
-{ HP_POP(clif->specialeffect), HP_POP2(HP_clif_specialeffect), 794 },
-{ HP_POP(clif->specialeffect_single), HP_POP2(HP_clif_specialeffect_single), 796 },
-{ HP_POP(clif->specialeffect_value), HP_POP2(HP_clif_specialeffect_value), 798 },
-{ HP_POP(clif->millenniumshield), HP_POP2(HP_clif_millenniumshield), 800 },
-{ HP_POP(clif->charm), HP_POP2(HP_clif_charm), 802 },
-{ HP_POP(clif->charm_single), HP_POP2(HP_clif_charm_single), 804 },
-{ HP_POP(clif->snap), HP_POP2(HP_clif_snap), 806 },
-{ HP_POP(clif->weather_check), HP_POP2(HP_clif_weather_check), 808 },
-{ HP_POP(clif->playBGM), HP_POP2(HP_clif_playBGM), 810 },
-{ HP_POP(clif->soundeffect), HP_POP2(HP_clif_soundeffect), 812 },
-{ HP_POP(clif->soundeffectall), HP_POP2(HP_clif_soundeffectall), 814 },
-{ HP_POP(clif->GlobalMessage), HP_POP2(HP_clif_GlobalMessage), 816 },
-{ HP_POP(clif->createchat), HP_POP2(HP_clif_createchat), 818 },
-{ HP_POP(clif->dispchat), HP_POP2(HP_clif_dispchat), 820 },
-{ HP_POP(clif->joinchatfail), HP_POP2(HP_clif_joinchatfail), 822 },
-{ HP_POP(clif->joinchatok), HP_POP2(HP_clif_joinchatok), 824 },
-{ HP_POP(clif->addchat), HP_POP2(HP_clif_addchat), 826 },
-{ HP_POP(clif->changechatowner), HP_POP2(HP_clif_changechatowner), 828 },
-{ HP_POP(clif->clearchat), HP_POP2(HP_clif_clearchat), 830 },
-{ HP_POP(clif->leavechat), HP_POP2(HP_clif_leavechat), 832 },
-{ HP_POP(clif->changechatstatus), HP_POP2(HP_clif_changechatstatus), 834 },
-{ HP_POP(clif->wis_message), HP_POP2(HP_clif_wis_message), 836 },
-{ HP_POP(clif->wis_end), HP_POP2(HP_clif_wis_end), 838 },
-{ HP_POP(clif->disp_onlyself), HP_POP2(HP_clif_disp_onlyself), 840 },
-{ HP_POP(clif->disp_message), HP_POP2(HP_clif_disp_message), 842 },
-{ HP_POP(clif->broadcast), HP_POP2(HP_clif_broadcast), 844 },
-{ HP_POP(clif->broadcast2), HP_POP2(HP_clif_broadcast2), 846 },
-{ HP_POP(clif->messagecolor), HP_POP2(HP_clif_messagecolor), 848 },
-{ HP_POP(clif->disp_overhead), HP_POP2(HP_clif_disp_overhead), 850 },
-{ HP_POP(clif->msg), HP_POP2(HP_clif_msg), 852 },
-{ HP_POP(clif->msg_value), HP_POP2(HP_clif_msg_value), 854 },
-{ HP_POP(clif->msg_skill), HP_POP2(HP_clif_msg_skill), 856 },
-{ HP_POP(clif->msgtable), HP_POP2(HP_clif_msgtable), 858 },
-{ HP_POP(clif->msgtable_num), HP_POP2(HP_clif_msgtable_num), 860 },
-{ HP_POP(clif->message), HP_POP2(HP_clif_message), 862 },
-{ HP_POP(clif->messageln), HP_POP2(HP_clif_messageln), 864 },
-{ HP_POP(clif->colormes), HP_POP2(HP_clif_colormes), 866 },
-{ HP_POP(clif->process_message), HP_POP2(HP_clif_process_message), 868 },
-{ HP_POP(clif->wisexin), HP_POP2(HP_clif_wisexin), 870 },
-{ HP_POP(clif->wisall), HP_POP2(HP_clif_wisall), 872 },
-{ HP_POP(clif->PMIgnoreList), HP_POP2(HP_clif_PMIgnoreList), 874 },
-{ HP_POP(clif->traderequest), HP_POP2(HP_clif_traderequest), 876 },
-{ HP_POP(clif->tradestart), HP_POP2(HP_clif_tradestart), 878 },
-{ HP_POP(clif->tradeadditem), HP_POP2(HP_clif_tradeadditem), 880 },
-{ HP_POP(clif->tradeitemok), HP_POP2(HP_clif_tradeitemok), 882 },
-{ HP_POP(clif->tradedeal_lock), HP_POP2(HP_clif_tradedeal_lock), 884 },
-{ HP_POP(clif->tradecancelled), HP_POP2(HP_clif_tradecancelled), 886 },
-{ HP_POP(clif->tradecompleted), HP_POP2(HP_clif_tradecompleted), 888 },
-{ HP_POP(clif->tradeundo), HP_POP2(HP_clif_tradeundo), 890 },
-{ HP_POP(clif->openvendingreq), HP_POP2(HP_clif_openvendingreq), 892 },
-{ HP_POP(clif->showvendingboard), HP_POP2(HP_clif_showvendingboard), 894 },
-{ HP_POP(clif->closevendingboard), HP_POP2(HP_clif_closevendingboard), 896 },
-{ HP_POP(clif->vendinglist), HP_POP2(HP_clif_vendinglist), 898 },
-{ HP_POP(clif->buyvending), HP_POP2(HP_clif_buyvending), 900 },
-{ HP_POP(clif->openvending), HP_POP2(HP_clif_openvending), 902 },
-{ HP_POP(clif->vendingreport), HP_POP2(HP_clif_vendingreport), 904 },
-{ HP_POP(clif->storagelist), HP_POP2(HP_clif_storagelist), 906 },
-{ HP_POP(clif->updatestorageamount), HP_POP2(HP_clif_updatestorageamount), 908 },
-{ HP_POP(clif->storageitemadded), HP_POP2(HP_clif_storageitemadded), 910 },
-{ HP_POP(clif->storageitemremoved), HP_POP2(HP_clif_storageitemremoved), 912 },
-{ HP_POP(clif->storageclose), HP_POP2(HP_clif_storageclose), 914 },
-{ HP_POP(clif->skillinfoblock), HP_POP2(HP_clif_skillinfoblock), 916 },
-{ HP_POP(clif->skillup), HP_POP2(HP_clif_skillup), 918 },
-{ HP_POP(clif->skillinfo), HP_POP2(HP_clif_skillinfo), 920 },
-{ HP_POP(clif->addskill), HP_POP2(HP_clif_addskill), 922 },
-{ HP_POP(clif->deleteskill), HP_POP2(HP_clif_deleteskill), 924 },
-{ HP_POP(clif->party_created), HP_POP2(HP_clif_party_created), 926 },
-{ HP_POP(clif->party_member_info), HP_POP2(HP_clif_party_member_info), 928 },
-{ HP_POP(clif->party_info), HP_POP2(HP_clif_party_info), 930 },
-{ HP_POP(clif->party_invite), HP_POP2(HP_clif_party_invite), 932 },
-{ HP_POP(clif->party_inviteack), HP_POP2(HP_clif_party_inviteack), 934 },
-{ HP_POP(clif->party_option), HP_POP2(HP_clif_party_option), 936 },
-{ HP_POP(clif->party_withdraw), HP_POP2(HP_clif_party_withdraw), 938 },
-{ HP_POP(clif->party_message), HP_POP2(HP_clif_party_message), 940 },
-{ HP_POP(clif->party_xy), HP_POP2(HP_clif_party_xy), 942 },
-{ HP_POP(clif->party_xy_single), HP_POP2(HP_clif_party_xy_single), 944 },
-{ HP_POP(clif->party_hp), HP_POP2(HP_clif_party_hp), 946 },
-{ HP_POP(clif->party_xy_remove), HP_POP2(HP_clif_party_xy_remove), 948 },
-{ HP_POP(clif->party_show_picker), HP_POP2(HP_clif_party_show_picker), 950 },
-{ HP_POP(clif->partyinvitationstate), HP_POP2(HP_clif_partyinvitationstate), 952 },
-{ HP_POP(clif->guild_created), HP_POP2(HP_clif_guild_created), 954 },
-{ HP_POP(clif->guild_belonginfo), HP_POP2(HP_clif_guild_belonginfo), 956 },
-{ HP_POP(clif->guild_masterormember), HP_POP2(HP_clif_guild_masterormember), 958 },
-{ HP_POP(clif->guild_basicinfo), HP_POP2(HP_clif_guild_basicinfo), 960 },
-{ HP_POP(clif->guild_allianceinfo), HP_POP2(HP_clif_guild_allianceinfo), 962 },
-{ HP_POP(clif->guild_memberlist), HP_POP2(HP_clif_guild_memberlist), 964 },
-{ HP_POP(clif->guild_skillinfo), HP_POP2(HP_clif_guild_skillinfo), 966 },
-{ HP_POP(clif->guild_send_onlineinfo), HP_POP2(HP_clif_guild_send_onlineinfo), 968 },
-{ HP_POP(clif->guild_memberlogin_notice), HP_POP2(HP_clif_guild_memberlogin_notice), 970 },
-{ HP_POP(clif->guild_invite), HP_POP2(HP_clif_guild_invite), 972 },
-{ HP_POP(clif->guild_inviteack), HP_POP2(HP_clif_guild_inviteack), 974 },
-{ HP_POP(clif->guild_leave), HP_POP2(HP_clif_guild_leave), 976 },
-{ HP_POP(clif->guild_expulsion), HP_POP2(HP_clif_guild_expulsion), 978 },
-{ HP_POP(clif->guild_positionchanged), HP_POP2(HP_clif_guild_positionchanged), 980 },
-{ HP_POP(clif->guild_memberpositionchanged), HP_POP2(HP_clif_guild_memberpositionchanged), 982 },
-{ HP_POP(clif->guild_emblem), HP_POP2(HP_clif_guild_emblem), 984 },
-{ HP_POP(clif->guild_emblem_area), HP_POP2(HP_clif_guild_emblem_area), 986 },
-{ HP_POP(clif->guild_notice), HP_POP2(HP_clif_guild_notice), 988 },
-{ HP_POP(clif->guild_message), HP_POP2(HP_clif_guild_message), 990 },
-{ HP_POP(clif->guild_skillup), HP_POP2(HP_clif_guild_skillup), 992 },
-{ HP_POP(clif->guild_reqalliance), HP_POP2(HP_clif_guild_reqalliance), 994 },
-{ HP_POP(clif->guild_allianceack), HP_POP2(HP_clif_guild_allianceack), 996 },
-{ HP_POP(clif->guild_delalliance), HP_POP2(HP_clif_guild_delalliance), 998 },
-{ HP_POP(clif->guild_oppositionack), HP_POP2(HP_clif_guild_oppositionack), 1000 },
-{ HP_POP(clif->guild_broken), HP_POP2(HP_clif_guild_broken), 1002 },
-{ HP_POP(clif->guild_xy), HP_POP2(HP_clif_guild_xy), 1004 },
-{ HP_POP(clif->guild_xy_single), HP_POP2(HP_clif_guild_xy_single), 1006 },
-{ HP_POP(clif->guild_xy_remove), HP_POP2(HP_clif_guild_xy_remove), 1008 },
-{ HP_POP(clif->guild_positionnamelist), HP_POP2(HP_clif_guild_positionnamelist), 1010 },
-{ HP_POP(clif->guild_positioninfolist), HP_POP2(HP_clif_guild_positioninfolist), 1012 },
-{ HP_POP(clif->guild_expulsionlist), HP_POP2(HP_clif_guild_expulsionlist), 1014 },
-{ HP_POP(clif->validate_emblem), HP_POP2(HP_clif_validate_emblem), 1016 },
-{ HP_POP(clif->bg_hp), HP_POP2(HP_clif_bg_hp), 1018 },
-{ HP_POP(clif->bg_xy), HP_POP2(HP_clif_bg_xy), 1020 },
-{ HP_POP(clif->bg_xy_remove), HP_POP2(HP_clif_bg_xy_remove), 1022 },
-{ HP_POP(clif->bg_message), HP_POP2(HP_clif_bg_message), 1024 },
-{ HP_POP(clif->bg_updatescore), HP_POP2(HP_clif_bg_updatescore), 1026 },
-{ HP_POP(clif->bg_updatescore_single), HP_POP2(HP_clif_bg_updatescore_single), 1028 },
-{ HP_POP(clif->sendbgemblem_area), HP_POP2(HP_clif_sendbgemblem_area), 1030 },
-{ HP_POP(clif->sendbgemblem_single), HP_POP2(HP_clif_sendbgemblem_single), 1032 },
-{ HP_POP(clif->instance), HP_POP2(HP_clif_instance), 1034 },
-{ HP_POP(clif->instance_join), HP_POP2(HP_clif_instance_join), 1036 },
-{ HP_POP(clif->instance_leave), HP_POP2(HP_clif_instance_leave), 1038 },
-{ HP_POP(clif->catch_process), HP_POP2(HP_clif_catch_process), 1040 },
-{ HP_POP(clif->pet_roulette), HP_POP2(HP_clif_pet_roulette), 1042 },
-{ HP_POP(clif->sendegg), HP_POP2(HP_clif_sendegg), 1044 },
-{ HP_POP(clif->send_petstatus), HP_POP2(HP_clif_send_petstatus), 1046 },
-{ HP_POP(clif->send_petdata), HP_POP2(HP_clif_send_petdata), 1048 },
-{ HP_POP(clif->pet_emotion), HP_POP2(HP_clif_pet_emotion), 1050 },
-{ HP_POP(clif->pet_food), HP_POP2(HP_clif_pet_food), 1052 },
-{ HP_POP(clif->friendslist_toggle_sub), HP_POP2(HP_clif_friendslist_toggle_sub), 1054 },
-{ HP_POP(clif->friendslist_send), HP_POP2(HP_clif_friendslist_send), 1056 },
-{ HP_POP(clif->friendslist_reqack), HP_POP2(HP_clif_friendslist_reqack), 1058 },
-{ HP_POP(clif->friendslist_toggle), HP_POP2(HP_clif_friendslist_toggle), 1060 },
-{ HP_POP(clif->friendlist_req), HP_POP2(HP_clif_friendlist_req), 1062 },
-{ HP_POP(clif->GM_kickack), HP_POP2(HP_clif_GM_kickack), 1064 },
-{ HP_POP(clif->GM_kick), HP_POP2(HP_clif_GM_kick), 1066 },
-{ HP_POP(clif->manner_message), HP_POP2(HP_clif_manner_message), 1068 },
-{ HP_POP(clif->GM_silence), HP_POP2(HP_clif_GM_silence), 1070 },
-{ HP_POP(clif->account_name), HP_POP2(HP_clif_account_name), 1072 },
-{ HP_POP(clif->check), HP_POP2(HP_clif_check), 1074 },
-{ HP_POP(clif->hominfo), HP_POP2(HP_clif_hominfo), 1076 },
-{ HP_POP(clif->homskillinfoblock), HP_POP2(HP_clif_homskillinfoblock), 1078 },
-{ HP_POP(clif->homskillup), HP_POP2(HP_clif_homskillup), 1080 },
-{ HP_POP(clif->hom_food), HP_POP2(HP_clif_hom_food), 1082 },
-{ HP_POP(clif->send_homdata), HP_POP2(HP_clif_send_homdata), 1084 },
-{ HP_POP(clif->quest_send_list), HP_POP2(HP_clif_quest_send_list), 1086 },
-{ HP_POP(clif->quest_send_mission), HP_POP2(HP_clif_quest_send_mission), 1088 },
-{ HP_POP(clif->quest_add), HP_POP2(HP_clif_quest_add), 1090 },
-{ HP_POP(clif->quest_delete), HP_POP2(HP_clif_quest_delete), 1092 },
-{ HP_POP(clif->quest_update_status), HP_POP2(HP_clif_quest_update_status), 1094 },
-{ HP_POP(clif->quest_update_objective), HP_POP2(HP_clif_quest_update_objective), 1096 },
-{ HP_POP(clif->quest_show_event), HP_POP2(HP_clif_quest_show_event), 1098 },
-{ HP_POP(clif->mail_window), HP_POP2(HP_clif_mail_window), 1100 },
-{ HP_POP(clif->mail_read), HP_POP2(HP_clif_mail_read), 1102 },
-{ HP_POP(clif->mail_delete), HP_POP2(HP_clif_mail_delete), 1104 },
-{ HP_POP(clif->mail_return), HP_POP2(HP_clif_mail_return), 1106 },
-{ HP_POP(clif->mail_send), HP_POP2(HP_clif_mail_send), 1108 },
-{ HP_POP(clif->mail_new), HP_POP2(HP_clif_mail_new), 1110 },
-{ HP_POP(clif->mail_refreshinbox), HP_POP2(HP_clif_mail_refreshinbox), 1112 },
-{ HP_POP(clif->mail_getattachment), HP_POP2(HP_clif_mail_getattachment), 1114 },
-{ HP_POP(clif->mail_setattachment), HP_POP2(HP_clif_mail_setattachment), 1116 },
-{ HP_POP(clif->auction_openwindow), HP_POP2(HP_clif_auction_openwindow), 1118 },
-{ HP_POP(clif->auction_results), HP_POP2(HP_clif_auction_results), 1120 },
-{ HP_POP(clif->auction_message), HP_POP2(HP_clif_auction_message), 1122 },
-{ HP_POP(clif->auction_close), HP_POP2(HP_clif_auction_close), 1124 },
-{ HP_POP(clif->auction_setitem), HP_POP2(HP_clif_auction_setitem), 1126 },
-{ HP_POP(clif->mercenary_info), HP_POP2(HP_clif_mercenary_info), 1128 },
-{ HP_POP(clif->mercenary_skillblock), HP_POP2(HP_clif_mercenary_skillblock), 1130 },
-{ HP_POP(clif->mercenary_message), HP_POP2(HP_clif_mercenary_message), 1132 },
-{ HP_POP(clif->mercenary_updatestatus), HP_POP2(HP_clif_mercenary_updatestatus), 1134 },
-{ HP_POP(clif->rental_time), HP_POP2(HP_clif_rental_time), 1136 },
-{ HP_POP(clif->rental_expired), HP_POP2(HP_clif_rental_expired), 1138 },
-{ HP_POP(clif->PartyBookingRegisterAck), HP_POP2(HP_clif_PartyBookingRegisterAck), 1140 },
-{ HP_POP(clif->PartyBookingDeleteAck), HP_POP2(HP_clif_PartyBookingDeleteAck), 1142 },
-{ HP_POP(clif->PartyBookingSearchAck), HP_POP2(HP_clif_PartyBookingSearchAck), 1144 },
-{ HP_POP(clif->PartyBookingUpdateNotify), HP_POP2(HP_clif_PartyBookingUpdateNotify), 1146 },
-{ HP_POP(clif->PartyBookingDeleteNotify), HP_POP2(HP_clif_PartyBookingDeleteNotify), 1148 },
-{ HP_POP(clif->PartyBookingInsertNotify), HP_POP2(HP_clif_PartyBookingInsertNotify), 1150 },
-{ HP_POP(clif->PartyBookingVolunteerInfo), HP_POP2(HP_clif_PartyBookingVolunteerInfo), 1152 },
-{ HP_POP(clif->PartyBookingRefuseVolunteer), HP_POP2(HP_clif_PartyBookingRefuseVolunteer), 1154 },
-{ HP_POP(clif->PartyBookingCancelVolunteer), HP_POP2(HP_clif_PartyBookingCancelVolunteer), 1156 },
-{ HP_POP(clif->PartyBookingAddFilteringList), HP_POP2(HP_clif_PartyBookingAddFilteringList), 1158 },
-{ HP_POP(clif->PartyBookingSubFilteringList), HP_POP2(HP_clif_PartyBookingSubFilteringList), 1160 },
-{ HP_POP(clif->buyingstore_open), HP_POP2(HP_clif_buyingstore_open), 1162 },
-{ HP_POP(clif->buyingstore_open_failed), HP_POP2(HP_clif_buyingstore_open_failed), 1164 },
-{ HP_POP(clif->buyingstore_myitemlist), HP_POP2(HP_clif_buyingstore_myitemlist), 1166 },
-{ HP_POP(clif->buyingstore_entry), HP_POP2(HP_clif_buyingstore_entry), 1168 },
-{ HP_POP(clif->buyingstore_entry_single), HP_POP2(HP_clif_buyingstore_entry_single), 1170 },
-{ HP_POP(clif->buyingstore_disappear_entry), HP_POP2(HP_clif_buyingstore_disappear_entry), 1172 },
-{ HP_POP(clif->buyingstore_disappear_entry_single), HP_POP2(HP_clif_buyingstore_disappear_entry_single), 1174 },
-{ HP_POP(clif->buyingstore_itemlist), HP_POP2(HP_clif_buyingstore_itemlist), 1176 },
-{ HP_POP(clif->buyingstore_trade_failed_buyer), HP_POP2(HP_clif_buyingstore_trade_failed_buyer), 1178 },
-{ HP_POP(clif->buyingstore_update_item), HP_POP2(HP_clif_buyingstore_update_item), 1180 },
-{ HP_POP(clif->buyingstore_delete_item), HP_POP2(HP_clif_buyingstore_delete_item), 1182 },
-{ HP_POP(clif->buyingstore_trade_failed_seller), HP_POP2(HP_clif_buyingstore_trade_failed_seller), 1184 },
-{ HP_POP(clif->search_store_info_ack), HP_POP2(HP_clif_search_store_info_ack), 1186 },
-{ HP_POP(clif->search_store_info_failed), HP_POP2(HP_clif_search_store_info_failed), 1188 },
-{ HP_POP(clif->open_search_store_info), HP_POP2(HP_clif_open_search_store_info), 1190 },
-{ HP_POP(clif->search_store_info_click_ack), HP_POP2(HP_clif_search_store_info_click_ack), 1192 },
-{ HP_POP(clif->elemental_info), HP_POP2(HP_clif_elemental_info), 1194 },
-{ HP_POP(clif->elemental_updatestatus), HP_POP2(HP_clif_elemental_updatestatus), 1196 },
-{ HP_POP(clif->bgqueue_ack), HP_POP2(HP_clif_bgqueue_ack), 1198 },
-{ HP_POP(clif->bgqueue_notice_delete), HP_POP2(HP_clif_bgqueue_notice_delete), 1200 },
-{ HP_POP(clif->bgqueue_update_info), HP_POP2(HP_clif_bgqueue_update_info), 1202 },
-{ HP_POP(clif->bgqueue_joined), HP_POP2(HP_clif_bgqueue_joined), 1204 },
-{ HP_POP(clif->bgqueue_pcleft), HP_POP2(HP_clif_bgqueue_pcleft), 1206 },
-{ HP_POP(clif->bgqueue_battlebegins), HP_POP2(HP_clif_bgqueue_battlebegins), 1208 },
-{ HP_POP(clif->adopt_reply), HP_POP2(HP_clif_adopt_reply), 1210 },
-{ HP_POP(clif->adopt_request), HP_POP2(HP_clif_adopt_request), 1212 },
-{ HP_POP(clif->readbook), HP_POP2(HP_clif_readbook), 1214 },
-{ HP_POP(clif->notify_time), HP_POP2(HP_clif_notify_time), 1216 },
-{ HP_POP(clif->user_count), HP_POP2(HP_clif_user_count), 1218 },
-{ HP_POP(clif->noask_sub), HP_POP2(HP_clif_noask_sub), 1220 },
-{ HP_POP(clif->bc_ready), HP_POP2(HP_clif_bc_ready), 1222 },
-{ HP_POP(clif->undisguise_timer), HP_POP2(HP_clif_undisguise_timer), 1224 },
-{ HP_POP(clif->chsys_create), HP_POP2(HP_clif_chsys_create), 1226 },
-{ HP_POP(clif->chsys_msg), HP_POP2(HP_clif_chsys_msg), 1228 },
-{ HP_POP(clif->chsys_msg2), HP_POP2(HP_clif_chsys_msg2), 1230 },
-{ HP_POP(clif->chsys_send), HP_POP2(HP_clif_chsys_send), 1232 },
-{ HP_POP(clif->chsys_join), HP_POP2(HP_clif_chsys_join), 1234 },
-{ HP_POP(clif->chsys_left), HP_POP2(HP_clif_chsys_left), 1236 },
-{ HP_POP(clif->chsys_delete), HP_POP2(HP_clif_chsys_delete), 1238 },
-{ HP_POP(clif->chsys_mjoin), HP_POP2(HP_clif_chsys_mjoin), 1240 },
-{ HP_POP(clif->chsys_quit), HP_POP2(HP_clif_chsys_quit), 1242 },
-{ HP_POP(clif->chsys_quitg), HP_POP2(HP_clif_chsys_quitg), 1244 },
-{ HP_POP(clif->chsys_gjoin), HP_POP2(HP_clif_chsys_gjoin), 1246 },
-{ HP_POP(clif->chsys_gleave), HP_POP2(HP_clif_chsys_gleave), 1248 },
-{ HP_POP(clif->pWantToConnection), HP_POP2(HP_clif_pWantToConnection), 1250 },
-{ HP_POP(clif->pLoadEndAck), HP_POP2(HP_clif_pLoadEndAck), 1252 },
-{ HP_POP(clif->pTickSend), HP_POP2(HP_clif_pTickSend), 1254 },
-{ HP_POP(clif->pHotkey), HP_POP2(HP_clif_pHotkey), 1256 },
-{ HP_POP(clif->pProgressbar), HP_POP2(HP_clif_pProgressbar), 1258 },
-{ HP_POP(clif->pWalkToXY), HP_POP2(HP_clif_pWalkToXY), 1260 },
-{ HP_POP(clif->pQuitGame), HP_POP2(HP_clif_pQuitGame), 1262 },
-{ HP_POP(clif->pGetCharNameRequest), HP_POP2(HP_clif_pGetCharNameRequest), 1264 },
-{ HP_POP(clif->pGlobalMessage), HP_POP2(HP_clif_pGlobalMessage), 1266 },
-{ HP_POP(clif->pMapMove), HP_POP2(HP_clif_pMapMove), 1268 },
-{ HP_POP(clif->pChangeDir), HP_POP2(HP_clif_pChangeDir), 1270 },
-{ HP_POP(clif->pEmotion), HP_POP2(HP_clif_pEmotion), 1272 },
-{ HP_POP(clif->pHowManyConnections), HP_POP2(HP_clif_pHowManyConnections), 1274 },
-{ HP_POP(clif->pActionRequest), HP_POP2(HP_clif_pActionRequest), 1276 },
-{ HP_POP(clif->pActionRequest_sub), HP_POP2(HP_clif_pActionRequest_sub), 1278 },
-{ HP_POP(clif->pRestart), HP_POP2(HP_clif_pRestart), 1280 },
-{ HP_POP(clif->pWisMessage), HP_POP2(HP_clif_pWisMessage), 1282 },
-{ HP_POP(clif->pBroadcast), HP_POP2(HP_clif_pBroadcast), 1284 },
-{ HP_POP(clif->pTakeItem), HP_POP2(HP_clif_pTakeItem), 1286 },
-{ HP_POP(clif->pDropItem), HP_POP2(HP_clif_pDropItem), 1288 },
-{ HP_POP(clif->pUseItem), HP_POP2(HP_clif_pUseItem), 1290 },
-{ HP_POP(clif->pEquipItem), HP_POP2(HP_clif_pEquipItem), 1292 },
-{ HP_POP(clif->pUnequipItem), HP_POP2(HP_clif_pUnequipItem), 1294 },
-{ HP_POP(clif->pNpcClicked), HP_POP2(HP_clif_pNpcClicked), 1296 },
-{ HP_POP(clif->pNpcBuySellSelected), HP_POP2(HP_clif_pNpcBuySellSelected), 1298 },
-{ HP_POP(clif->pNpcBuyListSend), HP_POP2(HP_clif_pNpcBuyListSend), 1300 },
-{ HP_POP(clif->pNpcSellListSend), HP_POP2(HP_clif_pNpcSellListSend), 1302 },
-{ HP_POP(clif->pCreateChatRoom), HP_POP2(HP_clif_pCreateChatRoom), 1304 },
-{ HP_POP(clif->pChatAddMember), HP_POP2(HP_clif_pChatAddMember), 1306 },
-{ HP_POP(clif->pChatRoomStatusChange), HP_POP2(HP_clif_pChatRoomStatusChange), 1308 },
-{ HP_POP(clif->pChangeChatOwner), HP_POP2(HP_clif_pChangeChatOwner), 1310 },
-{ HP_POP(clif->pKickFromChat), HP_POP2(HP_clif_pKickFromChat), 1312 },
-{ HP_POP(clif->pChatLeave), HP_POP2(HP_clif_pChatLeave), 1314 },
-{ HP_POP(clif->pTradeRequest), HP_POP2(HP_clif_pTradeRequest), 1316 },
-{ HP_POP(clif->chann_config_read), HP_POP2(HP_clif_chann_config_read), 1318 },
-{ HP_POP(clif->pTradeAck), HP_POP2(HP_clif_pTradeAck), 1320 },
-{ HP_POP(clif->pTradeAddItem), HP_POP2(HP_clif_pTradeAddItem), 1322 },
-{ HP_POP(clif->pTradeOk), HP_POP2(HP_clif_pTradeOk), 1324 },
-{ HP_POP(clif->pTradeCancel), HP_POP2(HP_clif_pTradeCancel), 1326 },
-{ HP_POP(clif->pTradeCommit), HP_POP2(HP_clif_pTradeCommit), 1328 },
-{ HP_POP(clif->pStopAttack), HP_POP2(HP_clif_pStopAttack), 1330 },
-{ HP_POP(clif->pPutItemToCart), HP_POP2(HP_clif_pPutItemToCart), 1332 },
-{ HP_POP(clif->pGetItemFromCart), HP_POP2(HP_clif_pGetItemFromCart), 1334 },
-{ HP_POP(clif->pRemoveOption), HP_POP2(HP_clif_pRemoveOption), 1336 },
-{ HP_POP(clif->pChangeCart), HP_POP2(HP_clif_pChangeCart), 1338 },
-{ HP_POP(clif->pStatusUp), HP_POP2(HP_clif_pStatusUp), 1340 },
-{ HP_POP(clif->pSkillUp), HP_POP2(HP_clif_pSkillUp), 1342 },
-{ HP_POP(clif->pUseSkillToId), HP_POP2(HP_clif_pUseSkillToId), 1344 },
-{ HP_POP(clif->pUseSkillToId_homun), HP_POP2(HP_clif_pUseSkillToId_homun), 1346 },
-{ HP_POP(clif->pUseSkillToId_mercenary), HP_POP2(HP_clif_pUseSkillToId_mercenary), 1348 },
-{ HP_POP(clif->pUseSkillToPos), HP_POP2(HP_clif_pUseSkillToPos), 1350 },
-{ HP_POP(clif->pUseSkillToPosSub), HP_POP2(HP_clif_pUseSkillToPosSub), 1352 },
-{ HP_POP(clif->pUseSkillToPos_homun), HP_POP2(HP_clif_pUseSkillToPos_homun), 1354 },
-{ HP_POP(clif->pUseSkillToPos_mercenary), HP_POP2(HP_clif_pUseSkillToPos_mercenary), 1356 },
-{ HP_POP(clif->pUseSkillToPosMoreInfo), HP_POP2(HP_clif_pUseSkillToPosMoreInfo), 1358 },
-{ HP_POP(clif->pUseSkillMap), HP_POP2(HP_clif_pUseSkillMap), 1360 },
-{ HP_POP(clif->pRequestMemo), HP_POP2(HP_clif_pRequestMemo), 1362 },
-{ HP_POP(clif->pProduceMix), HP_POP2(HP_clif_pProduceMix), 1364 },
-{ HP_POP(clif->pCooking), HP_POP2(HP_clif_pCooking), 1366 },
-{ HP_POP(clif->pRepairItem), HP_POP2(HP_clif_pRepairItem), 1368 },
-{ HP_POP(clif->pWeaponRefine), HP_POP2(HP_clif_pWeaponRefine), 1370 },
-{ HP_POP(clif->pNpcSelectMenu), HP_POP2(HP_clif_pNpcSelectMenu), 1372 },
-{ HP_POP(clif->pNpcNextClicked), HP_POP2(HP_clif_pNpcNextClicked), 1374 },
-{ HP_POP(clif->pNpcAmountInput), HP_POP2(HP_clif_pNpcAmountInput), 1376 },
-{ HP_POP(clif->pNpcStringInput), HP_POP2(HP_clif_pNpcStringInput), 1378 },
-{ HP_POP(clif->pNpcCloseClicked), HP_POP2(HP_clif_pNpcCloseClicked), 1380 },
-{ HP_POP(clif->pItemIdentify), HP_POP2(HP_clif_pItemIdentify), 1382 },
-{ HP_POP(clif->pSelectArrow), HP_POP2(HP_clif_pSelectArrow), 1384 },
-{ HP_POP(clif->pAutoSpell), HP_POP2(HP_clif_pAutoSpell), 1386 },
-{ HP_POP(clif->pUseCard), HP_POP2(HP_clif_pUseCard), 1388 },
-{ HP_POP(clif->pInsertCard), HP_POP2(HP_clif_pInsertCard), 1390 },
-{ HP_POP(clif->pSolveCharName), HP_POP2(HP_clif_pSolveCharName), 1392 },
-{ HP_POP(clif->pResetChar), HP_POP2(HP_clif_pResetChar), 1394 },
-{ HP_POP(clif->pLocalBroadcast), HP_POP2(HP_clif_pLocalBroadcast), 1396 },
-{ HP_POP(clif->pMoveToKafra), HP_POP2(HP_clif_pMoveToKafra), 1398 },
-{ HP_POP(clif->pMoveFromKafra), HP_POP2(HP_clif_pMoveFromKafra), 1400 },
-{ HP_POP(clif->pMoveToKafraFromCart), HP_POP2(HP_clif_pMoveToKafraFromCart), 1402 },
-{ HP_POP(clif->pMoveFromKafraToCart), HP_POP2(HP_clif_pMoveFromKafraToCart), 1404 },
-{ HP_POP(clif->pCloseKafra), HP_POP2(HP_clif_pCloseKafra), 1406 },
-{ HP_POP(clif->pStoragePassword), HP_POP2(HP_clif_pStoragePassword), 1408 },
-{ HP_POP(clif->pCreateParty), HP_POP2(HP_clif_pCreateParty), 1410 },
-{ HP_POP(clif->pCreateParty2), HP_POP2(HP_clif_pCreateParty2), 1412 },
-{ HP_POP(clif->pPartyInvite), HP_POP2(HP_clif_pPartyInvite), 1414 },
-{ HP_POP(clif->pPartyInvite2), HP_POP2(HP_clif_pPartyInvite2), 1416 },
-{ HP_POP(clif->pReplyPartyInvite), HP_POP2(HP_clif_pReplyPartyInvite), 1418 },
-{ HP_POP(clif->pReplyPartyInvite2), HP_POP2(HP_clif_pReplyPartyInvite2), 1420 },
-{ HP_POP(clif->pLeaveParty), HP_POP2(HP_clif_pLeaveParty), 1422 },
-{ HP_POP(clif->pRemovePartyMember), HP_POP2(HP_clif_pRemovePartyMember), 1424 },
-{ HP_POP(clif->pPartyChangeOption), HP_POP2(HP_clif_pPartyChangeOption), 1426 },
-{ HP_POP(clif->pPartyMessage), HP_POP2(HP_clif_pPartyMessage), 1428 },
-{ HP_POP(clif->pPartyChangeLeader), HP_POP2(HP_clif_pPartyChangeLeader), 1430 },
-{ HP_POP(clif->pPartyBookingRegisterReq), HP_POP2(HP_clif_pPartyBookingRegisterReq), 1432 },
-{ HP_POP(clif->pPartyBookingSearchReq), HP_POP2(HP_clif_pPartyBookingSearchReq), 1434 },
-{ HP_POP(clif->pPartyBookingDeleteReq), HP_POP2(HP_clif_pPartyBookingDeleteReq), 1436 },
-{ HP_POP(clif->pPartyBookingUpdateReq), HP_POP2(HP_clif_pPartyBookingUpdateReq), 1438 },
-{ HP_POP(clif->pCloseVending), HP_POP2(HP_clif_pCloseVending), 1440 },
-{ HP_POP(clif->pVendingListReq), HP_POP2(HP_clif_pVendingListReq), 1442 },
-{ HP_POP(clif->pPurchaseReq), HP_POP2(HP_clif_pPurchaseReq), 1444 },
-{ HP_POP(clif->pPurchaseReq2), HP_POP2(HP_clif_pPurchaseReq2), 1446 },
-{ HP_POP(clif->pOpenVending), HP_POP2(HP_clif_pOpenVending), 1448 },
-{ HP_POP(clif->pCreateGuild), HP_POP2(HP_clif_pCreateGuild), 1450 },
-{ HP_POP(clif->pGuildCheckMaster), HP_POP2(HP_clif_pGuildCheckMaster), 1452 },
-{ HP_POP(clif->pGuildRequestInfo), HP_POP2(HP_clif_pGuildRequestInfo), 1454 },
-{ HP_POP(clif->pGuildChangePositionInfo), HP_POP2(HP_clif_pGuildChangePositionInfo), 1456 },
-{ HP_POP(clif->pGuildChangeMemberPosition), HP_POP2(HP_clif_pGuildChangeMemberPosition), 1458 },
-{ HP_POP(clif->pGuildRequestEmblem), HP_POP2(HP_clif_pGuildRequestEmblem), 1460 },
-{ HP_POP(clif->pGuildChangeEmblem), HP_POP2(HP_clif_pGuildChangeEmblem), 1462 },
-{ HP_POP(clif->pGuildChangeNotice), HP_POP2(HP_clif_pGuildChangeNotice), 1464 },
-{ HP_POP(clif->pGuildInvite), HP_POP2(HP_clif_pGuildInvite), 1466 },
-{ HP_POP(clif->pGuildReplyInvite), HP_POP2(HP_clif_pGuildReplyInvite), 1468 },
-{ HP_POP(clif->pGuildLeave), HP_POP2(HP_clif_pGuildLeave), 1470 },
-{ HP_POP(clif->pGuildExpulsion), HP_POP2(HP_clif_pGuildExpulsion), 1472 },
-{ HP_POP(clif->pGuildMessage), HP_POP2(HP_clif_pGuildMessage), 1474 },
-{ HP_POP(clif->pGuildRequestAlliance), HP_POP2(HP_clif_pGuildRequestAlliance), 1476 },
-{ HP_POP(clif->pGuildReplyAlliance), HP_POP2(HP_clif_pGuildReplyAlliance), 1478 },
-{ HP_POP(clif->pGuildDelAlliance), HP_POP2(HP_clif_pGuildDelAlliance), 1480 },
-{ HP_POP(clif->pGuildOpposition), HP_POP2(HP_clif_pGuildOpposition), 1482 },
-{ HP_POP(clif->pGuildBreak), HP_POP2(HP_clif_pGuildBreak), 1484 },
-{ HP_POP(clif->pPetMenu), HP_POP2(HP_clif_pPetMenu), 1486 },
-{ HP_POP(clif->pCatchPet), HP_POP2(HP_clif_pCatchPet), 1488 },
-{ HP_POP(clif->pSelectEgg), HP_POP2(HP_clif_pSelectEgg), 1490 },
-{ HP_POP(clif->pSendEmotion), HP_POP2(HP_clif_pSendEmotion), 1492 },
-{ HP_POP(clif->pChangePetName), HP_POP2(HP_clif_pChangePetName), 1494 },
-{ HP_POP(clif->pGMKick), HP_POP2(HP_clif_pGMKick), 1496 },
-{ HP_POP(clif->pGMKickAll), HP_POP2(HP_clif_pGMKickAll), 1498 },
-{ HP_POP(clif->pGMShift), HP_POP2(HP_clif_pGMShift), 1500 },
-{ HP_POP(clif->pGMRemove2), HP_POP2(HP_clif_pGMRemove2), 1502 },
-{ HP_POP(clif->pGMRecall), HP_POP2(HP_clif_pGMRecall), 1504 },
-{ HP_POP(clif->pGMRecall2), HP_POP2(HP_clif_pGMRecall2), 1506 },
-{ HP_POP(clif->pGM_Monster_Item), HP_POP2(HP_clif_pGM_Monster_Item), 1508 },
-{ HP_POP(clif->pGMHide), HP_POP2(HP_clif_pGMHide), 1510 },
-{ HP_POP(clif->pGMReqNoChat), HP_POP2(HP_clif_pGMReqNoChat), 1512 },
-{ HP_POP(clif->pGMRc), HP_POP2(HP_clif_pGMRc), 1514 },
-{ HP_POP(clif->pGMReqAccountName), HP_POP2(HP_clif_pGMReqAccountName), 1516 },
-{ HP_POP(clif->pGMChangeMapType), HP_POP2(HP_clif_pGMChangeMapType), 1518 },
-{ HP_POP(clif->pPMIgnore), HP_POP2(HP_clif_pPMIgnore), 1520 },
-{ HP_POP(clif->pPMIgnoreAll), HP_POP2(HP_clif_pPMIgnoreAll), 1522 },
-{ HP_POP(clif->pPMIgnoreList), HP_POP2(HP_clif_pPMIgnoreList), 1524 },
-{ HP_POP(clif->pNoviceDoriDori), HP_POP2(HP_clif_pNoviceDoriDori), 1526 },
-{ HP_POP(clif->pNoviceExplosionSpirits), HP_POP2(HP_clif_pNoviceExplosionSpirits), 1528 },
-{ HP_POP(clif->pFriendsListAdd), HP_POP2(HP_clif_pFriendsListAdd), 1530 },
-{ HP_POP(clif->pFriendsListReply), HP_POP2(HP_clif_pFriendsListReply), 1532 },
-{ HP_POP(clif->pFriendsListRemove), HP_POP2(HP_clif_pFriendsListRemove), 1534 },
-{ HP_POP(clif->pPVPInfo), HP_POP2(HP_clif_pPVPInfo), 1536 },
-{ HP_POP(clif->pBlacksmith), HP_POP2(HP_clif_pBlacksmith), 1538 },
-{ HP_POP(clif->pAlchemist), HP_POP2(HP_clif_pAlchemist), 1540 },
-{ HP_POP(clif->pTaekwon), HP_POP2(HP_clif_pTaekwon), 1542 },
-{ HP_POP(clif->pRankingPk), HP_POP2(HP_clif_pRankingPk), 1544 },
-{ HP_POP(clif->pFeelSaveOk), HP_POP2(HP_clif_pFeelSaveOk), 1546 },
-{ HP_POP(clif->pChangeHomunculusName), HP_POP2(HP_clif_pChangeHomunculusName), 1548 },
-{ HP_POP(clif->pHomMoveToMaster), HP_POP2(HP_clif_pHomMoveToMaster), 1550 },
-{ HP_POP(clif->pHomMoveTo), HP_POP2(HP_clif_pHomMoveTo), 1552 },
-{ HP_POP(clif->pHomAttack), HP_POP2(HP_clif_pHomAttack), 1554 },
-{ HP_POP(clif->pHomMenu), HP_POP2(HP_clif_pHomMenu), 1556 },
-{ HP_POP(clif->pAutoRevive), HP_POP2(HP_clif_pAutoRevive), 1558 },
-{ HP_POP(clif->pCheck), HP_POP2(HP_clif_pCheck), 1560 },
-{ HP_POP(clif->pMail_refreshinbox), HP_POP2(HP_clif_pMail_refreshinbox), 1562 },
-{ HP_POP(clif->pMail_read), HP_POP2(HP_clif_pMail_read), 1564 },
-{ HP_POP(clif->pMail_getattach), HP_POP2(HP_clif_pMail_getattach), 1566 },
-{ HP_POP(clif->pMail_delete), HP_POP2(HP_clif_pMail_delete), 1568 },
-{ HP_POP(clif->pMail_return), HP_POP2(HP_clif_pMail_return), 1570 },
-{ HP_POP(clif->pMail_setattach), HP_POP2(HP_clif_pMail_setattach), 1572 },
-{ HP_POP(clif->pMail_winopen), HP_POP2(HP_clif_pMail_winopen), 1574 },
-{ HP_POP(clif->pMail_send), HP_POP2(HP_clif_pMail_send), 1576 },
-{ HP_POP(clif->pAuction_cancelreg), HP_POP2(HP_clif_pAuction_cancelreg), 1578 },
-{ HP_POP(clif->pAuction_setitem), HP_POP2(HP_clif_pAuction_setitem), 1580 },
-{ HP_POP(clif->pAuction_register), HP_POP2(HP_clif_pAuction_register), 1582 },
-{ HP_POP(clif->pAuction_cancel), HP_POP2(HP_clif_pAuction_cancel), 1584 },
-{ HP_POP(clif->pAuction_close), HP_POP2(HP_clif_pAuction_close), 1586 },
-{ HP_POP(clif->pAuction_bid), HP_POP2(HP_clif_pAuction_bid), 1588 },
-{ HP_POP(clif->pAuction_search), HP_POP2(HP_clif_pAuction_search), 1590 },
-{ HP_POP(clif->pAuction_buysell), HP_POP2(HP_clif_pAuction_buysell), 1592 },
-{ HP_POP(clif->pcashshop_buy), HP_POP2(HP_clif_pcashshop_buy), 1594 },
-{ HP_POP(clif->pAdopt_request), HP_POP2(HP_clif_pAdopt_request), 1596 },
-{ HP_POP(clif->pAdopt_reply), HP_POP2(HP_clif_pAdopt_reply), 1598 },
-{ HP_POP(clif->pViewPlayerEquip), HP_POP2(HP_clif_pViewPlayerEquip), 1600 },
-{ HP_POP(clif->pEquipTick), HP_POP2(HP_clif_pEquipTick), 1602 },
-{ HP_POP(clif->pquestStateAck), HP_POP2(HP_clif_pquestStateAck), 1604 },
-{ HP_POP(clif->pmercenary_action), HP_POP2(HP_clif_pmercenary_action), 1606 },
-{ HP_POP(clif->pBattleChat), HP_POP2(HP_clif_pBattleChat), 1608 },
-{ HP_POP(clif->pLessEffect), HP_POP2(HP_clif_pLessEffect), 1610 },
-{ HP_POP(clif->pItemListWindowSelected), HP_POP2(HP_clif_pItemListWindowSelected), 1612 },
-{ HP_POP(clif->pReqOpenBuyingStore), HP_POP2(HP_clif_pReqOpenBuyingStore), 1614 },
-{ HP_POP(clif->pReqCloseBuyingStore), HP_POP2(HP_clif_pReqCloseBuyingStore), 1616 },
-{ HP_POP(clif->pReqClickBuyingStore), HP_POP2(HP_clif_pReqClickBuyingStore), 1618 },
-{ HP_POP(clif->pReqTradeBuyingStore), HP_POP2(HP_clif_pReqTradeBuyingStore), 1620 },
-{ HP_POP(clif->pSearchStoreInfo), HP_POP2(HP_clif_pSearchStoreInfo), 1622 },
-{ HP_POP(clif->pSearchStoreInfoNextPage), HP_POP2(HP_clif_pSearchStoreInfoNextPage), 1624 },
-{ HP_POP(clif->pCloseSearchStoreInfo), HP_POP2(HP_clif_pCloseSearchStoreInfo), 1626 },
-{ HP_POP(clif->pSearchStoreInfoListItemClick), HP_POP2(HP_clif_pSearchStoreInfoListItemClick), 1628 },
-{ HP_POP(clif->pDebug), HP_POP2(HP_clif_pDebug), 1630 },
-{ HP_POP(clif->pSkillSelectMenu), HP_POP2(HP_clif_pSkillSelectMenu), 1632 },
-{ HP_POP(clif->pMoveItem), HP_POP2(HP_clif_pMoveItem), 1634 },
-{ HP_POP(clif->pDull), HP_POP2(HP_clif_pDull), 1636 },
-{ HP_POP(clif->pBGQueueRegister), HP_POP2(HP_clif_pBGQueueRegister), 1638 },
-{ HP_POP(clif->pBGQueueCheckState), HP_POP2(HP_clif_pBGQueueCheckState), 1640 },
-{ HP_POP(clif->pBGQueueRevokeReq), HP_POP2(HP_clif_pBGQueueRevokeReq), 1642 },
-{ HP_POP(clif->pBGQueueBattleBeginAck), HP_POP2(HP_clif_pBGQueueBattleBeginAck), 1644 },
-{ HP_POP(clif->pCashShopOpen), HP_POP2(HP_clif_pCashShopOpen), 1646 },
-{ HP_POP(clif->pCashShopClose), HP_POP2(HP_clif_pCashShopClose), 1648 },
-{ HP_POP(clif->pCashShopReqTab), HP_POP2(HP_clif_pCashShopReqTab), 1650 },
-{ HP_POP(clif->pCashShopSchedule), HP_POP2(HP_clif_pCashShopSchedule), 1652 },
-{ HP_POP(clif->pCashShopBuy), HP_POP2(HP_clif_pCashShopBuy), 1654 },
-{ HP_POP(clif->pPartyTick), HP_POP2(HP_clif_pPartyTick), 1656 },
-{ HP_POP(clif->pGuildInvite2), HP_POP2(HP_clif_pGuildInvite2), 1658 },
-{ HP_POP(clif->pPartyBookingAddFilter), HP_POP2(HP_clif_pPartyBookingAddFilter), 1660 },
-{ HP_POP(clif->pPartyBookingSubFilter), HP_POP2(HP_clif_pPartyBookingSubFilter), 1662 },
-{ HP_POP(clif->pPartyBookingReqVolunteer), HP_POP2(HP_clif_pPartyBookingReqVolunteer), 1664 },
-{ HP_POP(clif->pPartyBookingRefuseVolunteer), HP_POP2(HP_clif_pPartyBookingRefuseVolunteer), 1666 },
-{ HP_POP(clif->pPartyBookingCancelVolunteer), HP_POP2(HP_clif_pPartyBookingCancelVolunteer), 1668 },
+{ HP_POP(clif->spawn_unit2), HP_POP2(HP_clif_spawn_unit2), 500 },
+{ HP_POP(clif->set_unit_idle2), HP_POP2(HP_clif_set_unit_idle2), 502 },
+{ HP_POP(clif->set_unit_walking), HP_POP2(HP_clif_set_unit_walking), 504 },
+{ HP_POP(clif->calc_walkdelay), HP_POP2(HP_clif_calc_walkdelay), 506 },
+{ HP_POP(clif->getareachar_skillunit), HP_POP2(HP_clif_getareachar_skillunit), 508 },
+{ HP_POP(clif->getareachar_unit), HP_POP2(HP_clif_getareachar_unit), 510 },
+{ HP_POP(clif->clearchar_skillunit), HP_POP2(HP_clif_clearchar_skillunit), 512 },
+{ HP_POP(clif->getareachar), HP_POP2(HP_clif_getareachar), 514 },
+{ HP_POP(clif->spawn), HP_POP2(HP_clif_spawn), 516 },
+{ HP_POP(clif->changemap), HP_POP2(HP_clif_changemap), 518 },
+{ HP_POP(clif->changemapcell), HP_POP2(HP_clif_changemapcell), 520 },
+{ HP_POP(clif->map_property), HP_POP2(HP_clif_map_property), 522 },
+{ HP_POP(clif->pvpset), HP_POP2(HP_clif_pvpset), 524 },
+{ HP_POP(clif->map_property_mapall), HP_POP2(HP_clif_map_property_mapall), 526 },
+{ HP_POP(clif->bossmapinfo), HP_POP2(HP_clif_bossmapinfo), 528 },
+{ HP_POP(clif->map_type), HP_POP2(HP_clif_map_type), 530 },
+{ HP_POP(clif->maptypeproperty2), HP_POP2(HP_clif_maptypeproperty2), 532 },
+{ HP_POP(clif->changemapserver), HP_POP2(HP_clif_changemapserver), 534 },
+{ HP_POP(clif->npcbuysell), HP_POP2(HP_clif_npcbuysell), 536 },
+{ HP_POP(clif->buylist), HP_POP2(HP_clif_buylist), 538 },
+{ HP_POP(clif->selllist), HP_POP2(HP_clif_selllist), 540 },
+{ HP_POP(clif->cashshop_show), HP_POP2(HP_clif_cashshop_show), 542 },
+{ HP_POP(clif->npc_buy_result), HP_POP2(HP_clif_npc_buy_result), 544 },
+{ HP_POP(clif->npc_sell_result), HP_POP2(HP_clif_npc_sell_result), 546 },
+{ HP_POP(clif->cashshop_ack), HP_POP2(HP_clif_cashshop_ack), 548 },
+{ HP_POP(clif->scriptmes), HP_POP2(HP_clif_scriptmes), 550 },
+{ HP_POP(clif->scriptnext), HP_POP2(HP_clif_scriptnext), 552 },
+{ HP_POP(clif->scriptclose), HP_POP2(HP_clif_scriptclose), 554 },
+{ HP_POP(clif->scriptmenu), HP_POP2(HP_clif_scriptmenu), 556 },
+{ HP_POP(clif->scriptinput), HP_POP2(HP_clif_scriptinput), 558 },
+{ HP_POP(clif->scriptinputstr), HP_POP2(HP_clif_scriptinputstr), 560 },
+{ HP_POP(clif->cutin), HP_POP2(HP_clif_cutin), 562 },
+{ HP_POP(clif->sendfakenpc), HP_POP2(HP_clif_sendfakenpc), 564 },
+{ HP_POP(clif->scriptclear), HP_POP2(HP_clif_scriptclear), 566 },
+{ HP_POP(clif->viewpoint), HP_POP2(HP_clif_viewpoint), 568 },
+{ HP_POP(clif->damage), HP_POP2(HP_clif_damage), 570 },
+{ HP_POP(clif->sitting), HP_POP2(HP_clif_sitting), 572 },
+{ HP_POP(clif->standing), HP_POP2(HP_clif_standing), 574 },
+{ HP_POP(clif->arrow_create_list), HP_POP2(HP_clif_arrow_create_list), 576 },
+{ HP_POP(clif->refresh), HP_POP2(HP_clif_refresh), 578 },
+{ HP_POP(clif->fame_blacksmith), HP_POP2(HP_clif_fame_blacksmith), 580 },
+{ HP_POP(clif->fame_alchemist), HP_POP2(HP_clif_fame_alchemist), 582 },
+{ HP_POP(clif->fame_taekwon), HP_POP2(HP_clif_fame_taekwon), 584 },
+{ HP_POP(clif->ranklist), HP_POP2(HP_clif_ranklist), 586 },
+{ HP_POP(clif->update_rankingpoint), HP_POP2(HP_clif_update_rankingpoint), 588 },
+{ HP_POP(clif->pRanklist), HP_POP2(HP_clif_pRanklist), 590 },
+{ HP_POP(clif->hotkeys), HP_POP2(HP_clif_hotkeys), 592 },
+{ HP_POP(clif->insight), HP_POP2(HP_clif_insight), 594 },
+{ HP_POP(clif->outsight), HP_POP2(HP_clif_outsight), 596 },
+{ HP_POP(clif->skillcastcancel), HP_POP2(HP_clif_skillcastcancel), 598 },
+{ HP_POP(clif->skill_fail), HP_POP2(HP_clif_skill_fail), 600 },
+{ HP_POP(clif->skill_cooldown), HP_POP2(HP_clif_skill_cooldown), 602 },
+{ HP_POP(clif->skill_memomessage), HP_POP2(HP_clif_skill_memomessage), 604 },
+{ HP_POP(clif->skill_mapinfomessage), HP_POP2(HP_clif_skill_mapinfomessage), 606 },
+{ HP_POP(clif->skill_produce_mix_list), HP_POP2(HP_clif_skill_produce_mix_list), 608 },
+{ HP_POP(clif->cooking_list), HP_POP2(HP_clif_cooking_list), 610 },
+{ HP_POP(clif->autospell), HP_POP2(HP_clif_autospell), 612 },
+{ HP_POP(clif->combo_delay), HP_POP2(HP_clif_combo_delay), 614 },
+{ HP_POP(clif->status_change), HP_POP2(HP_clif_status_change), 616 },
+{ HP_POP(clif->insert_card), HP_POP2(HP_clif_insert_card), 618 },
+{ HP_POP(clif->inventorylist), HP_POP2(HP_clif_inventorylist), 620 },
+{ HP_POP(clif->equiplist), HP_POP2(HP_clif_equiplist), 622 },
+{ HP_POP(clif->cartlist), HP_POP2(HP_clif_cartlist), 624 },
+{ HP_POP(clif->favorite_item), HP_POP2(HP_clif_favorite_item), 626 },
+{ HP_POP(clif->clearcart), HP_POP2(HP_clif_clearcart), 628 },
+{ HP_POP(clif->item_identify_list), HP_POP2(HP_clif_item_identify_list), 630 },
+{ HP_POP(clif->item_identified), HP_POP2(HP_clif_item_identified), 632 },
+{ HP_POP(clif->item_repair_list), HP_POP2(HP_clif_item_repair_list), 634 },
+{ HP_POP(clif->item_repaireffect), HP_POP2(HP_clif_item_repaireffect), 636 },
+{ HP_POP(clif->item_damaged), HP_POP2(HP_clif_item_damaged), 638 },
+{ HP_POP(clif->item_refine_list), HP_POP2(HP_clif_item_refine_list), 640 },
+{ HP_POP(clif->item_skill), HP_POP2(HP_clif_item_skill), 642 },
+{ HP_POP(clif->mvp_item), HP_POP2(HP_clif_mvp_item), 644 },
+{ HP_POP(clif->mvp_exp), HP_POP2(HP_clif_mvp_exp), 646 },
+{ HP_POP(clif->mvp_noitem), HP_POP2(HP_clif_mvp_noitem), 648 },
+{ HP_POP(clif->changed_dir), HP_POP2(HP_clif_changed_dir), 650 },
+{ HP_POP(clif->charnameack), HP_POP2(HP_clif_charnameack), 652 },
+{ HP_POP(clif->monster_hp_bar), HP_POP2(HP_clif_monster_hp_bar), 654 },
+{ HP_POP(clif->hpmeter), HP_POP2(HP_clif_hpmeter), 656 },
+{ HP_POP(clif->hpmeter_single), HP_POP2(HP_clif_hpmeter_single), 658 },
+{ HP_POP(clif->hpmeter_sub), HP_POP2(HP_clif_hpmeter_sub), 660 },
+{ HP_POP(clif->upgrademessage), HP_POP2(HP_clif_upgrademessage), 662 },
+{ HP_POP(clif->get_weapon_view), HP_POP2(HP_clif_get_weapon_view), 664 },
+{ HP_POP(clif->gospel_info), HP_POP2(HP_clif_gospel_info), 666 },
+{ HP_POP(clif->feel_req), HP_POP2(HP_clif_feel_req), 668 },
+{ HP_POP(clif->starskill), HP_POP2(HP_clif_starskill), 670 },
+{ HP_POP(clif->feel_info), HP_POP2(HP_clif_feel_info), 672 },
+{ HP_POP(clif->hate_info), HP_POP2(HP_clif_hate_info), 674 },
+{ HP_POP(clif->mission_info), HP_POP2(HP_clif_mission_info), 676 },
+{ HP_POP(clif->feel_hate_reset), HP_POP2(HP_clif_feel_hate_reset), 678 },
+{ HP_POP(clif->partytickack), HP_POP2(HP_clif_partytickack), 680 },
+{ HP_POP(clif->equiptickack), HP_POP2(HP_clif_equiptickack), 682 },
+{ HP_POP(clif->viewequip_ack), HP_POP2(HP_clif_viewequip_ack), 684 },
+{ HP_POP(clif->viewequip_fail), HP_POP2(HP_clif_viewequip_fail), 686 },
+{ HP_POP(clif->equpcheckbox), HP_POP2(HP_clif_equpcheckbox), 688 },
+{ HP_POP(clif->displayexp), HP_POP2(HP_clif_displayexp), 690 },
+{ HP_POP(clif->font), HP_POP2(HP_clif_font), 692 },
+{ HP_POP(clif->progressbar), HP_POP2(HP_clif_progressbar), 694 },
+{ HP_POP(clif->progressbar_abort), HP_POP2(HP_clif_progressbar_abort), 696 },
+{ HP_POP(clif->showdigit), HP_POP2(HP_clif_showdigit), 698 },
+{ HP_POP(clif->elementalconverter_list), HP_POP2(HP_clif_elementalconverter_list), 700 },
+{ HP_POP(clif->spellbook_list), HP_POP2(HP_clif_spellbook_list), 702 },
+{ HP_POP(clif->magicdecoy_list), HP_POP2(HP_clif_magicdecoy_list), 704 },
+{ HP_POP(clif->poison_list), HP_POP2(HP_clif_poison_list), 706 },
+{ HP_POP(clif->autoshadowspell_list), HP_POP2(HP_clif_autoshadowspell_list), 708 },
+{ HP_POP(clif->skill_itemlistwindow), HP_POP2(HP_clif_skill_itemlistwindow), 710 },
+{ HP_POP(clif->sc_load), HP_POP2(HP_clif_sc_load), 712 },
+{ HP_POP(clif->sc_end), HP_POP2(HP_clif_sc_end), 714 },
+{ HP_POP(clif->initialstatus), HP_POP2(HP_clif_initialstatus), 716 },
+{ HP_POP(clif->cooldown_list), HP_POP2(HP_clif_cooldown_list), 718 },
+{ HP_POP(clif->updatestatus), HP_POP2(HP_clif_updatestatus), 720 },
+{ HP_POP(clif->changestatus), HP_POP2(HP_clif_changestatus), 722 },
+{ HP_POP(clif->statusupack), HP_POP2(HP_clif_statusupack), 724 },
+{ HP_POP(clif->movetoattack), HP_POP2(HP_clif_movetoattack), 726 },
+{ HP_POP(clif->solved_charname), HP_POP2(HP_clif_solved_charname), 728 },
+{ HP_POP(clif->charnameupdate), HP_POP2(HP_clif_charnameupdate), 730 },
+{ HP_POP(clif->delayquit), HP_POP2(HP_clif_delayquit), 732 },
+{ HP_POP(clif->getareachar_pc), HP_POP2(HP_clif_getareachar_pc), 734 },
+{ HP_POP(clif->disconnect_ack), HP_POP2(HP_clif_disconnect_ack), 736 },
+{ HP_POP(clif->PVPInfo), HP_POP2(HP_clif_PVPInfo), 738 },
+{ HP_POP(clif->blacksmith), HP_POP2(HP_clif_blacksmith), 740 },
+{ HP_POP(clif->alchemist), HP_POP2(HP_clif_alchemist), 742 },
+{ HP_POP(clif->taekwon), HP_POP2(HP_clif_taekwon), 744 },
+{ HP_POP(clif->ranking_pk), HP_POP2(HP_clif_ranking_pk), 746 },
+{ HP_POP(clif->quitsave), HP_POP2(HP_clif_quitsave), 748 },
+{ HP_POP(clif->misceffect), HP_POP2(HP_clif_misceffect), 750 },
+{ HP_POP(clif->changeoption), HP_POP2(HP_clif_changeoption), 752 },
+{ HP_POP(clif->changeoption2), HP_POP2(HP_clif_changeoption2), 754 },
+{ HP_POP(clif->emotion), HP_POP2(HP_clif_emotion), 756 },
+{ HP_POP(clif->talkiebox), HP_POP2(HP_clif_talkiebox), 758 },
+{ HP_POP(clif->wedding_effect), HP_POP2(HP_clif_wedding_effect), 760 },
+{ HP_POP(clif->divorced), HP_POP2(HP_clif_divorced), 762 },
+{ HP_POP(clif->callpartner), HP_POP2(HP_clif_callpartner), 764 },
+{ HP_POP(clif->skill_damage), HP_POP2(HP_clif_skill_damage), 766 },
+{ HP_POP(clif->skill_nodamage), HP_POP2(HP_clif_skill_nodamage), 768 },
+{ HP_POP(clif->skill_poseffect), HP_POP2(HP_clif_skill_poseffect), 770 },
+{ HP_POP(clif->skill_estimation), HP_POP2(HP_clif_skill_estimation), 772 },
+{ HP_POP(clif->skill_warppoint), HP_POP2(HP_clif_skill_warppoint), 774 },
+{ HP_POP(clif->skillcasting), HP_POP2(HP_clif_skillcasting), 776 },
+{ HP_POP(clif->produce_effect), HP_POP2(HP_clif_produce_effect), 778 },
+{ HP_POP(clif->devotion), HP_POP2(HP_clif_devotion), 780 },
+{ HP_POP(clif->spiritball), HP_POP2(HP_clif_spiritball), 782 },
+{ HP_POP(clif->spiritball_single), HP_POP2(HP_clif_spiritball_single), 784 },
+{ HP_POP(clif->bladestop), HP_POP2(HP_clif_bladestop), 786 },
+{ HP_POP(clif->mvp_effect), HP_POP2(HP_clif_mvp_effect), 788 },
+{ HP_POP(clif->heal), HP_POP2(HP_clif_heal), 790 },
+{ HP_POP(clif->resurrection), HP_POP2(HP_clif_resurrection), 792 },
+{ HP_POP(clif->refine), HP_POP2(HP_clif_refine), 794 },
+{ HP_POP(clif->weather), HP_POP2(HP_clif_weather), 796 },
+{ HP_POP(clif->specialeffect), HP_POP2(HP_clif_specialeffect), 798 },
+{ HP_POP(clif->specialeffect_single), HP_POP2(HP_clif_specialeffect_single), 800 },
+{ HP_POP(clif->specialeffect_value), HP_POP2(HP_clif_specialeffect_value), 802 },
+{ HP_POP(clif->millenniumshield), HP_POP2(HP_clif_millenniumshield), 804 },
+{ HP_POP(clif->charm), HP_POP2(HP_clif_charm), 806 },
+{ HP_POP(clif->charm_single), HP_POP2(HP_clif_charm_single), 808 },
+{ HP_POP(clif->snap), HP_POP2(HP_clif_snap), 810 },
+{ HP_POP(clif->weather_check), HP_POP2(HP_clif_weather_check), 812 },
+{ HP_POP(clif->playBGM), HP_POP2(HP_clif_playBGM), 814 },
+{ HP_POP(clif->soundeffect), HP_POP2(HP_clif_soundeffect), 816 },
+{ HP_POP(clif->soundeffectall), HP_POP2(HP_clif_soundeffectall), 818 },
+{ HP_POP(clif->GlobalMessage), HP_POP2(HP_clif_GlobalMessage), 820 },
+{ HP_POP(clif->createchat), HP_POP2(HP_clif_createchat), 822 },
+{ HP_POP(clif->dispchat), HP_POP2(HP_clif_dispchat), 824 },
+{ HP_POP(clif->joinchatfail), HP_POP2(HP_clif_joinchatfail), 826 },
+{ HP_POP(clif->joinchatok), HP_POP2(HP_clif_joinchatok), 828 },
+{ HP_POP(clif->addchat), HP_POP2(HP_clif_addchat), 830 },
+{ HP_POP(clif->changechatowner), HP_POP2(HP_clif_changechatowner), 832 },
+{ HP_POP(clif->clearchat), HP_POP2(HP_clif_clearchat), 834 },
+{ HP_POP(clif->leavechat), HP_POP2(HP_clif_leavechat), 836 },
+{ HP_POP(clif->changechatstatus), HP_POP2(HP_clif_changechatstatus), 838 },
+{ HP_POP(clif->wis_message), HP_POP2(HP_clif_wis_message), 840 },
+{ HP_POP(clif->wis_end), HP_POP2(HP_clif_wis_end), 842 },
+{ HP_POP(clif->disp_onlyself), HP_POP2(HP_clif_disp_onlyself), 844 },
+{ HP_POP(clif->disp_message), HP_POP2(HP_clif_disp_message), 846 },
+{ HP_POP(clif->broadcast), HP_POP2(HP_clif_broadcast), 848 },
+{ HP_POP(clif->broadcast2), HP_POP2(HP_clif_broadcast2), 850 },
+{ HP_POP(clif->messagecolor), HP_POP2(HP_clif_messagecolor), 852 },
+{ HP_POP(clif->disp_overhead), HP_POP2(HP_clif_disp_overhead), 854 },
+{ HP_POP(clif->msg), HP_POP2(HP_clif_msg), 856 },
+{ HP_POP(clif->msg_value), HP_POP2(HP_clif_msg_value), 858 },
+{ HP_POP(clif->msg_skill), HP_POP2(HP_clif_msg_skill), 860 },
+{ HP_POP(clif->msgtable), HP_POP2(HP_clif_msgtable), 862 },
+{ HP_POP(clif->msgtable_num), HP_POP2(HP_clif_msgtable_num), 864 },
+{ HP_POP(clif->message), HP_POP2(HP_clif_message), 866 },
+{ HP_POP(clif->messageln), HP_POP2(HP_clif_messageln), 868 },
+{ HP_POP(clif->colormes), HP_POP2(HP_clif_colormes), 870 },
+{ HP_POP(clif->process_message), HP_POP2(HP_clif_process_message), 872 },
+{ HP_POP(clif->wisexin), HP_POP2(HP_clif_wisexin), 874 },
+{ HP_POP(clif->wisall), HP_POP2(HP_clif_wisall), 876 },
+{ HP_POP(clif->PMIgnoreList), HP_POP2(HP_clif_PMIgnoreList), 878 },
+{ HP_POP(clif->traderequest), HP_POP2(HP_clif_traderequest), 880 },
+{ HP_POP(clif->tradestart), HP_POP2(HP_clif_tradestart), 882 },
+{ HP_POP(clif->tradeadditem), HP_POP2(HP_clif_tradeadditem), 884 },
+{ HP_POP(clif->tradeitemok), HP_POP2(HP_clif_tradeitemok), 886 },
+{ HP_POP(clif->tradedeal_lock), HP_POP2(HP_clif_tradedeal_lock), 888 },
+{ HP_POP(clif->tradecancelled), HP_POP2(HP_clif_tradecancelled), 890 },
+{ HP_POP(clif->tradecompleted), HP_POP2(HP_clif_tradecompleted), 892 },
+{ HP_POP(clif->tradeundo), HP_POP2(HP_clif_tradeundo), 894 },
+{ HP_POP(clif->openvendingreq), HP_POP2(HP_clif_openvendingreq), 896 },
+{ HP_POP(clif->showvendingboard), HP_POP2(HP_clif_showvendingboard), 898 },
+{ HP_POP(clif->closevendingboard), HP_POP2(HP_clif_closevendingboard), 900 },
+{ HP_POP(clif->vendinglist), HP_POP2(HP_clif_vendinglist), 902 },
+{ HP_POP(clif->buyvending), HP_POP2(HP_clif_buyvending), 904 },
+{ HP_POP(clif->openvending), HP_POP2(HP_clif_openvending), 906 },
+{ HP_POP(clif->vendingreport), HP_POP2(HP_clif_vendingreport), 908 },
+{ HP_POP(clif->storagelist), HP_POP2(HP_clif_storagelist), 910 },
+{ HP_POP(clif->updatestorageamount), HP_POP2(HP_clif_updatestorageamount), 912 },
+{ HP_POP(clif->storageitemadded), HP_POP2(HP_clif_storageitemadded), 914 },
+{ HP_POP(clif->storageitemremoved), HP_POP2(HP_clif_storageitemremoved), 916 },
+{ HP_POP(clif->storageclose), HP_POP2(HP_clif_storageclose), 918 },
+{ HP_POP(clif->skillinfoblock), HP_POP2(HP_clif_skillinfoblock), 920 },
+{ HP_POP(clif->skillup), HP_POP2(HP_clif_skillup), 922 },
+{ HP_POP(clif->skillinfo), HP_POP2(HP_clif_skillinfo), 924 },
+{ HP_POP(clif->addskill), HP_POP2(HP_clif_addskill), 926 },
+{ HP_POP(clif->deleteskill), HP_POP2(HP_clif_deleteskill), 928 },
+{ HP_POP(clif->party_created), HP_POP2(HP_clif_party_created), 930 },
+{ HP_POP(clif->party_member_info), HP_POP2(HP_clif_party_member_info), 932 },
+{ HP_POP(clif->party_info), HP_POP2(HP_clif_party_info), 934 },
+{ HP_POP(clif->party_invite), HP_POP2(HP_clif_party_invite), 936 },
+{ HP_POP(clif->party_inviteack), HP_POP2(HP_clif_party_inviteack), 938 },
+{ HP_POP(clif->party_option), HP_POP2(HP_clif_party_option), 940 },
+{ HP_POP(clif->party_withdraw), HP_POP2(HP_clif_party_withdraw), 942 },
+{ HP_POP(clif->party_message), HP_POP2(HP_clif_party_message), 944 },
+{ HP_POP(clif->party_xy), HP_POP2(HP_clif_party_xy), 946 },
+{ HP_POP(clif->party_xy_single), HP_POP2(HP_clif_party_xy_single), 948 },
+{ HP_POP(clif->party_hp), HP_POP2(HP_clif_party_hp), 950 },
+{ HP_POP(clif->party_xy_remove), HP_POP2(HP_clif_party_xy_remove), 952 },
+{ HP_POP(clif->party_show_picker), HP_POP2(HP_clif_party_show_picker), 954 },
+{ HP_POP(clif->partyinvitationstate), HP_POP2(HP_clif_partyinvitationstate), 956 },
+{ HP_POP(clif->guild_created), HP_POP2(HP_clif_guild_created), 958 },
+{ HP_POP(clif->guild_belonginfo), HP_POP2(HP_clif_guild_belonginfo), 960 },
+{ HP_POP(clif->guild_masterormember), HP_POP2(HP_clif_guild_masterormember), 962 },
+{ HP_POP(clif->guild_basicinfo), HP_POP2(HP_clif_guild_basicinfo), 964 },
+{ HP_POP(clif->guild_allianceinfo), HP_POP2(HP_clif_guild_allianceinfo), 966 },
+{ HP_POP(clif->guild_memberlist), HP_POP2(HP_clif_guild_memberlist), 968 },
+{ HP_POP(clif->guild_skillinfo), HP_POP2(HP_clif_guild_skillinfo), 970 },
+{ HP_POP(clif->guild_send_onlineinfo), HP_POP2(HP_clif_guild_send_onlineinfo), 972 },
+{ HP_POP(clif->guild_memberlogin_notice), HP_POP2(HP_clif_guild_memberlogin_notice), 974 },
+{ HP_POP(clif->guild_invite), HP_POP2(HP_clif_guild_invite), 976 },
+{ HP_POP(clif->guild_inviteack), HP_POP2(HP_clif_guild_inviteack), 978 },
+{ HP_POP(clif->guild_leave), HP_POP2(HP_clif_guild_leave), 980 },
+{ HP_POP(clif->guild_expulsion), HP_POP2(HP_clif_guild_expulsion), 982 },
+{ HP_POP(clif->guild_positionchanged), HP_POP2(HP_clif_guild_positionchanged), 984 },
+{ HP_POP(clif->guild_memberpositionchanged), HP_POP2(HP_clif_guild_memberpositionchanged), 986 },
+{ HP_POP(clif->guild_emblem), HP_POP2(HP_clif_guild_emblem), 988 },
+{ HP_POP(clif->guild_emblem_area), HP_POP2(HP_clif_guild_emblem_area), 990 },
+{ HP_POP(clif->guild_notice), HP_POP2(HP_clif_guild_notice), 992 },
+{ HP_POP(clif->guild_message), HP_POP2(HP_clif_guild_message), 994 },
+{ HP_POP(clif->guild_skillup), HP_POP2(HP_clif_guild_skillup), 996 },
+{ HP_POP(clif->guild_reqalliance), HP_POP2(HP_clif_guild_reqalliance), 998 },
+{ HP_POP(clif->guild_allianceack), HP_POP2(HP_clif_guild_allianceack), 1000 },
+{ HP_POP(clif->guild_delalliance), HP_POP2(HP_clif_guild_delalliance), 1002 },
+{ HP_POP(clif->guild_oppositionack), HP_POP2(HP_clif_guild_oppositionack), 1004 },
+{ HP_POP(clif->guild_broken), HP_POP2(HP_clif_guild_broken), 1006 },
+{ HP_POP(clif->guild_xy), HP_POP2(HP_clif_guild_xy), 1008 },
+{ HP_POP(clif->guild_xy_single), HP_POP2(HP_clif_guild_xy_single), 1010 },
+{ HP_POP(clif->guild_xy_remove), HP_POP2(HP_clif_guild_xy_remove), 1012 },
+{ HP_POP(clif->guild_positionnamelist), HP_POP2(HP_clif_guild_positionnamelist), 1014 },
+{ HP_POP(clif->guild_positioninfolist), HP_POP2(HP_clif_guild_positioninfolist), 1016 },
+{ HP_POP(clif->guild_expulsionlist), HP_POP2(HP_clif_guild_expulsionlist), 1018 },
+{ HP_POP(clif->validate_emblem), HP_POP2(HP_clif_validate_emblem), 1020 },
+{ HP_POP(clif->bg_hp), HP_POP2(HP_clif_bg_hp), 1022 },
+{ HP_POP(clif->bg_xy), HP_POP2(HP_clif_bg_xy), 1024 },
+{ HP_POP(clif->bg_xy_remove), HP_POP2(HP_clif_bg_xy_remove), 1026 },
+{ HP_POP(clif->bg_message), HP_POP2(HP_clif_bg_message), 1028 },
+{ HP_POP(clif->bg_updatescore), HP_POP2(HP_clif_bg_updatescore), 1030 },
+{ HP_POP(clif->bg_updatescore_single), HP_POP2(HP_clif_bg_updatescore_single), 1032 },
+{ HP_POP(clif->sendbgemblem_area), HP_POP2(HP_clif_sendbgemblem_area), 1034 },
+{ HP_POP(clif->sendbgemblem_single), HP_POP2(HP_clif_sendbgemblem_single), 1036 },
+{ HP_POP(clif->instance), HP_POP2(HP_clif_instance), 1038 },
+{ HP_POP(clif->instance_join), HP_POP2(HP_clif_instance_join), 1040 },
+{ HP_POP(clif->instance_leave), HP_POP2(HP_clif_instance_leave), 1042 },
+{ HP_POP(clif->catch_process), HP_POP2(HP_clif_catch_process), 1044 },
+{ HP_POP(clif->pet_roulette), HP_POP2(HP_clif_pet_roulette), 1046 },
+{ HP_POP(clif->sendegg), HP_POP2(HP_clif_sendegg), 1048 },
+{ HP_POP(clif->send_petstatus), HP_POP2(HP_clif_send_petstatus), 1050 },
+{ HP_POP(clif->send_petdata), HP_POP2(HP_clif_send_petdata), 1052 },
+{ HP_POP(clif->pet_emotion), HP_POP2(HP_clif_pet_emotion), 1054 },
+{ HP_POP(clif->pet_food), HP_POP2(HP_clif_pet_food), 1056 },
+{ HP_POP(clif->friendslist_toggle_sub), HP_POP2(HP_clif_friendslist_toggle_sub), 1058 },
+{ HP_POP(clif->friendslist_send), HP_POP2(HP_clif_friendslist_send), 1060 },
+{ HP_POP(clif->friendslist_reqack), HP_POP2(HP_clif_friendslist_reqack), 1062 },
+{ HP_POP(clif->friendslist_toggle), HP_POP2(HP_clif_friendslist_toggle), 1064 },
+{ HP_POP(clif->friendlist_req), HP_POP2(HP_clif_friendlist_req), 1066 },
+{ HP_POP(clif->GM_kickack), HP_POP2(HP_clif_GM_kickack), 1068 },
+{ HP_POP(clif->GM_kick), HP_POP2(HP_clif_GM_kick), 1070 },
+{ HP_POP(clif->manner_message), HP_POP2(HP_clif_manner_message), 1072 },
+{ HP_POP(clif->GM_silence), HP_POP2(HP_clif_GM_silence), 1074 },
+{ HP_POP(clif->account_name), HP_POP2(HP_clif_account_name), 1076 },
+{ HP_POP(clif->check), HP_POP2(HP_clif_check), 1078 },
+{ HP_POP(clif->hominfo), HP_POP2(HP_clif_hominfo), 1080 },
+{ HP_POP(clif->homskillinfoblock), HP_POP2(HP_clif_homskillinfoblock), 1082 },
+{ HP_POP(clif->homskillup), HP_POP2(HP_clif_homskillup), 1084 },
+{ HP_POP(clif->hom_food), HP_POP2(HP_clif_hom_food), 1086 },
+{ HP_POP(clif->send_homdata), HP_POP2(HP_clif_send_homdata), 1088 },
+{ HP_POP(clif->quest_send_list), HP_POP2(HP_clif_quest_send_list), 1090 },
+{ HP_POP(clif->quest_send_mission), HP_POP2(HP_clif_quest_send_mission), 1092 },
+{ HP_POP(clif->quest_add), HP_POP2(HP_clif_quest_add), 1094 },
+{ HP_POP(clif->quest_delete), HP_POP2(HP_clif_quest_delete), 1096 },
+{ HP_POP(clif->quest_update_status), HP_POP2(HP_clif_quest_update_status), 1098 },
+{ HP_POP(clif->quest_update_objective), HP_POP2(HP_clif_quest_update_objective), 1100 },
+{ HP_POP(clif->quest_show_event), HP_POP2(HP_clif_quest_show_event), 1102 },
+{ HP_POP(clif->mail_window), HP_POP2(HP_clif_mail_window), 1104 },
+{ HP_POP(clif->mail_read), HP_POP2(HP_clif_mail_read), 1106 },
+{ HP_POP(clif->mail_delete), HP_POP2(HP_clif_mail_delete), 1108 },
+{ HP_POP(clif->mail_return), HP_POP2(HP_clif_mail_return), 1110 },
+{ HP_POP(clif->mail_send), HP_POP2(HP_clif_mail_send), 1112 },
+{ HP_POP(clif->mail_new), HP_POP2(HP_clif_mail_new), 1114 },
+{ HP_POP(clif->mail_refreshinbox), HP_POP2(HP_clif_mail_refreshinbox), 1116 },
+{ HP_POP(clif->mail_getattachment), HP_POP2(HP_clif_mail_getattachment), 1118 },
+{ HP_POP(clif->mail_setattachment), HP_POP2(HP_clif_mail_setattachment), 1120 },
+{ HP_POP(clif->auction_openwindow), HP_POP2(HP_clif_auction_openwindow), 1122 },
+{ HP_POP(clif->auction_results), HP_POP2(HP_clif_auction_results), 1124 },
+{ HP_POP(clif->auction_message), HP_POP2(HP_clif_auction_message), 1126 },
+{ HP_POP(clif->auction_close), HP_POP2(HP_clif_auction_close), 1128 },
+{ HP_POP(clif->auction_setitem), HP_POP2(HP_clif_auction_setitem), 1130 },
+{ HP_POP(clif->mercenary_info), HP_POP2(HP_clif_mercenary_info), 1132 },
+{ HP_POP(clif->mercenary_skillblock), HP_POP2(HP_clif_mercenary_skillblock), 1134 },
+{ HP_POP(clif->mercenary_message), HP_POP2(HP_clif_mercenary_message), 1136 },
+{ HP_POP(clif->mercenary_updatestatus), HP_POP2(HP_clif_mercenary_updatestatus), 1138 },
+{ HP_POP(clif->rental_time), HP_POP2(HP_clif_rental_time), 1140 },
+{ HP_POP(clif->rental_expired), HP_POP2(HP_clif_rental_expired), 1142 },
+{ HP_POP(clif->PartyBookingRegisterAck), HP_POP2(HP_clif_PartyBookingRegisterAck), 1144 },
+{ HP_POP(clif->PartyBookingDeleteAck), HP_POP2(HP_clif_PartyBookingDeleteAck), 1146 },
+{ HP_POP(clif->PartyBookingSearchAck), HP_POP2(HP_clif_PartyBookingSearchAck), 1148 },
+{ HP_POP(clif->PartyBookingUpdateNotify), HP_POP2(HP_clif_PartyBookingUpdateNotify), 1150 },
+{ HP_POP(clif->PartyBookingDeleteNotify), HP_POP2(HP_clif_PartyBookingDeleteNotify), 1152 },
+{ HP_POP(clif->PartyBookingInsertNotify), HP_POP2(HP_clif_PartyBookingInsertNotify), 1154 },
+{ HP_POP(clif->PartyBookingVolunteerInfo), HP_POP2(HP_clif_PartyBookingVolunteerInfo), 1156 },
+{ HP_POP(clif->PartyBookingRefuseVolunteer), HP_POP2(HP_clif_PartyBookingRefuseVolunteer), 1158 },
+{ HP_POP(clif->PartyBookingCancelVolunteer), HP_POP2(HP_clif_PartyBookingCancelVolunteer), 1160 },
+{ HP_POP(clif->PartyBookingAddFilteringList), HP_POP2(HP_clif_PartyBookingAddFilteringList), 1162 },
+{ HP_POP(clif->PartyBookingSubFilteringList), HP_POP2(HP_clif_PartyBookingSubFilteringList), 1164 },
+{ HP_POP(clif->buyingstore_open), HP_POP2(HP_clif_buyingstore_open), 1166 },
+{ HP_POP(clif->buyingstore_open_failed), HP_POP2(HP_clif_buyingstore_open_failed), 1168 },
+{ HP_POP(clif->buyingstore_myitemlist), HP_POP2(HP_clif_buyingstore_myitemlist), 1170 },
+{ HP_POP(clif->buyingstore_entry), HP_POP2(HP_clif_buyingstore_entry), 1172 },
+{ HP_POP(clif->buyingstore_entry_single), HP_POP2(HP_clif_buyingstore_entry_single), 1174 },
+{ HP_POP(clif->buyingstore_disappear_entry), HP_POP2(HP_clif_buyingstore_disappear_entry), 1176 },
+{ HP_POP(clif->buyingstore_disappear_entry_single), HP_POP2(HP_clif_buyingstore_disappear_entry_single), 1178 },
+{ HP_POP(clif->buyingstore_itemlist), HP_POP2(HP_clif_buyingstore_itemlist), 1180 },
+{ HP_POP(clif->buyingstore_trade_failed_buyer), HP_POP2(HP_clif_buyingstore_trade_failed_buyer), 1182 },
+{ HP_POP(clif->buyingstore_update_item), HP_POP2(HP_clif_buyingstore_update_item), 1184 },
+{ HP_POP(clif->buyingstore_delete_item), HP_POP2(HP_clif_buyingstore_delete_item), 1186 },
+{ HP_POP(clif->buyingstore_trade_failed_seller), HP_POP2(HP_clif_buyingstore_trade_failed_seller), 1188 },
+{ HP_POP(clif->search_store_info_ack), HP_POP2(HP_clif_search_store_info_ack), 1190 },
+{ HP_POP(clif->search_store_info_failed), HP_POP2(HP_clif_search_store_info_failed), 1192 },
+{ HP_POP(clif->open_search_store_info), HP_POP2(HP_clif_open_search_store_info), 1194 },
+{ HP_POP(clif->search_store_info_click_ack), HP_POP2(HP_clif_search_store_info_click_ack), 1196 },
+{ HP_POP(clif->elemental_info), HP_POP2(HP_clif_elemental_info), 1198 },
+{ HP_POP(clif->elemental_updatestatus), HP_POP2(HP_clif_elemental_updatestatus), 1200 },
+{ HP_POP(clif->bgqueue_ack), HP_POP2(HP_clif_bgqueue_ack), 1202 },
+{ HP_POP(clif->bgqueue_notice_delete), HP_POP2(HP_clif_bgqueue_notice_delete), 1204 },
+{ HP_POP(clif->bgqueue_update_info), HP_POP2(HP_clif_bgqueue_update_info), 1206 },
+{ HP_POP(clif->bgqueue_joined), HP_POP2(HP_clif_bgqueue_joined), 1208 },
+{ HP_POP(clif->bgqueue_pcleft), HP_POP2(HP_clif_bgqueue_pcleft), 1210 },
+{ HP_POP(clif->bgqueue_battlebegins), HP_POP2(HP_clif_bgqueue_battlebegins), 1212 },
+{ HP_POP(clif->adopt_reply), HP_POP2(HP_clif_adopt_reply), 1214 },
+{ HP_POP(clif->adopt_request), HP_POP2(HP_clif_adopt_request), 1216 },
+{ HP_POP(clif->readbook), HP_POP2(HP_clif_readbook), 1218 },
+{ HP_POP(clif->notify_time), HP_POP2(HP_clif_notify_time), 1220 },
+{ HP_POP(clif->user_count), HP_POP2(HP_clif_user_count), 1222 },
+{ HP_POP(clif->noask_sub), HP_POP2(HP_clif_noask_sub), 1224 },
+{ HP_POP(clif->bc_ready), HP_POP2(HP_clif_bc_ready), 1226 },
+{ HP_POP(clif->undisguise_timer), HP_POP2(HP_clif_undisguise_timer), 1228 },
+{ HP_POP(clif->chsys_create), HP_POP2(HP_clif_chsys_create), 1230 },
+{ HP_POP(clif->chsys_msg), HP_POP2(HP_clif_chsys_msg), 1232 },
+{ HP_POP(clif->chsys_msg2), HP_POP2(HP_clif_chsys_msg2), 1234 },
+{ HP_POP(clif->chsys_send), HP_POP2(HP_clif_chsys_send), 1236 },
+{ HP_POP(clif->chsys_join), HP_POP2(HP_clif_chsys_join), 1238 },
+{ HP_POP(clif->chsys_left), HP_POP2(HP_clif_chsys_left), 1240 },
+{ HP_POP(clif->chsys_delete), HP_POP2(HP_clif_chsys_delete), 1242 },
+{ HP_POP(clif->chsys_mjoin), HP_POP2(HP_clif_chsys_mjoin), 1244 },
+{ HP_POP(clif->chsys_quit), HP_POP2(HP_clif_chsys_quit), 1246 },
+{ HP_POP(clif->chsys_quitg), HP_POP2(HP_clif_chsys_quitg), 1248 },
+{ HP_POP(clif->chsys_gjoin), HP_POP2(HP_clif_chsys_gjoin), 1250 },
+{ HP_POP(clif->chsys_gleave), HP_POP2(HP_clif_chsys_gleave), 1252 },
+{ HP_POP(clif->pWantToConnection), HP_POP2(HP_clif_pWantToConnection), 1254 },
+{ HP_POP(clif->pLoadEndAck), HP_POP2(HP_clif_pLoadEndAck), 1256 },
+{ HP_POP(clif->pTickSend), HP_POP2(HP_clif_pTickSend), 1258 },
+{ HP_POP(clif->pHotkey), HP_POP2(HP_clif_pHotkey), 1260 },
+{ HP_POP(clif->pProgressbar), HP_POP2(HP_clif_pProgressbar), 1262 },
+{ HP_POP(clif->pWalkToXY), HP_POP2(HP_clif_pWalkToXY), 1264 },
+{ HP_POP(clif->pQuitGame), HP_POP2(HP_clif_pQuitGame), 1266 },
+{ HP_POP(clif->pGetCharNameRequest), HP_POP2(HP_clif_pGetCharNameRequest), 1268 },
+{ HP_POP(clif->pGlobalMessage), HP_POP2(HP_clif_pGlobalMessage), 1270 },
+{ HP_POP(clif->pMapMove), HP_POP2(HP_clif_pMapMove), 1272 },
+{ HP_POP(clif->pChangeDir), HP_POP2(HP_clif_pChangeDir), 1274 },
+{ HP_POP(clif->pEmotion), HP_POP2(HP_clif_pEmotion), 1276 },
+{ HP_POP(clif->pHowManyConnections), HP_POP2(HP_clif_pHowManyConnections), 1278 },
+{ HP_POP(clif->pActionRequest), HP_POP2(HP_clif_pActionRequest), 1280 },
+{ HP_POP(clif->pActionRequest_sub), HP_POP2(HP_clif_pActionRequest_sub), 1282 },
+{ HP_POP(clif->pRestart), HP_POP2(HP_clif_pRestart), 1284 },
+{ HP_POP(clif->pWisMessage), HP_POP2(HP_clif_pWisMessage), 1286 },
+{ HP_POP(clif->pBroadcast), HP_POP2(HP_clif_pBroadcast), 1288 },
+{ HP_POP(clif->pTakeItem), HP_POP2(HP_clif_pTakeItem), 1290 },
+{ HP_POP(clif->pDropItem), HP_POP2(HP_clif_pDropItem), 1292 },
+{ HP_POP(clif->pUseItem), HP_POP2(HP_clif_pUseItem), 1294 },
+{ HP_POP(clif->pEquipItem), HP_POP2(HP_clif_pEquipItem), 1296 },
+{ HP_POP(clif->pUnequipItem), HP_POP2(HP_clif_pUnequipItem), 1298 },
+{ HP_POP(clif->pNpcClicked), HP_POP2(HP_clif_pNpcClicked), 1300 },
+{ HP_POP(clif->pNpcBuySellSelected), HP_POP2(HP_clif_pNpcBuySellSelected), 1302 },
+{ HP_POP(clif->pNpcBuyListSend), HP_POP2(HP_clif_pNpcBuyListSend), 1304 },
+{ HP_POP(clif->pNpcSellListSend), HP_POP2(HP_clif_pNpcSellListSend), 1306 },
+{ HP_POP(clif->pCreateChatRoom), HP_POP2(HP_clif_pCreateChatRoom), 1308 },
+{ HP_POP(clif->pChatAddMember), HP_POP2(HP_clif_pChatAddMember), 1310 },
+{ HP_POP(clif->pChatRoomStatusChange), HP_POP2(HP_clif_pChatRoomStatusChange), 1312 },
+{ HP_POP(clif->pChangeChatOwner), HP_POP2(HP_clif_pChangeChatOwner), 1314 },
+{ HP_POP(clif->pKickFromChat), HP_POP2(HP_clif_pKickFromChat), 1316 },
+{ HP_POP(clif->pChatLeave), HP_POP2(HP_clif_pChatLeave), 1318 },
+{ HP_POP(clif->pTradeRequest), HP_POP2(HP_clif_pTradeRequest), 1320 },
+{ HP_POP(clif->chann_config_read), HP_POP2(HP_clif_chann_config_read), 1322 },
+{ HP_POP(clif->pTradeAck), HP_POP2(HP_clif_pTradeAck), 1324 },
+{ HP_POP(clif->pTradeAddItem), HP_POP2(HP_clif_pTradeAddItem), 1326 },
+{ HP_POP(clif->pTradeOk), HP_POP2(HP_clif_pTradeOk), 1328 },
+{ HP_POP(clif->pTradeCancel), HP_POP2(HP_clif_pTradeCancel), 1330 },
+{ HP_POP(clif->pTradeCommit), HP_POP2(HP_clif_pTradeCommit), 1332 },
+{ HP_POP(clif->pStopAttack), HP_POP2(HP_clif_pStopAttack), 1334 },
+{ HP_POP(clif->pPutItemToCart), HP_POP2(HP_clif_pPutItemToCart), 1336 },
+{ HP_POP(clif->pGetItemFromCart), HP_POP2(HP_clif_pGetItemFromCart), 1338 },
+{ HP_POP(clif->pRemoveOption), HP_POP2(HP_clif_pRemoveOption), 1340 },
+{ HP_POP(clif->pChangeCart), HP_POP2(HP_clif_pChangeCart), 1342 },
+{ HP_POP(clif->pStatusUp), HP_POP2(HP_clif_pStatusUp), 1344 },
+{ HP_POP(clif->pSkillUp), HP_POP2(HP_clif_pSkillUp), 1346 },
+{ HP_POP(clif->pUseSkillToId), HP_POP2(HP_clif_pUseSkillToId), 1348 },
+{ HP_POP(clif->pUseSkillToId_homun), HP_POP2(HP_clif_pUseSkillToId_homun), 1350 },
+{ HP_POP(clif->pUseSkillToId_mercenary), HP_POP2(HP_clif_pUseSkillToId_mercenary), 1352 },
+{ HP_POP(clif->pUseSkillToPos), HP_POP2(HP_clif_pUseSkillToPos), 1354 },
+{ HP_POP(clif->pUseSkillToPosSub), HP_POP2(HP_clif_pUseSkillToPosSub), 1356 },
+{ HP_POP(clif->pUseSkillToPos_homun), HP_POP2(HP_clif_pUseSkillToPos_homun), 1358 },
+{ HP_POP(clif->pUseSkillToPos_mercenary), HP_POP2(HP_clif_pUseSkillToPos_mercenary), 1360 },
+{ HP_POP(clif->pUseSkillToPosMoreInfo), HP_POP2(HP_clif_pUseSkillToPosMoreInfo), 1362 },
+{ HP_POP(clif->pUseSkillMap), HP_POP2(HP_clif_pUseSkillMap), 1364 },
+{ HP_POP(clif->pRequestMemo), HP_POP2(HP_clif_pRequestMemo), 1366 },
+{ HP_POP(clif->pProduceMix), HP_POP2(HP_clif_pProduceMix), 1368 },
+{ HP_POP(clif->pCooking), HP_POP2(HP_clif_pCooking), 1370 },
+{ HP_POP(clif->pRepairItem), HP_POP2(HP_clif_pRepairItem), 1372 },
+{ HP_POP(clif->pWeaponRefine), HP_POP2(HP_clif_pWeaponRefine), 1374 },
+{ HP_POP(clif->pNpcSelectMenu), HP_POP2(HP_clif_pNpcSelectMenu), 1376 },
+{ HP_POP(clif->pNpcNextClicked), HP_POP2(HP_clif_pNpcNextClicked), 1378 },
+{ HP_POP(clif->pNpcAmountInput), HP_POP2(HP_clif_pNpcAmountInput), 1380 },
+{ HP_POP(clif->pNpcStringInput), HP_POP2(HP_clif_pNpcStringInput), 1382 },
+{ HP_POP(clif->pNpcCloseClicked), HP_POP2(HP_clif_pNpcCloseClicked), 1384 },
+{ HP_POP(clif->pItemIdentify), HP_POP2(HP_clif_pItemIdentify), 1386 },
+{ HP_POP(clif->pSelectArrow), HP_POP2(HP_clif_pSelectArrow), 1388 },
+{ HP_POP(clif->pAutoSpell), HP_POP2(HP_clif_pAutoSpell), 1390 },
+{ HP_POP(clif->pUseCard), HP_POP2(HP_clif_pUseCard), 1392 },
+{ HP_POP(clif->pInsertCard), HP_POP2(HP_clif_pInsertCard), 1394 },
+{ HP_POP(clif->pSolveCharName), HP_POP2(HP_clif_pSolveCharName), 1396 },
+{ HP_POP(clif->pResetChar), HP_POP2(HP_clif_pResetChar), 1398 },
+{ HP_POP(clif->pLocalBroadcast), HP_POP2(HP_clif_pLocalBroadcast), 1400 },
+{ HP_POP(clif->pMoveToKafra), HP_POP2(HP_clif_pMoveToKafra), 1402 },
+{ HP_POP(clif->pMoveFromKafra), HP_POP2(HP_clif_pMoveFromKafra), 1404 },
+{ HP_POP(clif->pMoveToKafraFromCart), HP_POP2(HP_clif_pMoveToKafraFromCart), 1406 },
+{ HP_POP(clif->pMoveFromKafraToCart), HP_POP2(HP_clif_pMoveFromKafraToCart), 1408 },
+{ HP_POP(clif->pCloseKafra), HP_POP2(HP_clif_pCloseKafra), 1410 },
+{ HP_POP(clif->pStoragePassword), HP_POP2(HP_clif_pStoragePassword), 1412 },
+{ HP_POP(clif->pCreateParty), HP_POP2(HP_clif_pCreateParty), 1414 },
+{ HP_POP(clif->pCreateParty2), HP_POP2(HP_clif_pCreateParty2), 1416 },
+{ HP_POP(clif->pPartyInvite), HP_POP2(HP_clif_pPartyInvite), 1418 },
+{ HP_POP(clif->pPartyInvite2), HP_POP2(HP_clif_pPartyInvite2), 1420 },
+{ HP_POP(clif->pReplyPartyInvite), HP_POP2(HP_clif_pReplyPartyInvite), 1422 },
+{ HP_POP(clif->pReplyPartyInvite2), HP_POP2(HP_clif_pReplyPartyInvite2), 1424 },
+{ HP_POP(clif->pLeaveParty), HP_POP2(HP_clif_pLeaveParty), 1426 },
+{ HP_POP(clif->pRemovePartyMember), HP_POP2(HP_clif_pRemovePartyMember), 1428 },
+{ HP_POP(clif->pPartyChangeOption), HP_POP2(HP_clif_pPartyChangeOption), 1430 },
+{ HP_POP(clif->pPartyMessage), HP_POP2(HP_clif_pPartyMessage), 1432 },
+{ HP_POP(clif->pPartyChangeLeader), HP_POP2(HP_clif_pPartyChangeLeader), 1434 },
+{ HP_POP(clif->pPartyBookingRegisterReq), HP_POP2(HP_clif_pPartyBookingRegisterReq), 1436 },
+{ HP_POP(clif->pPartyBookingSearchReq), HP_POP2(HP_clif_pPartyBookingSearchReq), 1438 },
+{ HP_POP(clif->pPartyBookingDeleteReq), HP_POP2(HP_clif_pPartyBookingDeleteReq), 1440 },
+{ HP_POP(clif->pPartyBookingUpdateReq), HP_POP2(HP_clif_pPartyBookingUpdateReq), 1442 },
+{ HP_POP(clif->pCloseVending), HP_POP2(HP_clif_pCloseVending), 1444 },
+{ HP_POP(clif->pVendingListReq), HP_POP2(HP_clif_pVendingListReq), 1446 },
+{ HP_POP(clif->pPurchaseReq), HP_POP2(HP_clif_pPurchaseReq), 1448 },
+{ HP_POP(clif->pPurchaseReq2), HP_POP2(HP_clif_pPurchaseReq2), 1450 },
+{ HP_POP(clif->pOpenVending), HP_POP2(HP_clif_pOpenVending), 1452 },
+{ HP_POP(clif->pCreateGuild), HP_POP2(HP_clif_pCreateGuild), 1454 },
+{ HP_POP(clif->pGuildCheckMaster), HP_POP2(HP_clif_pGuildCheckMaster), 1456 },
+{ HP_POP(clif->pGuildRequestInfo), HP_POP2(HP_clif_pGuildRequestInfo), 1458 },
+{ HP_POP(clif->pGuildChangePositionInfo), HP_POP2(HP_clif_pGuildChangePositionInfo), 1460 },
+{ HP_POP(clif->pGuildChangeMemberPosition), HP_POP2(HP_clif_pGuildChangeMemberPosition), 1462 },
+{ HP_POP(clif->pGuildRequestEmblem), HP_POP2(HP_clif_pGuildRequestEmblem), 1464 },
+{ HP_POP(clif->pGuildChangeEmblem), HP_POP2(HP_clif_pGuildChangeEmblem), 1466 },
+{ HP_POP(clif->pGuildChangeNotice), HP_POP2(HP_clif_pGuildChangeNotice), 1468 },
+{ HP_POP(clif->pGuildInvite), HP_POP2(HP_clif_pGuildInvite), 1470 },
+{ HP_POP(clif->pGuildReplyInvite), HP_POP2(HP_clif_pGuildReplyInvite), 1472 },
+{ HP_POP(clif->pGuildLeave), HP_POP2(HP_clif_pGuildLeave), 1474 },
+{ HP_POP(clif->pGuildExpulsion), HP_POP2(HP_clif_pGuildExpulsion), 1476 },
+{ HP_POP(clif->pGuildMessage), HP_POP2(HP_clif_pGuildMessage), 1478 },
+{ HP_POP(clif->pGuildRequestAlliance), HP_POP2(HP_clif_pGuildRequestAlliance), 1480 },
+{ HP_POP(clif->pGuildReplyAlliance), HP_POP2(HP_clif_pGuildReplyAlliance), 1482 },
+{ HP_POP(clif->pGuildDelAlliance), HP_POP2(HP_clif_pGuildDelAlliance), 1484 },
+{ HP_POP(clif->pGuildOpposition), HP_POP2(HP_clif_pGuildOpposition), 1486 },
+{ HP_POP(clif->pGuildBreak), HP_POP2(HP_clif_pGuildBreak), 1488 },
+{ HP_POP(clif->pPetMenu), HP_POP2(HP_clif_pPetMenu), 1490 },
+{ HP_POP(clif->pCatchPet), HP_POP2(HP_clif_pCatchPet), 1492 },
+{ HP_POP(clif->pSelectEgg), HP_POP2(HP_clif_pSelectEgg), 1494 },
+{ HP_POP(clif->pSendEmotion), HP_POP2(HP_clif_pSendEmotion), 1496 },
+{ HP_POP(clif->pChangePetName), HP_POP2(HP_clif_pChangePetName), 1498 },
+{ HP_POP(clif->pGMKick), HP_POP2(HP_clif_pGMKick), 1500 },
+{ HP_POP(clif->pGMKickAll), HP_POP2(HP_clif_pGMKickAll), 1502 },
+{ HP_POP(clif->pGMShift), HP_POP2(HP_clif_pGMShift), 1504 },
+{ HP_POP(clif->pGMRemove2), HP_POP2(HP_clif_pGMRemove2), 1506 },
+{ HP_POP(clif->pGMRecall), HP_POP2(HP_clif_pGMRecall), 1508 },
+{ HP_POP(clif->pGMRecall2), HP_POP2(HP_clif_pGMRecall2), 1510 },
+{ HP_POP(clif->pGM_Monster_Item), HP_POP2(HP_clif_pGM_Monster_Item), 1512 },
+{ HP_POP(clif->pGMHide), HP_POP2(HP_clif_pGMHide), 1514 },
+{ HP_POP(clif->pGMReqNoChat), HP_POP2(HP_clif_pGMReqNoChat), 1516 },
+{ HP_POP(clif->pGMRc), HP_POP2(HP_clif_pGMRc), 1518 },
+{ HP_POP(clif->pGMReqAccountName), HP_POP2(HP_clif_pGMReqAccountName), 1520 },
+{ HP_POP(clif->pGMChangeMapType), HP_POP2(HP_clif_pGMChangeMapType), 1522 },
+{ HP_POP(clif->pPMIgnore), HP_POP2(HP_clif_pPMIgnore), 1524 },
+{ HP_POP(clif->pPMIgnoreAll), HP_POP2(HP_clif_pPMIgnoreAll), 1526 },
+{ HP_POP(clif->pPMIgnoreList), HP_POP2(HP_clif_pPMIgnoreList), 1528 },
+{ HP_POP(clif->pNoviceDoriDori), HP_POP2(HP_clif_pNoviceDoriDori), 1530 },
+{ HP_POP(clif->pNoviceExplosionSpirits), HP_POP2(HP_clif_pNoviceExplosionSpirits), 1532 },
+{ HP_POP(clif->pFriendsListAdd), HP_POP2(HP_clif_pFriendsListAdd), 1534 },
+{ HP_POP(clif->pFriendsListReply), HP_POP2(HP_clif_pFriendsListReply), 1536 },
+{ HP_POP(clif->pFriendsListRemove), HP_POP2(HP_clif_pFriendsListRemove), 1538 },
+{ HP_POP(clif->pPVPInfo), HP_POP2(HP_clif_pPVPInfo), 1540 },
+{ HP_POP(clif->pBlacksmith), HP_POP2(HP_clif_pBlacksmith), 1542 },
+{ HP_POP(clif->pAlchemist), HP_POP2(HP_clif_pAlchemist), 1544 },
+{ HP_POP(clif->pTaekwon), HP_POP2(HP_clif_pTaekwon), 1546 },
+{ HP_POP(clif->pRankingPk), HP_POP2(HP_clif_pRankingPk), 1548 },
+{ HP_POP(clif->pFeelSaveOk), HP_POP2(HP_clif_pFeelSaveOk), 1550 },
+{ HP_POP(clif->pChangeHomunculusName), HP_POP2(HP_clif_pChangeHomunculusName), 1552 },
+{ HP_POP(clif->pHomMoveToMaster), HP_POP2(HP_clif_pHomMoveToMaster), 1554 },
+{ HP_POP(clif->pHomMoveTo), HP_POP2(HP_clif_pHomMoveTo), 1556 },
+{ HP_POP(clif->pHomAttack), HP_POP2(HP_clif_pHomAttack), 1558 },
+{ HP_POP(clif->pHomMenu), HP_POP2(HP_clif_pHomMenu), 1560 },
+{ HP_POP(clif->pAutoRevive), HP_POP2(HP_clif_pAutoRevive), 1562 },
+{ HP_POP(clif->pCheck), HP_POP2(HP_clif_pCheck), 1564 },
+{ HP_POP(clif->pMail_refreshinbox), HP_POP2(HP_clif_pMail_refreshinbox), 1566 },
+{ HP_POP(clif->pMail_read), HP_POP2(HP_clif_pMail_read), 1568 },
+{ HP_POP(clif->pMail_getattach), HP_POP2(HP_clif_pMail_getattach), 1570 },
+{ HP_POP(clif->pMail_delete), HP_POP2(HP_clif_pMail_delete), 1572 },
+{ HP_POP(clif->pMail_return), HP_POP2(HP_clif_pMail_return), 1574 },
+{ HP_POP(clif->pMail_setattach), HP_POP2(HP_clif_pMail_setattach), 1576 },
+{ HP_POP(clif->pMail_winopen), HP_POP2(HP_clif_pMail_winopen), 1578 },
+{ HP_POP(clif->pMail_send), HP_POP2(HP_clif_pMail_send), 1580 },
+{ HP_POP(clif->pAuction_cancelreg), HP_POP2(HP_clif_pAuction_cancelreg), 1582 },
+{ HP_POP(clif->pAuction_setitem), HP_POP2(HP_clif_pAuction_setitem), 1584 },
+{ HP_POP(clif->pAuction_register), HP_POP2(HP_clif_pAuction_register), 1586 },
+{ HP_POP(clif->pAuction_cancel), HP_POP2(HP_clif_pAuction_cancel), 1588 },
+{ HP_POP(clif->pAuction_close), HP_POP2(HP_clif_pAuction_close), 1590 },
+{ HP_POP(clif->pAuction_bid), HP_POP2(HP_clif_pAuction_bid), 1592 },
+{ HP_POP(clif->pAuction_search), HP_POP2(HP_clif_pAuction_search), 1594 },
+{ HP_POP(clif->pAuction_buysell), HP_POP2(HP_clif_pAuction_buysell), 1596 },
+{ HP_POP(clif->pcashshop_buy), HP_POP2(HP_clif_pcashshop_buy), 1598 },
+{ HP_POP(clif->pAdopt_request), HP_POP2(HP_clif_pAdopt_request), 1600 },
+{ HP_POP(clif->pAdopt_reply), HP_POP2(HP_clif_pAdopt_reply), 1602 },
+{ HP_POP(clif->pViewPlayerEquip), HP_POP2(HP_clif_pViewPlayerEquip), 1604 },
+{ HP_POP(clif->pEquipTick), HP_POP2(HP_clif_pEquipTick), 1606 },
+{ HP_POP(clif->pquestStateAck), HP_POP2(HP_clif_pquestStateAck), 1608 },
+{ HP_POP(clif->pmercenary_action), HP_POP2(HP_clif_pmercenary_action), 1610 },
+{ HP_POP(clif->pBattleChat), HP_POP2(HP_clif_pBattleChat), 1612 },
+{ HP_POP(clif->pLessEffect), HP_POP2(HP_clif_pLessEffect), 1614 },
+{ HP_POP(clif->pItemListWindowSelected), HP_POP2(HP_clif_pItemListWindowSelected), 1616 },
+{ HP_POP(clif->pReqOpenBuyingStore), HP_POP2(HP_clif_pReqOpenBuyingStore), 1618 },
+{ HP_POP(clif->pReqCloseBuyingStore), HP_POP2(HP_clif_pReqCloseBuyingStore), 1620 },
+{ HP_POP(clif->pReqClickBuyingStore), HP_POP2(HP_clif_pReqClickBuyingStore), 1622 },
+{ HP_POP(clif->pReqTradeBuyingStore), HP_POP2(HP_clif_pReqTradeBuyingStore), 1624 },
+{ HP_POP(clif->pSearchStoreInfo), HP_POP2(HP_clif_pSearchStoreInfo), 1626 },
+{ HP_POP(clif->pSearchStoreInfoNextPage), HP_POP2(HP_clif_pSearchStoreInfoNextPage), 1628 },
+{ HP_POP(clif->pCloseSearchStoreInfo), HP_POP2(HP_clif_pCloseSearchStoreInfo), 1630 },
+{ HP_POP(clif->pSearchStoreInfoListItemClick), HP_POP2(HP_clif_pSearchStoreInfoListItemClick), 1632 },
+{ HP_POP(clif->pDebug), HP_POP2(HP_clif_pDebug), 1634 },
+{ HP_POP(clif->pSkillSelectMenu), HP_POP2(HP_clif_pSkillSelectMenu), 1636 },
+{ HP_POP(clif->pMoveItem), HP_POP2(HP_clif_pMoveItem), 1638 },
+{ HP_POP(clif->pDull), HP_POP2(HP_clif_pDull), 1640 },
+{ HP_POP(clif->pBGQueueRegister), HP_POP2(HP_clif_pBGQueueRegister), 1642 },
+{ HP_POP(clif->pBGQueueCheckState), HP_POP2(HP_clif_pBGQueueCheckState), 1644 },
+{ HP_POP(clif->pBGQueueRevokeReq), HP_POP2(HP_clif_pBGQueueRevokeReq), 1646 },
+{ HP_POP(clif->pBGQueueBattleBeginAck), HP_POP2(HP_clif_pBGQueueBattleBeginAck), 1648 },
+{ HP_POP(clif->pCashShopOpen), HP_POP2(HP_clif_pCashShopOpen), 1650 },
+{ HP_POP(clif->pCashShopClose), HP_POP2(HP_clif_pCashShopClose), 1652 },
+{ HP_POP(clif->pCashShopReqTab), HP_POP2(HP_clif_pCashShopReqTab), 1654 },
+{ HP_POP(clif->pCashShopSchedule), HP_POP2(HP_clif_pCashShopSchedule), 1656 },
+{ HP_POP(clif->pCashShopBuy), HP_POP2(HP_clif_pCashShopBuy), 1658 },
+{ HP_POP(clif->pPartyTick), HP_POP2(HP_clif_pPartyTick), 1660 },
+{ HP_POP(clif->pGuildInvite2), HP_POP2(HP_clif_pGuildInvite2), 1662 },
+{ HP_POP(clif->pPartyBookingAddFilter), HP_POP2(HP_clif_pPartyBookingAddFilter), 1664 },
+{ HP_POP(clif->pPartyBookingSubFilter), HP_POP2(HP_clif_pPartyBookingSubFilter), 1666 },
+{ HP_POP(clif->pPartyBookingReqVolunteer), HP_POP2(HP_clif_pPartyBookingReqVolunteer), 1668 },
+{ HP_POP(clif->pPartyBookingRefuseVolunteer), HP_POP2(HP_clif_pPartyBookingRefuseVolunteer), 1670 },
+{ HP_POP(clif->pPartyBookingCancelVolunteer), HP_POP2(HP_clif_pPartyBookingCancelVolunteer), 1672 },
 /* duel */
-{ HP_POP(duel->create), HP_POP2(HP_duel_create), 1670 },
-{ HP_POP(duel->invite), HP_POP2(HP_duel_invite), 1672 },
-{ HP_POP(duel->accept), HP_POP2(HP_duel_accept), 1674 },
-{ HP_POP(duel->reject), HP_POP2(HP_duel_reject), 1676 },
-{ HP_POP(duel->leave), HP_POP2(HP_duel_leave), 1678 },
-{ HP_POP(duel->showinfo), HP_POP2(HP_duel_showinfo), 1680 },
-{ HP_POP(duel->checktime), HP_POP2(HP_duel_checktime), 1682 },
-{ HP_POP(duel->init), HP_POP2(HP_duel_init), 1684 },
-{ HP_POP(duel->final), HP_POP2(HP_duel_final), 1686 },
+{ HP_POP(duel->create), HP_POP2(HP_duel_create), 1674 },
+{ HP_POP(duel->invite), HP_POP2(HP_duel_invite), 1676 },
+{ HP_POP(duel->accept), HP_POP2(HP_duel_accept), 1678 },
+{ HP_POP(duel->reject), HP_POP2(HP_duel_reject), 1680 },
+{ HP_POP(duel->leave), HP_POP2(HP_duel_leave), 1682 },
+{ HP_POP(duel->showinfo), HP_POP2(HP_duel_showinfo), 1684 },
+{ HP_POP(duel->checktime), HP_POP2(HP_duel_checktime), 1686 },
+{ HP_POP(duel->init), HP_POP2(HP_duel_init), 1688 },
+{ HP_POP(duel->final), HP_POP2(HP_duel_final), 1690 },
 /* elemental */
-{ HP_POP(elemental->init), HP_POP2(HP_elemental_init), 1688 },
-{ HP_POP(elemental->final), HP_POP2(HP_elemental_final), 1690 },
-{ HP_POP(elemental->class), HP_POP2(HP_elemental_class), 1692 },
-{ HP_POP(elemental->get_viewdata), HP_POP2(HP_elemental_get_viewdata), 1694 },
-{ HP_POP(elemental->create), HP_POP2(HP_elemental_create), 1696 },
-{ HP_POP(elemental->data_received), HP_POP2(HP_elemental_data_received), 1698 },
-{ HP_POP(elemental->save), HP_POP2(HP_elemental_save), 1700 },
-{ HP_POP(elemental->change_mode_ack), HP_POP2(HP_elemental_change_mode_ack), 1702 },
-{ HP_POP(elemental->change_mode), HP_POP2(HP_elemental_change_mode), 1704 },
-{ HP_POP(elemental->heal), HP_POP2(HP_elemental_heal), 1706 },
-{ HP_POP(elemental->dead), HP_POP2(HP_elemental_dead), 1708 },
-{ HP_POP(elemental->delete), HP_POP2(HP_elemental_delete), 1710 },
-{ HP_POP(elemental->summon_stop), HP_POP2(HP_elemental_summon_stop), 1712 },
-{ HP_POP(elemental->get_lifetime), HP_POP2(HP_elemental_get_lifetime), 1714 },
-{ HP_POP(elemental->unlocktarget), HP_POP2(HP_elemental_unlocktarget), 1716 },
-{ HP_POP(elemental->skillnotok), HP_POP2(HP_elemental_skillnotok), 1718 },
-{ HP_POP(elemental->set_target), HP_POP2(HP_elemental_set_target), 1720 },
-{ HP_POP(elemental->clean_single_effect), HP_POP2(HP_elemental_clean_single_effect), 1722 },
-{ HP_POP(elemental->clean_effect), HP_POP2(HP_elemental_clean_effect), 1724 },
-{ HP_POP(elemental->action), HP_POP2(HP_elemental_action), 1726 },
-{ HP_POP(elemental->skill_get_requirements), HP_POP2(HP_elemental_skill_get_requirements), 1728 },
-{ HP_POP(elemental->read_skilldb), HP_POP2(HP_elemental_read_skilldb), 1730 },
-{ HP_POP(elemental->reload_db), HP_POP2(HP_elemental_reload_db), 1732 },
-{ HP_POP(elemental->reload_skilldb), HP_POP2(HP_elemental_reload_skilldb), 1734 },
-{ HP_POP(elemental->search_index), HP_POP2(HP_elemental_search_index), 1736 },
-{ HP_POP(elemental->summon_init), HP_POP2(HP_elemental_summon_init), 1738 },
-{ HP_POP(elemental->summon_end_timer), HP_POP2(HP_elemental_summon_end_timer), 1740 },
-{ HP_POP(elemental->ai_sub_timer_activesearch), HP_POP2(HP_elemental_ai_sub_timer_activesearch), 1742 },
-{ HP_POP(elemental->ai_sub_timer), HP_POP2(HP_elemental_ai_sub_timer), 1744 },
-{ HP_POP(elemental->ai_sub_foreachclient), HP_POP2(HP_elemental_ai_sub_foreachclient), 1746 },
-{ HP_POP(elemental->ai_timer), HP_POP2(HP_elemental_ai_timer), 1748 },
-{ HP_POP(elemental->read_db), HP_POP2(HP_elemental_read_db), 1750 },
+{ HP_POP(elemental->init), HP_POP2(HP_elemental_init), 1692 },
+{ HP_POP(elemental->final), HP_POP2(HP_elemental_final), 1694 },
+{ HP_POP(elemental->class), HP_POP2(HP_elemental_class), 1696 },
+{ HP_POP(elemental->get_viewdata), HP_POP2(HP_elemental_get_viewdata), 1698 },
+{ HP_POP(elemental->create), HP_POP2(HP_elemental_create), 1700 },
+{ HP_POP(elemental->data_received), HP_POP2(HP_elemental_data_received), 1702 },
+{ HP_POP(elemental->save), HP_POP2(HP_elemental_save), 1704 },
+{ HP_POP(elemental->change_mode_ack), HP_POP2(HP_elemental_change_mode_ack), 1706 },
+{ HP_POP(elemental->change_mode), HP_POP2(HP_elemental_change_mode), 1708 },
+{ HP_POP(elemental->heal), HP_POP2(HP_elemental_heal), 1710 },
+{ HP_POP(elemental->dead), HP_POP2(HP_elemental_dead), 1712 },
+{ HP_POP(elemental->delete), HP_POP2(HP_elemental_delete), 1714 },
+{ HP_POP(elemental->summon_stop), HP_POP2(HP_elemental_summon_stop), 1716 },
+{ HP_POP(elemental->get_lifetime), HP_POP2(HP_elemental_get_lifetime), 1718 },
+{ HP_POP(elemental->unlocktarget), HP_POP2(HP_elemental_unlocktarget), 1720 },
+{ HP_POP(elemental->skillnotok), HP_POP2(HP_elemental_skillnotok), 1722 },
+{ HP_POP(elemental->set_target), HP_POP2(HP_elemental_set_target), 1724 },
+{ HP_POP(elemental->clean_single_effect), HP_POP2(HP_elemental_clean_single_effect), 1726 },
+{ HP_POP(elemental->clean_effect), HP_POP2(HP_elemental_clean_effect), 1728 },
+{ HP_POP(elemental->action), HP_POP2(HP_elemental_action), 1730 },
+{ HP_POP(elemental->skill_get_requirements), HP_POP2(HP_elemental_skill_get_requirements), 1732 },
+{ HP_POP(elemental->read_skilldb), HP_POP2(HP_elemental_read_skilldb), 1734 },
+{ HP_POP(elemental->reload_db), HP_POP2(HP_elemental_reload_db), 1736 },
+{ HP_POP(elemental->reload_skilldb), HP_POP2(HP_elemental_reload_skilldb), 1738 },
+{ HP_POP(elemental->search_index), HP_POP2(HP_elemental_search_index), 1740 },
+{ HP_POP(elemental->summon_init), HP_POP2(HP_elemental_summon_init), 1742 },
+{ HP_POP(elemental->summon_end_timer), HP_POP2(HP_elemental_summon_end_timer), 1744 },
+{ HP_POP(elemental->ai_sub_timer_activesearch), HP_POP2(HP_elemental_ai_sub_timer_activesearch), 1746 },
+{ HP_POP(elemental->ai_sub_timer), HP_POP2(HP_elemental_ai_sub_timer), 1748 },
+{ HP_POP(elemental->ai_sub_foreachclient), HP_POP2(HP_elemental_ai_sub_foreachclient), 1750 },
+{ HP_POP(elemental->ai_timer), HP_POP2(HP_elemental_ai_timer), 1752 },
+{ HP_POP(elemental->read_db), HP_POP2(HP_elemental_read_db), 1754 },
 /* guild */
-{ HP_POP(guild->init), HP_POP2(HP_guild_init), 1752 },
-{ HP_POP(guild->final), HP_POP2(HP_guild_final), 1754 },
-{ HP_POP(guild->skill_get_max), HP_POP2(HP_guild_skill_get_max), 1756 },
-{ HP_POP(guild->checkskill), HP_POP2(HP_guild_checkskill), 1758 },
-{ HP_POP(guild->check_skill_require), HP_POP2(HP_guild_check_skill_require), 1760 },
-{ HP_POP(guild->checkcastles), HP_POP2(HP_guild_checkcastles), 1762 },
-{ HP_POP(guild->isallied), HP_POP2(HP_guild_isallied), 1764 },
-{ HP_POP(guild->search), HP_POP2(HP_guild_search), 1766 },
-{ HP_POP(guild->searchname), HP_POP2(HP_guild_searchname), 1768 },
-{ HP_POP(guild->castle_search), HP_POP2(HP_guild_castle_search), 1770 },
-{ HP_POP(guild->mapname2gc), HP_POP2(HP_guild_mapname2gc), 1772 },
-{ HP_POP(guild->mapindex2gc), HP_POP2(HP_guild_mapindex2gc), 1774 },
-{ HP_POP(guild->getavailablesd), HP_POP2(HP_guild_getavailablesd), 1776 },
-{ HP_POP(guild->getindex), HP_POP2(HP_guild_getindex), 1778 },
-{ HP_POP(guild->getposition), HP_POP2(HP_guild_getposition), 1780 },
-{ HP_POP(guild->payexp), HP_POP2(HP_guild_payexp), 1782 },
-{ HP_POP(guild->getexp), HP_POP2(HP_guild_getexp), 1784 },
-{ HP_POP(guild->create), HP_POP2(HP_guild_create), 1786 },
-{ HP_POP(guild->created), HP_POP2(HP_guild_created), 1788 },
-{ HP_POP(guild->request_info), HP_POP2(HP_guild_request_info), 1790 },
-{ HP_POP(guild->recv_noinfo), HP_POP2(HP_guild_recv_noinfo), 1792 },
-{ HP_POP(guild->recv_info), HP_POP2(HP_guild_recv_info), 1794 },
-{ HP_POP(guild->npc_request_info), HP_POP2(HP_guild_npc_request_info), 1796 },
-{ HP_POP(guild->invite), HP_POP2(HP_guild_invite), 1798 },
-{ HP_POP(guild->reply_invite), HP_POP2(HP_guild_reply_invite), 1800 },
-{ HP_POP(guild->member_joined), HP_POP2(HP_guild_member_joined), 1802 },
-{ HP_POP(guild->member_added), HP_POP2(HP_guild_member_added), 1804 },
-{ HP_POP(guild->leave), HP_POP2(HP_guild_leave), 1806 },
-{ HP_POP(guild->member_withdraw), HP_POP2(HP_guild_member_withdraw), 1808 },
-{ HP_POP(guild->expulsion), HP_POP2(HP_guild_expulsion), 1810 },
-{ HP_POP(guild->skillup), HP_POP2(HP_guild_skillup), 1812 },
-{ HP_POP(guild->block_skill), HP_POP2(HP_guild_block_skill), 1814 },
-{ HP_POP(guild->reqalliance), HP_POP2(HP_guild_reqalliance), 1816 },
-{ HP_POP(guild->reply_reqalliance), HP_POP2(HP_guild_reply_reqalliance), 1818 },
-{ HP_POP(guild->allianceack), HP_POP2(HP_guild_allianceack), 1820 },
-{ HP_POP(guild->delalliance), HP_POP2(HP_guild_delalliance), 1822 },
-{ HP_POP(guild->opposition), HP_POP2(HP_guild_opposition), 1824 },
-{ HP_POP(guild->check_alliance), HP_POP2(HP_guild_check_alliance), 1826 },
-{ HP_POP(guild->send_memberinfoshort), HP_POP2(HP_guild_send_memberinfoshort), 1828 },
-{ HP_POP(guild->recv_memberinfoshort), HP_POP2(HP_guild_recv_memberinfoshort), 1830 },
-{ HP_POP(guild->change_memberposition), HP_POP2(HP_guild_change_memberposition), 1832 },
-{ HP_POP(guild->memberposition_changed), HP_POP2(HP_guild_memberposition_changed), 1834 },
-{ HP_POP(guild->change_position), HP_POP2(HP_guild_change_position), 1836 },
-{ HP_POP(guild->position_changed), HP_POP2(HP_guild_position_changed), 1838 },
-{ HP_POP(guild->change_notice), HP_POP2(HP_guild_change_notice), 1840 },
-{ HP_POP(guild->notice_changed), HP_POP2(HP_guild_notice_changed), 1842 },
-{ HP_POP(guild->change_emblem), HP_POP2(HP_guild_change_emblem), 1844 },
-{ HP_POP(guild->emblem_changed), HP_POP2(HP_guild_emblem_changed), 1846 },
-{ HP_POP(guild->send_message), HP_POP2(HP_guild_send_message), 1848 },
-{ HP_POP(guild->recv_message), HP_POP2(HP_guild_recv_message), 1850 },
-{ HP_POP(guild->send_dot_remove), HP_POP2(HP_guild_send_dot_remove), 1852 },
-{ HP_POP(guild->skillupack), HP_POP2(HP_guild_skillupack), 1854 },
-{ HP_POP(guild->dobreak), HP_POP2(HP_guild_dobreak), 1856 },
-{ HP_POP(guild->broken), HP_POP2(HP_guild_broken), 1858 },
-{ HP_POP(guild->gm_change), HP_POP2(HP_guild_gm_change), 1860 },
-{ HP_POP(guild->gm_changed), HP_POP2(HP_guild_gm_changed), 1862 },
-{ HP_POP(guild->castle_map_init), HP_POP2(HP_guild_castle_map_init), 1864 },
-{ HP_POP(guild->castledatasave), HP_POP2(HP_guild_castledatasave), 1866 },
-{ HP_POP(guild->castledataloadack), HP_POP2(HP_guild_castledataloadack), 1868 },
-{ HP_POP(guild->castle_reconnect), HP_POP2(HP_guild_castle_reconnect), 1870 },
-{ HP_POP(guild->agit_start), HP_POP2(HP_guild_agit_start), 1872 },
-{ HP_POP(guild->agit_end), HP_POP2(HP_guild_agit_end), 1874 },
-{ HP_POP(guild->agit2_start), HP_POP2(HP_guild_agit2_start), 1876 },
-{ HP_POP(guild->agit2_end), HP_POP2(HP_guild_agit2_end), 1878 },
-{ HP_POP(guild->flag_add), HP_POP2(HP_guild_flag_add), 1880 },
-{ HP_POP(guild->flag_remove), HP_POP2(HP_guild_flag_remove), 1882 },
-{ HP_POP(guild->flags_clear), HP_POP2(HP_guild_flags_clear), 1884 },
-{ HP_POP(guild->aura_refresh), HP_POP2(HP_guild_aura_refresh), 1886 },
-{ HP_POP(guild->payexp_timer), HP_POP2(HP_guild_payexp_timer), 1888 },
-{ HP_POP(guild->sd_check), HP_POP2(HP_guild_sd_check), 1890 },
-{ HP_POP(guild->read_guildskill_tree_db), HP_POP2(HP_guild_read_guildskill_tree_db), 1892 },
-{ HP_POP(guild->read_castledb), HP_POP2(HP_guild_read_castledb), 1894 },
-{ HP_POP(guild->payexp_timer_sub), HP_POP2(HP_guild_payexp_timer_sub), 1896 },
-{ HP_POP(guild->send_xy_timer_sub), HP_POP2(HP_guild_send_xy_timer_sub), 1898 },
-{ HP_POP(guild->send_xy_timer), HP_POP2(HP_guild_send_xy_timer), 1900 },
-{ HP_POP(guild->create_expcache), HP_POP2(HP_guild_create_expcache), 1902 },
-{ HP_POP(guild->eventlist_db_final), HP_POP2(HP_guild_eventlist_db_final), 1904 },
-{ HP_POP(guild->expcache_db_final), HP_POP2(HP_guild_expcache_db_final), 1906 },
-{ HP_POP(guild->castle_db_final), HP_POP2(HP_guild_castle_db_final), 1908 },
-{ HP_POP(guild->broken_sub), HP_POP2(HP_guild_broken_sub), 1910 },
-{ HP_POP(guild->castle_broken_sub), HP_POP2(HP_guild_castle_broken_sub), 1912 },
-{ HP_POP(guild->makemember), HP_POP2(HP_guild_makemember), 1914 },
-{ HP_POP(guild->check_member), HP_POP2(HP_guild_check_member), 1916 },
-{ HP_POP(guild->get_alliance_count), HP_POP2(HP_guild_get_alliance_count), 1918 },
-{ HP_POP(guild->castle_reconnect_sub), HP_POP2(HP_guild_castle_reconnect_sub), 1920 },
+{ HP_POP(guild->init), HP_POP2(HP_guild_init), 1756 },
+{ HP_POP(guild->final), HP_POP2(HP_guild_final), 1758 },
+{ HP_POP(guild->skill_get_max), HP_POP2(HP_guild_skill_get_max), 1760 },
+{ HP_POP(guild->checkskill), HP_POP2(HP_guild_checkskill), 1762 },
+{ HP_POP(guild->check_skill_require), HP_POP2(HP_guild_check_skill_require), 1764 },
+{ HP_POP(guild->checkcastles), HP_POP2(HP_guild_checkcastles), 1766 },
+{ HP_POP(guild->isallied), HP_POP2(HP_guild_isallied), 1768 },
+{ HP_POP(guild->search), HP_POP2(HP_guild_search), 1770 },
+{ HP_POP(guild->searchname), HP_POP2(HP_guild_searchname), 1772 },
+{ HP_POP(guild->castle_search), HP_POP2(HP_guild_castle_search), 1774 },
+{ HP_POP(guild->mapname2gc), HP_POP2(HP_guild_mapname2gc), 1776 },
+{ HP_POP(guild->mapindex2gc), HP_POP2(HP_guild_mapindex2gc), 1778 },
+{ HP_POP(guild->getavailablesd), HP_POP2(HP_guild_getavailablesd), 1780 },
+{ HP_POP(guild->getindex), HP_POP2(HP_guild_getindex), 1782 },
+{ HP_POP(guild->getposition), HP_POP2(HP_guild_getposition), 1784 },
+{ HP_POP(guild->payexp), HP_POP2(HP_guild_payexp), 1786 },
+{ HP_POP(guild->getexp), HP_POP2(HP_guild_getexp), 1788 },
+{ HP_POP(guild->create), HP_POP2(HP_guild_create), 1790 },
+{ HP_POP(guild->created), HP_POP2(HP_guild_created), 1792 },
+{ HP_POP(guild->request_info), HP_POP2(HP_guild_request_info), 1794 },
+{ HP_POP(guild->recv_noinfo), HP_POP2(HP_guild_recv_noinfo), 1796 },
+{ HP_POP(guild->recv_info), HP_POP2(HP_guild_recv_info), 1798 },
+{ HP_POP(guild->npc_request_info), HP_POP2(HP_guild_npc_request_info), 1800 },
+{ HP_POP(guild->invite), HP_POP2(HP_guild_invite), 1802 },
+{ HP_POP(guild->reply_invite), HP_POP2(HP_guild_reply_invite), 1804 },
+{ HP_POP(guild->member_joined), HP_POP2(HP_guild_member_joined), 1806 },
+{ HP_POP(guild->member_added), HP_POP2(HP_guild_member_added), 1808 },
+{ HP_POP(guild->leave), HP_POP2(HP_guild_leave), 1810 },
+{ HP_POP(guild->member_withdraw), HP_POP2(HP_guild_member_withdraw), 1812 },
+{ HP_POP(guild->expulsion), HP_POP2(HP_guild_expulsion), 1814 },
+{ HP_POP(guild->skillup), HP_POP2(HP_guild_skillup), 1816 },
+{ HP_POP(guild->block_skill), HP_POP2(HP_guild_block_skill), 1818 },
+{ HP_POP(guild->reqalliance), HP_POP2(HP_guild_reqalliance), 1820 },
+{ HP_POP(guild->reply_reqalliance), HP_POP2(HP_guild_reply_reqalliance), 1822 },
+{ HP_POP(guild->allianceack), HP_POP2(HP_guild_allianceack), 1824 },
+{ HP_POP(guild->delalliance), HP_POP2(HP_guild_delalliance), 1826 },
+{ HP_POP(guild->opposition), HP_POP2(HP_guild_opposition), 1828 },
+{ HP_POP(guild->check_alliance), HP_POP2(HP_guild_check_alliance), 1830 },
+{ HP_POP(guild->send_memberinfoshort), HP_POP2(HP_guild_send_memberinfoshort), 1832 },
+{ HP_POP(guild->recv_memberinfoshort), HP_POP2(HP_guild_recv_memberinfoshort), 1834 },
+{ HP_POP(guild->change_memberposition), HP_POP2(HP_guild_change_memberposition), 1836 },
+{ HP_POP(guild->memberposition_changed), HP_POP2(HP_guild_memberposition_changed), 1838 },
+{ HP_POP(guild->change_position), HP_POP2(HP_guild_change_position), 1840 },
+{ HP_POP(guild->position_changed), HP_POP2(HP_guild_position_changed), 1842 },
+{ HP_POP(guild->change_notice), HP_POP2(HP_guild_change_notice), 1844 },
+{ HP_POP(guild->notice_changed), HP_POP2(HP_guild_notice_changed), 1846 },
+{ HP_POP(guild->change_emblem), HP_POP2(HP_guild_change_emblem), 1848 },
+{ HP_POP(guild->emblem_changed), HP_POP2(HP_guild_emblem_changed), 1850 },
+{ HP_POP(guild->send_message), HP_POP2(HP_guild_send_message), 1852 },
+{ HP_POP(guild->recv_message), HP_POP2(HP_guild_recv_message), 1854 },
+{ HP_POP(guild->send_dot_remove), HP_POP2(HP_guild_send_dot_remove), 1856 },
+{ HP_POP(guild->skillupack), HP_POP2(HP_guild_skillupack), 1858 },
+{ HP_POP(guild->dobreak), HP_POP2(HP_guild_dobreak), 1860 },
+{ HP_POP(guild->broken), HP_POP2(HP_guild_broken), 1862 },
+{ HP_POP(guild->gm_change), HP_POP2(HP_guild_gm_change), 1864 },
+{ HP_POP(guild->gm_changed), HP_POP2(HP_guild_gm_changed), 1866 },
+{ HP_POP(guild->castle_map_init), HP_POP2(HP_guild_castle_map_init), 1868 },
+{ HP_POP(guild->castledatasave), HP_POP2(HP_guild_castledatasave), 1870 },
+{ HP_POP(guild->castledataloadack), HP_POP2(HP_guild_castledataloadack), 1872 },
+{ HP_POP(guild->castle_reconnect), HP_POP2(HP_guild_castle_reconnect), 1874 },
+{ HP_POP(guild->agit_start), HP_POP2(HP_guild_agit_start), 1876 },
+{ HP_POP(guild->agit_end), HP_POP2(HP_guild_agit_end), 1878 },
+{ HP_POP(guild->agit2_start), HP_POP2(HP_guild_agit2_start), 1880 },
+{ HP_POP(guild->agit2_end), HP_POP2(HP_guild_agit2_end), 1882 },
+{ HP_POP(guild->flag_add), HP_POP2(HP_guild_flag_add), 1884 },
+{ HP_POP(guild->flag_remove), HP_POP2(HP_guild_flag_remove), 1886 },
+{ HP_POP(guild->flags_clear), HP_POP2(HP_guild_flags_clear), 1888 },
+{ HP_POP(guild->aura_refresh), HP_POP2(HP_guild_aura_refresh), 1890 },
+{ HP_POP(guild->payexp_timer), HP_POP2(HP_guild_payexp_timer), 1892 },
+{ HP_POP(guild->sd_check), HP_POP2(HP_guild_sd_check), 1894 },
+{ HP_POP(guild->read_guildskill_tree_db), HP_POP2(HP_guild_read_guildskill_tree_db), 1896 },
+{ HP_POP(guild->read_castledb), HP_POP2(HP_guild_read_castledb), 1898 },
+{ HP_POP(guild->payexp_timer_sub), HP_POP2(HP_guild_payexp_timer_sub), 1900 },
+{ HP_POP(guild->send_xy_timer_sub), HP_POP2(HP_guild_send_xy_timer_sub), 1902 },
+{ HP_POP(guild->send_xy_timer), HP_POP2(HP_guild_send_xy_timer), 1904 },
+{ HP_POP(guild->create_expcache), HP_POP2(HP_guild_create_expcache), 1906 },
+{ HP_POP(guild->eventlist_db_final), HP_POP2(HP_guild_eventlist_db_final), 1908 },
+{ HP_POP(guild->expcache_db_final), HP_POP2(HP_guild_expcache_db_final), 1910 },
+{ HP_POP(guild->castle_db_final), HP_POP2(HP_guild_castle_db_final), 1912 },
+{ HP_POP(guild->broken_sub), HP_POP2(HP_guild_broken_sub), 1914 },
+{ HP_POP(guild->castle_broken_sub), HP_POP2(HP_guild_castle_broken_sub), 1916 },
+{ HP_POP(guild->makemember), HP_POP2(HP_guild_makemember), 1918 },
+{ HP_POP(guild->check_member), HP_POP2(HP_guild_check_member), 1920 },
+{ HP_POP(guild->get_alliance_count), HP_POP2(HP_guild_get_alliance_count), 1922 },
+{ HP_POP(guild->castle_reconnect_sub), HP_POP2(HP_guild_castle_reconnect_sub), 1924 },
 /* gstorage */
-{ HP_POP(gstorage->id2storage), HP_POP2(HP_gstorage_id2storage), 1922 },
-{ HP_POP(gstorage->id2storage2), HP_POP2(HP_gstorage_id2storage2), 1924 },
-{ HP_POP(gstorage->init), HP_POP2(HP_gstorage_init), 1926 },
-{ HP_POP(gstorage->final), HP_POP2(HP_gstorage_final), 1928 },
-{ HP_POP(gstorage->delete), HP_POP2(HP_gstorage_delete), 1930 },
-{ HP_POP(gstorage->open), HP_POP2(HP_gstorage_open), 1932 },
-{ HP_POP(gstorage->additem), HP_POP2(HP_gstorage_additem), 1934 },
-{ HP_POP(gstorage->delitem), HP_POP2(HP_gstorage_delitem), 1936 },
-{ HP_POP(gstorage->add), HP_POP2(HP_gstorage_add), 1938 },
-{ HP_POP(gstorage->get), HP_POP2(HP_gstorage_get), 1940 },
-{ HP_POP(gstorage->addfromcart), HP_POP2(HP_gstorage_addfromcart), 1942 },
-{ HP_POP(gstorage->gettocart), HP_POP2(HP_gstorage_gettocart), 1944 },
-{ HP_POP(gstorage->close), HP_POP2(HP_gstorage_close), 1946 },
-{ HP_POP(gstorage->pc_quit), HP_POP2(HP_gstorage_pc_quit), 1948 },
-{ HP_POP(gstorage->save), HP_POP2(HP_gstorage_save), 1950 },
-{ HP_POP(gstorage->saved), HP_POP2(HP_gstorage_saved), 1952 },
-{ HP_POP(gstorage->create), HP_POP2(HP_gstorage_create), 1954 },
+{ HP_POP(gstorage->id2storage), HP_POP2(HP_gstorage_id2storage), 1926 },
+{ HP_POP(gstorage->id2storage2), HP_POP2(HP_gstorage_id2storage2), 1928 },
+{ HP_POP(gstorage->init), HP_POP2(HP_gstorage_init), 1930 },
+{ HP_POP(gstorage->final), HP_POP2(HP_gstorage_final), 1932 },
+{ HP_POP(gstorage->delete), HP_POP2(HP_gstorage_delete), 1934 },
+{ HP_POP(gstorage->open), HP_POP2(HP_gstorage_open), 1936 },
+{ HP_POP(gstorage->additem), HP_POP2(HP_gstorage_additem), 1938 },
+{ HP_POP(gstorage->delitem), HP_POP2(HP_gstorage_delitem), 1940 },
+{ HP_POP(gstorage->add), HP_POP2(HP_gstorage_add), 1942 },
+{ HP_POP(gstorage->get), HP_POP2(HP_gstorage_get), 1944 },
+{ HP_POP(gstorage->addfromcart), HP_POP2(HP_gstorage_addfromcart), 1946 },
+{ HP_POP(gstorage->gettocart), HP_POP2(HP_gstorage_gettocart), 1948 },
+{ HP_POP(gstorage->close), HP_POP2(HP_gstorage_close), 1950 },
+{ HP_POP(gstorage->pc_quit), HP_POP2(HP_gstorage_pc_quit), 1952 },
+{ HP_POP(gstorage->save), HP_POP2(HP_gstorage_save), 1954 },
+{ HP_POP(gstorage->saved), HP_POP2(HP_gstorage_saved), 1956 },
+{ HP_POP(gstorage->create), HP_POP2(HP_gstorage_create), 1958 },
 /* homun */
-{ HP_POP(homun->init), HP_POP2(HP_homun_init), 1956 },
-{ HP_POP(homun->final), HP_POP2(HP_homun_final), 1958 },
-{ HP_POP(homun->reload), HP_POP2(HP_homun_reload), 1960 },
-{ HP_POP(homun->reload_skill), HP_POP2(HP_homun_reload_skill), 1962 },
-{ HP_POP(homun->get_viewdata), HP_POP2(HP_homun_get_viewdata), 1964 },
-{ HP_POP(homun->class2type), HP_POP2(HP_homun_class2type), 1966 },
-{ HP_POP(homun->damaged), HP_POP2(HP_homun_damaged), 1968 },
-{ HP_POP(homun->dead), HP_POP2(HP_homun_dead), 1970 },
-{ HP_POP(homun->vaporize), HP_POP2(HP_homun_vaporize), 1972 },
-{ HP_POP(homun->delete), HP_POP2(HP_homun_delete), 1974 },
-{ HP_POP(homun->checkskill), HP_POP2(HP_homun_checkskill), 1976 },
-{ HP_POP(homun->calc_skilltree), HP_POP2(HP_homun_calc_skilltree), 1978 },
-{ HP_POP(homun->skill_tree_get_max), HP_POP2(HP_homun_skill_tree_get_max), 1980 },
-{ HP_POP(homun->skillup), HP_POP2(HP_homun_skillup), 1982 },
-{ HP_POP(homun->levelup), HP_POP2(HP_homun_levelup), 1984 },
-{ HP_POP(homun->change_class), HP_POP2(HP_homun_change_class), 1986 },
-{ HP_POP(homun->evolve), HP_POP2(HP_homun_evolve), 1988 },
-{ HP_POP(homun->mutate), HP_POP2(HP_homun_mutate), 1990 },
-{ HP_POP(homun->gainexp), HP_POP2(HP_homun_gainexp), 1992 },
-{ HP_POP(homun->add_intimacy), HP_POP2(HP_homun_add_intimacy), 1994 },
-{ HP_POP(homun->consume_intimacy), HP_POP2(HP_homun_consume_intimacy), 1996 },
-{ HP_POP(homun->healed), HP_POP2(HP_homun_healed), 1998 },
-{ HP_POP(homun->save), HP_POP2(HP_homun_save), 2000 },
-{ HP_POP(homun->menu), HP_POP2(HP_homun_menu), 2002 },
-{ HP_POP(homun->feed), HP_POP2(HP_homun_feed), 2004 },
-{ HP_POP(homun->hunger_timer), HP_POP2(HP_homun_hunger_timer), 2006 },
-{ HP_POP(homun->hunger_timer_delete), HP_POP2(HP_homun_hunger_timer_delete), 2008 },
-{ HP_POP(homun->change_name), HP_POP2(HP_homun_change_name), 2010 },
-{ HP_POP(homun->change_name_ack), HP_POP2(HP_homun_change_name_ack), 2012 },
-{ HP_POP(homun->db_search), HP_POP2(HP_homun_db_search), 2014 },
-{ HP_POP(homun->create), HP_POP2(HP_homun_create), 2016 },
-{ HP_POP(homun->init_timers), HP_POP2(HP_homun_init_timers), 2018 },
-{ HP_POP(homun->call), HP_POP2(HP_homun_call), 2020 },
-{ HP_POP(homun->recv_data), HP_POP2(HP_homun_recv_data), 2022 },
-{ HP_POP(homun->creation_request), HP_POP2(HP_homun_creation_request), 2024 },
-{ HP_POP(homun->ressurect), HP_POP2(HP_homun_ressurect), 2026 },
-{ HP_POP(homun->revive), HP_POP2(HP_homun_revive), 2028 },
-{ HP_POP(homun->stat_reset), HP_POP2(HP_homun_stat_reset), 2030 },
-{ HP_POP(homun->shuffle), HP_POP2(HP_homun_shuffle), 2032 },
-{ HP_POP(homun->read_db_sub), HP_POP2(HP_homun_read_db_sub), 2034 },
-{ HP_POP(homun->read_db), HP_POP2(HP_homun_read_db), 2036 },
-{ HP_POP(homun->read_skill_db_sub), HP_POP2(HP_homun_read_skill_db_sub), 2038 },
-{ HP_POP(homun->skill_db_read), HP_POP2(HP_homun_skill_db_read), 2040 },
-{ HP_POP(homun->exp_db_read), HP_POP2(HP_homun_exp_db_read), 2042 },
-{ HP_POP(homun->addspiritball), HP_POP2(HP_homun_addspiritball), 2044 },
-{ HP_POP(homun->delspiritball), HP_POP2(HP_homun_delspiritball), 2046 },
+{ HP_POP(homun->init), HP_POP2(HP_homun_init), 1960 },
+{ HP_POP(homun->final), HP_POP2(HP_homun_final), 1962 },
+{ HP_POP(homun->reload), HP_POP2(HP_homun_reload), 1964 },
+{ HP_POP(homun->reload_skill), HP_POP2(HP_homun_reload_skill), 1966 },
+{ HP_POP(homun->get_viewdata), HP_POP2(HP_homun_get_viewdata), 1968 },
+{ HP_POP(homun->class2type), HP_POP2(HP_homun_class2type), 1970 },
+{ HP_POP(homun->damaged), HP_POP2(HP_homun_damaged), 1972 },
+{ HP_POP(homun->dead), HP_POP2(HP_homun_dead), 1974 },
+{ HP_POP(homun->vaporize), HP_POP2(HP_homun_vaporize), 1976 },
+{ HP_POP(homun->delete), HP_POP2(HP_homun_delete), 1978 },
+{ HP_POP(homun->checkskill), HP_POP2(HP_homun_checkskill), 1980 },
+{ HP_POP(homun->calc_skilltree), HP_POP2(HP_homun_calc_skilltree), 1982 },
+{ HP_POP(homun->skill_tree_get_max), HP_POP2(HP_homun_skill_tree_get_max), 1984 },
+{ HP_POP(homun->skillup), HP_POP2(HP_homun_skillup), 1986 },
+{ HP_POP(homun->levelup), HP_POP2(HP_homun_levelup), 1988 },
+{ HP_POP(homun->change_class), HP_POP2(HP_homun_change_class), 1990 },
+{ HP_POP(homun->evolve), HP_POP2(HP_homun_evolve), 1992 },
+{ HP_POP(homun->mutate), HP_POP2(HP_homun_mutate), 1994 },
+{ HP_POP(homun->gainexp), HP_POP2(HP_homun_gainexp), 1996 },
+{ HP_POP(homun->add_intimacy), HP_POP2(HP_homun_add_intimacy), 1998 },
+{ HP_POP(homun->consume_intimacy), HP_POP2(HP_homun_consume_intimacy), 2000 },
+{ HP_POP(homun->healed), HP_POP2(HP_homun_healed), 2002 },
+{ HP_POP(homun->save), HP_POP2(HP_homun_save), 2004 },
+{ HP_POP(homun->menu), HP_POP2(HP_homun_menu), 2006 },
+{ HP_POP(homun->feed), HP_POP2(HP_homun_feed), 2008 },
+{ HP_POP(homun->hunger_timer), HP_POP2(HP_homun_hunger_timer), 2010 },
+{ HP_POP(homun->hunger_timer_delete), HP_POP2(HP_homun_hunger_timer_delete), 2012 },
+{ HP_POP(homun->change_name), HP_POP2(HP_homun_change_name), 2014 },
+{ HP_POP(homun->change_name_ack), HP_POP2(HP_homun_change_name_ack), 2016 },
+{ HP_POP(homun->db_search), HP_POP2(HP_homun_db_search), 2018 },
+{ HP_POP(homun->create), HP_POP2(HP_homun_create), 2020 },
+{ HP_POP(homun->init_timers), HP_POP2(HP_homun_init_timers), 2022 },
+{ HP_POP(homun->call), HP_POP2(HP_homun_call), 2024 },
+{ HP_POP(homun->recv_data), HP_POP2(HP_homun_recv_data), 2026 },
+{ HP_POP(homun->creation_request), HP_POP2(HP_homun_creation_request), 2028 },
+{ HP_POP(homun->ressurect), HP_POP2(HP_homun_ressurect), 2030 },
+{ HP_POP(homun->revive), HP_POP2(HP_homun_revive), 2032 },
+{ HP_POP(homun->stat_reset), HP_POP2(HP_homun_stat_reset), 2034 },
+{ HP_POP(homun->shuffle), HP_POP2(HP_homun_shuffle), 2036 },
+{ HP_POP(homun->read_db_sub), HP_POP2(HP_homun_read_db_sub), 2038 },
+{ HP_POP(homun->read_db), HP_POP2(HP_homun_read_db), 2040 },
+{ HP_POP(homun->read_skill_db_sub), HP_POP2(HP_homun_read_skill_db_sub), 2042 },
+{ HP_POP(homun->skill_db_read), HP_POP2(HP_homun_skill_db_read), 2044 },
+{ HP_POP(homun->exp_db_read), HP_POP2(HP_homun_exp_db_read), 2046 },
+{ HP_POP(homun->addspiritball), HP_POP2(HP_homun_addspiritball), 2048 },
+{ HP_POP(homun->delspiritball), HP_POP2(HP_homun_delspiritball), 2050 },
 /* instance */
-{ HP_POP(instance->init), HP_POP2(HP_instance_init), 2048 },
-{ HP_POP(instance->final), HP_POP2(HP_instance_final), 2050 },
-{ HP_POP(instance->create), HP_POP2(HP_instance_create), 2052 },
-{ HP_POP(instance->add_map), HP_POP2(HP_instance_add_map), 2054 },
-{ HP_POP(instance->del_map), HP_POP2(HP_instance_del_map), 2056 },
-{ HP_POP(instance->map2imap), HP_POP2(HP_instance_map2imap), 2058 },
-{ HP_POP(instance->mapid2imapid), HP_POP2(HP_instance_mapid2imapid), 2060 },
-{ HP_POP(instance->destroy), HP_POP2(HP_instance_destroy), 2062 },
-{ HP_POP(instance->start), HP_POP2(HP_instance_start), 2064 },
-{ HP_POP(instance->check_idle), HP_POP2(HP_instance_check_idle), 2066 },
-{ HP_POP(instance->check_kick), HP_POP2(HP_instance_check_kick), 2068 },
-{ HP_POP(instance->set_timeout), HP_POP2(HP_instance_set_timeout), 2070 },
-{ HP_POP(instance->valid), HP_POP2(HP_instance_valid), 2072 },
-{ HP_POP(instance->destroy_timer), HP_POP2(HP_instance_destroy_timer), 2074 },
+{ HP_POP(instance->init), HP_POP2(HP_instance_init), 2052 },
+{ HP_POP(instance->final), HP_POP2(HP_instance_final), 2054 },
+{ HP_POP(instance->create), HP_POP2(HP_instance_create), 2056 },
+{ HP_POP(instance->add_map), HP_POP2(HP_instance_add_map), 2058 },
+{ HP_POP(instance->del_map), HP_POP2(HP_instance_del_map), 2060 },
+{ HP_POP(instance->map2imap), HP_POP2(HP_instance_map2imap), 2062 },
+{ HP_POP(instance->mapid2imapid), HP_POP2(HP_instance_mapid2imapid), 2064 },
+{ HP_POP(instance->destroy), HP_POP2(HP_instance_destroy), 2066 },
+{ HP_POP(instance->start), HP_POP2(HP_instance_start), 2068 },
+{ HP_POP(instance->check_idle), HP_POP2(HP_instance_check_idle), 2070 },
+{ HP_POP(instance->check_kick), HP_POP2(HP_instance_check_kick), 2072 },
+{ HP_POP(instance->set_timeout), HP_POP2(HP_instance_set_timeout), 2074 },
+{ HP_POP(instance->valid), HP_POP2(HP_instance_valid), 2076 },
+{ HP_POP(instance->destroy_timer), HP_POP2(HP_instance_destroy_timer), 2078 },
 /* intif */
-{ HP_POP(intif->parse), HP_POP2(HP_intif_parse), 2076 },
-{ HP_POP(intif->create_pet), HP_POP2(HP_intif_create_pet), 2078 },
-{ HP_POP(intif->broadcast), HP_POP2(HP_intif_broadcast), 2080 },
-{ HP_POP(intif->broadcast2), HP_POP2(HP_intif_broadcast2), 2082 },
-{ HP_POP(intif->main_message), HP_POP2(HP_intif_main_message), 2084 },
-{ HP_POP(intif->wis_message), HP_POP2(HP_intif_wis_message), 2086 },
-{ HP_POP(intif->wis_message_to_gm), HP_POP2(HP_intif_wis_message_to_gm), 2088 },
-{ HP_POP(intif->saveregistry), HP_POP2(HP_intif_saveregistry), 2090 },
-{ HP_POP(intif->request_registry), HP_POP2(HP_intif_request_registry), 2092 },
-{ HP_POP(intif->request_guild_storage), HP_POP2(HP_intif_request_guild_storage), 2094 },
-{ HP_POP(intif->send_guild_storage), HP_POP2(HP_intif_send_guild_storage), 2096 },
-{ HP_POP(intif->create_party), HP_POP2(HP_intif_create_party), 2098 },
-{ HP_POP(intif->request_partyinfo), HP_POP2(HP_intif_request_partyinfo), 2100 },
-{ HP_POP(intif->party_addmember), HP_POP2(HP_intif_party_addmember), 2102 },
-{ HP_POP(intif->party_changeoption), HP_POP2(HP_intif_party_changeoption), 2104 },
-{ HP_POP(intif->party_leave), HP_POP2(HP_intif_party_leave), 2106 },
-{ HP_POP(intif->party_changemap), HP_POP2(HP_intif_party_changemap), 2108 },
-{ HP_POP(intif->break_party), HP_POP2(HP_intif_break_party), 2110 },
-{ HP_POP(intif->party_message), HP_POP2(HP_intif_party_message), 2112 },
-{ HP_POP(intif->party_leaderchange), HP_POP2(HP_intif_party_leaderchange), 2114 },
-{ HP_POP(intif->guild_create), HP_POP2(HP_intif_guild_create), 2116 },
-{ HP_POP(intif->guild_request_info), HP_POP2(HP_intif_guild_request_info), 2118 },
-{ HP_POP(intif->guild_addmember), HP_POP2(HP_intif_guild_addmember), 2120 },
-{ HP_POP(intif->guild_leave), HP_POP2(HP_intif_guild_leave), 2122 },
-{ HP_POP(intif->guild_memberinfoshort), HP_POP2(HP_intif_guild_memberinfoshort), 2124 },
-{ HP_POP(intif->guild_break), HP_POP2(HP_intif_guild_break), 2126 },
-{ HP_POP(intif->guild_message), HP_POP2(HP_intif_guild_message), 2128 },
-{ HP_POP(intif->guild_change_gm), HP_POP2(HP_intif_guild_change_gm), 2130 },
-{ HP_POP(intif->guild_change_basicinfo), HP_POP2(HP_intif_guild_change_basicinfo), 2132 },
-{ HP_POP(intif->guild_change_memberinfo), HP_POP2(HP_intif_guild_change_memberinfo), 2134 },
-{ HP_POP(intif->guild_position), HP_POP2(HP_intif_guild_position), 2136 },
-{ HP_POP(intif->guild_skillup), HP_POP2(HP_intif_guild_skillup), 2138 },
-{ HP_POP(intif->guild_alliance), HP_POP2(HP_intif_guild_alliance), 2140 },
-{ HP_POP(intif->guild_notice), HP_POP2(HP_intif_guild_notice), 2142 },
-{ HP_POP(intif->guild_emblem), HP_POP2(HP_intif_guild_emblem), 2144 },
-{ HP_POP(intif->guild_castle_dataload), HP_POP2(HP_intif_guild_castle_dataload), 2146 },
-{ HP_POP(intif->guild_castle_datasave), HP_POP2(HP_intif_guild_castle_datasave), 2148 },
-{ HP_POP(intif->request_petdata), HP_POP2(HP_intif_request_petdata), 2150 },
-{ HP_POP(intif->save_petdata), HP_POP2(HP_intif_save_petdata), 2152 },
-{ HP_POP(intif->delete_petdata), HP_POP2(HP_intif_delete_petdata), 2154 },
-{ HP_POP(intif->rename), HP_POP2(HP_intif_rename), 2156 },
-{ HP_POP(intif->homunculus_create), HP_POP2(HP_intif_homunculus_create), 2158 },
-{ HP_POP(intif->homunculus_requestload), HP_POP2(HP_intif_homunculus_requestload), 2160 },
-{ HP_POP(intif->homunculus_requestsave), HP_POP2(HP_intif_homunculus_requestsave), 2162 },
-{ HP_POP(intif->homunculus_requestdelete), HP_POP2(HP_intif_homunculus_requestdelete), 2164 },
-{ HP_POP(intif->request_questlog), HP_POP2(HP_intif_request_questlog), 2166 },
-{ HP_POP(intif->quest_save), HP_POP2(HP_intif_quest_save), 2168 },
-{ HP_POP(intif->mercenary_create), HP_POP2(HP_intif_mercenary_create), 2170 },
-{ HP_POP(intif->mercenary_request), HP_POP2(HP_intif_mercenary_request), 2172 },
-{ HP_POP(intif->mercenary_delete), HP_POP2(HP_intif_mercenary_delete), 2174 },
-{ HP_POP(intif->mercenary_save), HP_POP2(HP_intif_mercenary_save), 2176 },
-{ HP_POP(intif->Mail_requestinbox), HP_POP2(HP_intif_Mail_requestinbox), 2178 },
-{ HP_POP(intif->Mail_read), HP_POP2(HP_intif_Mail_read), 2180 },
-{ HP_POP(intif->Mail_getattach), HP_POP2(HP_intif_Mail_getattach), 2182 },
-{ HP_POP(intif->Mail_delete), HP_POP2(HP_intif_Mail_delete), 2184 },
-{ HP_POP(intif->Mail_return), HP_POP2(HP_intif_Mail_return), 2186 },
-{ HP_POP(intif->Mail_send), HP_POP2(HP_intif_Mail_send), 2188 },
-{ HP_POP(intif->Auction_requestlist), HP_POP2(HP_intif_Auction_requestlist), 2190 },
-{ HP_POP(intif->Auction_register), HP_POP2(HP_intif_Auction_register), 2192 },
-{ HP_POP(intif->Auction_cancel), HP_POP2(HP_intif_Auction_cancel), 2194 },
-{ HP_POP(intif->Auction_close), HP_POP2(HP_intif_Auction_close), 2196 },
-{ HP_POP(intif->Auction_bid), HP_POP2(HP_intif_Auction_bid), 2198 },
-{ HP_POP(intif->elemental_create), HP_POP2(HP_intif_elemental_create), 2200 },
-{ HP_POP(intif->elemental_request), HP_POP2(HP_intif_elemental_request), 2202 },
-{ HP_POP(intif->elemental_delete), HP_POP2(HP_intif_elemental_delete), 2204 },
-{ HP_POP(intif->elemental_save), HP_POP2(HP_intif_elemental_save), 2206 },
-{ HP_POP(intif->request_accinfo), HP_POP2(HP_intif_request_accinfo), 2208 },
-{ HP_POP(intif->CheckForCharServer), HP_POP2(HP_intif_CheckForCharServer), 2210 },
-{ HP_POP(intif->pWisMessage), HP_POP2(HP_intif_pWisMessage), 2212 },
-{ HP_POP(intif->pWisEnd), HP_POP2(HP_intif_pWisEnd), 2214 },
-{ HP_POP(intif->pWisToGM_sub), HP_POP2(HP_intif_pWisToGM_sub), 2216 },
-{ HP_POP(intif->pWisToGM), HP_POP2(HP_intif_pWisToGM), 2218 },
-{ HP_POP(intif->pRegisters), HP_POP2(HP_intif_pRegisters), 2220 },
-{ HP_POP(intif->pChangeNameOk), HP_POP2(HP_intif_pChangeNameOk), 2222 },
-{ HP_POP(intif->pMessageToFD), HP_POP2(HP_intif_pMessageToFD), 2224 },
-{ HP_POP(intif->pLoadGuildStorage), HP_POP2(HP_intif_pLoadGuildStorage), 2226 },
-{ HP_POP(intif->pSaveGuildStorage), HP_POP2(HP_intif_pSaveGuildStorage), 2228 },
-{ HP_POP(intif->pPartyCreated), HP_POP2(HP_intif_pPartyCreated), 2230 },
-{ HP_POP(intif->pPartyInfo), HP_POP2(HP_intif_pPartyInfo), 2232 },
-{ HP_POP(intif->pPartyMemberAdded), HP_POP2(HP_intif_pPartyMemberAdded), 2234 },
-{ HP_POP(intif->pPartyOptionChanged), HP_POP2(HP_intif_pPartyOptionChanged), 2236 },
-{ HP_POP(intif->pPartyMemberWithdraw), HP_POP2(HP_intif_pPartyMemberWithdraw), 2238 },
-{ HP_POP(intif->pPartyMove), HP_POP2(HP_intif_pPartyMove), 2240 },
-{ HP_POP(intif->pPartyBroken), HP_POP2(HP_intif_pPartyBroken), 2242 },
-{ HP_POP(intif->pPartyMessage), HP_POP2(HP_intif_pPartyMessage), 2244 },
-{ HP_POP(intif->pGuildCreated), HP_POP2(HP_intif_pGuildCreated), 2246 },
-{ HP_POP(intif->pGuildInfo), HP_POP2(HP_intif_pGuildInfo), 2248 },
-{ HP_POP(intif->pGuildMemberAdded), HP_POP2(HP_intif_pGuildMemberAdded), 2250 },
-{ HP_POP(intif->pGuildMemberWithdraw), HP_POP2(HP_intif_pGuildMemberWithdraw), 2252 },
-{ HP_POP(intif->pGuildMemberInfoShort), HP_POP2(HP_intif_pGuildMemberInfoShort), 2254 },
-{ HP_POP(intif->pGuildBroken), HP_POP2(HP_intif_pGuildBroken), 2256 },
-{ HP_POP(intif->pGuildMessage), HP_POP2(HP_intif_pGuildMessage), 2258 },
-{ HP_POP(intif->pGuildBasicInfoChanged), HP_POP2(HP_intif_pGuildBasicInfoChanged), 2260 },
-{ HP_POP(intif->pGuildMemberInfoChanged), HP_POP2(HP_intif_pGuildMemberInfoChanged), 2262 },
-{ HP_POP(intif->pGuildPosition), HP_POP2(HP_intif_pGuildPosition), 2264 },
-{ HP_POP(intif->pGuildSkillUp), HP_POP2(HP_intif_pGuildSkillUp), 2266 },
-{ HP_POP(intif->pGuildAlliance), HP_POP2(HP_intif_pGuildAlliance), 2268 },
-{ HP_POP(intif->pGuildNotice), HP_POP2(HP_intif_pGuildNotice), 2270 },
-{ HP_POP(intif->pGuildEmblem), HP_POP2(HP_intif_pGuildEmblem), 2272 },
-{ HP_POP(intif->pGuildCastleDataLoad), HP_POP2(HP_intif_pGuildCastleDataLoad), 2274 },
-{ HP_POP(intif->pGuildMasterChanged), HP_POP2(HP_intif_pGuildMasterChanged), 2276 },
-{ HP_POP(intif->pQuestLog), HP_POP2(HP_intif_pQuestLog), 2278 },
-{ HP_POP(intif->pQuestSave), HP_POP2(HP_intif_pQuestSave), 2280 },
-{ HP_POP(intif->pMailInboxReceived), HP_POP2(HP_intif_pMailInboxReceived), 2282 },
-{ HP_POP(intif->pMailNew), HP_POP2(HP_intif_pMailNew), 2284 },
-{ HP_POP(intif->pMailGetAttach), HP_POP2(HP_intif_pMailGetAttach), 2286 },
-{ HP_POP(intif->pMailDelete), HP_POP2(HP_intif_pMailDelete), 2288 },
-{ HP_POP(intif->pMailReturn), HP_POP2(HP_intif_pMailReturn), 2290 },
-{ HP_POP(intif->pMailSend), HP_POP2(HP_intif_pMailSend), 2292 },
-{ HP_POP(intif->pAuctionResults), HP_POP2(HP_intif_pAuctionResults), 2294 },
-{ HP_POP(intif->pAuctionRegister), HP_POP2(HP_intif_pAuctionRegister), 2296 },
-{ HP_POP(intif->pAuctionCancel), HP_POP2(HP_intif_pAuctionCancel), 2298 },
-{ HP_POP(intif->pAuctionClose), HP_POP2(HP_intif_pAuctionClose), 2300 },
-{ HP_POP(intif->pAuctionMessage), HP_POP2(HP_intif_pAuctionMessage), 2302 },
-{ HP_POP(intif->pAuctionBid), HP_POP2(HP_intif_pAuctionBid), 2304 },
-{ HP_POP(intif->pMercenaryReceived), HP_POP2(HP_intif_pMercenaryReceived), 2306 },
-{ HP_POP(intif->pMercenaryDeleted), HP_POP2(HP_intif_pMercenaryDeleted), 2308 },
-{ HP_POP(intif->pMercenarySaved), HP_POP2(HP_intif_pMercenarySaved), 2310 },
-{ HP_POP(intif->pElementalReceived), HP_POP2(HP_intif_pElementalReceived), 2312 },
-{ HP_POP(intif->pElementalDeleted), HP_POP2(HP_intif_pElementalDeleted), 2314 },
-{ HP_POP(intif->pElementalSaved), HP_POP2(HP_intif_pElementalSaved), 2316 },
-{ HP_POP(intif->pCreatePet), HP_POP2(HP_intif_pCreatePet), 2318 },
-{ HP_POP(intif->pRecvPetData), HP_POP2(HP_intif_pRecvPetData), 2320 },
-{ HP_POP(intif->pSavePetOk), HP_POP2(HP_intif_pSavePetOk), 2322 },
-{ HP_POP(intif->pDeletePetOk), HP_POP2(HP_intif_pDeletePetOk), 2324 },
-{ HP_POP(intif->pCreateHomunculus), HP_POP2(HP_intif_pCreateHomunculus), 2326 },
-{ HP_POP(intif->pRecvHomunculusData), HP_POP2(HP_intif_pRecvHomunculusData), 2328 },
-{ HP_POP(intif->pSaveHomunculusOk), HP_POP2(HP_intif_pSaveHomunculusOk), 2330 },
-{ HP_POP(intif->pDeleteHomunculusOk), HP_POP2(HP_intif_pDeleteHomunculusOk), 2332 },
+{ HP_POP(intif->parse), HP_POP2(HP_intif_parse), 2080 },
+{ HP_POP(intif->create_pet), HP_POP2(HP_intif_create_pet), 2082 },
+{ HP_POP(intif->broadcast), HP_POP2(HP_intif_broadcast), 2084 },
+{ HP_POP(intif->broadcast2), HP_POP2(HP_intif_broadcast2), 2086 },
+{ HP_POP(intif->main_message), HP_POP2(HP_intif_main_message), 2088 },
+{ HP_POP(intif->wis_message), HP_POP2(HP_intif_wis_message), 2090 },
+{ HP_POP(intif->wis_message_to_gm), HP_POP2(HP_intif_wis_message_to_gm), 2092 },
+{ HP_POP(intif->saveregistry), HP_POP2(HP_intif_saveregistry), 2094 },
+{ HP_POP(intif->request_registry), HP_POP2(HP_intif_request_registry), 2096 },
+{ HP_POP(intif->request_guild_storage), HP_POP2(HP_intif_request_guild_storage), 2098 },
+{ HP_POP(intif->send_guild_storage), HP_POP2(HP_intif_send_guild_storage), 2100 },
+{ HP_POP(intif->create_party), HP_POP2(HP_intif_create_party), 2102 },
+{ HP_POP(intif->request_partyinfo), HP_POP2(HP_intif_request_partyinfo), 2104 },
+{ HP_POP(intif->party_addmember), HP_POP2(HP_intif_party_addmember), 2106 },
+{ HP_POP(intif->party_changeoption), HP_POP2(HP_intif_party_changeoption), 2108 },
+{ HP_POP(intif->party_leave), HP_POP2(HP_intif_party_leave), 2110 },
+{ HP_POP(intif->party_changemap), HP_POP2(HP_intif_party_changemap), 2112 },
+{ HP_POP(intif->break_party), HP_POP2(HP_intif_break_party), 2114 },
+{ HP_POP(intif->party_message), HP_POP2(HP_intif_party_message), 2116 },
+{ HP_POP(intif->party_leaderchange), HP_POP2(HP_intif_party_leaderchange), 2118 },
+{ HP_POP(intif->guild_create), HP_POP2(HP_intif_guild_create), 2120 },
+{ HP_POP(intif->guild_request_info), HP_POP2(HP_intif_guild_request_info), 2122 },
+{ HP_POP(intif->guild_addmember), HP_POP2(HP_intif_guild_addmember), 2124 },
+{ HP_POP(intif->guild_leave), HP_POP2(HP_intif_guild_leave), 2126 },
+{ HP_POP(intif->guild_memberinfoshort), HP_POP2(HP_intif_guild_memberinfoshort), 2128 },
+{ HP_POP(intif->guild_break), HP_POP2(HP_intif_guild_break), 2130 },
+{ HP_POP(intif->guild_message), HP_POP2(HP_intif_guild_message), 2132 },
+{ HP_POP(intif->guild_change_gm), HP_POP2(HP_intif_guild_change_gm), 2134 },
+{ HP_POP(intif->guild_change_basicinfo), HP_POP2(HP_intif_guild_change_basicinfo), 2136 },
+{ HP_POP(intif->guild_change_memberinfo), HP_POP2(HP_intif_guild_change_memberinfo), 2138 },
+{ HP_POP(intif->guild_position), HP_POP2(HP_intif_guild_position), 2140 },
+{ HP_POP(intif->guild_skillup), HP_POP2(HP_intif_guild_skillup), 2142 },
+{ HP_POP(intif->guild_alliance), HP_POP2(HP_intif_guild_alliance), 2144 },
+{ HP_POP(intif->guild_notice), HP_POP2(HP_intif_guild_notice), 2146 },
+{ HP_POP(intif->guild_emblem), HP_POP2(HP_intif_guild_emblem), 2148 },
+{ HP_POP(intif->guild_castle_dataload), HP_POP2(HP_intif_guild_castle_dataload), 2150 },
+{ HP_POP(intif->guild_castle_datasave), HP_POP2(HP_intif_guild_castle_datasave), 2152 },
+{ HP_POP(intif->request_petdata), HP_POP2(HP_intif_request_petdata), 2154 },
+{ HP_POP(intif->save_petdata), HP_POP2(HP_intif_save_petdata), 2156 },
+{ HP_POP(intif->delete_petdata), HP_POP2(HP_intif_delete_petdata), 2158 },
+{ HP_POP(intif->rename), HP_POP2(HP_intif_rename), 2160 },
+{ HP_POP(intif->homunculus_create), HP_POP2(HP_intif_homunculus_create), 2162 },
+{ HP_POP(intif->homunculus_requestload), HP_POP2(HP_intif_homunculus_requestload), 2164 },
+{ HP_POP(intif->homunculus_requestsave), HP_POP2(HP_intif_homunculus_requestsave), 2166 },
+{ HP_POP(intif->homunculus_requestdelete), HP_POP2(HP_intif_homunculus_requestdelete), 2168 },
+{ HP_POP(intif->request_questlog), HP_POP2(HP_intif_request_questlog), 2170 },
+{ HP_POP(intif->quest_save), HP_POP2(HP_intif_quest_save), 2172 },
+{ HP_POP(intif->mercenary_create), HP_POP2(HP_intif_mercenary_create), 2174 },
+{ HP_POP(intif->mercenary_request), HP_POP2(HP_intif_mercenary_request), 2176 },
+{ HP_POP(intif->mercenary_delete), HP_POP2(HP_intif_mercenary_delete), 2178 },
+{ HP_POP(intif->mercenary_save), HP_POP2(HP_intif_mercenary_save), 2180 },
+{ HP_POP(intif->Mail_requestinbox), HP_POP2(HP_intif_Mail_requestinbox), 2182 },
+{ HP_POP(intif->Mail_read), HP_POP2(HP_intif_Mail_read), 2184 },
+{ HP_POP(intif->Mail_getattach), HP_POP2(HP_intif_Mail_getattach), 2186 },
+{ HP_POP(intif->Mail_delete), HP_POP2(HP_intif_Mail_delete), 2188 },
+{ HP_POP(intif->Mail_return), HP_POP2(HP_intif_Mail_return), 2190 },
+{ HP_POP(intif->Mail_send), HP_POP2(HP_intif_Mail_send), 2192 },
+{ HP_POP(intif->Auction_requestlist), HP_POP2(HP_intif_Auction_requestlist), 2194 },
+{ HP_POP(intif->Auction_register), HP_POP2(HP_intif_Auction_register), 2196 },
+{ HP_POP(intif->Auction_cancel), HP_POP2(HP_intif_Auction_cancel), 2198 },
+{ HP_POP(intif->Auction_close), HP_POP2(HP_intif_Auction_close), 2200 },
+{ HP_POP(intif->Auction_bid), HP_POP2(HP_intif_Auction_bid), 2202 },
+{ HP_POP(intif->elemental_create), HP_POP2(HP_intif_elemental_create), 2204 },
+{ HP_POP(intif->elemental_request), HP_POP2(HP_intif_elemental_request), 2206 },
+{ HP_POP(intif->elemental_delete), HP_POP2(HP_intif_elemental_delete), 2208 },
+{ HP_POP(intif->elemental_save), HP_POP2(HP_intif_elemental_save), 2210 },
+{ HP_POP(intif->request_accinfo), HP_POP2(HP_intif_request_accinfo), 2212 },
+{ HP_POP(intif->CheckForCharServer), HP_POP2(HP_intif_CheckForCharServer), 2214 },
+{ HP_POP(intif->pWisMessage), HP_POP2(HP_intif_pWisMessage), 2216 },
+{ HP_POP(intif->pWisEnd), HP_POP2(HP_intif_pWisEnd), 2218 },
+{ HP_POP(intif->pWisToGM_sub), HP_POP2(HP_intif_pWisToGM_sub), 2220 },
+{ HP_POP(intif->pWisToGM), HP_POP2(HP_intif_pWisToGM), 2222 },
+{ HP_POP(intif->pRegisters), HP_POP2(HP_intif_pRegisters), 2224 },
+{ HP_POP(intif->pChangeNameOk), HP_POP2(HP_intif_pChangeNameOk), 2226 },
+{ HP_POP(intif->pMessageToFD), HP_POP2(HP_intif_pMessageToFD), 2228 },
+{ HP_POP(intif->pLoadGuildStorage), HP_POP2(HP_intif_pLoadGuildStorage), 2230 },
+{ HP_POP(intif->pSaveGuildStorage), HP_POP2(HP_intif_pSaveGuildStorage), 2232 },
+{ HP_POP(intif->pPartyCreated), HP_POP2(HP_intif_pPartyCreated), 2234 },
+{ HP_POP(intif->pPartyInfo), HP_POP2(HP_intif_pPartyInfo), 2236 },
+{ HP_POP(intif->pPartyMemberAdded), HP_POP2(HP_intif_pPartyMemberAdded), 2238 },
+{ HP_POP(intif->pPartyOptionChanged), HP_POP2(HP_intif_pPartyOptionChanged), 2240 },
+{ HP_POP(intif->pPartyMemberWithdraw), HP_POP2(HP_intif_pPartyMemberWithdraw), 2242 },
+{ HP_POP(intif->pPartyMove), HP_POP2(HP_intif_pPartyMove), 2244 },
+{ HP_POP(intif->pPartyBroken), HP_POP2(HP_intif_pPartyBroken), 2246 },
+{ HP_POP(intif->pPartyMessage), HP_POP2(HP_intif_pPartyMessage), 2248 },
+{ HP_POP(intif->pGuildCreated), HP_POP2(HP_intif_pGuildCreated), 2250 },
+{ HP_POP(intif->pGuildInfo), HP_POP2(HP_intif_pGuildInfo), 2252 },
+{ HP_POP(intif->pGuildMemberAdded), HP_POP2(HP_intif_pGuildMemberAdded), 2254 },
+{ HP_POP(intif->pGuildMemberWithdraw), HP_POP2(HP_intif_pGuildMemberWithdraw), 2256 },
+{ HP_POP(intif->pGuildMemberInfoShort), HP_POP2(HP_intif_pGuildMemberInfoShort), 2258 },
+{ HP_POP(intif->pGuildBroken), HP_POP2(HP_intif_pGuildBroken), 2260 },
+{ HP_POP(intif->pGuildMessage), HP_POP2(HP_intif_pGuildMessage), 2262 },
+{ HP_POP(intif->pGuildBasicInfoChanged), HP_POP2(HP_intif_pGuildBasicInfoChanged), 2264 },
+{ HP_POP(intif->pGuildMemberInfoChanged), HP_POP2(HP_intif_pGuildMemberInfoChanged), 2266 },
+{ HP_POP(intif->pGuildPosition), HP_POP2(HP_intif_pGuildPosition), 2268 },
+{ HP_POP(intif->pGuildSkillUp), HP_POP2(HP_intif_pGuildSkillUp), 2270 },
+{ HP_POP(intif->pGuildAlliance), HP_POP2(HP_intif_pGuildAlliance), 2272 },
+{ HP_POP(intif->pGuildNotice), HP_POP2(HP_intif_pGuildNotice), 2274 },
+{ HP_POP(intif->pGuildEmblem), HP_POP2(HP_intif_pGuildEmblem), 2276 },
+{ HP_POP(intif->pGuildCastleDataLoad), HP_POP2(HP_intif_pGuildCastleDataLoad), 2278 },
+{ HP_POP(intif->pGuildMasterChanged), HP_POP2(HP_intif_pGuildMasterChanged), 2280 },
+{ HP_POP(intif->pQuestLog), HP_POP2(HP_intif_pQuestLog), 2282 },
+{ HP_POP(intif->pQuestSave), HP_POP2(HP_intif_pQuestSave), 2284 },
+{ HP_POP(intif->pMailInboxReceived), HP_POP2(HP_intif_pMailInboxReceived), 2286 },
+{ HP_POP(intif->pMailNew), HP_POP2(HP_intif_pMailNew), 2288 },
+{ HP_POP(intif->pMailGetAttach), HP_POP2(HP_intif_pMailGetAttach), 2290 },
+{ HP_POP(intif->pMailDelete), HP_POP2(HP_intif_pMailDelete), 2292 },
+{ HP_POP(intif->pMailReturn), HP_POP2(HP_intif_pMailReturn), 2294 },
+{ HP_POP(intif->pMailSend), HP_POP2(HP_intif_pMailSend), 2296 },
+{ HP_POP(intif->pAuctionResults), HP_POP2(HP_intif_pAuctionResults), 2298 },
+{ HP_POP(intif->pAuctionRegister), HP_POP2(HP_intif_pAuctionRegister), 2300 },
+{ HP_POP(intif->pAuctionCancel), HP_POP2(HP_intif_pAuctionCancel), 2302 },
+{ HP_POP(intif->pAuctionClose), HP_POP2(HP_intif_pAuctionClose), 2304 },
+{ HP_POP(intif->pAuctionMessage), HP_POP2(HP_intif_pAuctionMessage), 2306 },
+{ HP_POP(intif->pAuctionBid), HP_POP2(HP_intif_pAuctionBid), 2308 },
+{ HP_POP(intif->pMercenaryReceived), HP_POP2(HP_intif_pMercenaryReceived), 2310 },
+{ HP_POP(intif->pMercenaryDeleted), HP_POP2(HP_intif_pMercenaryDeleted), 2312 },
+{ HP_POP(intif->pMercenarySaved), HP_POP2(HP_intif_pMercenarySaved), 2314 },
+{ HP_POP(intif->pElementalReceived), HP_POP2(HP_intif_pElementalReceived), 2316 },
+{ HP_POP(intif->pElementalDeleted), HP_POP2(HP_intif_pElementalDeleted), 2318 },
+{ HP_POP(intif->pElementalSaved), HP_POP2(HP_intif_pElementalSaved), 2320 },
+{ HP_POP(intif->pCreatePet), HP_POP2(HP_intif_pCreatePet), 2322 },
+{ HP_POP(intif->pRecvPetData), HP_POP2(HP_intif_pRecvPetData), 2324 },
+{ HP_POP(intif->pSavePetOk), HP_POP2(HP_intif_pSavePetOk), 2326 },
+{ HP_POP(intif->pDeletePetOk), HP_POP2(HP_intif_pDeletePetOk), 2328 },
+{ HP_POP(intif->pCreateHomunculus), HP_POP2(HP_intif_pCreateHomunculus), 2330 },
+{ HP_POP(intif->pRecvHomunculusData), HP_POP2(HP_intif_pRecvHomunculusData), 2332 },
+{ HP_POP(intif->pSaveHomunculusOk), HP_POP2(HP_intif_pSaveHomunculusOk), 2334 },
+{ HP_POP(intif->pDeleteHomunculusOk), HP_POP2(HP_intif_pDeleteHomunculusOk), 2336 },
 /* ircbot */
-{ HP_POP(ircbot->init), HP_POP2(HP_ircbot_init), 2334 },
-{ HP_POP(ircbot->final), HP_POP2(HP_ircbot_final), 2336 },
-{ HP_POP(ircbot->parse), HP_POP2(HP_ircbot_parse), 2338 },
-{ HP_POP(ircbot->parse_sub), HP_POP2(HP_ircbot_parse_sub), 2340 },
-{ HP_POP(ircbot->parse_source), HP_POP2(HP_ircbot_parse_source), 2342 },
-{ HP_POP(ircbot->func_search), HP_POP2(HP_ircbot_func_search), 2344 },
-{ HP_POP(ircbot->connect_timer), HP_POP2(HP_ircbot_connect_timer), 2346 },
-{ HP_POP(ircbot->identify_timer), HP_POP2(HP_ircbot_identify_timer), 2348 },
-{ HP_POP(ircbot->join_timer), HP_POP2(HP_ircbot_join_timer), 2350 },
-{ HP_POP(ircbot->send), HP_POP2(HP_ircbot_send), 2352 },
-{ HP_POP(ircbot->relay), HP_POP2(HP_ircbot_relay), 2354 },
-{ HP_POP(ircbot->pong), HP_POP2(HP_ircbot_pong), 2356 },
-{ HP_POP(ircbot->privmsg), HP_POP2(HP_ircbot_privmsg), 2358 },
-{ HP_POP(ircbot->userjoin), HP_POP2(HP_ircbot_userjoin), 2360 },
-{ HP_POP(ircbot->userleave), HP_POP2(HP_ircbot_userleave), 2362 },
-{ HP_POP(ircbot->usernick), HP_POP2(HP_ircbot_usernick), 2364 },
+{ HP_POP(ircbot->init), HP_POP2(HP_ircbot_init), 2338 },
+{ HP_POP(ircbot->final), HP_POP2(HP_ircbot_final), 2340 },
+{ HP_POP(ircbot->parse), HP_POP2(HP_ircbot_parse), 2342 },
+{ HP_POP(ircbot->parse_sub), HP_POP2(HP_ircbot_parse_sub), 2344 },
+{ HP_POP(ircbot->parse_source), HP_POP2(HP_ircbot_parse_source), 2346 },
+{ HP_POP(ircbot->func_search), HP_POP2(HP_ircbot_func_search), 2348 },
+{ HP_POP(ircbot->connect_timer), HP_POP2(HP_ircbot_connect_timer), 2350 },
+{ HP_POP(ircbot->identify_timer), HP_POP2(HP_ircbot_identify_timer), 2352 },
+{ HP_POP(ircbot->join_timer), HP_POP2(HP_ircbot_join_timer), 2354 },
+{ HP_POP(ircbot->send), HP_POP2(HP_ircbot_send), 2356 },
+{ HP_POP(ircbot->relay), HP_POP2(HP_ircbot_relay), 2358 },
+{ HP_POP(ircbot->pong), HP_POP2(HP_ircbot_pong), 2360 },
+{ HP_POP(ircbot->privmsg), HP_POP2(HP_ircbot_privmsg), 2362 },
+{ HP_POP(ircbot->userjoin), HP_POP2(HP_ircbot_userjoin), 2364 },
+{ HP_POP(ircbot->userleave), HP_POP2(HP_ircbot_userleave), 2366 },
+{ HP_POP(ircbot->usernick), HP_POP2(HP_ircbot_usernick), 2368 },
 /* itemdb */
-{ HP_POP(itemdb->init), HP_POP2(HP_itemdb_init), 2366 },
-{ HP_POP(itemdb->final), HP_POP2(HP_itemdb_final), 2368 },
-{ HP_POP(itemdb->reload), HP_POP2(HP_itemdb_reload), 2370 },
-{ HP_POP(itemdb->name_constants), HP_POP2(HP_itemdb_name_constants), 2372 },
-{ HP_POP(itemdb->force_name_constants), HP_POP2(HP_itemdb_force_name_constants), 2374 },
-{ HP_POP(itemdb->read_groups), HP_POP2(HP_itemdb_read_groups), 2376 },
-{ HP_POP(itemdb->read_chains), HP_POP2(HP_itemdb_read_chains), 2378 },
-{ HP_POP(itemdb->read_packages), HP_POP2(HP_itemdb_read_packages), 2380 },
-{ HP_POP(itemdb->write_cached_packages), HP_POP2(HP_itemdb_write_cached_packages), 2382 },
-{ HP_POP(itemdb->read_cached_packages), HP_POP2(HP_itemdb_read_cached_packages), 2384 },
-{ HP_POP(itemdb->name2id), HP_POP2(HP_itemdb_name2id), 2386 },
-{ HP_POP(itemdb->search_name), HP_POP2(HP_itemdb_search_name), 2388 },
-{ HP_POP(itemdb->search_name_array), HP_POP2(HP_itemdb_search_name_array), 2390 },
-{ HP_POP(itemdb->load), HP_POP2(HP_itemdb_load), 2392 },
-{ HP_POP(itemdb->search), HP_POP2(HP_itemdb_search), 2394 },
-{ HP_POP(itemdb->parse_dbrow), HP_POP2(HP_itemdb_parse_dbrow), 2396 },
-{ HP_POP(itemdb->exists), HP_POP2(HP_itemdb_exists), 2398 },
-{ HP_POP(itemdb->in_group), HP_POP2(HP_itemdb_in_group), 2400 },
-{ HP_POP(itemdb->group_item), HP_POP2(HP_itemdb_group_item), 2402 },
-{ HP_POP(itemdb->chain_item), HP_POP2(HP_itemdb_chain_item), 2404 },
-{ HP_POP(itemdb->package_item), HP_POP2(HP_itemdb_package_item), 2406 },
-{ HP_POP(itemdb->searchname_sub), HP_POP2(HP_itemdb_searchname_sub), 2408 },
-{ HP_POP(itemdb->searchname_array_sub), HP_POP2(HP_itemdb_searchname_array_sub), 2410 },
-{ HP_POP(itemdb->searchrandomid), HP_POP2(HP_itemdb_searchrandomid), 2412 },
-{ HP_POP(itemdb->typename), HP_POP2(HP_itemdb_typename), 2414 },
-{ HP_POP(itemdb->jobid2mapid), HP_POP2(HP_itemdb_jobid2mapid), 2416 },
-{ HP_POP(itemdb->create_dummy_data), HP_POP2(HP_itemdb_create_dummy_data), 2418 },
-{ HP_POP(itemdb->create_item_data), HP_POP2(HP_itemdb_create_item_data), 2420 },
-{ HP_POP(itemdb->isequip), HP_POP2(HP_itemdb_isequip), 2422 },
-{ HP_POP(itemdb->isequip2), HP_POP2(HP_itemdb_isequip2), 2424 },
-{ HP_POP(itemdb->isstackable), HP_POP2(HP_itemdb_isstackable), 2426 },
-{ HP_POP(itemdb->isstackable2), HP_POP2(HP_itemdb_isstackable2), 2428 },
-{ HP_POP(itemdb->isdropable_sub), HP_POP2(HP_itemdb_isdropable_sub), 2430 },
-{ HP_POP(itemdb->cantrade_sub), HP_POP2(HP_itemdb_cantrade_sub), 2432 },
-{ HP_POP(itemdb->canpartnertrade_sub), HP_POP2(HP_itemdb_canpartnertrade_sub), 2434 },
-{ HP_POP(itemdb->cansell_sub), HP_POP2(HP_itemdb_cansell_sub), 2436 },
-{ HP_POP(itemdb->cancartstore_sub), HP_POP2(HP_itemdb_cancartstore_sub), 2438 },
-{ HP_POP(itemdb->canstore_sub), HP_POP2(HP_itemdb_canstore_sub), 2440 },
-{ HP_POP(itemdb->canguildstore_sub), HP_POP2(HP_itemdb_canguildstore_sub), 2442 },
-{ HP_POP(itemdb->canmail_sub), HP_POP2(HP_itemdb_canmail_sub), 2444 },
-{ HP_POP(itemdb->canauction_sub), HP_POP2(HP_itemdb_canauction_sub), 2446 },
-{ HP_POP(itemdb->isrestricted), HP_POP2(HP_itemdb_isrestricted), 2448 },
-{ HP_POP(itemdb->isidentified), HP_POP2(HP_itemdb_isidentified), 2450 },
-{ HP_POP(itemdb->isidentified2), HP_POP2(HP_itemdb_isidentified2), 2452 },
-{ HP_POP(itemdb->read_itemavail), HP_POP2(HP_itemdb_read_itemavail), 2454 },
-{ HP_POP(itemdb->read_itemtrade), HP_POP2(HP_itemdb_read_itemtrade), 2456 },
-{ HP_POP(itemdb->read_itemdelay), HP_POP2(HP_itemdb_read_itemdelay), 2458 },
-{ HP_POP(itemdb->read_stack), HP_POP2(HP_itemdb_read_stack), 2460 },
-{ HP_POP(itemdb->read_buyingstore), HP_POP2(HP_itemdb_read_buyingstore), 2462 },
-{ HP_POP(itemdb->read_nouse), HP_POP2(HP_itemdb_read_nouse), 2464 },
-{ HP_POP(itemdb->combo_split_atoi), HP_POP2(HP_itemdb_combo_split_atoi), 2466 },
-{ HP_POP(itemdb->read_combos), HP_POP2(HP_itemdb_read_combos), 2468 },
-{ HP_POP(itemdb->gendercheck), HP_POP2(HP_itemdb_gendercheck), 2470 },
-{ HP_POP(itemdb->re_split_atoi), HP_POP2(HP_itemdb_re_split_atoi), 2472 },
-{ HP_POP(itemdb->readdb), HP_POP2(HP_itemdb_readdb), 2474 },
-{ HP_POP(itemdb->read_sqldb), HP_POP2(HP_itemdb_read_sqldb), 2476 },
-{ HP_POP(itemdb->unique_id), HP_POP2(HP_itemdb_unique_id), 2478 },
-{ HP_POP(itemdb->uid_load), HP_POP2(HP_itemdb_uid_load), 2480 },
-{ HP_POP(itemdb->read), HP_POP2(HP_itemdb_read), 2482 },
-{ HP_POP(itemdb->destroy_item_data), HP_POP2(HP_itemdb_destroy_item_data), 2484 },
-{ HP_POP(itemdb->final_sub), HP_POP2(HP_itemdb_final_sub), 2486 },
+{ HP_POP(itemdb->init), HP_POP2(HP_itemdb_init), 2370 },
+{ HP_POP(itemdb->final), HP_POP2(HP_itemdb_final), 2372 },
+{ HP_POP(itemdb->reload), HP_POP2(HP_itemdb_reload), 2374 },
+{ HP_POP(itemdb->name_constants), HP_POP2(HP_itemdb_name_constants), 2376 },
+{ HP_POP(itemdb->force_name_constants), HP_POP2(HP_itemdb_force_name_constants), 2378 },
+{ HP_POP(itemdb->read_groups), HP_POP2(HP_itemdb_read_groups), 2380 },
+{ HP_POP(itemdb->read_chains), HP_POP2(HP_itemdb_read_chains), 2382 },
+{ HP_POP(itemdb->read_packages), HP_POP2(HP_itemdb_read_packages), 2384 },
+{ HP_POP(itemdb->write_cached_packages), HP_POP2(HP_itemdb_write_cached_packages), 2386 },
+{ HP_POP(itemdb->read_cached_packages), HP_POP2(HP_itemdb_read_cached_packages), 2388 },
+{ HP_POP(itemdb->name2id), HP_POP2(HP_itemdb_name2id), 2390 },
+{ HP_POP(itemdb->search_name), HP_POP2(HP_itemdb_search_name), 2392 },
+{ HP_POP(itemdb->search_name_array), HP_POP2(HP_itemdb_search_name_array), 2394 },
+{ HP_POP(itemdb->load), HP_POP2(HP_itemdb_load), 2396 },
+{ HP_POP(itemdb->search), HP_POP2(HP_itemdb_search), 2398 },
+{ HP_POP(itemdb->parse_dbrow), HP_POP2(HP_itemdb_parse_dbrow), 2400 },
+{ HP_POP(itemdb->exists), HP_POP2(HP_itemdb_exists), 2402 },
+{ HP_POP(itemdb->in_group), HP_POP2(HP_itemdb_in_group), 2404 },
+{ HP_POP(itemdb->group_item), HP_POP2(HP_itemdb_group_item), 2406 },
+{ HP_POP(itemdb->chain_item), HP_POP2(HP_itemdb_chain_item), 2408 },
+{ HP_POP(itemdb->package_item), HP_POP2(HP_itemdb_package_item), 2410 },
+{ HP_POP(itemdb->searchname_sub), HP_POP2(HP_itemdb_searchname_sub), 2412 },
+{ HP_POP(itemdb->searchname_array_sub), HP_POP2(HP_itemdb_searchname_array_sub), 2414 },
+{ HP_POP(itemdb->searchrandomid), HP_POP2(HP_itemdb_searchrandomid), 2416 },
+{ HP_POP(itemdb->typename), HP_POP2(HP_itemdb_typename), 2418 },
+{ HP_POP(itemdb->jobid2mapid), HP_POP2(HP_itemdb_jobid2mapid), 2420 },
+{ HP_POP(itemdb->create_dummy_data), HP_POP2(HP_itemdb_create_dummy_data), 2422 },
+{ HP_POP(itemdb->create_item_data), HP_POP2(HP_itemdb_create_item_data), 2424 },
+{ HP_POP(itemdb->isequip), HP_POP2(HP_itemdb_isequip), 2426 },
+{ HP_POP(itemdb->isequip2), HP_POP2(HP_itemdb_isequip2), 2428 },
+{ HP_POP(itemdb->isstackable), HP_POP2(HP_itemdb_isstackable), 2430 },
+{ HP_POP(itemdb->isstackable2), HP_POP2(HP_itemdb_isstackable2), 2432 },
+{ HP_POP(itemdb->isdropable_sub), HP_POP2(HP_itemdb_isdropable_sub), 2434 },
+{ HP_POP(itemdb->cantrade_sub), HP_POP2(HP_itemdb_cantrade_sub), 2436 },
+{ HP_POP(itemdb->canpartnertrade_sub), HP_POP2(HP_itemdb_canpartnertrade_sub), 2438 },
+{ HP_POP(itemdb->cansell_sub), HP_POP2(HP_itemdb_cansell_sub), 2440 },
+{ HP_POP(itemdb->cancartstore_sub), HP_POP2(HP_itemdb_cancartstore_sub), 2442 },
+{ HP_POP(itemdb->canstore_sub), HP_POP2(HP_itemdb_canstore_sub), 2444 },
+{ HP_POP(itemdb->canguildstore_sub), HP_POP2(HP_itemdb_canguildstore_sub), 2446 },
+{ HP_POP(itemdb->canmail_sub), HP_POP2(HP_itemdb_canmail_sub), 2448 },
+{ HP_POP(itemdb->canauction_sub), HP_POP2(HP_itemdb_canauction_sub), 2450 },
+{ HP_POP(itemdb->isrestricted), HP_POP2(HP_itemdb_isrestricted), 2452 },
+{ HP_POP(itemdb->isidentified), HP_POP2(HP_itemdb_isidentified), 2454 },
+{ HP_POP(itemdb->isidentified2), HP_POP2(HP_itemdb_isidentified2), 2456 },
+{ HP_POP(itemdb->read_itemavail), HP_POP2(HP_itemdb_read_itemavail), 2458 },
+{ HP_POP(itemdb->read_itemtrade), HP_POP2(HP_itemdb_read_itemtrade), 2460 },
+{ HP_POP(itemdb->read_itemdelay), HP_POP2(HP_itemdb_read_itemdelay), 2462 },
+{ HP_POP(itemdb->read_stack), HP_POP2(HP_itemdb_read_stack), 2464 },
+{ HP_POP(itemdb->read_buyingstore), HP_POP2(HP_itemdb_read_buyingstore), 2466 },
+{ HP_POP(itemdb->read_nouse), HP_POP2(HP_itemdb_read_nouse), 2468 },
+{ HP_POP(itemdb->combo_split_atoi), HP_POP2(HP_itemdb_combo_split_atoi), 2470 },
+{ HP_POP(itemdb->read_combos), HP_POP2(HP_itemdb_read_combos), 2472 },
+{ HP_POP(itemdb->gendercheck), HP_POP2(HP_itemdb_gendercheck), 2474 },
+{ HP_POP(itemdb->re_split_atoi), HP_POP2(HP_itemdb_re_split_atoi), 2476 },
+{ HP_POP(itemdb->readdb), HP_POP2(HP_itemdb_readdb), 2478 },
+{ HP_POP(itemdb->read_sqldb), HP_POP2(HP_itemdb_read_sqldb), 2480 },
+{ HP_POP(itemdb->unique_id), HP_POP2(HP_itemdb_unique_id), 2482 },
+{ HP_POP(itemdb->uid_load), HP_POP2(HP_itemdb_uid_load), 2484 },
+{ HP_POP(itemdb->read), HP_POP2(HP_itemdb_read), 2486 },
+{ HP_POP(itemdb->destroy_item_data), HP_POP2(HP_itemdb_destroy_item_data), 2488 },
+{ HP_POP(itemdb->final_sub), HP_POP2(HP_itemdb_final_sub), 2490 },
 /* logs */
-{ HP_POP(logs->pick_pc), HP_POP2(HP_logs_pick_pc), 2488 },
-{ HP_POP(logs->pick_mob), HP_POP2(HP_logs_pick_mob), 2490 },
-{ HP_POP(logs->zeny), HP_POP2(HP_logs_zeny), 2492 },
-{ HP_POP(logs->npc), HP_POP2(HP_logs_npc), 2494 },
-{ HP_POP(logs->chat), HP_POP2(HP_logs_chat), 2496 },
-{ HP_POP(logs->atcommand), HP_POP2(HP_logs_atcommand), 2498 },
-{ HP_POP(logs->branch), HP_POP2(HP_logs_branch), 2500 },
-{ HP_POP(logs->mvpdrop), HP_POP2(HP_logs_mvpdrop), 2502 },
-{ HP_POP(logs->pick_sub), HP_POP2(HP_logs_pick_sub), 2504 },
-{ HP_POP(logs->zeny_sub), HP_POP2(HP_logs_zeny_sub), 2506 },
-{ HP_POP(logs->npc_sub), HP_POP2(HP_logs_npc_sub), 2508 },
-{ HP_POP(logs->chat_sub), HP_POP2(HP_logs_chat_sub), 2510 },
-{ HP_POP(logs->atcommand_sub), HP_POP2(HP_logs_atcommand_sub), 2512 },
-{ HP_POP(logs->branch_sub), HP_POP2(HP_logs_branch_sub), 2514 },
-{ HP_POP(logs->mvpdrop_sub), HP_POP2(HP_logs_mvpdrop_sub), 2516 },
-{ HP_POP(logs->config_read), HP_POP2(HP_logs_config_read), 2518 },
-{ HP_POP(logs->config_done), HP_POP2(HP_logs_config_done), 2520 },
-{ HP_POP(logs->sql_init), HP_POP2(HP_logs_sql_init), 2522 },
-{ HP_POP(logs->sql_final), HP_POP2(HP_logs_sql_final), 2524 },
-{ HP_POP(logs->picktype2char), HP_POP2(HP_logs_picktype2char), 2526 },
-{ HP_POP(logs->chattype2char), HP_POP2(HP_logs_chattype2char), 2528 },
-{ HP_POP(logs->should_log_item), HP_POP2(HP_logs_should_log_item), 2530 },
+{ HP_POP(logs->pick_pc), HP_POP2(HP_logs_pick_pc), 2492 },
+{ HP_POP(logs->pick_mob), HP_POP2(HP_logs_pick_mob), 2494 },
+{ HP_POP(logs->zeny), HP_POP2(HP_logs_zeny), 2496 },
+{ HP_POP(logs->npc), HP_POP2(HP_logs_npc), 2498 },
+{ HP_POP(logs->chat), HP_POP2(HP_logs_chat), 2500 },
+{ HP_POP(logs->atcommand), HP_POP2(HP_logs_atcommand), 2502 },
+{ HP_POP(logs->branch), HP_POP2(HP_logs_branch), 2504 },
+{ HP_POP(logs->mvpdrop), HP_POP2(HP_logs_mvpdrop), 2506 },
+{ HP_POP(logs->pick_sub), HP_POP2(HP_logs_pick_sub), 2508 },
+{ HP_POP(logs->zeny_sub), HP_POP2(HP_logs_zeny_sub), 2510 },
+{ HP_POP(logs->npc_sub), HP_POP2(HP_logs_npc_sub), 2512 },
+{ HP_POP(logs->chat_sub), HP_POP2(HP_logs_chat_sub), 2514 },
+{ HP_POP(logs->atcommand_sub), HP_POP2(HP_logs_atcommand_sub), 2516 },
+{ HP_POP(logs->branch_sub), HP_POP2(HP_logs_branch_sub), 2518 },
+{ HP_POP(logs->mvpdrop_sub), HP_POP2(HP_logs_mvpdrop_sub), 2520 },
+{ HP_POP(logs->config_read), HP_POP2(HP_logs_config_read), 2522 },
+{ HP_POP(logs->config_done), HP_POP2(HP_logs_config_done), 2524 },
+{ HP_POP(logs->sql_init), HP_POP2(HP_logs_sql_init), 2526 },
+{ HP_POP(logs->sql_final), HP_POP2(HP_logs_sql_final), 2528 },
+{ HP_POP(logs->picktype2char), HP_POP2(HP_logs_picktype2char), 2530 },
+{ HP_POP(logs->chattype2char), HP_POP2(HP_logs_chattype2char), 2532 },
+{ HP_POP(logs->should_log_item), HP_POP2(HP_logs_should_log_item), 2534 },
 /* mail */
-{ HP_POP(mail->clear), HP_POP2(HP_mail_clear), 2532 },
-{ HP_POP(mail->removeitem), HP_POP2(HP_mail_removeitem), 2534 },
-{ HP_POP(mail->removezeny), HP_POP2(HP_mail_removezeny), 2536 },
-{ HP_POP(mail->setitem), HP_POP2(HP_mail_setitem), 2538 },
-{ HP_POP(mail->setattachment), HP_POP2(HP_mail_setattachment), 2540 },
-{ HP_POP(mail->getattachment), HP_POP2(HP_mail_getattachment), 2542 },
-{ HP_POP(mail->openmail), HP_POP2(HP_mail_openmail), 2544 },
-{ HP_POP(mail->deliveryfail), HP_POP2(HP_mail_deliveryfail), 2546 },
-{ HP_POP(mail->invalid_operation), HP_POP2(HP_mail_invalid_operation), 2548 },
+{ HP_POP(mail->clear), HP_POP2(HP_mail_clear), 2536 },
+{ HP_POP(mail->removeitem), HP_POP2(HP_mail_removeitem), 2538 },
+{ HP_POP(mail->removezeny), HP_POP2(HP_mail_removezeny), 2540 },
+{ HP_POP(mail->setitem), HP_POP2(HP_mail_setitem), 2542 },
+{ HP_POP(mail->setattachment), HP_POP2(HP_mail_setattachment), 2544 },
+{ HP_POP(mail->getattachment), HP_POP2(HP_mail_getattachment), 2546 },
+{ HP_POP(mail->openmail), HP_POP2(HP_mail_openmail), 2548 },
+{ HP_POP(mail->deliveryfail), HP_POP2(HP_mail_deliveryfail), 2550 },
+{ HP_POP(mail->invalid_operation), HP_POP2(HP_mail_invalid_operation), 2552 },
 /* map */
-{ HP_POP(map->zone_init), HP_POP2(HP_map_zone_init), 2550 },
-{ HP_POP(map->zone_remove), HP_POP2(HP_map_zone_remove), 2552 },
-{ HP_POP(map->zone_apply), HP_POP2(HP_map_zone_apply), 2554 },
-{ HP_POP(map->zone_change), HP_POP2(HP_map_zone_change), 2556 },
-{ HP_POP(map->zone_change2), HP_POP2(HP_map_zone_change2), 2558 },
-{ HP_POP(map->getcell), HP_POP2(HP_map_getcell), 2560 },
-{ HP_POP(map->setgatcell), HP_POP2(HP_map_setgatcell), 2562 },
-{ HP_POP(map->cellfromcache), HP_POP2(HP_map_cellfromcache), 2564 },
-{ HP_POP(map->setusers), HP_POP2(HP_map_setusers), 2566 },
-{ HP_POP(map->getusers), HP_POP2(HP_map_getusers), 2568 },
-{ HP_POP(map->usercount), HP_POP2(HP_map_usercount), 2570 },
-{ HP_POP(map->freeblock), HP_POP2(HP_map_freeblock), 2572 },
-{ HP_POP(map->freeblock_lock), HP_POP2(HP_map_freeblock_lock), 2574 },
-{ HP_POP(map->freeblock_unlock), HP_POP2(HP_map_freeblock_unlock), 2576 },
-{ HP_POP(map->addblock), HP_POP2(HP_map_addblock), 2578 },
-{ HP_POP(map->delblock), HP_POP2(HP_map_delblock), 2580 },
-{ HP_POP(map->moveblock), HP_POP2(HP_map_moveblock), 2582 },
-{ HP_POP(map->count_oncell), HP_POP2(HP_map_count_oncell), 2584 },
-{ HP_POP(map->find_skill_unit_oncell), HP_POP2(HP_map_find_skill_unit_oncell), 2586 },
-{ HP_POP(map->get_new_object_id), HP_POP2(HP_map_get_new_object_id), 2588 },
-{ HP_POP(map->search_freecell), HP_POP2(HP_map_search_freecell), 2590 },
-{ HP_POP(map->quit), HP_POP2(HP_map_quit), 2592 },
-{ HP_POP(map->addnpc), HP_POP2(HP_map_addnpc), 2594 },
-{ HP_POP(map->clearflooritem_timer), HP_POP2(HP_map_clearflooritem_timer), 2596 },
-{ HP_POP(map->removemobs_timer), HP_POP2(HP_map_removemobs_timer), 2598 },
-{ HP_POP(map->clearflooritem), HP_POP2(HP_map_clearflooritem), 2600 },
-{ HP_POP(map->addflooritem), HP_POP2(HP_map_addflooritem), 2602 },
-{ HP_POP(map->addnickdb), HP_POP2(HP_map_addnickdb), 2604 },
-{ HP_POP(map->delnickdb), HP_POP2(HP_map_delnickdb), 2606 },
-{ HP_POP(map->reqnickdb), HP_POP2(HP_map_reqnickdb), 2608 },
-{ HP_POP(map->charid2nick), HP_POP2(HP_map_charid2nick), 2610 },
-{ HP_POP(map->charid2sd), HP_POP2(HP_map_charid2sd), 2612 },
-{ HP_POP(map->vforeachpc), HP_POP2(HP_map_vforeachpc), 2614 },
-{ HP_POP(map->vforeachmob), HP_POP2(HP_map_vforeachmob), 2616 },
-{ HP_POP(map->vforeachnpc), HP_POP2(HP_map_vforeachnpc), 2618 },
-{ HP_POP(map->vforeachregen), HP_POP2(HP_map_vforeachregen), 2620 },
-{ HP_POP(map->vforeachiddb), HP_POP2(HP_map_vforeachiddb), 2622 },
-{ HP_POP(map->vforeachinrange), HP_POP2(HP_map_vforeachinrange), 2624 },
-{ HP_POP(map->vforeachinshootrange), HP_POP2(HP_map_vforeachinshootrange), 2626 },
-{ HP_POP(map->vforeachinarea), HP_POP2(HP_map_vforeachinarea), 2628 },
-{ HP_POP(map->vforcountinrange), HP_POP2(HP_map_vforcountinrange), 2630 },
-{ HP_POP(map->vforcountinarea), HP_POP2(HP_map_vforcountinarea), 2632 },
-{ HP_POP(map->vforeachinmovearea), HP_POP2(HP_map_vforeachinmovearea), 2634 },
-{ HP_POP(map->vforeachincell), HP_POP2(HP_map_vforeachincell), 2636 },
-{ HP_POP(map->vforeachinpath), HP_POP2(HP_map_vforeachinpath), 2638 },
-{ HP_POP(map->vforeachinmap), HP_POP2(HP_map_vforeachinmap), 2640 },
-{ HP_POP(map->vforeachininstance), HP_POP2(HP_map_vforeachininstance), 2642 },
-{ HP_POP(map->id2sd), HP_POP2(HP_map_id2sd), 2644 },
-{ HP_POP(map->id2md), HP_POP2(HP_map_id2md), 2646 },
-{ HP_POP(map->id2nd), HP_POP2(HP_map_id2nd), 2648 },
-{ HP_POP(map->id2hd), HP_POP2(HP_map_id2hd), 2650 },
-{ HP_POP(map->id2mc), HP_POP2(HP_map_id2mc), 2652 },
-{ HP_POP(map->id2cd), HP_POP2(HP_map_id2cd), 2654 },
-{ HP_POP(map->id2bl), HP_POP2(HP_map_id2bl), 2656 },
-{ HP_POP(map->blid_exists), HP_POP2(HP_map_blid_exists), 2658 },
-{ HP_POP(map->mapindex2mapid), HP_POP2(HP_map_mapindex2mapid), 2660 },
-{ HP_POP(map->mapname2mapid), HP_POP2(HP_map_mapname2mapid), 2662 },
-{ HP_POP(map->mapname2ipport), HP_POP2(HP_map_mapname2ipport), 2664 },
-{ HP_POP(map->setipport), HP_POP2(HP_map_setipport), 2666 },
-{ HP_POP(map->eraseipport), HP_POP2(HP_map_eraseipport), 2668 },
-{ HP_POP(map->eraseallipport), HP_POP2(HP_map_eraseallipport), 2670 },
-{ HP_POP(map->addiddb), HP_POP2(HP_map_addiddb), 2672 },
-{ HP_POP(map->deliddb), HP_POP2(HP_map_deliddb), 2674 },
-{ HP_POP(map->nick2sd), HP_POP2(HP_map_nick2sd), 2676 },
-{ HP_POP(map->getmob_boss), HP_POP2(HP_map_getmob_boss), 2678 },
-{ HP_POP(map->id2boss), HP_POP2(HP_map_id2boss), 2680 },
-{ HP_POP(map->reloadnpc), HP_POP2(HP_map_reloadnpc), 2682 },
-{ HP_POP(map->check_dir), HP_POP2(HP_map_check_dir), 2684 },
-{ HP_POP(map->calc_dir), HP_POP2(HP_map_calc_dir), 2686 },
-{ HP_POP(map->random_dir), HP_POP2(HP_map_random_dir), 2688 },
-{ HP_POP(map->cleanup_sub), HP_POP2(HP_map_cleanup_sub), 2690 },
-{ HP_POP(map->delmap), HP_POP2(HP_map_delmap), 2692 },
-{ HP_POP(map->flags_init), HP_POP2(HP_map_flags_init), 2694 },
-{ HP_POP(map->iwall_set), HP_POP2(HP_map_iwall_set), 2696 },
-{ HP_POP(map->iwall_get), HP_POP2(HP_map_iwall_get), 2698 },
-{ HP_POP(map->iwall_remove), HP_POP2(HP_map_iwall_remove), 2700 },
-{ HP_POP(map->addmobtolist), HP_POP2(HP_map_addmobtolist), 2702 },
-{ HP_POP(map->spawnmobs), HP_POP2(HP_map_spawnmobs), 2704 },
-{ HP_POP(map->removemobs), HP_POP2(HP_map_removemobs), 2706 },
-{ HP_POP(map->addmap2db), HP_POP2(HP_map_addmap2db), 2708 },
-{ HP_POP(map->removemapdb), HP_POP2(HP_map_removemapdb), 2710 },
-{ HP_POP(map->clean), HP_POP2(HP_map_clean), 2712 },
-{ HP_POP(map->do_shutdown), HP_POP2(HP_map_do_shutdown), 2714 },
-{ HP_POP(map->freeblock_timer), HP_POP2(HP_map_freeblock_timer), 2716 },
-{ HP_POP(map->searchrandfreecell), HP_POP2(HP_map_searchrandfreecell), 2718 },
-{ HP_POP(map->count_sub), HP_POP2(HP_map_count_sub), 2720 },
-{ HP_POP(map->create_charid2nick), HP_POP2(HP_map_create_charid2nick), 2722 },
-{ HP_POP(map->removemobs_sub), HP_POP2(HP_map_removemobs_sub), 2724 },
-{ HP_POP(map->gat2cell), HP_POP2(HP_map_gat2cell), 2726 },
-{ HP_POP(map->cell2gat), HP_POP2(HP_map_cell2gat), 2728 },
-{ HP_POP(map->getcellp), HP_POP2(HP_map_getcellp), 2730 },
-{ HP_POP(map->setcell), HP_POP2(HP_map_setcell), 2732 },
-{ HP_POP(map->sub_getcellp), HP_POP2(HP_map_sub_getcellp), 2734 },
-{ HP_POP(map->sub_setcell), HP_POP2(HP_map_sub_setcell), 2736 },
-{ HP_POP(map->iwall_nextxy), HP_POP2(HP_map_iwall_nextxy), 2738 },
-{ HP_POP(map->create_map_data_other_server), HP_POP2(HP_map_create_map_data_other_server), 2740 },
-{ HP_POP(map->eraseallipport_sub), HP_POP2(HP_map_eraseallipport_sub), 2742 },
-{ HP_POP(map->init_mapcache), HP_POP2(HP_map_init_mapcache), 2744 },
-{ HP_POP(map->readfromcache), HP_POP2(HP_map_readfromcache), 2746 },
-{ HP_POP(map->addmap), HP_POP2(HP_map_addmap), 2748 },
-{ HP_POP(map->delmapid), HP_POP2(HP_map_delmapid), 2750 },
-{ HP_POP(map->zone_db_clear), HP_POP2(HP_map_zone_db_clear), 2752 },
-{ HP_POP(map->list_final), HP_POP2(HP_map_list_final), 2754 },
-{ HP_POP(map->waterheight), HP_POP2(HP_map_waterheight), 2756 },
-{ HP_POP(map->readgat), HP_POP2(HP_map_readgat), 2758 },
-{ HP_POP(map->readallmaps), HP_POP2(HP_map_readallmaps), 2760 },
-{ HP_POP(map->config_read), HP_POP2(HP_map_config_read), 2762 },
-{ HP_POP(map->config_read_sub), HP_POP2(HP_map_config_read_sub), 2764 },
-{ HP_POP(map->reloadnpc_sub), HP_POP2(HP_map_reloadnpc_sub), 2766 },
-{ HP_POP(map->inter_config_read), HP_POP2(HP_map_inter_config_read), 2768 },
-{ HP_POP(map->sql_init), HP_POP2(HP_map_sql_init), 2770 },
-{ HP_POP(map->sql_close), HP_POP2(HP_map_sql_close), 2772 },
-{ HP_POP(map->zone_mf_cache), HP_POP2(HP_map_zone_mf_cache), 2774 },
-{ HP_POP(map->zone_str2itemid), HP_POP2(HP_map_zone_str2itemid), 2776 },
-{ HP_POP(map->zone_str2skillid), HP_POP2(HP_map_zone_str2skillid), 2778 },
-{ HP_POP(map->zone_bl_type), HP_POP2(HP_map_zone_bl_type), 2780 },
-{ HP_POP(map->read_zone_db), HP_POP2(HP_map_read_zone_db), 2782 },
-{ HP_POP(map->db_final), HP_POP2(HP_map_db_final), 2784 },
-{ HP_POP(map->nick_db_final), HP_POP2(HP_map_nick_db_final), 2786 },
-{ HP_POP(map->cleanup_db_sub), HP_POP2(HP_map_cleanup_db_sub), 2788 },
-{ HP_POP(map->abort_sub), HP_POP2(HP_map_abort_sub), 2790 },
-{ HP_POP(map->helpscreen), HP_POP2(HP_map_helpscreen), 2792 },
-{ HP_POP(map->versionscreen), HP_POP2(HP_map_versionscreen), 2794 },
-{ HP_POP(map->arg_next_value), HP_POP2(HP_map_arg_next_value), 2796 },
+{ HP_POP(map->zone_init), HP_POP2(HP_map_zone_init), 2554 },
+{ HP_POP(map->zone_remove), HP_POP2(HP_map_zone_remove), 2556 },
+{ HP_POP(map->zone_apply), HP_POP2(HP_map_zone_apply), 2558 },
+{ HP_POP(map->zone_change), HP_POP2(HP_map_zone_change), 2560 },
+{ HP_POP(map->zone_change2), HP_POP2(HP_map_zone_change2), 2562 },
+{ HP_POP(map->getcell), HP_POP2(HP_map_getcell), 2564 },
+{ HP_POP(map->setgatcell), HP_POP2(HP_map_setgatcell), 2566 },
+{ HP_POP(map->cellfromcache), HP_POP2(HP_map_cellfromcache), 2568 },
+{ HP_POP(map->setusers), HP_POP2(HP_map_setusers), 2570 },
+{ HP_POP(map->getusers), HP_POP2(HP_map_getusers), 2572 },
+{ HP_POP(map->usercount), HP_POP2(HP_map_usercount), 2574 },
+{ HP_POP(map->freeblock), HP_POP2(HP_map_freeblock), 2576 },
+{ HP_POP(map->freeblock_lock), HP_POP2(HP_map_freeblock_lock), 2578 },
+{ HP_POP(map->freeblock_unlock), HP_POP2(HP_map_freeblock_unlock), 2580 },
+{ HP_POP(map->addblock), HP_POP2(HP_map_addblock), 2582 },
+{ HP_POP(map->delblock), HP_POP2(HP_map_delblock), 2584 },
+{ HP_POP(map->moveblock), HP_POP2(HP_map_moveblock), 2586 },
+{ HP_POP(map->count_oncell), HP_POP2(HP_map_count_oncell), 2588 },
+{ HP_POP(map->find_skill_unit_oncell), HP_POP2(HP_map_find_skill_unit_oncell), 2590 },
+{ HP_POP(map->get_new_object_id), HP_POP2(HP_map_get_new_object_id), 2592 },
+{ HP_POP(map->search_freecell), HP_POP2(HP_map_search_freecell), 2594 },
+{ HP_POP(map->quit), HP_POP2(HP_map_quit), 2596 },
+{ HP_POP(map->addnpc), HP_POP2(HP_map_addnpc), 2598 },
+{ HP_POP(map->clearflooritem_timer), HP_POP2(HP_map_clearflooritem_timer), 2600 },
+{ HP_POP(map->removemobs_timer), HP_POP2(HP_map_removemobs_timer), 2602 },
+{ HP_POP(map->clearflooritem), HP_POP2(HP_map_clearflooritem), 2604 },
+{ HP_POP(map->addflooritem), HP_POP2(HP_map_addflooritem), 2606 },
+{ HP_POP(map->addnickdb), HP_POP2(HP_map_addnickdb), 2608 },
+{ HP_POP(map->delnickdb), HP_POP2(HP_map_delnickdb), 2610 },
+{ HP_POP(map->reqnickdb), HP_POP2(HP_map_reqnickdb), 2612 },
+{ HP_POP(map->charid2nick), HP_POP2(HP_map_charid2nick), 2614 },
+{ HP_POP(map->charid2sd), HP_POP2(HP_map_charid2sd), 2616 },
+{ HP_POP(map->vforeachpc), HP_POP2(HP_map_vforeachpc), 2618 },
+{ HP_POP(map->vforeachmob), HP_POP2(HP_map_vforeachmob), 2620 },
+{ HP_POP(map->vforeachnpc), HP_POP2(HP_map_vforeachnpc), 2622 },
+{ HP_POP(map->vforeachregen), HP_POP2(HP_map_vforeachregen), 2624 },
+{ HP_POP(map->vforeachiddb), HP_POP2(HP_map_vforeachiddb), 2626 },
+{ HP_POP(map->vforeachinrange), HP_POP2(HP_map_vforeachinrange), 2628 },
+{ HP_POP(map->vforeachinshootrange), HP_POP2(HP_map_vforeachinshootrange), 2630 },
+{ HP_POP(map->vforeachinarea), HP_POP2(HP_map_vforeachinarea), 2632 },
+{ HP_POP(map->vforcountinrange), HP_POP2(HP_map_vforcountinrange), 2634 },
+{ HP_POP(map->vforcountinarea), HP_POP2(HP_map_vforcountinarea), 2636 },
+{ HP_POP(map->vforeachinmovearea), HP_POP2(HP_map_vforeachinmovearea), 2638 },
+{ HP_POP(map->vforeachincell), HP_POP2(HP_map_vforeachincell), 2640 },
+{ HP_POP(map->vforeachinpath), HP_POP2(HP_map_vforeachinpath), 2642 },
+{ HP_POP(map->vforeachinmap), HP_POP2(HP_map_vforeachinmap), 2644 },
+{ HP_POP(map->vforeachininstance), HP_POP2(HP_map_vforeachininstance), 2646 },
+{ HP_POP(map->id2sd), HP_POP2(HP_map_id2sd), 2648 },
+{ HP_POP(map->id2md), HP_POP2(HP_map_id2md), 2650 },
+{ HP_POP(map->id2nd), HP_POP2(HP_map_id2nd), 2652 },
+{ HP_POP(map->id2hd), HP_POP2(HP_map_id2hd), 2654 },
+{ HP_POP(map->id2mc), HP_POP2(HP_map_id2mc), 2656 },
+{ HP_POP(map->id2cd), HP_POP2(HP_map_id2cd), 2658 },
+{ HP_POP(map->id2bl), HP_POP2(HP_map_id2bl), 2660 },
+{ HP_POP(map->blid_exists), HP_POP2(HP_map_blid_exists), 2662 },
+{ HP_POP(map->mapindex2mapid), HP_POP2(HP_map_mapindex2mapid), 2664 },
+{ HP_POP(map->mapname2mapid), HP_POP2(HP_map_mapname2mapid), 2666 },
+{ HP_POP(map->mapname2ipport), HP_POP2(HP_map_mapname2ipport), 2668 },
+{ HP_POP(map->setipport), HP_POP2(HP_map_setipport), 2670 },
+{ HP_POP(map->eraseipport), HP_POP2(HP_map_eraseipport), 2672 },
+{ HP_POP(map->eraseallipport), HP_POP2(HP_map_eraseallipport), 2674 },
+{ HP_POP(map->addiddb), HP_POP2(HP_map_addiddb), 2676 },
+{ HP_POP(map->deliddb), HP_POP2(HP_map_deliddb), 2678 },
+{ HP_POP(map->nick2sd), HP_POP2(HP_map_nick2sd), 2680 },
+{ HP_POP(map->getmob_boss), HP_POP2(HP_map_getmob_boss), 2682 },
+{ HP_POP(map->id2boss), HP_POP2(HP_map_id2boss), 2684 },
+{ HP_POP(map->reloadnpc), HP_POP2(HP_map_reloadnpc), 2686 },
+{ HP_POP(map->check_dir), HP_POP2(HP_map_check_dir), 2688 },
+{ HP_POP(map->calc_dir), HP_POP2(HP_map_calc_dir), 2690 },
+{ HP_POP(map->random_dir), HP_POP2(HP_map_random_dir), 2692 },
+{ HP_POP(map->cleanup_sub), HP_POP2(HP_map_cleanup_sub), 2694 },
+{ HP_POP(map->delmap), HP_POP2(HP_map_delmap), 2696 },
+{ HP_POP(map->flags_init), HP_POP2(HP_map_flags_init), 2698 },
+{ HP_POP(map->iwall_set), HP_POP2(HP_map_iwall_set), 2700 },
+{ HP_POP(map->iwall_get), HP_POP2(HP_map_iwall_get), 2702 },
+{ HP_POP(map->iwall_remove), HP_POP2(HP_map_iwall_remove), 2704 },
+{ HP_POP(map->addmobtolist), HP_POP2(HP_map_addmobtolist), 2706 },
+{ HP_POP(map->spawnmobs), HP_POP2(HP_map_spawnmobs), 2708 },
+{ HP_POP(map->removemobs), HP_POP2(HP_map_removemobs), 2710 },
+{ HP_POP(map->addmap2db), HP_POP2(HP_map_addmap2db), 2712 },
+{ HP_POP(map->removemapdb), HP_POP2(HP_map_removemapdb), 2714 },
+{ HP_POP(map->clean), HP_POP2(HP_map_clean), 2716 },
+{ HP_POP(map->do_shutdown), HP_POP2(HP_map_do_shutdown), 2718 },
+{ HP_POP(map->freeblock_timer), HP_POP2(HP_map_freeblock_timer), 2720 },
+{ HP_POP(map->searchrandfreecell), HP_POP2(HP_map_searchrandfreecell), 2722 },
+{ HP_POP(map->count_sub), HP_POP2(HP_map_count_sub), 2724 },
+{ HP_POP(map->create_charid2nick), HP_POP2(HP_map_create_charid2nick), 2726 },
+{ HP_POP(map->removemobs_sub), HP_POP2(HP_map_removemobs_sub), 2728 },
+{ HP_POP(map->gat2cell), HP_POP2(HP_map_gat2cell), 2730 },
+{ HP_POP(map->cell2gat), HP_POP2(HP_map_cell2gat), 2732 },
+{ HP_POP(map->getcellp), HP_POP2(HP_map_getcellp), 2734 },
+{ HP_POP(map->setcell), HP_POP2(HP_map_setcell), 2736 },
+{ HP_POP(map->sub_getcellp), HP_POP2(HP_map_sub_getcellp), 2738 },
+{ HP_POP(map->sub_setcell), HP_POP2(HP_map_sub_setcell), 2740 },
+{ HP_POP(map->iwall_nextxy), HP_POP2(HP_map_iwall_nextxy), 2742 },
+{ HP_POP(map->create_map_data_other_server), HP_POP2(HP_map_create_map_data_other_server), 2744 },
+{ HP_POP(map->eraseallipport_sub), HP_POP2(HP_map_eraseallipport_sub), 2746 },
+{ HP_POP(map->init_mapcache), HP_POP2(HP_map_init_mapcache), 2748 },
+{ HP_POP(map->readfromcache), HP_POP2(HP_map_readfromcache), 2750 },
+{ HP_POP(map->addmap), HP_POP2(HP_map_addmap), 2752 },
+{ HP_POP(map->delmapid), HP_POP2(HP_map_delmapid), 2754 },
+{ HP_POP(map->zone_db_clear), HP_POP2(HP_map_zone_db_clear), 2756 },
+{ HP_POP(map->list_final), HP_POP2(HP_map_list_final), 2758 },
+{ HP_POP(map->waterheight), HP_POP2(HP_map_waterheight), 2760 },
+{ HP_POP(map->readgat), HP_POP2(HP_map_readgat), 2762 },
+{ HP_POP(map->readallmaps), HP_POP2(HP_map_readallmaps), 2764 },
+{ HP_POP(map->config_read), HP_POP2(HP_map_config_read), 2766 },
+{ HP_POP(map->config_read_sub), HP_POP2(HP_map_config_read_sub), 2768 },
+{ HP_POP(map->reloadnpc_sub), HP_POP2(HP_map_reloadnpc_sub), 2770 },
+{ HP_POP(map->inter_config_read), HP_POP2(HP_map_inter_config_read), 2772 },
+{ HP_POP(map->sql_init), HP_POP2(HP_map_sql_init), 2774 },
+{ HP_POP(map->sql_close), HP_POP2(HP_map_sql_close), 2776 },
+{ HP_POP(map->zone_mf_cache), HP_POP2(HP_map_zone_mf_cache), 2778 },
+{ HP_POP(map->zone_str2itemid), HP_POP2(HP_map_zone_str2itemid), 2780 },
+{ HP_POP(map->zone_str2skillid), HP_POP2(HP_map_zone_str2skillid), 2782 },
+{ HP_POP(map->zone_bl_type), HP_POP2(HP_map_zone_bl_type), 2784 },
+{ HP_POP(map->read_zone_db), HP_POP2(HP_map_read_zone_db), 2786 },
+{ HP_POP(map->db_final), HP_POP2(HP_map_db_final), 2788 },
+{ HP_POP(map->nick_db_final), HP_POP2(HP_map_nick_db_final), 2790 },
+{ HP_POP(map->cleanup_db_sub), HP_POP2(HP_map_cleanup_db_sub), 2792 },
+{ HP_POP(map->abort_sub), HP_POP2(HP_map_abort_sub), 2794 },
+{ HP_POP(map->helpscreen), HP_POP2(HP_map_helpscreen), 2796 },
+{ HP_POP(map->versionscreen), HP_POP2(HP_map_versionscreen), 2798 },
+{ HP_POP(map->arg_next_value), HP_POP2(HP_map_arg_next_value), 2800 },
+{ HP_POP(map->addblcell), HP_POP2(HP_map_addblcell), 2802 },
+{ HP_POP(map->delblcell), HP_POP2(HP_map_delblcell), 2804 },
 /* mapit */
-{ HP_POP(mapit->alloc), HP_POP2(HP_mapit_alloc), 2798 },
-{ HP_POP(mapit->free), HP_POP2(HP_mapit_free), 2800 },
-{ HP_POP(mapit->first), HP_POP2(HP_mapit_first), 2802 },
-{ HP_POP(mapit->last), HP_POP2(HP_mapit_last), 2804 },
-{ HP_POP(mapit->next), HP_POP2(HP_mapit_next), 2806 },
-{ HP_POP(mapit->prev), HP_POP2(HP_mapit_prev), 2808 },
-{ HP_POP(mapit->exists), HP_POP2(HP_mapit_exists), 2810 },
+{ HP_POP(mapit->alloc), HP_POP2(HP_mapit_alloc), 2806 },
+{ HP_POP(mapit->free), HP_POP2(HP_mapit_free), 2808 },
+{ HP_POP(mapit->first), HP_POP2(HP_mapit_first), 2810 },
+{ HP_POP(mapit->last), HP_POP2(HP_mapit_last), 2812 },
+{ HP_POP(mapit->next), HP_POP2(HP_mapit_next), 2814 },
+{ HP_POP(mapit->prev), HP_POP2(HP_mapit_prev), 2816 },
+{ HP_POP(mapit->exists), HP_POP2(HP_mapit_exists), 2818 },
 /* mapreg */
-{ HP_POP(mapreg->init), HP_POP2(HP_mapreg_init), 2812 },
-{ HP_POP(mapreg->final), HP_POP2(HP_mapreg_final), 2814 },
-{ HP_POP(mapreg->readreg), HP_POP2(HP_mapreg_readreg), 2816 },
-{ HP_POP(mapreg->readregstr), HP_POP2(HP_mapreg_readregstr), 2818 },
-{ HP_POP(mapreg->setreg), HP_POP2(HP_mapreg_setreg), 2820 },
-{ HP_POP(mapreg->setregstr), HP_POP2(HP_mapreg_setregstr), 2822 },
-{ HP_POP(mapreg->load), HP_POP2(HP_mapreg_load), 2824 },
-{ HP_POP(mapreg->save), HP_POP2(HP_mapreg_save), 2826 },
-{ HP_POP(mapreg->save_timer), HP_POP2(HP_mapreg_save_timer), 2828 },
-{ HP_POP(mapreg->reload), HP_POP2(HP_mapreg_reload), 2830 },
-{ HP_POP(mapreg->config_read), HP_POP2(HP_mapreg_config_read), 2832 },
+{ HP_POP(mapreg->init), HP_POP2(HP_mapreg_init), 2820 },
+{ HP_POP(mapreg->final), HP_POP2(HP_mapreg_final), 2822 },
+{ HP_POP(mapreg->readreg), HP_POP2(HP_mapreg_readreg), 2824 },
+{ HP_POP(mapreg->readregstr), HP_POP2(HP_mapreg_readregstr), 2826 },
+{ HP_POP(mapreg->setreg), HP_POP2(HP_mapreg_setreg), 2828 },
+{ HP_POP(mapreg->setregstr), HP_POP2(HP_mapreg_setregstr), 2830 },
+{ HP_POP(mapreg->load), HP_POP2(HP_mapreg_load), 2832 },
+{ HP_POP(mapreg->save), HP_POP2(HP_mapreg_save), 2834 },
+{ HP_POP(mapreg->save_timer), HP_POP2(HP_mapreg_save_timer), 2836 },
+{ HP_POP(mapreg->reload), HP_POP2(HP_mapreg_reload), 2838 },
+{ HP_POP(mapreg->config_read), HP_POP2(HP_mapreg_config_read), 2840 },
 /* mercenary */
-{ HP_POP(mercenary->init), HP_POP2(HP_mercenary_init), 2834 },
-{ HP_POP(mercenary->class), HP_POP2(HP_mercenary_class), 2836 },
-{ HP_POP(mercenary->get_viewdata), HP_POP2(HP_mercenary_get_viewdata), 2838 },
-{ HP_POP(mercenary->create), HP_POP2(HP_mercenary_create), 2840 },
-{ HP_POP(mercenary->data_received), HP_POP2(HP_mercenary_data_received), 2842 },
-{ HP_POP(mercenary->save), HP_POP2(HP_mercenary_save), 2844 },
-{ HP_POP(mercenary->heal), HP_POP2(HP_mercenary_heal), 2846 },
-{ HP_POP(mercenary->dead), HP_POP2(HP_mercenary_dead), 2848 },
-{ HP_POP(mercenary->delete), HP_POP2(HP_mercenary_delete), 2850 },
-{ HP_POP(mercenary->contract_stop), HP_POP2(HP_mercenary_contract_stop), 2852 },
-{ HP_POP(mercenary->get_lifetime), HP_POP2(HP_mercenary_get_lifetime), 2854 },
-{ HP_POP(mercenary->get_guild), HP_POP2(HP_mercenary_get_guild), 2856 },
-{ HP_POP(mercenary->get_faith), HP_POP2(HP_mercenary_get_faith), 2858 },
-{ HP_POP(mercenary->set_faith), HP_POP2(HP_mercenary_set_faith), 2860 },
-{ HP_POP(mercenary->get_calls), HP_POP2(HP_mercenary_get_calls), 2862 },
-{ HP_POP(mercenary->set_calls), HP_POP2(HP_mercenary_set_calls), 2864 },
-{ HP_POP(mercenary->kills), HP_POP2(HP_mercenary_kills), 2866 },
-{ HP_POP(mercenary->checkskill), HP_POP2(HP_mercenary_checkskill), 2868 },
-{ HP_POP(mercenary->read_db), HP_POP2(HP_mercenary_read_db), 2870 },
-{ HP_POP(mercenary->read_skilldb), HP_POP2(HP_mercenary_read_skilldb), 2872 },
-{ HP_POP(mercenary->killbonus), HP_POP2(HP_mercenary_killbonus), 2874 },
-{ HP_POP(mercenary->search_index), HP_POP2(HP_mercenary_search_index), 2876 },
-{ HP_POP(mercenary->contract_end_timer), HP_POP2(HP_mercenary_contract_end_timer), 2878 },
-{ HP_POP(mercenary->read_db_sub), HP_POP2(HP_mercenary_read_db_sub), 2880 },
-{ HP_POP(mercenary->read_skill_db_sub), HP_POP2(HP_mercenary_read_skill_db_sub), 2882 },
+{ HP_POP(mercenary->init), HP_POP2(HP_mercenary_init), 2842 },
+{ HP_POP(mercenary->class), HP_POP2(HP_mercenary_class), 2844 },
+{ HP_POP(mercenary->get_viewdata), HP_POP2(HP_mercenary_get_viewdata), 2846 },
+{ HP_POP(mercenary->create), HP_POP2(HP_mercenary_create), 2848 },
+{ HP_POP(mercenary->data_received), HP_POP2(HP_mercenary_data_received), 2850 },
+{ HP_POP(mercenary->save), HP_POP2(HP_mercenary_save), 2852 },
+{ HP_POP(mercenary->heal), HP_POP2(HP_mercenary_heal), 2854 },
+{ HP_POP(mercenary->dead), HP_POP2(HP_mercenary_dead), 2856 },
+{ HP_POP(mercenary->delete), HP_POP2(HP_mercenary_delete), 2858 },
+{ HP_POP(mercenary->contract_stop), HP_POP2(HP_mercenary_contract_stop), 2860 },
+{ HP_POP(mercenary->get_lifetime), HP_POP2(HP_mercenary_get_lifetime), 2862 },
+{ HP_POP(mercenary->get_guild), HP_POP2(HP_mercenary_get_guild), 2864 },
+{ HP_POP(mercenary->get_faith), HP_POP2(HP_mercenary_get_faith), 2866 },
+{ HP_POP(mercenary->set_faith), HP_POP2(HP_mercenary_set_faith), 2868 },
+{ HP_POP(mercenary->get_calls), HP_POP2(HP_mercenary_get_calls), 2870 },
+{ HP_POP(mercenary->set_calls), HP_POP2(HP_mercenary_set_calls), 2872 },
+{ HP_POP(mercenary->kills), HP_POP2(HP_mercenary_kills), 2874 },
+{ HP_POP(mercenary->checkskill), HP_POP2(HP_mercenary_checkskill), 2876 },
+{ HP_POP(mercenary->read_db), HP_POP2(HP_mercenary_read_db), 2878 },
+{ HP_POP(mercenary->read_skilldb), HP_POP2(HP_mercenary_read_skilldb), 2880 },
+{ HP_POP(mercenary->killbonus), HP_POP2(HP_mercenary_killbonus), 2882 },
+{ HP_POP(mercenary->search_index), HP_POP2(HP_mercenary_search_index), 2884 },
+{ HP_POP(mercenary->contract_end_timer), HP_POP2(HP_mercenary_contract_end_timer), 2886 },
+{ HP_POP(mercenary->read_db_sub), HP_POP2(HP_mercenary_read_db_sub), 2888 },
+{ HP_POP(mercenary->read_skill_db_sub), HP_POP2(HP_mercenary_read_skill_db_sub), 2890 },
 /* mob */
-{ HP_POP(mob->init), HP_POP2(HP_mob_init), 2884 },
-{ HP_POP(mob->final), HP_POP2(HP_mob_final), 2886 },
-{ HP_POP(mob->reload), HP_POP2(HP_mob_reload), 2888 },
-{ HP_POP(mob->db), HP_POP2(HP_mob_db), 2890 },
-{ HP_POP(mob->chat), HP_POP2(HP_mob_chat), 2892 },
-{ HP_POP(mob->makedummymobdb), HP_POP2(HP_mob_makedummymobdb), 2894 },
-{ HP_POP(mob->spawn_guardian_sub), HP_POP2(HP_mob_spawn_guardian_sub), 2896 },
-{ HP_POP(mob->skill_id2skill_idx), HP_POP2(HP_mob_skill_id2skill_idx), 2898 },
-{ HP_POP(mob->db_searchname), HP_POP2(HP_mob_db_searchname), 2900 },
-{ HP_POP(mob->db_searchname_array_sub), HP_POP2(HP_mob_db_searchname_array_sub), 2902 },
-{ HP_POP(mob->mvptomb_create), HP_POP2(HP_mob_mvptomb_create), 2904 },
-{ HP_POP(mob->mvptomb_destroy), HP_POP2(HP_mob_mvptomb_destroy), 2906 },
-{ HP_POP(mob->db_searchname_array), HP_POP2(HP_mob_db_searchname_array), 2908 },
-{ HP_POP(mob->db_checkid), HP_POP2(HP_mob_db_checkid), 2910 },
-{ HP_POP(mob->get_viewdata), HP_POP2(HP_mob_get_viewdata), 2912 },
-{ HP_POP(mob->parse_dataset), HP_POP2(HP_mob_parse_dataset), 2914 },
-{ HP_POP(mob->spawn_dataset), HP_POP2(HP_mob_spawn_dataset), 2916 },
-{ HP_POP(mob->get_random_id), HP_POP2(HP_mob_get_random_id), 2918 },
-{ HP_POP(mob->ksprotected), HP_POP2(HP_mob_ksprotected), 2920 },
-{ HP_POP(mob->once_spawn_sub), HP_POP2(HP_mob_once_spawn_sub), 2922 },
-{ HP_POP(mob->once_spawn), HP_POP2(HP_mob_once_spawn), 2924 },
-{ HP_POP(mob->once_spawn_area), HP_POP2(HP_mob_once_spawn_area), 2926 },
-{ HP_POP(mob->spawn_guardian), HP_POP2(HP_mob_spawn_guardian), 2928 },
-{ HP_POP(mob->spawn_bg), HP_POP2(HP_mob_spawn_bg), 2930 },
-{ HP_POP(mob->can_reach), HP_POP2(HP_mob_can_reach), 2932 },
-{ HP_POP(mob->linksearch), HP_POP2(HP_mob_linksearch), 2934 },
-{ HP_POP(mob->delayspawn), HP_POP2(HP_mob_delayspawn), 2936 },
-{ HP_POP(mob->setdelayspawn), HP_POP2(HP_mob_setdelayspawn), 2938 },
-{ HP_POP(mob->count_sub), HP_POP2(HP_mob_count_sub), 2940 },
-{ HP_POP(mob->spawn), HP_POP2(HP_mob_spawn), 2942 },
-{ HP_POP(mob->can_changetarget), HP_POP2(HP_mob_can_changetarget), 2944 },
-{ HP_POP(mob->target), HP_POP2(HP_mob_target), 2946 },
-{ HP_POP(mob->ai_sub_hard_activesearch), HP_POP2(HP_mob_ai_sub_hard_activesearch), 2948 },
-{ HP_POP(mob->ai_sub_hard_changechase), HP_POP2(HP_mob_ai_sub_hard_changechase), 2950 },
-{ HP_POP(mob->ai_sub_hard_bg_ally), HP_POP2(HP_mob_ai_sub_hard_bg_ally), 2952 },
-{ HP_POP(mob->ai_sub_hard_lootsearch), HP_POP2(HP_mob_ai_sub_hard_lootsearch), 2954 },
-{ HP_POP(mob->warpchase_sub), HP_POP2(HP_mob_warpchase_sub), 2956 },
-{ HP_POP(mob->ai_sub_hard_slavemob), HP_POP2(HP_mob_ai_sub_hard_slavemob), 2958 },
-{ HP_POP(mob->unlocktarget), HP_POP2(HP_mob_unlocktarget), 2960 },
-{ HP_POP(mob->randomwalk), HP_POP2(HP_mob_randomwalk), 2962 },
-{ HP_POP(mob->warpchase), HP_POP2(HP_mob_warpchase), 2964 },
-{ HP_POP(mob->ai_sub_hard), HP_POP2(HP_mob_ai_sub_hard), 2966 },
-{ HP_POP(mob->ai_sub_hard_timer), HP_POP2(HP_mob_ai_sub_hard_timer), 2968 },
-{ HP_POP(mob->ai_sub_foreachclient), HP_POP2(HP_mob_ai_sub_foreachclient), 2970 },
-{ HP_POP(mob->ai_sub_lazy), HP_POP2(HP_mob_ai_sub_lazy), 2972 },
-{ HP_POP(mob->ai_lazy), HP_POP2(HP_mob_ai_lazy), 2974 },
-{ HP_POP(mob->ai_hard), HP_POP2(HP_mob_ai_hard), 2976 },
-{ HP_POP(mob->setdropitem), HP_POP2(HP_mob_setdropitem), 2978 },
-{ HP_POP(mob->setlootitem), HP_POP2(HP_mob_setlootitem), 2980 },
-{ HP_POP(mob->delay_item_drop), HP_POP2(HP_mob_delay_item_drop), 2982 },
-{ HP_POP(mob->item_drop), HP_POP2(HP_mob_item_drop), 2984 },
-{ HP_POP(mob->timer_delete), HP_POP2(HP_mob_timer_delete), 2986 },
-{ HP_POP(mob->deleteslave_sub), HP_POP2(HP_mob_deleteslave_sub), 2988 },
-{ HP_POP(mob->deleteslave), HP_POP2(HP_mob_deleteslave), 2990 },
-{ HP_POP(mob->respawn), HP_POP2(HP_mob_respawn), 2992 },
-{ HP_POP(mob->log_damage), HP_POP2(HP_mob_log_damage), 2994 },
-{ HP_POP(mob->damage), HP_POP2(HP_mob_damage), 2996 },
-{ HP_POP(mob->dead), HP_POP2(HP_mob_dead), 2998 },
-{ HP_POP(mob->revive), HP_POP2(HP_mob_revive), 3000 },
-{ HP_POP(mob->guardian_guildchange), HP_POP2(HP_mob_guardian_guildchange), 3002 },
-{ HP_POP(mob->random_class), HP_POP2(HP_mob_random_class), 3004 },
-{ HP_POP(mob->class_change), HP_POP2(HP_mob_class_change), 3006 },
-{ HP_POP(mob->heal), HP_POP2(HP_mob_heal), 3008 },
-{ HP_POP(mob->warpslave_sub), HP_POP2(HP_mob_warpslave_sub), 3010 },
-{ HP_POP(mob->warpslave), HP_POP2(HP_mob_warpslave), 3012 },
-{ HP_POP(mob->countslave_sub), HP_POP2(HP_mob_countslave_sub), 3014 },
-{ HP_POP(mob->countslave), HP_POP2(HP_mob_countslave), 3016 },
-{ HP_POP(mob->summonslave), HP_POP2(HP_mob_summonslave), 3018 },
-{ HP_POP(mob->getfriendhprate_sub), HP_POP2(HP_mob_getfriendhprate_sub), 3020 },
-{ HP_POP(mob->getfriendhprate), HP_POP2(HP_mob_getfriendhprate), 3022 },
-{ HP_POP(mob->getmasterhpltmaxrate), HP_POP2(HP_mob_getmasterhpltmaxrate), 3024 },
-{ HP_POP(mob->getfriendstatus_sub), HP_POP2(HP_mob_getfriendstatus_sub), 3026 },
-{ HP_POP(mob->getfriendstatus), HP_POP2(HP_mob_getfriendstatus), 3028 },
-{ HP_POP(mob->skill_use), HP_POP2(HP_mob_skill_use), 3030 },
-{ HP_POP(mob->skill_event), HP_POP2(HP_mob_skill_event), 3032 },
-{ HP_POP(mob->is_clone), HP_POP2(HP_mob_is_clone), 3034 },
-{ HP_POP(mob->clone_spawn), HP_POP2(HP_mob_clone_spawn), 3036 },
-{ HP_POP(mob->clone_delete), HP_POP2(HP_mob_clone_delete), 3038 },
-{ HP_POP(mob->drop_adjust), HP_POP2(HP_mob_drop_adjust), 3040 },
-{ HP_POP(mob->item_dropratio_adjust), HP_POP2(HP_mob_item_dropratio_adjust), 3042 },
-{ HP_POP(mob->parse_dbrow), HP_POP2(HP_mob_parse_dbrow), 3044 },
-{ HP_POP(mob->readdb_sub), HP_POP2(HP_mob_readdb_sub), 3046 },
-{ HP_POP(mob->readdb), HP_POP2(HP_mob_readdb), 3048 },
-{ HP_POP(mob->read_sqldb), HP_POP2(HP_mob_read_sqldb), 3050 },
-{ HP_POP(mob->readdb_mobavail), HP_POP2(HP_mob_readdb_mobavail), 3052 },
-{ HP_POP(mob->read_randommonster), HP_POP2(HP_mob_read_randommonster), 3054 },
-{ HP_POP(mob->parse_row_chatdb), HP_POP2(HP_mob_parse_row_chatdb), 3056 },
-{ HP_POP(mob->readchatdb), HP_POP2(HP_mob_readchatdb), 3058 },
-{ HP_POP(mob->parse_row_mobskilldb), HP_POP2(HP_mob_parse_row_mobskilldb), 3060 },
-{ HP_POP(mob->readskilldb), HP_POP2(HP_mob_readskilldb), 3062 },
-{ HP_POP(mob->read_sqlskilldb), HP_POP2(HP_mob_read_sqlskilldb), 3064 },
-{ HP_POP(mob->readdb_race2), HP_POP2(HP_mob_readdb_race2), 3066 },
-{ HP_POP(mob->readdb_itemratio), HP_POP2(HP_mob_readdb_itemratio), 3068 },
-{ HP_POP(mob->load), HP_POP2(HP_mob_load), 3070 },
-{ HP_POP(mob->clear_spawninfo), HP_POP2(HP_mob_clear_spawninfo), 3072 },
+{ HP_POP(mob->init), HP_POP2(HP_mob_init), 2892 },
+{ HP_POP(mob->final), HP_POP2(HP_mob_final), 2894 },
+{ HP_POP(mob->reload), HP_POP2(HP_mob_reload), 2896 },
+{ HP_POP(mob->db), HP_POP2(HP_mob_db), 2898 },
+{ HP_POP(mob->chat), HP_POP2(HP_mob_chat), 2900 },
+{ HP_POP(mob->makedummymobdb), HP_POP2(HP_mob_makedummymobdb), 2902 },
+{ HP_POP(mob->spawn_guardian_sub), HP_POP2(HP_mob_spawn_guardian_sub), 2904 },
+{ HP_POP(mob->skill_id2skill_idx), HP_POP2(HP_mob_skill_id2skill_idx), 2906 },
+{ HP_POP(mob->db_searchname), HP_POP2(HP_mob_db_searchname), 2908 },
+{ HP_POP(mob->db_searchname_array_sub), HP_POP2(HP_mob_db_searchname_array_sub), 2910 },
+{ HP_POP(mob->mvptomb_create), HP_POP2(HP_mob_mvptomb_create), 2912 },
+{ HP_POP(mob->mvptomb_destroy), HP_POP2(HP_mob_mvptomb_destroy), 2914 },
+{ HP_POP(mob->db_searchname_array), HP_POP2(HP_mob_db_searchname_array), 2916 },
+{ HP_POP(mob->db_checkid), HP_POP2(HP_mob_db_checkid), 2918 },
+{ HP_POP(mob->get_viewdata), HP_POP2(HP_mob_get_viewdata), 2920 },
+{ HP_POP(mob->parse_dataset), HP_POP2(HP_mob_parse_dataset), 2922 },
+{ HP_POP(mob->spawn_dataset), HP_POP2(HP_mob_spawn_dataset), 2924 },
+{ HP_POP(mob->get_random_id), HP_POP2(HP_mob_get_random_id), 2926 },
+{ HP_POP(mob->ksprotected), HP_POP2(HP_mob_ksprotected), 2928 },
+{ HP_POP(mob->once_spawn_sub), HP_POP2(HP_mob_once_spawn_sub), 2930 },
+{ HP_POP(mob->once_spawn), HP_POP2(HP_mob_once_spawn), 2932 },
+{ HP_POP(mob->once_spawn_area), HP_POP2(HP_mob_once_spawn_area), 2934 },
+{ HP_POP(mob->spawn_guardian), HP_POP2(HP_mob_spawn_guardian), 2936 },
+{ HP_POP(mob->spawn_bg), HP_POP2(HP_mob_spawn_bg), 2938 },
+{ HP_POP(mob->can_reach), HP_POP2(HP_mob_can_reach), 2940 },
+{ HP_POP(mob->linksearch), HP_POP2(HP_mob_linksearch), 2942 },
+{ HP_POP(mob->delayspawn), HP_POP2(HP_mob_delayspawn), 2944 },
+{ HP_POP(mob->setdelayspawn), HP_POP2(HP_mob_setdelayspawn), 2946 },
+{ HP_POP(mob->count_sub), HP_POP2(HP_mob_count_sub), 2948 },
+{ HP_POP(mob->spawn), HP_POP2(HP_mob_spawn), 2950 },
+{ HP_POP(mob->can_changetarget), HP_POP2(HP_mob_can_changetarget), 2952 },
+{ HP_POP(mob->target), HP_POP2(HP_mob_target), 2954 },
+{ HP_POP(mob->ai_sub_hard_activesearch), HP_POP2(HP_mob_ai_sub_hard_activesearch), 2956 },
+{ HP_POP(mob->ai_sub_hard_changechase), HP_POP2(HP_mob_ai_sub_hard_changechase), 2958 },
+{ HP_POP(mob->ai_sub_hard_bg_ally), HP_POP2(HP_mob_ai_sub_hard_bg_ally), 2960 },
+{ HP_POP(mob->ai_sub_hard_lootsearch), HP_POP2(HP_mob_ai_sub_hard_lootsearch), 2962 },
+{ HP_POP(mob->warpchase_sub), HP_POP2(HP_mob_warpchase_sub), 2964 },
+{ HP_POP(mob->ai_sub_hard_slavemob), HP_POP2(HP_mob_ai_sub_hard_slavemob), 2966 },
+{ HP_POP(mob->unlocktarget), HP_POP2(HP_mob_unlocktarget), 2968 },
+{ HP_POP(mob->randomwalk), HP_POP2(HP_mob_randomwalk), 2970 },
+{ HP_POP(mob->warpchase), HP_POP2(HP_mob_warpchase), 2972 },
+{ HP_POP(mob->ai_sub_hard), HP_POP2(HP_mob_ai_sub_hard), 2974 },
+{ HP_POP(mob->ai_sub_hard_timer), HP_POP2(HP_mob_ai_sub_hard_timer), 2976 },
+{ HP_POP(mob->ai_sub_foreachclient), HP_POP2(HP_mob_ai_sub_foreachclient), 2978 },
+{ HP_POP(mob->ai_sub_lazy), HP_POP2(HP_mob_ai_sub_lazy), 2980 },
+{ HP_POP(mob->ai_lazy), HP_POP2(HP_mob_ai_lazy), 2982 },
+{ HP_POP(mob->ai_hard), HP_POP2(HP_mob_ai_hard), 2984 },
+{ HP_POP(mob->setdropitem), HP_POP2(HP_mob_setdropitem), 2986 },
+{ HP_POP(mob->setlootitem), HP_POP2(HP_mob_setlootitem), 2988 },
+{ HP_POP(mob->delay_item_drop), HP_POP2(HP_mob_delay_item_drop), 2990 },
+{ HP_POP(mob->item_drop), HP_POP2(HP_mob_item_drop), 2992 },
+{ HP_POP(mob->timer_delete), HP_POP2(HP_mob_timer_delete), 2994 },
+{ HP_POP(mob->deleteslave_sub), HP_POP2(HP_mob_deleteslave_sub), 2996 },
+{ HP_POP(mob->deleteslave), HP_POP2(HP_mob_deleteslave), 2998 },
+{ HP_POP(mob->respawn), HP_POP2(HP_mob_respawn), 3000 },
+{ HP_POP(mob->log_damage), HP_POP2(HP_mob_log_damage), 3002 },
+{ HP_POP(mob->damage), HP_POP2(HP_mob_damage), 3004 },
+{ HP_POP(mob->dead), HP_POP2(HP_mob_dead), 3006 },
+{ HP_POP(mob->revive), HP_POP2(HP_mob_revive), 3008 },
+{ HP_POP(mob->guardian_guildchange), HP_POP2(HP_mob_guardian_guildchange), 3010 },
+{ HP_POP(mob->random_class), HP_POP2(HP_mob_random_class), 3012 },
+{ HP_POP(mob->class_change), HP_POP2(HP_mob_class_change), 3014 },
+{ HP_POP(mob->heal), HP_POP2(HP_mob_heal), 3016 },
+{ HP_POP(mob->warpslave_sub), HP_POP2(HP_mob_warpslave_sub), 3018 },
+{ HP_POP(mob->warpslave), HP_POP2(HP_mob_warpslave), 3020 },
+{ HP_POP(mob->countslave_sub), HP_POP2(HP_mob_countslave_sub), 3022 },
+{ HP_POP(mob->countslave), HP_POP2(HP_mob_countslave), 3024 },
+{ HP_POP(mob->summonslave), HP_POP2(HP_mob_summonslave), 3026 },
+{ HP_POP(mob->getfriendhprate_sub), HP_POP2(HP_mob_getfriendhprate_sub), 3028 },
+{ HP_POP(mob->getfriendhprate), HP_POP2(HP_mob_getfriendhprate), 3030 },
+{ HP_POP(mob->getmasterhpltmaxrate), HP_POP2(HP_mob_getmasterhpltmaxrate), 3032 },
+{ HP_POP(mob->getfriendstatus_sub), HP_POP2(HP_mob_getfriendstatus_sub), 3034 },
+{ HP_POP(mob->getfriendstatus), HP_POP2(HP_mob_getfriendstatus), 3036 },
+{ HP_POP(mob->skill_use), HP_POP2(HP_mob_skill_use), 3038 },
+{ HP_POP(mob->skill_event), HP_POP2(HP_mob_skill_event), 3040 },
+{ HP_POP(mob->is_clone), HP_POP2(HP_mob_is_clone), 3042 },
+{ HP_POP(mob->clone_spawn), HP_POP2(HP_mob_clone_spawn), 3044 },
+{ HP_POP(mob->clone_delete), HP_POP2(HP_mob_clone_delete), 3046 },
+{ HP_POP(mob->drop_adjust), HP_POP2(HP_mob_drop_adjust), 3048 },
+{ HP_POP(mob->item_dropratio_adjust), HP_POP2(HP_mob_item_dropratio_adjust), 3050 },
+{ HP_POP(mob->parse_dbrow), HP_POP2(HP_mob_parse_dbrow), 3052 },
+{ HP_POP(mob->readdb_sub), HP_POP2(HP_mob_readdb_sub), 3054 },
+{ HP_POP(mob->readdb), HP_POP2(HP_mob_readdb), 3056 },
+{ HP_POP(mob->read_sqldb), HP_POP2(HP_mob_read_sqldb), 3058 },
+{ HP_POP(mob->readdb_mobavail), HP_POP2(HP_mob_readdb_mobavail), 3060 },
+{ HP_POP(mob->read_randommonster), HP_POP2(HP_mob_read_randommonster), 3062 },
+{ HP_POP(mob->parse_row_chatdb), HP_POP2(HP_mob_parse_row_chatdb), 3064 },
+{ HP_POP(mob->readchatdb), HP_POP2(HP_mob_readchatdb), 3066 },
+{ HP_POP(mob->parse_row_mobskilldb), HP_POP2(HP_mob_parse_row_mobskilldb), 3068 },
+{ HP_POP(mob->readskilldb), HP_POP2(HP_mob_readskilldb), 3070 },
+{ HP_POP(mob->read_sqlskilldb), HP_POP2(HP_mob_read_sqlskilldb), 3072 },
+{ HP_POP(mob->readdb_race2), HP_POP2(HP_mob_readdb_race2), 3074 },
+{ HP_POP(mob->readdb_itemratio), HP_POP2(HP_mob_readdb_itemratio), 3076 },
+{ HP_POP(mob->load), HP_POP2(HP_mob_load), 3078 },
+{ HP_POP(mob->clear_spawninfo), HP_POP2(HP_mob_clear_spawninfo), 3080 },
 /* npc */
-{ HP_POP(npc->init), HP_POP2(HP_npc_init), 3074 },
-{ HP_POP(npc->final), HP_POP2(HP_npc_final), 3076 },
-{ HP_POP(npc->get_new_npc_id), HP_POP2(HP_npc_get_new_npc_id), 3078 },
-{ HP_POP(npc->get_viewdata), HP_POP2(HP_npc_get_viewdata), 3080 },
-{ HP_POP(npc->isnear_sub), HP_POP2(HP_npc_isnear_sub), 3082 },
-{ HP_POP(npc->isnear), HP_POP2(HP_npc_isnear), 3084 },
-{ HP_POP(npc->ontouch_event), HP_POP2(HP_npc_ontouch_event), 3086 },
-{ HP_POP(npc->ontouch2_event), HP_POP2(HP_npc_ontouch2_event), 3088 },
-{ HP_POP(npc->enable_sub), HP_POP2(HP_npc_enable_sub), 3090 },
-{ HP_POP(npc->enable), HP_POP2(HP_npc_enable), 3092 },
-{ HP_POP(npc->name2id), HP_POP2(HP_npc_name2id), 3094 },
-{ HP_POP(npc->event_dequeue), HP_POP2(HP_npc_event_dequeue), 3096 },
-{ HP_POP(npc->event_export_create), HP_POP2(HP_npc_event_export_create), 3098 },
-{ HP_POP(npc->event_export), HP_POP2(HP_npc_event_export), 3100 },
-{ HP_POP(npc->event_sub), HP_POP2(HP_npc_event_sub), 3102 },
-{ HP_POP(npc->event_doall_sub), HP_POP2(HP_npc_event_doall_sub), 3104 },
-{ HP_POP(npc->event_do), HP_POP2(HP_npc_event_do), 3106 },
-{ HP_POP(npc->event_doall_id), HP_POP2(HP_npc_event_doall_id), 3108 },
-{ HP_POP(npc->event_doall), HP_POP2(HP_npc_event_doall), 3110 },
-{ HP_POP(npc->event_do_clock), HP_POP2(HP_npc_event_do_clock), 3112 },
-{ HP_POP(npc->event_do_oninit), HP_POP2(HP_npc_event_do_oninit), 3114 },
-{ HP_POP(npc->timerevent_export), HP_POP2(HP_npc_timerevent_export), 3116 },
-{ HP_POP(npc->timerevent), HP_POP2(HP_npc_timerevent), 3118 },
-{ HP_POP(npc->timerevent_start), HP_POP2(HP_npc_timerevent_start), 3120 },
-{ HP_POP(npc->timerevent_stop), HP_POP2(HP_npc_timerevent_stop), 3122 },
-{ HP_POP(npc->timerevent_quit), HP_POP2(HP_npc_timerevent_quit), 3124 },
-{ HP_POP(npc->gettimerevent_tick), HP_POP2(HP_npc_gettimerevent_tick), 3126 },
-{ HP_POP(npc->settimerevent_tick), HP_POP2(HP_npc_settimerevent_tick), 3128 },
-{ HP_POP(npc->event), HP_POP2(HP_npc_event), 3130 },
-{ HP_POP(npc->touch_areanpc_sub), HP_POP2(HP_npc_touch_areanpc_sub), 3132 },
-{ HP_POP(npc->touchnext_areanpc), HP_POP2(HP_npc_touchnext_areanpc), 3134 },
-{ HP_POP(npc->touch_areanpc), HP_POP2(HP_npc_touch_areanpc), 3136 },
-{ HP_POP(npc->touch_areanpc2), HP_POP2(HP_npc_touch_areanpc2), 3138 },
-{ HP_POP(npc->check_areanpc), HP_POP2(HP_npc_check_areanpc), 3140 },
-{ HP_POP(npc->checknear), HP_POP2(HP_npc_checknear), 3142 },
-{ HP_POP(npc->globalmessage), HP_POP2(HP_npc_globalmessage), 3144 },
-{ HP_POP(npc->run_tomb), HP_POP2(HP_npc_run_tomb), 3146 },
-{ HP_POP(npc->click), HP_POP2(HP_npc_click), 3148 },
-{ HP_POP(npc->scriptcont), HP_POP2(HP_npc_scriptcont), 3150 },
-{ HP_POP(npc->buysellsel), HP_POP2(HP_npc_buysellsel), 3152 },
-{ HP_POP(npc->cashshop_buylist), HP_POP2(HP_npc_cashshop_buylist), 3154 },
-{ HP_POP(npc->buylist_sub), HP_POP2(HP_npc_buylist_sub), 3156 },
-{ HP_POP(npc->cashshop_buy), HP_POP2(HP_npc_cashshop_buy), 3158 },
-{ HP_POP(npc->buylist), HP_POP2(HP_npc_buylist), 3160 },
-{ HP_POP(npc->selllist_sub), HP_POP2(HP_npc_selllist_sub), 3162 },
-{ HP_POP(npc->selllist), HP_POP2(HP_npc_selllist), 3164 },
-{ HP_POP(npc->remove_map), HP_POP2(HP_npc_remove_map), 3166 },
-{ HP_POP(npc->unload_ev), HP_POP2(HP_npc_unload_ev), 3168 },
-{ HP_POP(npc->unload_ev_label), HP_POP2(HP_npc_unload_ev_label), 3170 },
-{ HP_POP(npc->unload_dup_sub), HP_POP2(HP_npc_unload_dup_sub), 3172 },
-{ HP_POP(npc->unload_duplicates), HP_POP2(HP_npc_unload_duplicates), 3174 },
-{ HP_POP(npc->unload), HP_POP2(HP_npc_unload), 3176 },
-{ HP_POP(npc->clearsrcfile), HP_POP2(HP_npc_clearsrcfile), 3178 },
-{ HP_POP(npc->addsrcfile), HP_POP2(HP_npc_addsrcfile), 3180 },
-{ HP_POP(npc->delsrcfile), HP_POP2(HP_npc_delsrcfile), 3182 },
-{ HP_POP(npc->parsename), HP_POP2(HP_npc_parsename), 3184 },
-{ HP_POP(npc->add_warp), HP_POP2(HP_npc_add_warp), 3186 },
-{ HP_POP(npc->parse_warp), HP_POP2(HP_npc_parse_warp), 3188 },
-{ HP_POP(npc->parse_shop), HP_POP2(HP_npc_parse_shop), 3190 },
-{ HP_POP(npc->convertlabel_db), HP_POP2(HP_npc_convertlabel_db), 3192 },
-{ HP_POP(npc->skip_script), HP_POP2(HP_npc_skip_script), 3194 },
-{ HP_POP(npc->parse_script), HP_POP2(HP_npc_parse_script), 3196 },
-{ HP_POP(npc->parse_duplicate), HP_POP2(HP_npc_parse_duplicate), 3198 },
-{ HP_POP(npc->duplicate4instance), HP_POP2(HP_npc_duplicate4instance), 3200 },
-{ HP_POP(npc->setcells), HP_POP2(HP_npc_setcells), 3202 },
-{ HP_POP(npc->unsetcells_sub), HP_POP2(HP_npc_unsetcells_sub), 3204 },
-{ HP_POP(npc->unsetcells), HP_POP2(HP_npc_unsetcells), 3206 },
-{ HP_POP(npc->movenpc), HP_POP2(HP_npc_movenpc), 3208 },
-{ HP_POP(npc->setdisplayname), HP_POP2(HP_npc_setdisplayname), 3210 },
-{ HP_POP(npc->setclass), HP_POP2(HP_npc_setclass), 3212 },
-{ HP_POP(npc->do_atcmd_event), HP_POP2(HP_npc_do_atcmd_event), 3214 },
-{ HP_POP(npc->parse_function), HP_POP2(HP_npc_parse_function), 3216 },
-{ HP_POP(npc->parse_mob2), HP_POP2(HP_npc_parse_mob2), 3218 },
-{ HP_POP(npc->parse_mob), HP_POP2(HP_npc_parse_mob), 3220 },
-{ HP_POP(npc->parse_mapflag), HP_POP2(HP_npc_parse_mapflag), 3222 },
-{ HP_POP(npc->parsesrcfile), HP_POP2(HP_npc_parsesrcfile), 3224 },
-{ HP_POP(npc->script_event), HP_POP2(HP_npc_script_event), 3226 },
-{ HP_POP(npc->read_event_script), HP_POP2(HP_npc_read_event_script), 3228 },
-{ HP_POP(npc->path_db_clear_sub), HP_POP2(HP_npc_path_db_clear_sub), 3230 },
-{ HP_POP(npc->ev_label_db_clear_sub), HP_POP2(HP_npc_ev_label_db_clear_sub), 3232 },
-{ HP_POP(npc->reload), HP_POP2(HP_npc_reload), 3234 },
-{ HP_POP(npc->unloadfile), HP_POP2(HP_npc_unloadfile), 3236 },
-{ HP_POP(npc->do_clear_npc), HP_POP2(HP_npc_do_clear_npc), 3238 },
-{ HP_POP(npc->debug_warps_sub), HP_POP2(HP_npc_debug_warps_sub), 3240 },
-{ HP_POP(npc->debug_warps), HP_POP2(HP_npc_debug_warps), 3242 },
+{ HP_POP(npc->init), HP_POP2(HP_npc_init), 3082 },
+{ HP_POP(npc->final), HP_POP2(HP_npc_final), 3084 },
+{ HP_POP(npc->get_new_npc_id), HP_POP2(HP_npc_get_new_npc_id), 3086 },
+{ HP_POP(npc->get_viewdata), HP_POP2(HP_npc_get_viewdata), 3088 },
+{ HP_POP(npc->isnear_sub), HP_POP2(HP_npc_isnear_sub), 3090 },
+{ HP_POP(npc->isnear), HP_POP2(HP_npc_isnear), 3092 },
+{ HP_POP(npc->ontouch_event), HP_POP2(HP_npc_ontouch_event), 3094 },
+{ HP_POP(npc->ontouch2_event), HP_POP2(HP_npc_ontouch2_event), 3096 },
+{ HP_POP(npc->enable_sub), HP_POP2(HP_npc_enable_sub), 3098 },
+{ HP_POP(npc->enable), HP_POP2(HP_npc_enable), 3100 },
+{ HP_POP(npc->name2id), HP_POP2(HP_npc_name2id), 3102 },
+{ HP_POP(npc->event_dequeue), HP_POP2(HP_npc_event_dequeue), 3104 },
+{ HP_POP(npc->event_export_create), HP_POP2(HP_npc_event_export_create), 3106 },
+{ HP_POP(npc->event_export), HP_POP2(HP_npc_event_export), 3108 },
+{ HP_POP(npc->event_sub), HP_POP2(HP_npc_event_sub), 3110 },
+{ HP_POP(npc->event_doall_sub), HP_POP2(HP_npc_event_doall_sub), 3112 },
+{ HP_POP(npc->event_do), HP_POP2(HP_npc_event_do), 3114 },
+{ HP_POP(npc->event_doall_id), HP_POP2(HP_npc_event_doall_id), 3116 },
+{ HP_POP(npc->event_doall), HP_POP2(HP_npc_event_doall), 3118 },
+{ HP_POP(npc->event_do_clock), HP_POP2(HP_npc_event_do_clock), 3120 },
+{ HP_POP(npc->event_do_oninit), HP_POP2(HP_npc_event_do_oninit), 3122 },
+{ HP_POP(npc->timerevent_export), HP_POP2(HP_npc_timerevent_export), 3124 },
+{ HP_POP(npc->timerevent), HP_POP2(HP_npc_timerevent), 3126 },
+{ HP_POP(npc->timerevent_start), HP_POP2(HP_npc_timerevent_start), 3128 },
+{ HP_POP(npc->timerevent_stop), HP_POP2(HP_npc_timerevent_stop), 3130 },
+{ HP_POP(npc->timerevent_quit), HP_POP2(HP_npc_timerevent_quit), 3132 },
+{ HP_POP(npc->gettimerevent_tick), HP_POP2(HP_npc_gettimerevent_tick), 3134 },
+{ HP_POP(npc->settimerevent_tick), HP_POP2(HP_npc_settimerevent_tick), 3136 },
+{ HP_POP(npc->event), HP_POP2(HP_npc_event), 3138 },
+{ HP_POP(npc->touch_areanpc_sub), HP_POP2(HP_npc_touch_areanpc_sub), 3140 },
+{ HP_POP(npc->touchnext_areanpc), HP_POP2(HP_npc_touchnext_areanpc), 3142 },
+{ HP_POP(npc->touch_areanpc), HP_POP2(HP_npc_touch_areanpc), 3144 },
+{ HP_POP(npc->touch_areanpc2), HP_POP2(HP_npc_touch_areanpc2), 3146 },
+{ HP_POP(npc->check_areanpc), HP_POP2(HP_npc_check_areanpc), 3148 },
+{ HP_POP(npc->checknear), HP_POP2(HP_npc_checknear), 3150 },
+{ HP_POP(npc->globalmessage), HP_POP2(HP_npc_globalmessage), 3152 },
+{ HP_POP(npc->run_tomb), HP_POP2(HP_npc_run_tomb), 3154 },
+{ HP_POP(npc->click), HP_POP2(HP_npc_click), 3156 },
+{ HP_POP(npc->scriptcont), HP_POP2(HP_npc_scriptcont), 3158 },
+{ HP_POP(npc->buysellsel), HP_POP2(HP_npc_buysellsel), 3160 },
+{ HP_POP(npc->cashshop_buylist), HP_POP2(HP_npc_cashshop_buylist), 3162 },
+{ HP_POP(npc->buylist_sub), HP_POP2(HP_npc_buylist_sub), 3164 },
+{ HP_POP(npc->cashshop_buy), HP_POP2(HP_npc_cashshop_buy), 3166 },
+{ HP_POP(npc->buylist), HP_POP2(HP_npc_buylist), 3168 },
+{ HP_POP(npc->selllist_sub), HP_POP2(HP_npc_selllist_sub), 3170 },
+{ HP_POP(npc->selllist), HP_POP2(HP_npc_selllist), 3172 },
+{ HP_POP(npc->remove_map), HP_POP2(HP_npc_remove_map), 3174 },
+{ HP_POP(npc->unload_ev), HP_POP2(HP_npc_unload_ev), 3176 },
+{ HP_POP(npc->unload_ev_label), HP_POP2(HP_npc_unload_ev_label), 3178 },
+{ HP_POP(npc->unload_dup_sub), HP_POP2(HP_npc_unload_dup_sub), 3180 },
+{ HP_POP(npc->unload_duplicates), HP_POP2(HP_npc_unload_duplicates), 3182 },
+{ HP_POP(npc->unload), HP_POP2(HP_npc_unload), 3184 },
+{ HP_POP(npc->clearsrcfile), HP_POP2(HP_npc_clearsrcfile), 3186 },
+{ HP_POP(npc->addsrcfile), HP_POP2(HP_npc_addsrcfile), 3188 },
+{ HP_POP(npc->delsrcfile), HP_POP2(HP_npc_delsrcfile), 3190 },
+{ HP_POP(npc->parsename), HP_POP2(HP_npc_parsename), 3192 },
+{ HP_POP(npc->add_warp), HP_POP2(HP_npc_add_warp), 3194 },
+{ HP_POP(npc->parse_warp), HP_POP2(HP_npc_parse_warp), 3196 },
+{ HP_POP(npc->parse_shop), HP_POP2(HP_npc_parse_shop), 3198 },
+{ HP_POP(npc->convertlabel_db), HP_POP2(HP_npc_convertlabel_db), 3200 },
+{ HP_POP(npc->skip_script), HP_POP2(HP_npc_skip_script), 3202 },
+{ HP_POP(npc->parse_script), HP_POP2(HP_npc_parse_script), 3204 },
+{ HP_POP(npc->parse_duplicate), HP_POP2(HP_npc_parse_duplicate), 3206 },
+{ HP_POP(npc->duplicate4instance), HP_POP2(HP_npc_duplicate4instance), 3208 },
+{ HP_POP(npc->setcells), HP_POP2(HP_npc_setcells), 3210 },
+{ HP_POP(npc->unsetcells_sub), HP_POP2(HP_npc_unsetcells_sub), 3212 },
+{ HP_POP(npc->unsetcells), HP_POP2(HP_npc_unsetcells), 3214 },
+{ HP_POP(npc->movenpc), HP_POP2(HP_npc_movenpc), 3216 },
+{ HP_POP(npc->setdisplayname), HP_POP2(HP_npc_setdisplayname), 3218 },
+{ HP_POP(npc->setclass), HP_POP2(HP_npc_setclass), 3220 },
+{ HP_POP(npc->do_atcmd_event), HP_POP2(HP_npc_do_atcmd_event), 3222 },
+{ HP_POP(npc->parse_function), HP_POP2(HP_npc_parse_function), 3224 },
+{ HP_POP(npc->parse_mob2), HP_POP2(HP_npc_parse_mob2), 3226 },
+{ HP_POP(npc->parse_mob), HP_POP2(HP_npc_parse_mob), 3228 },
+{ HP_POP(npc->parse_mapflag), HP_POP2(HP_npc_parse_mapflag), 3230 },
+{ HP_POP(npc->parsesrcfile), HP_POP2(HP_npc_parsesrcfile), 3232 },
+{ HP_POP(npc->script_event), HP_POP2(HP_npc_script_event), 3234 },
+{ HP_POP(npc->read_event_script), HP_POP2(HP_npc_read_event_script), 3236 },
+{ HP_POP(npc->path_db_clear_sub), HP_POP2(HP_npc_path_db_clear_sub), 3238 },
+{ HP_POP(npc->ev_label_db_clear_sub), HP_POP2(HP_npc_ev_label_db_clear_sub), 3240 },
+{ HP_POP(npc->reload), HP_POP2(HP_npc_reload), 3242 },
+{ HP_POP(npc->unloadfile), HP_POP2(HP_npc_unloadfile), 3244 },
+{ HP_POP(npc->do_clear_npc), HP_POP2(HP_npc_do_clear_npc), 3246 },
+{ HP_POP(npc->debug_warps_sub), HP_POP2(HP_npc_debug_warps_sub), 3248 },
+{ HP_POP(npc->debug_warps), HP_POP2(HP_npc_debug_warps), 3250 },
+{ HP_POP(npc->secure_timeout_timer), HP_POP2(HP_npc_secure_timeout_timer), 3252 },
 /* party */
-{ HP_POP(party->init), HP_POP2(HP_party_init), 3244 },
-{ HP_POP(party->final), HP_POP2(HP_party_final), 3246 },
-{ HP_POP(party->search), HP_POP2(HP_party_search), 3248 },
-{ HP_POP(party->searchname), HP_POP2(HP_party_searchname), 3250 },
-{ HP_POP(party->getmemberid), HP_POP2(HP_party_getmemberid), 3252 },
-{ HP_POP(party->getavailablesd), HP_POP2(HP_party_getavailablesd), 3254 },
-{ HP_POP(party->create), HP_POP2(HP_party_create), 3256 },
-{ HP_POP(party->created), HP_POP2(HP_party_created), 3258 },
-{ HP_POP(party->request_info), HP_POP2(HP_party_request_info), 3260 },
-{ HP_POP(party->invite), HP_POP2(HP_party_invite), 3262 },
-{ HP_POP(party->member_joined), HP_POP2(HP_party_member_joined), 3264 },
-{ HP_POP(party->member_added), HP_POP2(HP_party_member_added), 3266 },
-{ HP_POP(party->leave), HP_POP2(HP_party_leave), 3268 },
-{ HP_POP(party->removemember), HP_POP2(HP_party_removemember), 3270 },
-{ HP_POP(party->member_withdraw), HP_POP2(HP_party_member_withdraw), 3272 },
-{ HP_POP(party->reply_invite), HP_POP2(HP_party_reply_invite), 3274 },
-{ HP_POP(party->recv_noinfo), HP_POP2(HP_party_recv_noinfo), 3276 },
-{ HP_POP(party->recv_info), HP_POP2(HP_party_recv_info), 3278 },
-{ HP_POP(party->recv_movemap), HP_POP2(HP_party_recv_movemap), 3280 },
-{ HP_POP(party->broken), HP_POP2(HP_party_broken), 3282 },
-{ HP_POP(party->optionchanged), HP_POP2(HP_party_optionchanged), 3284 },
-{ HP_POP(party->changeoption), HP_POP2(HP_party_changeoption), 3286 },
-{ HP_POP(party->changeleader), HP_POP2(HP_party_changeleader), 3288 },
-{ HP_POP(party->send_movemap), HP_POP2(HP_party_send_movemap), 3290 },
-{ HP_POP(party->send_levelup), HP_POP2(HP_party_send_levelup), 3292 },
-{ HP_POP(party->send_logout), HP_POP2(HP_party_send_logout), 3294 },
-{ HP_POP(party->send_message), HP_POP2(HP_party_send_message), 3296 },
-{ HP_POP(party->recv_message), HP_POP2(HP_party_recv_message), 3298 },
-{ HP_POP(party->skill_check), HP_POP2(HP_party_skill_check), 3300 },
-{ HP_POP(party->send_xy_clear), HP_POP2(HP_party_send_xy_clear), 3302 },
-{ HP_POP(party->exp_share), HP_POP2(HP_party_exp_share), 3304 },
-{ HP_POP(party->share_loot), HP_POP2(HP_party_share_loot), 3306 },
-{ HP_POP(party->send_dot_remove), HP_POP2(HP_party_send_dot_remove), 3308 },
-{ HP_POP(party->sub_count), HP_POP2(HP_party_sub_count), 3310 },
-{ HP_POP(party->booking_register), HP_POP2(HP_party_booking_register), 3312 },
-{ HP_POP(party->booking_update), HP_POP2(HP_party_booking_update), 3314 },
-{ HP_POP(party->booking_search), HP_POP2(HP_party_booking_search), 3316 },
-{ HP_POP(party->booking_delete), HP_POP2(HP_party_booking_delete), 3318 },
-{ HP_POP(party->vforeachsamemap), HP_POP2(HP_party_vforeachsamemap), 3320 },
-{ HP_POP(party->send_xy_timer), HP_POP2(HP_party_send_xy_timer), 3322 },
-{ HP_POP(party->fill_member), HP_POP2(HP_party_fill_member), 3324 },
-{ HP_POP(party->sd_check), HP_POP2(HP_party_sd_check), 3326 },
-{ HP_POP(party->check_state), HP_POP2(HP_party_check_state), 3328 },
-{ HP_POP(party->create_booking_data), HP_POP2(HP_party_create_booking_data), 3330 },
-{ HP_POP(party->db_final), HP_POP2(HP_party_db_final), 3332 },
+{ HP_POP(party->init), HP_POP2(HP_party_init), 3254 },
+{ HP_POP(party->final), HP_POP2(HP_party_final), 3256 },
+{ HP_POP(party->search), HP_POP2(HP_party_search), 3258 },
+{ HP_POP(party->searchname), HP_POP2(HP_party_searchname), 3260 },
+{ HP_POP(party->getmemberid), HP_POP2(HP_party_getmemberid), 3262 },
+{ HP_POP(party->getavailablesd), HP_POP2(HP_party_getavailablesd), 3264 },
+{ HP_POP(party->create), HP_POP2(HP_party_create), 3266 },
+{ HP_POP(party->created), HP_POP2(HP_party_created), 3268 },
+{ HP_POP(party->request_info), HP_POP2(HP_party_request_info), 3270 },
+{ HP_POP(party->invite), HP_POP2(HP_party_invite), 3272 },
+{ HP_POP(party->member_joined), HP_POP2(HP_party_member_joined), 3274 },
+{ HP_POP(party->member_added), HP_POP2(HP_party_member_added), 3276 },
+{ HP_POP(party->leave), HP_POP2(HP_party_leave), 3278 },
+{ HP_POP(party->removemember), HP_POP2(HP_party_removemember), 3280 },
+{ HP_POP(party->member_withdraw), HP_POP2(HP_party_member_withdraw), 3282 },
+{ HP_POP(party->reply_invite), HP_POP2(HP_party_reply_invite), 3284 },
+{ HP_POP(party->recv_noinfo), HP_POP2(HP_party_recv_noinfo), 3286 },
+{ HP_POP(party->recv_info), HP_POP2(HP_party_recv_info), 3288 },
+{ HP_POP(party->recv_movemap), HP_POP2(HP_party_recv_movemap), 3290 },
+{ HP_POP(party->broken), HP_POP2(HP_party_broken), 3292 },
+{ HP_POP(party->optionchanged), HP_POP2(HP_party_optionchanged), 3294 },
+{ HP_POP(party->changeoption), HP_POP2(HP_party_changeoption), 3296 },
+{ HP_POP(party->changeleader), HP_POP2(HP_party_changeleader), 3298 },
+{ HP_POP(party->send_movemap), HP_POP2(HP_party_send_movemap), 3300 },
+{ HP_POP(party->send_levelup), HP_POP2(HP_party_send_levelup), 3302 },
+{ HP_POP(party->send_logout), HP_POP2(HP_party_send_logout), 3304 },
+{ HP_POP(party->send_message), HP_POP2(HP_party_send_message), 3306 },
+{ HP_POP(party->recv_message), HP_POP2(HP_party_recv_message), 3308 },
+{ HP_POP(party->skill_check), HP_POP2(HP_party_skill_check), 3310 },
+{ HP_POP(party->send_xy_clear), HP_POP2(HP_party_send_xy_clear), 3312 },
+{ HP_POP(party->exp_share), HP_POP2(HP_party_exp_share), 3314 },
+{ HP_POP(party->share_loot), HP_POP2(HP_party_share_loot), 3316 },
+{ HP_POP(party->send_dot_remove), HP_POP2(HP_party_send_dot_remove), 3318 },
+{ HP_POP(party->sub_count), HP_POP2(HP_party_sub_count), 3320 },
+{ HP_POP(party->booking_register), HP_POP2(HP_party_booking_register), 3322 },
+{ HP_POP(party->booking_update), HP_POP2(HP_party_booking_update), 3324 },
+{ HP_POP(party->booking_search), HP_POP2(HP_party_booking_search), 3326 },
+{ HP_POP(party->recruit_register), HP_POP2(HP_party_recruit_register), 3328 },
+{ HP_POP(party->recruit_update), HP_POP2(HP_party_recruit_update), 3330 },
+{ HP_POP(party->recruit_search), HP_POP2(HP_party_recruit_search), 3332 },
+{ HP_POP(party->booking_delete), HP_POP2(HP_party_booking_delete), 3334 },
+{ HP_POP(party->vforeachsamemap), HP_POP2(HP_party_vforeachsamemap), 3336 },
+{ HP_POP(party->send_xy_timer), HP_POP2(HP_party_send_xy_timer), 3338 },
+{ HP_POP(party->fill_member), HP_POP2(HP_party_fill_member), 3340 },
+{ HP_POP(party->sd_check), HP_POP2(HP_party_sd_check), 3342 },
+{ HP_POP(party->check_state), HP_POP2(HP_party_check_state), 3344 },
+{ HP_POP(party->create_booking_data), HP_POP2(HP_party_create_booking_data), 3346 },
+{ HP_POP(party->db_final), HP_POP2(HP_party_db_final), 3348 },
 /* path */
-{ HP_POP(path->blownpos), HP_POP2(HP_path_blownpos), 3334 },
-{ HP_POP(path->search), HP_POP2(HP_path_search), 3336 },
-{ HP_POP(path->search_long), HP_POP2(HP_path_search_long), 3338 },
-{ HP_POP(path->check_distance), HP_POP2(HP_path_check_distance), 3340 },
-{ HP_POP(path->distance), HP_POP2(HP_path_distance), 3342 },
+{ HP_POP(path->blownpos), HP_POP2(HP_path_blownpos), 3350 },
+{ HP_POP(path->search), HP_POP2(HP_path_search), 3352 },
+{ HP_POP(path->search_long), HP_POP2(HP_path_search_long), 3354 },
+{ HP_POP(path->check_distance), HP_POP2(HP_path_check_distance), 3356 },
+{ HP_POP(path->distance), HP_POP2(HP_path_distance), 3358 },
 /* pc */
-{ HP_POP(pc->init), HP_POP2(HP_pc_init), 3344 },
-{ HP_POP(pc->final), HP_POP2(HP_pc_final), 3346 },
-{ HP_POP(pc->get_dummy_sd), HP_POP2(HP_pc_get_dummy_sd), 3348 },
-{ HP_POP(pc->class2idx), HP_POP2(HP_pc_class2idx), 3350 },
-{ HP_POP(pc->get_group_level), HP_POP2(HP_pc_get_group_level), 3352 },
-{ HP_POP(pc->can_give_items), HP_POP2(HP_pc_can_give_items), 3354 },
-{ HP_POP(pc->can_use_command), HP_POP2(HP_pc_can_use_command), 3356 },
-{ HP_POP(pc->has_permission), HP_POP2(HP_pc_has_permission), 3358 },
-{ HP_POP(pc->set_group), HP_POP2(HP_pc_set_group), 3360 },
-{ HP_POP(pc->should_log_commands), HP_POP2(HP_pc_should_log_commands), 3362 },
-{ HP_POP(pc->setrestartvalue), HP_POP2(HP_pc_setrestartvalue), 3364 },
-{ HP_POP(pc->makesavestatus), HP_POP2(HP_pc_makesavestatus), 3366 },
-{ HP_POP(pc->respawn), HP_POP2(HP_pc_respawn), 3368 },
-{ HP_POP(pc->setnewpc), HP_POP2(HP_pc_setnewpc), 3370 },
-{ HP_POP(pc->authok), HP_POP2(HP_pc_authok), 3372 },
-{ HP_POP(pc->authfail), HP_POP2(HP_pc_authfail), 3374 },
-{ HP_POP(pc->reg_received), HP_POP2(HP_pc_reg_received), 3376 },
-{ HP_POP(pc->isequip), HP_POP2(HP_pc_isequip), 3378 },
-{ HP_POP(pc->equippoint), HP_POP2(HP_pc_equippoint), 3380 },
-{ HP_POP(pc->setinventorydata), HP_POP2(HP_pc_setinventorydata), 3382 },
-{ HP_POP(pc->checkskill), HP_POP2(HP_pc_checkskill), 3384 },
-{ HP_POP(pc->checkskill2), HP_POP2(HP_pc_checkskill2), 3386 },
-{ HP_POP(pc->checkallowskill), HP_POP2(HP_pc_checkallowskill), 3388 },
-{ HP_POP(pc->checkequip), HP_POP2(HP_pc_checkequip), 3390 },
-{ HP_POP(pc->calc_skilltree), HP_POP2(HP_pc_calc_skilltree), 3392 },
-{ HP_POP(pc->calc_skilltree_normalize_job), HP_POP2(HP_pc_calc_skilltree_normalize_job), 3394 },
-{ HP_POP(pc->clean_skilltree), HP_POP2(HP_pc_clean_skilltree), 3396 },
-{ HP_POP(pc->setpos), HP_POP2(HP_pc_setpos), 3398 },
-{ HP_POP(pc->setsavepoint), HP_POP2(HP_pc_setsavepoint), 3400 },
-{ HP_POP(pc->randomwarp), HP_POP2(HP_pc_randomwarp), 3402 },
-{ HP_POP(pc->memo), HP_POP2(HP_pc_memo), 3404 },
-{ HP_POP(pc->checkadditem), HP_POP2(HP_pc_checkadditem), 3406 },
-{ HP_POP(pc->inventoryblank), HP_POP2(HP_pc_inventoryblank), 3408 },
-{ HP_POP(pc->search_inventory), HP_POP2(HP_pc_search_inventory), 3410 },
-{ HP_POP(pc->payzeny), HP_POP2(HP_pc_payzeny), 3412 },
-{ HP_POP(pc->additem), HP_POP2(HP_pc_additem), 3414 },
-{ HP_POP(pc->getzeny), HP_POP2(HP_pc_getzeny), 3416 },
-{ HP_POP(pc->delitem), HP_POP2(HP_pc_delitem), 3418 },
-{ HP_POP(pc->paycash), HP_POP2(HP_pc_paycash), 3420 },
-{ HP_POP(pc->getcash), HP_POP2(HP_pc_getcash), 3422 },
-{ HP_POP(pc->cart_additem), HP_POP2(HP_pc_cart_additem), 3424 },
-{ HP_POP(pc->cart_delitem), HP_POP2(HP_pc_cart_delitem), 3426 },
-{ HP_POP(pc->putitemtocart), HP_POP2(HP_pc_putitemtocart), 3428 },
-{ HP_POP(pc->getitemfromcart), HP_POP2(HP_pc_getitemfromcart), 3430 },
-{ HP_POP(pc->cartitem_amount), HP_POP2(HP_pc_cartitem_amount), 3432 },
-{ HP_POP(pc->takeitem), HP_POP2(HP_pc_takeitem), 3434 },
-{ HP_POP(pc->dropitem), HP_POP2(HP_pc_dropitem), 3436 },
-{ HP_POP(pc->isequipped), HP_POP2(HP_pc_isequipped), 3438 },
-{ HP_POP(pc->can_Adopt), HP_POP2(HP_pc_can_Adopt), 3440 },
-{ HP_POP(pc->adoption), HP_POP2(HP_pc_adoption), 3442 },
-{ HP_POP(pc->updateweightstatus), HP_POP2(HP_pc_updateweightstatus), 3444 },
-{ HP_POP(pc->addautobonus), HP_POP2(HP_pc_addautobonus), 3446 },
-{ HP_POP(pc->exeautobonus), HP_POP2(HP_pc_exeautobonus), 3448 },
-{ HP_POP(pc->endautobonus), HP_POP2(HP_pc_endautobonus), 3450 },
-{ HP_POP(pc->delautobonus), HP_POP2(HP_pc_delautobonus), 3452 },
-{ HP_POP(pc->bonus), HP_POP2(HP_pc_bonus), 3454 },
-{ HP_POP(pc->bonus2), HP_POP2(HP_pc_bonus2), 3456 },
-{ HP_POP(pc->bonus3), HP_POP2(HP_pc_bonus3), 3458 },
-{ HP_POP(pc->bonus4), HP_POP2(HP_pc_bonus4), 3460 },
-{ HP_POP(pc->bonus5), HP_POP2(HP_pc_bonus5), 3462 },
-{ HP_POP(pc->skill), HP_POP2(HP_pc_skill), 3464 },
-{ HP_POP(pc->insert_card), HP_POP2(HP_pc_insert_card), 3466 },
-{ HP_POP(pc->steal_item), HP_POP2(HP_pc_steal_item), 3468 },
-{ HP_POP(pc->steal_coin), HP_POP2(HP_pc_steal_coin), 3470 },
-{ HP_POP(pc->modifybuyvalue), HP_POP2(HP_pc_modifybuyvalue), 3472 },
-{ HP_POP(pc->modifysellvalue), HP_POP2(HP_pc_modifysellvalue), 3474 },
-{ HP_POP(pc->follow), HP_POP2(HP_pc_follow), 3476 },
-{ HP_POP(pc->stop_following), HP_POP2(HP_pc_stop_following), 3478 },
-{ HP_POP(pc->maxbaselv), HP_POP2(HP_pc_maxbaselv), 3480 },
-{ HP_POP(pc->maxjoblv), HP_POP2(HP_pc_maxjoblv), 3482 },
-{ HP_POP(pc->checkbaselevelup), HP_POP2(HP_pc_checkbaselevelup), 3484 },
-{ HP_POP(pc->checkjoblevelup), HP_POP2(HP_pc_checkjoblevelup), 3486 },
-{ HP_POP(pc->gainexp), HP_POP2(HP_pc_gainexp), 3488 },
-{ HP_POP(pc->nextbaseexp), HP_POP2(HP_pc_nextbaseexp), 3490 },
-{ HP_POP(pc->thisbaseexp), HP_POP2(HP_pc_thisbaseexp), 3492 },
-{ HP_POP(pc->nextjobexp), HP_POP2(HP_pc_nextjobexp), 3494 },
-{ HP_POP(pc->thisjobexp), HP_POP2(HP_pc_thisjobexp), 3496 },
-{ HP_POP(pc->gets_status_point), HP_POP2(HP_pc_gets_status_point), 3498 },
-{ HP_POP(pc->need_status_point), HP_POP2(HP_pc_need_status_point), 3500 },
-{ HP_POP(pc->statusup), HP_POP2(HP_pc_statusup), 3502 },
-{ HP_POP(pc->statusup2), HP_POP2(HP_pc_statusup2), 3504 },
-{ HP_POP(pc->skillup), HP_POP2(HP_pc_skillup), 3506 },
-{ HP_POP(pc->allskillup), HP_POP2(HP_pc_allskillup), 3508 },
-{ HP_POP(pc->resetlvl), HP_POP2(HP_pc_resetlvl), 3510 },
-{ HP_POP(pc->resetstate), HP_POP2(HP_pc_resetstate), 3512 },
-{ HP_POP(pc->resetskill), HP_POP2(HP_pc_resetskill), 3514 },
-{ HP_POP(pc->resetfeel), HP_POP2(HP_pc_resetfeel), 3516 },
-{ HP_POP(pc->resethate), HP_POP2(HP_pc_resethate), 3518 },
-{ HP_POP(pc->equipitem), HP_POP2(HP_pc_equipitem), 3520 },
-{ HP_POP(pc->unequipitem), HP_POP2(HP_pc_unequipitem), 3522 },
-{ HP_POP(pc->checkitem), HP_POP2(HP_pc_checkitem), 3524 },
-{ HP_POP(pc->useitem), HP_POP2(HP_pc_useitem), 3526 },
-{ HP_POP(pc->skillatk_bonus), HP_POP2(HP_pc_skillatk_bonus), 3528 },
-{ HP_POP(pc->skillheal_bonus), HP_POP2(HP_pc_skillheal_bonus), 3530 },
-{ HP_POP(pc->skillheal2_bonus), HP_POP2(HP_pc_skillheal2_bonus), 3532 },
-{ HP_POP(pc->damage), HP_POP2(HP_pc_damage), 3534 },
-{ HP_POP(pc->dead), HP_POP2(HP_pc_dead), 3536 },
-{ HP_POP(pc->revive), HP_POP2(HP_pc_revive), 3538 },
-{ HP_POP(pc->heal), HP_POP2(HP_pc_heal), 3540 },
-{ HP_POP(pc->itemheal), HP_POP2(HP_pc_itemheal), 3542 },
-{ HP_POP(pc->percentheal), HP_POP2(HP_pc_percentheal), 3544 },
-{ HP_POP(pc->jobchange), HP_POP2(HP_pc_jobchange), 3546 },
-{ HP_POP(pc->setoption), HP_POP2(HP_pc_setoption), 3548 },
-{ HP_POP(pc->setcart), HP_POP2(HP_pc_setcart), 3550 },
-{ HP_POP(pc->setfalcon), HP_POP2(HP_pc_setfalcon), 3552 },
-{ HP_POP(pc->setriding), HP_POP2(HP_pc_setriding), 3554 },
-{ HP_POP(pc->setmadogear), HP_POP2(HP_pc_setmadogear), 3556 },
-{ HP_POP(pc->changelook), HP_POP2(HP_pc_changelook), 3558 },
-{ HP_POP(pc->equiplookall), HP_POP2(HP_pc_equiplookall), 3560 },
-{ HP_POP(pc->readparam), HP_POP2(HP_pc_readparam), 3562 },
-{ HP_POP(pc->setparam), HP_POP2(HP_pc_setparam), 3564 },
-{ HP_POP(pc->readreg), HP_POP2(HP_pc_readreg), 3566 },
-{ HP_POP(pc->setreg), HP_POP2(HP_pc_setreg), 3568 },
-{ HP_POP(pc->readregstr), HP_POP2(HP_pc_readregstr), 3570 },
-{ HP_POP(pc->setregstr), HP_POP2(HP_pc_setregstr), 3572 },
-{ HP_POP(pc->readregistry), HP_POP2(HP_pc_readregistry), 3574 },
-{ HP_POP(pc->setregistry), HP_POP2(HP_pc_setregistry), 3576 },
-{ HP_POP(pc->readregistry_str), HP_POP2(HP_pc_readregistry_str), 3578 },
-{ HP_POP(pc->setregistry_str), HP_POP2(HP_pc_setregistry_str), 3580 },
-{ HP_POP(pc->addeventtimer), HP_POP2(HP_pc_addeventtimer), 3582 },
-{ HP_POP(pc->deleventtimer), HP_POP2(HP_pc_deleventtimer), 3584 },
-{ HP_POP(pc->cleareventtimer), HP_POP2(HP_pc_cleareventtimer), 3586 },
-{ HP_POP(pc->addeventtimercount), HP_POP2(HP_pc_addeventtimercount), 3588 },
-{ HP_POP(pc->calc_pvprank), HP_POP2(HP_pc_calc_pvprank), 3590 },
-{ HP_POP(pc->calc_pvprank_timer), HP_POP2(HP_pc_calc_pvprank_timer), 3592 },
-{ HP_POP(pc->ismarried), HP_POP2(HP_pc_ismarried), 3594 },
-{ HP_POP(pc->marriage), HP_POP2(HP_pc_marriage), 3596 },
-{ HP_POP(pc->divorce), HP_POP2(HP_pc_divorce), 3598 },
-{ HP_POP(pc->get_partner), HP_POP2(HP_pc_get_partner), 3600 },
-{ HP_POP(pc->get_father), HP_POP2(HP_pc_get_father), 3602 },
-{ HP_POP(pc->get_mother), HP_POP2(HP_pc_get_mother), 3604 },
-{ HP_POP(pc->get_child), HP_POP2(HP_pc_get_child), 3606 },
-{ HP_POP(pc->bleeding), HP_POP2(HP_pc_bleeding), 3608 },
-{ HP_POP(pc->regen), HP_POP2(HP_pc_regen), 3610 },
-{ HP_POP(pc->setstand), HP_POP2(HP_pc_setstand), 3612 },
-{ HP_POP(pc->candrop), HP_POP2(HP_pc_candrop), 3614 },
-{ HP_POP(pc->jobid2mapid), HP_POP2(HP_pc_jobid2mapid), 3616 },
-{ HP_POP(pc->mapid2jobid), HP_POP2(HP_pc_mapid2jobid), 3618 },
-{ HP_POP(pc->job_name), HP_POP2(HP_pc_job_name), 3620 },
-{ HP_POP(pc->setinvincibletimer), HP_POP2(HP_pc_setinvincibletimer), 3622 },
-{ HP_POP(pc->delinvincibletimer), HP_POP2(HP_pc_delinvincibletimer), 3624 },
-{ HP_POP(pc->addspiritball), HP_POP2(HP_pc_addspiritball), 3626 },
-{ HP_POP(pc->delspiritball), HP_POP2(HP_pc_delspiritball), 3628 },
-{ HP_POP(pc->addfame), HP_POP2(HP_pc_addfame), 3630 },
-{ HP_POP(pc->famerank), HP_POP2(HP_pc_famerank), 3632 },
-{ HP_POP(pc->set_hate_mob), HP_POP2(HP_pc_set_hate_mob), 3634 },
-{ HP_POP(pc->readdb), HP_POP2(HP_pc_readdb), 3636 },
-{ HP_POP(pc->map_day_timer), HP_POP2(HP_pc_map_day_timer), 3638 },
-{ HP_POP(pc->map_night_timer), HP_POP2(HP_pc_map_night_timer), 3640 },
-{ HP_POP(pc->inventory_rentals), HP_POP2(HP_pc_inventory_rentals), 3642 },
-{ HP_POP(pc->inventory_rental_clear), HP_POP2(HP_pc_inventory_rental_clear), 3644 },
-{ HP_POP(pc->inventory_rental_add), HP_POP2(HP_pc_inventory_rental_add), 3646 },
-{ HP_POP(pc->disguise), HP_POP2(HP_pc_disguise), 3648 },
-{ HP_POP(pc->isautolooting), HP_POP2(HP_pc_isautolooting), 3650 },
-{ HP_POP(pc->overheat), HP_POP2(HP_pc_overheat), 3652 },
-{ HP_POP(pc->banding), HP_POP2(HP_pc_banding), 3654 },
-{ HP_POP(pc->itemcd_do), HP_POP2(HP_pc_itemcd_do), 3656 },
-{ HP_POP(pc->load_combo), HP_POP2(HP_pc_load_combo), 3658 },
-{ HP_POP(pc->add_charm), HP_POP2(HP_pc_add_charm), 3660 },
-{ HP_POP(pc->del_charm), HP_POP2(HP_pc_del_charm), 3662 },
-{ HP_POP(pc->baselevelchanged), HP_POP2(HP_pc_baselevelchanged), 3664 },
-{ HP_POP(pc->level_penalty_mod), HP_POP2(HP_pc_level_penalty_mod), 3666 },
-{ HP_POP(pc->calc_skillpoint), HP_POP2(HP_pc_calc_skillpoint), 3668 },
-{ HP_POP(pc->invincible_timer), HP_POP2(HP_pc_invincible_timer), 3670 },
-{ HP_POP(pc->spiritball_timer), HP_POP2(HP_pc_spiritball_timer), 3672 },
-{ HP_POP(pc->check_banding), HP_POP2(HP_pc_check_banding), 3674 },
-{ HP_POP(pc->inventory_rental_end), HP_POP2(HP_pc_inventory_rental_end), 3676 },
-{ HP_POP(pc->check_skilltree), HP_POP2(HP_pc_check_skilltree), 3678 },
-{ HP_POP(pc->bonus_autospell), HP_POP2(HP_pc_bonus_autospell), 3680 },
-{ HP_POP(pc->bonus_autospell_onskill), HP_POP2(HP_pc_bonus_autospell_onskill), 3682 },
-{ HP_POP(pc->bonus_addeff), HP_POP2(HP_pc_bonus_addeff), 3684 },
-{ HP_POP(pc->bonus_addeff_onskill), HP_POP2(HP_pc_bonus_addeff_onskill), 3686 },
-{ HP_POP(pc->bonus_item_drop), HP_POP2(HP_pc_bonus_item_drop), 3688 },
-{ HP_POP(pc->calcexp), HP_POP2(HP_pc_calcexp), 3690 },
-{ HP_POP(pc->respawn_timer), HP_POP2(HP_pc_respawn_timer), 3692 },
-{ HP_POP(pc->jobchange_killclone), HP_POP2(HP_pc_jobchange_killclone), 3694 },
-{ HP_POP(pc->getstat), HP_POP2(HP_pc_getstat), 3696 },
-{ HP_POP(pc->setstat), HP_POP2(HP_pc_setstat), 3698 },
-{ HP_POP(pc->eventtimer), HP_POP2(HP_pc_eventtimer), 3700 },
-{ HP_POP(pc->daynight_timer_sub), HP_POP2(HP_pc_daynight_timer_sub), 3702 },
-{ HP_POP(pc->charm_timer), HP_POP2(HP_pc_charm_timer), 3704 },
-{ HP_POP(pc->readdb_levelpenalty), HP_POP2(HP_pc_readdb_levelpenalty), 3706 },
-{ HP_POP(pc->autosave), HP_POP2(HP_pc_autosave), 3708 },
-{ HP_POP(pc->follow_timer), HP_POP2(HP_pc_follow_timer), 3710 },
-{ HP_POP(pc->read_skill_tree), HP_POP2(HP_pc_read_skill_tree), 3712 },
-{ HP_POP(pc->isUseitem), HP_POP2(HP_pc_isUseitem), 3714 },
-{ HP_POP(pc->show_steal), HP_POP2(HP_pc_show_steal), 3716 },
-{ HP_POP(pc->checkcombo), HP_POP2(HP_pc_checkcombo), 3718 },
-{ HP_POP(pc->calcweapontype), HP_POP2(HP_pc_calcweapontype), 3720 },
-{ HP_POP(pc->removecombo), HP_POP2(HP_pc_removecombo), 3722 },
+{ HP_POP(pc->init), HP_POP2(HP_pc_init), 3360 },
+{ HP_POP(pc->final), HP_POP2(HP_pc_final), 3362 },
+{ HP_POP(pc->get_dummy_sd), HP_POP2(HP_pc_get_dummy_sd), 3364 },
+{ HP_POP(pc->class2idx), HP_POP2(HP_pc_class2idx), 3366 },
+{ HP_POP(pc->get_group_level), HP_POP2(HP_pc_get_group_level), 3368 },
+{ HP_POP(pc->can_give_items), HP_POP2(HP_pc_can_give_items), 3370 },
+{ HP_POP(pc->can_use_command), HP_POP2(HP_pc_can_use_command), 3372 },
+{ HP_POP(pc->has_permission), HP_POP2(HP_pc_has_permission), 3374 },
+{ HP_POP(pc->set_group), HP_POP2(HP_pc_set_group), 3376 },
+{ HP_POP(pc->should_log_commands), HP_POP2(HP_pc_should_log_commands), 3378 },
+{ HP_POP(pc->setrestartvalue), HP_POP2(HP_pc_setrestartvalue), 3380 },
+{ HP_POP(pc->makesavestatus), HP_POP2(HP_pc_makesavestatus), 3382 },
+{ HP_POP(pc->respawn), HP_POP2(HP_pc_respawn), 3384 },
+{ HP_POP(pc->setnewpc), HP_POP2(HP_pc_setnewpc), 3386 },
+{ HP_POP(pc->authok), HP_POP2(HP_pc_authok), 3388 },
+{ HP_POP(pc->authfail), HP_POP2(HP_pc_authfail), 3390 },
+{ HP_POP(pc->reg_received), HP_POP2(HP_pc_reg_received), 3392 },
+{ HP_POP(pc->isequip), HP_POP2(HP_pc_isequip), 3394 },
+{ HP_POP(pc->equippoint), HP_POP2(HP_pc_equippoint), 3396 },
+{ HP_POP(pc->setinventorydata), HP_POP2(HP_pc_setinventorydata), 3398 },
+{ HP_POP(pc->checkskill), HP_POP2(HP_pc_checkskill), 3400 },
+{ HP_POP(pc->checkskill2), HP_POP2(HP_pc_checkskill2), 3402 },
+{ HP_POP(pc->checkallowskill), HP_POP2(HP_pc_checkallowskill), 3404 },
+{ HP_POP(pc->checkequip), HP_POP2(HP_pc_checkequip), 3406 },
+{ HP_POP(pc->calc_skilltree), HP_POP2(HP_pc_calc_skilltree), 3408 },
+{ HP_POP(pc->calc_skilltree_normalize_job), HP_POP2(HP_pc_calc_skilltree_normalize_job), 3410 },
+{ HP_POP(pc->clean_skilltree), HP_POP2(HP_pc_clean_skilltree), 3412 },
+{ HP_POP(pc->setpos), HP_POP2(HP_pc_setpos), 3414 },
+{ HP_POP(pc->setsavepoint), HP_POP2(HP_pc_setsavepoint), 3416 },
+{ HP_POP(pc->randomwarp), HP_POP2(HP_pc_randomwarp), 3418 },
+{ HP_POP(pc->memo), HP_POP2(HP_pc_memo), 3420 },
+{ HP_POP(pc->checkadditem), HP_POP2(HP_pc_checkadditem), 3422 },
+{ HP_POP(pc->inventoryblank), HP_POP2(HP_pc_inventoryblank), 3424 },
+{ HP_POP(pc->search_inventory), HP_POP2(HP_pc_search_inventory), 3426 },
+{ HP_POP(pc->payzeny), HP_POP2(HP_pc_payzeny), 3428 },
+{ HP_POP(pc->additem), HP_POP2(HP_pc_additem), 3430 },
+{ HP_POP(pc->getzeny), HP_POP2(HP_pc_getzeny), 3432 },
+{ HP_POP(pc->delitem), HP_POP2(HP_pc_delitem), 3434 },
+{ HP_POP(pc->paycash), HP_POP2(HP_pc_paycash), 3436 },
+{ HP_POP(pc->getcash), HP_POP2(HP_pc_getcash), 3438 },
+{ HP_POP(pc->cart_additem), HP_POP2(HP_pc_cart_additem), 3440 },
+{ HP_POP(pc->cart_delitem), HP_POP2(HP_pc_cart_delitem), 3442 },
+{ HP_POP(pc->putitemtocart), HP_POP2(HP_pc_putitemtocart), 3444 },
+{ HP_POP(pc->getitemfromcart), HP_POP2(HP_pc_getitemfromcart), 3446 },
+{ HP_POP(pc->cartitem_amount), HP_POP2(HP_pc_cartitem_amount), 3448 },
+{ HP_POP(pc->takeitem), HP_POP2(HP_pc_takeitem), 3450 },
+{ HP_POP(pc->dropitem), HP_POP2(HP_pc_dropitem), 3452 },
+{ HP_POP(pc->isequipped), HP_POP2(HP_pc_isequipped), 3454 },
+{ HP_POP(pc->can_Adopt), HP_POP2(HP_pc_can_Adopt), 3456 },
+{ HP_POP(pc->adoption), HP_POP2(HP_pc_adoption), 3458 },
+{ HP_POP(pc->updateweightstatus), HP_POP2(HP_pc_updateweightstatus), 3460 },
+{ HP_POP(pc->addautobonus), HP_POP2(HP_pc_addautobonus), 3462 },
+{ HP_POP(pc->exeautobonus), HP_POP2(HP_pc_exeautobonus), 3464 },
+{ HP_POP(pc->endautobonus), HP_POP2(HP_pc_endautobonus), 3466 },
+{ HP_POP(pc->delautobonus), HP_POP2(HP_pc_delautobonus), 3468 },
+{ HP_POP(pc->bonus), HP_POP2(HP_pc_bonus), 3470 },
+{ HP_POP(pc->bonus2), HP_POP2(HP_pc_bonus2), 3472 },
+{ HP_POP(pc->bonus3), HP_POP2(HP_pc_bonus3), 3474 },
+{ HP_POP(pc->bonus4), HP_POP2(HP_pc_bonus4), 3476 },
+{ HP_POP(pc->bonus5), HP_POP2(HP_pc_bonus5), 3478 },
+{ HP_POP(pc->skill), HP_POP2(HP_pc_skill), 3480 },
+{ HP_POP(pc->insert_card), HP_POP2(HP_pc_insert_card), 3482 },
+{ HP_POP(pc->steal_item), HP_POP2(HP_pc_steal_item), 3484 },
+{ HP_POP(pc->steal_coin), HP_POP2(HP_pc_steal_coin), 3486 },
+{ HP_POP(pc->modifybuyvalue), HP_POP2(HP_pc_modifybuyvalue), 3488 },
+{ HP_POP(pc->modifysellvalue), HP_POP2(HP_pc_modifysellvalue), 3490 },
+{ HP_POP(pc->follow), HP_POP2(HP_pc_follow), 3492 },
+{ HP_POP(pc->stop_following), HP_POP2(HP_pc_stop_following), 3494 },
+{ HP_POP(pc->maxbaselv), HP_POP2(HP_pc_maxbaselv), 3496 },
+{ HP_POP(pc->maxjoblv), HP_POP2(HP_pc_maxjoblv), 3498 },
+{ HP_POP(pc->checkbaselevelup), HP_POP2(HP_pc_checkbaselevelup), 3500 },
+{ HP_POP(pc->checkjoblevelup), HP_POP2(HP_pc_checkjoblevelup), 3502 },
+{ HP_POP(pc->gainexp), HP_POP2(HP_pc_gainexp), 3504 },
+{ HP_POP(pc->nextbaseexp), HP_POP2(HP_pc_nextbaseexp), 3506 },
+{ HP_POP(pc->thisbaseexp), HP_POP2(HP_pc_thisbaseexp), 3508 },
+{ HP_POP(pc->nextjobexp), HP_POP2(HP_pc_nextjobexp), 3510 },
+{ HP_POP(pc->thisjobexp), HP_POP2(HP_pc_thisjobexp), 3512 },
+{ HP_POP(pc->gets_status_point), HP_POP2(HP_pc_gets_status_point), 3514 },
+{ HP_POP(pc->need_status_point), HP_POP2(HP_pc_need_status_point), 3516 },
+{ HP_POP(pc->statusup), HP_POP2(HP_pc_statusup), 3518 },
+{ HP_POP(pc->statusup2), HP_POP2(HP_pc_statusup2), 3520 },
+{ HP_POP(pc->skillup), HP_POP2(HP_pc_skillup), 3522 },
+{ HP_POP(pc->allskillup), HP_POP2(HP_pc_allskillup), 3524 },
+{ HP_POP(pc->resetlvl), HP_POP2(HP_pc_resetlvl), 3526 },
+{ HP_POP(pc->resetstate), HP_POP2(HP_pc_resetstate), 3528 },
+{ HP_POP(pc->resetskill), HP_POP2(HP_pc_resetskill), 3530 },
+{ HP_POP(pc->resetfeel), HP_POP2(HP_pc_resetfeel), 3532 },
+{ HP_POP(pc->resethate), HP_POP2(HP_pc_resethate), 3534 },
+{ HP_POP(pc->equipitem), HP_POP2(HP_pc_equipitem), 3536 },
+{ HP_POP(pc->unequipitem), HP_POP2(HP_pc_unequipitem), 3538 },
+{ HP_POP(pc->checkitem), HP_POP2(HP_pc_checkitem), 3540 },
+{ HP_POP(pc->useitem), HP_POP2(HP_pc_useitem), 3542 },
+{ HP_POP(pc->skillatk_bonus), HP_POP2(HP_pc_skillatk_bonus), 3544 },
+{ HP_POP(pc->skillheal_bonus), HP_POP2(HP_pc_skillheal_bonus), 3546 },
+{ HP_POP(pc->skillheal2_bonus), HP_POP2(HP_pc_skillheal2_bonus), 3548 },
+{ HP_POP(pc->damage), HP_POP2(HP_pc_damage), 3550 },
+{ HP_POP(pc->dead), HP_POP2(HP_pc_dead), 3552 },
+{ HP_POP(pc->revive), HP_POP2(HP_pc_revive), 3554 },
+{ HP_POP(pc->heal), HP_POP2(HP_pc_heal), 3556 },
+{ HP_POP(pc->itemheal), HP_POP2(HP_pc_itemheal), 3558 },
+{ HP_POP(pc->percentheal), HP_POP2(HP_pc_percentheal), 3560 },
+{ HP_POP(pc->jobchange), HP_POP2(HP_pc_jobchange), 3562 },
+{ HP_POP(pc->setoption), HP_POP2(HP_pc_setoption), 3564 },
+{ HP_POP(pc->setcart), HP_POP2(HP_pc_setcart), 3566 },
+{ HP_POP(pc->setfalcon), HP_POP2(HP_pc_setfalcon), 3568 },
+{ HP_POP(pc->setriding), HP_POP2(HP_pc_setriding), 3570 },
+{ HP_POP(pc->setmadogear), HP_POP2(HP_pc_setmadogear), 3572 },
+{ HP_POP(pc->changelook), HP_POP2(HP_pc_changelook), 3574 },
+{ HP_POP(pc->equiplookall), HP_POP2(HP_pc_equiplookall), 3576 },
+{ HP_POP(pc->readparam), HP_POP2(HP_pc_readparam), 3578 },
+{ HP_POP(pc->setparam), HP_POP2(HP_pc_setparam), 3580 },
+{ HP_POP(pc->readreg), HP_POP2(HP_pc_readreg), 3582 },
+{ HP_POP(pc->setreg), HP_POP2(HP_pc_setreg), 3584 },
+{ HP_POP(pc->readregstr), HP_POP2(HP_pc_readregstr), 3586 },
+{ HP_POP(pc->setregstr), HP_POP2(HP_pc_setregstr), 3588 },
+{ HP_POP(pc->readregistry), HP_POP2(HP_pc_readregistry), 3590 },
+{ HP_POP(pc->setregistry), HP_POP2(HP_pc_setregistry), 3592 },
+{ HP_POP(pc->readregistry_str), HP_POP2(HP_pc_readregistry_str), 3594 },
+{ HP_POP(pc->setregistry_str), HP_POP2(HP_pc_setregistry_str), 3596 },
+{ HP_POP(pc->addeventtimer), HP_POP2(HP_pc_addeventtimer), 3598 },
+{ HP_POP(pc->deleventtimer), HP_POP2(HP_pc_deleventtimer), 3600 },
+{ HP_POP(pc->cleareventtimer), HP_POP2(HP_pc_cleareventtimer), 3602 },
+{ HP_POP(pc->addeventtimercount), HP_POP2(HP_pc_addeventtimercount), 3604 },
+{ HP_POP(pc->calc_pvprank), HP_POP2(HP_pc_calc_pvprank), 3606 },
+{ HP_POP(pc->calc_pvprank_timer), HP_POP2(HP_pc_calc_pvprank_timer), 3608 },
+{ HP_POP(pc->ismarried), HP_POP2(HP_pc_ismarried), 3610 },
+{ HP_POP(pc->marriage), HP_POP2(HP_pc_marriage), 3612 },
+{ HP_POP(pc->divorce), HP_POP2(HP_pc_divorce), 3614 },
+{ HP_POP(pc->get_partner), HP_POP2(HP_pc_get_partner), 3616 },
+{ HP_POP(pc->get_father), HP_POP2(HP_pc_get_father), 3618 },
+{ HP_POP(pc->get_mother), HP_POP2(HP_pc_get_mother), 3620 },
+{ HP_POP(pc->get_child), HP_POP2(HP_pc_get_child), 3622 },
+{ HP_POP(pc->bleeding), HP_POP2(HP_pc_bleeding), 3624 },
+{ HP_POP(pc->regen), HP_POP2(HP_pc_regen), 3626 },
+{ HP_POP(pc->setstand), HP_POP2(HP_pc_setstand), 3628 },
+{ HP_POP(pc->candrop), HP_POP2(HP_pc_candrop), 3630 },
+{ HP_POP(pc->jobid2mapid), HP_POP2(HP_pc_jobid2mapid), 3632 },
+{ HP_POP(pc->mapid2jobid), HP_POP2(HP_pc_mapid2jobid), 3634 },
+{ HP_POP(pc->job_name), HP_POP2(HP_pc_job_name), 3636 },
+{ HP_POP(pc->setinvincibletimer), HP_POP2(HP_pc_setinvincibletimer), 3638 },
+{ HP_POP(pc->delinvincibletimer), HP_POP2(HP_pc_delinvincibletimer), 3640 },
+{ HP_POP(pc->addspiritball), HP_POP2(HP_pc_addspiritball), 3642 },
+{ HP_POP(pc->delspiritball), HP_POP2(HP_pc_delspiritball), 3644 },
+{ HP_POP(pc->addfame), HP_POP2(HP_pc_addfame), 3646 },
+{ HP_POP(pc->famerank), HP_POP2(HP_pc_famerank), 3648 },
+{ HP_POP(pc->set_hate_mob), HP_POP2(HP_pc_set_hate_mob), 3650 },
+{ HP_POP(pc->readdb), HP_POP2(HP_pc_readdb), 3652 },
+{ HP_POP(pc->map_day_timer), HP_POP2(HP_pc_map_day_timer), 3654 },
+{ HP_POP(pc->map_night_timer), HP_POP2(HP_pc_map_night_timer), 3656 },
+{ HP_POP(pc->inventory_rentals), HP_POP2(HP_pc_inventory_rentals), 3658 },
+{ HP_POP(pc->inventory_rental_clear), HP_POP2(HP_pc_inventory_rental_clear), 3660 },
+{ HP_POP(pc->inventory_rental_add), HP_POP2(HP_pc_inventory_rental_add), 3662 },
+{ HP_POP(pc->disguise), HP_POP2(HP_pc_disguise), 3664 },
+{ HP_POP(pc->isautolooting), HP_POP2(HP_pc_isautolooting), 3666 },
+{ HP_POP(pc->overheat), HP_POP2(HP_pc_overheat), 3668 },
+{ HP_POP(pc->banding), HP_POP2(HP_pc_banding), 3670 },
+{ HP_POP(pc->itemcd_do), HP_POP2(HP_pc_itemcd_do), 3672 },
+{ HP_POP(pc->load_combo), HP_POP2(HP_pc_load_combo), 3674 },
+{ HP_POP(pc->add_charm), HP_POP2(HP_pc_add_charm), 3676 },
+{ HP_POP(pc->del_charm), HP_POP2(HP_pc_del_charm), 3678 },
+{ HP_POP(pc->baselevelchanged), HP_POP2(HP_pc_baselevelchanged), 3680 },
+{ HP_POP(pc->level_penalty_mod), HP_POP2(HP_pc_level_penalty_mod), 3682 },
+{ HP_POP(pc->calc_skillpoint), HP_POP2(HP_pc_calc_skillpoint), 3684 },
+{ HP_POP(pc->invincible_timer), HP_POP2(HP_pc_invincible_timer), 3686 },
+{ HP_POP(pc->spiritball_timer), HP_POP2(HP_pc_spiritball_timer), 3688 },
+{ HP_POP(pc->check_banding), HP_POP2(HP_pc_check_banding), 3690 },
+{ HP_POP(pc->inventory_rental_end), HP_POP2(HP_pc_inventory_rental_end), 3692 },
+{ HP_POP(pc->check_skilltree), HP_POP2(HP_pc_check_skilltree), 3694 },
+{ HP_POP(pc->bonus_autospell), HP_POP2(HP_pc_bonus_autospell), 3696 },
+{ HP_POP(pc->bonus_autospell_onskill), HP_POP2(HP_pc_bonus_autospell_onskill), 3698 },
+{ HP_POP(pc->bonus_addeff), HP_POP2(HP_pc_bonus_addeff), 3700 },
+{ HP_POP(pc->bonus_addeff_onskill), HP_POP2(HP_pc_bonus_addeff_onskill), 3702 },
+{ HP_POP(pc->bonus_item_drop), HP_POP2(HP_pc_bonus_item_drop), 3704 },
+{ HP_POP(pc->calcexp), HP_POP2(HP_pc_calcexp), 3706 },
+{ HP_POP(pc->respawn_timer), HP_POP2(HP_pc_respawn_timer), 3708 },
+{ HP_POP(pc->jobchange_killclone), HP_POP2(HP_pc_jobchange_killclone), 3710 },
+{ HP_POP(pc->getstat), HP_POP2(HP_pc_getstat), 3712 },
+{ HP_POP(pc->setstat), HP_POP2(HP_pc_setstat), 3714 },
+{ HP_POP(pc->eventtimer), HP_POP2(HP_pc_eventtimer), 3716 },
+{ HP_POP(pc->daynight_timer_sub), HP_POP2(HP_pc_daynight_timer_sub), 3718 },
+{ HP_POP(pc->charm_timer), HP_POP2(HP_pc_charm_timer), 3720 },
+{ HP_POP(pc->readdb_levelpenalty), HP_POP2(HP_pc_readdb_levelpenalty), 3722 },
+{ HP_POP(pc->autosave), HP_POP2(HP_pc_autosave), 3724 },
+{ HP_POP(pc->follow_timer), HP_POP2(HP_pc_follow_timer), 3726 },
+{ HP_POP(pc->read_skill_tree), HP_POP2(HP_pc_read_skill_tree), 3728 },
+{ HP_POP(pc->isUseitem), HP_POP2(HP_pc_isUseitem), 3730 },
+{ HP_POP(pc->show_steal), HP_POP2(HP_pc_show_steal), 3732 },
+{ HP_POP(pc->checkcombo), HP_POP2(HP_pc_checkcombo), 3734 },
+{ HP_POP(pc->calcweapontype), HP_POP2(HP_pc_calcweapontype), 3736 },
+{ HP_POP(pc->removecombo), HP_POP2(HP_pc_removecombo), 3738 },
 /* pet */
-{ HP_POP(pet->init), HP_POP2(HP_pet_init), 3724 },
-{ HP_POP(pet->final), HP_POP2(HP_pet_final), 3726 },
-{ HP_POP(pet->hungry_val), HP_POP2(HP_pet_hungry_val), 3728 },
-{ HP_POP(pet->set_intimate), HP_POP2(HP_pet_set_intimate), 3730 },
-{ HP_POP(pet->create_egg), HP_POP2(HP_pet_create_egg), 3732 },
-{ HP_POP(pet->unlocktarget), HP_POP2(HP_pet_unlocktarget), 3734 },
-{ HP_POP(pet->attackskill), HP_POP2(HP_pet_attackskill), 3736 },
-{ HP_POP(pet->target_check), HP_POP2(HP_pet_target_check), 3738 },
-{ HP_POP(pet->sc_check), HP_POP2(HP_pet_sc_check), 3740 },
-{ HP_POP(pet->hungry), HP_POP2(HP_pet_hungry), 3742 },
-{ HP_POP(pet->search_petDB_index), HP_POP2(HP_pet_search_petDB_index), 3744 },
-{ HP_POP(pet->hungry_timer_delete), HP_POP2(HP_pet_hungry_timer_delete), 3746 },
-{ HP_POP(pet->performance), HP_POP2(HP_pet_performance), 3748 },
-{ HP_POP(pet->return_egg), HP_POP2(HP_pet_return_egg), 3750 },
-{ HP_POP(pet->data_init), HP_POP2(HP_pet_data_init), 3752 },
-{ HP_POP(pet->birth_process), HP_POP2(HP_pet_birth_process), 3754 },
-{ HP_POP(pet->recv_petdata), HP_POP2(HP_pet_recv_petdata), 3756 },
-{ HP_POP(pet->select_egg), HP_POP2(HP_pet_select_egg), 3758 },
-{ HP_POP(pet->catch_process1), HP_POP2(HP_pet_catch_process1), 3760 },
-{ HP_POP(pet->catch_process2), HP_POP2(HP_pet_catch_process2), 3762 },
-{ HP_POP(pet->get_egg), HP_POP2(HP_pet_get_egg), 3764 },
-{ HP_POP(pet->unequipitem), HP_POP2(HP_pet_unequipitem), 3766 },
-{ HP_POP(pet->food), HP_POP2(HP_pet_food), 3768 },
-{ HP_POP(pet->ai_sub_hard_lootsearch), HP_POP2(HP_pet_ai_sub_hard_lootsearch), 3770 },
-{ HP_POP(pet->menu), HP_POP2(HP_pet_menu), 3772 },
-{ HP_POP(pet->change_name), HP_POP2(HP_pet_change_name), 3774 },
-{ HP_POP(pet->change_name_ack), HP_POP2(HP_pet_change_name_ack), 3776 },
-{ HP_POP(pet->equipitem), HP_POP2(HP_pet_equipitem), 3778 },
-{ HP_POP(pet->randomwalk), HP_POP2(HP_pet_randomwalk), 3780 },
-{ HP_POP(pet->ai_sub_hard), HP_POP2(HP_pet_ai_sub_hard), 3782 },
-{ HP_POP(pet->ai_sub_foreachclient), HP_POP2(HP_pet_ai_sub_foreachclient), 3784 },
-{ HP_POP(pet->ai_hard), HP_POP2(HP_pet_ai_hard), 3786 },
-{ HP_POP(pet->delay_item_drop), HP_POP2(HP_pet_delay_item_drop), 3788 },
-{ HP_POP(pet->lootitem_drop), HP_POP2(HP_pet_lootitem_drop), 3790 },
-{ HP_POP(pet->skill_bonus_timer), HP_POP2(HP_pet_skill_bonus_timer), 3792 },
-{ HP_POP(pet->recovery_timer), HP_POP2(HP_pet_recovery_timer), 3794 },
-{ HP_POP(pet->heal_timer), HP_POP2(HP_pet_heal_timer), 3796 },
-{ HP_POP(pet->skill_support_timer), HP_POP2(HP_pet_skill_support_timer), 3798 },
-{ HP_POP(pet->read_db), HP_POP2(HP_pet_read_db), 3800 },
+{ HP_POP(pet->init), HP_POP2(HP_pet_init), 3740 },
+{ HP_POP(pet->final), HP_POP2(HP_pet_final), 3742 },
+{ HP_POP(pet->hungry_val), HP_POP2(HP_pet_hungry_val), 3744 },
+{ HP_POP(pet->set_intimate), HP_POP2(HP_pet_set_intimate), 3746 },
+{ HP_POP(pet->create_egg), HP_POP2(HP_pet_create_egg), 3748 },
+{ HP_POP(pet->unlocktarget), HP_POP2(HP_pet_unlocktarget), 3750 },
+{ HP_POP(pet->attackskill), HP_POP2(HP_pet_attackskill), 3752 },
+{ HP_POP(pet->target_check), HP_POP2(HP_pet_target_check), 3754 },
+{ HP_POP(pet->sc_check), HP_POP2(HP_pet_sc_check), 3756 },
+{ HP_POP(pet->hungry), HP_POP2(HP_pet_hungry), 3758 },
+{ HP_POP(pet->search_petDB_index), HP_POP2(HP_pet_search_petDB_index), 3760 },
+{ HP_POP(pet->hungry_timer_delete), HP_POP2(HP_pet_hungry_timer_delete), 3762 },
+{ HP_POP(pet->performance), HP_POP2(HP_pet_performance), 3764 },
+{ HP_POP(pet->return_egg), HP_POP2(HP_pet_return_egg), 3766 },
+{ HP_POP(pet->data_init), HP_POP2(HP_pet_data_init), 3768 },
+{ HP_POP(pet->birth_process), HP_POP2(HP_pet_birth_process), 3770 },
+{ HP_POP(pet->recv_petdata), HP_POP2(HP_pet_recv_petdata), 3772 },
+{ HP_POP(pet->select_egg), HP_POP2(HP_pet_select_egg), 3774 },
+{ HP_POP(pet->catch_process1), HP_POP2(HP_pet_catch_process1), 3776 },
+{ HP_POP(pet->catch_process2), HP_POP2(HP_pet_catch_process2), 3778 },
+{ HP_POP(pet->get_egg), HP_POP2(HP_pet_get_egg), 3780 },
+{ HP_POP(pet->unequipitem), HP_POP2(HP_pet_unequipitem), 3782 },
+{ HP_POP(pet->food), HP_POP2(HP_pet_food), 3784 },
+{ HP_POP(pet->ai_sub_hard_lootsearch), HP_POP2(HP_pet_ai_sub_hard_lootsearch), 3786 },
+{ HP_POP(pet->menu), HP_POP2(HP_pet_menu), 3788 },
+{ HP_POP(pet->change_name), HP_POP2(HP_pet_change_name), 3790 },
+{ HP_POP(pet->change_name_ack), HP_POP2(HP_pet_change_name_ack), 3792 },
+{ HP_POP(pet->equipitem), HP_POP2(HP_pet_equipitem), 3794 },
+{ HP_POP(pet->randomwalk), HP_POP2(HP_pet_randomwalk), 3796 },
+{ HP_POP(pet->ai_sub_hard), HP_POP2(HP_pet_ai_sub_hard), 3798 },
+{ HP_POP(pet->ai_sub_foreachclient), HP_POP2(HP_pet_ai_sub_foreachclient), 3800 },
+{ HP_POP(pet->ai_hard), HP_POP2(HP_pet_ai_hard), 3802 },
+{ HP_POP(pet->delay_item_drop), HP_POP2(HP_pet_delay_item_drop), 3804 },
+{ HP_POP(pet->lootitem_drop), HP_POP2(HP_pet_lootitem_drop), 3806 },
+{ HP_POP(pet->skill_bonus_timer), HP_POP2(HP_pet_skill_bonus_timer), 3808 },
+{ HP_POP(pet->recovery_timer), HP_POP2(HP_pet_recovery_timer), 3810 },
+{ HP_POP(pet->heal_timer), HP_POP2(HP_pet_heal_timer), 3812 },
+{ HP_POP(pet->skill_support_timer), HP_POP2(HP_pet_skill_support_timer), 3814 },
+{ HP_POP(pet->read_db), HP_POP2(HP_pet_read_db), 3816 },
 /* quest */
-{ HP_POP(quest->init), HP_POP2(HP_quest_init), 3802 },
-{ HP_POP(quest->reload), HP_POP2(HP_quest_reload), 3804 },
-{ HP_POP(quest->search_db), HP_POP2(HP_quest_search_db), 3806 },
-{ HP_POP(quest->pc_login), HP_POP2(HP_quest_pc_login), 3808 },
-{ HP_POP(quest->add), HP_POP2(HP_quest_add), 3810 },
-{ HP_POP(quest->change), HP_POP2(HP_quest_change), 3812 },
-{ HP_POP(quest->delete), HP_POP2(HP_quest_delete), 3814 },
-{ HP_POP(quest->update_objective_sub), HP_POP2(HP_quest_update_objective_sub), 3816 },
-{ HP_POP(quest->update_objective), HP_POP2(HP_quest_update_objective), 3818 },
-{ HP_POP(quest->update_status), HP_POP2(HP_quest_update_status), 3820 },
-{ HP_POP(quest->check), HP_POP2(HP_quest_check), 3822 },
-{ HP_POP(quest->read_db), HP_POP2(HP_quest_read_db), 3824 },
+{ HP_POP(quest->init), HP_POP2(HP_quest_init), 3818 },
+{ HP_POP(quest->reload), HP_POP2(HP_quest_reload), 3820 },
+{ HP_POP(quest->search_db), HP_POP2(HP_quest_search_db), 3822 },
+{ HP_POP(quest->pc_login), HP_POP2(HP_quest_pc_login), 3824 },
+{ HP_POP(quest->add), HP_POP2(HP_quest_add), 3826 },
+{ HP_POP(quest->change), HP_POP2(HP_quest_change), 3828 },
+{ HP_POP(quest->delete), HP_POP2(HP_quest_delete), 3830 },
+{ HP_POP(quest->update_objective_sub), HP_POP2(HP_quest_update_objective_sub), 3832 },
+{ HP_POP(quest->update_objective), HP_POP2(HP_quest_update_objective), 3834 },
+{ HP_POP(quest->update_status), HP_POP2(HP_quest_update_status), 3836 },
+{ HP_POP(quest->check), HP_POP2(HP_quest_check), 3838 },
+{ HP_POP(quest->read_db), HP_POP2(HP_quest_read_db), 3840 },
 /* script */
-{ HP_POP(script->init), HP_POP2(HP_script_init), 3826 },
-{ HP_POP(script->final), HP_POP2(HP_script_final), 3828 },
-{ HP_POP(script->reload), HP_POP2(HP_script_reload), 3830 },
-{ HP_POP(script->parse), HP_POP2(HP_script_parse), 3832 },
-{ HP_POP(script->parse_builtin), HP_POP2(HP_script_parse_builtin), 3834 },
-{ HP_POP(script->parse_subexpr), HP_POP2(HP_script_parse_subexpr), 3836 },
-{ HP_POP(script->skip_space), HP_POP2(HP_script_skip_space), 3838 },
-{ HP_POP(script->error), HP_POP2(HP_script_error), 3840 },
-{ HP_POP(script->warning), HP_POP2(HP_script_warning), 3842 },
-{ HP_POP(script->addScript), HP_POP2(HP_script_addScript), 3844 },
-{ HP_POP(script->conv_num), HP_POP2(HP_script_conv_num), 3846 },
-{ HP_POP(script->conv_str), HP_POP2(HP_script_conv_str), 3848 },
-{ HP_POP(script->rid2sd), HP_POP2(HP_script_rid2sd), 3850 },
-{ HP_POP(script->detach_rid), HP_POP2(HP_script_detach_rid), 3852 },
-{ HP_POP(script->push_val), HP_POP2(HP_script_push_val), 3854 },
-{ HP_POP(script->get_val), HP_POP2(HP_script_get_val), 3856 },
-{ HP_POP(script->get_val2), HP_POP2(HP_script_get_val2), 3858 },
-{ HP_POP(script->push_str), HP_POP2(HP_script_push_str), 3860 },
-{ HP_POP(script->push_copy), HP_POP2(HP_script_push_copy), 3862 },
-{ HP_POP(script->pop_stack), HP_POP2(HP_script_pop_stack), 3864 },
-{ HP_POP(script->set_constant), HP_POP2(HP_script_set_constant), 3866 },
-{ HP_POP(script->set_constant2), HP_POP2(HP_script_set_constant2), 3868 },
-{ HP_POP(script->set_constant_force), HP_POP2(HP_script_set_constant_force), 3870 },
-{ HP_POP(script->get_constant), HP_POP2(HP_script_get_constant), 3872 },
-{ HP_POP(script->label_add), HP_POP2(HP_script_label_add), 3874 },
-{ HP_POP(script->run), HP_POP2(HP_script_run), 3876 },
-{ HP_POP(script->run_main), HP_POP2(HP_script_run_main), 3878 },
-{ HP_POP(script->run_timer), HP_POP2(HP_script_run_timer), 3880 },
-{ HP_POP(script->set_var), HP_POP2(HP_script_set_var), 3882 },
-{ HP_POP(script->stop_instances), HP_POP2(HP_script_stop_instances), 3884 },
-{ HP_POP(script->free_code), HP_POP2(HP_script_free_code), 3886 },
-{ HP_POP(script->free_vars), HP_POP2(HP_script_free_vars), 3888 },
-{ HP_POP(script->alloc_state), HP_POP2(HP_script_alloc_state), 3890 },
-{ HP_POP(script->free_state), HP_POP2(HP_script_free_state), 3892 },
-{ HP_POP(script->run_autobonus), HP_POP2(HP_script_run_autobonus), 3894 },
-{ HP_POP(script->cleararray_pc), HP_POP2(HP_script_cleararray_pc), 3896 },
-{ HP_POP(script->setarray_pc), HP_POP2(HP_script_setarray_pc), 3898 },
-{ HP_POP(script->config_read), HP_POP2(HP_script_config_read), 3900 },
-{ HP_POP(script->add_str), HP_POP2(HP_script_add_str), 3902 },
-{ HP_POP(script->get_str), HP_POP2(HP_script_get_str), 3904 },
-{ HP_POP(script->search_str), HP_POP2(HP_script_search_str), 3906 },
-{ HP_POP(script->setd_sub), HP_POP2(HP_script_setd_sub), 3908 },
-{ HP_POP(script->attach_state), HP_POP2(HP_script_attach_state), 3910 },
-{ HP_POP(script->queue), HP_POP2(HP_script_queue), 3912 },
-{ HP_POP(script->queue_add), HP_POP2(HP_script_queue_add), 3914 },
-{ HP_POP(script->queue_del), HP_POP2(HP_script_queue_del), 3916 },
-{ HP_POP(script->queue_remove), HP_POP2(HP_script_queue_remove), 3918 },
-{ HP_POP(script->queue_create), HP_POP2(HP_script_queue_create), 3920 },
-{ HP_POP(script->queue_clear), HP_POP2(HP_script_queue_clear), 3922 },
-{ HP_POP(script->parse_curly_close), HP_POP2(HP_script_parse_curly_close), 3924 },
-{ HP_POP(script->parse_syntax_close), HP_POP2(HP_script_parse_syntax_close), 3926 },
-{ HP_POP(script->parse_syntax_close_sub), HP_POP2(HP_script_parse_syntax_close_sub), 3928 },
-{ HP_POP(script->parse_syntax), HP_POP2(HP_script_parse_syntax), 3930 },
-{ HP_POP(script->get_com), HP_POP2(HP_script_get_com), 3932 },
-{ HP_POP(script->get_num), HP_POP2(HP_script_get_num), 3934 },
-{ HP_POP(script->op2name), HP_POP2(HP_script_op2name), 3936 },
-{ HP_POP(script->reportsrc), HP_POP2(HP_script_reportsrc), 3938 },
-{ HP_POP(script->reportdata), HP_POP2(HP_script_reportdata), 3940 },
-{ HP_POP(script->reportfunc), HP_POP2(HP_script_reportfunc), 3942 },
-{ HP_POP(script->disp_error_message2), HP_POP2(HP_script_disp_error_message2), 3944 },
-{ HP_POP(script->disp_warning_message), HP_POP2(HP_script_disp_warning_message), 3946 },
-{ HP_POP(script->check_event), HP_POP2(HP_script_check_event), 3948 },
-{ HP_POP(script->calc_hash), HP_POP2(HP_script_calc_hash), 3950 },
-{ HP_POP(script->addb), HP_POP2(HP_script_addb), 3952 },
-{ HP_POP(script->addc), HP_POP2(HP_script_addc), 3954 },
-{ HP_POP(script->addi), HP_POP2(HP_script_addi), 3956 },
-{ HP_POP(script->addl), HP_POP2(HP_script_addl), 3958 },
-{ HP_POP(script->set_label), HP_POP2(HP_script_set_label), 3960 },
-{ HP_POP(script->skip_word), HP_POP2(HP_script_skip_word), 3962 },
-{ HP_POP(script->add_word), HP_POP2(HP_script_add_word), 3964 },
-{ HP_POP(script->parse_callfunc), HP_POP2(HP_script_parse_callfunc), 3966 },
-{ HP_POP(script->parse_nextline), HP_POP2(HP_script_parse_nextline), 3968 },
-{ HP_POP(script->parse_variable), HP_POP2(HP_script_parse_variable), 3970 },
-{ HP_POP(script->parse_simpleexpr), HP_POP2(HP_script_parse_simpleexpr), 3972 },
-{ HP_POP(script->parse_expr), HP_POP2(HP_script_parse_expr), 3974 },
-{ HP_POP(script->parse_line), HP_POP2(HP_script_parse_line), 3976 },
-{ HP_POP(script->read_constdb), HP_POP2(HP_script_read_constdb), 3978 },
-{ HP_POP(script->print_line), HP_POP2(HP_script_print_line), 3980 },
-{ HP_POP(script->errorwarning_sub), HP_POP2(HP_script_errorwarning_sub), 3982 },
-{ HP_POP(script->set_reg), HP_POP2(HP_script_set_reg), 3984 },
-{ HP_POP(script->stack_expand), HP_POP2(HP_script_stack_expand), 3986 },
-{ HP_POP(script->push_retinfo), HP_POP2(HP_script_push_retinfo), 3988 },
-{ HP_POP(script->pop_val), HP_POP2(HP_script_pop_val), 3990 },
-{ HP_POP(script->op_3), HP_POP2(HP_script_op_3), 3992 },
-{ HP_POP(script->op_2str), HP_POP2(HP_script_op_2str), 3994 },
-{ HP_POP(script->op_2num), HP_POP2(HP_script_op_2num), 3996 },
-{ HP_POP(script->op_2), HP_POP2(HP_script_op_2), 3998 },
-{ HP_POP(script->op_1), HP_POP2(HP_script_op_1), 4000 },
-{ HP_POP(script->check_buildin_argtype), HP_POP2(HP_script_check_buildin_argtype), 4002 },
-{ HP_POP(script->detach_state), HP_POP2(HP_script_detach_state), 4004 },
-{ HP_POP(script->db_free_code_sub), HP_POP2(HP_script_db_free_code_sub), 4006 },
-{ HP_POP(script->add_autobonus), HP_POP2(HP_script_add_autobonus), 4008 },
-{ HP_POP(script->menu_countoptions), HP_POP2(HP_script_menu_countoptions), 4010 },
-{ HP_POP(script->buildin_areawarp_sub), HP_POP2(HP_script_buildin_areawarp_sub), 4012 },
-{ HP_POP(script->buildin_areapercentheal_sub), HP_POP2(HP_script_buildin_areapercentheal_sub), 4014 },
-{ HP_POP(script->getarraysize), HP_POP2(HP_script_getarraysize), 4016 },
-{ HP_POP(script->buildin_delitem_delete), HP_POP2(HP_script_buildin_delitem_delete), 4018 },
-{ HP_POP(script->buildin_delitem_search), HP_POP2(HP_script_buildin_delitem_search), 4020 },
-{ HP_POP(script->buildin_killmonster_sub_strip), HP_POP2(HP_script_buildin_killmonster_sub_strip), 4022 },
-{ HP_POP(script->buildin_killmonster_sub), HP_POP2(HP_script_buildin_killmonster_sub), 4024 },
-{ HP_POP(script->buildin_killmonsterall_sub_strip), HP_POP2(HP_script_buildin_killmonsterall_sub_strip), 4026 },
-{ HP_POP(script->buildin_killmonsterall_sub), HP_POP2(HP_script_buildin_killmonsterall_sub), 4028 },
-{ HP_POP(script->buildin_announce_sub), HP_POP2(HP_script_buildin_announce_sub), 4030 },
-{ HP_POP(script->buildin_getareausers_sub), HP_POP2(HP_script_buildin_getareausers_sub), 4032 },
-{ HP_POP(script->buildin_getareadropitem_sub), HP_POP2(HP_script_buildin_getareadropitem_sub), 4034 },
-{ HP_POP(script->mapflag_pvp_sub), HP_POP2(HP_script_mapflag_pvp_sub), 4036 },
-{ HP_POP(script->buildin_pvpoff_sub), HP_POP2(HP_script_buildin_pvpoff_sub), 4038 },
-{ HP_POP(script->buildin_maprespawnguildid_sub_pc), HP_POP2(HP_script_buildin_maprespawnguildid_sub_pc), 4040 },
-{ HP_POP(script->buildin_maprespawnguildid_sub_mob), HP_POP2(HP_script_buildin_maprespawnguildid_sub_mob), 4042 },
-{ HP_POP(script->buildin_mobcount_sub), HP_POP2(HP_script_buildin_mobcount_sub), 4044 },
-{ HP_POP(script->playBGM_sub), HP_POP2(HP_script_playBGM_sub), 4046 },
-{ HP_POP(script->playBGM_foreachpc_sub), HP_POP2(HP_script_playBGM_foreachpc_sub), 4048 },
-{ HP_POP(script->soundeffect_sub), HP_POP2(HP_script_soundeffect_sub), 4050 },
-{ HP_POP(script->buildin_query_sql_sub), HP_POP2(HP_script_buildin_query_sql_sub), 4052 },
-{ HP_POP(script->axtoi), HP_POP2(HP_script_axtoi), 4054 },
-{ HP_POP(script->buildin_instance_warpall_sub), HP_POP2(HP_script_buildin_instance_warpall_sub), 4056 },
-{ HP_POP(script->buildin_mobuseskill_sub), HP_POP2(HP_script_buildin_mobuseskill_sub), 4058 },
-{ HP_POP(script->cleanfloor_sub), HP_POP2(HP_script_cleanfloor_sub), 4060 },
-{ HP_POP(script->run_func), HP_POP2(HP_script_run_func), 4062 },
+{ HP_POP(script->init), HP_POP2(HP_script_init), 3842 },
+{ HP_POP(script->final), HP_POP2(HP_script_final), 3844 },
+{ HP_POP(script->reload), HP_POP2(HP_script_reload), 3846 },
+{ HP_POP(script->parse), HP_POP2(HP_script_parse), 3848 },
+{ HP_POP(script->parse_builtin), HP_POP2(HP_script_parse_builtin), 3850 },
+{ HP_POP(script->parse_subexpr), HP_POP2(HP_script_parse_subexpr), 3852 },
+{ HP_POP(script->skip_space), HP_POP2(HP_script_skip_space), 3854 },
+{ HP_POP(script->error), HP_POP2(HP_script_error), 3856 },
+{ HP_POP(script->warning), HP_POP2(HP_script_warning), 3858 },
+{ HP_POP(script->addScript), HP_POP2(HP_script_addScript), 3860 },
+{ HP_POP(script->conv_num), HP_POP2(HP_script_conv_num), 3862 },
+{ HP_POP(script->conv_str), HP_POP2(HP_script_conv_str), 3864 },
+{ HP_POP(script->rid2sd), HP_POP2(HP_script_rid2sd), 3866 },
+{ HP_POP(script->detach_rid), HP_POP2(HP_script_detach_rid), 3868 },
+{ HP_POP(script->push_val), HP_POP2(HP_script_push_val), 3870 },
+{ HP_POP(script->get_val), HP_POP2(HP_script_get_val), 3872 },
+{ HP_POP(script->get_val2), HP_POP2(HP_script_get_val2), 3874 },
+{ HP_POP(script->push_str), HP_POP2(HP_script_push_str), 3876 },
+{ HP_POP(script->push_copy), HP_POP2(HP_script_push_copy), 3878 },
+{ HP_POP(script->pop_stack), HP_POP2(HP_script_pop_stack), 3880 },
+{ HP_POP(script->set_constant), HP_POP2(HP_script_set_constant), 3882 },
+{ HP_POP(script->set_constant2), HP_POP2(HP_script_set_constant2), 3884 },
+{ HP_POP(script->set_constant_force), HP_POP2(HP_script_set_constant_force), 3886 },
+{ HP_POP(script->get_constant), HP_POP2(HP_script_get_constant), 3888 },
+{ HP_POP(script->label_add), HP_POP2(HP_script_label_add), 3890 },
+{ HP_POP(script->run), HP_POP2(HP_script_run), 3892 },
+{ HP_POP(script->run_main), HP_POP2(HP_script_run_main), 3894 },
+{ HP_POP(script->run_timer), HP_POP2(HP_script_run_timer), 3896 },
+{ HP_POP(script->set_var), HP_POP2(HP_script_set_var), 3898 },
+{ HP_POP(script->stop_instances), HP_POP2(HP_script_stop_instances), 3900 },
+{ HP_POP(script->free_code), HP_POP2(HP_script_free_code), 3902 },
+{ HP_POP(script->free_vars), HP_POP2(HP_script_free_vars), 3904 },
+{ HP_POP(script->alloc_state), HP_POP2(HP_script_alloc_state), 3906 },
+{ HP_POP(script->free_state), HP_POP2(HP_script_free_state), 3908 },
+{ HP_POP(script->run_autobonus), HP_POP2(HP_script_run_autobonus), 3910 },
+{ HP_POP(script->cleararray_pc), HP_POP2(HP_script_cleararray_pc), 3912 },
+{ HP_POP(script->setarray_pc), HP_POP2(HP_script_setarray_pc), 3914 },
+{ HP_POP(script->config_read), HP_POP2(HP_script_config_read), 3916 },
+{ HP_POP(script->add_str), HP_POP2(HP_script_add_str), 3918 },
+{ HP_POP(script->get_str), HP_POP2(HP_script_get_str), 3920 },
+{ HP_POP(script->search_str), HP_POP2(HP_script_search_str), 3922 },
+{ HP_POP(script->setd_sub), HP_POP2(HP_script_setd_sub), 3924 },
+{ HP_POP(script->attach_state), HP_POP2(HP_script_attach_state), 3926 },
+{ HP_POP(script->queue), HP_POP2(HP_script_queue), 3928 },
+{ HP_POP(script->queue_add), HP_POP2(HP_script_queue_add), 3930 },
+{ HP_POP(script->queue_del), HP_POP2(HP_script_queue_del), 3932 },
+{ HP_POP(script->queue_remove), HP_POP2(HP_script_queue_remove), 3934 },
+{ HP_POP(script->queue_create), HP_POP2(HP_script_queue_create), 3936 },
+{ HP_POP(script->queue_clear), HP_POP2(HP_script_queue_clear), 3938 },
+{ HP_POP(script->parse_curly_close), HP_POP2(HP_script_parse_curly_close), 3940 },
+{ HP_POP(script->parse_syntax_close), HP_POP2(HP_script_parse_syntax_close), 3942 },
+{ HP_POP(script->parse_syntax_close_sub), HP_POP2(HP_script_parse_syntax_close_sub), 3944 },
+{ HP_POP(script->parse_syntax), HP_POP2(HP_script_parse_syntax), 3946 },
+{ HP_POP(script->get_com), HP_POP2(HP_script_get_com), 3948 },
+{ HP_POP(script->get_num), HP_POP2(HP_script_get_num), 3950 },
+{ HP_POP(script->op2name), HP_POP2(HP_script_op2name), 3952 },
+{ HP_POP(script->reportsrc), HP_POP2(HP_script_reportsrc), 3954 },
+{ HP_POP(script->reportdata), HP_POP2(HP_script_reportdata), 3956 },
+{ HP_POP(script->reportfunc), HP_POP2(HP_script_reportfunc), 3958 },
+{ HP_POP(script->disp_error_message2), HP_POP2(HP_script_disp_error_message2), 3960 },
+{ HP_POP(script->disp_warning_message), HP_POP2(HP_script_disp_warning_message), 3962 },
+{ HP_POP(script->check_event), HP_POP2(HP_script_check_event), 3964 },
+{ HP_POP(script->calc_hash), HP_POP2(HP_script_calc_hash), 3966 },
+{ HP_POP(script->addb), HP_POP2(HP_script_addb), 3968 },
+{ HP_POP(script->addc), HP_POP2(HP_script_addc), 3970 },
+{ HP_POP(script->addi), HP_POP2(HP_script_addi), 3972 },
+{ HP_POP(script->addl), HP_POP2(HP_script_addl), 3974 },
+{ HP_POP(script->set_label), HP_POP2(HP_script_set_label), 3976 },
+{ HP_POP(script->skip_word), HP_POP2(HP_script_skip_word), 3978 },
+{ HP_POP(script->add_word), HP_POP2(HP_script_add_word), 3980 },
+{ HP_POP(script->parse_callfunc), HP_POP2(HP_script_parse_callfunc), 3982 },
+{ HP_POP(script->parse_nextline), HP_POP2(HP_script_parse_nextline), 3984 },
+{ HP_POP(script->parse_variable), HP_POP2(HP_script_parse_variable), 3986 },
+{ HP_POP(script->parse_simpleexpr), HP_POP2(HP_script_parse_simpleexpr), 3988 },
+{ HP_POP(script->parse_expr), HP_POP2(HP_script_parse_expr), 3990 },
+{ HP_POP(script->parse_line), HP_POP2(HP_script_parse_line), 3992 },
+{ HP_POP(script->read_constdb), HP_POP2(HP_script_read_constdb), 3994 },
+{ HP_POP(script->print_line), HP_POP2(HP_script_print_line), 3996 },
+{ HP_POP(script->errorwarning_sub), HP_POP2(HP_script_errorwarning_sub), 3998 },
+{ HP_POP(script->set_reg), HP_POP2(HP_script_set_reg), 4000 },
+{ HP_POP(script->stack_expand), HP_POP2(HP_script_stack_expand), 4002 },
+{ HP_POP(script->push_retinfo), HP_POP2(HP_script_push_retinfo), 4004 },
+{ HP_POP(script->pop_val), HP_POP2(HP_script_pop_val), 4006 },
+{ HP_POP(script->op_3), HP_POP2(HP_script_op_3), 4008 },
+{ HP_POP(script->op_2str), HP_POP2(HP_script_op_2str), 4010 },
+{ HP_POP(script->op_2num), HP_POP2(HP_script_op_2num), 4012 },
+{ HP_POP(script->op_2), HP_POP2(HP_script_op_2), 4014 },
+{ HP_POP(script->op_1), HP_POP2(HP_script_op_1), 4016 },
+{ HP_POP(script->check_buildin_argtype), HP_POP2(HP_script_check_buildin_argtype), 4018 },
+{ HP_POP(script->detach_state), HP_POP2(HP_script_detach_state), 4020 },
+{ HP_POP(script->db_free_code_sub), HP_POP2(HP_script_db_free_code_sub), 4022 },
+{ HP_POP(script->add_autobonus), HP_POP2(HP_script_add_autobonus), 4024 },
+{ HP_POP(script->menu_countoptions), HP_POP2(HP_script_menu_countoptions), 4026 },
+{ HP_POP(script->buildin_areawarp_sub), HP_POP2(HP_script_buildin_areawarp_sub), 4028 },
+{ HP_POP(script->buildin_areapercentheal_sub), HP_POP2(HP_script_buildin_areapercentheal_sub), 4030 },
+{ HP_POP(script->getarraysize), HP_POP2(HP_script_getarraysize), 4032 },
+{ HP_POP(script->buildin_delitem_delete), HP_POP2(HP_script_buildin_delitem_delete), 4034 },
+{ HP_POP(script->buildin_delitem_search), HP_POP2(HP_script_buildin_delitem_search), 4036 },
+{ HP_POP(script->buildin_killmonster_sub_strip), HP_POP2(HP_script_buildin_killmonster_sub_strip), 4038 },
+{ HP_POP(script->buildin_killmonster_sub), HP_POP2(HP_script_buildin_killmonster_sub), 4040 },
+{ HP_POP(script->buildin_killmonsterall_sub_strip), HP_POP2(HP_script_buildin_killmonsterall_sub_strip), 4042 },
+{ HP_POP(script->buildin_killmonsterall_sub), HP_POP2(HP_script_buildin_killmonsterall_sub), 4044 },
+{ HP_POP(script->buildin_announce_sub), HP_POP2(HP_script_buildin_announce_sub), 4046 },
+{ HP_POP(script->buildin_getareausers_sub), HP_POP2(HP_script_buildin_getareausers_sub), 4048 },
+{ HP_POP(script->buildin_getareadropitem_sub), HP_POP2(HP_script_buildin_getareadropitem_sub), 4050 },
+{ HP_POP(script->mapflag_pvp_sub), HP_POP2(HP_script_mapflag_pvp_sub), 4052 },
+{ HP_POP(script->buildin_pvpoff_sub), HP_POP2(HP_script_buildin_pvpoff_sub), 4054 },
+{ HP_POP(script->buildin_maprespawnguildid_sub_pc), HP_POP2(HP_script_buildin_maprespawnguildid_sub_pc), 4056 },
+{ HP_POP(script->buildin_maprespawnguildid_sub_mob), HP_POP2(HP_script_buildin_maprespawnguildid_sub_mob), 4058 },
+{ HP_POP(script->buildin_mobcount_sub), HP_POP2(HP_script_buildin_mobcount_sub), 4060 },
+{ HP_POP(script->playBGM_sub), HP_POP2(HP_script_playBGM_sub), 4062 },
+{ HP_POP(script->playBGM_foreachpc_sub), HP_POP2(HP_script_playBGM_foreachpc_sub), 4064 },
+{ HP_POP(script->soundeffect_sub), HP_POP2(HP_script_soundeffect_sub), 4066 },
+{ HP_POP(script->buildin_query_sql_sub), HP_POP2(HP_script_buildin_query_sql_sub), 4068 },
+{ HP_POP(script->axtoi), HP_POP2(HP_script_axtoi), 4070 },
+{ HP_POP(script->buildin_instance_warpall_sub), HP_POP2(HP_script_buildin_instance_warpall_sub), 4072 },
+{ HP_POP(script->buildin_mobuseskill_sub), HP_POP2(HP_script_buildin_mobuseskill_sub), 4074 },
+{ HP_POP(script->cleanfloor_sub), HP_POP2(HP_script_cleanfloor_sub), 4076 },
+{ HP_POP(script->run_func), HP_POP2(HP_script_run_func), 4078 },
 /* searchstore */
-{ HP_POP(searchstore->open), HP_POP2(HP_searchstore_open), 4064 },
-{ HP_POP(searchstore->query), HP_POP2(HP_searchstore_query), 4066 },
-{ HP_POP(searchstore->querynext), HP_POP2(HP_searchstore_querynext), 4068 },
-{ HP_POP(searchstore->next), HP_POP2(HP_searchstore_next), 4070 },
-{ HP_POP(searchstore->clear), HP_POP2(HP_searchstore_clear), 4072 },
-{ HP_POP(searchstore->close), HP_POP2(HP_searchstore_close), 4074 },
-{ HP_POP(searchstore->click), HP_POP2(HP_searchstore_click), 4076 },
-{ HP_POP(searchstore->queryremote), HP_POP2(HP_searchstore_queryremote), 4078 },
-{ HP_POP(searchstore->clearremote), HP_POP2(HP_searchstore_clearremote), 4080 },
-{ HP_POP(searchstore->result), HP_POP2(HP_searchstore_result), 4082 },
+{ HP_POP(searchstore->open), HP_POP2(HP_searchstore_open), 4080 },
+{ HP_POP(searchstore->query), HP_POP2(HP_searchstore_query), 4082 },
+{ HP_POP(searchstore->querynext), HP_POP2(HP_searchstore_querynext), 4084 },
+{ HP_POP(searchstore->next), HP_POP2(HP_searchstore_next), 4086 },
+{ HP_POP(searchstore->clear), HP_POP2(HP_searchstore_clear), 4088 },
+{ HP_POP(searchstore->close), HP_POP2(HP_searchstore_close), 4090 },
+{ HP_POP(searchstore->click), HP_POP2(HP_searchstore_click), 4092 },
+{ HP_POP(searchstore->queryremote), HP_POP2(HP_searchstore_queryremote), 4094 },
+{ HP_POP(searchstore->clearremote), HP_POP2(HP_searchstore_clearremote), 4096 },
+{ HP_POP(searchstore->result), HP_POP2(HP_searchstore_result), 4098 },
 /* skill */
-{ HP_POP(skill->init), HP_POP2(HP_skill_init), 4084 },
-{ HP_POP(skill->final), HP_POP2(HP_skill_final), 4086 },
-{ HP_POP(skill->reload), HP_POP2(HP_skill_reload), 4088 },
-{ HP_POP(skill->read_db), HP_POP2(HP_skill_read_db), 4090 },
-{ HP_POP(skill->get_index), HP_POP2(HP_skill_get_index), 4092 },
-{ HP_POP(skill->get_type), HP_POP2(HP_skill_get_type), 4094 },
-{ HP_POP(skill->get_hit), HP_POP2(HP_skill_get_hit), 4096 },
-{ HP_POP(skill->get_inf), HP_POP2(HP_skill_get_inf), 4098 },
-{ HP_POP(skill->get_ele), HP_POP2(HP_skill_get_ele), 4100 },
-{ HP_POP(skill->get_nk), HP_POP2(HP_skill_get_nk), 4102 },
-{ HP_POP(skill->get_max), HP_POP2(HP_skill_get_max), 4104 },
-{ HP_POP(skill->get_range), HP_POP2(HP_skill_get_range), 4106 },
-{ HP_POP(skill->get_range2), HP_POP2(HP_skill_get_range2), 4108 },
-{ HP_POP(skill->get_splash), HP_POP2(HP_skill_get_splash), 4110 },
-{ HP_POP(skill->get_hp), HP_POP2(HP_skill_get_hp), 4112 },
-{ HP_POP(skill->get_mhp), HP_POP2(HP_skill_get_mhp), 4114 },
-{ HP_POP(skill->get_sp), HP_POP2(HP_skill_get_sp), 4116 },
-{ HP_POP(skill->get_state), HP_POP2(HP_skill_get_state), 4118 },
-{ HP_POP(skill->get_spiritball), HP_POP2(HP_skill_get_spiritball), 4120 },
-{ HP_POP(skill->get_zeny), HP_POP2(HP_skill_get_zeny), 4122 },
-{ HP_POP(skill->get_num), HP_POP2(HP_skill_get_num), 4124 },
-{ HP_POP(skill->get_cast), HP_POP2(HP_skill_get_cast), 4126 },
-{ HP_POP(skill->get_delay), HP_POP2(HP_skill_get_delay), 4128 },
-{ HP_POP(skill->get_walkdelay), HP_POP2(HP_skill_get_walkdelay), 4130 },
-{ HP_POP(skill->get_time), HP_POP2(HP_skill_get_time), 4132 },
-{ HP_POP(skill->get_time2), HP_POP2(HP_skill_get_time2), 4134 },
-{ HP_POP(skill->get_castnodex), HP_POP2(HP_skill_get_castnodex), 4136 },
-{ HP_POP(skill->get_delaynodex), HP_POP2(HP_skill_get_delaynodex), 4138 },
-{ HP_POP(skill->get_castdef), HP_POP2(HP_skill_get_castdef), 4140 },
-{ HP_POP(skill->get_weapontype), HP_POP2(HP_skill_get_weapontype), 4142 },
-{ HP_POP(skill->get_ammotype), HP_POP2(HP_skill_get_ammotype), 4144 },
-{ HP_POP(skill->get_ammo_qty), HP_POP2(HP_skill_get_ammo_qty), 4146 },
-{ HP_POP(skill->get_unit_id), HP_POP2(HP_skill_get_unit_id), 4148 },
-{ HP_POP(skill->get_inf2), HP_POP2(HP_skill_get_inf2), 4150 },
-{ HP_POP(skill->get_castcancel), HP_POP2(HP_skill_get_castcancel), 4152 },
-{ HP_POP(skill->get_maxcount), HP_POP2(HP_skill_get_maxcount), 4154 },
-{ HP_POP(skill->get_blewcount), HP_POP2(HP_skill_get_blewcount), 4156 },
-{ HP_POP(skill->get_unit_flag), HP_POP2(HP_skill_get_unit_flag), 4158 },
-{ HP_POP(skill->get_unit_target), HP_POP2(HP_skill_get_unit_target), 4160 },
-{ HP_POP(skill->get_unit_interval), HP_POP2(HP_skill_get_unit_interval), 4162 },
-{ HP_POP(skill->get_unit_bl_target), HP_POP2(HP_skill_get_unit_bl_target), 4164 },
-{ HP_POP(skill->get_unit_layout_type), HP_POP2(HP_skill_get_unit_layout_type), 4166 },
-{ HP_POP(skill->get_unit_range), HP_POP2(HP_skill_get_unit_range), 4168 },
-{ HP_POP(skill->get_cooldown), HP_POP2(HP_skill_get_cooldown), 4170 },
-{ HP_POP(skill->tree_get_max), HP_POP2(HP_skill_tree_get_max), 4172 },
-{ HP_POP(skill->get_name), HP_POP2(HP_skill_get_name), 4174 },
-{ HP_POP(skill->get_desc), HP_POP2(HP_skill_get_desc), 4176 },
-{ HP_POP(skill->chk), HP_POP2(HP_skill_chk), 4178 },
-{ HP_POP(skill->get_casttype), HP_POP2(HP_skill_get_casttype), 4180 },
-{ HP_POP(skill->get_casttype2), HP_POP2(HP_skill_get_casttype2), 4182 },
-{ HP_POP(skill->name2id), HP_POP2(HP_skill_name2id), 4184 },
-{ HP_POP(skill->isammotype), HP_POP2(HP_skill_isammotype), 4186 },
-{ HP_POP(skill->castend_id), HP_POP2(HP_skill_castend_id), 4188 },
-{ HP_POP(skill->castend_pos), HP_POP2(HP_skill_castend_pos), 4190 },
-{ HP_POP(skill->castend_map), HP_POP2(HP_skill_castend_map), 4192 },
-{ HP_POP(skill->cleartimerskill), HP_POP2(HP_skill_cleartimerskill), 4194 },
-{ HP_POP(skill->addtimerskill), HP_POP2(HP_skill_addtimerskill), 4196 },
-{ HP_POP(skill->additional_effect), HP_POP2(HP_skill_additional_effect), 4198 },
-{ HP_POP(skill->counter_additional_effect), HP_POP2(HP_skill_counter_additional_effect), 4200 },
-{ HP_POP(skill->blown), HP_POP2(HP_skill_blown), 4202 },
-{ HP_POP(skill->break_equip), HP_POP2(HP_skill_break_equip), 4204 },
-{ HP_POP(skill->strip_equip), HP_POP2(HP_skill_strip_equip), 4206 },
-{ HP_POP(skill->id2group), HP_POP2(HP_skill_id2group), 4208 },
-{ HP_POP(skill->unitsetting), HP_POP2(HP_skill_unitsetting), 4210 },
-{ HP_POP(skill->initunit), HP_POP2(HP_skill_initunit), 4212 },
-{ HP_POP(skill->delunit), HP_POP2(HP_skill_delunit), 4214 },
-{ HP_POP(skill->init_unitgroup), HP_POP2(HP_skill_init_unitgroup), 4216 },
-{ HP_POP(skill->del_unitgroup), HP_POP2(HP_skill_del_unitgroup), 4218 },
-{ HP_POP(skill->clear_unitgroup), HP_POP2(HP_skill_clear_unitgroup), 4220 },
-{ HP_POP(skill->clear_group), HP_POP2(HP_skill_clear_group), 4222 },
-{ HP_POP(skill->unit_onplace), HP_POP2(HP_skill_unit_onplace), 4224 },
-{ HP_POP(skill->unit_ondamaged), HP_POP2(HP_skill_unit_ondamaged), 4226 },
-{ HP_POP(skill->cast_fix), HP_POP2(HP_skill_cast_fix), 4228 },
-{ HP_POP(skill->cast_fix_sc), HP_POP2(HP_skill_cast_fix_sc), 4230 },
-{ HP_POP(skill->vf_cast_fix), HP_POP2(HP_skill_vf_cast_fix), 4232 },
-{ HP_POP(skill->delay_fix), HP_POP2(HP_skill_delay_fix), 4234 },
-{ HP_POP(skill->check_condition_castbegin), HP_POP2(HP_skill_check_condition_castbegin), 4236 },
-{ HP_POP(skill->check_condition_castend), HP_POP2(HP_skill_check_condition_castend), 4238 },
-{ HP_POP(skill->consume_requirement), HP_POP2(HP_skill_consume_requirement), 4240 },
-{ HP_POP(skill->get_requirement), HP_POP2(HP_skill_get_requirement), 4242 },
-{ HP_POP(skill->check_pc_partner), HP_POP2(HP_skill_check_pc_partner), 4244 },
-{ HP_POP(skill->unit_move), HP_POP2(HP_skill_unit_move), 4246 },
-{ HP_POP(skill->unit_onleft), HP_POP2(HP_skill_unit_onleft), 4248 },
-{ HP_POP(skill->unit_onout), HP_POP2(HP_skill_unit_onout), 4250 },
-{ HP_POP(skill->unit_move_unit_group), HP_POP2(HP_skill_unit_move_unit_group), 4252 },
-{ HP_POP(skill->sit), HP_POP2(HP_skill_sit), 4254 },
-{ HP_POP(skill->brandishspear), HP_POP2(HP_skill_brandishspear), 4256 },
-{ HP_POP(skill->repairweapon), HP_POP2(HP_skill_repairweapon), 4258 },
-{ HP_POP(skill->identify), HP_POP2(HP_skill_identify), 4260 },
-{ HP_POP(skill->weaponrefine), HP_POP2(HP_skill_weaponrefine), 4262 },
-{ HP_POP(skill->autospell), HP_POP2(HP_skill_autospell), 4264 },
-{ HP_POP(skill->calc_heal), HP_POP2(HP_skill_calc_heal), 4266 },
-{ HP_POP(skill->check_cloaking), HP_POP2(HP_skill_check_cloaking), 4268 },
-{ HP_POP(skill->enchant_elemental_end), HP_POP2(HP_skill_enchant_elemental_end), 4270 },
-{ HP_POP(skill->not_ok), HP_POP2(HP_skill_not_ok), 4272 },
-{ HP_POP(skill->not_ok_hom), HP_POP2(HP_skill_not_ok_hom), 4274 },
-{ HP_POP(skill->not_ok_mercenary), HP_POP2(HP_skill_not_ok_mercenary), 4276 },
-{ HP_POP(skill->chastle_mob_changetarget), HP_POP2(HP_skill_chastle_mob_changetarget), 4278 },
-{ HP_POP(skill->can_produce_mix), HP_POP2(HP_skill_can_produce_mix), 4280 },
-{ HP_POP(skill->produce_mix), HP_POP2(HP_skill_produce_mix), 4282 },
-{ HP_POP(skill->arrow_create), HP_POP2(HP_skill_arrow_create), 4284 },
-{ HP_POP(skill->castend_nodamage_id), HP_POP2(HP_skill_castend_nodamage_id), 4286 },
-{ HP_POP(skill->castend_damage_id), HP_POP2(HP_skill_castend_damage_id), 4288 },
-{ HP_POP(skill->castend_pos2), HP_POP2(HP_skill_castend_pos2), 4290 },
-{ HP_POP(skill->blockpc_start), HP_POP2(HP_skill_blockpc_start), 4292 },
-{ HP_POP(skill->blockhomun_start), HP_POP2(HP_skill_blockhomun_start), 4294 },
-{ HP_POP(skill->blockmerc_start), HP_POP2(HP_skill_blockmerc_start), 4296 },
-{ HP_POP(skill->attack), HP_POP2(HP_skill_attack), 4298 },
-{ HP_POP(skill->attack_area), HP_POP2(HP_skill_attack_area), 4300 },
-{ HP_POP(skill->area_sub), HP_POP2(HP_skill_area_sub), 4302 },
-{ HP_POP(skill->area_sub_count), HP_POP2(HP_skill_area_sub_count), 4304 },
-{ HP_POP(skill->check_unit_range), HP_POP2(HP_skill_check_unit_range), 4306 },
-{ HP_POP(skill->check_unit_range_sub), HP_POP2(HP_skill_check_unit_range_sub), 4308 },
-{ HP_POP(skill->check_unit_range2), HP_POP2(HP_skill_check_unit_range2), 4310 },
-{ HP_POP(skill->check_unit_range2_sub), HP_POP2(HP_skill_check_unit_range2_sub), 4312 },
-{ HP_POP(skill->toggle_magicpower), HP_POP2(HP_skill_toggle_magicpower), 4314 },
-{ HP_POP(skill->magic_reflect), HP_POP2(HP_skill_magic_reflect), 4316 },
-{ HP_POP(skill->onskillusage), HP_POP2(HP_skill_onskillusage), 4318 },
-{ HP_POP(skill->cell_overlap), HP_POP2(HP_skill_cell_overlap), 4320 },
-{ HP_POP(skill->timerskill), HP_POP2(HP_skill_timerskill), 4322 },
-{ HP_POP(skill->trap_splash), HP_POP2(HP_skill_trap_splash), 4324 },
-{ HP_POP(skill->check_condition_mercenary), HP_POP2(HP_skill_check_condition_mercenary), 4326 },
-{ HP_POP(skill->locate_element_field), HP_POP2(HP_skill_locate_element_field), 4328 },
-{ HP_POP(skill->graffitiremover), HP_POP2(HP_skill_graffitiremover), 4330 },
-{ HP_POP(skill->activate_reverberation), HP_POP2(HP_skill_activate_reverberation), 4332 },
-{ HP_POP(skill->dance_overlap_sub), HP_POP2(HP_skill_dance_overlap_sub), 4334 },
-{ HP_POP(skill->dance_overlap), HP_POP2(HP_skill_dance_overlap), 4336 },
-{ HP_POP(skill->get_unit_layout), HP_POP2(HP_skill_get_unit_layout), 4338 },
-{ HP_POP(skill->frostjoke_scream), HP_POP2(HP_skill_frostjoke_scream), 4340 },
-{ HP_POP(skill->greed), HP_POP2(HP_skill_greed), 4342 },
-{ HP_POP(skill->destroy_trap), HP_POP2(HP_skill_destroy_trap), 4344 },
-{ HP_POP(skill->icewall_block), HP_POP2(HP_skill_icewall_block), 4346 },
-{ HP_POP(skill->unitgrouptickset_search), HP_POP2(HP_skill_unitgrouptickset_search), 4348 },
-{ HP_POP(skill->dance_switch), HP_POP2(HP_skill_dance_switch), 4350 },
-{ HP_POP(skill->check_condition_char_sub), HP_POP2(HP_skill_check_condition_char_sub), 4352 },
-{ HP_POP(skill->check_condition_mob_master_sub), HP_POP2(HP_skill_check_condition_mob_master_sub), 4354 },
-{ HP_POP(skill->brandishspear_first), HP_POP2(HP_skill_brandishspear_first), 4356 },
-{ HP_POP(skill->brandishspear_dir), HP_POP2(HP_skill_brandishspear_dir), 4358 },
-{ HP_POP(skill->get_fixed_cast), HP_POP2(HP_skill_get_fixed_cast), 4360 },
-{ HP_POP(skill->sit_count), HP_POP2(HP_skill_sit_count), 4362 },
-{ HP_POP(skill->sit_in), HP_POP2(HP_skill_sit_in), 4364 },
-{ HP_POP(skill->sit_out), HP_POP2(HP_skill_sit_out), 4366 },
-{ HP_POP(skill->unitsetmapcell), HP_POP2(HP_skill_unitsetmapcell), 4368 },
-{ HP_POP(skill->unit_onplace_timer), HP_POP2(HP_skill_unit_onplace_timer), 4370 },
-{ HP_POP(skill->unit_effect), HP_POP2(HP_skill_unit_effect), 4372 },
-{ HP_POP(skill->unit_timer_sub_onplace), HP_POP2(HP_skill_unit_timer_sub_onplace), 4374 },
-{ HP_POP(skill->unit_move_sub), HP_POP2(HP_skill_unit_move_sub), 4376 },
-{ HP_POP(skill->blockpc_end), HP_POP2(HP_skill_blockpc_end), 4378 },
-{ HP_POP(skill->blockhomun_end), HP_POP2(HP_skill_blockhomun_end), 4380 },
-{ HP_POP(skill->blockmerc_end), HP_POP2(HP_skill_blockmerc_end), 4382 },
-{ HP_POP(skill->split_atoi), HP_POP2(HP_skill_split_atoi), 4384 },
-{ HP_POP(skill->unit_timer), HP_POP2(HP_skill_unit_timer), 4386 },
-{ HP_POP(skill->unit_timer_sub), HP_POP2(HP_skill_unit_timer_sub), 4388 },
-{ HP_POP(skill->init_unit_layout), HP_POP2(HP_skill_init_unit_layout), 4390 },
-{ HP_POP(skill->parse_row_skilldb), HP_POP2(HP_skill_parse_row_skilldb), 4392 },
-{ HP_POP(skill->parse_row_requiredb), HP_POP2(HP_skill_parse_row_requiredb), 4394 },
-{ HP_POP(skill->parse_row_castdb), HP_POP2(HP_skill_parse_row_castdb), 4396 },
-{ HP_POP(skill->parse_row_castnodexdb), HP_POP2(HP_skill_parse_row_castnodexdb), 4398 },
-{ HP_POP(skill->parse_row_unitdb), HP_POP2(HP_skill_parse_row_unitdb), 4400 },
-{ HP_POP(skill->parse_row_producedb), HP_POP2(HP_skill_parse_row_producedb), 4402 },
-{ HP_POP(skill->parse_row_createarrowdb), HP_POP2(HP_skill_parse_row_createarrowdb), 4404 },
-{ HP_POP(skill->parse_row_abradb), HP_POP2(HP_skill_parse_row_abradb), 4406 },
-{ HP_POP(skill->parse_row_spellbookdb), HP_POP2(HP_skill_parse_row_spellbookdb), 4408 },
-{ HP_POP(skill->parse_row_magicmushroomdb), HP_POP2(HP_skill_parse_row_magicmushroomdb), 4410 },
-{ HP_POP(skill->parse_row_reproducedb), HP_POP2(HP_skill_parse_row_reproducedb), 4412 },
-{ HP_POP(skill->parse_row_improvisedb), HP_POP2(HP_skill_parse_row_improvisedb), 4414 },
-{ HP_POP(skill->parse_row_changematerialdb), HP_POP2(HP_skill_parse_row_changematerialdb), 4416 },
-{ HP_POP(skill->usave_add), HP_POP2(HP_skill_usave_add), 4418 },
-{ HP_POP(skill->usave_trigger), HP_POP2(HP_skill_usave_trigger), 4420 },
-{ HP_POP(skill->cooldown_load), HP_POP2(HP_skill_cooldown_load), 4422 },
-{ HP_POP(skill->spellbook), HP_POP2(HP_skill_spellbook), 4424 },
-{ HP_POP(skill->block_check), HP_POP2(HP_skill_block_check), 4426 },
-{ HP_POP(skill->detonator), HP_POP2(HP_skill_detonator), 4428 },
-{ HP_POP(skill->check_camouflage), HP_POP2(HP_skill_check_camouflage), 4430 },
-{ HP_POP(skill->magicdecoy), HP_POP2(HP_skill_magicdecoy), 4432 },
-{ HP_POP(skill->poisoningweapon), HP_POP2(HP_skill_poisoningweapon), 4434 },
-{ HP_POP(skill->select_menu), HP_POP2(HP_skill_select_menu), 4436 },
-{ HP_POP(skill->elementalanalysis), HP_POP2(HP_skill_elementalanalysis), 4438 },
-{ HP_POP(skill->changematerial), HP_POP2(HP_skill_changematerial), 4440 },
-{ HP_POP(skill->get_elemental_type), HP_POP2(HP_skill_get_elemental_type), 4442 },
-{ HP_POP(skill->cooldown_save), HP_POP2(HP_skill_cooldown_save), 4444 },
-{ HP_POP(skill->maelstrom_suction), HP_POP2(HP_skill_maelstrom_suction), 4446 },
-{ HP_POP(skill->get_new_group_id), HP_POP2(HP_skill_get_new_group_id), 4448 },
+{ HP_POP(skill->init), HP_POP2(HP_skill_init), 4100 },
+{ HP_POP(skill->final), HP_POP2(HP_skill_final), 4102 },
+{ HP_POP(skill->reload), HP_POP2(HP_skill_reload), 4104 },
+{ HP_POP(skill->read_db), HP_POP2(HP_skill_read_db), 4106 },
+{ HP_POP(skill->get_index), HP_POP2(HP_skill_get_index), 4108 },
+{ HP_POP(skill->get_type), HP_POP2(HP_skill_get_type), 4110 },
+{ HP_POP(skill->get_hit), HP_POP2(HP_skill_get_hit), 4112 },
+{ HP_POP(skill->get_inf), HP_POP2(HP_skill_get_inf), 4114 },
+{ HP_POP(skill->get_ele), HP_POP2(HP_skill_get_ele), 4116 },
+{ HP_POP(skill->get_nk), HP_POP2(HP_skill_get_nk), 4118 },
+{ HP_POP(skill->get_max), HP_POP2(HP_skill_get_max), 4120 },
+{ HP_POP(skill->get_range), HP_POP2(HP_skill_get_range), 4122 },
+{ HP_POP(skill->get_range2), HP_POP2(HP_skill_get_range2), 4124 },
+{ HP_POP(skill->get_splash), HP_POP2(HP_skill_get_splash), 4126 },
+{ HP_POP(skill->get_hp), HP_POP2(HP_skill_get_hp), 4128 },
+{ HP_POP(skill->get_mhp), HP_POP2(HP_skill_get_mhp), 4130 },
+{ HP_POP(skill->get_sp), HP_POP2(HP_skill_get_sp), 4132 },
+{ HP_POP(skill->get_state), HP_POP2(HP_skill_get_state), 4134 },
+{ HP_POP(skill->get_spiritball), HP_POP2(HP_skill_get_spiritball), 4136 },
+{ HP_POP(skill->get_zeny), HP_POP2(HP_skill_get_zeny), 4138 },
+{ HP_POP(skill->get_num), HP_POP2(HP_skill_get_num), 4140 },
+{ HP_POP(skill->get_cast), HP_POP2(HP_skill_get_cast), 4142 },
+{ HP_POP(skill->get_delay), HP_POP2(HP_skill_get_delay), 4144 },
+{ HP_POP(skill->get_walkdelay), HP_POP2(HP_skill_get_walkdelay), 4146 },
+{ HP_POP(skill->get_time), HP_POP2(HP_skill_get_time), 4148 },
+{ HP_POP(skill->get_time2), HP_POP2(HP_skill_get_time2), 4150 },
+{ HP_POP(skill->get_castnodex), HP_POP2(HP_skill_get_castnodex), 4152 },
+{ HP_POP(skill->get_delaynodex), HP_POP2(HP_skill_get_delaynodex), 4154 },
+{ HP_POP(skill->get_castdef), HP_POP2(HP_skill_get_castdef), 4156 },
+{ HP_POP(skill->get_weapontype), HP_POP2(HP_skill_get_weapontype), 4158 },
+{ HP_POP(skill->get_ammotype), HP_POP2(HP_skill_get_ammotype), 4160 },
+{ HP_POP(skill->get_ammo_qty), HP_POP2(HP_skill_get_ammo_qty), 4162 },
+{ HP_POP(skill->get_unit_id), HP_POP2(HP_skill_get_unit_id), 4164 },
+{ HP_POP(skill->get_inf2), HP_POP2(HP_skill_get_inf2), 4166 },
+{ HP_POP(skill->get_castcancel), HP_POP2(HP_skill_get_castcancel), 4168 },
+{ HP_POP(skill->get_maxcount), HP_POP2(HP_skill_get_maxcount), 4170 },
+{ HP_POP(skill->get_blewcount), HP_POP2(HP_skill_get_blewcount), 4172 },
+{ HP_POP(skill->get_unit_flag), HP_POP2(HP_skill_get_unit_flag), 4174 },
+{ HP_POP(skill->get_unit_target), HP_POP2(HP_skill_get_unit_target), 4176 },
+{ HP_POP(skill->get_unit_interval), HP_POP2(HP_skill_get_unit_interval), 4178 },
+{ HP_POP(skill->get_unit_bl_target), HP_POP2(HP_skill_get_unit_bl_target), 4180 },
+{ HP_POP(skill->get_unit_layout_type), HP_POP2(HP_skill_get_unit_layout_type), 4182 },
+{ HP_POP(skill->get_unit_range), HP_POP2(HP_skill_get_unit_range), 4184 },
+{ HP_POP(skill->get_cooldown), HP_POP2(HP_skill_get_cooldown), 4186 },
+{ HP_POP(skill->tree_get_max), HP_POP2(HP_skill_tree_get_max), 4188 },
+{ HP_POP(skill->get_name), HP_POP2(HP_skill_get_name), 4190 },
+{ HP_POP(skill->get_desc), HP_POP2(HP_skill_get_desc), 4192 },
+{ HP_POP(skill->chk), HP_POP2(HP_skill_chk), 4194 },
+{ HP_POP(skill->get_casttype), HP_POP2(HP_skill_get_casttype), 4196 },
+{ HP_POP(skill->get_casttype2), HP_POP2(HP_skill_get_casttype2), 4198 },
+{ HP_POP(skill->name2id), HP_POP2(HP_skill_name2id), 4200 },
+{ HP_POP(skill->isammotype), HP_POP2(HP_skill_isammotype), 4202 },
+{ HP_POP(skill->castend_id), HP_POP2(HP_skill_castend_id), 4204 },
+{ HP_POP(skill->castend_pos), HP_POP2(HP_skill_castend_pos), 4206 },
+{ HP_POP(skill->castend_map), HP_POP2(HP_skill_castend_map), 4208 },
+{ HP_POP(skill->cleartimerskill), HP_POP2(HP_skill_cleartimerskill), 4210 },
+{ HP_POP(skill->addtimerskill), HP_POP2(HP_skill_addtimerskill), 4212 },
+{ HP_POP(skill->additional_effect), HP_POP2(HP_skill_additional_effect), 4214 },
+{ HP_POP(skill->counter_additional_effect), HP_POP2(HP_skill_counter_additional_effect), 4216 },
+{ HP_POP(skill->blown), HP_POP2(HP_skill_blown), 4218 },
+{ HP_POP(skill->break_equip), HP_POP2(HP_skill_break_equip), 4220 },
+{ HP_POP(skill->strip_equip), HP_POP2(HP_skill_strip_equip), 4222 },
+{ HP_POP(skill->id2group), HP_POP2(HP_skill_id2group), 4224 },
+{ HP_POP(skill->unitsetting), HP_POP2(HP_skill_unitsetting), 4226 },
+{ HP_POP(skill->initunit), HP_POP2(HP_skill_initunit), 4228 },
+{ HP_POP(skill->delunit), HP_POP2(HP_skill_delunit), 4230 },
+{ HP_POP(skill->init_unitgroup), HP_POP2(HP_skill_init_unitgroup), 4232 },
+{ HP_POP(skill->del_unitgroup), HP_POP2(HP_skill_del_unitgroup), 4234 },
+{ HP_POP(skill->clear_unitgroup), HP_POP2(HP_skill_clear_unitgroup), 4236 },
+{ HP_POP(skill->clear_group), HP_POP2(HP_skill_clear_group), 4238 },
+{ HP_POP(skill->unit_onplace), HP_POP2(HP_skill_unit_onplace), 4240 },
+{ HP_POP(skill->unit_ondamaged), HP_POP2(HP_skill_unit_ondamaged), 4242 },
+{ HP_POP(skill->cast_fix), HP_POP2(HP_skill_cast_fix), 4244 },
+{ HP_POP(skill->cast_fix_sc), HP_POP2(HP_skill_cast_fix_sc), 4246 },
+{ HP_POP(skill->vf_cast_fix), HP_POP2(HP_skill_vf_cast_fix), 4248 },
+{ HP_POP(skill->delay_fix), HP_POP2(HP_skill_delay_fix), 4250 },
+{ HP_POP(skill->check_condition_castbegin), HP_POP2(HP_skill_check_condition_castbegin), 4252 },
+{ HP_POP(skill->check_condition_castend), HP_POP2(HP_skill_check_condition_castend), 4254 },
+{ HP_POP(skill->consume_requirement), HP_POP2(HP_skill_consume_requirement), 4256 },
+{ HP_POP(skill->get_requirement), HP_POP2(HP_skill_get_requirement), 4258 },
+{ HP_POP(skill->check_pc_partner), HP_POP2(HP_skill_check_pc_partner), 4260 },
+{ HP_POP(skill->unit_move), HP_POP2(HP_skill_unit_move), 4262 },
+{ HP_POP(skill->unit_onleft), HP_POP2(HP_skill_unit_onleft), 4264 },
+{ HP_POP(skill->unit_onout), HP_POP2(HP_skill_unit_onout), 4266 },
+{ HP_POP(skill->unit_move_unit_group), HP_POP2(HP_skill_unit_move_unit_group), 4268 },
+{ HP_POP(skill->sit), HP_POP2(HP_skill_sit), 4270 },
+{ HP_POP(skill->brandishspear), HP_POP2(HP_skill_brandishspear), 4272 },
+{ HP_POP(skill->repairweapon), HP_POP2(HP_skill_repairweapon), 4274 },
+{ HP_POP(skill->identify), HP_POP2(HP_skill_identify), 4276 },
+{ HP_POP(skill->weaponrefine), HP_POP2(HP_skill_weaponrefine), 4278 },
+{ HP_POP(skill->autospell), HP_POP2(HP_skill_autospell), 4280 },
+{ HP_POP(skill->calc_heal), HP_POP2(HP_skill_calc_heal), 4282 },
+{ HP_POP(skill->check_cloaking), HP_POP2(HP_skill_check_cloaking), 4284 },
+{ HP_POP(skill->enchant_elemental_end), HP_POP2(HP_skill_enchant_elemental_end), 4286 },
+{ HP_POP(skill->not_ok), HP_POP2(HP_skill_not_ok), 4288 },
+{ HP_POP(skill->not_ok_hom), HP_POP2(HP_skill_not_ok_hom), 4290 },
+{ HP_POP(skill->not_ok_mercenary), HP_POP2(HP_skill_not_ok_mercenary), 4292 },
+{ HP_POP(skill->chastle_mob_changetarget), HP_POP2(HP_skill_chastle_mob_changetarget), 4294 },
+{ HP_POP(skill->can_produce_mix), HP_POP2(HP_skill_can_produce_mix), 4296 },
+{ HP_POP(skill->produce_mix), HP_POP2(HP_skill_produce_mix), 4298 },
+{ HP_POP(skill->arrow_create), HP_POP2(HP_skill_arrow_create), 4300 },
+{ HP_POP(skill->castend_nodamage_id), HP_POP2(HP_skill_castend_nodamage_id), 4302 },
+{ HP_POP(skill->castend_damage_id), HP_POP2(HP_skill_castend_damage_id), 4304 },
+{ HP_POP(skill->castend_pos2), HP_POP2(HP_skill_castend_pos2), 4306 },
+{ HP_POP(skill->blockpc_start), HP_POP2(HP_skill_blockpc_start), 4308 },
+{ HP_POP(skill->blockhomun_start), HP_POP2(HP_skill_blockhomun_start), 4310 },
+{ HP_POP(skill->blockmerc_start), HP_POP2(HP_skill_blockmerc_start), 4312 },
+{ HP_POP(skill->attack), HP_POP2(HP_skill_attack), 4314 },
+{ HP_POP(skill->attack_area), HP_POP2(HP_skill_attack_area), 4316 },
+{ HP_POP(skill->area_sub), HP_POP2(HP_skill_area_sub), 4318 },
+{ HP_POP(skill->area_sub_count), HP_POP2(HP_skill_area_sub_count), 4320 },
+{ HP_POP(skill->check_unit_range), HP_POP2(HP_skill_check_unit_range), 4322 },
+{ HP_POP(skill->check_unit_range_sub), HP_POP2(HP_skill_check_unit_range_sub), 4324 },
+{ HP_POP(skill->check_unit_range2), HP_POP2(HP_skill_check_unit_range2), 4326 },
+{ HP_POP(skill->check_unit_range2_sub), HP_POP2(HP_skill_check_unit_range2_sub), 4328 },
+{ HP_POP(skill->toggle_magicpower), HP_POP2(HP_skill_toggle_magicpower), 4330 },
+{ HP_POP(skill->magic_reflect), HP_POP2(HP_skill_magic_reflect), 4332 },
+{ HP_POP(skill->onskillusage), HP_POP2(HP_skill_onskillusage), 4334 },
+{ HP_POP(skill->cell_overlap), HP_POP2(HP_skill_cell_overlap), 4336 },
+{ HP_POP(skill->timerskill), HP_POP2(HP_skill_timerskill), 4338 },
+{ HP_POP(skill->trap_splash), HP_POP2(HP_skill_trap_splash), 4340 },
+{ HP_POP(skill->check_condition_mercenary), HP_POP2(HP_skill_check_condition_mercenary), 4342 },
+{ HP_POP(skill->locate_element_field), HP_POP2(HP_skill_locate_element_field), 4344 },
+{ HP_POP(skill->graffitiremover), HP_POP2(HP_skill_graffitiremover), 4346 },
+{ HP_POP(skill->activate_reverberation), HP_POP2(HP_skill_activate_reverberation), 4348 },
+{ HP_POP(skill->dance_overlap_sub), HP_POP2(HP_skill_dance_overlap_sub), 4350 },
+{ HP_POP(skill->dance_overlap), HP_POP2(HP_skill_dance_overlap), 4352 },
+{ HP_POP(skill->get_unit_layout), HP_POP2(HP_skill_get_unit_layout), 4354 },
+{ HP_POP(skill->frostjoke_scream), HP_POP2(HP_skill_frostjoke_scream), 4356 },
+{ HP_POP(skill->greed), HP_POP2(HP_skill_greed), 4358 },
+{ HP_POP(skill->destroy_trap), HP_POP2(HP_skill_destroy_trap), 4360 },
+{ HP_POP(skill->icewall_block), HP_POP2(HP_skill_icewall_block), 4362 },
+{ HP_POP(skill->unitgrouptickset_search), HP_POP2(HP_skill_unitgrouptickset_search), 4364 },
+{ HP_POP(skill->dance_switch), HP_POP2(HP_skill_dance_switch), 4366 },
+{ HP_POP(skill->check_condition_char_sub), HP_POP2(HP_skill_check_condition_char_sub), 4368 },
+{ HP_POP(skill->check_condition_mob_master_sub), HP_POP2(HP_skill_check_condition_mob_master_sub), 4370 },
+{ HP_POP(skill->brandishspear_first), HP_POP2(HP_skill_brandishspear_first), 4372 },
+{ HP_POP(skill->brandishspear_dir), HP_POP2(HP_skill_brandishspear_dir), 4374 },
+{ HP_POP(skill->get_fixed_cast), HP_POP2(HP_skill_get_fixed_cast), 4376 },
+{ HP_POP(skill->sit_count), HP_POP2(HP_skill_sit_count), 4378 },
+{ HP_POP(skill->sit_in), HP_POP2(HP_skill_sit_in), 4380 },
+{ HP_POP(skill->sit_out), HP_POP2(HP_skill_sit_out), 4382 },
+{ HP_POP(skill->unitsetmapcell), HP_POP2(HP_skill_unitsetmapcell), 4384 },
+{ HP_POP(skill->unit_onplace_timer), HP_POP2(HP_skill_unit_onplace_timer), 4386 },
+{ HP_POP(skill->unit_effect), HP_POP2(HP_skill_unit_effect), 4388 },
+{ HP_POP(skill->unit_timer_sub_onplace), HP_POP2(HP_skill_unit_timer_sub_onplace), 4390 },
+{ HP_POP(skill->unit_move_sub), HP_POP2(HP_skill_unit_move_sub), 4392 },
+{ HP_POP(skill->blockpc_end), HP_POP2(HP_skill_blockpc_end), 4394 },
+{ HP_POP(skill->blockhomun_end), HP_POP2(HP_skill_blockhomun_end), 4396 },
+{ HP_POP(skill->blockmerc_end), HP_POP2(HP_skill_blockmerc_end), 4398 },
+{ HP_POP(skill->split_atoi), HP_POP2(HP_skill_split_atoi), 4400 },
+{ HP_POP(skill->unit_timer), HP_POP2(HP_skill_unit_timer), 4402 },
+{ HP_POP(skill->unit_timer_sub), HP_POP2(HP_skill_unit_timer_sub), 4404 },
+{ HP_POP(skill->init_unit_layout), HP_POP2(HP_skill_init_unit_layout), 4406 },
+{ HP_POP(skill->parse_row_skilldb), HP_POP2(HP_skill_parse_row_skilldb), 4408 },
+{ HP_POP(skill->parse_row_requiredb), HP_POP2(HP_skill_parse_row_requiredb), 4410 },
+{ HP_POP(skill->parse_row_castdb), HP_POP2(HP_skill_parse_row_castdb), 4412 },
+{ HP_POP(skill->parse_row_castnodexdb), HP_POP2(HP_skill_parse_row_castnodexdb), 4414 },
+{ HP_POP(skill->parse_row_unitdb), HP_POP2(HP_skill_parse_row_unitdb), 4416 },
+{ HP_POP(skill->parse_row_producedb), HP_POP2(HP_skill_parse_row_producedb), 4418 },
+{ HP_POP(skill->parse_row_createarrowdb), HP_POP2(HP_skill_parse_row_createarrowdb), 4420 },
+{ HP_POP(skill->parse_row_abradb), HP_POP2(HP_skill_parse_row_abradb), 4422 },
+{ HP_POP(skill->parse_row_spellbookdb), HP_POP2(HP_skill_parse_row_spellbookdb), 4424 },
+{ HP_POP(skill->parse_row_magicmushroomdb), HP_POP2(HP_skill_parse_row_magicmushroomdb), 4426 },
+{ HP_POP(skill->parse_row_reproducedb), HP_POP2(HP_skill_parse_row_reproducedb), 4428 },
+{ HP_POP(skill->parse_row_improvisedb), HP_POP2(HP_skill_parse_row_improvisedb), 4430 },
+{ HP_POP(skill->parse_row_changematerialdb), HP_POP2(HP_skill_parse_row_changematerialdb), 4432 },
+{ HP_POP(skill->usave_add), HP_POP2(HP_skill_usave_add), 4434 },
+{ HP_POP(skill->usave_trigger), HP_POP2(HP_skill_usave_trigger), 4436 },
+{ HP_POP(skill->cooldown_load), HP_POP2(HP_skill_cooldown_load), 4438 },
+{ HP_POP(skill->spellbook), HP_POP2(HP_skill_spellbook), 4440 },
+{ HP_POP(skill->block_check), HP_POP2(HP_skill_block_check), 4442 },
+{ HP_POP(skill->detonator), HP_POP2(HP_skill_detonator), 4444 },
+{ HP_POP(skill->check_camouflage), HP_POP2(HP_skill_check_camouflage), 4446 },
+{ HP_POP(skill->magicdecoy), HP_POP2(HP_skill_magicdecoy), 4448 },
+{ HP_POP(skill->poisoningweapon), HP_POP2(HP_skill_poisoningweapon), 4450 },
+{ HP_POP(skill->select_menu), HP_POP2(HP_skill_select_menu), 4452 },
+{ HP_POP(skill->elementalanalysis), HP_POP2(HP_skill_elementalanalysis), 4454 },
+{ HP_POP(skill->changematerial), HP_POP2(HP_skill_changematerial), 4456 },
+{ HP_POP(skill->get_elemental_type), HP_POP2(HP_skill_get_elemental_type), 4458 },
+{ HP_POP(skill->cooldown_save), HP_POP2(HP_skill_cooldown_save), 4460 },
+{ HP_POP(skill->maelstrom_suction), HP_POP2(HP_skill_maelstrom_suction), 4462 },
+{ HP_POP(skill->get_new_group_id), HP_POP2(HP_skill_get_new_group_id), 4464 },
 /* status */
-{ HP_POP(status->init), HP_POP2(HP_status_init), 4450 },
-{ HP_POP(status->final), HP_POP2(HP_status_final), 4452 },
-{ HP_POP(status->get_refine_chance), HP_POP2(HP_status_get_refine_chance), 4454 },
-{ HP_POP(status->skill2sc), HP_POP2(HP_status_skill2sc), 4456 },
-{ HP_POP(status->sc2skill), HP_POP2(HP_status_sc2skill), 4458 },
-{ HP_POP(status->sc2scb_flag), HP_POP2(HP_status_sc2scb_flag), 4460 },
-{ HP_POP(status->type2relevant_bl_types), HP_POP2(HP_status_type2relevant_bl_types), 4462 },
-{ HP_POP(status->get_sc_type), HP_POP2(HP_status_get_sc_type), 4464 },
-{ HP_POP(status->damage), HP_POP2(HP_status_damage), 4466 },
-{ HP_POP(status->charge), HP_POP2(HP_status_charge), 4468 },
-{ HP_POP(status->percent_change), HP_POP2(HP_status_percent_change), 4470 },
-{ HP_POP(status->set_hp), HP_POP2(HP_status_set_hp), 4472 },
-{ HP_POP(status->set_sp), HP_POP2(HP_status_set_sp), 4474 },
-{ HP_POP(status->heal), HP_POP2(HP_status_heal), 4476 },
-{ HP_POP(status->revive), HP_POP2(HP_status_revive), 4478 },
-{ HP_POP(status->get_regen_data), HP_POP2(HP_status_get_regen_data), 4480 },
-{ HP_POP(status->get_status_data), HP_POP2(HP_status_get_status_data), 4482 },
-{ HP_POP(status->get_base_status), HP_POP2(HP_status_get_base_status), 4484 },
-{ HP_POP(status->get_name), HP_POP2(HP_status_get_name), 4486 },
-{ HP_POP(status->get_class), HP_POP2(HP_status_get_class), 4488 },
-{ HP_POP(status->get_lv), HP_POP2(HP_status_get_lv), 4490 },
-{ HP_POP(status->get_def), HP_POP2(HP_status_get_def), 4492 },
-{ HP_POP(status->get_speed), HP_POP2(HP_status_get_speed), 4494 },
-{ HP_POP(status->calc_attack_element), HP_POP2(HP_status_calc_attack_element), 4496 },
-{ HP_POP(status->get_party_id), HP_POP2(HP_status_get_party_id), 4498 },
-{ HP_POP(status->get_guild_id), HP_POP2(HP_status_get_guild_id), 4500 },
-{ HP_POP(status->get_emblem_id), HP_POP2(HP_status_get_emblem_id), 4502 },
-{ HP_POP(status->get_mexp), HP_POP2(HP_status_get_mexp), 4504 },
-{ HP_POP(status->get_race2), HP_POP2(HP_status_get_race2), 4506 },
-{ HP_POP(status->get_viewdata), HP_POP2(HP_status_get_viewdata), 4508 },
-{ HP_POP(status->set_viewdata), HP_POP2(HP_status_set_viewdata), 4510 },
-{ HP_POP(status->change_init), HP_POP2(HP_status_change_init), 4512 },
-{ HP_POP(status->get_sc), HP_POP2(HP_status_get_sc), 4514 },
-{ HP_POP(status->isdead), HP_POP2(HP_status_isdead), 4516 },
-{ HP_POP(status->isimmune), HP_POP2(HP_status_isimmune), 4518 },
-{ HP_POP(status->get_sc_def), HP_POP2(HP_status_get_sc_def), 4520 },
-{ HP_POP(status->change_start), HP_POP2(HP_status_change_start), 4522 },
-{ HP_POP(status->change_end_), HP_POP2(HP_status_change_end_), 4524 },
-{ HP_POP(status->kaahi_heal_timer), HP_POP2(HP_status_kaahi_heal_timer), 4526 },
-{ HP_POP(status->change_timer), HP_POP2(HP_status_change_timer), 4528 },
-{ HP_POP(status->change_timer_sub), HP_POP2(HP_status_change_timer_sub), 4530 },
-{ HP_POP(status->change_clear), HP_POP2(HP_status_change_clear), 4532 },
-{ HP_POP(status->change_clear_buffs), HP_POP2(HP_status_change_clear_buffs), 4534 },
-{ HP_POP(status->calc_bl_), HP_POP2(HP_status_calc_bl_), 4536 },
-{ HP_POP(status->calc_mob_), HP_POP2(HP_status_calc_mob_), 4538 },
-{ HP_POP(status->calc_pet_), HP_POP2(HP_status_calc_pet_), 4540 },
-{ HP_POP(status->calc_pc_), HP_POP2(HP_status_calc_pc_), 4542 },
-{ HP_POP(status->calc_homunculus_), HP_POP2(HP_status_calc_homunculus_), 4544 },
-{ HP_POP(status->calc_mercenary_), HP_POP2(HP_status_calc_mercenary_), 4546 },
-{ HP_POP(status->calc_elemental_), HP_POP2(HP_status_calc_elemental_), 4548 },
-{ HP_POP(status->calc_misc), HP_POP2(HP_status_calc_misc), 4550 },
-{ HP_POP(status->calc_regen), HP_POP2(HP_status_calc_regen), 4552 },
-{ HP_POP(status->calc_regen_rate), HP_POP2(HP_status_calc_regen_rate), 4554 },
-{ HP_POP(status->check_skilluse), HP_POP2(HP_status_check_skilluse), 4556 },
-{ HP_POP(status->check_visibility), HP_POP2(HP_status_check_visibility), 4558 },
-{ HP_POP(status->change_spread), HP_POP2(HP_status_change_spread), 4560 },
-{ HP_POP(status->calc_def), HP_POP2(HP_status_calc_def), 4562 },
-{ HP_POP(status->calc_def2), HP_POP2(HP_status_calc_def2), 4564 },
-{ HP_POP(status->calc_mdef), HP_POP2(HP_status_calc_mdef), 4566 },
-{ HP_POP(status->calc_mdef2), HP_POP2(HP_status_calc_mdef2), 4568 },
-{ HP_POP(status->calc_batk), HP_POP2(HP_status_calc_batk), 4570 },
-{ HP_POP(status->get_total_mdef), HP_POP2(HP_status_get_total_mdef), 4572 },
-{ HP_POP(status->get_total_def), HP_POP2(HP_status_get_total_def), 4574 },
-{ HP_POP(status->get_matk), HP_POP2(HP_status_get_matk), 4576 },
-{ HP_POP(status->readdb), HP_POP2(HP_status_readdb), 4578 },
-{ HP_POP(status->initChangeTables), HP_POP2(HP_status_initChangeTables), 4580 },
-{ HP_POP(status->initDummyData), HP_POP2(HP_status_initDummyData), 4582 },
-{ HP_POP(status->base_amotion_pc), HP_POP2(HP_status_base_amotion_pc), 4584 },
-{ HP_POP(status->base_atk), HP_POP2(HP_status_base_atk), 4586 },
-{ HP_POP(status->calc_sigma), HP_POP2(HP_status_calc_sigma), 4588 },
-{ HP_POP(status->base_pc_maxhp), HP_POP2(HP_status_base_pc_maxhp), 4590 },
-{ HP_POP(status->base_pc_maxsp), HP_POP2(HP_status_base_pc_maxsp), 4592 },
-{ HP_POP(status->calc_npc_), HP_POP2(HP_status_calc_npc_), 4594 },
-{ HP_POP(status->calc_str), HP_POP2(HP_status_calc_str), 4596 },
-{ HP_POP(status->calc_agi), HP_POP2(HP_status_calc_agi), 4598 },
-{ HP_POP(status->calc_vit), HP_POP2(HP_status_calc_vit), 4600 },
-{ HP_POP(status->calc_int), HP_POP2(HP_status_calc_int), 4602 },
-{ HP_POP(status->calc_dex), HP_POP2(HP_status_calc_dex), 4604 },
-{ HP_POP(status->calc_luk), HP_POP2(HP_status_calc_luk), 4606 },
-{ HP_POP(status->calc_watk), HP_POP2(HP_status_calc_watk), 4608 },
-{ HP_POP(status->calc_matk), HP_POP2(HP_status_calc_matk), 4610 },
-{ HP_POP(status->calc_hit), HP_POP2(HP_status_calc_hit), 4612 },
-{ HP_POP(status->calc_critical), HP_POP2(HP_status_calc_critical), 4614 },
-{ HP_POP(status->calc_flee), HP_POP2(HP_status_calc_flee), 4616 },
-{ HP_POP(status->calc_flee2), HP_POP2(HP_status_calc_flee2), 4618 },
-{ HP_POP(status->calc_speed), HP_POP2(HP_status_calc_speed), 4620 },
-{ HP_POP(status->calc_aspd_rate), HP_POP2(HP_status_calc_aspd_rate), 4622 },
-{ HP_POP(status->calc_dmotion), HP_POP2(HP_status_calc_dmotion), 4624 },
-{ HP_POP(status->calc_fix_aspd), HP_POP2(HP_status_calc_fix_aspd), 4626 },
-{ HP_POP(status->calc_maxhp), HP_POP2(HP_status_calc_maxhp), 4628 },
-{ HP_POP(status->calc_maxsp), HP_POP2(HP_status_calc_maxsp), 4630 },
-{ HP_POP(status->calc_element), HP_POP2(HP_status_calc_element), 4632 },
-{ HP_POP(status->calc_element_lv), HP_POP2(HP_status_calc_element_lv), 4634 },
-{ HP_POP(status->calc_mode), HP_POP2(HP_status_calc_mode), 4636 },
-{ HP_POP(status->calc_bl_main), HP_POP2(HP_status_calc_bl_main), 4638 },
-{ HP_POP(status->display_add), HP_POP2(HP_status_display_add), 4640 },
-{ HP_POP(status->display_remove), HP_POP2(HP_status_display_remove), 4642 },
-{ HP_POP(status->natural_heal), HP_POP2(HP_status_natural_heal), 4644 },
-{ HP_POP(status->natural_heal_timer), HP_POP2(HP_status_natural_heal_timer), 4646 },
-{ HP_POP(status->readdb_job1), HP_POP2(HP_status_readdb_job1), 4648 },
-{ HP_POP(status->readdb_job2), HP_POP2(HP_status_readdb_job2), 4650 },
-{ HP_POP(status->readdb_sizefix), HP_POP2(HP_status_readdb_sizefix), 4652 },
-{ HP_POP(status->readdb_refine), HP_POP2(HP_status_readdb_refine), 4654 },
-{ HP_POP(status->readdb_scconfig), HP_POP2(HP_status_readdb_scconfig), 4656 },
+{ HP_POP(status->init), HP_POP2(HP_status_init), 4466 },
+{ HP_POP(status->final), HP_POP2(HP_status_final), 4468 },
+{ HP_POP(status->get_refine_chance), HP_POP2(HP_status_get_refine_chance), 4470 },
+{ HP_POP(status->skill2sc), HP_POP2(HP_status_skill2sc), 4472 },
+{ HP_POP(status->sc2skill), HP_POP2(HP_status_sc2skill), 4474 },
+{ HP_POP(status->sc2scb_flag), HP_POP2(HP_status_sc2scb_flag), 4476 },
+{ HP_POP(status->type2relevant_bl_types), HP_POP2(HP_status_type2relevant_bl_types), 4478 },
+{ HP_POP(status->get_sc_type), HP_POP2(HP_status_get_sc_type), 4480 },
+{ HP_POP(status->damage), HP_POP2(HP_status_damage), 4482 },
+{ HP_POP(status->charge), HP_POP2(HP_status_charge), 4484 },
+{ HP_POP(status->percent_change), HP_POP2(HP_status_percent_change), 4486 },
+{ HP_POP(status->set_hp), HP_POP2(HP_status_set_hp), 4488 },
+{ HP_POP(status->set_sp), HP_POP2(HP_status_set_sp), 4490 },
+{ HP_POP(status->heal), HP_POP2(HP_status_heal), 4492 },
+{ HP_POP(status->revive), HP_POP2(HP_status_revive), 4494 },
+{ HP_POP(status->get_regen_data), HP_POP2(HP_status_get_regen_data), 4496 },
+{ HP_POP(status->get_status_data), HP_POP2(HP_status_get_status_data), 4498 },
+{ HP_POP(status->get_base_status), HP_POP2(HP_status_get_base_status), 4500 },
+{ HP_POP(status->get_name), HP_POP2(HP_status_get_name), 4502 },
+{ HP_POP(status->get_class), HP_POP2(HP_status_get_class), 4504 },
+{ HP_POP(status->get_lv), HP_POP2(HP_status_get_lv), 4506 },
+{ HP_POP(status->get_def), HP_POP2(HP_status_get_def), 4508 },
+{ HP_POP(status->get_speed), HP_POP2(HP_status_get_speed), 4510 },
+{ HP_POP(status->calc_attack_element), HP_POP2(HP_status_calc_attack_element), 4512 },
+{ HP_POP(status->get_party_id), HP_POP2(HP_status_get_party_id), 4514 },
+{ HP_POP(status->get_guild_id), HP_POP2(HP_status_get_guild_id), 4516 },
+{ HP_POP(status->get_emblem_id), HP_POP2(HP_status_get_emblem_id), 4518 },
+{ HP_POP(status->get_mexp), HP_POP2(HP_status_get_mexp), 4520 },
+{ HP_POP(status->get_race2), HP_POP2(HP_status_get_race2), 4522 },
+{ HP_POP(status->get_viewdata), HP_POP2(HP_status_get_viewdata), 4524 },
+{ HP_POP(status->set_viewdata), HP_POP2(HP_status_set_viewdata), 4526 },
+{ HP_POP(status->change_init), HP_POP2(HP_status_change_init), 4528 },
+{ HP_POP(status->get_sc), HP_POP2(HP_status_get_sc), 4530 },
+{ HP_POP(status->isdead), HP_POP2(HP_status_isdead), 4532 },
+{ HP_POP(status->isimmune), HP_POP2(HP_status_isimmune), 4534 },
+{ HP_POP(status->get_sc_def), HP_POP2(HP_status_get_sc_def), 4536 },
+{ HP_POP(status->change_start), HP_POP2(HP_status_change_start), 4538 },
+{ HP_POP(status->change_end_), HP_POP2(HP_status_change_end_), 4540 },
+{ HP_POP(status->kaahi_heal_timer), HP_POP2(HP_status_kaahi_heal_timer), 4542 },
+{ HP_POP(status->change_timer), HP_POP2(HP_status_change_timer), 4544 },
+{ HP_POP(status->change_timer_sub), HP_POP2(HP_status_change_timer_sub), 4546 },
+{ HP_POP(status->change_clear), HP_POP2(HP_status_change_clear), 4548 },
+{ HP_POP(status->change_clear_buffs), HP_POP2(HP_status_change_clear_buffs), 4550 },
+{ HP_POP(status->calc_bl_), HP_POP2(HP_status_calc_bl_), 4552 },
+{ HP_POP(status->calc_mob_), HP_POP2(HP_status_calc_mob_), 4554 },
+{ HP_POP(status->calc_pet_), HP_POP2(HP_status_calc_pet_), 4556 },
+{ HP_POP(status->calc_pc_), HP_POP2(HP_status_calc_pc_), 4558 },
+{ HP_POP(status->calc_homunculus_), HP_POP2(HP_status_calc_homunculus_), 4560 },
+{ HP_POP(status->calc_mercenary_), HP_POP2(HP_status_calc_mercenary_), 4562 },
+{ HP_POP(status->calc_elemental_), HP_POP2(HP_status_calc_elemental_), 4564 },
+{ HP_POP(status->calc_misc), HP_POP2(HP_status_calc_misc), 4566 },
+{ HP_POP(status->calc_regen), HP_POP2(HP_status_calc_regen), 4568 },
+{ HP_POP(status->calc_regen_rate), HP_POP2(HP_status_calc_regen_rate), 4570 },
+{ HP_POP(status->check_skilluse), HP_POP2(HP_status_check_skilluse), 4572 },
+{ HP_POP(status->check_visibility), HP_POP2(HP_status_check_visibility), 4574 },
+{ HP_POP(status->change_spread), HP_POP2(HP_status_change_spread), 4576 },
+{ HP_POP(status->calc_def), HP_POP2(HP_status_calc_def), 4578 },
+{ HP_POP(status->calc_def2), HP_POP2(HP_status_calc_def2), 4580 },
+{ HP_POP(status->calc_mdef), HP_POP2(HP_status_calc_mdef), 4582 },
+{ HP_POP(status->calc_mdef2), HP_POP2(HP_status_calc_mdef2), 4584 },
+{ HP_POP(status->calc_batk), HP_POP2(HP_status_calc_batk), 4586 },
+{ HP_POP(status->base_matk), HP_POP2(HP_status_base_matk), 4588 },
+{ HP_POP(status->get_weapon_atk), HP_POP2(HP_status_get_weapon_atk), 4590 },
+{ HP_POP(status->get_total_mdef), HP_POP2(HP_status_get_total_mdef), 4592 },
+{ HP_POP(status->get_total_def), HP_POP2(HP_status_get_total_def), 4594 },
+{ HP_POP(status->get_matk), HP_POP2(HP_status_get_matk), 4596 },
+{ HP_POP(status->readdb), HP_POP2(HP_status_readdb), 4598 },
+{ HP_POP(status->initChangeTables), HP_POP2(HP_status_initChangeTables), 4600 },
+{ HP_POP(status->initDummyData), HP_POP2(HP_status_initDummyData), 4602 },
+{ HP_POP(status->base_amotion_pc), HP_POP2(HP_status_base_amotion_pc), 4604 },
+{ HP_POP(status->base_atk), HP_POP2(HP_status_base_atk), 4606 },
+{ HP_POP(status->calc_sigma), HP_POP2(HP_status_calc_sigma), 4608 },
+{ HP_POP(status->base_pc_maxhp), HP_POP2(HP_status_base_pc_maxhp), 4610 },
+{ HP_POP(status->base_pc_maxsp), HP_POP2(HP_status_base_pc_maxsp), 4612 },
+{ HP_POP(status->calc_npc_), HP_POP2(HP_status_calc_npc_), 4614 },
+{ HP_POP(status->calc_str), HP_POP2(HP_status_calc_str), 4616 },
+{ HP_POP(status->calc_agi), HP_POP2(HP_status_calc_agi), 4618 },
+{ HP_POP(status->calc_vit), HP_POP2(HP_status_calc_vit), 4620 },
+{ HP_POP(status->calc_int), HP_POP2(HP_status_calc_int), 4622 },
+{ HP_POP(status->calc_dex), HP_POP2(HP_status_calc_dex), 4624 },
+{ HP_POP(status->calc_luk), HP_POP2(HP_status_calc_luk), 4626 },
+{ HP_POP(status->calc_watk), HP_POP2(HP_status_calc_watk), 4628 },
+{ HP_POP(status->calc_matk), HP_POP2(HP_status_calc_matk), 4630 },
+{ HP_POP(status->calc_hit), HP_POP2(HP_status_calc_hit), 4632 },
+{ HP_POP(status->calc_critical), HP_POP2(HP_status_calc_critical), 4634 },
+{ HP_POP(status->calc_flee), HP_POP2(HP_status_calc_flee), 4636 },
+{ HP_POP(status->calc_flee2), HP_POP2(HP_status_calc_flee2), 4638 },
+{ HP_POP(status->calc_speed), HP_POP2(HP_status_calc_speed), 4640 },
+{ HP_POP(status->calc_aspd_rate), HP_POP2(HP_status_calc_aspd_rate), 4642 },
+{ HP_POP(status->calc_dmotion), HP_POP2(HP_status_calc_dmotion), 4644 },
+{ HP_POP(status->calc_aspd), HP_POP2(HP_status_calc_aspd), 4646 },
+{ HP_POP(status->calc_fix_aspd), HP_POP2(HP_status_calc_fix_aspd), 4648 },
+{ HP_POP(status->calc_maxhp), HP_POP2(HP_status_calc_maxhp), 4650 },
+{ HP_POP(status->calc_maxsp), HP_POP2(HP_status_calc_maxsp), 4652 },
+{ HP_POP(status->calc_element), HP_POP2(HP_status_calc_element), 4654 },
+{ HP_POP(status->calc_element_lv), HP_POP2(HP_status_calc_element_lv), 4656 },
+{ HP_POP(status->calc_mode), HP_POP2(HP_status_calc_mode), 4658 },
+{ HP_POP(status->calc_ematk), HP_POP2(HP_status_calc_ematk), 4660 },
+{ HP_POP(status->calc_bl_main), HP_POP2(HP_status_calc_bl_main), 4662 },
+{ HP_POP(status->display_add), HP_POP2(HP_status_display_add), 4664 },
+{ HP_POP(status->display_remove), HP_POP2(HP_status_display_remove), 4666 },
+{ HP_POP(status->natural_heal), HP_POP2(HP_status_natural_heal), 4668 },
+{ HP_POP(status->natural_heal_timer), HP_POP2(HP_status_natural_heal_timer), 4670 },
+{ HP_POP(status->readdb_job1), HP_POP2(HP_status_readdb_job1), 4672 },
+{ HP_POP(status->readdb_job2), HP_POP2(HP_status_readdb_job2), 4674 },
+{ HP_POP(status->readdb_sizefix), HP_POP2(HP_status_readdb_sizefix), 4676 },
+{ HP_POP(status->readdb_refine), HP_POP2(HP_status_readdb_refine), 4678 },
+{ HP_POP(status->readdb_scconfig), HP_POP2(HP_status_readdb_scconfig), 4680 },
 /* storage */
-{ HP_POP(storage->reconnect), HP_POP2(HP_storage_reconnect), 4658 },
-{ HP_POP(storage->delitem), HP_POP2(HP_storage_delitem), 4660 },
-{ HP_POP(storage->open), HP_POP2(HP_storage_open), 4662 },
-{ HP_POP(storage->add), HP_POP2(HP_storage_add), 4664 },
-{ HP_POP(storage->get), HP_POP2(HP_storage_get), 4666 },
-{ HP_POP(storage->additem), HP_POP2(HP_storage_additem), 4668 },
-{ HP_POP(storage->addfromcart), HP_POP2(HP_storage_addfromcart), 4670 },
-{ HP_POP(storage->gettocart), HP_POP2(HP_storage_gettocart), 4672 },
-{ HP_POP(storage->close), HP_POP2(HP_storage_close), 4674 },
-{ HP_POP(storage->pc_quit), HP_POP2(HP_storage_pc_quit), 4676 },
-{ HP_POP(storage->comp_item), HP_POP2(HP_storage_comp_item), 4678 },
-{ HP_POP(storage->sortitem), HP_POP2(HP_storage_sortitem), 4680 },
-{ HP_POP(storage->reconnect_sub), HP_POP2(HP_storage_reconnect_sub), 4682 },
+{ HP_POP(storage->reconnect), HP_POP2(HP_storage_reconnect), 4682 },
+{ HP_POP(storage->delitem), HP_POP2(HP_storage_delitem), 4684 },
+{ HP_POP(storage->open), HP_POP2(HP_storage_open), 4686 },
+{ HP_POP(storage->add), HP_POP2(HP_storage_add), 4688 },
+{ HP_POP(storage->get), HP_POP2(HP_storage_get), 4690 },
+{ HP_POP(storage->additem), HP_POP2(HP_storage_additem), 4692 },
+{ HP_POP(storage->addfromcart), HP_POP2(HP_storage_addfromcart), 4694 },
+{ HP_POP(storage->gettocart), HP_POP2(HP_storage_gettocart), 4696 },
+{ HP_POP(storage->close), HP_POP2(HP_storage_close), 4698 },
+{ HP_POP(storage->pc_quit), HP_POP2(HP_storage_pc_quit), 4700 },
+{ HP_POP(storage->comp_item), HP_POP2(HP_storage_comp_item), 4702 },
+{ HP_POP(storage->sortitem), HP_POP2(HP_storage_sortitem), 4704 },
+{ HP_POP(storage->reconnect_sub), HP_POP2(HP_storage_reconnect_sub), 4706 },
 /* trade */
-{ HP_POP(trade->request), HP_POP2(HP_trade_request), 4684 },
-{ HP_POP(trade->ack), HP_POP2(HP_trade_ack), 4686 },
-{ HP_POP(trade->check_impossible), HP_POP2(HP_trade_check_impossible), 4688 },
-{ HP_POP(trade->check), HP_POP2(HP_trade_check), 4690 },
-{ HP_POP(trade->additem), HP_POP2(HP_trade_additem), 4692 },
-{ HP_POP(trade->addzeny), HP_POP2(HP_trade_addzeny), 4694 },
-{ HP_POP(trade->ok), HP_POP2(HP_trade_ok), 4696 },
-{ HP_POP(trade->cancel), HP_POP2(HP_trade_cancel), 4698 },
-{ HP_POP(trade->commit), HP_POP2(HP_trade_commit), 4700 },
+{ HP_POP(trade->request), HP_POP2(HP_trade_request), 4708 },
+{ HP_POP(trade->ack), HP_POP2(HP_trade_ack), 4710 },
+{ HP_POP(trade->check_impossible), HP_POP2(HP_trade_check_impossible), 4712 },
+{ HP_POP(trade->check), HP_POP2(HP_trade_check), 4714 },
+{ HP_POP(trade->additem), HP_POP2(HP_trade_additem), 4716 },
+{ HP_POP(trade->addzeny), HP_POP2(HP_trade_addzeny), 4718 },
+{ HP_POP(trade->ok), HP_POP2(HP_trade_ok), 4720 },
+{ HP_POP(trade->cancel), HP_POP2(HP_trade_cancel), 4722 },
+{ HP_POP(trade->commit), HP_POP2(HP_trade_commit), 4724 },
 /* unit */
-{ HP_POP(unit->init), HP_POP2(HP_unit_init), 4702 },
-{ HP_POP(unit->final), HP_POP2(HP_unit_final), 4704 },
-{ HP_POP(unit->bl2ud), HP_POP2(HP_unit_bl2ud), 4706 },
-{ HP_POP(unit->bl2ud2), HP_POP2(HP_unit_bl2ud2), 4708 },
-{ HP_POP(unit->attack_timer), HP_POP2(HP_unit_attack_timer), 4710 },
-{ HP_POP(unit->walktoxy_timer), HP_POP2(HP_unit_walktoxy_timer), 4712 },
-{ HP_POP(unit->walktoxy_sub), HP_POP2(HP_unit_walktoxy_sub), 4714 },
-{ HP_POP(unit->delay_walktoxy_timer), HP_POP2(HP_unit_delay_walktoxy_timer), 4716 },
-{ HP_POP(unit->walktoxy), HP_POP2(HP_unit_walktoxy), 4718 },
-{ HP_POP(unit->walktobl_sub), HP_POP2(HP_unit_walktobl_sub), 4720 },
-{ HP_POP(unit->walktobl), HP_POP2(HP_unit_walktobl), 4722 },
-{ HP_POP(unit->run), HP_POP2(HP_unit_run), 4724 },
-{ HP_POP(unit->wugdash), HP_POP2(HP_unit_wugdash), 4726 },
-{ HP_POP(unit->escape), HP_POP2(HP_unit_escape), 4728 },
-{ HP_POP(unit->movepos), HP_POP2(HP_unit_movepos), 4730 },
-{ HP_POP(unit->setdir), HP_POP2(HP_unit_setdir), 4732 },
-{ HP_POP(unit->getdir), HP_POP2(HP_unit_getdir), 4734 },
-{ HP_POP(unit->blown), HP_POP2(HP_unit_blown), 4736 },
-{ HP_POP(unit->warp), HP_POP2(HP_unit_warp), 4738 },
-{ HP_POP(unit->stop_walking), HP_POP2(HP_unit_stop_walking), 4740 },
-{ HP_POP(unit->skilluse_id), HP_POP2(HP_unit_skilluse_id), 4742 },
-{ HP_POP(unit->is_walking), HP_POP2(HP_unit_is_walking), 4744 },
-{ HP_POP(unit->can_move), HP_POP2(HP_unit_can_move), 4746 },
-{ HP_POP(unit->resume_running), HP_POP2(HP_unit_resume_running), 4748 },
-{ HP_POP(unit->set_walkdelay), HP_POP2(HP_unit_set_walkdelay), 4750 },
-{ HP_POP(unit->skilluse_id2), HP_POP2(HP_unit_skilluse_id2), 4752 },
-{ HP_POP(unit->skilluse_pos), HP_POP2(HP_unit_skilluse_pos), 4754 },
-{ HP_POP(unit->skilluse_pos2), HP_POP2(HP_unit_skilluse_pos2), 4756 },
-{ HP_POP(unit->set_target), HP_POP2(HP_unit_set_target), 4758 },
-{ HP_POP(unit->stop_attack), HP_POP2(HP_unit_stop_attack), 4760 },
-{ HP_POP(unit->unattackable), HP_POP2(HP_unit_unattackable), 4762 },
-{ HP_POP(unit->attack), HP_POP2(HP_unit_attack), 4764 },
-{ HP_POP(unit->cancel_combo), HP_POP2(HP_unit_cancel_combo), 4766 },
-{ HP_POP(unit->can_reach_pos), HP_POP2(HP_unit_can_reach_pos), 4768 },
-{ HP_POP(unit->can_reach_bl), HP_POP2(HP_unit_can_reach_bl), 4770 },
-{ HP_POP(unit->calc_pos), HP_POP2(HP_unit_calc_pos), 4772 },
-{ HP_POP(unit->attack_timer_sub), HP_POP2(HP_unit_attack_timer_sub), 4774 },
-{ HP_POP(unit->skillcastcancel), HP_POP2(HP_unit_skillcastcancel), 4776 },
-{ HP_POP(unit->dataset), HP_POP2(HP_unit_dataset), 4778 },
-{ HP_POP(unit->counttargeted), HP_POP2(HP_unit_counttargeted), 4780 },
-{ HP_POP(unit->fixdamage), HP_POP2(HP_unit_fixdamage), 4782 },
-{ HP_POP(unit->changeviewsize), HP_POP2(HP_unit_changeviewsize), 4784 },
-{ HP_POP(unit->remove_map), HP_POP2(HP_unit_remove_map), 4786 },
-{ HP_POP(unit->remove_map_pc), HP_POP2(HP_unit_remove_map_pc), 4788 },
-{ HP_POP(unit->free_pc), HP_POP2(HP_unit_free_pc), 4790 },
-{ HP_POP(unit->free), HP_POP2(HP_unit_free), 4792 },
+{ HP_POP(unit->init), HP_POP2(HP_unit_init), 4726 },
+{ HP_POP(unit->final), HP_POP2(HP_unit_final), 4728 },
+{ HP_POP(unit->bl2ud), HP_POP2(HP_unit_bl2ud), 4730 },
+{ HP_POP(unit->bl2ud2), HP_POP2(HP_unit_bl2ud2), 4732 },
+{ HP_POP(unit->attack_timer), HP_POP2(HP_unit_attack_timer), 4734 },
+{ HP_POP(unit->walktoxy_timer), HP_POP2(HP_unit_walktoxy_timer), 4736 },
+{ HP_POP(unit->walktoxy_sub), HP_POP2(HP_unit_walktoxy_sub), 4738 },
+{ HP_POP(unit->delay_walktoxy_timer), HP_POP2(HP_unit_delay_walktoxy_timer), 4740 },
+{ HP_POP(unit->walktoxy), HP_POP2(HP_unit_walktoxy), 4742 },
+{ HP_POP(unit->walktobl_sub), HP_POP2(HP_unit_walktobl_sub), 4744 },
+{ HP_POP(unit->walktobl), HP_POP2(HP_unit_walktobl), 4746 },
+{ HP_POP(unit->run), HP_POP2(HP_unit_run), 4748 },
+{ HP_POP(unit->wugdash), HP_POP2(HP_unit_wugdash), 4750 },
+{ HP_POP(unit->escape), HP_POP2(HP_unit_escape), 4752 },
+{ HP_POP(unit->movepos), HP_POP2(HP_unit_movepos), 4754 },
+{ HP_POP(unit->setdir), HP_POP2(HP_unit_setdir), 4756 },
+{ HP_POP(unit->getdir), HP_POP2(HP_unit_getdir), 4758 },
+{ HP_POP(unit->blown), HP_POP2(HP_unit_blown), 4760 },
+{ HP_POP(unit->warp), HP_POP2(HP_unit_warp), 4762 },
+{ HP_POP(unit->stop_walking), HP_POP2(HP_unit_stop_walking), 4764 },
+{ HP_POP(unit->skilluse_id), HP_POP2(HP_unit_skilluse_id), 4766 },
+{ HP_POP(unit->is_walking), HP_POP2(HP_unit_is_walking), 4768 },
+{ HP_POP(unit->can_move), HP_POP2(HP_unit_can_move), 4770 },
+{ HP_POP(unit->resume_running), HP_POP2(HP_unit_resume_running), 4772 },
+{ HP_POP(unit->set_walkdelay), HP_POP2(HP_unit_set_walkdelay), 4774 },
+{ HP_POP(unit->skilluse_id2), HP_POP2(HP_unit_skilluse_id2), 4776 },
+{ HP_POP(unit->skilluse_pos), HP_POP2(HP_unit_skilluse_pos), 4778 },
+{ HP_POP(unit->skilluse_pos2), HP_POP2(HP_unit_skilluse_pos2), 4780 },
+{ HP_POP(unit->set_target), HP_POP2(HP_unit_set_target), 4782 },
+{ HP_POP(unit->stop_attack), HP_POP2(HP_unit_stop_attack), 4784 },
+{ HP_POP(unit->unattackable), HP_POP2(HP_unit_unattackable), 4786 },
+{ HP_POP(unit->attack), HP_POP2(HP_unit_attack), 4788 },
+{ HP_POP(unit->cancel_combo), HP_POP2(HP_unit_cancel_combo), 4790 },
+{ HP_POP(unit->can_reach_pos), HP_POP2(HP_unit_can_reach_pos), 4792 },
+{ HP_POP(unit->can_reach_bl), HP_POP2(HP_unit_can_reach_bl), 4794 },
+{ HP_POP(unit->calc_pos), HP_POP2(HP_unit_calc_pos), 4796 },
+{ HP_POP(unit->attack_timer_sub), HP_POP2(HP_unit_attack_timer_sub), 4798 },
+{ HP_POP(unit->skillcastcancel), HP_POP2(HP_unit_skillcastcancel), 4800 },
+{ HP_POP(unit->dataset), HP_POP2(HP_unit_dataset), 4802 },
+{ HP_POP(unit->counttargeted), HP_POP2(HP_unit_counttargeted), 4804 },
+{ HP_POP(unit->fixdamage), HP_POP2(HP_unit_fixdamage), 4806 },
+{ HP_POP(unit->changeviewsize), HP_POP2(HP_unit_changeviewsize), 4808 },
+{ HP_POP(unit->remove_map), HP_POP2(HP_unit_remove_map), 4810 },
+{ HP_POP(unit->remove_map_pc), HP_POP2(HP_unit_remove_map_pc), 4812 },
+{ HP_POP(unit->free_pc), HP_POP2(HP_unit_free_pc), 4814 },
+{ HP_POP(unit->free), HP_POP2(HP_unit_free), 4816 },
 /* vending */
-{ HP_POP(vending->init), HP_POP2(HP_vending_init), 4794 },
-{ HP_POP(vending->final), HP_POP2(HP_vending_final), 4796 },
-{ HP_POP(vending->close), HP_POP2(HP_vending_close), 4798 },
-{ HP_POP(vending->open), HP_POP2(HP_vending_open), 4800 },
-{ HP_POP(vending->list), HP_POP2(HP_vending_list), 4802 },
-{ HP_POP(vending->purchase), HP_POP2(HP_vending_purchase), 4804 },
-{ HP_POP(vending->search), HP_POP2(HP_vending_search), 4806 },
-{ HP_POP(vending->searchall), HP_POP2(HP_vending_searchall), 4808 },
+{ HP_POP(vending->init), HP_POP2(HP_vending_init), 4818 },
+{ HP_POP(vending->final), HP_POP2(HP_vending_final), 4820 },
+{ HP_POP(vending->close), HP_POP2(HP_vending_close), 4822 },
+{ HP_POP(vending->open), HP_POP2(HP_vending_open), 4824 },
+{ HP_POP(vending->list), HP_POP2(HP_vending_list), 4826 },
+{ HP_POP(vending->purchase), HP_POP2(HP_vending_purchase), 4828 },
+{ HP_POP(vending->search), HP_POP2(HP_vending_search), 4830 },
+{ HP_POP(vending->searchall), HP_POP2(HP_vending_searchall), 4832 },
 };
 int HookingPointsLenMax = 41;
diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
index ce8e3b4b1..115d81071 100644
--- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
@@ -6647,6 +6647,56 @@ void HP_clif_spawn_unit(struct block_list *bl, enum send_target target) {
 	}
 	return;
 }
+void HP_clif_spawn_unit2(struct block_list *bl, enum send_target target) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_clif_spawn_unit2_pre ) {
+		void (*preHookFunc) (struct block_list *bl, enum send_target *target);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_spawn_unit2_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_clif_spawn_unit2_pre[hIndex].func;
+			preHookFunc(bl, &target);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.spawn_unit2(bl, target);
+	}
+	if( HPMHooks.count.HP_clif_spawn_unit2_post ) {
+		void (*postHookFunc) (struct block_list *bl, enum send_target *target);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_spawn_unit2_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_clif_spawn_unit2_post[hIndex].func;
+			postHookFunc(bl, &target);
+		}
+	}
+	return;
+}
+void HP_clif_set_unit_idle2(struct block_list *bl, struct map_session_data *tsd, enum send_target target) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_clif_set_unit_idle2_pre ) {
+		void (*preHookFunc) (struct block_list *bl, struct map_session_data *tsd, enum send_target *target);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_set_unit_idle2_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_clif_set_unit_idle2_pre[hIndex].func;
+			preHookFunc(bl, tsd, &target);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.set_unit_idle2(bl, tsd, target);
+	}
+	if( HPMHooks.count.HP_clif_set_unit_idle2_post ) {
+		void (*postHookFunc) (struct block_list *bl, struct map_session_data *tsd, enum send_target *target);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_set_unit_idle2_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_clif_set_unit_idle2_post[hIndex].func;
+			postHookFunc(bl, tsd, &target);
+		}
+	}
+	return;
+}
 void HP_clif_set_unit_walking(struct block_list *bl, struct map_session_data *tsd, struct unit_data *ud, enum send_target target) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_clif_set_unit_walking_pre ) {
@@ -36399,6 +36449,56 @@ bool HP_map_arg_next_value(const char *option, int i, int argc) {
 	}
 	return retVal___;
 }
+void HP_map_addblcell(struct block_list *bl) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_map_addblcell_pre ) {
+		void (*preHookFunc) (struct block_list *bl);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_map_addblcell_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_map_addblcell_pre[hIndex].func;
+			preHookFunc(bl);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.map.addblcell(bl);
+	}
+	if( HPMHooks.count.HP_map_addblcell_post ) {
+		void (*postHookFunc) (struct block_list *bl);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_map_addblcell_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_map_addblcell_post[hIndex].func;
+			postHookFunc(bl);
+		}
+	}
+	return;
+}
+void HP_map_delblcell(struct block_list *bl) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_map_delblcell_pre ) {
+		void (*preHookFunc) (struct block_list *bl);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_map_delblcell_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_map_delblcell_pre[hIndex].func;
+			preHookFunc(bl);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.map.delblcell(bl);
+	}
+	if( HPMHooks.count.HP_map_delblcell_post ) {
+		void (*postHookFunc) (struct block_list *bl);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_map_delblcell_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_map_delblcell_post[hIndex].func;
+			postHookFunc(bl);
+		}
+	}
+	return;
+}
 /* mapit */
 struct s_mapiterator* HP_mapit_alloc(enum e_mapitflags flags, enum bl_type types) {
 	int hIndex = 0;
@@ -42464,6 +42564,33 @@ void HP_npc_debug_warps(void) {
 	}
 	return;
 }
+int HP_npc_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t data) {
+	int hIndex = 0;
+	int retVal___;
+	memset(&retVal___, '\0', sizeof(int));
+	if( HPMHooks.count.HP_npc_secure_timeout_timer_pre ) {
+		int (*preHookFunc) (int *tid, unsigned int *tick, int *id, intptr_t *data);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_secure_timeout_timer_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_npc_secure_timeout_timer_pre[hIndex].func;
+			retVal___ = preHookFunc(&tid, &tick, &id, &data);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.npc.secure_timeout_timer(tid, tick, id, data);
+	}
+	if( HPMHooks.count.HP_npc_secure_timeout_timer_post ) {
+		int (*postHookFunc) (int retVal___, int *tid, unsigned int *tick, int *id, intptr_t *data);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_secure_timeout_timer_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_npc_secure_timeout_timer_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data);
+		}
+	}
+	return retVal___;
+}
 /* party */
 void HP_party_init(void) {
 	int hIndex = 0;
@@ -43372,13 +43499,13 @@ int HP_party_sub_count(struct block_list *bl, va_list ap) {
 	}
 	return retVal___;
 }
-void HP_party_booking_register(struct map_session_data *sd, short level, const char *notice) {
+void HP_party_booking_register(struct map_session_data *sd, short level, short mapid, short *job) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_party_booking_register_pre ) {
-		void (*preHookFunc) (struct map_session_data *sd, short *level, const char *notice);
+		void (*preHookFunc) (struct map_session_data *sd, short *level, short *mapid, short *job);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_party_booking_register_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_party_booking_register_pre[hIndex].func;
-			preHookFunc(sd, &level, notice);
+			preHookFunc(sd, &level, &mapid, job);
 		}
 		if( *HPMforce_return ) {
 			*HPMforce_return = false;
@@ -43386,24 +43513,24 @@ void HP_party_booking_register(struct map_session_data *sd, short level, const c
 		}
 	}
 	{
-		HPMHooks.source.party.booking_register(sd, level, notice);
+		HPMHooks.source.party.booking_register(sd, level, mapid, job);
 	}
 	if( HPMHooks.count.HP_party_booking_register_post ) {
-		void (*postHookFunc) (struct map_session_data *sd, short *level, const char *notice);
+		void (*postHookFunc) (struct map_session_data *sd, short *level, short *mapid, short *job);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_party_booking_register_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_party_booking_register_post[hIndex].func;
-			postHookFunc(sd, &level, notice);
+			postHookFunc(sd, &level, &mapid, job);
 		}
 	}
 	return;
 }
-void HP_party_booking_update(struct map_session_data *sd, const char *notice) {
+void HP_party_booking_update(struct map_session_data *sd, short *job) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_party_booking_update_pre ) {
-		void (*preHookFunc) (struct map_session_data *sd, const char *notice);
+		void (*preHookFunc) (struct map_session_data *sd, short *job);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_party_booking_update_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_party_booking_update_pre[hIndex].func;
-			preHookFunc(sd, notice);
+			preHookFunc(sd, job);
 		}
 		if( *HPMforce_return ) {
 			*HPMforce_return = false;
@@ -43411,24 +43538,24 @@ void HP_party_booking_update(struct map_session_data *sd, const char *notice) {
 		}
 	}
 	{
-		HPMHooks.source.party.booking_update(sd, notice);
+		HPMHooks.source.party.booking_update(sd, job);
 	}
 	if( HPMHooks.count.HP_party_booking_update_post ) {
-		void (*postHookFunc) (struct map_session_data *sd, const char *notice);
+		void (*postHookFunc) (struct map_session_data *sd, short *job);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_party_booking_update_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_party_booking_update_post[hIndex].func;
-			postHookFunc(sd, notice);
+			postHookFunc(sd, job);
 		}
 	}
 	return;
 }
-void HP_party_booking_search(struct map_session_data *sd, short level, short mapid, unsigned long lastindex, short resultcount) {
+void HP_party_booking_search(struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_party_booking_search_pre ) {
-		void (*preHookFunc) (struct map_session_data *sd, short *level, short *mapid, unsigned long *lastindex, short *resultcount);
+		void (*preHookFunc) (struct map_session_data *sd, short *level, short *mapid, short *job, unsigned long *lastindex, short *resultcount);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_party_booking_search_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_party_booking_search_pre[hIndex].func;
-			preHookFunc(sd, &level, &mapid, &lastindex, &resultcount);
+			preHookFunc(sd, &level, &mapid, &job, &lastindex, &resultcount);
 		}
 		if( *HPMforce_return ) {
 			*HPMforce_return = false;
@@ -43436,12 +43563,87 @@ void HP_party_booking_search(struct map_session_data *sd, short level, short map
 		}
 	}
 	{
-		HPMHooks.source.party.booking_search(sd, level, mapid, lastindex, resultcount);
+		HPMHooks.source.party.booking_search(sd, level, mapid, job, lastindex, resultcount);
 	}
 	if( HPMHooks.count.HP_party_booking_search_post ) {
-		void (*postHookFunc) (struct map_session_data *sd, short *level, short *mapid, unsigned long *lastindex, short *resultcount);
+		void (*postHookFunc) (struct map_session_data *sd, short *level, short *mapid, short *job, unsigned long *lastindex, short *resultcount);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_party_booking_search_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_party_booking_search_post[hIndex].func;
+			postHookFunc(sd, &level, &mapid, &job, &lastindex, &resultcount);
+		}
+	}
+	return;
+}
+void HP_party_recruit_register(struct map_session_data *sd, short level, const char *notice) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_party_recruit_register_pre ) {
+		void (*preHookFunc) (struct map_session_data *sd, short *level, const char *notice);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recruit_register_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_party_recruit_register_pre[hIndex].func;
+			preHookFunc(sd, &level, notice);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.party.recruit_register(sd, level, notice);
+	}
+	if( HPMHooks.count.HP_party_recruit_register_post ) {
+		void (*postHookFunc) (struct map_session_data *sd, short *level, const char *notice);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recruit_register_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_party_recruit_register_post[hIndex].func;
+			postHookFunc(sd, &level, notice);
+		}
+	}
+	return;
+}
+void HP_party_recruit_update(struct map_session_data *sd, const char *notice) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_party_recruit_update_pre ) {
+		void (*preHookFunc) (struct map_session_data *sd, const char *notice);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recruit_update_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_party_recruit_update_pre[hIndex].func;
+			preHookFunc(sd, notice);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.party.recruit_update(sd, notice);
+	}
+	if( HPMHooks.count.HP_party_recruit_update_post ) {
+		void (*postHookFunc) (struct map_session_data *sd, const char *notice);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recruit_update_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_party_recruit_update_post[hIndex].func;
+			postHookFunc(sd, notice);
+		}
+	}
+	return;
+}
+void HP_party_recruit_search(struct map_session_data *sd, short level, short mapid, unsigned long lastindex, short resultcount) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_party_recruit_search_pre ) {
+		void (*preHookFunc) (struct map_session_data *sd, short *level, short *mapid, unsigned long *lastindex, short *resultcount);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recruit_search_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_party_recruit_search_pre[hIndex].func;
+			preHookFunc(sd, &level, &mapid, &lastindex, &resultcount);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.party.recruit_search(sd, level, mapid, lastindex, resultcount);
+	}
+	if( HPMHooks.count.HP_party_recruit_search_post ) {
+		void (*postHookFunc) (struct map_session_data *sd, short *level, short *mapid, unsigned long *lastindex, short *resultcount);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recruit_search_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_party_recruit_search_post[hIndex].func;
 			postHookFunc(sd, &level, &mapid, &lastindex, &resultcount);
 		}
 	}
@@ -60462,6 +60664,60 @@ unsigned short HP_status_calc_batk(struct block_list *bl, struct status_change *
 	}
 	return retVal___;
 }
+unsigned short HP_status_base_matk(const struct status_data *st, int level) {
+	int hIndex = 0;
+	unsigned short retVal___;
+	memset(&retVal___, '\0', sizeof(unsigned short));
+	if( HPMHooks.count.HP_status_base_matk_pre ) {
+		unsigned short (*preHookFunc) (const struct status_data *st, int *level);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_status_base_matk_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_status_base_matk_pre[hIndex].func;
+			retVal___ = preHookFunc(st, &level);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.status.base_matk(st, level);
+	}
+	if( HPMHooks.count.HP_status_base_matk_post ) {
+		unsigned short (*postHookFunc) (unsigned short retVal___, const struct status_data *st, int *level);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_status_base_matk_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_status_base_matk_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, st, &level);
+		}
+	}
+	return retVal___;
+}
+int HP_status_get_weapon_atk(struct block_list *src, struct weapon_atk *watk, int flag) {
+	int hIndex = 0;
+	int retVal___;
+	memset(&retVal___, '\0', sizeof(int));
+	if( HPMHooks.count.HP_status_get_weapon_atk_pre ) {
+		int (*preHookFunc) (struct block_list *src, struct weapon_atk *watk, int *flag);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_weapon_atk_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_status_get_weapon_atk_pre[hIndex].func;
+			retVal___ = preHookFunc(src, watk, &flag);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.status.get_weapon_atk(src, watk, flag);
+	}
+	if( HPMHooks.count.HP_status_get_weapon_atk_post ) {
+		int (*postHookFunc) (int retVal___, struct block_list *src, struct weapon_atk *watk, int *flag);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_status_get_weapon_atk_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_status_get_weapon_atk_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, src, watk, &flag);
+		}
+	}
+	return retVal___;
+}
 int HP_status_get_total_mdef(struct block_list *src) {
 	int hIndex = 0;
 	int retVal___;
@@ -61185,6 +61441,33 @@ unsigned short HP_status_calc_dmotion(struct block_list *bl, struct status_chang
 	}
 	return retVal___;
 }
+short HP_status_calc_aspd(struct block_list *bl, struct status_change *sc, short flag) {
+	int hIndex = 0;
+	short retVal___;
+	memset(&retVal___, '\0', sizeof(short));
+	if( HPMHooks.count.HP_status_calc_aspd_pre ) {
+		short (*preHookFunc) (struct block_list *bl, struct status_change *sc, short *flag);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_aspd_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_status_calc_aspd_pre[hIndex].func;
+			retVal___ = preHookFunc(bl, sc, &flag);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.status.calc_aspd(bl, sc, flag);
+	}
+	if( HPMHooks.count.HP_status_calc_aspd_post ) {
+		short (*postHookFunc) (short retVal___, struct block_list *bl, struct status_change *sc, short *flag);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_aspd_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_status_calc_aspd_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, bl, sc, &flag);
+		}
+	}
+	return retVal___;
+}
 short HP_status_calc_fix_aspd(struct block_list *bl, struct status_change *sc, int aspd) {
 	int hIndex = 0;
 	short retVal___;
@@ -61347,6 +61630,33 @@ unsigned short HP_status_calc_mode(struct block_list *bl, struct status_change *
 	}
 	return retVal___;
 }
+unsigned short HP_status_calc_ematk(struct block_list *bl, struct status_change *sc, int matk) {
+	int hIndex = 0;
+	unsigned short retVal___;
+	memset(&retVal___, '\0', sizeof(unsigned short));
+	if( HPMHooks.count.HP_status_calc_ematk_pre ) {
+		unsigned short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *matk);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_ematk_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_status_calc_ematk_pre[hIndex].func;
+			retVal___ = preHookFunc(bl, sc, &matk);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.status.calc_ematk(bl, sc, matk);
+	}
+	if( HPMHooks.count.HP_status_calc_ematk_post ) {
+		unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int *matk);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_ematk_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_status_calc_ematk_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, bl, sc, &matk);
+		}
+	}
+	return retVal___;
+}
 void HP_status_calc_bl_main(struct block_list *bl, int flag) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_status_calc_bl_main_pre ) {