Merge branch 'master' of https://github.com/HerculesWS/Hercules

6 files changed, 2567 insertions, 2474 deletions

diff --git a/src/map/battle.c b/src/map/battle.c
index fb950860e..0406500b7 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2938,27 +2938,6 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
 
 		if( sc->data[SC__DEADLYINFECT] && damage > 0 && rnd()%100 < 65 + 5 * sc->data[SC__DEADLYINFECT]->val1 )
 			status->change_spread(bl, src); // Deadly infect attacked side
-
-		if( sc && sc->data[SC__SHADOWFORM] ) {
-			struct block_list *s_bl = map->id2bl(sc->data[SC__SHADOWFORM]->val2);
-			if( !s_bl || s_bl->m != bl->m ) { // If the shadow form target is not present remove the sc.
-				status_change_end(bl, SC__SHADOWFORM, INVALID_TIMER);
-			} else if( status->isdead(s_bl) || !battle->check_target(src,s_bl,BCT_ENEMY)) { // If the shadow form target is dead or not your enemy remove the sc in both.
-				status_change_end(bl, SC__SHADOWFORM, INVALID_TIMER);
-				if( s_bl->type == BL_PC )
-					((TBL_PC*)s_bl)->shadowform_id = 0;
-			} else {
-				if( (--sc->data[SC__SHADOWFORM]->val3) < 0 ) { // If you have exceded max hits supported, remove the sc in both.
-					status_change_end(bl, SC__SHADOWFORM, INVALID_TIMER);
-					if( s_bl->type == BL_PC )
-						((TBL_PC*)s_bl)->shadowform_id = 0;
-				} else {
-					status->damage(bl, s_bl, damage, 0, clif->damage(s_bl, s_bl, timer->gettick(), 500, 500, damage, -1, 0, 0), 0);
-					return ATK_NONE;
-				}
-			}
-		}
-
 	}
 
 	//SC effects from caster side.
@@ -5533,7 +5512,13 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
 	}
 	map->freeblock_lock();
 
-	battle->delay_damage(tick, wd.amotion, src, target, wd.flag, 0, 0, damage, wd.dmg_lv, wd.dmotion, true);
+	if( skill->check_shadowform(target, damage, wd.div_) ){
+		if( !status->isdead(target) )
+			skill->additional_effect(src, target, 0, 0, wd.flag, wd.dmg_lv, tick);
+		if( wd.dmg_lv > ATK_BLOCK)
+			skill->counter_additional_effect(src, target, 0, 0, wd.flag,tick);
+	}else
+		battle->delay_damage(tick, wd.amotion, src, target, wd.flag, 0, 0, damage, wd.dmg_lv, wd.dmotion, true);
 	if( tsc ) {
 		if( tsc->data[SC_DEVOTION] ) {
 			struct status_change_entry *sce = tsc->data[SC_DEVOTION];
diff --git a/src/map/skill.c b/src/map/skill.c
index 9db10bbc7..315c5ed61 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1139,12 +1139,12 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
 			sc_start4(bl,SC_BURNING,100,skill_lv,0,src->id,0,skill->get_time2(skill_id,skill_lv));
 			break;
 		case WL_EARTHSTRAIN:
-		{
-			// lv 1 & 2 = Strip Helm, lv 3 = Strip Armor, lv 4 = Strip Weapon and lv 5 = Strip Accessory. [malufett]
-			const int pos[5] = { EQP_HELM, EQP_HELM, EQP_ARMOR, EQP_WEAPON, EQP_ACC };
-			skill->strip_equip(bl, pos[skill_lv], 6 * skill_lv + status->get_lv(src) / 4 + status_get_dex(src) / 10,
-			                   skill_lv, skill->get_time2(skill_id,skill_lv));
-		}
+			{
+				// lv 1 & 2 = Strip Helm, lv 3 = Strip Armor, lv 4 = Strip Weapon and lv 5 = Strip Accessory. [malufett]
+				const int pos[5] = { EQP_HELM, EQP_HELM, EQP_ARMOR, EQP_WEAPON, EQP_ACC };
+				skill->strip_equip(bl, pos[skill_lv-1], 6 * skill_lv + status->get_lv(src) / 4 + status_get_dex(src) / 10,
+					skill_lv, skill->get_time2(skill_id,skill_lv));
+			}
 			break;
 		case WL_JACKFROST:
 			sc_start(bl,SC_FREEZE,100,skill_lv,skill->get_time(skill_id,skill_lv));
@@ -2117,7 +2117,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
 	int type;
 	int64 damage;
 	int8 rmdamage=0;//magic reflected
-	bool additional_effects = true;
+	bool additional_effects = true, shadow_flag = false;
 
 	if(skill_id > 0 && !skill_lv) return 0;
 
@@ -2574,10 +2574,12 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
 		if (ud && DIFF_TICK(ud->attackabletime, tick + type) < 0)
 			ud->attackabletime = tick + type;
 	}
+	
+	shadow_flag = skill->check_shadowform(bl, damage, dmg.div_);
 
 	if( !dmg.amotion ) {
 		//Instant damage
-		if( !sc || (!sc->data[SC_DEVOTION] && skill_id != CR_REFLECTSHIELD) )
+		if( (!sc || (!sc->data[SC_DEVOTION] && skill_id != CR_REFLECTSHIELD)) && !shadow_flag)
 			status_fix_damage(src,bl,damage,dmg.dmotion); //Deal damage before knockback to allow stuff like firewall+storm gust combo.
 		if( !status->isdead(bl) && additional_effects )
 			skill->additional_effect(src,bl,skill_id,skill_lv,dmg.flag,dmg.dmg_lv,tick);
@@ -2657,8 +2659,15 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
 	}
 
 	//Delayed damage must be dealt after the knockback (it needs to know actual position of target)
-	if (dmg.amotion)
-		battle->delay_damage(tick, dmg.amotion,src,bl,dmg.flag,skill_id,skill_lv,damage,dmg.dmg_lv,dmg.dmotion, additional_effects);
+	if (dmg.amotion){
+		if( shadow_flag ){
+			if( !status->isdead(bl) && additional_effects )
+				skill->additional_effect(src,bl,skill_id,skill_lv,dmg.flag,dmg.dmg_lv,tick);
+			if( dmg.flag > ATK_BLOCK )
+				skill->counter_additional_effect(src,bl,skill_id,skill_lv,dmg.flag,tick);
+		}else
+			battle->delay_damage(tick, dmg.amotion,src,bl,dmg.flag,skill_id,skill_lv,damage,dmg.dmg_lv,dmg.dmotion, additional_effects);
+	}
 
 	if( sc && sc->data[SC_DEVOTION] && skill_id != PA_PRESSURE ) {
 		struct status_change_entry *sce = sc->data[SC_DEVOTION];
@@ -3059,8 +3068,23 @@ int skill_timerskill(int tid, unsigned int tick, int id, intptr_t data) {
 				break; // Target not on Map
 			if(src->m != target->m)
 				break; // Different Maps
-			if(status->isdead(src))
-				break; // Caster is Dead
+			if(status->isdead(src)){
+				// Exceptions
+				switch(skl->skill_id){
+					case WL_CHAINLIGHTNING_ATK:
+					case WL_TETRAVORTEX_FIRE:
+					case WL_TETRAVORTEX_WATER:
+					case WL_TETRAVORTEX_WIND:
+					case WL_TETRAVORTEX_GROUND:
+					case SR_FLASHCOMBO_ATK_STEP1:
+					case SR_FLASHCOMBO_ATK_STEP2:
+					case SR_FLASHCOMBO_ATK_STEP3:
+					case SR_FLASHCOMBO_ATK_STEP4:
+						break;
+					default:
+						continue; // Caster is Dead
+				}
+			}
 			if(status->isdead(target) && skl->skill_id != RG_INTIMIDATE && skl->skill_id != WZ_WATERBALL)
 				break;
 
@@ -3134,7 +3158,7 @@ int skill_timerskill(int tid, unsigned int tick, int id, intptr_t data) {
 					if( skl->type == 4 ){ 
 						const enum sc_type scs[] = { SC_BURNING, SC_BLOODING, SC_FROSTMISTY, SC_STUN }; // status inflicts are depend on what summoned element is used.
 						int rate = skl->y, index = skl->x-1;
-						sc_start2(target, scs[index], rate, skl->skill_lv, src->id, skill->get_time(WL_TETRAVORTEX,index));
+						sc_start2(target, scs[index], rate, skl->skill_lv, src->id, skill->get_time(WL_TETRAVORTEX,index+1));
 					}
 					break;
 				case WM_REVERBERATION_MELEE:
@@ -3285,6 +3309,17 @@ int skill_cleartimerskill (struct block_list *src)
 
 	for(i=0;i<MAX_SKILLTIMERSKILL;i++) {
 		if(ud->skilltimerskill[i]) {
+			switch(ud->skilltimerskill[i]->skill_id){
+				case WL_TETRAVORTEX_FIRE:
+				case WL_TETRAVORTEX_WATER:
+				case WL_TETRAVORTEX_WIND:
+				case WL_TETRAVORTEX_GROUND:
+				case SR_FLASHCOMBO_ATK_STEP1:
+				case SR_FLASHCOMBO_ATK_STEP2:
+				case SR_FLASHCOMBO_ATK_STEP3:
+				case SR_FLASHCOMBO_ATK_STEP4:
+					continue;
+			}
 			timer->delete(ud->skilltimerskill[i]->timer, skill->timerskill);
 			ers_free(skill->timer_ers, ud->skilltimerskill[i]);
 			ud->skilltimerskill[i]=NULL;
@@ -15046,6 +15081,39 @@ bool skill_check_camouflage(struct block_list *bl, struct status_change_entry *s
 	return wall;
 }
 
+bool skill_check_shadowform(struct block_list *bl, int64 damage, int hit){
+	struct status_change *sc;
+	struct block_list *src;
+
+	nullpo_retr(false, bl);
+
+	sc = status->get_sc(bl);
+
+	if( sc && sc->data[SC__SHADOWFORM] && damage ) {
+		src = map->id2bl(sc->data[SC__SHADOWFORM]->val2);
+
+		if( !src || src->m != bl->m ) { 
+			status_change_end(bl, SC__SHADOWFORM, INVALID_TIMER);
+			return false;
+		}
+
+		if( src && (status->isdead(src) || !battle->check_target(bl,src,BCT_ENEMY)) ){
+			if( src->type == BL_PC )
+				((TBL_PC*)src)->shadowform_id = 0;
+			status_change_end(bl, SC__SHADOWFORM, INVALID_TIMER);
+			return false;
+		}
+
+		status->damage(bl, src, damage, 0, clif->damage(src, src, timer->gettick(), 500, 500, damage, hit, (hit > 1 ? 8 : 0), 0), 0);
+		if( (--sc->data[SC__SHADOWFORM]->val3) <= 0 ) {
+			status_change_end(bl, SC__SHADOWFORM, INVALID_TIMER);
+			if( src->type == BL_PC )
+				((TBL_PC*)src)->shadowform_id = 0;
+		}
+		return true;
+	}
+	return false;
+}
 /*==========================================
  *
  *------------------------------------------*/
@@ -18291,4 +18359,5 @@ void skill_defaults(void) {
 	skill->cooldown_save = skill_cooldown_save;
 	skill->maelstrom_suction = skill_maelstrom_suction;
 	skill->get_new_group_id = skill_get_new_group_id;
+	skill->check_shadowform = skill_check_shadowform;
 }
diff --git a/src/map/skill.h b/src/map/skill.h
index 0f89cd3be..720865a1f 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -909,7 +909,14 @@ enum e_skill {
 	NPC_VENOMFOG,
 	NPC_MILLENNIUMSHIELD,
 	NPC_COMET,
-	
+	NPC_WIDEWEB,
+	NPC_WIDESUCK,
+	NPC_STORMGUST2,
+	NPC_FIRESTORM,
+	NPC_REVERBERATION,
+	NPC_REVERBERATION_ATK,
+	NPC_LEX_AETERNA,
+
 	KN_CHARGEATK = 1001,
 	CR_SHRINK,
 	AS_SONICACCEL,
@@ -1271,7 +1278,7 @@ enum e_skill {
 	RL_R_TRIP_PLUSATK,
 	RL_B_FLICKER_ATK,
 	RL_GLITTERING_GREED_ATK,
-
+	
 	KO_YAMIKUMO = 3001,
 	KO_RIGHT,
 	KO_LEFT,
@@ -2011,6 +2018,7 @@ struct skill_interface {
 	void (*cooldown_save) (struct map_session_data * sd);
 	int (*maelstrom_suction) (struct block_list *bl, va_list ap);
 	int (*get_new_group_id) (void);
+	bool (*check_shadowform) (struct block_list *bl, int64 damage, int hit);
 };
 
 struct skill_interface *skill;
diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
index d26779ccb..03534821e 100644
--- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
@@ -4511,6 +4511,8 @@ struct {
 	struct HPMHookPoint *HP_skill_maelstrom_suction_post;
 	struct HPMHookPoint *HP_skill_get_new_group_id_pre;
 	struct HPMHookPoint *HP_skill_get_new_group_id_post;
+	struct HPMHookPoint *HP_skill_check_shadowform_pre;
+	struct HPMHookPoint *HP_skill_check_shadowform_post;
 	struct HPMHookPoint *HP_status_init_pre;
 	struct HPMHookPoint *HP_status_init_post;
 	struct HPMHookPoint *HP_status_final_pre;
@@ -9388,6 +9390,8 @@ struct {
 	int HP_skill_maelstrom_suction_post;
 	int HP_skill_get_new_group_id_pre;
 	int HP_skill_get_new_group_id_post;
+	int HP_skill_check_shadowform_pre;
+	int HP_skill_check_shadowform_post;
 	int HP_status_init_pre;
 	int HP_status_init_post;
 	int HP_status_final_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
index 310618cef..dcd283641 100644
--- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
@@ -6,2479 +6,2480 @@
 
 struct HookingPointData HookingPoints[] = {
 /* atcommand */
-	{ HP_POP(atcommand->init), HP_POP2(HP_atcommand_init), 0 },
-	{ HP_POP(atcommand->final), HP_POP2(HP_atcommand_final), 2 },
-	{ HP_POP(atcommand->parse), HP_POP2(HP_atcommand_parse), 4 },
-	{ HP_POP(atcommand->create), HP_POP2(HP_atcommand_create), 6 },
-	{ HP_POP(atcommand->can_use), HP_POP2(HP_atcommand_can_use), 8 },
-	{ HP_POP(atcommand->can_use2), HP_POP2(HP_atcommand_can_use2), 10 },
-	{ HP_POP(atcommand->load_groups), HP_POP2(HP_atcommand_load_groups), 12 },
-	{ HP_POP(atcommand->exists), HP_POP2(HP_atcommand_exists), 14 },
-	{ HP_POP(atcommand->msg_read), HP_POP2(HP_atcommand_msg_read), 16 },
-	{ HP_POP(atcommand->final_msg), HP_POP2(HP_atcommand_final_msg), 18 },
-	{ HP_POP(atcommand->get_bind_byname), HP_POP2(HP_atcommand_get_bind_byname), 20 },
-	{ HP_POP(atcommand->get_info_byname), HP_POP2(HP_atcommand_get_info_byname), 22 },
-	{ HP_POP(atcommand->check_alias), HP_POP2(HP_atcommand_check_alias), 24 },
-	{ HP_POP(atcommand->get_suggestions), HP_POP2(HP_atcommand_get_suggestions), 26 },
-	{ HP_POP(atcommand->config_read), HP_POP2(HP_atcommand_config_read), 28 },
-	{ HP_POP(atcommand->stopattack), HP_POP2(HP_atcommand_stopattack), 30 },
-	{ HP_POP(atcommand->pvpoff_sub), HP_POP2(HP_atcommand_pvpoff_sub), 32 },
-	{ HP_POP(atcommand->pvpon_sub), HP_POP2(HP_atcommand_pvpon_sub), 34 },
-	{ HP_POP(atcommand->atkillmonster_sub), HP_POP2(HP_atcommand_atkillmonster_sub), 36 },
-	{ HP_POP(atcommand->raise_sub), HP_POP2(HP_atcommand_raise_sub), 38 },
-	{ HP_POP(atcommand->get_jail_time), HP_POP2(HP_atcommand_get_jail_time), 40 },
-	{ HP_POP(atcommand->cleanfloor_sub), HP_POP2(HP_atcommand_cleanfloor_sub), 42 },
-	{ HP_POP(atcommand->mutearea_sub), HP_POP2(HP_atcommand_mutearea_sub), 44 },
-	{ HP_POP(atcommand->commands_sub), HP_POP2(HP_atcommand_commands_sub), 46 },
-	{ HP_POP(atcommand->cmd_db_clear), HP_POP2(HP_atcommand_cmd_db_clear), 48 },
-	{ HP_POP(atcommand->cmd_db_clear_sub), HP_POP2(HP_atcommand_cmd_db_clear_sub), 50 },
-	{ HP_POP(atcommand->doload), HP_POP2(HP_atcommand_doload), 52 },
-	{ HP_POP(atcommand->base_commands), HP_POP2(HP_atcommand_base_commands), 54 },
+	{ HP_POP(atcommand->init, HP_atcommand_init) },
+	{ HP_POP(atcommand->final, HP_atcommand_final) },
+	{ HP_POP(atcommand->parse, HP_atcommand_parse) },
+	{ HP_POP(atcommand->create, HP_atcommand_create) },
+	{ HP_POP(atcommand->can_use, HP_atcommand_can_use) },
+	{ HP_POP(atcommand->can_use2, HP_atcommand_can_use2) },
+	{ HP_POP(atcommand->load_groups, HP_atcommand_load_groups) },
+	{ HP_POP(atcommand->exists, HP_atcommand_exists) },
+	{ HP_POP(atcommand->msg_read, HP_atcommand_msg_read) },
+	{ HP_POP(atcommand->final_msg, HP_atcommand_final_msg) },
+	{ HP_POP(atcommand->get_bind_byname, HP_atcommand_get_bind_byname) },
+	{ HP_POP(atcommand->get_info_byname, HP_atcommand_get_info_byname) },
+	{ HP_POP(atcommand->check_alias, HP_atcommand_check_alias) },
+	{ HP_POP(atcommand->get_suggestions, HP_atcommand_get_suggestions) },
+	{ HP_POP(atcommand->config_read, HP_atcommand_config_read) },
+	{ HP_POP(atcommand->stopattack, HP_atcommand_stopattack) },
+	{ HP_POP(atcommand->pvpoff_sub, HP_atcommand_pvpoff_sub) },
+	{ HP_POP(atcommand->pvpon_sub, HP_atcommand_pvpon_sub) },
+	{ HP_POP(atcommand->atkillmonster_sub, HP_atcommand_atkillmonster_sub) },
+	{ HP_POP(atcommand->raise_sub, HP_atcommand_raise_sub) },
+	{ HP_POP(atcommand->get_jail_time, HP_atcommand_get_jail_time) },
+	{ HP_POP(atcommand->cleanfloor_sub, HP_atcommand_cleanfloor_sub) },
+	{ HP_POP(atcommand->mutearea_sub, HP_atcommand_mutearea_sub) },
+	{ HP_POP(atcommand->commands_sub, HP_atcommand_commands_sub) },
+	{ HP_POP(atcommand->cmd_db_clear, HP_atcommand_cmd_db_clear) },
+	{ HP_POP(atcommand->cmd_db_clear_sub, HP_atcommand_cmd_db_clear_sub) },
+	{ HP_POP(atcommand->doload, HP_atcommand_doload) },
+	{ HP_POP(atcommand->base_commands, HP_atcommand_base_commands) },
 /* battle */
-	{ HP_POP(battle->init), HP_POP2(HP_battle_init), 56 },
-	{ HP_POP(battle->final), HP_POP2(HP_battle_final), 58 },
-	{ HP_POP(battle->calc_attack), HP_POP2(HP_battle_calc_attack), 60 },
-	{ HP_POP(battle->calc_damage), HP_POP2(HP_battle_calc_damage), 62 },
-	{ HP_POP(battle->calc_gvg_damage), HP_POP2(HP_battle_calc_gvg_damage), 64 },
-	{ HP_POP(battle->calc_bg_damage), HP_POP2(HP_battle_calc_bg_damage), 66 },
-	{ HP_POP(battle->weapon_attack), HP_POP2(HP_battle_weapon_attack), 68 },
-	{ HP_POP(battle->calc_weapon_attack), HP_POP2(HP_battle_calc_weapon_attack), 70 },
-	{ HP_POP(battle->delay_damage), HP_POP2(HP_battle_delay_damage), 72 },
-	{ HP_POP(battle->drain), HP_POP2(HP_battle_drain), 74 },
-	{ HP_POP(battle->calc_return_damage), HP_POP2(HP_battle_calc_return_damage), 76 },
-	{ HP_POP(battle->attr_ratio), HP_POP2(HP_battle_attr_ratio), 78 },
-	{ HP_POP(battle->attr_fix), HP_POP2(HP_battle_attr_fix), 80 },
-	{ HP_POP(battle->calc_cardfix), HP_POP2(HP_battle_calc_cardfix), 82 },
-	{ HP_POP(battle->calc_elefix), HP_POP2(HP_battle_calc_elefix), 84 },
-	{ HP_POP(battle->calc_masteryfix), HP_POP2(HP_battle_calc_masteryfix), 86 },
-	{ HP_POP(battle->calc_skillratio), HP_POP2(HP_battle_calc_skillratio), 88 },
-	{ HP_POP(battle->calc_sizefix), HP_POP2(HP_battle_calc_sizefix), 90 },
-	{ HP_POP(battle->calc_weapon_damage), HP_POP2(HP_battle_calc_weapon_damage), 92 },
-	{ HP_POP(battle->calc_defense), HP_POP2(HP_battle_calc_defense), 94 },
-	{ HP_POP(battle->get_master), HP_POP2(HP_battle_get_master), 96 },
-	{ HP_POP(battle->get_targeted), HP_POP2(HP_battle_get_targeted), 98 },
-	{ HP_POP(battle->get_enemy), HP_POP2(HP_battle_get_enemy), 100 },
-	{ HP_POP(battle->get_target), HP_POP2(HP_battle_get_target), 102 },
-	{ HP_POP(battle->get_current_skill), HP_POP2(HP_battle_get_current_skill), 104 },
-	{ HP_POP(battle->check_undead), HP_POP2(HP_battle_check_undead), 106 },
-	{ HP_POP(battle->check_target), HP_POP2(HP_battle_check_target), 108 },
-	{ HP_POP(battle->check_range), HP_POP2(HP_battle_check_range), 110 },
-	{ HP_POP(battle->consume_ammo), HP_POP2(HP_battle_consume_ammo), 112 },
-	{ HP_POP(battle->get_targeted_sub), HP_POP2(HP_battle_get_targeted_sub), 114 },
-	{ HP_POP(battle->get_enemy_sub), HP_POP2(HP_battle_get_enemy_sub), 116 },
-	{ HP_POP(battle->get_enemy_area_sub), HP_POP2(HP_battle_get_enemy_area_sub), 118 },
-	{ HP_POP(battle->delay_damage_sub), HP_POP2(HP_battle_delay_damage_sub), 120 },
-	{ HP_POP(battle->blewcount_bonus), HP_POP2(HP_battle_blewcount_bonus), 122 },
-	{ HP_POP(battle->range_type), HP_POP2(HP_battle_range_type), 124 },
-	{ HP_POP(battle->calc_base_damage), HP_POP2(HP_battle_calc_base_damage), 126 },
-	{ HP_POP(battle->calc_base_damage2), HP_POP2(HP_battle_calc_base_damage2), 128 },
-	{ HP_POP(battle->calc_misc_attack), HP_POP2(HP_battle_calc_misc_attack), 130 },
-	{ HP_POP(battle->calc_magic_attack), HP_POP2(HP_battle_calc_magic_attack), 132 },
-	{ HP_POP(battle->adjust_skill_damage), HP_POP2(HP_battle_adjust_skill_damage), 134 },
-	{ HP_POP(battle->add_mastery), HP_POP2(HP_battle_add_mastery), 136 },
-	{ HP_POP(battle->calc_drain), HP_POP2(HP_battle_calc_drain), 138 },
-	{ HP_POP(battle->config_read), HP_POP2(HP_battle_config_read), 140 },
-	{ HP_POP(battle->config_set_defaults), HP_POP2(HP_battle_config_set_defaults), 142 },
-	{ HP_POP(battle->config_set_value), HP_POP2(HP_battle_config_set_value), 144 },
-	{ HP_POP(battle->config_get_value), HP_POP2(HP_battle_config_get_value), 146 },
-	{ HP_POP(battle->config_adjust), HP_POP2(HP_battle_config_adjust), 148 },
-	{ HP_POP(battle->get_enemy_area), HP_POP2(HP_battle_get_enemy_area), 150 },
-	{ HP_POP(battle->damage_area), HP_POP2(HP_battle_damage_area), 152 },
+	{ HP_POP(battle->init, HP_battle_init) },
+	{ HP_POP(battle->final, HP_battle_final) },
+	{ HP_POP(battle->calc_attack, HP_battle_calc_attack) },
+	{ HP_POP(battle->calc_damage, HP_battle_calc_damage) },
+	{ HP_POP(battle->calc_gvg_damage, HP_battle_calc_gvg_damage) },
+	{ HP_POP(battle->calc_bg_damage, HP_battle_calc_bg_damage) },
+	{ HP_POP(battle->weapon_attack, HP_battle_weapon_attack) },
+	{ HP_POP(battle->calc_weapon_attack, HP_battle_calc_weapon_attack) },
+	{ HP_POP(battle->delay_damage, HP_battle_delay_damage) },
+	{ HP_POP(battle->drain, HP_battle_drain) },
+	{ HP_POP(battle->calc_return_damage, HP_battle_calc_return_damage) },
+	{ HP_POP(battle->attr_ratio, HP_battle_attr_ratio) },
+	{ HP_POP(battle->attr_fix, HP_battle_attr_fix) },
+	{ HP_POP(battle->calc_cardfix, HP_battle_calc_cardfix) },
+	{ HP_POP(battle->calc_elefix, HP_battle_calc_elefix) },
+	{ HP_POP(battle->calc_masteryfix, HP_battle_calc_masteryfix) },
+	{ HP_POP(battle->calc_skillratio, HP_battle_calc_skillratio) },
+	{ HP_POP(battle->calc_sizefix, HP_battle_calc_sizefix) },
+	{ HP_POP(battle->calc_weapon_damage, HP_battle_calc_weapon_damage) },
+	{ HP_POP(battle->calc_defense, HP_battle_calc_defense) },
+	{ HP_POP(battle->get_master, HP_battle_get_master) },
+	{ HP_POP(battle->get_targeted, HP_battle_get_targeted) },
+	{ HP_POP(battle->get_enemy, HP_battle_get_enemy) },
+	{ HP_POP(battle->get_target, HP_battle_get_target) },
+	{ HP_POP(battle->get_current_skill, HP_battle_get_current_skill) },
+	{ HP_POP(battle->check_undead, HP_battle_check_undead) },
+	{ HP_POP(battle->check_target, HP_battle_check_target) },
+	{ HP_POP(battle->check_range, HP_battle_check_range) },
+	{ HP_POP(battle->consume_ammo, HP_battle_consume_ammo) },
+	{ HP_POP(battle->get_targeted_sub, HP_battle_get_targeted_sub) },
+	{ HP_POP(battle->get_enemy_sub, HP_battle_get_enemy_sub) },
+	{ HP_POP(battle->get_enemy_area_sub, HP_battle_get_enemy_area_sub) },
+	{ HP_POP(battle->delay_damage_sub, HP_battle_delay_damage_sub) },
+	{ HP_POP(battle->blewcount_bonus, HP_battle_blewcount_bonus) },
+	{ HP_POP(battle->range_type, HP_battle_range_type) },
+	{ HP_POP(battle->calc_base_damage, HP_battle_calc_base_damage) },
+	{ HP_POP(battle->calc_base_damage2, HP_battle_calc_base_damage2) },
+	{ HP_POP(battle->calc_misc_attack, HP_battle_calc_misc_attack) },
+	{ HP_POP(battle->calc_magic_attack, HP_battle_calc_magic_attack) },
+	{ HP_POP(battle->adjust_skill_damage, HP_battle_adjust_skill_damage) },
+	{ HP_POP(battle->add_mastery, HP_battle_add_mastery) },
+	{ HP_POP(battle->calc_drain, HP_battle_calc_drain) },
+	{ HP_POP(battle->config_read, HP_battle_config_read) },
+	{ HP_POP(battle->config_set_defaults, HP_battle_config_set_defaults) },
+	{ HP_POP(battle->config_set_value, HP_battle_config_set_value) },
+	{ HP_POP(battle->config_get_value, HP_battle_config_get_value) },
+	{ HP_POP(battle->config_adjust, HP_battle_config_adjust) },
+	{ HP_POP(battle->get_enemy_area, HP_battle_get_enemy_area) },
+	{ HP_POP(battle->damage_area, HP_battle_damage_area) },
 /* bg */
-	{ HP_POP(bg->init), HP_POP2(HP_bg_init), 154 },
-	{ HP_POP(bg->final), HP_POP2(HP_bg_final), 156 },
-	{ HP_POP(bg->name2arena), HP_POP2(HP_bg_name2arena), 158 },
-	{ HP_POP(bg->queue_add), HP_POP2(HP_bg_queue_add), 160 },
-	{ HP_POP(bg->can_queue), HP_POP2(HP_bg_can_queue), 162 },
-	{ HP_POP(bg->id2pos), HP_POP2(HP_bg_id2pos), 164 },
-	{ HP_POP(bg->queue_pc_cleanup), HP_POP2(HP_bg_queue_pc_cleanup), 166 },
-	{ HP_POP(bg->begin), HP_POP2(HP_bg_begin), 168 },
-	{ HP_POP(bg->begin_timer), HP_POP2(HP_bg_begin_timer), 170 },
-	{ HP_POP(bg->queue_pregame), HP_POP2(HP_bg_queue_pregame), 172 },
-	{ HP_POP(bg->fillup_timer), HP_POP2(HP_bg_fillup_timer), 174 },
-	{ HP_POP(bg->queue_ready_ack), HP_POP2(HP_bg_queue_ready_ack), 176 },
-	{ HP_POP(bg->match_over), HP_POP2(HP_bg_match_over), 178 },
-	{ HP_POP(bg->queue_check), HP_POP2(HP_bg_queue_check), 180 },
-	{ HP_POP(bg->team_search), HP_POP2(HP_bg_team_search), 182 },
-	{ HP_POP(bg->getavailablesd), HP_POP2(HP_bg_getavailablesd), 184 },
-	{ HP_POP(bg->team_delete), HP_POP2(HP_bg_team_delete), 186 },
-	{ HP_POP(bg->team_warp), HP_POP2(HP_bg_team_warp), 188 },
-	{ HP_POP(bg->send_dot_remove), HP_POP2(HP_bg_send_dot_remove), 190 },
-	{ HP_POP(bg->team_join), HP_POP2(HP_bg_team_join), 192 },
-	{ HP_POP(bg->team_leave), HP_POP2(HP_bg_team_leave), 194 },
-	{ HP_POP(bg->member_respawn), HP_POP2(HP_bg_member_respawn), 196 },
-	{ HP_POP(bg->create), HP_POP2(HP_bg_create), 198 },
-	{ HP_POP(bg->team_get_id), HP_POP2(HP_bg_team_get_id), 200 },
-	{ HP_POP(bg->send_message), HP_POP2(HP_bg_send_message), 202 },
-	{ HP_POP(bg->send_xy_timer_sub), HP_POP2(HP_bg_send_xy_timer_sub), 204 },
-	{ HP_POP(bg->send_xy_timer), HP_POP2(HP_bg_send_xy_timer), 206 },
-	{ HP_POP(bg->config_read), HP_POP2(HP_bg_config_read), 208 },
+	{ HP_POP(bg->init, HP_bg_init) },
+	{ HP_POP(bg->final, HP_bg_final) },
+	{ HP_POP(bg->name2arena, HP_bg_name2arena) },
+	{ HP_POP(bg->queue_add, HP_bg_queue_add) },
+	{ HP_POP(bg->can_queue, HP_bg_can_queue) },
+	{ HP_POP(bg->id2pos, HP_bg_id2pos) },
+	{ HP_POP(bg->queue_pc_cleanup, HP_bg_queue_pc_cleanup) },
+	{ HP_POP(bg->begin, HP_bg_begin) },
+	{ HP_POP(bg->begin_timer, HP_bg_begin_timer) },
+	{ HP_POP(bg->queue_pregame, HP_bg_queue_pregame) },
+	{ HP_POP(bg->fillup_timer, HP_bg_fillup_timer) },
+	{ HP_POP(bg->queue_ready_ack, HP_bg_queue_ready_ack) },
+	{ HP_POP(bg->match_over, HP_bg_match_over) },
+	{ HP_POP(bg->queue_check, HP_bg_queue_check) },
+	{ HP_POP(bg->team_search, HP_bg_team_search) },
+	{ HP_POP(bg->getavailablesd, HP_bg_getavailablesd) },
+	{ HP_POP(bg->team_delete, HP_bg_team_delete) },
+	{ HP_POP(bg->team_warp, HP_bg_team_warp) },
+	{ HP_POP(bg->send_dot_remove, HP_bg_send_dot_remove) },
+	{ HP_POP(bg->team_join, HP_bg_team_join) },
+	{ HP_POP(bg->team_leave, HP_bg_team_leave) },
+	{ HP_POP(bg->member_respawn, HP_bg_member_respawn) },
+	{ HP_POP(bg->create, HP_bg_create) },
+	{ HP_POP(bg->team_get_id, HP_bg_team_get_id) },
+	{ HP_POP(bg->send_message, HP_bg_send_message) },
+	{ HP_POP(bg->send_xy_timer_sub, HP_bg_send_xy_timer_sub) },
+	{ HP_POP(bg->send_xy_timer, HP_bg_send_xy_timer) },
+	{ HP_POP(bg->config_read, HP_bg_config_read) },
 /* buyingstore */
-	{ HP_POP(buyingstore->setup), HP_POP2(HP_buyingstore_setup), 210 },
-	{ HP_POP(buyingstore->create), HP_POP2(HP_buyingstore_create), 212 },
-	{ HP_POP(buyingstore->close), HP_POP2(HP_buyingstore_close), 214 },
-	{ HP_POP(buyingstore->open), HP_POP2(HP_buyingstore_open), 216 },
-	{ HP_POP(buyingstore->trade), HP_POP2(HP_buyingstore_trade), 218 },
-	{ HP_POP(buyingstore->search), HP_POP2(HP_buyingstore_search), 220 },
-	{ HP_POP(buyingstore->searchall), HP_POP2(HP_buyingstore_searchall), 222 },
-	{ HP_POP(buyingstore->getuid), HP_POP2(HP_buyingstore_getuid), 224 },
+	{ HP_POP(buyingstore->setup, HP_buyingstore_setup) },
+	{ HP_POP(buyingstore->create, HP_buyingstore_create) },
+	{ HP_POP(buyingstore->close, HP_buyingstore_close) },
+	{ HP_POP(buyingstore->open, HP_buyingstore_open) },
+	{ HP_POP(buyingstore->trade, HP_buyingstore_trade) },
+	{ HP_POP(buyingstore->search, HP_buyingstore_search) },
+	{ HP_POP(buyingstore->searchall, HP_buyingstore_searchall) },
+	{ HP_POP(buyingstore->getuid, HP_buyingstore_getuid) },
 /* chat */
-	{ HP_POP(chat->create_pc_chat), HP_POP2(HP_chat_create_pc_chat), 226 },
-	{ HP_POP(chat->join), HP_POP2(HP_chat_join), 228 },
-	{ HP_POP(chat->leave), HP_POP2(HP_chat_leave), 230 },
-	{ HP_POP(chat->change_owner), HP_POP2(HP_chat_change_owner), 232 },
-	{ HP_POP(chat->change_status), HP_POP2(HP_chat_change_status), 234 },
-	{ HP_POP(chat->kick), HP_POP2(HP_chat_kick), 236 },
-	{ HP_POP(chat->create_npc_chat), HP_POP2(HP_chat_create_npc_chat), 238 },
-	{ HP_POP(chat->delete_npc_chat), HP_POP2(HP_chat_delete_npc_chat), 240 },
-	{ HP_POP(chat->enable_event), HP_POP2(HP_chat_enable_event), 242 },
-	{ HP_POP(chat->disable_event), HP_POP2(HP_chat_disable_event), 244 },
-	{ HP_POP(chat->npc_kick_all), HP_POP2(HP_chat_npc_kick_all), 246 },
-	{ HP_POP(chat->trigger_event), HP_POP2(HP_chat_trigger_event), 248 },
-	{ HP_POP(chat->create), HP_POP2(HP_chat_create), 250 },
+	{ HP_POP(chat->create_pc_chat, HP_chat_create_pc_chat) },
+	{ HP_POP(chat->join, HP_chat_join) },
+	{ HP_POP(chat->leave, HP_chat_leave) },
+	{ HP_POP(chat->change_owner, HP_chat_change_owner) },
+	{ HP_POP(chat->change_status, HP_chat_change_status) },
+	{ HP_POP(chat->kick, HP_chat_kick) },
+	{ HP_POP(chat->create_npc_chat, HP_chat_create_npc_chat) },
+	{ HP_POP(chat->delete_npc_chat, HP_chat_delete_npc_chat) },
+	{ HP_POP(chat->enable_event, HP_chat_enable_event) },
+	{ HP_POP(chat->disable_event, HP_chat_disable_event) },
+	{ HP_POP(chat->npc_kick_all, HP_chat_npc_kick_all) },
+	{ HP_POP(chat->trigger_event, HP_chat_trigger_event) },
+	{ HP_POP(chat->create, HP_chat_create) },
 /* chrif */
-	{ HP_POP(chrif->final), HP_POP2(HP_chrif_final), 252 },
-	{ HP_POP(chrif->init), HP_POP2(HP_chrif_init), 254 },
-	{ HP_POP(chrif->setuserid), HP_POP2(HP_chrif_setuserid), 256 },
-	{ HP_POP(chrif->setpasswd), HP_POP2(HP_chrif_setpasswd), 258 },
-	{ HP_POP(chrif->checkdefaultlogin), HP_POP2(HP_chrif_checkdefaultlogin), 260 },
-	{ HP_POP(chrif->setip), HP_POP2(HP_chrif_setip), 262 },
-	{ HP_POP(chrif->setport), HP_POP2(HP_chrif_setport), 264 },
-	{ HP_POP(chrif->isconnected), HP_POP2(HP_chrif_isconnected), 266 },
-	{ HP_POP(chrif->check_shutdown), HP_POP2(HP_chrif_check_shutdown), 268 },
-	{ HP_POP(chrif->search), HP_POP2(HP_chrif_search), 270 },
-	{ HP_POP(chrif->auth_check), HP_POP2(HP_chrif_auth_check), 272 },
-	{ HP_POP(chrif->auth_delete), HP_POP2(HP_chrif_auth_delete), 274 },
-	{ HP_POP(chrif->auth_finished), HP_POP2(HP_chrif_auth_finished), 276 },
-	{ HP_POP(chrif->authreq), HP_POP2(HP_chrif_authreq), 278 },
-	{ HP_POP(chrif->authok), HP_POP2(HP_chrif_authok), 280 },
-	{ HP_POP(chrif->scdata_request), HP_POP2(HP_chrif_scdata_request), 282 },
-	{ HP_POP(chrif->save), HP_POP2(HP_chrif_save), 284 },
-	{ HP_POP(chrif->charselectreq), HP_POP2(HP_chrif_charselectreq), 286 },
-	{ HP_POP(chrif->changemapserver), HP_POP2(HP_chrif_changemapserver), 288 },
-	{ HP_POP(chrif->searchcharid), HP_POP2(HP_chrif_searchcharid), 290 },
-	{ HP_POP(chrif->changeemail), HP_POP2(HP_chrif_changeemail), 292 },
-	{ HP_POP(chrif->char_ask_name), HP_POP2(HP_chrif_char_ask_name), 294 },
-	{ HP_POP(chrif->updatefamelist), HP_POP2(HP_chrif_updatefamelist), 296 },
-	{ HP_POP(chrif->buildfamelist), HP_POP2(HP_chrif_buildfamelist), 298 },
-	{ HP_POP(chrif->save_scdata), HP_POP2(HP_chrif_save_scdata), 300 },
-	{ HP_POP(chrif->ragsrvinfo), HP_POP2(HP_chrif_ragsrvinfo), 302 },
-	{ HP_POP(chrif->char_offline), HP_POP2(HP_chrif_char_offline), 304 },
-	{ HP_POP(chrif->char_offline_nsd), HP_POP2(HP_chrif_char_offline_nsd), 306 },
-	{ HP_POP(chrif->char_reset_offline), HP_POP2(HP_chrif_char_reset_offline), 308 },
-	{ HP_POP(chrif->send_users_tochar), HP_POP2(HP_chrif_send_users_tochar), 310 },
-	{ HP_POP(chrif->char_online), HP_POP2(HP_chrif_char_online), 312 },
-	{ HP_POP(chrif->changesex), HP_POP2(HP_chrif_changesex), 314 },
-	{ HP_POP(chrif->divorce), HP_POP2(HP_chrif_divorce), 316 },
-	{ HP_POP(chrif->removefriend), HP_POP2(HP_chrif_removefriend), 318 },
-	{ HP_POP(chrif->send_report), HP_POP2(HP_chrif_send_report), 320 },
-	{ HP_POP(chrif->flush_fifo), HP_POP2(HP_chrif_flush_fifo), 322 },
-	{ HP_POP(chrif->skillid2idx), HP_POP2(HP_chrif_skillid2idx), 324 },
-	{ HP_POP(chrif->sd_to_auth), HP_POP2(HP_chrif_sd_to_auth), 326 },
-	{ HP_POP(chrif->check_connect_char_server), HP_POP2(HP_chrif_check_connect_char_server), 328 },
-	{ HP_POP(chrif->auth_logout), HP_POP2(HP_chrif_auth_logout), 330 },
-	{ HP_POP(chrif->save_ack), HP_POP2(HP_chrif_save_ack), 332 },
-	{ HP_POP(chrif->reconnect), HP_POP2(HP_chrif_reconnect), 334 },
-	{ HP_POP(chrif->auth_db_cleanup_sub), HP_POP2(HP_chrif_auth_db_cleanup_sub), 336 },
-	{ HP_POP(chrif->char_ask_name_answer), HP_POP2(HP_chrif_char_ask_name_answer), 338 },
-	{ HP_POP(chrif->auth_db_final), HP_POP2(HP_chrif_auth_db_final), 340 },
-	{ HP_POP(chrif->send_usercount_tochar), HP_POP2(HP_chrif_send_usercount_tochar), 342 },
-	{ HP_POP(chrif->auth_db_cleanup), HP_POP2(HP_chrif_auth_db_cleanup), 344 },
-	{ HP_POP(chrif->connect), HP_POP2(HP_chrif_connect), 346 },
-	{ HP_POP(chrif->connectack), HP_POP2(HP_chrif_connectack), 348 },
-	{ HP_POP(chrif->sendmap), HP_POP2(HP_chrif_sendmap), 350 },
-	{ HP_POP(chrif->sendmapack), HP_POP2(HP_chrif_sendmapack), 352 },
-	{ HP_POP(chrif->recvmap), HP_POP2(HP_chrif_recvmap), 354 },
-	{ HP_POP(chrif->changemapserverack), HP_POP2(HP_chrif_changemapserverack), 356 },
-	{ HP_POP(chrif->changedsex), HP_POP2(HP_chrif_changedsex), 358 },
-	{ HP_POP(chrif->divorceack), HP_POP2(HP_chrif_divorceack), 360 },
-	{ HP_POP(chrif->accountban), HP_POP2(HP_chrif_accountban), 362 },
-	{ HP_POP(chrif->recvfamelist), HP_POP2(HP_chrif_recvfamelist), 364 },
-	{ HP_POP(chrif->load_scdata), HP_POP2(HP_chrif_load_scdata), 366 },
-	{ HP_POP(chrif->update_ip), HP_POP2(HP_chrif_update_ip), 368 },
-	{ HP_POP(chrif->disconnectplayer), HP_POP2(HP_chrif_disconnectplayer), 370 },
-	{ HP_POP(chrif->removemap), HP_POP2(HP_chrif_removemap), 372 },
-	{ HP_POP(chrif->updatefamelist_ack), HP_POP2(HP_chrif_updatefamelist_ack), 374 },
-	{ HP_POP(chrif->keepalive), HP_POP2(HP_chrif_keepalive), 376 },
-	{ HP_POP(chrif->keepalive_ack), HP_POP2(HP_chrif_keepalive_ack), 378 },
-	{ HP_POP(chrif->deadopt), HP_POP2(HP_chrif_deadopt), 380 },
-	{ HP_POP(chrif->authfail), HP_POP2(HP_chrif_authfail), 382 },
-	{ HP_POP(chrif->on_ready), HP_POP2(HP_chrif_on_ready), 384 },
-	{ HP_POP(chrif->on_disconnect), HP_POP2(HP_chrif_on_disconnect), 386 },
-	{ HP_POP(chrif->parse), HP_POP2(HP_chrif_parse), 388 },
+	{ HP_POP(chrif->final, HP_chrif_final) },
+	{ HP_POP(chrif->init, HP_chrif_init) },
+	{ HP_POP(chrif->setuserid, HP_chrif_setuserid) },
+	{ HP_POP(chrif->setpasswd, HP_chrif_setpasswd) },
+	{ HP_POP(chrif->checkdefaultlogin, HP_chrif_checkdefaultlogin) },
+	{ HP_POP(chrif->setip, HP_chrif_setip) },
+	{ HP_POP(chrif->setport, HP_chrif_setport) },
+	{ HP_POP(chrif->isconnected, HP_chrif_isconnected) },
+	{ HP_POP(chrif->check_shutdown, HP_chrif_check_shutdown) },
+	{ HP_POP(chrif->search, HP_chrif_search) },
+	{ HP_POP(chrif->auth_check, HP_chrif_auth_check) },
+	{ HP_POP(chrif->auth_delete, HP_chrif_auth_delete) },
+	{ HP_POP(chrif->auth_finished, HP_chrif_auth_finished) },
+	{ HP_POP(chrif->authreq, HP_chrif_authreq) },
+	{ HP_POP(chrif->authok, HP_chrif_authok) },
+	{ HP_POP(chrif->scdata_request, HP_chrif_scdata_request) },
+	{ HP_POP(chrif->save, HP_chrif_save) },
+	{ HP_POP(chrif->charselectreq, HP_chrif_charselectreq) },
+	{ HP_POP(chrif->changemapserver, HP_chrif_changemapserver) },
+	{ HP_POP(chrif->searchcharid, HP_chrif_searchcharid) },
+	{ HP_POP(chrif->changeemail, HP_chrif_changeemail) },
+	{ HP_POP(chrif->char_ask_name, HP_chrif_char_ask_name) },
+	{ HP_POP(chrif->updatefamelist, HP_chrif_updatefamelist) },
+	{ HP_POP(chrif->buildfamelist, HP_chrif_buildfamelist) },
+	{ HP_POP(chrif->save_scdata, HP_chrif_save_scdata) },
+	{ HP_POP(chrif->ragsrvinfo, HP_chrif_ragsrvinfo) },
+	{ HP_POP(chrif->char_offline, HP_chrif_char_offline) },
+	{ HP_POP(chrif->char_offline_nsd, HP_chrif_char_offline_nsd) },
+	{ HP_POP(chrif->char_reset_offline, HP_chrif_char_reset_offline) },
+	{ HP_POP(chrif->send_users_tochar, HP_chrif_send_users_tochar) },
+	{ HP_POP(chrif->char_online, HP_chrif_char_online) },
+	{ HP_POP(chrif->changesex, HP_chrif_changesex) },
+	{ HP_POP(chrif->divorce, HP_chrif_divorce) },
+	{ HP_POP(chrif->removefriend, HP_chrif_removefriend) },
+	{ HP_POP(chrif->send_report, HP_chrif_send_report) },
+	{ HP_POP(chrif->flush_fifo, HP_chrif_flush_fifo) },
+	{ HP_POP(chrif->skillid2idx, HP_chrif_skillid2idx) },
+	{ HP_POP(chrif->sd_to_auth, HP_chrif_sd_to_auth) },
+	{ HP_POP(chrif->check_connect_char_server, HP_chrif_check_connect_char_server) },
+	{ HP_POP(chrif->auth_logout, HP_chrif_auth_logout) },
+	{ HP_POP(chrif->save_ack, HP_chrif_save_ack) },
+	{ HP_POP(chrif->reconnect, HP_chrif_reconnect) },
+	{ HP_POP(chrif->auth_db_cleanup_sub, HP_chrif_auth_db_cleanup_sub) },
+	{ HP_POP(chrif->char_ask_name_answer, HP_chrif_char_ask_name_answer) },
+	{ HP_POP(chrif->auth_db_final, HP_chrif_auth_db_final) },
+	{ HP_POP(chrif->send_usercount_tochar, HP_chrif_send_usercount_tochar) },
+	{ HP_POP(chrif->auth_db_cleanup, HP_chrif_auth_db_cleanup) },
+	{ HP_POP(chrif->connect, HP_chrif_connect) },
+	{ HP_POP(chrif->connectack, HP_chrif_connectack) },
+	{ HP_POP(chrif->sendmap, HP_chrif_sendmap) },
+	{ HP_POP(chrif->sendmapack, HP_chrif_sendmapack) },
+	{ HP_POP(chrif->recvmap, HP_chrif_recvmap) },
+	{ HP_POP(chrif->changemapserverack, HP_chrif_changemapserverack) },
+	{ HP_POP(chrif->changedsex, HP_chrif_changedsex) },
+	{ HP_POP(chrif->divorceack, HP_chrif_divorceack) },
+	{ HP_POP(chrif->accountban, HP_chrif_accountban) },
+	{ HP_POP(chrif->recvfamelist, HP_chrif_recvfamelist) },
+	{ HP_POP(chrif->load_scdata, HP_chrif_load_scdata) },
+	{ HP_POP(chrif->update_ip, HP_chrif_update_ip) },
+	{ HP_POP(chrif->disconnectplayer, HP_chrif_disconnectplayer) },
+	{ HP_POP(chrif->removemap, HP_chrif_removemap) },
+	{ HP_POP(chrif->updatefamelist_ack, HP_chrif_updatefamelist_ack) },
+	{ HP_POP(chrif->keepalive, HP_chrif_keepalive) },
+	{ HP_POP(chrif->keepalive_ack, HP_chrif_keepalive_ack) },
+	{ HP_POP(chrif->deadopt, HP_chrif_deadopt) },
+	{ HP_POP(chrif->authfail, HP_chrif_authfail) },
+	{ HP_POP(chrif->on_ready, HP_chrif_on_ready) },
+	{ HP_POP(chrif->on_disconnect, HP_chrif_on_disconnect) },
+	{ HP_POP(chrif->parse, HP_chrif_parse) },
 /* clif */
-	{ HP_POP(clif->init), HP_POP2(HP_clif_init), 390 },
-	{ HP_POP(clif->final), HP_POP2(HP_clif_final), 392 },
-	{ HP_POP(clif->setip), HP_POP2(HP_clif_setip), 394 },
-	{ HP_POP(clif->setbindip), HP_POP2(HP_clif_setbindip), 396 },
-	{ HP_POP(clif->setport), HP_POP2(HP_clif_setport), 398 },
-	{ HP_POP(clif->refresh_ip), HP_POP2(HP_clif_refresh_ip), 400 },
-	{ HP_POP(clif->send), HP_POP2(HP_clif_send), 402 },
-	{ HP_POP(clif->send_sub), HP_POP2(HP_clif_send_sub), 404 },
-	{ HP_POP(clif->parse), HP_POP2(HP_clif_parse), 406 },
-	{ HP_POP(clif->parse_cmd), HP_POP2(HP_clif_parse_cmd), 408 },
-	{ HP_POP(clif->decrypt_cmd), HP_POP2(HP_clif_decrypt_cmd), 410 },
-	{ HP_POP(clif->authok), HP_POP2(HP_clif_authok), 412 },
-	{ HP_POP(clif->authrefuse), HP_POP2(HP_clif_authrefuse), 414 },
-	{ HP_POP(clif->authfail_fd), HP_POP2(HP_clif_authfail_fd), 416 },
-	{ HP_POP(clif->charselectok), HP_POP2(HP_clif_charselectok), 418 },
-	{ HP_POP(clif->dropflooritem), HP_POP2(HP_clif_dropflooritem), 420 },
-	{ HP_POP(clif->clearflooritem), HP_POP2(HP_clif_clearflooritem), 422 },
-	{ HP_POP(clif->additem), HP_POP2(HP_clif_additem), 424 },
-	{ HP_POP(clif->dropitem), HP_POP2(HP_clif_dropitem), 426 },
-	{ HP_POP(clif->delitem), HP_POP2(HP_clif_delitem), 428 },
-	{ HP_POP(clif->takeitem), HP_POP2(HP_clif_takeitem), 430 },
-	{ HP_POP(clif->arrowequip), HP_POP2(HP_clif_arrowequip), 432 },
-	{ HP_POP(clif->arrow_fail), HP_POP2(HP_clif_arrow_fail), 434 },
-	{ HP_POP(clif->use_card), HP_POP2(HP_clif_use_card), 436 },
-	{ HP_POP(clif->cart_additem), HP_POP2(HP_clif_cart_additem), 438 },
-	{ HP_POP(clif->cart_delitem), HP_POP2(HP_clif_cart_delitem), 440 },
-	{ HP_POP(clif->equipitemack), HP_POP2(HP_clif_equipitemack), 442 },
-	{ HP_POP(clif->unequipitemack), HP_POP2(HP_clif_unequipitemack), 444 },
-	{ HP_POP(clif->useitemack), HP_POP2(HP_clif_useitemack), 446 },
-	{ HP_POP(clif->addcards), HP_POP2(HP_clif_addcards), 448 },
-	{ HP_POP(clif->addcards2), HP_POP2(HP_clif_addcards2), 450 },
-	{ HP_POP(clif->item_sub), HP_POP2(HP_clif_item_sub), 452 },
-	{ HP_POP(clif->getareachar_item), HP_POP2(HP_clif_getareachar_item), 454 },
-	{ HP_POP(clif->cart_additem_ack), HP_POP2(HP_clif_cart_additem_ack), 456 },
-	{ HP_POP(clif->cashshop_load), HP_POP2(HP_clif_cashshop_load), 458 },
-	{ HP_POP(clif->package_announce), HP_POP2(HP_clif_package_announce), 460 },
-	{ HP_POP(clif->clearunit_single), HP_POP2(HP_clif_clearunit_single), 462 },
-	{ HP_POP(clif->clearunit_area), HP_POP2(HP_clif_clearunit_area), 464 },
-	{ HP_POP(clif->clearunit_delayed), HP_POP2(HP_clif_clearunit_delayed), 466 },
-	{ HP_POP(clif->walkok), HP_POP2(HP_clif_walkok), 468 },
-	{ HP_POP(clif->move), HP_POP2(HP_clif_move), 470 },
-	{ HP_POP(clif->move2), HP_POP2(HP_clif_move2), 472 },
-	{ HP_POP(clif->blown), HP_POP2(HP_clif_blown), 474 },
-	{ HP_POP(clif->slide), HP_POP2(HP_clif_slide), 476 },
-	{ HP_POP(clif->fixpos), HP_POP2(HP_clif_fixpos), 478 },
-	{ HP_POP(clif->changelook), HP_POP2(HP_clif_changelook), 480 },
-	{ HP_POP(clif->changetraplook), HP_POP2(HP_clif_changetraplook), 482 },
-	{ HP_POP(clif->refreshlook), HP_POP2(HP_clif_refreshlook), 484 },
-	{ HP_POP(clif->class_change), HP_POP2(HP_clif_class_change), 486 },
-	{ HP_POP(clif->skill_setunit), HP_POP2(HP_clif_skill_setunit), 488 },
-	{ HP_POP(clif->skill_delunit), HP_POP2(HP_clif_skill_delunit), 490 },
-	{ HP_POP(clif->skillunit_update), HP_POP2(HP_clif_skillunit_update), 492 },
-	{ 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->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->ShowScript), HP_POP2(HP_clif_ShowScript), 880 },
-	{ HP_POP(clif->traderequest), HP_POP2(HP_clif_traderequest), 882 },
-	{ HP_POP(clif->tradestart), HP_POP2(HP_clif_tradestart), 884 },
-	{ HP_POP(clif->tradeadditem), HP_POP2(HP_clif_tradeadditem), 886 },
-	{ HP_POP(clif->tradeitemok), HP_POP2(HP_clif_tradeitemok), 888 },
-	{ HP_POP(clif->tradedeal_lock), HP_POP2(HP_clif_tradedeal_lock), 890 },
-	{ HP_POP(clif->tradecancelled), HP_POP2(HP_clif_tradecancelled), 892 },
-	{ HP_POP(clif->tradecompleted), HP_POP2(HP_clif_tradecompleted), 894 },
-	{ HP_POP(clif->tradeundo), HP_POP2(HP_clif_tradeundo), 896 },
-	{ HP_POP(clif->openvendingreq), HP_POP2(HP_clif_openvendingreq), 898 },
-	{ HP_POP(clif->showvendingboard), HP_POP2(HP_clif_showvendingboard), 900 },
-	{ HP_POP(clif->closevendingboard), HP_POP2(HP_clif_closevendingboard), 902 },
-	{ HP_POP(clif->vendinglist), HP_POP2(HP_clif_vendinglist), 904 },
-	{ HP_POP(clif->buyvending), HP_POP2(HP_clif_buyvending), 906 },
-	{ HP_POP(clif->openvending), HP_POP2(HP_clif_openvending), 908 },
-	{ HP_POP(clif->vendingreport), HP_POP2(HP_clif_vendingreport), 910 },
-	{ HP_POP(clif->storagelist), HP_POP2(HP_clif_storagelist), 912 },
-	{ HP_POP(clif->updatestorageamount), HP_POP2(HP_clif_updatestorageamount), 914 },
-	{ HP_POP(clif->storageitemadded), HP_POP2(HP_clif_storageitemadded), 916 },
-	{ HP_POP(clif->storageitemremoved), HP_POP2(HP_clif_storageitemremoved), 918 },
-	{ HP_POP(clif->storageclose), HP_POP2(HP_clif_storageclose), 920 },
-	{ HP_POP(clif->skillinfoblock), HP_POP2(HP_clif_skillinfoblock), 922 },
-	{ HP_POP(clif->skillup), HP_POP2(HP_clif_skillup), 924 },
-	{ HP_POP(clif->skillinfo), HP_POP2(HP_clif_skillinfo), 926 },
-	{ HP_POP(clif->addskill), HP_POP2(HP_clif_addskill), 928 },
-	{ HP_POP(clif->deleteskill), HP_POP2(HP_clif_deleteskill), 930 },
-	{ HP_POP(clif->party_created), HP_POP2(HP_clif_party_created), 932 },
-	{ HP_POP(clif->party_member_info), HP_POP2(HP_clif_party_member_info), 934 },
-	{ HP_POP(clif->party_info), HP_POP2(HP_clif_party_info), 936 },
-	{ HP_POP(clif->party_invite), HP_POP2(HP_clif_party_invite), 938 },
-	{ HP_POP(clif->party_inviteack), HP_POP2(HP_clif_party_inviteack), 940 },
-	{ HP_POP(clif->party_option), HP_POP2(HP_clif_party_option), 942 },
-	{ HP_POP(clif->party_withdraw), HP_POP2(HP_clif_party_withdraw), 944 },
-	{ HP_POP(clif->party_message), HP_POP2(HP_clif_party_message), 946 },
-	{ HP_POP(clif->party_xy), HP_POP2(HP_clif_party_xy), 948 },
-	{ HP_POP(clif->party_xy_single), HP_POP2(HP_clif_party_xy_single), 950 },
-	{ HP_POP(clif->party_hp), HP_POP2(HP_clif_party_hp), 952 },
-	{ HP_POP(clif->party_xy_remove), HP_POP2(HP_clif_party_xy_remove), 954 },
-	{ HP_POP(clif->party_show_picker), HP_POP2(HP_clif_party_show_picker), 956 },
-	{ HP_POP(clif->partyinvitationstate), HP_POP2(HP_clif_partyinvitationstate), 958 },
-	{ HP_POP(clif->guild_created), HP_POP2(HP_clif_guild_created), 960 },
-	{ HP_POP(clif->guild_belonginfo), HP_POP2(HP_clif_guild_belonginfo), 962 },
-	{ HP_POP(clif->guild_masterormember), HP_POP2(HP_clif_guild_masterormember), 964 },
-	{ HP_POP(clif->guild_basicinfo), HP_POP2(HP_clif_guild_basicinfo), 966 },
-	{ HP_POP(clif->guild_allianceinfo), HP_POP2(HP_clif_guild_allianceinfo), 968 },
-	{ HP_POP(clif->guild_memberlist), HP_POP2(HP_clif_guild_memberlist), 970 },
-	{ HP_POP(clif->guild_skillinfo), HP_POP2(HP_clif_guild_skillinfo), 972 },
-	{ HP_POP(clif->guild_send_onlineinfo), HP_POP2(HP_clif_guild_send_onlineinfo), 974 },
-	{ HP_POP(clif->guild_memberlogin_notice), HP_POP2(HP_clif_guild_memberlogin_notice), 976 },
-	{ HP_POP(clif->guild_invite), HP_POP2(HP_clif_guild_invite), 978 },
-	{ HP_POP(clif->guild_inviteack), HP_POP2(HP_clif_guild_inviteack), 980 },
-	{ HP_POP(clif->guild_leave), HP_POP2(HP_clif_guild_leave), 982 },
-	{ HP_POP(clif->guild_expulsion), HP_POP2(HP_clif_guild_expulsion), 984 },
-	{ HP_POP(clif->guild_positionchanged), HP_POP2(HP_clif_guild_positionchanged), 986 },
-	{ HP_POP(clif->guild_memberpositionchanged), HP_POP2(HP_clif_guild_memberpositionchanged), 988 },
-	{ HP_POP(clif->guild_emblem), HP_POP2(HP_clif_guild_emblem), 990 },
-	{ HP_POP(clif->guild_emblem_area), HP_POP2(HP_clif_guild_emblem_area), 992 },
-	{ HP_POP(clif->guild_notice), HP_POP2(HP_clif_guild_notice), 994 },
-	{ HP_POP(clif->guild_message), HP_POP2(HP_clif_guild_message), 996 },
-	{ HP_POP(clif->guild_skillup), HP_POP2(HP_clif_guild_skillup), 998 },
-	{ HP_POP(clif->guild_reqalliance), HP_POP2(HP_clif_guild_reqalliance), 1000 },
-	{ HP_POP(clif->guild_allianceack), HP_POP2(HP_clif_guild_allianceack), 1002 },
-	{ HP_POP(clif->guild_delalliance), HP_POP2(HP_clif_guild_delalliance), 1004 },
-	{ HP_POP(clif->guild_oppositionack), HP_POP2(HP_clif_guild_oppositionack), 1006 },
-	{ HP_POP(clif->guild_broken), HP_POP2(HP_clif_guild_broken), 1008 },
-	{ HP_POP(clif->guild_xy), HP_POP2(HP_clif_guild_xy), 1010 },
-	{ HP_POP(clif->guild_xy_single), HP_POP2(HP_clif_guild_xy_single), 1012 },
-	{ HP_POP(clif->guild_xy_remove), HP_POP2(HP_clif_guild_xy_remove), 1014 },
-	{ HP_POP(clif->guild_positionnamelist), HP_POP2(HP_clif_guild_positionnamelist), 1016 },
-	{ HP_POP(clif->guild_positioninfolist), HP_POP2(HP_clif_guild_positioninfolist), 1018 },
-	{ HP_POP(clif->guild_expulsionlist), HP_POP2(HP_clif_guild_expulsionlist), 1020 },
-	{ HP_POP(clif->validate_emblem), HP_POP2(HP_clif_validate_emblem), 1022 },
-	{ HP_POP(clif->bg_hp), HP_POP2(HP_clif_bg_hp), 1024 },
-	{ HP_POP(clif->bg_xy), HP_POP2(HP_clif_bg_xy), 1026 },
-	{ HP_POP(clif->bg_xy_remove), HP_POP2(HP_clif_bg_xy_remove), 1028 },
-	{ HP_POP(clif->bg_message), HP_POP2(HP_clif_bg_message), 1030 },
-	{ HP_POP(clif->bg_updatescore), HP_POP2(HP_clif_bg_updatescore), 1032 },
-	{ HP_POP(clif->bg_updatescore_single), HP_POP2(HP_clif_bg_updatescore_single), 1034 },
-	{ HP_POP(clif->sendbgemblem_area), HP_POP2(HP_clif_sendbgemblem_area), 1036 },
-	{ HP_POP(clif->sendbgemblem_single), HP_POP2(HP_clif_sendbgemblem_single), 1038 },
-	{ HP_POP(clif->instance), HP_POP2(HP_clif_instance), 1040 },
-	{ HP_POP(clif->instance_join), HP_POP2(HP_clif_instance_join), 1042 },
-	{ HP_POP(clif->instance_leave), HP_POP2(HP_clif_instance_leave), 1044 },
-	{ HP_POP(clif->catch_process), HP_POP2(HP_clif_catch_process), 1046 },
-	{ HP_POP(clif->pet_roulette), HP_POP2(HP_clif_pet_roulette), 1048 },
-	{ HP_POP(clif->sendegg), HP_POP2(HP_clif_sendegg), 1050 },
-	{ HP_POP(clif->send_petstatus), HP_POP2(HP_clif_send_petstatus), 1052 },
-	{ HP_POP(clif->send_petdata), HP_POP2(HP_clif_send_petdata), 1054 },
-	{ HP_POP(clif->pet_emotion), HP_POP2(HP_clif_pet_emotion), 1056 },
-	{ HP_POP(clif->pet_food), HP_POP2(HP_clif_pet_food), 1058 },
-	{ HP_POP(clif->friendslist_toggle_sub), HP_POP2(HP_clif_friendslist_toggle_sub), 1060 },
-	{ HP_POP(clif->friendslist_send), HP_POP2(HP_clif_friendslist_send), 1062 },
-	{ HP_POP(clif->friendslist_reqack), HP_POP2(HP_clif_friendslist_reqack), 1064 },
-	{ HP_POP(clif->friendslist_toggle), HP_POP2(HP_clif_friendslist_toggle), 1066 },
-	{ HP_POP(clif->friendlist_req), HP_POP2(HP_clif_friendlist_req), 1068 },
-	{ HP_POP(clif->GM_kickack), HP_POP2(HP_clif_GM_kickack), 1070 },
-	{ HP_POP(clif->GM_kick), HP_POP2(HP_clif_GM_kick), 1072 },
-	{ HP_POP(clif->manner_message), HP_POP2(HP_clif_manner_message), 1074 },
-	{ HP_POP(clif->GM_silence), HP_POP2(HP_clif_GM_silence), 1076 },
-	{ HP_POP(clif->account_name), HP_POP2(HP_clif_account_name), 1078 },
-	{ HP_POP(clif->check), HP_POP2(HP_clif_check), 1080 },
-	{ HP_POP(clif->hominfo), HP_POP2(HP_clif_hominfo), 1082 },
-	{ HP_POP(clif->homskillinfoblock), HP_POP2(HP_clif_homskillinfoblock), 1084 },
-	{ HP_POP(clif->homskillup), HP_POP2(HP_clif_homskillup), 1086 },
-	{ HP_POP(clif->hom_food), HP_POP2(HP_clif_hom_food), 1088 },
-	{ HP_POP(clif->send_homdata), HP_POP2(HP_clif_send_homdata), 1090 },
-	{ HP_POP(clif->quest_send_list), HP_POP2(HP_clif_quest_send_list), 1092 },
-	{ HP_POP(clif->quest_send_mission), HP_POP2(HP_clif_quest_send_mission), 1094 },
-	{ HP_POP(clif->quest_add), HP_POP2(HP_clif_quest_add), 1096 },
-	{ HP_POP(clif->quest_delete), HP_POP2(HP_clif_quest_delete), 1098 },
-	{ HP_POP(clif->quest_update_status), HP_POP2(HP_clif_quest_update_status), 1100 },
-	{ HP_POP(clif->quest_update_objective), HP_POP2(HP_clif_quest_update_objective), 1102 },
-	{ HP_POP(clif->quest_show_event), HP_POP2(HP_clif_quest_show_event), 1104 },
-	{ HP_POP(clif->mail_window), HP_POP2(HP_clif_mail_window), 1106 },
-	{ HP_POP(clif->mail_read), HP_POP2(HP_clif_mail_read), 1108 },
-	{ HP_POP(clif->mail_delete), HP_POP2(HP_clif_mail_delete), 1110 },
-	{ HP_POP(clif->mail_return), HP_POP2(HP_clif_mail_return), 1112 },
-	{ HP_POP(clif->mail_send), HP_POP2(HP_clif_mail_send), 1114 },
-	{ HP_POP(clif->mail_new), HP_POP2(HP_clif_mail_new), 1116 },
-	{ HP_POP(clif->mail_refreshinbox), HP_POP2(HP_clif_mail_refreshinbox), 1118 },
-	{ HP_POP(clif->mail_getattachment), HP_POP2(HP_clif_mail_getattachment), 1120 },
-	{ HP_POP(clif->mail_setattachment), HP_POP2(HP_clif_mail_setattachment), 1122 },
-	{ HP_POP(clif->auction_openwindow), HP_POP2(HP_clif_auction_openwindow), 1124 },
-	{ HP_POP(clif->auction_results), HP_POP2(HP_clif_auction_results), 1126 },
-	{ HP_POP(clif->auction_message), HP_POP2(HP_clif_auction_message), 1128 },
-	{ HP_POP(clif->auction_close), HP_POP2(HP_clif_auction_close), 1130 },
-	{ HP_POP(clif->auction_setitem), HP_POP2(HP_clif_auction_setitem), 1132 },
-	{ HP_POP(clif->mercenary_info), HP_POP2(HP_clif_mercenary_info), 1134 },
-	{ HP_POP(clif->mercenary_skillblock), HP_POP2(HP_clif_mercenary_skillblock), 1136 },
-	{ HP_POP(clif->mercenary_message), HP_POP2(HP_clif_mercenary_message), 1138 },
-	{ HP_POP(clif->mercenary_updatestatus), HP_POP2(HP_clif_mercenary_updatestatus), 1140 },
-	{ HP_POP(clif->rental_time), HP_POP2(HP_clif_rental_time), 1142 },
-	{ HP_POP(clif->rental_expired), HP_POP2(HP_clif_rental_expired), 1144 },
-	{ HP_POP(clif->PartyBookingRegisterAck), HP_POP2(HP_clif_PartyBookingRegisterAck), 1146 },
-	{ HP_POP(clif->PartyBookingDeleteAck), HP_POP2(HP_clif_PartyBookingDeleteAck), 1148 },
-	{ HP_POP(clif->PartyBookingSearchAck), HP_POP2(HP_clif_PartyBookingSearchAck), 1150 },
-	{ HP_POP(clif->PartyBookingUpdateNotify), HP_POP2(HP_clif_PartyBookingUpdateNotify), 1152 },
-	{ HP_POP(clif->PartyBookingDeleteNotify), HP_POP2(HP_clif_PartyBookingDeleteNotify), 1154 },
-	{ HP_POP(clif->PartyBookingInsertNotify), HP_POP2(HP_clif_PartyBookingInsertNotify), 1156 },
-	{ HP_POP(clif->PartyRecruitRegisterAck), HP_POP2(HP_clif_PartyRecruitRegisterAck), 1158 },
-	{ HP_POP(clif->PartyRecruitDeleteAck), HP_POP2(HP_clif_PartyRecruitDeleteAck), 1160 },
-	{ HP_POP(clif->PartyRecruitSearchAck), HP_POP2(HP_clif_PartyRecruitSearchAck), 1162 },
-	{ HP_POP(clif->PartyRecruitUpdateNotify), HP_POP2(HP_clif_PartyRecruitUpdateNotify), 1164 },
-	{ HP_POP(clif->PartyRecruitDeleteNotify), HP_POP2(HP_clif_PartyRecruitDeleteNotify), 1166 },
-	{ HP_POP(clif->PartyRecruitInsertNotify), HP_POP2(HP_clif_PartyRecruitInsertNotify), 1168 },
-	{ HP_POP(clif->PartyBookingVolunteerInfo), HP_POP2(HP_clif_PartyBookingVolunteerInfo), 1170 },
-	{ HP_POP(clif->PartyBookingRefuseVolunteer), HP_POP2(HP_clif_PartyBookingRefuseVolunteer), 1172 },
-	{ HP_POP(clif->PartyBookingCancelVolunteer), HP_POP2(HP_clif_PartyBookingCancelVolunteer), 1174 },
-	{ HP_POP(clif->PartyBookingAddFilteringList), HP_POP2(HP_clif_PartyBookingAddFilteringList), 1176 },
-	{ HP_POP(clif->PartyBookingSubFilteringList), HP_POP2(HP_clif_PartyBookingSubFilteringList), 1178 },
-	{ HP_POP(clif->buyingstore_open), HP_POP2(HP_clif_buyingstore_open), 1180 },
-	{ HP_POP(clif->buyingstore_open_failed), HP_POP2(HP_clif_buyingstore_open_failed), 1182 },
-	{ HP_POP(clif->buyingstore_myitemlist), HP_POP2(HP_clif_buyingstore_myitemlist), 1184 },
-	{ HP_POP(clif->buyingstore_entry), HP_POP2(HP_clif_buyingstore_entry), 1186 },
-	{ HP_POP(clif->buyingstore_entry_single), HP_POP2(HP_clif_buyingstore_entry_single), 1188 },
-	{ HP_POP(clif->buyingstore_disappear_entry), HP_POP2(HP_clif_buyingstore_disappear_entry), 1190 },
-	{ HP_POP(clif->buyingstore_disappear_entry_single), HP_POP2(HP_clif_buyingstore_disappear_entry_single), 1192 },
-	{ HP_POP(clif->buyingstore_itemlist), HP_POP2(HP_clif_buyingstore_itemlist), 1194 },
-	{ HP_POP(clif->buyingstore_trade_failed_buyer), HP_POP2(HP_clif_buyingstore_trade_failed_buyer), 1196 },
-	{ HP_POP(clif->buyingstore_update_item), HP_POP2(HP_clif_buyingstore_update_item), 1198 },
-	{ HP_POP(clif->buyingstore_delete_item), HP_POP2(HP_clif_buyingstore_delete_item), 1200 },
-	{ HP_POP(clif->buyingstore_trade_failed_seller), HP_POP2(HP_clif_buyingstore_trade_failed_seller), 1202 },
-	{ HP_POP(clif->search_store_info_ack), HP_POP2(HP_clif_search_store_info_ack), 1204 },
-	{ HP_POP(clif->search_store_info_failed), HP_POP2(HP_clif_search_store_info_failed), 1206 },
-	{ HP_POP(clif->open_search_store_info), HP_POP2(HP_clif_open_search_store_info), 1208 },
-	{ HP_POP(clif->search_store_info_click_ack), HP_POP2(HP_clif_search_store_info_click_ack), 1210 },
-	{ HP_POP(clif->elemental_info), HP_POP2(HP_clif_elemental_info), 1212 },
-	{ HP_POP(clif->elemental_updatestatus), HP_POP2(HP_clif_elemental_updatestatus), 1214 },
-	{ HP_POP(clif->bgqueue_ack), HP_POP2(HP_clif_bgqueue_ack), 1216 },
-	{ HP_POP(clif->bgqueue_notice_delete), HP_POP2(HP_clif_bgqueue_notice_delete), 1218 },
-	{ HP_POP(clif->bgqueue_update_info), HP_POP2(HP_clif_bgqueue_update_info), 1220 },
-	{ HP_POP(clif->bgqueue_joined), HP_POP2(HP_clif_bgqueue_joined), 1222 },
-	{ HP_POP(clif->bgqueue_pcleft), HP_POP2(HP_clif_bgqueue_pcleft), 1224 },
-	{ HP_POP(clif->bgqueue_battlebegins), HP_POP2(HP_clif_bgqueue_battlebegins), 1226 },
-	{ HP_POP(clif->adopt_reply), HP_POP2(HP_clif_adopt_reply), 1228 },
-	{ HP_POP(clif->adopt_request), HP_POP2(HP_clif_adopt_request), 1230 },
-	{ HP_POP(clif->readbook), HP_POP2(HP_clif_readbook), 1232 },
-	{ HP_POP(clif->notify_time), HP_POP2(HP_clif_notify_time), 1234 },
-	{ HP_POP(clif->user_count), HP_POP2(HP_clif_user_count), 1236 },
-	{ HP_POP(clif->noask_sub), HP_POP2(HP_clif_noask_sub), 1238 },
-	{ HP_POP(clif->bc_ready), HP_POP2(HP_clif_bc_ready), 1240 },
-	{ HP_POP(clif->undisguise_timer), HP_POP2(HP_clif_undisguise_timer), 1242 },
-	{ HP_POP(clif->chsys_create), HP_POP2(HP_clif_chsys_create), 1244 },
-	{ HP_POP(clif->chsys_msg), HP_POP2(HP_clif_chsys_msg), 1246 },
-	{ HP_POP(clif->chsys_msg2), HP_POP2(HP_clif_chsys_msg2), 1248 },
-	{ HP_POP(clif->chsys_send), HP_POP2(HP_clif_chsys_send), 1250 },
-	{ HP_POP(clif->chsys_join), HP_POP2(HP_clif_chsys_join), 1252 },
-	{ HP_POP(clif->chsys_left), HP_POP2(HP_clif_chsys_left), 1254 },
-	{ HP_POP(clif->chsys_delete), HP_POP2(HP_clif_chsys_delete), 1256 },
-	{ HP_POP(clif->chsys_mjoin), HP_POP2(HP_clif_chsys_mjoin), 1258 },
-	{ HP_POP(clif->chsys_quit), HP_POP2(HP_clif_chsys_quit), 1260 },
-	{ HP_POP(clif->chsys_quitg), HP_POP2(HP_clif_chsys_quitg), 1262 },
-	{ HP_POP(clif->chsys_gjoin), HP_POP2(HP_clif_chsys_gjoin), 1264 },
-	{ HP_POP(clif->chsys_gleave), HP_POP2(HP_clif_chsys_gleave), 1266 },
-	{ HP_POP(clif->bank_deposit), HP_POP2(HP_clif_bank_deposit), 1268 },
-	{ HP_POP(clif->bank_withdraw), HP_POP2(HP_clif_bank_withdraw), 1270 },
-	{ HP_POP(clif->pWantToConnection), HP_POP2(HP_clif_pWantToConnection), 1272 },
-	{ HP_POP(clif->pLoadEndAck), HP_POP2(HP_clif_pLoadEndAck), 1274 },
-	{ HP_POP(clif->pTickSend), HP_POP2(HP_clif_pTickSend), 1276 },
-	{ HP_POP(clif->pHotkey), HP_POP2(HP_clif_pHotkey), 1278 },
-	{ HP_POP(clif->pProgressbar), HP_POP2(HP_clif_pProgressbar), 1280 },
-	{ HP_POP(clif->pWalkToXY), HP_POP2(HP_clif_pWalkToXY), 1282 },
-	{ HP_POP(clif->pQuitGame), HP_POP2(HP_clif_pQuitGame), 1284 },
-	{ HP_POP(clif->pGetCharNameRequest), HP_POP2(HP_clif_pGetCharNameRequest), 1286 },
-	{ HP_POP(clif->pGlobalMessage), HP_POP2(HP_clif_pGlobalMessage), 1288 },
-	{ HP_POP(clif->pMapMove), HP_POP2(HP_clif_pMapMove), 1290 },
-	{ HP_POP(clif->pChangeDir), HP_POP2(HP_clif_pChangeDir), 1292 },
-	{ HP_POP(clif->pEmotion), HP_POP2(HP_clif_pEmotion), 1294 },
-	{ HP_POP(clif->pHowManyConnections), HP_POP2(HP_clif_pHowManyConnections), 1296 },
-	{ HP_POP(clif->pActionRequest), HP_POP2(HP_clif_pActionRequest), 1298 },
-	{ HP_POP(clif->pActionRequest_sub), HP_POP2(HP_clif_pActionRequest_sub), 1300 },
-	{ HP_POP(clif->pRestart), HP_POP2(HP_clif_pRestart), 1302 },
-	{ HP_POP(clif->pWisMessage), HP_POP2(HP_clif_pWisMessage), 1304 },
-	{ HP_POP(clif->pBroadcast), HP_POP2(HP_clif_pBroadcast), 1306 },
-	{ HP_POP(clif->pTakeItem), HP_POP2(HP_clif_pTakeItem), 1308 },
-	{ HP_POP(clif->pDropItem), HP_POP2(HP_clif_pDropItem), 1310 },
-	{ HP_POP(clif->pUseItem), HP_POP2(HP_clif_pUseItem), 1312 },
-	{ HP_POP(clif->pEquipItem), HP_POP2(HP_clif_pEquipItem), 1314 },
-	{ HP_POP(clif->pUnequipItem), HP_POP2(HP_clif_pUnequipItem), 1316 },
-	{ HP_POP(clif->pNpcClicked), HP_POP2(HP_clif_pNpcClicked), 1318 },
-	{ HP_POP(clif->pNpcBuySellSelected), HP_POP2(HP_clif_pNpcBuySellSelected), 1320 },
-	{ HP_POP(clif->pNpcBuyListSend), HP_POP2(HP_clif_pNpcBuyListSend), 1322 },
-	{ HP_POP(clif->pNpcSellListSend), HP_POP2(HP_clif_pNpcSellListSend), 1324 },
-	{ HP_POP(clif->pCreateChatRoom), HP_POP2(HP_clif_pCreateChatRoom), 1326 },
-	{ HP_POP(clif->pChatAddMember), HP_POP2(HP_clif_pChatAddMember), 1328 },
-	{ HP_POP(clif->pChatRoomStatusChange), HP_POP2(HP_clif_pChatRoomStatusChange), 1330 },
-	{ HP_POP(clif->pChangeChatOwner), HP_POP2(HP_clif_pChangeChatOwner), 1332 },
-	{ HP_POP(clif->pKickFromChat), HP_POP2(HP_clif_pKickFromChat), 1334 },
-	{ HP_POP(clif->pChatLeave), HP_POP2(HP_clif_pChatLeave), 1336 },
-	{ HP_POP(clif->pTradeRequest), HP_POP2(HP_clif_pTradeRequest), 1338 },
-	{ HP_POP(clif->chann_config_read), HP_POP2(HP_clif_chann_config_read), 1340 },
-	{ HP_POP(clif->pTradeAck), HP_POP2(HP_clif_pTradeAck), 1342 },
-	{ HP_POP(clif->pTradeAddItem), HP_POP2(HP_clif_pTradeAddItem), 1344 },
-	{ HP_POP(clif->pTradeOk), HP_POP2(HP_clif_pTradeOk), 1346 },
-	{ HP_POP(clif->pTradeCancel), HP_POP2(HP_clif_pTradeCancel), 1348 },
-	{ HP_POP(clif->pTradeCommit), HP_POP2(HP_clif_pTradeCommit), 1350 },
-	{ HP_POP(clif->pStopAttack), HP_POP2(HP_clif_pStopAttack), 1352 },
-	{ HP_POP(clif->pPutItemToCart), HP_POP2(HP_clif_pPutItemToCart), 1354 },
-	{ HP_POP(clif->pGetItemFromCart), HP_POP2(HP_clif_pGetItemFromCart), 1356 },
-	{ HP_POP(clif->pRemoveOption), HP_POP2(HP_clif_pRemoveOption), 1358 },
-	{ HP_POP(clif->pChangeCart), HP_POP2(HP_clif_pChangeCart), 1360 },
-	{ HP_POP(clif->pStatusUp), HP_POP2(HP_clif_pStatusUp), 1362 },
-	{ HP_POP(clif->pSkillUp), HP_POP2(HP_clif_pSkillUp), 1364 },
-	{ HP_POP(clif->pUseSkillToId), HP_POP2(HP_clif_pUseSkillToId), 1366 },
-	{ HP_POP(clif->pUseSkillToId_homun), HP_POP2(HP_clif_pUseSkillToId_homun), 1368 },
-	{ HP_POP(clif->pUseSkillToId_mercenary), HP_POP2(HP_clif_pUseSkillToId_mercenary), 1370 },
-	{ HP_POP(clif->pUseSkillToPos), HP_POP2(HP_clif_pUseSkillToPos), 1372 },
-	{ HP_POP(clif->pUseSkillToPosSub), HP_POP2(HP_clif_pUseSkillToPosSub), 1374 },
-	{ HP_POP(clif->pUseSkillToPos_homun), HP_POP2(HP_clif_pUseSkillToPos_homun), 1376 },
-	{ HP_POP(clif->pUseSkillToPos_mercenary), HP_POP2(HP_clif_pUseSkillToPos_mercenary), 1378 },
-	{ HP_POP(clif->pUseSkillToPosMoreInfo), HP_POP2(HP_clif_pUseSkillToPosMoreInfo), 1380 },
-	{ HP_POP(clif->pUseSkillMap), HP_POP2(HP_clif_pUseSkillMap), 1382 },
-	{ HP_POP(clif->pRequestMemo), HP_POP2(HP_clif_pRequestMemo), 1384 },
-	{ HP_POP(clif->pProduceMix), HP_POP2(HP_clif_pProduceMix), 1386 },
-	{ HP_POP(clif->pCooking), HP_POP2(HP_clif_pCooking), 1388 },
-	{ HP_POP(clif->pRepairItem), HP_POP2(HP_clif_pRepairItem), 1390 },
-	{ HP_POP(clif->pWeaponRefine), HP_POP2(HP_clif_pWeaponRefine), 1392 },
-	{ HP_POP(clif->pNpcSelectMenu), HP_POP2(HP_clif_pNpcSelectMenu), 1394 },
-	{ HP_POP(clif->pNpcNextClicked), HP_POP2(HP_clif_pNpcNextClicked), 1396 },
-	{ HP_POP(clif->pNpcAmountInput), HP_POP2(HP_clif_pNpcAmountInput), 1398 },
-	{ HP_POP(clif->pNpcStringInput), HP_POP2(HP_clif_pNpcStringInput), 1400 },
-	{ HP_POP(clif->pNpcCloseClicked), HP_POP2(HP_clif_pNpcCloseClicked), 1402 },
-	{ HP_POP(clif->pItemIdentify), HP_POP2(HP_clif_pItemIdentify), 1404 },
-	{ HP_POP(clif->pSelectArrow), HP_POP2(HP_clif_pSelectArrow), 1406 },
-	{ HP_POP(clif->pAutoSpell), HP_POP2(HP_clif_pAutoSpell), 1408 },
-	{ HP_POP(clif->pUseCard), HP_POP2(HP_clif_pUseCard), 1410 },
-	{ HP_POP(clif->pInsertCard), HP_POP2(HP_clif_pInsertCard), 1412 },
-	{ HP_POP(clif->pSolveCharName), HP_POP2(HP_clif_pSolveCharName), 1414 },
-	{ HP_POP(clif->pResetChar), HP_POP2(HP_clif_pResetChar), 1416 },
-	{ HP_POP(clif->pLocalBroadcast), HP_POP2(HP_clif_pLocalBroadcast), 1418 },
-	{ HP_POP(clif->pMoveToKafra), HP_POP2(HP_clif_pMoveToKafra), 1420 },
-	{ HP_POP(clif->pMoveFromKafra), HP_POP2(HP_clif_pMoveFromKafra), 1422 },
-	{ HP_POP(clif->pMoveToKafraFromCart), HP_POP2(HP_clif_pMoveToKafraFromCart), 1424 },
-	{ HP_POP(clif->pMoveFromKafraToCart), HP_POP2(HP_clif_pMoveFromKafraToCart), 1426 },
-	{ HP_POP(clif->pCloseKafra), HP_POP2(HP_clif_pCloseKafra), 1428 },
-	{ HP_POP(clif->pStoragePassword), HP_POP2(HP_clif_pStoragePassword), 1430 },
-	{ HP_POP(clif->pCreateParty), HP_POP2(HP_clif_pCreateParty), 1432 },
-	{ HP_POP(clif->pCreateParty2), HP_POP2(HP_clif_pCreateParty2), 1434 },
-	{ HP_POP(clif->pPartyInvite), HP_POP2(HP_clif_pPartyInvite), 1436 },
-	{ HP_POP(clif->pPartyInvite2), HP_POP2(HP_clif_pPartyInvite2), 1438 },
-	{ HP_POP(clif->pReplyPartyInvite), HP_POP2(HP_clif_pReplyPartyInvite), 1440 },
-	{ HP_POP(clif->pReplyPartyInvite2), HP_POP2(HP_clif_pReplyPartyInvite2), 1442 },
-	{ HP_POP(clif->pLeaveParty), HP_POP2(HP_clif_pLeaveParty), 1444 },
-	{ HP_POP(clif->pRemovePartyMember), HP_POP2(HP_clif_pRemovePartyMember), 1446 },
-	{ HP_POP(clif->pPartyChangeOption), HP_POP2(HP_clif_pPartyChangeOption), 1448 },
-	{ HP_POP(clif->pPartyMessage), HP_POP2(HP_clif_pPartyMessage), 1450 },
-	{ HP_POP(clif->pPartyChangeLeader), HP_POP2(HP_clif_pPartyChangeLeader), 1452 },
-	{ HP_POP(clif->pPartyBookingRegisterReq), HP_POP2(HP_clif_pPartyBookingRegisterReq), 1454 },
-	{ HP_POP(clif->pPartyBookingSearchReq), HP_POP2(HP_clif_pPartyBookingSearchReq), 1456 },
-	{ HP_POP(clif->pPartyBookingDeleteReq), HP_POP2(HP_clif_pPartyBookingDeleteReq), 1458 },
-	{ HP_POP(clif->pPartyBookingUpdateReq), HP_POP2(HP_clif_pPartyBookingUpdateReq), 1460 },
-	{ HP_POP(clif->pPartyRecruitRegisterReq), HP_POP2(HP_clif_pPartyRecruitRegisterReq), 1462 },
-	{ HP_POP(clif->pPartyRecruitSearchReq), HP_POP2(HP_clif_pPartyRecruitSearchReq), 1464 },
-	{ HP_POP(clif->pPartyRecruitDeleteReq), HP_POP2(HP_clif_pPartyRecruitDeleteReq), 1466 },
-	{ HP_POP(clif->pPartyRecruitUpdateReq), HP_POP2(HP_clif_pPartyRecruitUpdateReq), 1468 },
-	{ HP_POP(clif->pCloseVending), HP_POP2(HP_clif_pCloseVending), 1470 },
-	{ HP_POP(clif->pVendingListReq), HP_POP2(HP_clif_pVendingListReq), 1472 },
-	{ HP_POP(clif->pPurchaseReq), HP_POP2(HP_clif_pPurchaseReq), 1474 },
-	{ HP_POP(clif->pPurchaseReq2), HP_POP2(HP_clif_pPurchaseReq2), 1476 },
-	{ HP_POP(clif->pOpenVending), HP_POP2(HP_clif_pOpenVending), 1478 },
-	{ HP_POP(clif->pCreateGuild), HP_POP2(HP_clif_pCreateGuild), 1480 },
-	{ HP_POP(clif->pGuildCheckMaster), HP_POP2(HP_clif_pGuildCheckMaster), 1482 },
-	{ HP_POP(clif->pGuildRequestInfo), HP_POP2(HP_clif_pGuildRequestInfo), 1484 },
-	{ HP_POP(clif->pGuildChangePositionInfo), HP_POP2(HP_clif_pGuildChangePositionInfo), 1486 },
-	{ HP_POP(clif->pGuildChangeMemberPosition), HP_POP2(HP_clif_pGuildChangeMemberPosition), 1488 },
-	{ HP_POP(clif->pGuildRequestEmblem), HP_POP2(HP_clif_pGuildRequestEmblem), 1490 },
-	{ HP_POP(clif->pGuildChangeEmblem), HP_POP2(HP_clif_pGuildChangeEmblem), 1492 },
-	{ HP_POP(clif->pGuildChangeNotice), HP_POP2(HP_clif_pGuildChangeNotice), 1494 },
-	{ HP_POP(clif->pGuildInvite), HP_POP2(HP_clif_pGuildInvite), 1496 },
-	{ HP_POP(clif->pGuildReplyInvite), HP_POP2(HP_clif_pGuildReplyInvite), 1498 },
-	{ HP_POP(clif->pGuildLeave), HP_POP2(HP_clif_pGuildLeave), 1500 },
-	{ HP_POP(clif->pGuildExpulsion), HP_POP2(HP_clif_pGuildExpulsion), 1502 },
-	{ HP_POP(clif->pGuildMessage), HP_POP2(HP_clif_pGuildMessage), 1504 },
-	{ HP_POP(clif->pGuildRequestAlliance), HP_POP2(HP_clif_pGuildRequestAlliance), 1506 },
-	{ HP_POP(clif->pGuildReplyAlliance), HP_POP2(HP_clif_pGuildReplyAlliance), 1508 },
-	{ HP_POP(clif->pGuildDelAlliance), HP_POP2(HP_clif_pGuildDelAlliance), 1510 },
-	{ HP_POP(clif->pGuildOpposition), HP_POP2(HP_clif_pGuildOpposition), 1512 },
-	{ HP_POP(clif->pGuildBreak), HP_POP2(HP_clif_pGuildBreak), 1514 },
-	{ HP_POP(clif->pPetMenu), HP_POP2(HP_clif_pPetMenu), 1516 },
-	{ HP_POP(clif->pCatchPet), HP_POP2(HP_clif_pCatchPet), 1518 },
-	{ HP_POP(clif->pSelectEgg), HP_POP2(HP_clif_pSelectEgg), 1520 },
-	{ HP_POP(clif->pSendEmotion), HP_POP2(HP_clif_pSendEmotion), 1522 },
-	{ HP_POP(clif->pChangePetName), HP_POP2(HP_clif_pChangePetName), 1524 },
-	{ HP_POP(clif->pGMKick), HP_POP2(HP_clif_pGMKick), 1526 },
-	{ HP_POP(clif->pGMKickAll), HP_POP2(HP_clif_pGMKickAll), 1528 },
-	{ HP_POP(clif->pGMShift), HP_POP2(HP_clif_pGMShift), 1530 },
-	{ HP_POP(clif->pGMRemove2), HP_POP2(HP_clif_pGMRemove2), 1532 },
-	{ HP_POP(clif->pGMRecall), HP_POP2(HP_clif_pGMRecall), 1534 },
-	{ HP_POP(clif->pGMRecall2), HP_POP2(HP_clif_pGMRecall2), 1536 },
-	{ HP_POP(clif->pGM_Monster_Item), HP_POP2(HP_clif_pGM_Monster_Item), 1538 },
-	{ HP_POP(clif->pGMHide), HP_POP2(HP_clif_pGMHide), 1540 },
-	{ HP_POP(clif->pGMReqNoChat), HP_POP2(HP_clif_pGMReqNoChat), 1542 },
-	{ HP_POP(clif->pGMRc), HP_POP2(HP_clif_pGMRc), 1544 },
-	{ HP_POP(clif->pGMReqAccountName), HP_POP2(HP_clif_pGMReqAccountName), 1546 },
-	{ HP_POP(clif->pGMChangeMapType), HP_POP2(HP_clif_pGMChangeMapType), 1548 },
-	{ HP_POP(clif->pPMIgnore), HP_POP2(HP_clif_pPMIgnore), 1550 },
-	{ HP_POP(clif->pPMIgnoreAll), HP_POP2(HP_clif_pPMIgnoreAll), 1552 },
-	{ HP_POP(clif->pPMIgnoreList), HP_POP2(HP_clif_pPMIgnoreList), 1554 },
-	{ HP_POP(clif->pNoviceDoriDori), HP_POP2(HP_clif_pNoviceDoriDori), 1556 },
-	{ HP_POP(clif->pNoviceExplosionSpirits), HP_POP2(HP_clif_pNoviceExplosionSpirits), 1558 },
-	{ HP_POP(clif->pFriendsListAdd), HP_POP2(HP_clif_pFriendsListAdd), 1560 },
-	{ HP_POP(clif->pFriendsListReply), HP_POP2(HP_clif_pFriendsListReply), 1562 },
-	{ HP_POP(clif->pFriendsListRemove), HP_POP2(HP_clif_pFriendsListRemove), 1564 },
-	{ HP_POP(clif->pPVPInfo), HP_POP2(HP_clif_pPVPInfo), 1566 },
-	{ HP_POP(clif->pBlacksmith), HP_POP2(HP_clif_pBlacksmith), 1568 },
-	{ HP_POP(clif->pAlchemist), HP_POP2(HP_clif_pAlchemist), 1570 },
-	{ HP_POP(clif->pTaekwon), HP_POP2(HP_clif_pTaekwon), 1572 },
-	{ HP_POP(clif->pRankingPk), HP_POP2(HP_clif_pRankingPk), 1574 },
-	{ HP_POP(clif->pFeelSaveOk), HP_POP2(HP_clif_pFeelSaveOk), 1576 },
-	{ HP_POP(clif->pChangeHomunculusName), HP_POP2(HP_clif_pChangeHomunculusName), 1578 },
-	{ HP_POP(clif->pHomMoveToMaster), HP_POP2(HP_clif_pHomMoveToMaster), 1580 },
-	{ HP_POP(clif->pHomMoveTo), HP_POP2(HP_clif_pHomMoveTo), 1582 },
-	{ HP_POP(clif->pHomAttack), HP_POP2(HP_clif_pHomAttack), 1584 },
-	{ HP_POP(clif->pHomMenu), HP_POP2(HP_clif_pHomMenu), 1586 },
-	{ HP_POP(clif->pAutoRevive), HP_POP2(HP_clif_pAutoRevive), 1588 },
-	{ HP_POP(clif->pCheck), HP_POP2(HP_clif_pCheck), 1590 },
-	{ HP_POP(clif->pMail_refreshinbox), HP_POP2(HP_clif_pMail_refreshinbox), 1592 },
-	{ HP_POP(clif->pMail_read), HP_POP2(HP_clif_pMail_read), 1594 },
-	{ HP_POP(clif->pMail_getattach), HP_POP2(HP_clif_pMail_getattach), 1596 },
-	{ HP_POP(clif->pMail_delete), HP_POP2(HP_clif_pMail_delete), 1598 },
-	{ HP_POP(clif->pMail_return), HP_POP2(HP_clif_pMail_return), 1600 },
-	{ HP_POP(clif->pMail_setattach), HP_POP2(HP_clif_pMail_setattach), 1602 },
-	{ HP_POP(clif->pMail_winopen), HP_POP2(HP_clif_pMail_winopen), 1604 },
-	{ HP_POP(clif->pMail_send), HP_POP2(HP_clif_pMail_send), 1606 },
-	{ HP_POP(clif->pAuction_cancelreg), HP_POP2(HP_clif_pAuction_cancelreg), 1608 },
-	{ HP_POP(clif->pAuction_setitem), HP_POP2(HP_clif_pAuction_setitem), 1610 },
-	{ HP_POP(clif->pAuction_register), HP_POP2(HP_clif_pAuction_register), 1612 },
-	{ HP_POP(clif->pAuction_cancel), HP_POP2(HP_clif_pAuction_cancel), 1614 },
-	{ HP_POP(clif->pAuction_close), HP_POP2(HP_clif_pAuction_close), 1616 },
-	{ HP_POP(clif->pAuction_bid), HP_POP2(HP_clif_pAuction_bid), 1618 },
-	{ HP_POP(clif->pAuction_search), HP_POP2(HP_clif_pAuction_search), 1620 },
-	{ HP_POP(clif->pAuction_buysell), HP_POP2(HP_clif_pAuction_buysell), 1622 },
-	{ HP_POP(clif->pcashshop_buy), HP_POP2(HP_clif_pcashshop_buy), 1624 },
-	{ HP_POP(clif->pAdopt_request), HP_POP2(HP_clif_pAdopt_request), 1626 },
-	{ HP_POP(clif->pAdopt_reply), HP_POP2(HP_clif_pAdopt_reply), 1628 },
-	{ HP_POP(clif->pViewPlayerEquip), HP_POP2(HP_clif_pViewPlayerEquip), 1630 },
-	{ HP_POP(clif->pEquipTick), HP_POP2(HP_clif_pEquipTick), 1632 },
-	{ HP_POP(clif->pquestStateAck), HP_POP2(HP_clif_pquestStateAck), 1634 },
-	{ HP_POP(clif->pmercenary_action), HP_POP2(HP_clif_pmercenary_action), 1636 },
-	{ HP_POP(clif->pBattleChat), HP_POP2(HP_clif_pBattleChat), 1638 },
-	{ HP_POP(clif->pLessEffect), HP_POP2(HP_clif_pLessEffect), 1640 },
-	{ HP_POP(clif->pItemListWindowSelected), HP_POP2(HP_clif_pItemListWindowSelected), 1642 },
-	{ HP_POP(clif->pReqOpenBuyingStore), HP_POP2(HP_clif_pReqOpenBuyingStore), 1644 },
-	{ HP_POP(clif->pReqCloseBuyingStore), HP_POP2(HP_clif_pReqCloseBuyingStore), 1646 },
-	{ HP_POP(clif->pReqClickBuyingStore), HP_POP2(HP_clif_pReqClickBuyingStore), 1648 },
-	{ HP_POP(clif->pReqTradeBuyingStore), HP_POP2(HP_clif_pReqTradeBuyingStore), 1650 },
-	{ HP_POP(clif->pSearchStoreInfo), HP_POP2(HP_clif_pSearchStoreInfo), 1652 },
-	{ HP_POP(clif->pSearchStoreInfoNextPage), HP_POP2(HP_clif_pSearchStoreInfoNextPage), 1654 },
-	{ HP_POP(clif->pCloseSearchStoreInfo), HP_POP2(HP_clif_pCloseSearchStoreInfo), 1656 },
-	{ HP_POP(clif->pSearchStoreInfoListItemClick), HP_POP2(HP_clif_pSearchStoreInfoListItemClick), 1658 },
-	{ HP_POP(clif->pDebug), HP_POP2(HP_clif_pDebug), 1660 },
-	{ HP_POP(clif->pSkillSelectMenu), HP_POP2(HP_clif_pSkillSelectMenu), 1662 },
-	{ HP_POP(clif->pMoveItem), HP_POP2(HP_clif_pMoveItem), 1664 },
-	{ HP_POP(clif->pDull), HP_POP2(HP_clif_pDull), 1666 },
-	{ HP_POP(clif->pBGQueueRegister), HP_POP2(HP_clif_pBGQueueRegister), 1668 },
-	{ HP_POP(clif->pBGQueueCheckState), HP_POP2(HP_clif_pBGQueueCheckState), 1670 },
-	{ HP_POP(clif->pBGQueueRevokeReq), HP_POP2(HP_clif_pBGQueueRevokeReq), 1672 },
-	{ HP_POP(clif->pBGQueueBattleBeginAck), HP_POP2(HP_clif_pBGQueueBattleBeginAck), 1674 },
-	{ HP_POP(clif->pCashShopOpen), HP_POP2(HP_clif_pCashShopOpen), 1676 },
-	{ HP_POP(clif->pCashShopClose), HP_POP2(HP_clif_pCashShopClose), 1678 },
-	{ HP_POP(clif->pCashShopReqTab), HP_POP2(HP_clif_pCashShopReqTab), 1680 },
-	{ HP_POP(clif->pCashShopSchedule), HP_POP2(HP_clif_pCashShopSchedule), 1682 },
-	{ HP_POP(clif->pCashShopBuy), HP_POP2(HP_clif_pCashShopBuy), 1684 },
-	{ HP_POP(clif->pPartyTick), HP_POP2(HP_clif_pPartyTick), 1686 },
-	{ HP_POP(clif->pGuildInvite2), HP_POP2(HP_clif_pGuildInvite2), 1688 },
-	{ HP_POP(clif->pPartyBookingAddFilter), HP_POP2(HP_clif_pPartyBookingAddFilter), 1690 },
-	{ HP_POP(clif->pPartyBookingSubFilter), HP_POP2(HP_clif_pPartyBookingSubFilter), 1692 },
-	{ HP_POP(clif->pPartyBookingReqVolunteer), HP_POP2(HP_clif_pPartyBookingReqVolunteer), 1694 },
-	{ HP_POP(clif->pPartyBookingRefuseVolunteer), HP_POP2(HP_clif_pPartyBookingRefuseVolunteer), 1696 },
-	{ HP_POP(clif->pPartyBookingCancelVolunteer), HP_POP2(HP_clif_pPartyBookingCancelVolunteer), 1698 },
-	{ HP_POP(clif->pBankDeposit), HP_POP2(HP_clif_pBankDeposit), 1700 },
-	{ HP_POP(clif->pBankWithdraw), HP_POP2(HP_clif_pBankWithdraw), 1702 },
-	{ HP_POP(clif->pBankCheck), HP_POP2(HP_clif_pBankCheck), 1704 },
-	{ HP_POP(clif->pBankOpen), HP_POP2(HP_clif_pBankOpen), 1706 },
-	{ HP_POP(clif->pBankClose), HP_POP2(HP_clif_pBankClose), 1708 },
+	{ HP_POP(clif->init, HP_clif_init) },
+	{ HP_POP(clif->final, HP_clif_final) },
+	{ HP_POP(clif->setip, HP_clif_setip) },
+	{ HP_POP(clif->setbindip, HP_clif_setbindip) },
+	{ HP_POP(clif->setport, HP_clif_setport) },
+	{ HP_POP(clif->refresh_ip, HP_clif_refresh_ip) },
+	{ HP_POP(clif->send, HP_clif_send) },
+	{ HP_POP(clif->send_sub, HP_clif_send_sub) },
+	{ HP_POP(clif->parse, HP_clif_parse) },
+	{ HP_POP(clif->parse_cmd, HP_clif_parse_cmd) },
+	{ HP_POP(clif->decrypt_cmd, HP_clif_decrypt_cmd) },
+	{ HP_POP(clif->authok, HP_clif_authok) },
+	{ HP_POP(clif->authrefuse, HP_clif_authrefuse) },
+	{ HP_POP(clif->authfail_fd, HP_clif_authfail_fd) },
+	{ HP_POP(clif->charselectok, HP_clif_charselectok) },
+	{ HP_POP(clif->dropflooritem, HP_clif_dropflooritem) },
+	{ HP_POP(clif->clearflooritem, HP_clif_clearflooritem) },
+	{ HP_POP(clif->additem, HP_clif_additem) },
+	{ HP_POP(clif->dropitem, HP_clif_dropitem) },
+	{ HP_POP(clif->delitem, HP_clif_delitem) },
+	{ HP_POP(clif->takeitem, HP_clif_takeitem) },
+	{ HP_POP(clif->arrowequip, HP_clif_arrowequip) },
+	{ HP_POP(clif->arrow_fail, HP_clif_arrow_fail) },
+	{ HP_POP(clif->use_card, HP_clif_use_card) },
+	{ HP_POP(clif->cart_additem, HP_clif_cart_additem) },
+	{ HP_POP(clif->cart_delitem, HP_clif_cart_delitem) },
+	{ HP_POP(clif->equipitemack, HP_clif_equipitemack) },
+	{ HP_POP(clif->unequipitemack, HP_clif_unequipitemack) },
+	{ HP_POP(clif->useitemack, HP_clif_useitemack) },
+	{ HP_POP(clif->addcards, HP_clif_addcards) },
+	{ HP_POP(clif->addcards2, HP_clif_addcards2) },
+	{ HP_POP(clif->item_sub, HP_clif_item_sub) },
+	{ HP_POP(clif->getareachar_item, HP_clif_getareachar_item) },
+	{ HP_POP(clif->cart_additem_ack, HP_clif_cart_additem_ack) },
+	{ HP_POP(clif->cashshop_load, HP_clif_cashshop_load) },
+	{ HP_POP(clif->package_announce, HP_clif_package_announce) },
+	{ HP_POP(clif->clearunit_single, HP_clif_clearunit_single) },
+	{ HP_POP(clif->clearunit_area, HP_clif_clearunit_area) },
+	{ HP_POP(clif->clearunit_delayed, HP_clif_clearunit_delayed) },
+	{ HP_POP(clif->walkok, HP_clif_walkok) },
+	{ HP_POP(clif->move, HP_clif_move) },
+	{ HP_POP(clif->move2, HP_clif_move2) },
+	{ HP_POP(clif->blown, HP_clif_blown) },
+	{ HP_POP(clif->slide, HP_clif_slide) },
+	{ HP_POP(clif->fixpos, HP_clif_fixpos) },
+	{ HP_POP(clif->changelook, HP_clif_changelook) },
+	{ HP_POP(clif->changetraplook, HP_clif_changetraplook) },
+	{ HP_POP(clif->refreshlook, HP_clif_refreshlook) },
+	{ HP_POP(clif->class_change, HP_clif_class_change) },
+	{ HP_POP(clif->skill_setunit, HP_clif_skill_setunit) },
+	{ HP_POP(clif->skill_delunit, HP_clif_skill_delunit) },
+	{ HP_POP(clif->skillunit_update, HP_clif_skillunit_update) },
+	{ HP_POP(clif->clearunit_delayed_sub, HP_clif_clearunit_delayed_sub) },
+	{ HP_POP(clif->set_unit_idle, HP_clif_set_unit_idle) },
+	{ HP_POP(clif->spawn_unit, HP_clif_spawn_unit) },
+	{ HP_POP(clif->spawn_unit2, HP_clif_spawn_unit2) },
+	{ HP_POP(clif->set_unit_idle2, HP_clif_set_unit_idle2) },
+	{ HP_POP(clif->set_unit_walking, HP_clif_set_unit_walking) },
+	{ HP_POP(clif->calc_walkdelay, HP_clif_calc_walkdelay) },
+	{ HP_POP(clif->getareachar_skillunit, HP_clif_getareachar_skillunit) },
+	{ HP_POP(clif->getareachar_unit, HP_clif_getareachar_unit) },
+	{ HP_POP(clif->clearchar_skillunit, HP_clif_clearchar_skillunit) },
+	{ HP_POP(clif->getareachar, HP_clif_getareachar) },
+	{ HP_POP(clif->spawn, HP_clif_spawn) },
+	{ HP_POP(clif->changemap, HP_clif_changemap) },
+	{ HP_POP(clif->changemapcell, HP_clif_changemapcell) },
+	{ HP_POP(clif->map_property, HP_clif_map_property) },
+	{ HP_POP(clif->pvpset, HP_clif_pvpset) },
+	{ HP_POP(clif->map_property_mapall, HP_clif_map_property_mapall) },
+	{ HP_POP(clif->bossmapinfo, HP_clif_bossmapinfo) },
+	{ HP_POP(clif->map_type, HP_clif_map_type) },
+	{ HP_POP(clif->maptypeproperty2, HP_clif_maptypeproperty2) },
+	{ HP_POP(clif->changemapserver, HP_clif_changemapserver) },
+	{ HP_POP(clif->npcbuysell, HP_clif_npcbuysell) },
+	{ HP_POP(clif->buylist, HP_clif_buylist) },
+	{ HP_POP(clif->selllist, HP_clif_selllist) },
+	{ HP_POP(clif->cashshop_show, HP_clif_cashshop_show) },
+	{ HP_POP(clif->npc_buy_result, HP_clif_npc_buy_result) },
+	{ HP_POP(clif->npc_sell_result, HP_clif_npc_sell_result) },
+	{ HP_POP(clif->cashshop_ack, HP_clif_cashshop_ack) },
+	{ HP_POP(clif->scriptmes, HP_clif_scriptmes) },
+	{ HP_POP(clif->scriptnext, HP_clif_scriptnext) },
+	{ HP_POP(clif->scriptclose, HP_clif_scriptclose) },
+	{ HP_POP(clif->scriptmenu, HP_clif_scriptmenu) },
+	{ HP_POP(clif->scriptinput, HP_clif_scriptinput) },
+	{ HP_POP(clif->scriptinputstr, HP_clif_scriptinputstr) },
+	{ HP_POP(clif->cutin, HP_clif_cutin) },
+	{ HP_POP(clif->sendfakenpc, HP_clif_sendfakenpc) },
+	{ HP_POP(clif->scriptclear, HP_clif_scriptclear) },
+	{ HP_POP(clif->viewpoint, HP_clif_viewpoint) },
+	{ HP_POP(clif->damage, HP_clif_damage) },
+	{ HP_POP(clif->sitting, HP_clif_sitting) },
+	{ HP_POP(clif->standing, HP_clif_standing) },
+	{ HP_POP(clif->arrow_create_list, HP_clif_arrow_create_list) },
+	{ HP_POP(clif->refresh, HP_clif_refresh) },
+	{ HP_POP(clif->fame_blacksmith, HP_clif_fame_blacksmith) },
+	{ HP_POP(clif->fame_alchemist, HP_clif_fame_alchemist) },
+	{ HP_POP(clif->fame_taekwon, HP_clif_fame_taekwon) },
+	{ HP_POP(clif->ranklist, HP_clif_ranklist) },
+	{ HP_POP(clif->update_rankingpoint, HP_clif_update_rankingpoint) },
+	{ HP_POP(clif->pRanklist, HP_clif_pRanklist) },
+	{ HP_POP(clif->hotkeys, HP_clif_hotkeys) },
+	{ HP_POP(clif->insight, HP_clif_insight) },
+	{ HP_POP(clif->outsight, HP_clif_outsight) },
+	{ HP_POP(clif->skillcastcancel, HP_clif_skillcastcancel) },
+	{ HP_POP(clif->skill_fail, HP_clif_skill_fail) },
+	{ HP_POP(clif->skill_cooldown, HP_clif_skill_cooldown) },
+	{ HP_POP(clif->skill_memomessage, HP_clif_skill_memomessage) },
+	{ HP_POP(clif->skill_mapinfomessage, HP_clif_skill_mapinfomessage) },
+	{ HP_POP(clif->skill_produce_mix_list, HP_clif_skill_produce_mix_list) },
+	{ HP_POP(clif->cooking_list, HP_clif_cooking_list) },
+	{ HP_POP(clif->autospell, HP_clif_autospell) },
+	{ HP_POP(clif->combo_delay, HP_clif_combo_delay) },
+	{ HP_POP(clif->status_change, HP_clif_status_change) },
+	{ HP_POP(clif->insert_card, HP_clif_insert_card) },
+	{ HP_POP(clif->inventorylist, HP_clif_inventorylist) },
+	{ HP_POP(clif->equiplist, HP_clif_equiplist) },
+	{ HP_POP(clif->cartlist, HP_clif_cartlist) },
+	{ HP_POP(clif->favorite_item, HP_clif_favorite_item) },
+	{ HP_POP(clif->clearcart, HP_clif_clearcart) },
+	{ HP_POP(clif->item_identify_list, HP_clif_item_identify_list) },
+	{ HP_POP(clif->item_identified, HP_clif_item_identified) },
+	{ HP_POP(clif->item_repair_list, HP_clif_item_repair_list) },
+	{ HP_POP(clif->item_repaireffect, HP_clif_item_repaireffect) },
+	{ HP_POP(clif->item_damaged, HP_clif_item_damaged) },
+	{ HP_POP(clif->item_refine_list, HP_clif_item_refine_list) },
+	{ HP_POP(clif->item_skill, HP_clif_item_skill) },
+	{ HP_POP(clif->mvp_item, HP_clif_mvp_item) },
+	{ HP_POP(clif->mvp_exp, HP_clif_mvp_exp) },
+	{ HP_POP(clif->mvp_noitem, HP_clif_mvp_noitem) },
+	{ HP_POP(clif->changed_dir, HP_clif_changed_dir) },
+	{ HP_POP(clif->charnameack, HP_clif_charnameack) },
+	{ HP_POP(clif->monster_hp_bar, HP_clif_monster_hp_bar) },
+	{ HP_POP(clif->hpmeter, HP_clif_hpmeter) },
+	{ HP_POP(clif->hpmeter_single, HP_clif_hpmeter_single) },
+	{ HP_POP(clif->hpmeter_sub, HP_clif_hpmeter_sub) },
+	{ HP_POP(clif->upgrademessage, HP_clif_upgrademessage) },
+	{ HP_POP(clif->get_weapon_view, HP_clif_get_weapon_view) },
+	{ HP_POP(clif->gospel_info, HP_clif_gospel_info) },
+	{ HP_POP(clif->feel_req, HP_clif_feel_req) },
+	{ HP_POP(clif->starskill, HP_clif_starskill) },
+	{ HP_POP(clif->feel_info, HP_clif_feel_info) },
+	{ HP_POP(clif->hate_info, HP_clif_hate_info) },
+	{ HP_POP(clif->mission_info, HP_clif_mission_info) },
+	{ HP_POP(clif->feel_hate_reset, HP_clif_feel_hate_reset) },
+	{ HP_POP(clif->partytickack, HP_clif_partytickack) },
+	{ HP_POP(clif->equiptickack, HP_clif_equiptickack) },
+	{ HP_POP(clif->viewequip_ack, HP_clif_viewequip_ack) },
+	{ HP_POP(clif->viewequip_fail, HP_clif_viewequip_fail) },
+	{ HP_POP(clif->equpcheckbox, HP_clif_equpcheckbox) },
+	{ HP_POP(clif->displayexp, HP_clif_displayexp) },
+	{ HP_POP(clif->font, HP_clif_font) },
+	{ HP_POP(clif->progressbar, HP_clif_progressbar) },
+	{ HP_POP(clif->progressbar_abort, HP_clif_progressbar_abort) },
+	{ HP_POP(clif->showdigit, HP_clif_showdigit) },
+	{ HP_POP(clif->elementalconverter_list, HP_clif_elementalconverter_list) },
+	{ HP_POP(clif->spellbook_list, HP_clif_spellbook_list) },
+	{ HP_POP(clif->magicdecoy_list, HP_clif_magicdecoy_list) },
+	{ HP_POP(clif->poison_list, HP_clif_poison_list) },
+	{ HP_POP(clif->autoshadowspell_list, HP_clif_autoshadowspell_list) },
+	{ HP_POP(clif->skill_itemlistwindow, HP_clif_skill_itemlistwindow) },
+	{ HP_POP(clif->sc_load, HP_clif_sc_load) },
+	{ HP_POP(clif->sc_end, HP_clif_sc_end) },
+	{ HP_POP(clif->initialstatus, HP_clif_initialstatus) },
+	{ HP_POP(clif->cooldown_list, HP_clif_cooldown_list) },
+	{ HP_POP(clif->updatestatus, HP_clif_updatestatus) },
+	{ HP_POP(clif->changestatus, HP_clif_changestatus) },
+	{ HP_POP(clif->statusupack, HP_clif_statusupack) },
+	{ HP_POP(clif->movetoattack, HP_clif_movetoattack) },
+	{ HP_POP(clif->solved_charname, HP_clif_solved_charname) },
+	{ HP_POP(clif->charnameupdate, HP_clif_charnameupdate) },
+	{ HP_POP(clif->delayquit, HP_clif_delayquit) },
+	{ HP_POP(clif->getareachar_pc, HP_clif_getareachar_pc) },
+	{ HP_POP(clif->disconnect_ack, HP_clif_disconnect_ack) },
+	{ HP_POP(clif->PVPInfo, HP_clif_PVPInfo) },
+	{ HP_POP(clif->blacksmith, HP_clif_blacksmith) },
+	{ HP_POP(clif->alchemist, HP_clif_alchemist) },
+	{ HP_POP(clif->taekwon, HP_clif_taekwon) },
+	{ HP_POP(clif->ranking_pk, HP_clif_ranking_pk) },
+	{ HP_POP(clif->quitsave, HP_clif_quitsave) },
+	{ HP_POP(clif->misceffect, HP_clif_misceffect) },
+	{ HP_POP(clif->changeoption, HP_clif_changeoption) },
+	{ HP_POP(clif->changeoption2, HP_clif_changeoption2) },
+	{ HP_POP(clif->emotion, HP_clif_emotion) },
+	{ HP_POP(clif->talkiebox, HP_clif_talkiebox) },
+	{ HP_POP(clif->wedding_effect, HP_clif_wedding_effect) },
+	{ HP_POP(clif->divorced, HP_clif_divorced) },
+	{ HP_POP(clif->callpartner, HP_clif_callpartner) },
+	{ HP_POP(clif->skill_damage, HP_clif_skill_damage) },
+	{ HP_POP(clif->skill_nodamage, HP_clif_skill_nodamage) },
+	{ HP_POP(clif->skill_poseffect, HP_clif_skill_poseffect) },
+	{ HP_POP(clif->skill_estimation, HP_clif_skill_estimation) },
+	{ HP_POP(clif->skill_warppoint, HP_clif_skill_warppoint) },
+	{ HP_POP(clif->skillcasting, HP_clif_skillcasting) },
+	{ HP_POP(clif->produce_effect, HP_clif_produce_effect) },
+	{ HP_POP(clif->devotion, HP_clif_devotion) },
+	{ HP_POP(clif->spiritball, HP_clif_spiritball) },
+	{ HP_POP(clif->spiritball_single, HP_clif_spiritball_single) },
+	{ HP_POP(clif->bladestop, HP_clif_bladestop) },
+	{ HP_POP(clif->mvp_effect, HP_clif_mvp_effect) },
+	{ HP_POP(clif->heal, HP_clif_heal) },
+	{ HP_POP(clif->resurrection, HP_clif_resurrection) },
+	{ HP_POP(clif->refine, HP_clif_refine) },
+	{ HP_POP(clif->weather, HP_clif_weather) },
+	{ HP_POP(clif->specialeffect, HP_clif_specialeffect) },
+	{ HP_POP(clif->specialeffect_single, HP_clif_specialeffect_single) },
+	{ HP_POP(clif->specialeffect_value, HP_clif_specialeffect_value) },
+	{ HP_POP(clif->millenniumshield, HP_clif_millenniumshield) },
+	{ HP_POP(clif->charm, HP_clif_charm) },
+	{ HP_POP(clif->charm_single, HP_clif_charm_single) },
+	{ HP_POP(clif->snap, HP_clif_snap) },
+	{ HP_POP(clif->weather_check, HP_clif_weather_check) },
+	{ HP_POP(clif->playBGM, HP_clif_playBGM) },
+	{ HP_POP(clif->soundeffect, HP_clif_soundeffect) },
+	{ HP_POP(clif->soundeffectall, HP_clif_soundeffectall) },
+	{ HP_POP(clif->GlobalMessage, HP_clif_GlobalMessage) },
+	{ HP_POP(clif->createchat, HP_clif_createchat) },
+	{ HP_POP(clif->dispchat, HP_clif_dispchat) },
+	{ HP_POP(clif->joinchatfail, HP_clif_joinchatfail) },
+	{ HP_POP(clif->joinchatok, HP_clif_joinchatok) },
+	{ HP_POP(clif->addchat, HP_clif_addchat) },
+	{ HP_POP(clif->changechatowner, HP_clif_changechatowner) },
+	{ HP_POP(clif->clearchat, HP_clif_clearchat) },
+	{ HP_POP(clif->leavechat, HP_clif_leavechat) },
+	{ HP_POP(clif->changechatstatus, HP_clif_changechatstatus) },
+	{ HP_POP(clif->wis_message, HP_clif_wis_message) },
+	{ HP_POP(clif->wis_end, HP_clif_wis_end) },
+	{ HP_POP(clif->disp_onlyself, HP_clif_disp_onlyself) },
+	{ HP_POP(clif->disp_message, HP_clif_disp_message) },
+	{ HP_POP(clif->broadcast, HP_clif_broadcast) },
+	{ HP_POP(clif->broadcast2, HP_clif_broadcast2) },
+	{ HP_POP(clif->messagecolor, HP_clif_messagecolor) },
+	{ HP_POP(clif->disp_overhead, HP_clif_disp_overhead) },
+	{ HP_POP(clif->msg, HP_clif_msg) },
+	{ HP_POP(clif->msg_value, HP_clif_msg_value) },
+	{ HP_POP(clif->msg_skill, HP_clif_msg_skill) },
+	{ HP_POP(clif->msgtable, HP_clif_msgtable) },
+	{ HP_POP(clif->msgtable_num, HP_clif_msgtable_num) },
+	{ HP_POP(clif->message, HP_clif_message) },
+	{ HP_POP(clif->messageln, HP_clif_messageln) },
+	{ HP_POP(clif->colormes, HP_clif_colormes) },
+	{ HP_POP(clif->process_message, HP_clif_process_message) },
+	{ HP_POP(clif->wisexin, HP_clif_wisexin) },
+	{ HP_POP(clif->wisall, HP_clif_wisall) },
+	{ HP_POP(clif->PMIgnoreList, HP_clif_PMIgnoreList) },
+	{ HP_POP(clif->ShowScript, HP_clif_ShowScript) },
+	{ HP_POP(clif->traderequest, HP_clif_traderequest) },
+	{ HP_POP(clif->tradestart, HP_clif_tradestart) },
+	{ HP_POP(clif->tradeadditem, HP_clif_tradeadditem) },
+	{ HP_POP(clif->tradeitemok, HP_clif_tradeitemok) },
+	{ HP_POP(clif->tradedeal_lock, HP_clif_tradedeal_lock) },
+	{ HP_POP(clif->tradecancelled, HP_clif_tradecancelled) },
+	{ HP_POP(clif->tradecompleted, HP_clif_tradecompleted) },
+	{ HP_POP(clif->tradeundo, HP_clif_tradeundo) },
+	{ HP_POP(clif->openvendingreq, HP_clif_openvendingreq) },
+	{ HP_POP(clif->showvendingboard, HP_clif_showvendingboard) },
+	{ HP_POP(clif->closevendingboard, HP_clif_closevendingboard) },
+	{ HP_POP(clif->vendinglist, HP_clif_vendinglist) },
+	{ HP_POP(clif->buyvending, HP_clif_buyvending) },
+	{ HP_POP(clif->openvending, HP_clif_openvending) },
+	{ HP_POP(clif->vendingreport, HP_clif_vendingreport) },
+	{ HP_POP(clif->storagelist, HP_clif_storagelist) },
+	{ HP_POP(clif->updatestorageamount, HP_clif_updatestorageamount) },
+	{ HP_POP(clif->storageitemadded, HP_clif_storageitemadded) },
+	{ HP_POP(clif->storageitemremoved, HP_clif_storageitemremoved) },
+	{ HP_POP(clif->storageclose, HP_clif_storageclose) },
+	{ HP_POP(clif->skillinfoblock, HP_clif_skillinfoblock) },
+	{ HP_POP(clif->skillup, HP_clif_skillup) },
+	{ HP_POP(clif->skillinfo, HP_clif_skillinfo) },
+	{ HP_POP(clif->addskill, HP_clif_addskill) },
+	{ HP_POP(clif->deleteskill, HP_clif_deleteskill) },
+	{ HP_POP(clif->party_created, HP_clif_party_created) },
+	{ HP_POP(clif->party_member_info, HP_clif_party_member_info) },
+	{ HP_POP(clif->party_info, HP_clif_party_info) },
+	{ HP_POP(clif->party_invite, HP_clif_party_invite) },
+	{ HP_POP(clif->party_inviteack, HP_clif_party_inviteack) },
+	{ HP_POP(clif->party_option, HP_clif_party_option) },
+	{ HP_POP(clif->party_withdraw, HP_clif_party_withdraw) },
+	{ HP_POP(clif->party_message, HP_clif_party_message) },
+	{ HP_POP(clif->party_xy, HP_clif_party_xy) },
+	{ HP_POP(clif->party_xy_single, HP_clif_party_xy_single) },
+	{ HP_POP(clif->party_hp, HP_clif_party_hp) },
+	{ HP_POP(clif->party_xy_remove, HP_clif_party_xy_remove) },
+	{ HP_POP(clif->party_show_picker, HP_clif_party_show_picker) },
+	{ HP_POP(clif->partyinvitationstate, HP_clif_partyinvitationstate) },
+	{ HP_POP(clif->guild_created, HP_clif_guild_created) },
+	{ HP_POP(clif->guild_belonginfo, HP_clif_guild_belonginfo) },
+	{ HP_POP(clif->guild_masterormember, HP_clif_guild_masterormember) },
+	{ HP_POP(clif->guild_basicinfo, HP_clif_guild_basicinfo) },
+	{ HP_POP(clif->guild_allianceinfo, HP_clif_guild_allianceinfo) },
+	{ HP_POP(clif->guild_memberlist, HP_clif_guild_memberlist) },
+	{ HP_POP(clif->guild_skillinfo, HP_clif_guild_skillinfo) },
+	{ HP_POP(clif->guild_send_onlineinfo, HP_clif_guild_send_onlineinfo) },
+	{ HP_POP(clif->guild_memberlogin_notice, HP_clif_guild_memberlogin_notice) },
+	{ HP_POP(clif->guild_invite, HP_clif_guild_invite) },
+	{ HP_POP(clif->guild_inviteack, HP_clif_guild_inviteack) },
+	{ HP_POP(clif->guild_leave, HP_clif_guild_leave) },
+	{ HP_POP(clif->guild_expulsion, HP_clif_guild_expulsion) },
+	{ HP_POP(clif->guild_positionchanged, HP_clif_guild_positionchanged) },
+	{ HP_POP(clif->guild_memberpositionchanged, HP_clif_guild_memberpositionchanged) },
+	{ HP_POP(clif->guild_emblem, HP_clif_guild_emblem) },
+	{ HP_POP(clif->guild_emblem_area, HP_clif_guild_emblem_area) },
+	{ HP_POP(clif->guild_notice, HP_clif_guild_notice) },
+	{ HP_POP(clif->guild_message, HP_clif_guild_message) },
+	{ HP_POP(clif->guild_skillup, HP_clif_guild_skillup) },
+	{ HP_POP(clif->guild_reqalliance, HP_clif_guild_reqalliance) },
+	{ HP_POP(clif->guild_allianceack, HP_clif_guild_allianceack) },
+	{ HP_POP(clif->guild_delalliance, HP_clif_guild_delalliance) },
+	{ HP_POP(clif->guild_oppositionack, HP_clif_guild_oppositionack) },
+	{ HP_POP(clif->guild_broken, HP_clif_guild_broken) },
+	{ HP_POP(clif->guild_xy, HP_clif_guild_xy) },
+	{ HP_POP(clif->guild_xy_single, HP_clif_guild_xy_single) },
+	{ HP_POP(clif->guild_xy_remove, HP_clif_guild_xy_remove) },
+	{ HP_POP(clif->guild_positionnamelist, HP_clif_guild_positionnamelist) },
+	{ HP_POP(clif->guild_positioninfolist, HP_clif_guild_positioninfolist) },
+	{ HP_POP(clif->guild_expulsionlist, HP_clif_guild_expulsionlist) },
+	{ HP_POP(clif->validate_emblem, HP_clif_validate_emblem) },
+	{ HP_POP(clif->bg_hp, HP_clif_bg_hp) },
+	{ HP_POP(clif->bg_xy, HP_clif_bg_xy) },
+	{ HP_POP(clif->bg_xy_remove, HP_clif_bg_xy_remove) },
+	{ HP_POP(clif->bg_message, HP_clif_bg_message) },
+	{ HP_POP(clif->bg_updatescore, HP_clif_bg_updatescore) },
+	{ HP_POP(clif->bg_updatescore_single, HP_clif_bg_updatescore_single) },
+	{ HP_POP(clif->sendbgemblem_area, HP_clif_sendbgemblem_area) },
+	{ HP_POP(clif->sendbgemblem_single, HP_clif_sendbgemblem_single) },
+	{ HP_POP(clif->instance, HP_clif_instance) },
+	{ HP_POP(clif->instance_join, HP_clif_instance_join) },
+	{ HP_POP(clif->instance_leave, HP_clif_instance_leave) },
+	{ HP_POP(clif->catch_process, HP_clif_catch_process) },
+	{ HP_POP(clif->pet_roulette, HP_clif_pet_roulette) },
+	{ HP_POP(clif->sendegg, HP_clif_sendegg) },
+	{ HP_POP(clif->send_petstatus, HP_clif_send_petstatus) },
+	{ HP_POP(clif->send_petdata, HP_clif_send_petdata) },
+	{ HP_POP(clif->pet_emotion, HP_clif_pet_emotion) },
+	{ HP_POP(clif->pet_food, HP_clif_pet_food) },
+	{ HP_POP(clif->friendslist_toggle_sub, HP_clif_friendslist_toggle_sub) },
+	{ HP_POP(clif->friendslist_send, HP_clif_friendslist_send) },
+	{ HP_POP(clif->friendslist_reqack, HP_clif_friendslist_reqack) },
+	{ HP_POP(clif->friendslist_toggle, HP_clif_friendslist_toggle) },
+	{ HP_POP(clif->friendlist_req, HP_clif_friendlist_req) },
+	{ HP_POP(clif->GM_kickack, HP_clif_GM_kickack) },
+	{ HP_POP(clif->GM_kick, HP_clif_GM_kick) },
+	{ HP_POP(clif->manner_message, HP_clif_manner_message) },
+	{ HP_POP(clif->GM_silence, HP_clif_GM_silence) },
+	{ HP_POP(clif->account_name, HP_clif_account_name) },
+	{ HP_POP(clif->check, HP_clif_check) },
+	{ HP_POP(clif->hominfo, HP_clif_hominfo) },
+	{ HP_POP(clif->homskillinfoblock, HP_clif_homskillinfoblock) },
+	{ HP_POP(clif->homskillup, HP_clif_homskillup) },
+	{ HP_POP(clif->hom_food, HP_clif_hom_food) },
+	{ HP_POP(clif->send_homdata, HP_clif_send_homdata) },
+	{ HP_POP(clif->quest_send_list, HP_clif_quest_send_list) },
+	{ HP_POP(clif->quest_send_mission, HP_clif_quest_send_mission) },
+	{ HP_POP(clif->quest_add, HP_clif_quest_add) },
+	{ HP_POP(clif->quest_delete, HP_clif_quest_delete) },
+	{ HP_POP(clif->quest_update_status, HP_clif_quest_update_status) },
+	{ HP_POP(clif->quest_update_objective, HP_clif_quest_update_objective) },
+	{ HP_POP(clif->quest_show_event, HP_clif_quest_show_event) },
+	{ HP_POP(clif->mail_window, HP_clif_mail_window) },
+	{ HP_POP(clif->mail_read, HP_clif_mail_read) },
+	{ HP_POP(clif->mail_delete, HP_clif_mail_delete) },
+	{ HP_POP(clif->mail_return, HP_clif_mail_return) },
+	{ HP_POP(clif->mail_send, HP_clif_mail_send) },
+	{ HP_POP(clif->mail_new, HP_clif_mail_new) },
+	{ HP_POP(clif->mail_refreshinbox, HP_clif_mail_refreshinbox) },
+	{ HP_POP(clif->mail_getattachment, HP_clif_mail_getattachment) },
+	{ HP_POP(clif->mail_setattachment, HP_clif_mail_setattachment) },
+	{ HP_POP(clif->auction_openwindow, HP_clif_auction_openwindow) },
+	{ HP_POP(clif->auction_results, HP_clif_auction_results) },
+	{ HP_POP(clif->auction_message, HP_clif_auction_message) },
+	{ HP_POP(clif->auction_close, HP_clif_auction_close) },
+	{ HP_POP(clif->auction_setitem, HP_clif_auction_setitem) },
+	{ HP_POP(clif->mercenary_info, HP_clif_mercenary_info) },
+	{ HP_POP(clif->mercenary_skillblock, HP_clif_mercenary_skillblock) },
+	{ HP_POP(clif->mercenary_message, HP_clif_mercenary_message) },
+	{ HP_POP(clif->mercenary_updatestatus, HP_clif_mercenary_updatestatus) },
+	{ HP_POP(clif->rental_time, HP_clif_rental_time) },
+	{ HP_POP(clif->rental_expired, HP_clif_rental_expired) },
+	{ HP_POP(clif->PartyBookingRegisterAck, HP_clif_PartyBookingRegisterAck) },
+	{ HP_POP(clif->PartyBookingDeleteAck, HP_clif_PartyBookingDeleteAck) },
+	{ HP_POP(clif->PartyBookingSearchAck, HP_clif_PartyBookingSearchAck) },
+	{ HP_POP(clif->PartyBookingUpdateNotify, HP_clif_PartyBookingUpdateNotify) },
+	{ HP_POP(clif->PartyBookingDeleteNotify, HP_clif_PartyBookingDeleteNotify) },
+	{ HP_POP(clif->PartyBookingInsertNotify, HP_clif_PartyBookingInsertNotify) },
+	{ HP_POP(clif->PartyRecruitRegisterAck, HP_clif_PartyRecruitRegisterAck) },
+	{ HP_POP(clif->PartyRecruitDeleteAck, HP_clif_PartyRecruitDeleteAck) },
+	{ HP_POP(clif->PartyRecruitSearchAck, HP_clif_PartyRecruitSearchAck) },
+	{ HP_POP(clif->PartyRecruitUpdateNotify, HP_clif_PartyRecruitUpdateNotify) },
+	{ HP_POP(clif->PartyRecruitDeleteNotify, HP_clif_PartyRecruitDeleteNotify) },
+	{ HP_POP(clif->PartyRecruitInsertNotify, HP_clif_PartyRecruitInsertNotify) },
+	{ HP_POP(clif->PartyBookingVolunteerInfo, HP_clif_PartyBookingVolunteerInfo) },
+	{ HP_POP(clif->PartyBookingRefuseVolunteer, HP_clif_PartyBookingRefuseVolunteer) },
+	{ HP_POP(clif->PartyBookingCancelVolunteer, HP_clif_PartyBookingCancelVolunteer) },
+	{ HP_POP(clif->PartyBookingAddFilteringList, HP_clif_PartyBookingAddFilteringList) },
+	{ HP_POP(clif->PartyBookingSubFilteringList, HP_clif_PartyBookingSubFilteringList) },
+	{ HP_POP(clif->buyingstore_open, HP_clif_buyingstore_open) },
+	{ HP_POP(clif->buyingstore_open_failed, HP_clif_buyingstore_open_failed) },
+	{ HP_POP(clif->buyingstore_myitemlist, HP_clif_buyingstore_myitemlist) },
+	{ HP_POP(clif->buyingstore_entry, HP_clif_buyingstore_entry) },
+	{ HP_POP(clif->buyingstore_entry_single, HP_clif_buyingstore_entry_single) },
+	{ HP_POP(clif->buyingstore_disappear_entry, HP_clif_buyingstore_disappear_entry) },
+	{ HP_POP(clif->buyingstore_disappear_entry_single, HP_clif_buyingstore_disappear_entry_single) },
+	{ HP_POP(clif->buyingstore_itemlist, HP_clif_buyingstore_itemlist) },
+	{ HP_POP(clif->buyingstore_trade_failed_buyer, HP_clif_buyingstore_trade_failed_buyer) },
+	{ HP_POP(clif->buyingstore_update_item, HP_clif_buyingstore_update_item) },
+	{ HP_POP(clif->buyingstore_delete_item, HP_clif_buyingstore_delete_item) },
+	{ HP_POP(clif->buyingstore_trade_failed_seller, HP_clif_buyingstore_trade_failed_seller) },
+	{ HP_POP(clif->search_store_info_ack, HP_clif_search_store_info_ack) },
+	{ HP_POP(clif->search_store_info_failed, HP_clif_search_store_info_failed) },
+	{ HP_POP(clif->open_search_store_info, HP_clif_open_search_store_info) },
+	{ HP_POP(clif->search_store_info_click_ack, HP_clif_search_store_info_click_ack) },
+	{ HP_POP(clif->elemental_info, HP_clif_elemental_info) },
+	{ HP_POP(clif->elemental_updatestatus, HP_clif_elemental_updatestatus) },
+	{ HP_POP(clif->bgqueue_ack, HP_clif_bgqueue_ack) },
+	{ HP_POP(clif->bgqueue_notice_delete, HP_clif_bgqueue_notice_delete) },
+	{ HP_POP(clif->bgqueue_update_info, HP_clif_bgqueue_update_info) },
+	{ HP_POP(clif->bgqueue_joined, HP_clif_bgqueue_joined) },
+	{ HP_POP(clif->bgqueue_pcleft, HP_clif_bgqueue_pcleft) },
+	{ HP_POP(clif->bgqueue_battlebegins, HP_clif_bgqueue_battlebegins) },
+	{ HP_POP(clif->adopt_reply, HP_clif_adopt_reply) },
+	{ HP_POP(clif->adopt_request, HP_clif_adopt_request) },
+	{ HP_POP(clif->readbook, HP_clif_readbook) },
+	{ HP_POP(clif->notify_time, HP_clif_notify_time) },
+	{ HP_POP(clif->user_count, HP_clif_user_count) },
+	{ HP_POP(clif->noask_sub, HP_clif_noask_sub) },
+	{ HP_POP(clif->bc_ready, HP_clif_bc_ready) },
+	{ HP_POP(clif->undisguise_timer, HP_clif_undisguise_timer) },
+	{ HP_POP(clif->chsys_create, HP_clif_chsys_create) },
+	{ HP_POP(clif->chsys_msg, HP_clif_chsys_msg) },
+	{ HP_POP(clif->chsys_msg2, HP_clif_chsys_msg2) },
+	{ HP_POP(clif->chsys_send, HP_clif_chsys_send) },
+	{ HP_POP(clif->chsys_join, HP_clif_chsys_join) },
+	{ HP_POP(clif->chsys_left, HP_clif_chsys_left) },
+	{ HP_POP(clif->chsys_delete, HP_clif_chsys_delete) },
+	{ HP_POP(clif->chsys_mjoin, HP_clif_chsys_mjoin) },
+	{ HP_POP(clif->chsys_quit, HP_clif_chsys_quit) },
+	{ HP_POP(clif->chsys_quitg, HP_clif_chsys_quitg) },
+	{ HP_POP(clif->chsys_gjoin, HP_clif_chsys_gjoin) },
+	{ HP_POP(clif->chsys_gleave, HP_clif_chsys_gleave) },
+	{ HP_POP(clif->bank_deposit, HP_clif_bank_deposit) },
+	{ HP_POP(clif->bank_withdraw, HP_clif_bank_withdraw) },
+	{ HP_POP(clif->pWantToConnection, HP_clif_pWantToConnection) },
+	{ HP_POP(clif->pLoadEndAck, HP_clif_pLoadEndAck) },
+	{ HP_POP(clif->pTickSend, HP_clif_pTickSend) },
+	{ HP_POP(clif->pHotkey, HP_clif_pHotkey) },
+	{ HP_POP(clif->pProgressbar, HP_clif_pProgressbar) },
+	{ HP_POP(clif->pWalkToXY, HP_clif_pWalkToXY) },
+	{ HP_POP(clif->pQuitGame, HP_clif_pQuitGame) },
+	{ HP_POP(clif->pGetCharNameRequest, HP_clif_pGetCharNameRequest) },
+	{ HP_POP(clif->pGlobalMessage, HP_clif_pGlobalMessage) },
+	{ HP_POP(clif->pMapMove, HP_clif_pMapMove) },
+	{ HP_POP(clif->pChangeDir, HP_clif_pChangeDir) },
+	{ HP_POP(clif->pEmotion, HP_clif_pEmotion) },
+	{ HP_POP(clif->pHowManyConnections, HP_clif_pHowManyConnections) },
+	{ HP_POP(clif->pActionRequest, HP_clif_pActionRequest) },
+	{ HP_POP(clif->pActionRequest_sub, HP_clif_pActionRequest_sub) },
+	{ HP_POP(clif->pRestart, HP_clif_pRestart) },
+	{ HP_POP(clif->pWisMessage, HP_clif_pWisMessage) },
+	{ HP_POP(clif->pBroadcast, HP_clif_pBroadcast) },
+	{ HP_POP(clif->pTakeItem, HP_clif_pTakeItem) },
+	{ HP_POP(clif->pDropItem, HP_clif_pDropItem) },
+	{ HP_POP(clif->pUseItem, HP_clif_pUseItem) },
+	{ HP_POP(clif->pEquipItem, HP_clif_pEquipItem) },
+	{ HP_POP(clif->pUnequipItem, HP_clif_pUnequipItem) },
+	{ HP_POP(clif->pNpcClicked, HP_clif_pNpcClicked) },
+	{ HP_POP(clif->pNpcBuySellSelected, HP_clif_pNpcBuySellSelected) },
+	{ HP_POP(clif->pNpcBuyListSend, HP_clif_pNpcBuyListSend) },
+	{ HP_POP(clif->pNpcSellListSend, HP_clif_pNpcSellListSend) },
+	{ HP_POP(clif->pCreateChatRoom, HP_clif_pCreateChatRoom) },
+	{ HP_POP(clif->pChatAddMember, HP_clif_pChatAddMember) },
+	{ HP_POP(clif->pChatRoomStatusChange, HP_clif_pChatRoomStatusChange) },
+	{ HP_POP(clif->pChangeChatOwner, HP_clif_pChangeChatOwner) },
+	{ HP_POP(clif->pKickFromChat, HP_clif_pKickFromChat) },
+	{ HP_POP(clif->pChatLeave, HP_clif_pChatLeave) },
+	{ HP_POP(clif->pTradeRequest, HP_clif_pTradeRequest) },
+	{ HP_POP(clif->chann_config_read, HP_clif_chann_config_read) },
+	{ HP_POP(clif->pTradeAck, HP_clif_pTradeAck) },
+	{ HP_POP(clif->pTradeAddItem, HP_clif_pTradeAddItem) },
+	{ HP_POP(clif->pTradeOk, HP_clif_pTradeOk) },
+	{ HP_POP(clif->pTradeCancel, HP_clif_pTradeCancel) },
+	{ HP_POP(clif->pTradeCommit, HP_clif_pTradeCommit) },
+	{ HP_POP(clif->pStopAttack, HP_clif_pStopAttack) },
+	{ HP_POP(clif->pPutItemToCart, HP_clif_pPutItemToCart) },
+	{ HP_POP(clif->pGetItemFromCart, HP_clif_pGetItemFromCart) },
+	{ HP_POP(clif->pRemoveOption, HP_clif_pRemoveOption) },
+	{ HP_POP(clif->pChangeCart, HP_clif_pChangeCart) },
+	{ HP_POP(clif->pStatusUp, HP_clif_pStatusUp) },
+	{ HP_POP(clif->pSkillUp, HP_clif_pSkillUp) },
+	{ HP_POP(clif->pUseSkillToId, HP_clif_pUseSkillToId) },
+	{ HP_POP(clif->pUseSkillToId_homun, HP_clif_pUseSkillToId_homun) },
+	{ HP_POP(clif->pUseSkillToId_mercenary, HP_clif_pUseSkillToId_mercenary) },
+	{ HP_POP(clif->pUseSkillToPos, HP_clif_pUseSkillToPos) },
+	{ HP_POP(clif->pUseSkillToPosSub, HP_clif_pUseSkillToPosSub) },
+	{ HP_POP(clif->pUseSkillToPos_homun, HP_clif_pUseSkillToPos_homun) },
+	{ HP_POP(clif->pUseSkillToPos_mercenary, HP_clif_pUseSkillToPos_mercenary) },
+	{ HP_POP(clif->pUseSkillToPosMoreInfo, HP_clif_pUseSkillToPosMoreInfo) },
+	{ HP_POP(clif->pUseSkillMap, HP_clif_pUseSkillMap) },
+	{ HP_POP(clif->pRequestMemo, HP_clif_pRequestMemo) },
+	{ HP_POP(clif->pProduceMix, HP_clif_pProduceMix) },
+	{ HP_POP(clif->pCooking, HP_clif_pCooking) },
+	{ HP_POP(clif->pRepairItem, HP_clif_pRepairItem) },
+	{ HP_POP(clif->pWeaponRefine, HP_clif_pWeaponRefine) },
+	{ HP_POP(clif->pNpcSelectMenu, HP_clif_pNpcSelectMenu) },
+	{ HP_POP(clif->pNpcNextClicked, HP_clif_pNpcNextClicked) },
+	{ HP_POP(clif->pNpcAmountInput, HP_clif_pNpcAmountInput) },
+	{ HP_POP(clif->pNpcStringInput, HP_clif_pNpcStringInput) },
+	{ HP_POP(clif->pNpcCloseClicked, HP_clif_pNpcCloseClicked) },
+	{ HP_POP(clif->pItemIdentify, HP_clif_pItemIdentify) },
+	{ HP_POP(clif->pSelectArrow, HP_clif_pSelectArrow) },
+	{ HP_POP(clif->pAutoSpell, HP_clif_pAutoSpell) },
+	{ HP_POP(clif->pUseCard, HP_clif_pUseCard) },
+	{ HP_POP(clif->pInsertCard, HP_clif_pInsertCard) },
+	{ HP_POP(clif->pSolveCharName, HP_clif_pSolveCharName) },
+	{ HP_POP(clif->pResetChar, HP_clif_pResetChar) },
+	{ HP_POP(clif->pLocalBroadcast, HP_clif_pLocalBroadcast) },
+	{ HP_POP(clif->pMoveToKafra, HP_clif_pMoveToKafra) },
+	{ HP_POP(clif->pMoveFromKafra, HP_clif_pMoveFromKafra) },
+	{ HP_POP(clif->pMoveToKafraFromCart, HP_clif_pMoveToKafraFromCart) },
+	{ HP_POP(clif->pMoveFromKafraToCart, HP_clif_pMoveFromKafraToCart) },
+	{ HP_POP(clif->pCloseKafra, HP_clif_pCloseKafra) },
+	{ HP_POP(clif->pStoragePassword, HP_clif_pStoragePassword) },
+	{ HP_POP(clif->pCreateParty, HP_clif_pCreateParty) },
+	{ HP_POP(clif->pCreateParty2, HP_clif_pCreateParty2) },
+	{ HP_POP(clif->pPartyInvite, HP_clif_pPartyInvite) },
+	{ HP_POP(clif->pPartyInvite2, HP_clif_pPartyInvite2) },
+	{ HP_POP(clif->pReplyPartyInvite, HP_clif_pReplyPartyInvite) },
+	{ HP_POP(clif->pReplyPartyInvite2, HP_clif_pReplyPartyInvite2) },
+	{ HP_POP(clif->pLeaveParty, HP_clif_pLeaveParty) },
+	{ HP_POP(clif->pRemovePartyMember, HP_clif_pRemovePartyMember) },
+	{ HP_POP(clif->pPartyChangeOption, HP_clif_pPartyChangeOption) },
+	{ HP_POP(clif->pPartyMessage, HP_clif_pPartyMessage) },
+	{ HP_POP(clif->pPartyChangeLeader, HP_clif_pPartyChangeLeader) },
+	{ HP_POP(clif->pPartyBookingRegisterReq, HP_clif_pPartyBookingRegisterReq) },
+	{ HP_POP(clif->pPartyBookingSearchReq, HP_clif_pPartyBookingSearchReq) },
+	{ HP_POP(clif->pPartyBookingDeleteReq, HP_clif_pPartyBookingDeleteReq) },
+	{ HP_POP(clif->pPartyBookingUpdateReq, HP_clif_pPartyBookingUpdateReq) },
+	{ HP_POP(clif->pPartyRecruitRegisterReq, HP_clif_pPartyRecruitRegisterReq) },
+	{ HP_POP(clif->pPartyRecruitSearchReq, HP_clif_pPartyRecruitSearchReq) },
+	{ HP_POP(clif->pPartyRecruitDeleteReq, HP_clif_pPartyRecruitDeleteReq) },
+	{ HP_POP(clif->pPartyRecruitUpdateReq, HP_clif_pPartyRecruitUpdateReq) },
+	{ HP_POP(clif->pCloseVending, HP_clif_pCloseVending) },
+	{ HP_POP(clif->pVendingListReq, HP_clif_pVendingListReq) },
+	{ HP_POP(clif->pPurchaseReq, HP_clif_pPurchaseReq) },
+	{ HP_POP(clif->pPurchaseReq2, HP_clif_pPurchaseReq2) },
+	{ HP_POP(clif->pOpenVending, HP_clif_pOpenVending) },
+	{ HP_POP(clif->pCreateGuild, HP_clif_pCreateGuild) },
+	{ HP_POP(clif->pGuildCheckMaster, HP_clif_pGuildCheckMaster) },
+	{ HP_POP(clif->pGuildRequestInfo, HP_clif_pGuildRequestInfo) },
+	{ HP_POP(clif->pGuildChangePositionInfo, HP_clif_pGuildChangePositionInfo) },
+	{ HP_POP(clif->pGuildChangeMemberPosition, HP_clif_pGuildChangeMemberPosition) },
+	{ HP_POP(clif->pGuildRequestEmblem, HP_clif_pGuildRequestEmblem) },
+	{ HP_POP(clif->pGuildChangeEmblem, HP_clif_pGuildChangeEmblem) },
+	{ HP_POP(clif->pGuildChangeNotice, HP_clif_pGuildChangeNotice) },
+	{ HP_POP(clif->pGuildInvite, HP_clif_pGuildInvite) },
+	{ HP_POP(clif->pGuildReplyInvite, HP_clif_pGuildReplyInvite) },
+	{ HP_POP(clif->pGuildLeave, HP_clif_pGuildLeave) },
+	{ HP_POP(clif->pGuildExpulsion, HP_clif_pGuildExpulsion) },
+	{ HP_POP(clif->pGuildMessage, HP_clif_pGuildMessage) },
+	{ HP_POP(clif->pGuildRequestAlliance, HP_clif_pGuildRequestAlliance) },
+	{ HP_POP(clif->pGuildReplyAlliance, HP_clif_pGuildReplyAlliance) },
+	{ HP_POP(clif->pGuildDelAlliance, HP_clif_pGuildDelAlliance) },
+	{ HP_POP(clif->pGuildOpposition, HP_clif_pGuildOpposition) },
+	{ HP_POP(clif->pGuildBreak, HP_clif_pGuildBreak) },
+	{ HP_POP(clif->pPetMenu, HP_clif_pPetMenu) },
+	{ HP_POP(clif->pCatchPet, HP_clif_pCatchPet) },
+	{ HP_POP(clif->pSelectEgg, HP_clif_pSelectEgg) },
+	{ HP_POP(clif->pSendEmotion, HP_clif_pSendEmotion) },
+	{ HP_POP(clif->pChangePetName, HP_clif_pChangePetName) },
+	{ HP_POP(clif->pGMKick, HP_clif_pGMKick) },
+	{ HP_POP(clif->pGMKickAll, HP_clif_pGMKickAll) },
+	{ HP_POP(clif->pGMShift, HP_clif_pGMShift) },
+	{ HP_POP(clif->pGMRemove2, HP_clif_pGMRemove2) },
+	{ HP_POP(clif->pGMRecall, HP_clif_pGMRecall) },
+	{ HP_POP(clif->pGMRecall2, HP_clif_pGMRecall2) },
+	{ HP_POP(clif->pGM_Monster_Item, HP_clif_pGM_Monster_Item) },
+	{ HP_POP(clif->pGMHide, HP_clif_pGMHide) },
+	{ HP_POP(clif->pGMReqNoChat, HP_clif_pGMReqNoChat) },
+	{ HP_POP(clif->pGMRc, HP_clif_pGMRc) },
+	{ HP_POP(clif->pGMReqAccountName, HP_clif_pGMReqAccountName) },
+	{ HP_POP(clif->pGMChangeMapType, HP_clif_pGMChangeMapType) },
+	{ HP_POP(clif->pPMIgnore, HP_clif_pPMIgnore) },
+	{ HP_POP(clif->pPMIgnoreAll, HP_clif_pPMIgnoreAll) },
+	{ HP_POP(clif->pPMIgnoreList, HP_clif_pPMIgnoreList) },
+	{ HP_POP(clif->pNoviceDoriDori, HP_clif_pNoviceDoriDori) },
+	{ HP_POP(clif->pNoviceExplosionSpirits, HP_clif_pNoviceExplosionSpirits) },
+	{ HP_POP(clif->pFriendsListAdd, HP_clif_pFriendsListAdd) },
+	{ HP_POP(clif->pFriendsListReply, HP_clif_pFriendsListReply) },
+	{ HP_POP(clif->pFriendsListRemove, HP_clif_pFriendsListRemove) },
+	{ HP_POP(clif->pPVPInfo, HP_clif_pPVPInfo) },
+	{ HP_POP(clif->pBlacksmith, HP_clif_pBlacksmith) },
+	{ HP_POP(clif->pAlchemist, HP_clif_pAlchemist) },
+	{ HP_POP(clif->pTaekwon, HP_clif_pTaekwon) },
+	{ HP_POP(clif->pRankingPk, HP_clif_pRankingPk) },
+	{ HP_POP(clif->pFeelSaveOk, HP_clif_pFeelSaveOk) },
+	{ HP_POP(clif->pChangeHomunculusName, HP_clif_pChangeHomunculusName) },
+	{ HP_POP(clif->pHomMoveToMaster, HP_clif_pHomMoveToMaster) },
+	{ HP_POP(clif->pHomMoveTo, HP_clif_pHomMoveTo) },
+	{ HP_POP(clif->pHomAttack, HP_clif_pHomAttack) },
+	{ HP_POP(clif->pHomMenu, HP_clif_pHomMenu) },
+	{ HP_POP(clif->pAutoRevive, HP_clif_pAutoRevive) },
+	{ HP_POP(clif->pCheck, HP_clif_pCheck) },
+	{ HP_POP(clif->pMail_refreshinbox, HP_clif_pMail_refreshinbox) },
+	{ HP_POP(clif->pMail_read, HP_clif_pMail_read) },
+	{ HP_POP(clif->pMail_getattach, HP_clif_pMail_getattach) },
+	{ HP_POP(clif->pMail_delete, HP_clif_pMail_delete) },
+	{ HP_POP(clif->pMail_return, HP_clif_pMail_return) },
+	{ HP_POP(clif->pMail_setattach, HP_clif_pMail_setattach) },
+	{ HP_POP(clif->pMail_winopen, HP_clif_pMail_winopen) },
+	{ HP_POP(clif->pMail_send, HP_clif_pMail_send) },
+	{ HP_POP(clif->pAuction_cancelreg, HP_clif_pAuction_cancelreg) },
+	{ HP_POP(clif->pAuction_setitem, HP_clif_pAuction_setitem) },
+	{ HP_POP(clif->pAuction_register, HP_clif_pAuction_register) },
+	{ HP_POP(clif->pAuction_cancel, HP_clif_pAuction_cancel) },
+	{ HP_POP(clif->pAuction_close, HP_clif_pAuction_close) },
+	{ HP_POP(clif->pAuction_bid, HP_clif_pAuction_bid) },
+	{ HP_POP(clif->pAuction_search, HP_clif_pAuction_search) },
+	{ HP_POP(clif->pAuction_buysell, HP_clif_pAuction_buysell) },
+	{ HP_POP(clif->pcashshop_buy, HP_clif_pcashshop_buy) },
+	{ HP_POP(clif->pAdopt_request, HP_clif_pAdopt_request) },
+	{ HP_POP(clif->pAdopt_reply, HP_clif_pAdopt_reply) },
+	{ HP_POP(clif->pViewPlayerEquip, HP_clif_pViewPlayerEquip) },
+	{ HP_POP(clif->pEquipTick, HP_clif_pEquipTick) },
+	{ HP_POP(clif->pquestStateAck, HP_clif_pquestStateAck) },
+	{ HP_POP(clif->pmercenary_action, HP_clif_pmercenary_action) },
+	{ HP_POP(clif->pBattleChat, HP_clif_pBattleChat) },
+	{ HP_POP(clif->pLessEffect, HP_clif_pLessEffect) },
+	{ HP_POP(clif->pItemListWindowSelected, HP_clif_pItemListWindowSelected) },
+	{ HP_POP(clif->pReqOpenBuyingStore, HP_clif_pReqOpenBuyingStore) },
+	{ HP_POP(clif->pReqCloseBuyingStore, HP_clif_pReqCloseBuyingStore) },
+	{ HP_POP(clif->pReqClickBuyingStore, HP_clif_pReqClickBuyingStore) },
+	{ HP_POP(clif->pReqTradeBuyingStore, HP_clif_pReqTradeBuyingStore) },
+	{ HP_POP(clif->pSearchStoreInfo, HP_clif_pSearchStoreInfo) },
+	{ HP_POP(clif->pSearchStoreInfoNextPage, HP_clif_pSearchStoreInfoNextPage) },
+	{ HP_POP(clif->pCloseSearchStoreInfo, HP_clif_pCloseSearchStoreInfo) },
+	{ HP_POP(clif->pSearchStoreInfoListItemClick, HP_clif_pSearchStoreInfoListItemClick) },
+	{ HP_POP(clif->pDebug, HP_clif_pDebug) },
+	{ HP_POP(clif->pSkillSelectMenu, HP_clif_pSkillSelectMenu) },
+	{ HP_POP(clif->pMoveItem, HP_clif_pMoveItem) },
+	{ HP_POP(clif->pDull, HP_clif_pDull) },
+	{ HP_POP(clif->pBGQueueRegister, HP_clif_pBGQueueRegister) },
+	{ HP_POP(clif->pBGQueueCheckState, HP_clif_pBGQueueCheckState) },
+	{ HP_POP(clif->pBGQueueRevokeReq, HP_clif_pBGQueueRevokeReq) },
+	{ HP_POP(clif->pBGQueueBattleBeginAck, HP_clif_pBGQueueBattleBeginAck) },
+	{ HP_POP(clif->pCashShopOpen, HP_clif_pCashShopOpen) },
+	{ HP_POP(clif->pCashShopClose, HP_clif_pCashShopClose) },
+	{ HP_POP(clif->pCashShopReqTab, HP_clif_pCashShopReqTab) },
+	{ HP_POP(clif->pCashShopSchedule, HP_clif_pCashShopSchedule) },
+	{ HP_POP(clif->pCashShopBuy, HP_clif_pCashShopBuy) },
+	{ HP_POP(clif->pPartyTick, HP_clif_pPartyTick) },
+	{ HP_POP(clif->pGuildInvite2, HP_clif_pGuildInvite2) },
+	{ HP_POP(clif->pPartyBookingAddFilter, HP_clif_pPartyBookingAddFilter) },
+	{ HP_POP(clif->pPartyBookingSubFilter, HP_clif_pPartyBookingSubFilter) },
+	{ HP_POP(clif->pPartyBookingReqVolunteer, HP_clif_pPartyBookingReqVolunteer) },
+	{ HP_POP(clif->pPartyBookingRefuseVolunteer, HP_clif_pPartyBookingRefuseVolunteer) },
+	{ HP_POP(clif->pPartyBookingCancelVolunteer, HP_clif_pPartyBookingCancelVolunteer) },
+	{ HP_POP(clif->pBankDeposit, HP_clif_pBankDeposit) },
+	{ HP_POP(clif->pBankWithdraw, HP_clif_pBankWithdraw) },
+	{ HP_POP(clif->pBankCheck, HP_clif_pBankCheck) },
+	{ HP_POP(clif->pBankOpen, HP_clif_pBankOpen) },
+	{ HP_POP(clif->pBankClose, HP_clif_pBankClose) },
 /* duel */
-	{ HP_POP(duel->create), HP_POP2(HP_duel_create), 1710 },
-	{ HP_POP(duel->invite), HP_POP2(HP_duel_invite), 1712 },
-	{ HP_POP(duel->accept), HP_POP2(HP_duel_accept), 1714 },
-	{ HP_POP(duel->reject), HP_POP2(HP_duel_reject), 1716 },
-	{ HP_POP(duel->leave), HP_POP2(HP_duel_leave), 1718 },
-	{ HP_POP(duel->showinfo), HP_POP2(HP_duel_showinfo), 1720 },
-	{ HP_POP(duel->checktime), HP_POP2(HP_duel_checktime), 1722 },
-	{ HP_POP(duel->init), HP_POP2(HP_duel_init), 1724 },
-	{ HP_POP(duel->final), HP_POP2(HP_duel_final), 1726 },
+	{ HP_POP(duel->create, HP_duel_create) },
+	{ HP_POP(duel->invite, HP_duel_invite) },
+	{ HP_POP(duel->accept, HP_duel_accept) },
+	{ HP_POP(duel->reject, HP_duel_reject) },
+	{ HP_POP(duel->leave, HP_duel_leave) },
+	{ HP_POP(duel->showinfo, HP_duel_showinfo) },
+	{ HP_POP(duel->checktime, HP_duel_checktime) },
+	{ HP_POP(duel->init, HP_duel_init) },
+	{ HP_POP(duel->final, HP_duel_final) },
 /* elemental */
-	{ HP_POP(elemental->init), HP_POP2(HP_elemental_init), 1728 },
-	{ HP_POP(elemental->final), HP_POP2(HP_elemental_final), 1730 },
-	{ HP_POP(elemental->class), HP_POP2(HP_elemental_class), 1732 },
-	{ HP_POP(elemental->get_viewdata), HP_POP2(HP_elemental_get_viewdata), 1734 },
-	{ HP_POP(elemental->create), HP_POP2(HP_elemental_create), 1736 },
-	{ HP_POP(elemental->data_received), HP_POP2(HP_elemental_data_received), 1738 },
-	{ HP_POP(elemental->save), HP_POP2(HP_elemental_save), 1740 },
-	{ HP_POP(elemental->change_mode_ack), HP_POP2(HP_elemental_change_mode_ack), 1742 },
-	{ HP_POP(elemental->change_mode), HP_POP2(HP_elemental_change_mode), 1744 },
-	{ HP_POP(elemental->heal), HP_POP2(HP_elemental_heal), 1746 },
-	{ HP_POP(elemental->dead), HP_POP2(HP_elemental_dead), 1748 },
-	{ HP_POP(elemental->delete), HP_POP2(HP_elemental_delete), 1750 },
-	{ HP_POP(elemental->summon_stop), HP_POP2(HP_elemental_summon_stop), 1752 },
-	{ HP_POP(elemental->get_lifetime), HP_POP2(HP_elemental_get_lifetime), 1754 },
-	{ HP_POP(elemental->unlocktarget), HP_POP2(HP_elemental_unlocktarget), 1756 },
-	{ HP_POP(elemental->skillnotok), HP_POP2(HP_elemental_skillnotok), 1758 },
-	{ HP_POP(elemental->set_target), HP_POP2(HP_elemental_set_target), 1760 },
-	{ HP_POP(elemental->clean_single_effect), HP_POP2(HP_elemental_clean_single_effect), 1762 },
-	{ HP_POP(elemental->clean_effect), HP_POP2(HP_elemental_clean_effect), 1764 },
-	{ HP_POP(elemental->action), HP_POP2(HP_elemental_action), 1766 },
-	{ HP_POP(elemental->skill_get_requirements), HP_POP2(HP_elemental_skill_get_requirements), 1768 },
-	{ HP_POP(elemental->read_skilldb), HP_POP2(HP_elemental_read_skilldb), 1770 },
-	{ HP_POP(elemental->reload_db), HP_POP2(HP_elemental_reload_db), 1772 },
-	{ HP_POP(elemental->reload_skilldb), HP_POP2(HP_elemental_reload_skilldb), 1774 },
-	{ HP_POP(elemental->search_index), HP_POP2(HP_elemental_search_index), 1776 },
-	{ HP_POP(elemental->summon_init), HP_POP2(HP_elemental_summon_init), 1778 },
-	{ HP_POP(elemental->summon_end_timer), HP_POP2(HP_elemental_summon_end_timer), 1780 },
-	{ HP_POP(elemental->ai_sub_timer_activesearch), HP_POP2(HP_elemental_ai_sub_timer_activesearch), 1782 },
-	{ HP_POP(elemental->ai_sub_timer), HP_POP2(HP_elemental_ai_sub_timer), 1784 },
-	{ HP_POP(elemental->ai_sub_foreachclient), HP_POP2(HP_elemental_ai_sub_foreachclient), 1786 },
-	{ HP_POP(elemental->ai_timer), HP_POP2(HP_elemental_ai_timer), 1788 },
-	{ HP_POP(elemental->read_db), HP_POP2(HP_elemental_read_db), 1790 },
+	{ HP_POP(elemental->init, HP_elemental_init) },
+	{ HP_POP(elemental->final, HP_elemental_final) },
+	{ HP_POP(elemental->class, HP_elemental_class) },
+	{ HP_POP(elemental->get_viewdata, HP_elemental_get_viewdata) },
+	{ HP_POP(elemental->create, HP_elemental_create) },
+	{ HP_POP(elemental->data_received, HP_elemental_data_received) },
+	{ HP_POP(elemental->save, HP_elemental_save) },
+	{ HP_POP(elemental->change_mode_ack, HP_elemental_change_mode_ack) },
+	{ HP_POP(elemental->change_mode, HP_elemental_change_mode) },
+	{ HP_POP(elemental->heal, HP_elemental_heal) },
+	{ HP_POP(elemental->dead, HP_elemental_dead) },
+	{ HP_POP(elemental->delete, HP_elemental_delete) },
+	{ HP_POP(elemental->summon_stop, HP_elemental_summon_stop) },
+	{ HP_POP(elemental->get_lifetime, HP_elemental_get_lifetime) },
+	{ HP_POP(elemental->unlocktarget, HP_elemental_unlocktarget) },
+	{ HP_POP(elemental->skillnotok, HP_elemental_skillnotok) },
+	{ HP_POP(elemental->set_target, HP_elemental_set_target) },
+	{ HP_POP(elemental->clean_single_effect, HP_elemental_clean_single_effect) },
+	{ HP_POP(elemental->clean_effect, HP_elemental_clean_effect) },
+	{ HP_POP(elemental->action, HP_elemental_action) },
+	{ HP_POP(elemental->skill_get_requirements, HP_elemental_skill_get_requirements) },
+	{ HP_POP(elemental->read_skilldb, HP_elemental_read_skilldb) },
+	{ HP_POP(elemental->reload_db, HP_elemental_reload_db) },
+	{ HP_POP(elemental->reload_skilldb, HP_elemental_reload_skilldb) },
+	{ HP_POP(elemental->search_index, HP_elemental_search_index) },
+	{ HP_POP(elemental->summon_init, HP_elemental_summon_init) },
+	{ HP_POP(elemental->summon_end_timer, HP_elemental_summon_end_timer) },
+	{ HP_POP(elemental->ai_sub_timer_activesearch, HP_elemental_ai_sub_timer_activesearch) },
+	{ HP_POP(elemental->ai_sub_timer, HP_elemental_ai_sub_timer) },
+	{ HP_POP(elemental->ai_sub_foreachclient, HP_elemental_ai_sub_foreachclient) },
+	{ HP_POP(elemental->ai_timer, HP_elemental_ai_timer) },
+	{ HP_POP(elemental->read_db, HP_elemental_read_db) },
 /* guild */
-	{ HP_POP(guild->init), HP_POP2(HP_guild_init), 1792 },
-	{ HP_POP(guild->final), HP_POP2(HP_guild_final), 1794 },
-	{ HP_POP(guild->skill_get_max), HP_POP2(HP_guild_skill_get_max), 1796 },
-	{ HP_POP(guild->checkskill), HP_POP2(HP_guild_checkskill), 1798 },
-	{ HP_POP(guild->check_skill_require), HP_POP2(HP_guild_check_skill_require), 1800 },
-	{ HP_POP(guild->checkcastles), HP_POP2(HP_guild_checkcastles), 1802 },
-	{ HP_POP(guild->isallied), HP_POP2(HP_guild_isallied), 1804 },
-	{ HP_POP(guild->search), HP_POP2(HP_guild_search), 1806 },
-	{ HP_POP(guild->searchname), HP_POP2(HP_guild_searchname), 1808 },
-	{ HP_POP(guild->castle_search), HP_POP2(HP_guild_castle_search), 1810 },
-	{ HP_POP(guild->mapname2gc), HP_POP2(HP_guild_mapname2gc), 1812 },
-	{ HP_POP(guild->mapindex2gc), HP_POP2(HP_guild_mapindex2gc), 1814 },
-	{ HP_POP(guild->getavailablesd), HP_POP2(HP_guild_getavailablesd), 1816 },
-	{ HP_POP(guild->getindex), HP_POP2(HP_guild_getindex), 1818 },
-	{ HP_POP(guild->getposition), HP_POP2(HP_guild_getposition), 1820 },
-	{ HP_POP(guild->payexp), HP_POP2(HP_guild_payexp), 1822 },
-	{ HP_POP(guild->getexp), HP_POP2(HP_guild_getexp), 1824 },
-	{ HP_POP(guild->create), HP_POP2(HP_guild_create), 1826 },
-	{ HP_POP(guild->created), HP_POP2(HP_guild_created), 1828 },
-	{ HP_POP(guild->request_info), HP_POP2(HP_guild_request_info), 1830 },
-	{ HP_POP(guild->recv_noinfo), HP_POP2(HP_guild_recv_noinfo), 1832 },
-	{ HP_POP(guild->recv_info), HP_POP2(HP_guild_recv_info), 1834 },
-	{ HP_POP(guild->npc_request_info), HP_POP2(HP_guild_npc_request_info), 1836 },
-	{ HP_POP(guild->invite), HP_POP2(HP_guild_invite), 1838 },
-	{ HP_POP(guild->reply_invite), HP_POP2(HP_guild_reply_invite), 1840 },
-	{ HP_POP(guild->member_joined), HP_POP2(HP_guild_member_joined), 1842 },
-	{ HP_POP(guild->member_added), HP_POP2(HP_guild_member_added), 1844 },
-	{ HP_POP(guild->leave), HP_POP2(HP_guild_leave), 1846 },
-	{ HP_POP(guild->member_withdraw), HP_POP2(HP_guild_member_withdraw), 1848 },
-	{ HP_POP(guild->expulsion), HP_POP2(HP_guild_expulsion), 1850 },
-	{ HP_POP(guild->skillup), HP_POP2(HP_guild_skillup), 1852 },
-	{ HP_POP(guild->block_skill), HP_POP2(HP_guild_block_skill), 1854 },
-	{ HP_POP(guild->reqalliance), HP_POP2(HP_guild_reqalliance), 1856 },
-	{ HP_POP(guild->reply_reqalliance), HP_POP2(HP_guild_reply_reqalliance), 1858 },
-	{ HP_POP(guild->allianceack), HP_POP2(HP_guild_allianceack), 1860 },
-	{ HP_POP(guild->delalliance), HP_POP2(HP_guild_delalliance), 1862 },
-	{ HP_POP(guild->opposition), HP_POP2(HP_guild_opposition), 1864 },
-	{ HP_POP(guild->check_alliance), HP_POP2(HP_guild_check_alliance), 1866 },
-	{ HP_POP(guild->send_memberinfoshort), HP_POP2(HP_guild_send_memberinfoshort), 1868 },
-	{ HP_POP(guild->recv_memberinfoshort), HP_POP2(HP_guild_recv_memberinfoshort), 1870 },
-	{ HP_POP(guild->change_memberposition), HP_POP2(HP_guild_change_memberposition), 1872 },
-	{ HP_POP(guild->memberposition_changed), HP_POP2(HP_guild_memberposition_changed), 1874 },
-	{ HP_POP(guild->change_position), HP_POP2(HP_guild_change_position), 1876 },
-	{ HP_POP(guild->position_changed), HP_POP2(HP_guild_position_changed), 1878 },
-	{ HP_POP(guild->change_notice), HP_POP2(HP_guild_change_notice), 1880 },
-	{ HP_POP(guild->notice_changed), HP_POP2(HP_guild_notice_changed), 1882 },
-	{ HP_POP(guild->change_emblem), HP_POP2(HP_guild_change_emblem), 1884 },
-	{ HP_POP(guild->emblem_changed), HP_POP2(HP_guild_emblem_changed), 1886 },
-	{ HP_POP(guild->send_message), HP_POP2(HP_guild_send_message), 1888 },
-	{ HP_POP(guild->recv_message), HP_POP2(HP_guild_recv_message), 1890 },
-	{ HP_POP(guild->send_dot_remove), HP_POP2(HP_guild_send_dot_remove), 1892 },
-	{ HP_POP(guild->skillupack), HP_POP2(HP_guild_skillupack), 1894 },
-	{ HP_POP(guild->dobreak), HP_POP2(HP_guild_dobreak), 1896 },
-	{ HP_POP(guild->broken), HP_POP2(HP_guild_broken), 1898 },
-	{ HP_POP(guild->gm_change), HP_POP2(HP_guild_gm_change), 1900 },
-	{ HP_POP(guild->gm_changed), HP_POP2(HP_guild_gm_changed), 1902 },
-	{ HP_POP(guild->castle_map_init), HP_POP2(HP_guild_castle_map_init), 1904 },
-	{ HP_POP(guild->castledatasave), HP_POP2(HP_guild_castledatasave), 1906 },
-	{ HP_POP(guild->castledataloadack), HP_POP2(HP_guild_castledataloadack), 1908 },
-	{ HP_POP(guild->castle_reconnect), HP_POP2(HP_guild_castle_reconnect), 1910 },
-	{ HP_POP(guild->agit_start), HP_POP2(HP_guild_agit_start), 1912 },
-	{ HP_POP(guild->agit_end), HP_POP2(HP_guild_agit_end), 1914 },
-	{ HP_POP(guild->agit2_start), HP_POP2(HP_guild_agit2_start), 1916 },
-	{ HP_POP(guild->agit2_end), HP_POP2(HP_guild_agit2_end), 1918 },
-	{ HP_POP(guild->flag_add), HP_POP2(HP_guild_flag_add), 1920 },
-	{ HP_POP(guild->flag_remove), HP_POP2(HP_guild_flag_remove), 1922 },
-	{ HP_POP(guild->flags_clear), HP_POP2(HP_guild_flags_clear), 1924 },
-	{ HP_POP(guild->aura_refresh), HP_POP2(HP_guild_aura_refresh), 1926 },
-	{ HP_POP(guild->payexp_timer), HP_POP2(HP_guild_payexp_timer), 1928 },
-	{ HP_POP(guild->sd_check), HP_POP2(HP_guild_sd_check), 1930 },
-	{ HP_POP(guild->read_guildskill_tree_db), HP_POP2(HP_guild_read_guildskill_tree_db), 1932 },
-	{ HP_POP(guild->read_castledb), HP_POP2(HP_guild_read_castledb), 1934 },
-	{ HP_POP(guild->payexp_timer_sub), HP_POP2(HP_guild_payexp_timer_sub), 1936 },
-	{ HP_POP(guild->send_xy_timer_sub), HP_POP2(HP_guild_send_xy_timer_sub), 1938 },
-	{ HP_POP(guild->send_xy_timer), HP_POP2(HP_guild_send_xy_timer), 1940 },
-	{ HP_POP(guild->create_expcache), HP_POP2(HP_guild_create_expcache), 1942 },
-	{ HP_POP(guild->eventlist_db_final), HP_POP2(HP_guild_eventlist_db_final), 1944 },
-	{ HP_POP(guild->expcache_db_final), HP_POP2(HP_guild_expcache_db_final), 1946 },
-	{ HP_POP(guild->castle_db_final), HP_POP2(HP_guild_castle_db_final), 1948 },
-	{ HP_POP(guild->broken_sub), HP_POP2(HP_guild_broken_sub), 1950 },
-	{ HP_POP(guild->castle_broken_sub), HP_POP2(HP_guild_castle_broken_sub), 1952 },
-	{ HP_POP(guild->makemember), HP_POP2(HP_guild_makemember), 1954 },
-	{ HP_POP(guild->check_member), HP_POP2(HP_guild_check_member), 1956 },
-	{ HP_POP(guild->get_alliance_count), HP_POP2(HP_guild_get_alliance_count), 1958 },
-	{ HP_POP(guild->castle_reconnect_sub), HP_POP2(HP_guild_castle_reconnect_sub), 1960 },
+	{ HP_POP(guild->init, HP_guild_init) },
+	{ HP_POP(guild->final, HP_guild_final) },
+	{ HP_POP(guild->skill_get_max, HP_guild_skill_get_max) },
+	{ HP_POP(guild->checkskill, HP_guild_checkskill) },
+	{ HP_POP(guild->check_skill_require, HP_guild_check_skill_require) },
+	{ HP_POP(guild->checkcastles, HP_guild_checkcastles) },
+	{ HP_POP(guild->isallied, HP_guild_isallied) },
+	{ HP_POP(guild->search, HP_guild_search) },
+	{ HP_POP(guild->searchname, HP_guild_searchname) },
+	{ HP_POP(guild->castle_search, HP_guild_castle_search) },
+	{ HP_POP(guild->mapname2gc, HP_guild_mapname2gc) },
+	{ HP_POP(guild->mapindex2gc, HP_guild_mapindex2gc) },
+	{ HP_POP(guild->getavailablesd, HP_guild_getavailablesd) },
+	{ HP_POP(guild->getindex, HP_guild_getindex) },
+	{ HP_POP(guild->getposition, HP_guild_getposition) },
+	{ HP_POP(guild->payexp, HP_guild_payexp) },
+	{ HP_POP(guild->getexp, HP_guild_getexp) },
+	{ HP_POP(guild->create, HP_guild_create) },
+	{ HP_POP(guild->created, HP_guild_created) },
+	{ HP_POP(guild->request_info, HP_guild_request_info) },
+	{ HP_POP(guild->recv_noinfo, HP_guild_recv_noinfo) },
+	{ HP_POP(guild->recv_info, HP_guild_recv_info) },
+	{ HP_POP(guild->npc_request_info, HP_guild_npc_request_info) },
+	{ HP_POP(guild->invite, HP_guild_invite) },
+	{ HP_POP(guild->reply_invite, HP_guild_reply_invite) },
+	{ HP_POP(guild->member_joined, HP_guild_member_joined) },
+	{ HP_POP(guild->member_added, HP_guild_member_added) },
+	{ HP_POP(guild->leave, HP_guild_leave) },
+	{ HP_POP(guild->member_withdraw, HP_guild_member_withdraw) },
+	{ HP_POP(guild->expulsion, HP_guild_expulsion) },
+	{ HP_POP(guild->skillup, HP_guild_skillup) },
+	{ HP_POP(guild->block_skill, HP_guild_block_skill) },
+	{ HP_POP(guild->reqalliance, HP_guild_reqalliance) },
+	{ HP_POP(guild->reply_reqalliance, HP_guild_reply_reqalliance) },
+	{ HP_POP(guild->allianceack, HP_guild_allianceack) },
+	{ HP_POP(guild->delalliance, HP_guild_delalliance) },
+	{ HP_POP(guild->opposition, HP_guild_opposition) },
+	{ HP_POP(guild->check_alliance, HP_guild_check_alliance) },
+	{ HP_POP(guild->send_memberinfoshort, HP_guild_send_memberinfoshort) },
+	{ HP_POP(guild->recv_memberinfoshort, HP_guild_recv_memberinfoshort) },
+	{ HP_POP(guild->change_memberposition, HP_guild_change_memberposition) },
+	{ HP_POP(guild->memberposition_changed, HP_guild_memberposition_changed) },
+	{ HP_POP(guild->change_position, HP_guild_change_position) },
+	{ HP_POP(guild->position_changed, HP_guild_position_changed) },
+	{ HP_POP(guild->change_notice, HP_guild_change_notice) },
+	{ HP_POP(guild->notice_changed, HP_guild_notice_changed) },
+	{ HP_POP(guild->change_emblem, HP_guild_change_emblem) },
+	{ HP_POP(guild->emblem_changed, HP_guild_emblem_changed) },
+	{ HP_POP(guild->send_message, HP_guild_send_message) },
+	{ HP_POP(guild->recv_message, HP_guild_recv_message) },
+	{ HP_POP(guild->send_dot_remove, HP_guild_send_dot_remove) },
+	{ HP_POP(guild->skillupack, HP_guild_skillupack) },
+	{ HP_POP(guild->dobreak, HP_guild_dobreak) },
+	{ HP_POP(guild->broken, HP_guild_broken) },
+	{ HP_POP(guild->gm_change, HP_guild_gm_change) },
+	{ HP_POP(guild->gm_changed, HP_guild_gm_changed) },
+	{ HP_POP(guild->castle_map_init, HP_guild_castle_map_init) },
+	{ HP_POP(guild->castledatasave, HP_guild_castledatasave) },
+	{ HP_POP(guild->castledataloadack, HP_guild_castledataloadack) },
+	{ HP_POP(guild->castle_reconnect, HP_guild_castle_reconnect) },
+	{ HP_POP(guild->agit_start, HP_guild_agit_start) },
+	{ HP_POP(guild->agit_end, HP_guild_agit_end) },
+	{ HP_POP(guild->agit2_start, HP_guild_agit2_start) },
+	{ HP_POP(guild->agit2_end, HP_guild_agit2_end) },
+	{ HP_POP(guild->flag_add, HP_guild_flag_add) },
+	{ HP_POP(guild->flag_remove, HP_guild_flag_remove) },
+	{ HP_POP(guild->flags_clear, HP_guild_flags_clear) },
+	{ HP_POP(guild->aura_refresh, HP_guild_aura_refresh) },
+	{ HP_POP(guild->payexp_timer, HP_guild_payexp_timer) },
+	{ HP_POP(guild->sd_check, HP_guild_sd_check) },
+	{ HP_POP(guild->read_guildskill_tree_db, HP_guild_read_guildskill_tree_db) },
+	{ HP_POP(guild->read_castledb, HP_guild_read_castledb) },
+	{ HP_POP(guild->payexp_timer_sub, HP_guild_payexp_timer_sub) },
+	{ HP_POP(guild->send_xy_timer_sub, HP_guild_send_xy_timer_sub) },
+	{ HP_POP(guild->send_xy_timer, HP_guild_send_xy_timer) },
+	{ HP_POP(guild->create_expcache, HP_guild_create_expcache) },
+	{ HP_POP(guild->eventlist_db_final, HP_guild_eventlist_db_final) },
+	{ HP_POP(guild->expcache_db_final, HP_guild_expcache_db_final) },
+	{ HP_POP(guild->castle_db_final, HP_guild_castle_db_final) },
+	{ HP_POP(guild->broken_sub, HP_guild_broken_sub) },
+	{ HP_POP(guild->castle_broken_sub, HP_guild_castle_broken_sub) },
+	{ HP_POP(guild->makemember, HP_guild_makemember) },
+	{ HP_POP(guild->check_member, HP_guild_check_member) },
+	{ HP_POP(guild->get_alliance_count, HP_guild_get_alliance_count) },
+	{ HP_POP(guild->castle_reconnect_sub, HP_guild_castle_reconnect_sub) },
 /* gstorage */
-	{ HP_POP(gstorage->id2storage), HP_POP2(HP_gstorage_id2storage), 1962 },
-	{ HP_POP(gstorage->id2storage2), HP_POP2(HP_gstorage_id2storage2), 1964 },
-	{ HP_POP(gstorage->init), HP_POP2(HP_gstorage_init), 1966 },
-	{ HP_POP(gstorage->final), HP_POP2(HP_gstorage_final), 1968 },
-	{ HP_POP(gstorage->delete), HP_POP2(HP_gstorage_delete), 1970 },
-	{ HP_POP(gstorage->open), HP_POP2(HP_gstorage_open), 1972 },
-	{ HP_POP(gstorage->additem), HP_POP2(HP_gstorage_additem), 1974 },
-	{ HP_POP(gstorage->delitem), HP_POP2(HP_gstorage_delitem), 1976 },
-	{ HP_POP(gstorage->add), HP_POP2(HP_gstorage_add), 1978 },
-	{ HP_POP(gstorage->get), HP_POP2(HP_gstorage_get), 1980 },
-	{ HP_POP(gstorage->addfromcart), HP_POP2(HP_gstorage_addfromcart), 1982 },
-	{ HP_POP(gstorage->gettocart), HP_POP2(HP_gstorage_gettocart), 1984 },
-	{ HP_POP(gstorage->close), HP_POP2(HP_gstorage_close), 1986 },
-	{ HP_POP(gstorage->pc_quit), HP_POP2(HP_gstorage_pc_quit), 1988 },
-	{ HP_POP(gstorage->save), HP_POP2(HP_gstorage_save), 1990 },
-	{ HP_POP(gstorage->saved), HP_POP2(HP_gstorage_saved), 1992 },
-	{ HP_POP(gstorage->create), HP_POP2(HP_gstorage_create), 1994 },
+	{ HP_POP(gstorage->id2storage, HP_gstorage_id2storage) },
+	{ HP_POP(gstorage->id2storage2, HP_gstorage_id2storage2) },
+	{ HP_POP(gstorage->init, HP_gstorage_init) },
+	{ HP_POP(gstorage->final, HP_gstorage_final) },
+	{ HP_POP(gstorage->delete, HP_gstorage_delete) },
+	{ HP_POP(gstorage->open, HP_gstorage_open) },
+	{ HP_POP(gstorage->additem, HP_gstorage_additem) },
+	{ HP_POP(gstorage->delitem, HP_gstorage_delitem) },
+	{ HP_POP(gstorage->add, HP_gstorage_add) },
+	{ HP_POP(gstorage->get, HP_gstorage_get) },
+	{ HP_POP(gstorage->addfromcart, HP_gstorage_addfromcart) },
+	{ HP_POP(gstorage->gettocart, HP_gstorage_gettocart) },
+	{ HP_POP(gstorage->close, HP_gstorage_close) },
+	{ HP_POP(gstorage->pc_quit, HP_gstorage_pc_quit) },
+	{ HP_POP(gstorage->save, HP_gstorage_save) },
+	{ HP_POP(gstorage->saved, HP_gstorage_saved) },
+	{ HP_POP(gstorage->create, HP_gstorage_create) },
 /* homun */
-	{ HP_POP(homun->init), HP_POP2(HP_homun_init), 1996 },
-	{ HP_POP(homun->final), HP_POP2(HP_homun_final), 1998 },
-	{ HP_POP(homun->reload), HP_POP2(HP_homun_reload), 2000 },
-	{ HP_POP(homun->reload_skill), HP_POP2(HP_homun_reload_skill), 2002 },
-	{ HP_POP(homun->get_viewdata), HP_POP2(HP_homun_get_viewdata), 2004 },
-	{ HP_POP(homun->class2type), HP_POP2(HP_homun_class2type), 2006 },
-	{ HP_POP(homun->damaged), HP_POP2(HP_homun_damaged), 2008 },
-	{ HP_POP(homun->dead), HP_POP2(HP_homun_dead), 2010 },
-	{ HP_POP(homun->vaporize), HP_POP2(HP_homun_vaporize), 2012 },
-	{ HP_POP(homun->delete), HP_POP2(HP_homun_delete), 2014 },
-	{ HP_POP(homun->checkskill), HP_POP2(HP_homun_checkskill), 2016 },
-	{ HP_POP(homun->calc_skilltree), HP_POP2(HP_homun_calc_skilltree), 2018 },
-	{ HP_POP(homun->skill_tree_get_max), HP_POP2(HP_homun_skill_tree_get_max), 2020 },
-	{ HP_POP(homun->skillup), HP_POP2(HP_homun_skillup), 2022 },
-	{ HP_POP(homun->levelup), HP_POP2(HP_homun_levelup), 2024 },
-	{ HP_POP(homun->change_class), HP_POP2(HP_homun_change_class), 2026 },
-	{ HP_POP(homun->evolve), HP_POP2(HP_homun_evolve), 2028 },
-	{ HP_POP(homun->mutate), HP_POP2(HP_homun_mutate), 2030 },
-	{ HP_POP(homun->gainexp), HP_POP2(HP_homun_gainexp), 2032 },
-	{ HP_POP(homun->add_intimacy), HP_POP2(HP_homun_add_intimacy), 2034 },
-	{ HP_POP(homun->consume_intimacy), HP_POP2(HP_homun_consume_intimacy), 2036 },
-	{ HP_POP(homun->healed), HP_POP2(HP_homun_healed), 2038 },
-	{ HP_POP(homun->save), HP_POP2(HP_homun_save), 2040 },
-	{ HP_POP(homun->menu), HP_POP2(HP_homun_menu), 2042 },
-	{ HP_POP(homun->feed), HP_POP2(HP_homun_feed), 2044 },
-	{ HP_POP(homun->hunger_timer), HP_POP2(HP_homun_hunger_timer), 2046 },
-	{ HP_POP(homun->hunger_timer_delete), HP_POP2(HP_homun_hunger_timer_delete), 2048 },
-	{ HP_POP(homun->change_name), HP_POP2(HP_homun_change_name), 2050 },
-	{ HP_POP(homun->change_name_ack), HP_POP2(HP_homun_change_name_ack), 2052 },
-	{ HP_POP(homun->db_search), HP_POP2(HP_homun_db_search), 2054 },
-	{ HP_POP(homun->create), HP_POP2(HP_homun_create), 2056 },
-	{ HP_POP(homun->init_timers), HP_POP2(HP_homun_init_timers), 2058 },
-	{ HP_POP(homun->call), HP_POP2(HP_homun_call), 2060 },
-	{ HP_POP(homun->recv_data), HP_POP2(HP_homun_recv_data), 2062 },
-	{ HP_POP(homun->creation_request), HP_POP2(HP_homun_creation_request), 2064 },
-	{ HP_POP(homun->ressurect), HP_POP2(HP_homun_ressurect), 2066 },
-	{ HP_POP(homun->revive), HP_POP2(HP_homun_revive), 2068 },
-	{ HP_POP(homun->stat_reset), HP_POP2(HP_homun_stat_reset), 2070 },
-	{ HP_POP(homun->shuffle), HP_POP2(HP_homun_shuffle), 2072 },
-	{ HP_POP(homun->read_db_sub), HP_POP2(HP_homun_read_db_sub), 2074 },
-	{ HP_POP(homun->read_db), HP_POP2(HP_homun_read_db), 2076 },
-	{ HP_POP(homun->read_skill_db_sub), HP_POP2(HP_homun_read_skill_db_sub), 2078 },
-	{ HP_POP(homun->skill_db_read), HP_POP2(HP_homun_skill_db_read), 2080 },
-	{ HP_POP(homun->exp_db_read), HP_POP2(HP_homun_exp_db_read), 2082 },
-	{ HP_POP(homun->addspiritball), HP_POP2(HP_homun_addspiritball), 2084 },
-	{ HP_POP(homun->delspiritball), HP_POP2(HP_homun_delspiritball), 2086 },
+	{ HP_POP(homun->init, HP_homun_init) },
+	{ HP_POP(homun->final, HP_homun_final) },
+	{ HP_POP(homun->reload, HP_homun_reload) },
+	{ HP_POP(homun->reload_skill, HP_homun_reload_skill) },
+	{ HP_POP(homun->get_viewdata, HP_homun_get_viewdata) },
+	{ HP_POP(homun->class2type, HP_homun_class2type) },
+	{ HP_POP(homun->damaged, HP_homun_damaged) },
+	{ HP_POP(homun->dead, HP_homun_dead) },
+	{ HP_POP(homun->vaporize, HP_homun_vaporize) },
+	{ HP_POP(homun->delete, HP_homun_delete) },
+	{ HP_POP(homun->checkskill, HP_homun_checkskill) },
+	{ HP_POP(homun->calc_skilltree, HP_homun_calc_skilltree) },
+	{ HP_POP(homun->skill_tree_get_max, HP_homun_skill_tree_get_max) },
+	{ HP_POP(homun->skillup, HP_homun_skillup) },
+	{ HP_POP(homun->levelup, HP_homun_levelup) },
+	{ HP_POP(homun->change_class, HP_homun_change_class) },
+	{ HP_POP(homun->evolve, HP_homun_evolve) },
+	{ HP_POP(homun->mutate, HP_homun_mutate) },
+	{ HP_POP(homun->gainexp, HP_homun_gainexp) },
+	{ HP_POP(homun->add_intimacy, HP_homun_add_intimacy) },
+	{ HP_POP(homun->consume_intimacy, HP_homun_consume_intimacy) },
+	{ HP_POP(homun->healed, HP_homun_healed) },
+	{ HP_POP(homun->save, HP_homun_save) },
+	{ HP_POP(homun->menu, HP_homun_menu) },
+	{ HP_POP(homun->feed, HP_homun_feed) },
+	{ HP_POP(homun->hunger_timer, HP_homun_hunger_timer) },
+	{ HP_POP(homun->hunger_timer_delete, HP_homun_hunger_timer_delete) },
+	{ HP_POP(homun->change_name, HP_homun_change_name) },
+	{ HP_POP(homun->change_name_ack, HP_homun_change_name_ack) },
+	{ HP_POP(homun->db_search, HP_homun_db_search) },
+	{ HP_POP(homun->create, HP_homun_create) },
+	{ HP_POP(homun->init_timers, HP_homun_init_timers) },
+	{ HP_POP(homun->call, HP_homun_call) },
+	{ HP_POP(homun->recv_data, HP_homun_recv_data) },
+	{ HP_POP(homun->creation_request, HP_homun_creation_request) },
+	{ HP_POP(homun->ressurect, HP_homun_ressurect) },
+	{ HP_POP(homun->revive, HP_homun_revive) },
+	{ HP_POP(homun->stat_reset, HP_homun_stat_reset) },
+	{ HP_POP(homun->shuffle, HP_homun_shuffle) },
+	{ HP_POP(homun->read_db_sub, HP_homun_read_db_sub) },
+	{ HP_POP(homun->read_db, HP_homun_read_db) },
+	{ HP_POP(homun->read_skill_db_sub, HP_homun_read_skill_db_sub) },
+	{ HP_POP(homun->skill_db_read, HP_homun_skill_db_read) },
+	{ HP_POP(homun->exp_db_read, HP_homun_exp_db_read) },
+	{ HP_POP(homun->addspiritball, HP_homun_addspiritball) },
+	{ HP_POP(homun->delspiritball, HP_homun_delspiritball) },
 /* instance */
-	{ HP_POP(instance->init), HP_POP2(HP_instance_init), 2088 },
-	{ HP_POP(instance->final), HP_POP2(HP_instance_final), 2090 },
-	{ HP_POP(instance->create), HP_POP2(HP_instance_create), 2092 },
-	{ HP_POP(instance->add_map), HP_POP2(HP_instance_add_map), 2094 },
-	{ HP_POP(instance->del_map), HP_POP2(HP_instance_del_map), 2096 },
-	{ HP_POP(instance->map2imap), HP_POP2(HP_instance_map2imap), 2098 },
-	{ HP_POP(instance->mapid2imapid), HP_POP2(HP_instance_mapid2imapid), 2100 },
-	{ HP_POP(instance->destroy), HP_POP2(HP_instance_destroy), 2102 },
-	{ HP_POP(instance->start), HP_POP2(HP_instance_start), 2104 },
-	{ HP_POP(instance->check_idle), HP_POP2(HP_instance_check_idle), 2106 },
-	{ HP_POP(instance->check_kick), HP_POP2(HP_instance_check_kick), 2108 },
-	{ HP_POP(instance->set_timeout), HP_POP2(HP_instance_set_timeout), 2110 },
-	{ HP_POP(instance->valid), HP_POP2(HP_instance_valid), 2112 },
-	{ HP_POP(instance->destroy_timer), HP_POP2(HP_instance_destroy_timer), 2114 },
+	{ HP_POP(instance->init, HP_instance_init) },
+	{ HP_POP(instance->final, HP_instance_final) },
+	{ HP_POP(instance->create, HP_instance_create) },
+	{ HP_POP(instance->add_map, HP_instance_add_map) },
+	{ HP_POP(instance->del_map, HP_instance_del_map) },
+	{ HP_POP(instance->map2imap, HP_instance_map2imap) },
+	{ HP_POP(instance->mapid2imapid, HP_instance_mapid2imapid) },
+	{ HP_POP(instance->destroy, HP_instance_destroy) },
+	{ HP_POP(instance->start, HP_instance_start) },
+	{ HP_POP(instance->check_idle, HP_instance_check_idle) },
+	{ HP_POP(instance->check_kick, HP_instance_check_kick) },
+	{ HP_POP(instance->set_timeout, HP_instance_set_timeout) },
+	{ HP_POP(instance->valid, HP_instance_valid) },
+	{ HP_POP(instance->destroy_timer, HP_instance_destroy_timer) },
 /* intif */
-	{ HP_POP(intif->parse), HP_POP2(HP_intif_parse), 2116 },
-	{ HP_POP(intif->create_pet), HP_POP2(HP_intif_create_pet), 2118 },
-	{ HP_POP(intif->broadcast), HP_POP2(HP_intif_broadcast), 2120 },
-	{ HP_POP(intif->broadcast2), HP_POP2(HP_intif_broadcast2), 2122 },
-	{ HP_POP(intif->main_message), HP_POP2(HP_intif_main_message), 2124 },
-	{ HP_POP(intif->wis_message), HP_POP2(HP_intif_wis_message), 2126 },
-	{ HP_POP(intif->wis_message_to_gm), HP_POP2(HP_intif_wis_message_to_gm), 2128 },
-	{ HP_POP(intif->saveregistry), HP_POP2(HP_intif_saveregistry), 2130 },
-	{ HP_POP(intif->request_registry), HP_POP2(HP_intif_request_registry), 2132 },
-	{ HP_POP(intif->request_guild_storage), HP_POP2(HP_intif_request_guild_storage), 2134 },
-	{ HP_POP(intif->send_guild_storage), HP_POP2(HP_intif_send_guild_storage), 2136 },
-	{ HP_POP(intif->create_party), HP_POP2(HP_intif_create_party), 2138 },
-	{ HP_POP(intif->request_partyinfo), HP_POP2(HP_intif_request_partyinfo), 2140 },
-	{ HP_POP(intif->party_addmember), HP_POP2(HP_intif_party_addmember), 2142 },
-	{ HP_POP(intif->party_changeoption), HP_POP2(HP_intif_party_changeoption), 2144 },
-	{ HP_POP(intif->party_leave), HP_POP2(HP_intif_party_leave), 2146 },
-	{ HP_POP(intif->party_changemap), HP_POP2(HP_intif_party_changemap), 2148 },
-	{ HP_POP(intif->break_party), HP_POP2(HP_intif_break_party), 2150 },
-	{ HP_POP(intif->party_message), HP_POP2(HP_intif_party_message), 2152 },
-	{ HP_POP(intif->party_leaderchange), HP_POP2(HP_intif_party_leaderchange), 2154 },
-	{ HP_POP(intif->guild_create), HP_POP2(HP_intif_guild_create), 2156 },
-	{ HP_POP(intif->guild_request_info), HP_POP2(HP_intif_guild_request_info), 2158 },
-	{ HP_POP(intif->guild_addmember), HP_POP2(HP_intif_guild_addmember), 2160 },
-	{ HP_POP(intif->guild_leave), HP_POP2(HP_intif_guild_leave), 2162 },
-	{ HP_POP(intif->guild_memberinfoshort), HP_POP2(HP_intif_guild_memberinfoshort), 2164 },
-	{ HP_POP(intif->guild_break), HP_POP2(HP_intif_guild_break), 2166 },
-	{ HP_POP(intif->guild_message), HP_POP2(HP_intif_guild_message), 2168 },
-	{ HP_POP(intif->guild_change_gm), HP_POP2(HP_intif_guild_change_gm), 2170 },
-	{ HP_POP(intif->guild_change_basicinfo), HP_POP2(HP_intif_guild_change_basicinfo), 2172 },
-	{ HP_POP(intif->guild_change_memberinfo), HP_POP2(HP_intif_guild_change_memberinfo), 2174 },
-	{ HP_POP(intif->guild_position), HP_POP2(HP_intif_guild_position), 2176 },
-	{ HP_POP(intif->guild_skillup), HP_POP2(HP_intif_guild_skillup), 2178 },
-	{ HP_POP(intif->guild_alliance), HP_POP2(HP_intif_guild_alliance), 2180 },
-	{ HP_POP(intif->guild_notice), HP_POP2(HP_intif_guild_notice), 2182 },
-	{ HP_POP(intif->guild_emblem), HP_POP2(HP_intif_guild_emblem), 2184 },
-	{ HP_POP(intif->guild_castle_dataload), HP_POP2(HP_intif_guild_castle_dataload), 2186 },
-	{ HP_POP(intif->guild_castle_datasave), HP_POP2(HP_intif_guild_castle_datasave), 2188 },
-	{ HP_POP(intif->request_petdata), HP_POP2(HP_intif_request_petdata), 2190 },
-	{ HP_POP(intif->save_petdata), HP_POP2(HP_intif_save_petdata), 2192 },
-	{ HP_POP(intif->delete_petdata), HP_POP2(HP_intif_delete_petdata), 2194 },
-	{ HP_POP(intif->rename), HP_POP2(HP_intif_rename), 2196 },
-	{ HP_POP(intif->homunculus_create), HP_POP2(HP_intif_homunculus_create), 2198 },
-	{ HP_POP(intif->homunculus_requestload), HP_POP2(HP_intif_homunculus_requestload), 2200 },
-	{ HP_POP(intif->homunculus_requestsave), HP_POP2(HP_intif_homunculus_requestsave), 2202 },
-	{ HP_POP(intif->homunculus_requestdelete), HP_POP2(HP_intif_homunculus_requestdelete), 2204 },
-	{ HP_POP(intif->request_questlog), HP_POP2(HP_intif_request_questlog), 2206 },
-	{ HP_POP(intif->quest_save), HP_POP2(HP_intif_quest_save), 2208 },
-	{ HP_POP(intif->mercenary_create), HP_POP2(HP_intif_mercenary_create), 2210 },
-	{ HP_POP(intif->mercenary_request), HP_POP2(HP_intif_mercenary_request), 2212 },
-	{ HP_POP(intif->mercenary_delete), HP_POP2(HP_intif_mercenary_delete), 2214 },
-	{ HP_POP(intif->mercenary_save), HP_POP2(HP_intif_mercenary_save), 2216 },
-	{ HP_POP(intif->Mail_requestinbox), HP_POP2(HP_intif_Mail_requestinbox), 2218 },
-	{ HP_POP(intif->Mail_read), HP_POP2(HP_intif_Mail_read), 2220 },
-	{ HP_POP(intif->Mail_getattach), HP_POP2(HP_intif_Mail_getattach), 2222 },
-	{ HP_POP(intif->Mail_delete), HP_POP2(HP_intif_Mail_delete), 2224 },
-	{ HP_POP(intif->Mail_return), HP_POP2(HP_intif_Mail_return), 2226 },
-	{ HP_POP(intif->Mail_send), HP_POP2(HP_intif_Mail_send), 2228 },
-	{ HP_POP(intif->Auction_requestlist), HP_POP2(HP_intif_Auction_requestlist), 2230 },
-	{ HP_POP(intif->Auction_register), HP_POP2(HP_intif_Auction_register), 2232 },
-	{ HP_POP(intif->Auction_cancel), HP_POP2(HP_intif_Auction_cancel), 2234 },
-	{ HP_POP(intif->Auction_close), HP_POP2(HP_intif_Auction_close), 2236 },
-	{ HP_POP(intif->Auction_bid), HP_POP2(HP_intif_Auction_bid), 2238 },
-	{ HP_POP(intif->elemental_create), HP_POP2(HP_intif_elemental_create), 2240 },
-	{ HP_POP(intif->elemental_request), HP_POP2(HP_intif_elemental_request), 2242 },
-	{ HP_POP(intif->elemental_delete), HP_POP2(HP_intif_elemental_delete), 2244 },
-	{ HP_POP(intif->elemental_save), HP_POP2(HP_intif_elemental_save), 2246 },
-	{ HP_POP(intif->request_accinfo), HP_POP2(HP_intif_request_accinfo), 2248 },
-	{ HP_POP(intif->CheckForCharServer), HP_POP2(HP_intif_CheckForCharServer), 2250 },
-	{ HP_POP(intif->pWisMessage), HP_POP2(HP_intif_pWisMessage), 2252 },
-	{ HP_POP(intif->pWisEnd), HP_POP2(HP_intif_pWisEnd), 2254 },
-	{ HP_POP(intif->pWisToGM_sub), HP_POP2(HP_intif_pWisToGM_sub), 2256 },
-	{ HP_POP(intif->pWisToGM), HP_POP2(HP_intif_pWisToGM), 2258 },
-	{ HP_POP(intif->pRegisters), HP_POP2(HP_intif_pRegisters), 2260 },
-	{ HP_POP(intif->pChangeNameOk), HP_POP2(HP_intif_pChangeNameOk), 2262 },
-	{ HP_POP(intif->pMessageToFD), HP_POP2(HP_intif_pMessageToFD), 2264 },
-	{ HP_POP(intif->pLoadGuildStorage), HP_POP2(HP_intif_pLoadGuildStorage), 2266 },
-	{ HP_POP(intif->pSaveGuildStorage), HP_POP2(HP_intif_pSaveGuildStorage), 2268 },
-	{ HP_POP(intif->pPartyCreated), HP_POP2(HP_intif_pPartyCreated), 2270 },
-	{ HP_POP(intif->pPartyInfo), HP_POP2(HP_intif_pPartyInfo), 2272 },
-	{ HP_POP(intif->pPartyMemberAdded), HP_POP2(HP_intif_pPartyMemberAdded), 2274 },
-	{ HP_POP(intif->pPartyOptionChanged), HP_POP2(HP_intif_pPartyOptionChanged), 2276 },
-	{ HP_POP(intif->pPartyMemberWithdraw), HP_POP2(HP_intif_pPartyMemberWithdraw), 2278 },
-	{ HP_POP(intif->pPartyMove), HP_POP2(HP_intif_pPartyMove), 2280 },
-	{ HP_POP(intif->pPartyBroken), HP_POP2(HP_intif_pPartyBroken), 2282 },
-	{ HP_POP(intif->pPartyMessage), HP_POP2(HP_intif_pPartyMessage), 2284 },
-	{ HP_POP(intif->pGuildCreated), HP_POP2(HP_intif_pGuildCreated), 2286 },
-	{ HP_POP(intif->pGuildInfo), HP_POP2(HP_intif_pGuildInfo), 2288 },
-	{ HP_POP(intif->pGuildMemberAdded), HP_POP2(HP_intif_pGuildMemberAdded), 2290 },
-	{ HP_POP(intif->pGuildMemberWithdraw), HP_POP2(HP_intif_pGuildMemberWithdraw), 2292 },
-	{ HP_POP(intif->pGuildMemberInfoShort), HP_POP2(HP_intif_pGuildMemberInfoShort), 2294 },
-	{ HP_POP(intif->pGuildBroken), HP_POP2(HP_intif_pGuildBroken), 2296 },
-	{ HP_POP(intif->pGuildMessage), HP_POP2(HP_intif_pGuildMessage), 2298 },
-	{ HP_POP(intif->pGuildBasicInfoChanged), HP_POP2(HP_intif_pGuildBasicInfoChanged), 2300 },
-	{ HP_POP(intif->pGuildMemberInfoChanged), HP_POP2(HP_intif_pGuildMemberInfoChanged), 2302 },
-	{ HP_POP(intif->pGuildPosition), HP_POP2(HP_intif_pGuildPosition), 2304 },
-	{ HP_POP(intif->pGuildSkillUp), HP_POP2(HP_intif_pGuildSkillUp), 2306 },
-	{ HP_POP(intif->pGuildAlliance), HP_POP2(HP_intif_pGuildAlliance), 2308 },
-	{ HP_POP(intif->pGuildNotice), HP_POP2(HP_intif_pGuildNotice), 2310 },
-	{ HP_POP(intif->pGuildEmblem), HP_POP2(HP_intif_pGuildEmblem), 2312 },
-	{ HP_POP(intif->pGuildCastleDataLoad), HP_POP2(HP_intif_pGuildCastleDataLoad), 2314 },
-	{ HP_POP(intif->pGuildMasterChanged), HP_POP2(HP_intif_pGuildMasterChanged), 2316 },
-	{ HP_POP(intif->pQuestLog), HP_POP2(HP_intif_pQuestLog), 2318 },
-	{ HP_POP(intif->pQuestSave), HP_POP2(HP_intif_pQuestSave), 2320 },
-	{ HP_POP(intif->pMailInboxReceived), HP_POP2(HP_intif_pMailInboxReceived), 2322 },
-	{ HP_POP(intif->pMailNew), HP_POP2(HP_intif_pMailNew), 2324 },
-	{ HP_POP(intif->pMailGetAttach), HP_POP2(HP_intif_pMailGetAttach), 2326 },
-	{ HP_POP(intif->pMailDelete), HP_POP2(HP_intif_pMailDelete), 2328 },
-	{ HP_POP(intif->pMailReturn), HP_POP2(HP_intif_pMailReturn), 2330 },
-	{ HP_POP(intif->pMailSend), HP_POP2(HP_intif_pMailSend), 2332 },
-	{ HP_POP(intif->pAuctionResults), HP_POP2(HP_intif_pAuctionResults), 2334 },
-	{ HP_POP(intif->pAuctionRegister), HP_POP2(HP_intif_pAuctionRegister), 2336 },
-	{ HP_POP(intif->pAuctionCancel), HP_POP2(HP_intif_pAuctionCancel), 2338 },
-	{ HP_POP(intif->pAuctionClose), HP_POP2(HP_intif_pAuctionClose), 2340 },
-	{ HP_POP(intif->pAuctionMessage), HP_POP2(HP_intif_pAuctionMessage), 2342 },
-	{ HP_POP(intif->pAuctionBid), HP_POP2(HP_intif_pAuctionBid), 2344 },
-	{ HP_POP(intif->pMercenaryReceived), HP_POP2(HP_intif_pMercenaryReceived), 2346 },
-	{ HP_POP(intif->pMercenaryDeleted), HP_POP2(HP_intif_pMercenaryDeleted), 2348 },
-	{ HP_POP(intif->pMercenarySaved), HP_POP2(HP_intif_pMercenarySaved), 2350 },
-	{ HP_POP(intif->pElementalReceived), HP_POP2(HP_intif_pElementalReceived), 2352 },
-	{ HP_POP(intif->pElementalDeleted), HP_POP2(HP_intif_pElementalDeleted), 2354 },
-	{ HP_POP(intif->pElementalSaved), HP_POP2(HP_intif_pElementalSaved), 2356 },
-	{ HP_POP(intif->pCreatePet), HP_POP2(HP_intif_pCreatePet), 2358 },
-	{ HP_POP(intif->pRecvPetData), HP_POP2(HP_intif_pRecvPetData), 2360 },
-	{ HP_POP(intif->pSavePetOk), HP_POP2(HP_intif_pSavePetOk), 2362 },
-	{ HP_POP(intif->pDeletePetOk), HP_POP2(HP_intif_pDeletePetOk), 2364 },
-	{ HP_POP(intif->pCreateHomunculus), HP_POP2(HP_intif_pCreateHomunculus), 2366 },
-	{ HP_POP(intif->pRecvHomunculusData), HP_POP2(HP_intif_pRecvHomunculusData), 2368 },
-	{ HP_POP(intif->pSaveHomunculusOk), HP_POP2(HP_intif_pSaveHomunculusOk), 2370 },
-	{ HP_POP(intif->pDeleteHomunculusOk), HP_POP2(HP_intif_pDeleteHomunculusOk), 2372 },
+	{ HP_POP(intif->parse, HP_intif_parse) },
+	{ HP_POP(intif->create_pet, HP_intif_create_pet) },
+	{ HP_POP(intif->broadcast, HP_intif_broadcast) },
+	{ HP_POP(intif->broadcast2, HP_intif_broadcast2) },
+	{ HP_POP(intif->main_message, HP_intif_main_message) },
+	{ HP_POP(intif->wis_message, HP_intif_wis_message) },
+	{ HP_POP(intif->wis_message_to_gm, HP_intif_wis_message_to_gm) },
+	{ HP_POP(intif->saveregistry, HP_intif_saveregistry) },
+	{ HP_POP(intif->request_registry, HP_intif_request_registry) },
+	{ HP_POP(intif->request_guild_storage, HP_intif_request_guild_storage) },
+	{ HP_POP(intif->send_guild_storage, HP_intif_send_guild_storage) },
+	{ HP_POP(intif->create_party, HP_intif_create_party) },
+	{ HP_POP(intif->request_partyinfo, HP_intif_request_partyinfo) },
+	{ HP_POP(intif->party_addmember, HP_intif_party_addmember) },
+	{ HP_POP(intif->party_changeoption, HP_intif_party_changeoption) },
+	{ HP_POP(intif->party_leave, HP_intif_party_leave) },
+	{ HP_POP(intif->party_changemap, HP_intif_party_changemap) },
+	{ HP_POP(intif->break_party, HP_intif_break_party) },
+	{ HP_POP(intif->party_message, HP_intif_party_message) },
+	{ HP_POP(intif->party_leaderchange, HP_intif_party_leaderchange) },
+	{ HP_POP(intif->guild_create, HP_intif_guild_create) },
+	{ HP_POP(intif->guild_request_info, HP_intif_guild_request_info) },
+	{ HP_POP(intif->guild_addmember, HP_intif_guild_addmember) },
+	{ HP_POP(intif->guild_leave, HP_intif_guild_leave) },
+	{ HP_POP(intif->guild_memberinfoshort, HP_intif_guild_memberinfoshort) },
+	{ HP_POP(intif->guild_break, HP_intif_guild_break) },
+	{ HP_POP(intif->guild_message, HP_intif_guild_message) },
+	{ HP_POP(intif->guild_change_gm, HP_intif_guild_change_gm) },
+	{ HP_POP(intif->guild_change_basicinfo, HP_intif_guild_change_basicinfo) },
+	{ HP_POP(intif->guild_change_memberinfo, HP_intif_guild_change_memberinfo) },
+	{ HP_POP(intif->guild_position, HP_intif_guild_position) },
+	{ HP_POP(intif->guild_skillup, HP_intif_guild_skillup) },
+	{ HP_POP(intif->guild_alliance, HP_intif_guild_alliance) },
+	{ HP_POP(intif->guild_notice, HP_intif_guild_notice) },
+	{ HP_POP(intif->guild_emblem, HP_intif_guild_emblem) },
+	{ HP_POP(intif->guild_castle_dataload, HP_intif_guild_castle_dataload) },
+	{ HP_POP(intif->guild_castle_datasave, HP_intif_guild_castle_datasave) },
+	{ HP_POP(intif->request_petdata, HP_intif_request_petdata) },
+	{ HP_POP(intif->save_petdata, HP_intif_save_petdata) },
+	{ HP_POP(intif->delete_petdata, HP_intif_delete_petdata) },
+	{ HP_POP(intif->rename, HP_intif_rename) },
+	{ HP_POP(intif->homunculus_create, HP_intif_homunculus_create) },
+	{ HP_POP(intif->homunculus_requestload, HP_intif_homunculus_requestload) },
+	{ HP_POP(intif->homunculus_requestsave, HP_intif_homunculus_requestsave) },
+	{ HP_POP(intif->homunculus_requestdelete, HP_intif_homunculus_requestdelete) },
+	{ HP_POP(intif->request_questlog, HP_intif_request_questlog) },
+	{ HP_POP(intif->quest_save, HP_intif_quest_save) },
+	{ HP_POP(intif->mercenary_create, HP_intif_mercenary_create) },
+	{ HP_POP(intif->mercenary_request, HP_intif_mercenary_request) },
+	{ HP_POP(intif->mercenary_delete, HP_intif_mercenary_delete) },
+	{ HP_POP(intif->mercenary_save, HP_intif_mercenary_save) },
+	{ HP_POP(intif->Mail_requestinbox, HP_intif_Mail_requestinbox) },
+	{ HP_POP(intif->Mail_read, HP_intif_Mail_read) },
+	{ HP_POP(intif->Mail_getattach, HP_intif_Mail_getattach) },
+	{ HP_POP(intif->Mail_delete, HP_intif_Mail_delete) },
+	{ HP_POP(intif->Mail_return, HP_intif_Mail_return) },
+	{ HP_POP(intif->Mail_send, HP_intif_Mail_send) },
+	{ HP_POP(intif->Auction_requestlist, HP_intif_Auction_requestlist) },
+	{ HP_POP(intif->Auction_register, HP_intif_Auction_register) },
+	{ HP_POP(intif->Auction_cancel, HP_intif_Auction_cancel) },
+	{ HP_POP(intif->Auction_close, HP_intif_Auction_close) },
+	{ HP_POP(intif->Auction_bid, HP_intif_Auction_bid) },
+	{ HP_POP(intif->elemental_create, HP_intif_elemental_create) },
+	{ HP_POP(intif->elemental_request, HP_intif_elemental_request) },
+	{ HP_POP(intif->elemental_delete, HP_intif_elemental_delete) },
+	{ HP_POP(intif->elemental_save, HP_intif_elemental_save) },
+	{ HP_POP(intif->request_accinfo, HP_intif_request_accinfo) },
+	{ HP_POP(intif->CheckForCharServer, HP_intif_CheckForCharServer) },
+	{ HP_POP(intif->pWisMessage, HP_intif_pWisMessage) },
+	{ HP_POP(intif->pWisEnd, HP_intif_pWisEnd) },
+	{ HP_POP(intif->pWisToGM_sub, HP_intif_pWisToGM_sub) },
+	{ HP_POP(intif->pWisToGM, HP_intif_pWisToGM) },
+	{ HP_POP(intif->pRegisters, HP_intif_pRegisters) },
+	{ HP_POP(intif->pChangeNameOk, HP_intif_pChangeNameOk) },
+	{ HP_POP(intif->pMessageToFD, HP_intif_pMessageToFD) },
+	{ HP_POP(intif->pLoadGuildStorage, HP_intif_pLoadGuildStorage) },
+	{ HP_POP(intif->pSaveGuildStorage, HP_intif_pSaveGuildStorage) },
+	{ HP_POP(intif->pPartyCreated, HP_intif_pPartyCreated) },
+	{ HP_POP(intif->pPartyInfo, HP_intif_pPartyInfo) },
+	{ HP_POP(intif->pPartyMemberAdded, HP_intif_pPartyMemberAdded) },
+	{ HP_POP(intif->pPartyOptionChanged, HP_intif_pPartyOptionChanged) },
+	{ HP_POP(intif->pPartyMemberWithdraw, HP_intif_pPartyMemberWithdraw) },
+	{ HP_POP(intif->pPartyMove, HP_intif_pPartyMove) },
+	{ HP_POP(intif->pPartyBroken, HP_intif_pPartyBroken) },
+	{ HP_POP(intif->pPartyMessage, HP_intif_pPartyMessage) },
+	{ HP_POP(intif->pGuildCreated, HP_intif_pGuildCreated) },
+	{ HP_POP(intif->pGuildInfo, HP_intif_pGuildInfo) },
+	{ HP_POP(intif->pGuildMemberAdded, HP_intif_pGuildMemberAdded) },
+	{ HP_POP(intif->pGuildMemberWithdraw, HP_intif_pGuildMemberWithdraw) },
+	{ HP_POP(intif->pGuildMemberInfoShort, HP_intif_pGuildMemberInfoShort) },
+	{ HP_POP(intif->pGuildBroken, HP_intif_pGuildBroken) },
+	{ HP_POP(intif->pGuildMessage, HP_intif_pGuildMessage) },
+	{ HP_POP(intif->pGuildBasicInfoChanged, HP_intif_pGuildBasicInfoChanged) },
+	{ HP_POP(intif->pGuildMemberInfoChanged, HP_intif_pGuildMemberInfoChanged) },
+	{ HP_POP(intif->pGuildPosition, HP_intif_pGuildPosition) },
+	{ HP_POP(intif->pGuildSkillUp, HP_intif_pGuildSkillUp) },
+	{ HP_POP(intif->pGuildAlliance, HP_intif_pGuildAlliance) },
+	{ HP_POP(intif->pGuildNotice, HP_intif_pGuildNotice) },
+	{ HP_POP(intif->pGuildEmblem, HP_intif_pGuildEmblem) },
+	{ HP_POP(intif->pGuildCastleDataLoad, HP_intif_pGuildCastleDataLoad) },
+	{ HP_POP(intif->pGuildMasterChanged, HP_intif_pGuildMasterChanged) },
+	{ HP_POP(intif->pQuestLog, HP_intif_pQuestLog) },
+	{ HP_POP(intif->pQuestSave, HP_intif_pQuestSave) },
+	{ HP_POP(intif->pMailInboxReceived, HP_intif_pMailInboxReceived) },
+	{ HP_POP(intif->pMailNew, HP_intif_pMailNew) },
+	{ HP_POP(intif->pMailGetAttach, HP_intif_pMailGetAttach) },
+	{ HP_POP(intif->pMailDelete, HP_intif_pMailDelete) },
+	{ HP_POP(intif->pMailReturn, HP_intif_pMailReturn) },
+	{ HP_POP(intif->pMailSend, HP_intif_pMailSend) },
+	{ HP_POP(intif->pAuctionResults, HP_intif_pAuctionResults) },
+	{ HP_POP(intif->pAuctionRegister, HP_intif_pAuctionRegister) },
+	{ HP_POP(intif->pAuctionCancel, HP_intif_pAuctionCancel) },
+	{ HP_POP(intif->pAuctionClose, HP_intif_pAuctionClose) },
+	{ HP_POP(intif->pAuctionMessage, HP_intif_pAuctionMessage) },
+	{ HP_POP(intif->pAuctionBid, HP_intif_pAuctionBid) },
+	{ HP_POP(intif->pMercenaryReceived, HP_intif_pMercenaryReceived) },
+	{ HP_POP(intif->pMercenaryDeleted, HP_intif_pMercenaryDeleted) },
+	{ HP_POP(intif->pMercenarySaved, HP_intif_pMercenarySaved) },
+	{ HP_POP(intif->pElementalReceived, HP_intif_pElementalReceived) },
+	{ HP_POP(intif->pElementalDeleted, HP_intif_pElementalDeleted) },
+	{ HP_POP(intif->pElementalSaved, HP_intif_pElementalSaved) },
+	{ HP_POP(intif->pCreatePet, HP_intif_pCreatePet) },
+	{ HP_POP(intif->pRecvPetData, HP_intif_pRecvPetData) },
+	{ HP_POP(intif->pSavePetOk, HP_intif_pSavePetOk) },
+	{ HP_POP(intif->pDeletePetOk, HP_intif_pDeletePetOk) },
+	{ HP_POP(intif->pCreateHomunculus, HP_intif_pCreateHomunculus) },
+	{ HP_POP(intif->pRecvHomunculusData, HP_intif_pRecvHomunculusData) },
+	{ HP_POP(intif->pSaveHomunculusOk, HP_intif_pSaveHomunculusOk) },
+	{ HP_POP(intif->pDeleteHomunculusOk, HP_intif_pDeleteHomunculusOk) },
 /* ircbot */
-	{ HP_POP(ircbot->init), HP_POP2(HP_ircbot_init), 2374 },
-	{ HP_POP(ircbot->final), HP_POP2(HP_ircbot_final), 2376 },
-	{ HP_POP(ircbot->parse), HP_POP2(HP_ircbot_parse), 2378 },
-	{ HP_POP(ircbot->parse_sub), HP_POP2(HP_ircbot_parse_sub), 2380 },
-	{ HP_POP(ircbot->parse_source), HP_POP2(HP_ircbot_parse_source), 2382 },
-	{ HP_POP(ircbot->func_search), HP_POP2(HP_ircbot_func_search), 2384 },
-	{ HP_POP(ircbot->connect_timer), HP_POP2(HP_ircbot_connect_timer), 2386 },
-	{ HP_POP(ircbot->identify_timer), HP_POP2(HP_ircbot_identify_timer), 2388 },
-	{ HP_POP(ircbot->join_timer), HP_POP2(HP_ircbot_join_timer), 2390 },
-	{ HP_POP(ircbot->send), HP_POP2(HP_ircbot_send), 2392 },
-	{ HP_POP(ircbot->relay), HP_POP2(HP_ircbot_relay), 2394 },
-	{ HP_POP(ircbot->pong), HP_POP2(HP_ircbot_pong), 2396 },
-	{ HP_POP(ircbot->privmsg), HP_POP2(HP_ircbot_privmsg), 2398 },
-	{ HP_POP(ircbot->userjoin), HP_POP2(HP_ircbot_userjoin), 2400 },
-	{ HP_POP(ircbot->userleave), HP_POP2(HP_ircbot_userleave), 2402 },
-	{ HP_POP(ircbot->usernick), HP_POP2(HP_ircbot_usernick), 2404 },
+	{ HP_POP(ircbot->init, HP_ircbot_init) },
+	{ HP_POP(ircbot->final, HP_ircbot_final) },
+	{ HP_POP(ircbot->parse, HP_ircbot_parse) },
+	{ HP_POP(ircbot->parse_sub, HP_ircbot_parse_sub) },
+	{ HP_POP(ircbot->parse_source, HP_ircbot_parse_source) },
+	{ HP_POP(ircbot->func_search, HP_ircbot_func_search) },
+	{ HP_POP(ircbot->connect_timer, HP_ircbot_connect_timer) },
+	{ HP_POP(ircbot->identify_timer, HP_ircbot_identify_timer) },
+	{ HP_POP(ircbot->join_timer, HP_ircbot_join_timer) },
+	{ HP_POP(ircbot->send, HP_ircbot_send) },
+	{ HP_POP(ircbot->relay, HP_ircbot_relay) },
+	{ HP_POP(ircbot->pong, HP_ircbot_pong) },
+	{ HP_POP(ircbot->privmsg, HP_ircbot_privmsg) },
+	{ HP_POP(ircbot->userjoin, HP_ircbot_userjoin) },
+	{ HP_POP(ircbot->userleave, HP_ircbot_userleave) },
+	{ HP_POP(ircbot->usernick, HP_ircbot_usernick) },
 /* itemdb */
-	{ HP_POP(itemdb->init), HP_POP2(HP_itemdb_init), 2406 },
-	{ HP_POP(itemdb->final), HP_POP2(HP_itemdb_final), 2408 },
-	{ HP_POP(itemdb->reload), HP_POP2(HP_itemdb_reload), 2410 },
-	{ HP_POP(itemdb->name_constants), HP_POP2(HP_itemdb_name_constants), 2412 },
-	{ HP_POP(itemdb->force_name_constants), HP_POP2(HP_itemdb_force_name_constants), 2414 },
-	{ HP_POP(itemdb->read_groups), HP_POP2(HP_itemdb_read_groups), 2416 },
-	{ HP_POP(itemdb->read_chains), HP_POP2(HP_itemdb_read_chains), 2418 },
-	{ HP_POP(itemdb->read_packages), HP_POP2(HP_itemdb_read_packages), 2420 },
-	{ HP_POP(itemdb->write_cached_packages), HP_POP2(HP_itemdb_write_cached_packages), 2422 },
-	{ HP_POP(itemdb->read_cached_packages), HP_POP2(HP_itemdb_read_cached_packages), 2424 },
-	{ HP_POP(itemdb->name2id), HP_POP2(HP_itemdb_name2id), 2426 },
-	{ HP_POP(itemdb->search_name), HP_POP2(HP_itemdb_search_name), 2428 },
-	{ HP_POP(itemdb->search_name_array), HP_POP2(HP_itemdb_search_name_array), 2430 },
-	{ HP_POP(itemdb->load), HP_POP2(HP_itemdb_load), 2432 },
-	{ HP_POP(itemdb->search), HP_POP2(HP_itemdb_search), 2434 },
-	{ HP_POP(itemdb->parse_dbrow), HP_POP2(HP_itemdb_parse_dbrow), 2436 },
-	{ HP_POP(itemdb->exists), HP_POP2(HP_itemdb_exists), 2438 },
-	{ HP_POP(itemdb->in_group), HP_POP2(HP_itemdb_in_group), 2440 },
-	{ HP_POP(itemdb->group_item), HP_POP2(HP_itemdb_group_item), 2442 },
-	{ HP_POP(itemdb->chain_item), HP_POP2(HP_itemdb_chain_item), 2444 },
-	{ HP_POP(itemdb->package_item), HP_POP2(HP_itemdb_package_item), 2446 },
-	{ HP_POP(itemdb->searchname_sub), HP_POP2(HP_itemdb_searchname_sub), 2448 },
-	{ HP_POP(itemdb->searchname_array_sub), HP_POP2(HP_itemdb_searchname_array_sub), 2450 },
-	{ HP_POP(itemdb->searchrandomid), HP_POP2(HP_itemdb_searchrandomid), 2452 },
-	{ HP_POP(itemdb->typename), HP_POP2(HP_itemdb_typename), 2454 },
-	{ HP_POP(itemdb->jobid2mapid), HP_POP2(HP_itemdb_jobid2mapid), 2456 },
-	{ HP_POP(itemdb->create_dummy_data), HP_POP2(HP_itemdb_create_dummy_data), 2458 },
-	{ HP_POP(itemdb->create_item_data), HP_POP2(HP_itemdb_create_item_data), 2460 },
-	{ HP_POP(itemdb->isequip), HP_POP2(HP_itemdb_isequip), 2462 },
-	{ HP_POP(itemdb->isequip2), HP_POP2(HP_itemdb_isequip2), 2464 },
-	{ HP_POP(itemdb->isstackable), HP_POP2(HP_itemdb_isstackable), 2466 },
-	{ HP_POP(itemdb->isstackable2), HP_POP2(HP_itemdb_isstackable2), 2468 },
-	{ HP_POP(itemdb->isdropable_sub), HP_POP2(HP_itemdb_isdropable_sub), 2470 },
-	{ HP_POP(itemdb->cantrade_sub), HP_POP2(HP_itemdb_cantrade_sub), 2472 },
-	{ HP_POP(itemdb->canpartnertrade_sub), HP_POP2(HP_itemdb_canpartnertrade_sub), 2474 },
-	{ HP_POP(itemdb->cansell_sub), HP_POP2(HP_itemdb_cansell_sub), 2476 },
-	{ HP_POP(itemdb->cancartstore_sub), HP_POP2(HP_itemdb_cancartstore_sub), 2478 },
-	{ HP_POP(itemdb->canstore_sub), HP_POP2(HP_itemdb_canstore_sub), 2480 },
-	{ HP_POP(itemdb->canguildstore_sub), HP_POP2(HP_itemdb_canguildstore_sub), 2482 },
-	{ HP_POP(itemdb->canmail_sub), HP_POP2(HP_itemdb_canmail_sub), 2484 },
-	{ HP_POP(itemdb->canauction_sub), HP_POP2(HP_itemdb_canauction_sub), 2486 },
-	{ HP_POP(itemdb->isrestricted), HP_POP2(HP_itemdb_isrestricted), 2488 },
-	{ HP_POP(itemdb->isidentified), HP_POP2(HP_itemdb_isidentified), 2490 },
-	{ HP_POP(itemdb->isidentified2), HP_POP2(HP_itemdb_isidentified2), 2492 },
-	{ HP_POP(itemdb->read_itemavail), HP_POP2(HP_itemdb_read_itemavail), 2494 },
-	{ HP_POP(itemdb->read_itemtrade), HP_POP2(HP_itemdb_read_itemtrade), 2496 },
-	{ HP_POP(itemdb->read_itemdelay), HP_POP2(HP_itemdb_read_itemdelay), 2498 },
-	{ HP_POP(itemdb->read_stack), HP_POP2(HP_itemdb_read_stack), 2500 },
-	{ HP_POP(itemdb->read_buyingstore), HP_POP2(HP_itemdb_read_buyingstore), 2502 },
-	{ HP_POP(itemdb->read_nouse), HP_POP2(HP_itemdb_read_nouse), 2504 },
-	{ HP_POP(itemdb->combo_split_atoi), HP_POP2(HP_itemdb_combo_split_atoi), 2506 },
-	{ HP_POP(itemdb->read_combos), HP_POP2(HP_itemdb_read_combos), 2508 },
-	{ HP_POP(itemdb->gendercheck), HP_POP2(HP_itemdb_gendercheck), 2510 },
-	{ HP_POP(itemdb->re_split_atoi), HP_POP2(HP_itemdb_re_split_atoi), 2512 },
-	{ HP_POP(itemdb->readdb), HP_POP2(HP_itemdb_readdb), 2514 },
-	{ HP_POP(itemdb->read_sqldb), HP_POP2(HP_itemdb_read_sqldb), 2516 },
-	{ HP_POP(itemdb->unique_id), HP_POP2(HP_itemdb_unique_id), 2518 },
-	{ HP_POP(itemdb->uid_load), HP_POP2(HP_itemdb_uid_load), 2520 },
-	{ HP_POP(itemdb->read), HP_POP2(HP_itemdb_read), 2522 },
-	{ HP_POP(itemdb->destroy_item_data), HP_POP2(HP_itemdb_destroy_item_data), 2524 },
-	{ HP_POP(itemdb->final_sub), HP_POP2(HP_itemdb_final_sub), 2526 },
+	{ HP_POP(itemdb->init, HP_itemdb_init) },
+	{ HP_POP(itemdb->final, HP_itemdb_final) },
+	{ HP_POP(itemdb->reload, HP_itemdb_reload) },
+	{ HP_POP(itemdb->name_constants, HP_itemdb_name_constants) },
+	{ HP_POP(itemdb->force_name_constants, HP_itemdb_force_name_constants) },
+	{ HP_POP(itemdb->read_groups, HP_itemdb_read_groups) },
+	{ HP_POP(itemdb->read_chains, HP_itemdb_read_chains) },
+	{ HP_POP(itemdb->read_packages, HP_itemdb_read_packages) },
+	{ HP_POP(itemdb->write_cached_packages, HP_itemdb_write_cached_packages) },
+	{ HP_POP(itemdb->read_cached_packages, HP_itemdb_read_cached_packages) },
+	{ HP_POP(itemdb->name2id, HP_itemdb_name2id) },
+	{ HP_POP(itemdb->search_name, HP_itemdb_search_name) },
+	{ HP_POP(itemdb->search_name_array, HP_itemdb_search_name_array) },
+	{ HP_POP(itemdb->load, HP_itemdb_load) },
+	{ HP_POP(itemdb->search, HP_itemdb_search) },
+	{ HP_POP(itemdb->parse_dbrow, HP_itemdb_parse_dbrow) },
+	{ HP_POP(itemdb->exists, HP_itemdb_exists) },
+	{ HP_POP(itemdb->in_group, HP_itemdb_in_group) },
+	{ HP_POP(itemdb->group_item, HP_itemdb_group_item) },
+	{ HP_POP(itemdb->chain_item, HP_itemdb_chain_item) },
+	{ HP_POP(itemdb->package_item, HP_itemdb_package_item) },
+	{ HP_POP(itemdb->searchname_sub, HP_itemdb_searchname_sub) },
+	{ HP_POP(itemdb->searchname_array_sub, HP_itemdb_searchname_array_sub) },
+	{ HP_POP(itemdb->searchrandomid, HP_itemdb_searchrandomid) },
+	{ HP_POP(itemdb->typename, HP_itemdb_typename) },
+	{ HP_POP(itemdb->jobid2mapid, HP_itemdb_jobid2mapid) },
+	{ HP_POP(itemdb->create_dummy_data, HP_itemdb_create_dummy_data) },
+	{ HP_POP(itemdb->create_item_data, HP_itemdb_create_item_data) },
+	{ HP_POP(itemdb->isequip, HP_itemdb_isequip) },
+	{ HP_POP(itemdb->isequip2, HP_itemdb_isequip2) },
+	{ HP_POP(itemdb->isstackable, HP_itemdb_isstackable) },
+	{ HP_POP(itemdb->isstackable2, HP_itemdb_isstackable2) },
+	{ HP_POP(itemdb->isdropable_sub, HP_itemdb_isdropable_sub) },
+	{ HP_POP(itemdb->cantrade_sub, HP_itemdb_cantrade_sub) },
+	{ HP_POP(itemdb->canpartnertrade_sub, HP_itemdb_canpartnertrade_sub) },
+	{ HP_POP(itemdb->cansell_sub, HP_itemdb_cansell_sub) },
+	{ HP_POP(itemdb->cancartstore_sub, HP_itemdb_cancartstore_sub) },
+	{ HP_POP(itemdb->canstore_sub, HP_itemdb_canstore_sub) },
+	{ HP_POP(itemdb->canguildstore_sub, HP_itemdb_canguildstore_sub) },
+	{ HP_POP(itemdb->canmail_sub, HP_itemdb_canmail_sub) },
+	{ HP_POP(itemdb->canauction_sub, HP_itemdb_canauction_sub) },
+	{ HP_POP(itemdb->isrestricted, HP_itemdb_isrestricted) },
+	{ HP_POP(itemdb->isidentified, HP_itemdb_isidentified) },
+	{ HP_POP(itemdb->isidentified2, HP_itemdb_isidentified2) },
+	{ HP_POP(itemdb->read_itemavail, HP_itemdb_read_itemavail) },
+	{ HP_POP(itemdb->read_itemtrade, HP_itemdb_read_itemtrade) },
+	{ HP_POP(itemdb->read_itemdelay, HP_itemdb_read_itemdelay) },
+	{ HP_POP(itemdb->read_stack, HP_itemdb_read_stack) },
+	{ HP_POP(itemdb->read_buyingstore, HP_itemdb_read_buyingstore) },
+	{ HP_POP(itemdb->read_nouse, HP_itemdb_read_nouse) },
+	{ HP_POP(itemdb->combo_split_atoi, HP_itemdb_combo_split_atoi) },
+	{ HP_POP(itemdb->read_combos, HP_itemdb_read_combos) },
+	{ HP_POP(itemdb->gendercheck, HP_itemdb_gendercheck) },
+	{ HP_POP(itemdb->re_split_atoi, HP_itemdb_re_split_atoi) },
+	{ HP_POP(itemdb->readdb, HP_itemdb_readdb) },
+	{ HP_POP(itemdb->read_sqldb, HP_itemdb_read_sqldb) },
+	{ HP_POP(itemdb->unique_id, HP_itemdb_unique_id) },
+	{ HP_POP(itemdb->uid_load, HP_itemdb_uid_load) },
+	{ HP_POP(itemdb->read, HP_itemdb_read) },
+	{ HP_POP(itemdb->destroy_item_data, HP_itemdb_destroy_item_data) },
+	{ HP_POP(itemdb->final_sub, HP_itemdb_final_sub) },
 /* logs */
-	{ HP_POP(logs->pick_pc), HP_POP2(HP_logs_pick_pc), 2528 },
-	{ HP_POP(logs->pick_mob), HP_POP2(HP_logs_pick_mob), 2530 },
-	{ HP_POP(logs->zeny), HP_POP2(HP_logs_zeny), 2532 },
-	{ HP_POP(logs->npc), HP_POP2(HP_logs_npc), 2534 },
-	{ HP_POP(logs->chat), HP_POP2(HP_logs_chat), 2536 },
-	{ HP_POP(logs->atcommand), HP_POP2(HP_logs_atcommand), 2538 },
-	{ HP_POP(logs->branch), HP_POP2(HP_logs_branch), 2540 },
-	{ HP_POP(logs->mvpdrop), HP_POP2(HP_logs_mvpdrop), 2542 },
-	{ HP_POP(logs->pick_sub), HP_POP2(HP_logs_pick_sub), 2544 },
-	{ HP_POP(logs->zeny_sub), HP_POP2(HP_logs_zeny_sub), 2546 },
-	{ HP_POP(logs->npc_sub), HP_POP2(HP_logs_npc_sub), 2548 },
-	{ HP_POP(logs->chat_sub), HP_POP2(HP_logs_chat_sub), 2550 },
-	{ HP_POP(logs->atcommand_sub), HP_POP2(HP_logs_atcommand_sub), 2552 },
-	{ HP_POP(logs->branch_sub), HP_POP2(HP_logs_branch_sub), 2554 },
-	{ HP_POP(logs->mvpdrop_sub), HP_POP2(HP_logs_mvpdrop_sub), 2556 },
-	{ HP_POP(logs->config_read), HP_POP2(HP_logs_config_read), 2558 },
-	{ HP_POP(logs->config_done), HP_POP2(HP_logs_config_done), 2560 },
-	{ HP_POP(logs->sql_init), HP_POP2(HP_logs_sql_init), 2562 },
-	{ HP_POP(logs->sql_final), HP_POP2(HP_logs_sql_final), 2564 },
-	{ HP_POP(logs->picktype2char), HP_POP2(HP_logs_picktype2char), 2566 },
-	{ HP_POP(logs->chattype2char), HP_POP2(HP_logs_chattype2char), 2568 },
-	{ HP_POP(logs->should_log_item), HP_POP2(HP_logs_should_log_item), 2570 },
+	{ HP_POP(logs->pick_pc, HP_logs_pick_pc) },
+	{ HP_POP(logs->pick_mob, HP_logs_pick_mob) },
+	{ HP_POP(logs->zeny, HP_logs_zeny) },
+	{ HP_POP(logs->npc, HP_logs_npc) },
+	{ HP_POP(logs->chat, HP_logs_chat) },
+	{ HP_POP(logs->atcommand, HP_logs_atcommand) },
+	{ HP_POP(logs->branch, HP_logs_branch) },
+	{ HP_POP(logs->mvpdrop, HP_logs_mvpdrop) },
+	{ HP_POP(logs->pick_sub, HP_logs_pick_sub) },
+	{ HP_POP(logs->zeny_sub, HP_logs_zeny_sub) },
+	{ HP_POP(logs->npc_sub, HP_logs_npc_sub) },
+	{ HP_POP(logs->chat_sub, HP_logs_chat_sub) },
+	{ HP_POP(logs->atcommand_sub, HP_logs_atcommand_sub) },
+	{ HP_POP(logs->branch_sub, HP_logs_branch_sub) },
+	{ HP_POP(logs->mvpdrop_sub, HP_logs_mvpdrop_sub) },
+	{ HP_POP(logs->config_read, HP_logs_config_read) },
+	{ HP_POP(logs->config_done, HP_logs_config_done) },
+	{ HP_POP(logs->sql_init, HP_logs_sql_init) },
+	{ HP_POP(logs->sql_final, HP_logs_sql_final) },
+	{ HP_POP(logs->picktype2char, HP_logs_picktype2char) },
+	{ HP_POP(logs->chattype2char, HP_logs_chattype2char) },
+	{ HP_POP(logs->should_log_item, HP_logs_should_log_item) },
 /* mail */
-	{ HP_POP(mail->clear), HP_POP2(HP_mail_clear), 2572 },
-	{ HP_POP(mail->removeitem), HP_POP2(HP_mail_removeitem), 2574 },
-	{ HP_POP(mail->removezeny), HP_POP2(HP_mail_removezeny), 2576 },
-	{ HP_POP(mail->setitem), HP_POP2(HP_mail_setitem), 2578 },
-	{ HP_POP(mail->setattachment), HP_POP2(HP_mail_setattachment), 2580 },
-	{ HP_POP(mail->getattachment), HP_POP2(HP_mail_getattachment), 2582 },
-	{ HP_POP(mail->openmail), HP_POP2(HP_mail_openmail), 2584 },
-	{ HP_POP(mail->deliveryfail), HP_POP2(HP_mail_deliveryfail), 2586 },
-	{ HP_POP(mail->invalid_operation), HP_POP2(HP_mail_invalid_operation), 2588 },
+	{ HP_POP(mail->clear, HP_mail_clear) },
+	{ HP_POP(mail->removeitem, HP_mail_removeitem) },
+	{ HP_POP(mail->removezeny, HP_mail_removezeny) },
+	{ HP_POP(mail->setitem, HP_mail_setitem) },
+	{ HP_POP(mail->setattachment, HP_mail_setattachment) },
+	{ HP_POP(mail->getattachment, HP_mail_getattachment) },
+	{ HP_POP(mail->openmail, HP_mail_openmail) },
+	{ HP_POP(mail->deliveryfail, HP_mail_deliveryfail) },
+	{ HP_POP(mail->invalid_operation, HP_mail_invalid_operation) },
 /* map */
-	{ HP_POP(map->zone_init), HP_POP2(HP_map_zone_init), 2590 },
-	{ HP_POP(map->zone_remove), HP_POP2(HP_map_zone_remove), 2592 },
-	{ HP_POP(map->zone_apply), HP_POP2(HP_map_zone_apply), 2594 },
-	{ HP_POP(map->zone_change), HP_POP2(HP_map_zone_change), 2596 },
-	{ HP_POP(map->zone_change2), HP_POP2(HP_map_zone_change2), 2598 },
-	{ HP_POP(map->getcell), HP_POP2(HP_map_getcell), 2600 },
-	{ HP_POP(map->setgatcell), HP_POP2(HP_map_setgatcell), 2602 },
-	{ HP_POP(map->cellfromcache), HP_POP2(HP_map_cellfromcache), 2604 },
-	{ HP_POP(map->setusers), HP_POP2(HP_map_setusers), 2606 },
-	{ HP_POP(map->getusers), HP_POP2(HP_map_getusers), 2608 },
-	{ HP_POP(map->usercount), HP_POP2(HP_map_usercount), 2610 },
-	{ HP_POP(map->freeblock), HP_POP2(HP_map_freeblock), 2612 },
-	{ HP_POP(map->freeblock_lock), HP_POP2(HP_map_freeblock_lock), 2614 },
-	{ HP_POP(map->freeblock_unlock), HP_POP2(HP_map_freeblock_unlock), 2616 },
-	{ HP_POP(map->addblock), HP_POP2(HP_map_addblock), 2618 },
-	{ HP_POP(map->delblock), HP_POP2(HP_map_delblock), 2620 },
-	{ HP_POP(map->moveblock), HP_POP2(HP_map_moveblock), 2622 },
-	{ HP_POP(map->count_oncell), HP_POP2(HP_map_count_oncell), 2624 },
-	{ HP_POP(map->find_skill_unit_oncell), HP_POP2(HP_map_find_skill_unit_oncell), 2626 },
-	{ HP_POP(map->get_new_object_id), HP_POP2(HP_map_get_new_object_id), 2628 },
-	{ HP_POP(map->search_freecell), HP_POP2(HP_map_search_freecell), 2630 },
-	{ HP_POP(map->quit), HP_POP2(HP_map_quit), 2632 },
-	{ HP_POP(map->addnpc), HP_POP2(HP_map_addnpc), 2634 },
-	{ HP_POP(map->clearflooritem_timer), HP_POP2(HP_map_clearflooritem_timer), 2636 },
-	{ HP_POP(map->removemobs_timer), HP_POP2(HP_map_removemobs_timer), 2638 },
-	{ HP_POP(map->clearflooritem), HP_POP2(HP_map_clearflooritem), 2640 },
-	{ HP_POP(map->addflooritem), HP_POP2(HP_map_addflooritem), 2642 },
-	{ HP_POP(map->addnickdb), HP_POP2(HP_map_addnickdb), 2644 },
-	{ HP_POP(map->delnickdb), HP_POP2(HP_map_delnickdb), 2646 },
-	{ HP_POP(map->reqnickdb), HP_POP2(HP_map_reqnickdb), 2648 },
-	{ HP_POP(map->charid2nick), HP_POP2(HP_map_charid2nick), 2650 },
-	{ HP_POP(map->charid2sd), HP_POP2(HP_map_charid2sd), 2652 },
-	{ HP_POP(map->vforeachpc), HP_POP2(HP_map_vforeachpc), 2654 },
-	{ HP_POP(map->vforeachmob), HP_POP2(HP_map_vforeachmob), 2656 },
-	{ HP_POP(map->vforeachnpc), HP_POP2(HP_map_vforeachnpc), 2658 },
-	{ HP_POP(map->vforeachregen), HP_POP2(HP_map_vforeachregen), 2660 },
-	{ HP_POP(map->vforeachiddb), HP_POP2(HP_map_vforeachiddb), 2662 },
-	{ HP_POP(map->vforeachinrange), HP_POP2(HP_map_vforeachinrange), 2664 },
-	{ HP_POP(map->vforeachinshootrange), HP_POP2(HP_map_vforeachinshootrange), 2666 },
-	{ HP_POP(map->vforeachinarea), HP_POP2(HP_map_vforeachinarea), 2668 },
-	{ HP_POP(map->vforcountinrange), HP_POP2(HP_map_vforcountinrange), 2670 },
-	{ HP_POP(map->vforcountinarea), HP_POP2(HP_map_vforcountinarea), 2672 },
-	{ HP_POP(map->vforeachinmovearea), HP_POP2(HP_map_vforeachinmovearea), 2674 },
-	{ HP_POP(map->vforeachincell), HP_POP2(HP_map_vforeachincell), 2676 },
-	{ HP_POP(map->vforeachinpath), HP_POP2(HP_map_vforeachinpath), 2678 },
-	{ HP_POP(map->vforeachinmap), HP_POP2(HP_map_vforeachinmap), 2680 },
-	{ HP_POP(map->vforeachininstance), HP_POP2(HP_map_vforeachininstance), 2682 },
-	{ HP_POP(map->id2sd), HP_POP2(HP_map_id2sd), 2684 },
-	{ HP_POP(map->id2md), HP_POP2(HP_map_id2md), 2686 },
-	{ HP_POP(map->id2nd), HP_POP2(HP_map_id2nd), 2688 },
-	{ HP_POP(map->id2hd), HP_POP2(HP_map_id2hd), 2690 },
-	{ HP_POP(map->id2mc), HP_POP2(HP_map_id2mc), 2692 },
-	{ HP_POP(map->id2cd), HP_POP2(HP_map_id2cd), 2694 },
-	{ HP_POP(map->id2bl), HP_POP2(HP_map_id2bl), 2696 },
-	{ HP_POP(map->blid_exists), HP_POP2(HP_map_blid_exists), 2698 },
-	{ HP_POP(map->mapindex2mapid), HP_POP2(HP_map_mapindex2mapid), 2700 },
-	{ HP_POP(map->mapname2mapid), HP_POP2(HP_map_mapname2mapid), 2702 },
-	{ HP_POP(map->mapname2ipport), HP_POP2(HP_map_mapname2ipport), 2704 },
-	{ HP_POP(map->setipport), HP_POP2(HP_map_setipport), 2706 },
-	{ HP_POP(map->eraseipport), HP_POP2(HP_map_eraseipport), 2708 },
-	{ HP_POP(map->eraseallipport), HP_POP2(HP_map_eraseallipport), 2710 },
-	{ HP_POP(map->addiddb), HP_POP2(HP_map_addiddb), 2712 },
-	{ HP_POP(map->deliddb), HP_POP2(HP_map_deliddb), 2714 },
-	{ HP_POP(map->nick2sd), HP_POP2(HP_map_nick2sd), 2716 },
-	{ HP_POP(map->getmob_boss), HP_POP2(HP_map_getmob_boss), 2718 },
-	{ HP_POP(map->id2boss), HP_POP2(HP_map_id2boss), 2720 },
-	{ HP_POP(map->reloadnpc), HP_POP2(HP_map_reloadnpc), 2722 },
-	{ HP_POP(map->check_dir), HP_POP2(HP_map_check_dir), 2724 },
-	{ HP_POP(map->calc_dir), HP_POP2(HP_map_calc_dir), 2726 },
-	{ HP_POP(map->random_dir), HP_POP2(HP_map_random_dir), 2728 },
-	{ HP_POP(map->cleanup_sub), HP_POP2(HP_map_cleanup_sub), 2730 },
-	{ HP_POP(map->delmap), HP_POP2(HP_map_delmap), 2732 },
-	{ HP_POP(map->flags_init), HP_POP2(HP_map_flags_init), 2734 },
-	{ HP_POP(map->iwall_set), HP_POP2(HP_map_iwall_set), 2736 },
-	{ HP_POP(map->iwall_get), HP_POP2(HP_map_iwall_get), 2738 },
-	{ HP_POP(map->iwall_remove), HP_POP2(HP_map_iwall_remove), 2740 },
-	{ HP_POP(map->addmobtolist), HP_POP2(HP_map_addmobtolist), 2742 },
-	{ HP_POP(map->spawnmobs), HP_POP2(HP_map_spawnmobs), 2744 },
-	{ HP_POP(map->removemobs), HP_POP2(HP_map_removemobs), 2746 },
-	{ HP_POP(map->addmap2db), HP_POP2(HP_map_addmap2db), 2748 },
-	{ HP_POP(map->removemapdb), HP_POP2(HP_map_removemapdb), 2750 },
-	{ HP_POP(map->clean), HP_POP2(HP_map_clean), 2752 },
-	{ HP_POP(map->do_shutdown), HP_POP2(HP_map_do_shutdown), 2754 },
-	{ HP_POP(map->freeblock_timer), HP_POP2(HP_map_freeblock_timer), 2756 },
-	{ HP_POP(map->searchrandfreecell), HP_POP2(HP_map_searchrandfreecell), 2758 },
-	{ HP_POP(map->count_sub), HP_POP2(HP_map_count_sub), 2760 },
-	{ HP_POP(map->create_charid2nick), HP_POP2(HP_map_create_charid2nick), 2762 },
-	{ HP_POP(map->removemobs_sub), HP_POP2(HP_map_removemobs_sub), 2764 },
-	{ HP_POP(map->gat2cell), HP_POP2(HP_map_gat2cell), 2766 },
-	{ HP_POP(map->cell2gat), HP_POP2(HP_map_cell2gat), 2768 },
-	{ HP_POP(map->getcellp), HP_POP2(HP_map_getcellp), 2770 },
-	{ HP_POP(map->setcell), HP_POP2(HP_map_setcell), 2772 },
-	{ HP_POP(map->sub_getcellp), HP_POP2(HP_map_sub_getcellp), 2774 },
-	{ HP_POP(map->sub_setcell), HP_POP2(HP_map_sub_setcell), 2776 },
-	{ HP_POP(map->iwall_nextxy), HP_POP2(HP_map_iwall_nextxy), 2778 },
-	{ HP_POP(map->create_map_data_other_server), HP_POP2(HP_map_create_map_data_other_server), 2780 },
-	{ HP_POP(map->eraseallipport_sub), HP_POP2(HP_map_eraseallipport_sub), 2782 },
-	{ HP_POP(map->init_mapcache), HP_POP2(HP_map_init_mapcache), 2784 },
-	{ HP_POP(map->readfromcache), HP_POP2(HP_map_readfromcache), 2786 },
-	{ HP_POP(map->addmap), HP_POP2(HP_map_addmap), 2788 },
-	{ HP_POP(map->delmapid), HP_POP2(HP_map_delmapid), 2790 },
-	{ HP_POP(map->zone_db_clear), HP_POP2(HP_map_zone_db_clear), 2792 },
-	{ HP_POP(map->list_final), HP_POP2(HP_map_list_final), 2794 },
-	{ HP_POP(map->waterheight), HP_POP2(HP_map_waterheight), 2796 },
-	{ HP_POP(map->readgat), HP_POP2(HP_map_readgat), 2798 },
-	{ HP_POP(map->readallmaps), HP_POP2(HP_map_readallmaps), 2800 },
-	{ HP_POP(map->config_read), HP_POP2(HP_map_config_read), 2802 },
-	{ HP_POP(map->config_read_sub), HP_POP2(HP_map_config_read_sub), 2804 },
-	{ HP_POP(map->reloadnpc_sub), HP_POP2(HP_map_reloadnpc_sub), 2806 },
-	{ HP_POP(map->inter_config_read), HP_POP2(HP_map_inter_config_read), 2808 },
-	{ HP_POP(map->sql_init), HP_POP2(HP_map_sql_init), 2810 },
-	{ HP_POP(map->sql_close), HP_POP2(HP_map_sql_close), 2812 },
-	{ HP_POP(map->zone_mf_cache), HP_POP2(HP_map_zone_mf_cache), 2814 },
-	{ HP_POP(map->zone_str2itemid), HP_POP2(HP_map_zone_str2itemid), 2816 },
-	{ HP_POP(map->zone_str2skillid), HP_POP2(HP_map_zone_str2skillid), 2818 },
-	{ HP_POP(map->zone_bl_type), HP_POP2(HP_map_zone_bl_type), 2820 },
-	{ HP_POP(map->read_zone_db), HP_POP2(HP_map_read_zone_db), 2822 },
-	{ HP_POP(map->db_final), HP_POP2(HP_map_db_final), 2824 },
-	{ HP_POP(map->nick_db_final), HP_POP2(HP_map_nick_db_final), 2826 },
-	{ HP_POP(map->cleanup_db_sub), HP_POP2(HP_map_cleanup_db_sub), 2828 },
-	{ HP_POP(map->abort_sub), HP_POP2(HP_map_abort_sub), 2830 },
-	{ HP_POP(map->helpscreen), HP_POP2(HP_map_helpscreen), 2832 },
-	{ HP_POP(map->versionscreen), HP_POP2(HP_map_versionscreen), 2834 },
-	{ HP_POP(map->arg_next_value), HP_POP2(HP_map_arg_next_value), 2836 },
-	{ HP_POP(map->addblcell), HP_POP2(HP_map_addblcell), 2838 },
-	{ HP_POP(map->delblcell), HP_POP2(HP_map_delblcell), 2840 },
+	{ HP_POP(map->zone_init, HP_map_zone_init) },
+	{ HP_POP(map->zone_remove, HP_map_zone_remove) },
+	{ HP_POP(map->zone_apply, HP_map_zone_apply) },
+	{ HP_POP(map->zone_change, HP_map_zone_change) },
+	{ HP_POP(map->zone_change2, HP_map_zone_change2) },
+	{ HP_POP(map->getcell, HP_map_getcell) },
+	{ HP_POP(map->setgatcell, HP_map_setgatcell) },
+	{ HP_POP(map->cellfromcache, HP_map_cellfromcache) },
+	{ HP_POP(map->setusers, HP_map_setusers) },
+	{ HP_POP(map->getusers, HP_map_getusers) },
+	{ HP_POP(map->usercount, HP_map_usercount) },
+	{ HP_POP(map->freeblock, HP_map_freeblock) },
+	{ HP_POP(map->freeblock_lock, HP_map_freeblock_lock) },
+	{ HP_POP(map->freeblock_unlock, HP_map_freeblock_unlock) },
+	{ HP_POP(map->addblock, HP_map_addblock) },
+	{ HP_POP(map->delblock, HP_map_delblock) },
+	{ HP_POP(map->moveblock, HP_map_moveblock) },
+	{ HP_POP(map->count_oncell, HP_map_count_oncell) },
+	{ HP_POP(map->find_skill_unit_oncell, HP_map_find_skill_unit_oncell) },
+	{ HP_POP(map->get_new_object_id, HP_map_get_new_object_id) },
+	{ HP_POP(map->search_freecell, HP_map_search_freecell) },
+	{ HP_POP(map->quit, HP_map_quit) },
+	{ HP_POP(map->addnpc, HP_map_addnpc) },
+	{ HP_POP(map->clearflooritem_timer, HP_map_clearflooritem_timer) },
+	{ HP_POP(map->removemobs_timer, HP_map_removemobs_timer) },
+	{ HP_POP(map->clearflooritem, HP_map_clearflooritem) },
+	{ HP_POP(map->addflooritem, HP_map_addflooritem) },
+	{ HP_POP(map->addnickdb, HP_map_addnickdb) },
+	{ HP_POP(map->delnickdb, HP_map_delnickdb) },
+	{ HP_POP(map->reqnickdb, HP_map_reqnickdb) },
+	{ HP_POP(map->charid2nick, HP_map_charid2nick) },
+	{ HP_POP(map->charid2sd, HP_map_charid2sd) },
+	{ HP_POP(map->vforeachpc, HP_map_vforeachpc) },
+	{ HP_POP(map->vforeachmob, HP_map_vforeachmob) },
+	{ HP_POP(map->vforeachnpc, HP_map_vforeachnpc) },
+	{ HP_POP(map->vforeachregen, HP_map_vforeachregen) },
+	{ HP_POP(map->vforeachiddb, HP_map_vforeachiddb) },
+	{ HP_POP(map->vforeachinrange, HP_map_vforeachinrange) },
+	{ HP_POP(map->vforeachinshootrange, HP_map_vforeachinshootrange) },
+	{ HP_POP(map->vforeachinarea, HP_map_vforeachinarea) },
+	{ HP_POP(map->vforcountinrange, HP_map_vforcountinrange) },
+	{ HP_POP(map->vforcountinarea, HP_map_vforcountinarea) },
+	{ HP_POP(map->vforeachinmovearea, HP_map_vforeachinmovearea) },
+	{ HP_POP(map->vforeachincell, HP_map_vforeachincell) },
+	{ HP_POP(map->vforeachinpath, HP_map_vforeachinpath) },
+	{ HP_POP(map->vforeachinmap, HP_map_vforeachinmap) },
+	{ HP_POP(map->vforeachininstance, HP_map_vforeachininstance) },
+	{ HP_POP(map->id2sd, HP_map_id2sd) },
+	{ HP_POP(map->id2md, HP_map_id2md) },
+	{ HP_POP(map->id2nd, HP_map_id2nd) },
+	{ HP_POP(map->id2hd, HP_map_id2hd) },
+	{ HP_POP(map->id2mc, HP_map_id2mc) },
+	{ HP_POP(map->id2cd, HP_map_id2cd) },
+	{ HP_POP(map->id2bl, HP_map_id2bl) },
+	{ HP_POP(map->blid_exists, HP_map_blid_exists) },
+	{ HP_POP(map->mapindex2mapid, HP_map_mapindex2mapid) },
+	{ HP_POP(map->mapname2mapid, HP_map_mapname2mapid) },
+	{ HP_POP(map->mapname2ipport, HP_map_mapname2ipport) },
+	{ HP_POP(map->setipport, HP_map_setipport) },
+	{ HP_POP(map->eraseipport, HP_map_eraseipport) },
+	{ HP_POP(map->eraseallipport, HP_map_eraseallipport) },
+	{ HP_POP(map->addiddb, HP_map_addiddb) },
+	{ HP_POP(map->deliddb, HP_map_deliddb) },
+	{ HP_POP(map->nick2sd, HP_map_nick2sd) },
+	{ HP_POP(map->getmob_boss, HP_map_getmob_boss) },
+	{ HP_POP(map->id2boss, HP_map_id2boss) },
+	{ HP_POP(map->reloadnpc, HP_map_reloadnpc) },
+	{ HP_POP(map->check_dir, HP_map_check_dir) },
+	{ HP_POP(map->calc_dir, HP_map_calc_dir) },
+	{ HP_POP(map->random_dir, HP_map_random_dir) },
+	{ HP_POP(map->cleanup_sub, HP_map_cleanup_sub) },
+	{ HP_POP(map->delmap, HP_map_delmap) },
+	{ HP_POP(map->flags_init, HP_map_flags_init) },
+	{ HP_POP(map->iwall_set, HP_map_iwall_set) },
+	{ HP_POP(map->iwall_get, HP_map_iwall_get) },
+	{ HP_POP(map->iwall_remove, HP_map_iwall_remove) },
+	{ HP_POP(map->addmobtolist, HP_map_addmobtolist) },
+	{ HP_POP(map->spawnmobs, HP_map_spawnmobs) },
+	{ HP_POP(map->removemobs, HP_map_removemobs) },
+	{ HP_POP(map->addmap2db, HP_map_addmap2db) },
+	{ HP_POP(map->removemapdb, HP_map_removemapdb) },
+	{ HP_POP(map->clean, HP_map_clean) },
+	{ HP_POP(map->do_shutdown, HP_map_do_shutdown) },
+	{ HP_POP(map->freeblock_timer, HP_map_freeblock_timer) },
+	{ HP_POP(map->searchrandfreecell, HP_map_searchrandfreecell) },
+	{ HP_POP(map->count_sub, HP_map_count_sub) },
+	{ HP_POP(map->create_charid2nick, HP_map_create_charid2nick) },
+	{ HP_POP(map->removemobs_sub, HP_map_removemobs_sub) },
+	{ HP_POP(map->gat2cell, HP_map_gat2cell) },
+	{ HP_POP(map->cell2gat, HP_map_cell2gat) },
+	{ HP_POP(map->getcellp, HP_map_getcellp) },
+	{ HP_POP(map->setcell, HP_map_setcell) },
+	{ HP_POP(map->sub_getcellp, HP_map_sub_getcellp) },
+	{ HP_POP(map->sub_setcell, HP_map_sub_setcell) },
+	{ HP_POP(map->iwall_nextxy, HP_map_iwall_nextxy) },
+	{ HP_POP(map->create_map_data_other_server, HP_map_create_map_data_other_server) },
+	{ HP_POP(map->eraseallipport_sub, HP_map_eraseallipport_sub) },
+	{ HP_POP(map->init_mapcache, HP_map_init_mapcache) },
+	{ HP_POP(map->readfromcache, HP_map_readfromcache) },
+	{ HP_POP(map->addmap, HP_map_addmap) },
+	{ HP_POP(map->delmapid, HP_map_delmapid) },
+	{ HP_POP(map->zone_db_clear, HP_map_zone_db_clear) },
+	{ HP_POP(map->list_final, HP_map_list_final) },
+	{ HP_POP(map->waterheight, HP_map_waterheight) },
+	{ HP_POP(map->readgat, HP_map_readgat) },
+	{ HP_POP(map->readallmaps, HP_map_readallmaps) },
+	{ HP_POP(map->config_read, HP_map_config_read) },
+	{ HP_POP(map->config_read_sub, HP_map_config_read_sub) },
+	{ HP_POP(map->reloadnpc_sub, HP_map_reloadnpc_sub) },
+	{ HP_POP(map->inter_config_read, HP_map_inter_config_read) },
+	{ HP_POP(map->sql_init, HP_map_sql_init) },
+	{ HP_POP(map->sql_close, HP_map_sql_close) },
+	{ HP_POP(map->zone_mf_cache, HP_map_zone_mf_cache) },
+	{ HP_POP(map->zone_str2itemid, HP_map_zone_str2itemid) },
+	{ HP_POP(map->zone_str2skillid, HP_map_zone_str2skillid) },
+	{ HP_POP(map->zone_bl_type, HP_map_zone_bl_type) },
+	{ HP_POP(map->read_zone_db, HP_map_read_zone_db) },
+	{ HP_POP(map->db_final, HP_map_db_final) },
+	{ HP_POP(map->nick_db_final, HP_map_nick_db_final) },
+	{ HP_POP(map->cleanup_db_sub, HP_map_cleanup_db_sub) },
+	{ HP_POP(map->abort_sub, HP_map_abort_sub) },
+	{ HP_POP(map->helpscreen, HP_map_helpscreen) },
+	{ HP_POP(map->versionscreen, HP_map_versionscreen) },
+	{ HP_POP(map->arg_next_value, HP_map_arg_next_value) },
+	{ HP_POP(map->addblcell, HP_map_addblcell) },
+	{ HP_POP(map->delblcell, HP_map_delblcell) },
 /* mapit */
-	{ HP_POP(mapit->alloc), HP_POP2(HP_mapit_alloc), 2842 },
-	{ HP_POP(mapit->free), HP_POP2(HP_mapit_free), 2844 },
-	{ HP_POP(mapit->first), HP_POP2(HP_mapit_first), 2846 },
-	{ HP_POP(mapit->last), HP_POP2(HP_mapit_last), 2848 },
-	{ HP_POP(mapit->next), HP_POP2(HP_mapit_next), 2850 },
-	{ HP_POP(mapit->prev), HP_POP2(HP_mapit_prev), 2852 },
-	{ HP_POP(mapit->exists), HP_POP2(HP_mapit_exists), 2854 },
+	{ HP_POP(mapit->alloc, HP_mapit_alloc) },
+	{ HP_POP(mapit->free, HP_mapit_free) },
+	{ HP_POP(mapit->first, HP_mapit_first) },
+	{ HP_POP(mapit->last, HP_mapit_last) },
+	{ HP_POP(mapit->next, HP_mapit_next) },
+	{ HP_POP(mapit->prev, HP_mapit_prev) },
+	{ HP_POP(mapit->exists, HP_mapit_exists) },
 /* mapreg */
-	{ HP_POP(mapreg->init), HP_POP2(HP_mapreg_init), 2856 },
-	{ HP_POP(mapreg->final), HP_POP2(HP_mapreg_final), 2858 },
-	{ HP_POP(mapreg->readreg), HP_POP2(HP_mapreg_readreg), 2860 },
-	{ HP_POP(mapreg->readregstr), HP_POP2(HP_mapreg_readregstr), 2862 },
-	{ HP_POP(mapreg->setreg), HP_POP2(HP_mapreg_setreg), 2864 },
-	{ HP_POP(mapreg->setregstr), HP_POP2(HP_mapreg_setregstr), 2866 },
-	{ HP_POP(mapreg->load), HP_POP2(HP_mapreg_load), 2868 },
-	{ HP_POP(mapreg->save), HP_POP2(HP_mapreg_save), 2870 },
-	{ HP_POP(mapreg->save_timer), HP_POP2(HP_mapreg_save_timer), 2872 },
-	{ HP_POP(mapreg->reload), HP_POP2(HP_mapreg_reload), 2874 },
-	{ HP_POP(mapreg->config_read), HP_POP2(HP_mapreg_config_read), 2876 },
+	{ HP_POP(mapreg->init, HP_mapreg_init) },
+	{ HP_POP(mapreg->final, HP_mapreg_final) },
+	{ HP_POP(mapreg->readreg, HP_mapreg_readreg) },
+	{ HP_POP(mapreg->readregstr, HP_mapreg_readregstr) },
+	{ HP_POP(mapreg->setreg, HP_mapreg_setreg) },
+	{ HP_POP(mapreg->setregstr, HP_mapreg_setregstr) },
+	{ HP_POP(mapreg->load, HP_mapreg_load) },
+	{ HP_POP(mapreg->save, HP_mapreg_save) },
+	{ HP_POP(mapreg->save_timer, HP_mapreg_save_timer) },
+	{ HP_POP(mapreg->reload, HP_mapreg_reload) },
+	{ HP_POP(mapreg->config_read, HP_mapreg_config_read) },
 /* mercenary */
-	{ HP_POP(mercenary->init), HP_POP2(HP_mercenary_init), 2878 },
-	{ HP_POP(mercenary->class), HP_POP2(HP_mercenary_class), 2880 },
-	{ HP_POP(mercenary->get_viewdata), HP_POP2(HP_mercenary_get_viewdata), 2882 },
-	{ HP_POP(mercenary->create), HP_POP2(HP_mercenary_create), 2884 },
-	{ HP_POP(mercenary->data_received), HP_POP2(HP_mercenary_data_received), 2886 },
-	{ HP_POP(mercenary->save), HP_POP2(HP_mercenary_save), 2888 },
-	{ HP_POP(mercenary->heal), HP_POP2(HP_mercenary_heal), 2890 },
-	{ HP_POP(mercenary->dead), HP_POP2(HP_mercenary_dead), 2892 },
-	{ HP_POP(mercenary->delete), HP_POP2(HP_mercenary_delete), 2894 },
-	{ HP_POP(mercenary->contract_stop), HP_POP2(HP_mercenary_contract_stop), 2896 },
-	{ HP_POP(mercenary->get_lifetime), HP_POP2(HP_mercenary_get_lifetime), 2898 },
-	{ HP_POP(mercenary->get_guild), HP_POP2(HP_mercenary_get_guild), 2900 },
-	{ HP_POP(mercenary->get_faith), HP_POP2(HP_mercenary_get_faith), 2902 },
-	{ HP_POP(mercenary->set_faith), HP_POP2(HP_mercenary_set_faith), 2904 },
-	{ HP_POP(mercenary->get_calls), HP_POP2(HP_mercenary_get_calls), 2906 },
-	{ HP_POP(mercenary->set_calls), HP_POP2(HP_mercenary_set_calls), 2908 },
-	{ HP_POP(mercenary->kills), HP_POP2(HP_mercenary_kills), 2910 },
-	{ HP_POP(mercenary->checkskill), HP_POP2(HP_mercenary_checkskill), 2912 },
-	{ HP_POP(mercenary->read_db), HP_POP2(HP_mercenary_read_db), 2914 },
-	{ HP_POP(mercenary->read_skilldb), HP_POP2(HP_mercenary_read_skilldb), 2916 },
-	{ HP_POP(mercenary->killbonus), HP_POP2(HP_mercenary_killbonus), 2918 },
-	{ HP_POP(mercenary->search_index), HP_POP2(HP_mercenary_search_index), 2920 },
-	{ HP_POP(mercenary->contract_end_timer), HP_POP2(HP_mercenary_contract_end_timer), 2922 },
-	{ HP_POP(mercenary->read_db_sub), HP_POP2(HP_mercenary_read_db_sub), 2924 },
-	{ HP_POP(mercenary->read_skill_db_sub), HP_POP2(HP_mercenary_read_skill_db_sub), 2926 },
+	{ HP_POP(mercenary->init, HP_mercenary_init) },
+	{ HP_POP(mercenary->class, HP_mercenary_class) },
+	{ HP_POP(mercenary->get_viewdata, HP_mercenary_get_viewdata) },
+	{ HP_POP(mercenary->create, HP_mercenary_create) },
+	{ HP_POP(mercenary->data_received, HP_mercenary_data_received) },
+	{ HP_POP(mercenary->save, HP_mercenary_save) },
+	{ HP_POP(mercenary->heal, HP_mercenary_heal) },
+	{ HP_POP(mercenary->dead, HP_mercenary_dead) },
+	{ HP_POP(mercenary->delete, HP_mercenary_delete) },
+	{ HP_POP(mercenary->contract_stop, HP_mercenary_contract_stop) },
+	{ HP_POP(mercenary->get_lifetime, HP_mercenary_get_lifetime) },
+	{ HP_POP(mercenary->get_guild, HP_mercenary_get_guild) },
+	{ HP_POP(mercenary->get_faith, HP_mercenary_get_faith) },
+	{ HP_POP(mercenary->set_faith, HP_mercenary_set_faith) },
+	{ HP_POP(mercenary->get_calls, HP_mercenary_get_calls) },
+	{ HP_POP(mercenary->set_calls, HP_mercenary_set_calls) },
+	{ HP_POP(mercenary->kills, HP_mercenary_kills) },
+	{ HP_POP(mercenary->checkskill, HP_mercenary_checkskill) },
+	{ HP_POP(mercenary->read_db, HP_mercenary_read_db) },
+	{ HP_POP(mercenary->read_skilldb, HP_mercenary_read_skilldb) },
+	{ HP_POP(mercenary->killbonus, HP_mercenary_killbonus) },
+	{ HP_POP(mercenary->search_index, HP_mercenary_search_index) },
+	{ HP_POP(mercenary->contract_end_timer, HP_mercenary_contract_end_timer) },
+	{ HP_POP(mercenary->read_db_sub, HP_mercenary_read_db_sub) },
+	{ HP_POP(mercenary->read_skill_db_sub, HP_mercenary_read_skill_db_sub) },
 /* mob */
-	{ HP_POP(mob->init), HP_POP2(HP_mob_init), 2928 },
-	{ HP_POP(mob->final), HP_POP2(HP_mob_final), 2930 },
-	{ HP_POP(mob->reload), HP_POP2(HP_mob_reload), 2932 },
-	{ HP_POP(mob->db), HP_POP2(HP_mob_db), 2934 },
-	{ HP_POP(mob->chat), HP_POP2(HP_mob_chat), 2936 },
-	{ HP_POP(mob->makedummymobdb), HP_POP2(HP_mob_makedummymobdb), 2938 },
-	{ HP_POP(mob->spawn_guardian_sub), HP_POP2(HP_mob_spawn_guardian_sub), 2940 },
-	{ HP_POP(mob->skill_id2skill_idx), HP_POP2(HP_mob_skill_id2skill_idx), 2942 },
-	{ HP_POP(mob->db_searchname), HP_POP2(HP_mob_db_searchname), 2944 },
-	{ HP_POP(mob->db_searchname_array_sub), HP_POP2(HP_mob_db_searchname_array_sub), 2946 },
-	{ HP_POP(mob->mvptomb_create), HP_POP2(HP_mob_mvptomb_create), 2948 },
-	{ HP_POP(mob->mvptomb_destroy), HP_POP2(HP_mob_mvptomb_destroy), 2950 },
-	{ HP_POP(mob->db_searchname_array), HP_POP2(HP_mob_db_searchname_array), 2952 },
-	{ HP_POP(mob->db_checkid), HP_POP2(HP_mob_db_checkid), 2954 },
-	{ HP_POP(mob->get_viewdata), HP_POP2(HP_mob_get_viewdata), 2956 },
-	{ HP_POP(mob->parse_dataset), HP_POP2(HP_mob_parse_dataset), 2958 },
-	{ HP_POP(mob->spawn_dataset), HP_POP2(HP_mob_spawn_dataset), 2960 },
-	{ HP_POP(mob->get_random_id), HP_POP2(HP_mob_get_random_id), 2962 },
-	{ HP_POP(mob->ksprotected), HP_POP2(HP_mob_ksprotected), 2964 },
-	{ HP_POP(mob->once_spawn_sub), HP_POP2(HP_mob_once_spawn_sub), 2966 },
-	{ HP_POP(mob->once_spawn), HP_POP2(HP_mob_once_spawn), 2968 },
-	{ HP_POP(mob->once_spawn_area), HP_POP2(HP_mob_once_spawn_area), 2970 },
-	{ HP_POP(mob->spawn_guardian), HP_POP2(HP_mob_spawn_guardian), 2972 },
-	{ HP_POP(mob->spawn_bg), HP_POP2(HP_mob_spawn_bg), 2974 },
-	{ HP_POP(mob->can_reach), HP_POP2(HP_mob_can_reach), 2976 },
-	{ HP_POP(mob->linksearch), HP_POP2(HP_mob_linksearch), 2978 },
-	{ HP_POP(mob->delayspawn), HP_POP2(HP_mob_delayspawn), 2980 },
-	{ HP_POP(mob->setdelayspawn), HP_POP2(HP_mob_setdelayspawn), 2982 },
-	{ HP_POP(mob->count_sub), HP_POP2(HP_mob_count_sub), 2984 },
-	{ HP_POP(mob->spawn), HP_POP2(HP_mob_spawn), 2986 },
-	{ HP_POP(mob->can_changetarget), HP_POP2(HP_mob_can_changetarget), 2988 },
-	{ HP_POP(mob->target), HP_POP2(HP_mob_target), 2990 },
-	{ HP_POP(mob->ai_sub_hard_activesearch), HP_POP2(HP_mob_ai_sub_hard_activesearch), 2992 },
-	{ HP_POP(mob->ai_sub_hard_changechase), HP_POP2(HP_mob_ai_sub_hard_changechase), 2994 },
-	{ HP_POP(mob->ai_sub_hard_bg_ally), HP_POP2(HP_mob_ai_sub_hard_bg_ally), 2996 },
-	{ HP_POP(mob->ai_sub_hard_lootsearch), HP_POP2(HP_mob_ai_sub_hard_lootsearch), 2998 },
-	{ HP_POP(mob->warpchase_sub), HP_POP2(HP_mob_warpchase_sub), 3000 },
-	{ HP_POP(mob->ai_sub_hard_slavemob), HP_POP2(HP_mob_ai_sub_hard_slavemob), 3002 },
-	{ HP_POP(mob->unlocktarget), HP_POP2(HP_mob_unlocktarget), 3004 },
-	{ HP_POP(mob->randomwalk), HP_POP2(HP_mob_randomwalk), 3006 },
-	{ HP_POP(mob->warpchase), HP_POP2(HP_mob_warpchase), 3008 },
-	{ HP_POP(mob->ai_sub_hard), HP_POP2(HP_mob_ai_sub_hard), 3010 },
-	{ HP_POP(mob->ai_sub_hard_timer), HP_POP2(HP_mob_ai_sub_hard_timer), 3012 },
-	{ HP_POP(mob->ai_sub_foreachclient), HP_POP2(HP_mob_ai_sub_foreachclient), 3014 },
-	{ HP_POP(mob->ai_sub_lazy), HP_POP2(HP_mob_ai_sub_lazy), 3016 },
-	{ HP_POP(mob->ai_lazy), HP_POP2(HP_mob_ai_lazy), 3018 },
-	{ HP_POP(mob->ai_hard), HP_POP2(HP_mob_ai_hard), 3020 },
-	{ HP_POP(mob->setdropitem), HP_POP2(HP_mob_setdropitem), 3022 },
-	{ HP_POP(mob->setlootitem), HP_POP2(HP_mob_setlootitem), 3024 },
-	{ HP_POP(mob->delay_item_drop), HP_POP2(HP_mob_delay_item_drop), 3026 },
-	{ HP_POP(mob->item_drop), HP_POP2(HP_mob_item_drop), 3028 },
-	{ HP_POP(mob->timer_delete), HP_POP2(HP_mob_timer_delete), 3030 },
-	{ HP_POP(mob->deleteslave_sub), HP_POP2(HP_mob_deleteslave_sub), 3032 },
-	{ HP_POP(mob->deleteslave), HP_POP2(HP_mob_deleteslave), 3034 },
-	{ HP_POP(mob->respawn), HP_POP2(HP_mob_respawn), 3036 },
-	{ HP_POP(mob->log_damage), HP_POP2(HP_mob_log_damage), 3038 },
-	{ HP_POP(mob->damage), HP_POP2(HP_mob_damage), 3040 },
-	{ HP_POP(mob->dead), HP_POP2(HP_mob_dead), 3042 },
-	{ HP_POP(mob->revive), HP_POP2(HP_mob_revive), 3044 },
-	{ HP_POP(mob->guardian_guildchange), HP_POP2(HP_mob_guardian_guildchange), 3046 },
-	{ HP_POP(mob->random_class), HP_POP2(HP_mob_random_class), 3048 },
-	{ HP_POP(mob->class_change), HP_POP2(HP_mob_class_change), 3050 },
-	{ HP_POP(mob->heal), HP_POP2(HP_mob_heal), 3052 },
-	{ HP_POP(mob->warpslave_sub), HP_POP2(HP_mob_warpslave_sub), 3054 },
-	{ HP_POP(mob->warpslave), HP_POP2(HP_mob_warpslave), 3056 },
-	{ HP_POP(mob->countslave_sub), HP_POP2(HP_mob_countslave_sub), 3058 },
-	{ HP_POP(mob->countslave), HP_POP2(HP_mob_countslave), 3060 },
-	{ HP_POP(mob->summonslave), HP_POP2(HP_mob_summonslave), 3062 },
-	{ HP_POP(mob->getfriendhprate_sub), HP_POP2(HP_mob_getfriendhprate_sub), 3064 },
-	{ HP_POP(mob->getfriendhprate), HP_POP2(HP_mob_getfriendhprate), 3066 },
-	{ HP_POP(mob->getmasterhpltmaxrate), HP_POP2(HP_mob_getmasterhpltmaxrate), 3068 },
-	{ HP_POP(mob->getfriendstatus_sub), HP_POP2(HP_mob_getfriendstatus_sub), 3070 },
-	{ HP_POP(mob->getfriendstatus), HP_POP2(HP_mob_getfriendstatus), 3072 },
-	{ HP_POP(mob->skill_use), HP_POP2(HP_mob_skill_use), 3074 },
-	{ HP_POP(mob->skill_event), HP_POP2(HP_mob_skill_event), 3076 },
-	{ HP_POP(mob->is_clone), HP_POP2(HP_mob_is_clone), 3078 },
-	{ HP_POP(mob->clone_spawn), HP_POP2(HP_mob_clone_spawn), 3080 },
-	{ HP_POP(mob->clone_delete), HP_POP2(HP_mob_clone_delete), 3082 },
-	{ HP_POP(mob->drop_adjust), HP_POP2(HP_mob_drop_adjust), 3084 },
-	{ HP_POP(mob->item_dropratio_adjust), HP_POP2(HP_mob_item_dropratio_adjust), 3086 },
-	{ HP_POP(mob->parse_dbrow), HP_POP2(HP_mob_parse_dbrow), 3088 },
-	{ HP_POP(mob->readdb_sub), HP_POP2(HP_mob_readdb_sub), 3090 },
-	{ HP_POP(mob->readdb), HP_POP2(HP_mob_readdb), 3092 },
-	{ HP_POP(mob->read_sqldb), HP_POP2(HP_mob_read_sqldb), 3094 },
-	{ HP_POP(mob->readdb_mobavail), HP_POP2(HP_mob_readdb_mobavail), 3096 },
-	{ HP_POP(mob->read_randommonster), HP_POP2(HP_mob_read_randommonster), 3098 },
-	{ HP_POP(mob->parse_row_chatdb), HP_POP2(HP_mob_parse_row_chatdb), 3100 },
-	{ HP_POP(mob->readchatdb), HP_POP2(HP_mob_readchatdb), 3102 },
-	{ HP_POP(mob->parse_row_mobskilldb), HP_POP2(HP_mob_parse_row_mobskilldb), 3104 },
-	{ HP_POP(mob->readskilldb), HP_POP2(HP_mob_readskilldb), 3106 },
-	{ HP_POP(mob->read_sqlskilldb), HP_POP2(HP_mob_read_sqlskilldb), 3108 },
-	{ HP_POP(mob->readdb_race2), HP_POP2(HP_mob_readdb_race2), 3110 },
-	{ HP_POP(mob->readdb_itemratio), HP_POP2(HP_mob_readdb_itemratio), 3112 },
-	{ HP_POP(mob->load), HP_POP2(HP_mob_load), 3114 },
-	{ HP_POP(mob->clear_spawninfo), HP_POP2(HP_mob_clear_spawninfo), 3116 },
+	{ HP_POP(mob->init, HP_mob_init) },
+	{ HP_POP(mob->final, HP_mob_final) },
+	{ HP_POP(mob->reload, HP_mob_reload) },
+	{ HP_POP(mob->db, HP_mob_db) },
+	{ HP_POP(mob->chat, HP_mob_chat) },
+	{ HP_POP(mob->makedummymobdb, HP_mob_makedummymobdb) },
+	{ HP_POP(mob->spawn_guardian_sub, HP_mob_spawn_guardian_sub) },
+	{ HP_POP(mob->skill_id2skill_idx, HP_mob_skill_id2skill_idx) },
+	{ HP_POP(mob->db_searchname, HP_mob_db_searchname) },
+	{ HP_POP(mob->db_searchname_array_sub, HP_mob_db_searchname_array_sub) },
+	{ HP_POP(mob->mvptomb_create, HP_mob_mvptomb_create) },
+	{ HP_POP(mob->mvptomb_destroy, HP_mob_mvptomb_destroy) },
+	{ HP_POP(mob->db_searchname_array, HP_mob_db_searchname_array) },
+	{ HP_POP(mob->db_checkid, HP_mob_db_checkid) },
+	{ HP_POP(mob->get_viewdata, HP_mob_get_viewdata) },
+	{ HP_POP(mob->parse_dataset, HP_mob_parse_dataset) },
+	{ HP_POP(mob->spawn_dataset, HP_mob_spawn_dataset) },
+	{ HP_POP(mob->get_random_id, HP_mob_get_random_id) },
+	{ HP_POP(mob->ksprotected, HP_mob_ksprotected) },
+	{ HP_POP(mob->once_spawn_sub, HP_mob_once_spawn_sub) },
+	{ HP_POP(mob->once_spawn, HP_mob_once_spawn) },
+	{ HP_POP(mob->once_spawn_area, HP_mob_once_spawn_area) },
+	{ HP_POP(mob->spawn_guardian, HP_mob_spawn_guardian) },
+	{ HP_POP(mob->spawn_bg, HP_mob_spawn_bg) },
+	{ HP_POP(mob->can_reach, HP_mob_can_reach) },
+	{ HP_POP(mob->linksearch, HP_mob_linksearch) },
+	{ HP_POP(mob->delayspawn, HP_mob_delayspawn) },
+	{ HP_POP(mob->setdelayspawn, HP_mob_setdelayspawn) },
+	{ HP_POP(mob->count_sub, HP_mob_count_sub) },
+	{ HP_POP(mob->spawn, HP_mob_spawn) },
+	{ HP_POP(mob->can_changetarget, HP_mob_can_changetarget) },
+	{ HP_POP(mob->target, HP_mob_target) },
+	{ HP_POP(mob->ai_sub_hard_activesearch, HP_mob_ai_sub_hard_activesearch) },
+	{ HP_POP(mob->ai_sub_hard_changechase, HP_mob_ai_sub_hard_changechase) },
+	{ HP_POP(mob->ai_sub_hard_bg_ally, HP_mob_ai_sub_hard_bg_ally) },
+	{ HP_POP(mob->ai_sub_hard_lootsearch, HP_mob_ai_sub_hard_lootsearch) },
+	{ HP_POP(mob->warpchase_sub, HP_mob_warpchase_sub) },
+	{ HP_POP(mob->ai_sub_hard_slavemob, HP_mob_ai_sub_hard_slavemob) },
+	{ HP_POP(mob->unlocktarget, HP_mob_unlocktarget) },
+	{ HP_POP(mob->randomwalk, HP_mob_randomwalk) },
+	{ HP_POP(mob->warpchase, HP_mob_warpchase) },
+	{ HP_POP(mob->ai_sub_hard, HP_mob_ai_sub_hard) },
+	{ HP_POP(mob->ai_sub_hard_timer, HP_mob_ai_sub_hard_timer) },
+	{ HP_POP(mob->ai_sub_foreachclient, HP_mob_ai_sub_foreachclient) },
+	{ HP_POP(mob->ai_sub_lazy, HP_mob_ai_sub_lazy) },
+	{ HP_POP(mob->ai_lazy, HP_mob_ai_lazy) },
+	{ HP_POP(mob->ai_hard, HP_mob_ai_hard) },
+	{ HP_POP(mob->setdropitem, HP_mob_setdropitem) },
+	{ HP_POP(mob->setlootitem, HP_mob_setlootitem) },
+	{ HP_POP(mob->delay_item_drop, HP_mob_delay_item_drop) },
+	{ HP_POP(mob->item_drop, HP_mob_item_drop) },
+	{ HP_POP(mob->timer_delete, HP_mob_timer_delete) },
+	{ HP_POP(mob->deleteslave_sub, HP_mob_deleteslave_sub) },
+	{ HP_POP(mob->deleteslave, HP_mob_deleteslave) },
+	{ HP_POP(mob->respawn, HP_mob_respawn) },
+	{ HP_POP(mob->log_damage, HP_mob_log_damage) },
+	{ HP_POP(mob->damage, HP_mob_damage) },
+	{ HP_POP(mob->dead, HP_mob_dead) },
+	{ HP_POP(mob->revive, HP_mob_revive) },
+	{ HP_POP(mob->guardian_guildchange, HP_mob_guardian_guildchange) },
+	{ HP_POP(mob->random_class, HP_mob_random_class) },
+	{ HP_POP(mob->class_change, HP_mob_class_change) },
+	{ HP_POP(mob->heal, HP_mob_heal) },
+	{ HP_POP(mob->warpslave_sub, HP_mob_warpslave_sub) },
+	{ HP_POP(mob->warpslave, HP_mob_warpslave) },
+	{ HP_POP(mob->countslave_sub, HP_mob_countslave_sub) },
+	{ HP_POP(mob->countslave, HP_mob_countslave) },
+	{ HP_POP(mob->summonslave, HP_mob_summonslave) },
+	{ HP_POP(mob->getfriendhprate_sub, HP_mob_getfriendhprate_sub) },
+	{ HP_POP(mob->getfriendhprate, HP_mob_getfriendhprate) },
+	{ HP_POP(mob->getmasterhpltmaxrate, HP_mob_getmasterhpltmaxrate) },
+	{ HP_POP(mob->getfriendstatus_sub, HP_mob_getfriendstatus_sub) },
+	{ HP_POP(mob->getfriendstatus, HP_mob_getfriendstatus) },
+	{ HP_POP(mob->skill_use, HP_mob_skill_use) },
+	{ HP_POP(mob->skill_event, HP_mob_skill_event) },
+	{ HP_POP(mob->is_clone, HP_mob_is_clone) },
+	{ HP_POP(mob->clone_spawn, HP_mob_clone_spawn) },
+	{ HP_POP(mob->clone_delete, HP_mob_clone_delete) },
+	{ HP_POP(mob->drop_adjust, HP_mob_drop_adjust) },
+	{ HP_POP(mob->item_dropratio_adjust, HP_mob_item_dropratio_adjust) },
+	{ HP_POP(mob->parse_dbrow, HP_mob_parse_dbrow) },
+	{ HP_POP(mob->readdb_sub, HP_mob_readdb_sub) },
+	{ HP_POP(mob->readdb, HP_mob_readdb) },
+	{ HP_POP(mob->read_sqldb, HP_mob_read_sqldb) },
+	{ HP_POP(mob->readdb_mobavail, HP_mob_readdb_mobavail) },
+	{ HP_POP(mob->read_randommonster, HP_mob_read_randommonster) },
+	{ HP_POP(mob->parse_row_chatdb, HP_mob_parse_row_chatdb) },
+	{ HP_POP(mob->readchatdb, HP_mob_readchatdb) },
+	{ HP_POP(mob->parse_row_mobskilldb, HP_mob_parse_row_mobskilldb) },
+	{ HP_POP(mob->readskilldb, HP_mob_readskilldb) },
+	{ HP_POP(mob->read_sqlskilldb, HP_mob_read_sqlskilldb) },
+	{ HP_POP(mob->readdb_race2, HP_mob_readdb_race2) },
+	{ HP_POP(mob->readdb_itemratio, HP_mob_readdb_itemratio) },
+	{ HP_POP(mob->load, HP_mob_load) },
+	{ HP_POP(mob->clear_spawninfo, HP_mob_clear_spawninfo) },
 /* npc */
-	{ HP_POP(npc->init), HP_POP2(HP_npc_init), 3118 },
-	{ HP_POP(npc->final), HP_POP2(HP_npc_final), 3120 },
-	{ HP_POP(npc->get_new_npc_id), HP_POP2(HP_npc_get_new_npc_id), 3122 },
-	{ HP_POP(npc->get_viewdata), HP_POP2(HP_npc_get_viewdata), 3124 },
-	{ HP_POP(npc->isnear_sub), HP_POP2(HP_npc_isnear_sub), 3126 },
-	{ HP_POP(npc->isnear), HP_POP2(HP_npc_isnear), 3128 },
-	{ HP_POP(npc->ontouch_event), HP_POP2(HP_npc_ontouch_event), 3130 },
-	{ HP_POP(npc->ontouch2_event), HP_POP2(HP_npc_ontouch2_event), 3132 },
-	{ HP_POP(npc->enable_sub), HP_POP2(HP_npc_enable_sub), 3134 },
-	{ HP_POP(npc->enable), HP_POP2(HP_npc_enable), 3136 },
-	{ HP_POP(npc->name2id), HP_POP2(HP_npc_name2id), 3138 },
-	{ HP_POP(npc->event_dequeue), HP_POP2(HP_npc_event_dequeue), 3140 },
-	{ HP_POP(npc->event_export_create), HP_POP2(HP_npc_event_export_create), 3142 },
-	{ HP_POP(npc->event_export), HP_POP2(HP_npc_event_export), 3144 },
-	{ HP_POP(npc->event_sub), HP_POP2(HP_npc_event_sub), 3146 },
-	{ HP_POP(npc->event_doall_sub), HP_POP2(HP_npc_event_doall_sub), 3148 },
-	{ HP_POP(npc->event_do), HP_POP2(HP_npc_event_do), 3150 },
-	{ HP_POP(npc->event_doall_id), HP_POP2(HP_npc_event_doall_id), 3152 },
-	{ HP_POP(npc->event_doall), HP_POP2(HP_npc_event_doall), 3154 },
-	{ HP_POP(npc->event_do_clock), HP_POP2(HP_npc_event_do_clock), 3156 },
-	{ HP_POP(npc->event_do_oninit), HP_POP2(HP_npc_event_do_oninit), 3158 },
-	{ HP_POP(npc->timerevent_export), HP_POP2(HP_npc_timerevent_export), 3160 },
-	{ HP_POP(npc->timerevent), HP_POP2(HP_npc_timerevent), 3162 },
-	{ HP_POP(npc->timerevent_start), HP_POP2(HP_npc_timerevent_start), 3164 },
-	{ HP_POP(npc->timerevent_stop), HP_POP2(HP_npc_timerevent_stop), 3166 },
-	{ HP_POP(npc->timerevent_quit), HP_POP2(HP_npc_timerevent_quit), 3168 },
-	{ HP_POP(npc->gettimerevent_tick), HP_POP2(HP_npc_gettimerevent_tick), 3170 },
-	{ HP_POP(npc->settimerevent_tick), HP_POP2(HP_npc_settimerevent_tick), 3172 },
-	{ HP_POP(npc->event), HP_POP2(HP_npc_event), 3174 },
-	{ HP_POP(npc->touch_areanpc_sub), HP_POP2(HP_npc_touch_areanpc_sub), 3176 },
-	{ HP_POP(npc->touchnext_areanpc), HP_POP2(HP_npc_touchnext_areanpc), 3178 },
-	{ HP_POP(npc->touch_areanpc), HP_POP2(HP_npc_touch_areanpc), 3180 },
-	{ HP_POP(npc->touch_areanpc2), HP_POP2(HP_npc_touch_areanpc2), 3182 },
-	{ HP_POP(npc->check_areanpc), HP_POP2(HP_npc_check_areanpc), 3184 },
-	{ HP_POP(npc->checknear), HP_POP2(HP_npc_checknear), 3186 },
-	{ HP_POP(npc->globalmessage), HP_POP2(HP_npc_globalmessage), 3188 },
-	{ HP_POP(npc->run_tomb), HP_POP2(HP_npc_run_tomb), 3190 },
-	{ HP_POP(npc->click), HP_POP2(HP_npc_click), 3192 },
-	{ HP_POP(npc->scriptcont), HP_POP2(HP_npc_scriptcont), 3194 },
-	{ HP_POP(npc->buysellsel), HP_POP2(HP_npc_buysellsel), 3196 },
-	{ HP_POP(npc->cashshop_buylist), HP_POP2(HP_npc_cashshop_buylist), 3198 },
-	{ HP_POP(npc->buylist_sub), HP_POP2(HP_npc_buylist_sub), 3200 },
-	{ HP_POP(npc->cashshop_buy), HP_POP2(HP_npc_cashshop_buy), 3202 },
-	{ HP_POP(npc->buylist), HP_POP2(HP_npc_buylist), 3204 },
-	{ HP_POP(npc->selllist_sub), HP_POP2(HP_npc_selllist_sub), 3206 },
-	{ HP_POP(npc->selllist), HP_POP2(HP_npc_selllist), 3208 },
-	{ HP_POP(npc->remove_map), HP_POP2(HP_npc_remove_map), 3210 },
-	{ HP_POP(npc->unload_ev), HP_POP2(HP_npc_unload_ev), 3212 },
-	{ HP_POP(npc->unload_ev_label), HP_POP2(HP_npc_unload_ev_label), 3214 },
-	{ HP_POP(npc->unload_dup_sub), HP_POP2(HP_npc_unload_dup_sub), 3216 },
-	{ HP_POP(npc->unload_duplicates), HP_POP2(HP_npc_unload_duplicates), 3218 },
-	{ HP_POP(npc->unload), HP_POP2(HP_npc_unload), 3220 },
-	{ HP_POP(npc->clearsrcfile), HP_POP2(HP_npc_clearsrcfile), 3222 },
-	{ HP_POP(npc->addsrcfile), HP_POP2(HP_npc_addsrcfile), 3224 },
-	{ HP_POP(npc->delsrcfile), HP_POP2(HP_npc_delsrcfile), 3226 },
-	{ HP_POP(npc->parsename), HP_POP2(HP_npc_parsename), 3228 },
-	{ HP_POP(npc->add_warp), HP_POP2(HP_npc_add_warp), 3230 },
-	{ HP_POP(npc->parse_warp), HP_POP2(HP_npc_parse_warp), 3232 },
-	{ HP_POP(npc->parse_shop), HP_POP2(HP_npc_parse_shop), 3234 },
-	{ HP_POP(npc->convertlabel_db), HP_POP2(HP_npc_convertlabel_db), 3236 },
-	{ HP_POP(npc->skip_script), HP_POP2(HP_npc_skip_script), 3238 },
-	{ HP_POP(npc->parse_script), HP_POP2(HP_npc_parse_script), 3240 },
-	{ HP_POP(npc->parse_duplicate), HP_POP2(HP_npc_parse_duplicate), 3242 },
-	{ HP_POP(npc->duplicate4instance), HP_POP2(HP_npc_duplicate4instance), 3244 },
-	{ HP_POP(npc->setcells), HP_POP2(HP_npc_setcells), 3246 },
-	{ HP_POP(npc->unsetcells_sub), HP_POP2(HP_npc_unsetcells_sub), 3248 },
-	{ HP_POP(npc->unsetcells), HP_POP2(HP_npc_unsetcells), 3250 },
-	{ HP_POP(npc->movenpc), HP_POP2(HP_npc_movenpc), 3252 },
-	{ HP_POP(npc->setdisplayname), HP_POP2(HP_npc_setdisplayname), 3254 },
-	{ HP_POP(npc->setclass), HP_POP2(HP_npc_setclass), 3256 },
-	{ HP_POP(npc->do_atcmd_event), HP_POP2(HP_npc_do_atcmd_event), 3258 },
-	{ HP_POP(npc->parse_function), HP_POP2(HP_npc_parse_function), 3260 },
-	{ HP_POP(npc->parse_mob2), HP_POP2(HP_npc_parse_mob2), 3262 },
-	{ HP_POP(npc->parse_mob), HP_POP2(HP_npc_parse_mob), 3264 },
-	{ HP_POP(npc->parse_mapflag), HP_POP2(HP_npc_parse_mapflag), 3266 },
-	{ HP_POP(npc->parsesrcfile), HP_POP2(HP_npc_parsesrcfile), 3268 },
-	{ HP_POP(npc->script_event), HP_POP2(HP_npc_script_event), 3270 },
-	{ HP_POP(npc->read_event_script), HP_POP2(HP_npc_read_event_script), 3272 },
-	{ HP_POP(npc->path_db_clear_sub), HP_POP2(HP_npc_path_db_clear_sub), 3274 },
-	{ HP_POP(npc->ev_label_db_clear_sub), HP_POP2(HP_npc_ev_label_db_clear_sub), 3276 },
-	{ HP_POP(npc->reload), HP_POP2(HP_npc_reload), 3278 },
-	{ HP_POP(npc->unloadfile), HP_POP2(HP_npc_unloadfile), 3280 },
-	{ HP_POP(npc->do_clear_npc), HP_POP2(HP_npc_do_clear_npc), 3282 },
-	{ HP_POP(npc->debug_warps_sub), HP_POP2(HP_npc_debug_warps_sub), 3284 },
-	{ HP_POP(npc->debug_warps), HP_POP2(HP_npc_debug_warps), 3286 },
-	{ HP_POP(npc->secure_timeout_timer), HP_POP2(HP_npc_secure_timeout_timer), 3288 },
+	{ HP_POP(npc->init, HP_npc_init) },
+	{ HP_POP(npc->final, HP_npc_final) },
+	{ HP_POP(npc->get_new_npc_id, HP_npc_get_new_npc_id) },
+	{ HP_POP(npc->get_viewdata, HP_npc_get_viewdata) },
+	{ HP_POP(npc->isnear_sub, HP_npc_isnear_sub) },
+	{ HP_POP(npc->isnear, HP_npc_isnear) },
+	{ HP_POP(npc->ontouch_event, HP_npc_ontouch_event) },
+	{ HP_POP(npc->ontouch2_event, HP_npc_ontouch2_event) },
+	{ HP_POP(npc->enable_sub, HP_npc_enable_sub) },
+	{ HP_POP(npc->enable, HP_npc_enable) },
+	{ HP_POP(npc->name2id, HP_npc_name2id) },
+	{ HP_POP(npc->event_dequeue, HP_npc_event_dequeue) },
+	{ HP_POP(npc->event_export_create, HP_npc_event_export_create) },
+	{ HP_POP(npc->event_export, HP_npc_event_export) },
+	{ HP_POP(npc->event_sub, HP_npc_event_sub) },
+	{ HP_POP(npc->event_doall_sub, HP_npc_event_doall_sub) },
+	{ HP_POP(npc->event_do, HP_npc_event_do) },
+	{ HP_POP(npc->event_doall_id, HP_npc_event_doall_id) },
+	{ HP_POP(npc->event_doall, HP_npc_event_doall) },
+	{ HP_POP(npc->event_do_clock, HP_npc_event_do_clock) },
+	{ HP_POP(npc->event_do_oninit, HP_npc_event_do_oninit) },
+	{ HP_POP(npc->timerevent_export, HP_npc_timerevent_export) },
+	{ HP_POP(npc->timerevent, HP_npc_timerevent) },
+	{ HP_POP(npc->timerevent_start, HP_npc_timerevent_start) },
+	{ HP_POP(npc->timerevent_stop, HP_npc_timerevent_stop) },
+	{ HP_POP(npc->timerevent_quit, HP_npc_timerevent_quit) },
+	{ HP_POP(npc->gettimerevent_tick, HP_npc_gettimerevent_tick) },
+	{ HP_POP(npc->settimerevent_tick, HP_npc_settimerevent_tick) },
+	{ HP_POP(npc->event, HP_npc_event) },
+	{ HP_POP(npc->touch_areanpc_sub, HP_npc_touch_areanpc_sub) },
+	{ HP_POP(npc->touchnext_areanpc, HP_npc_touchnext_areanpc) },
+	{ HP_POP(npc->touch_areanpc, HP_npc_touch_areanpc) },
+	{ HP_POP(npc->touch_areanpc2, HP_npc_touch_areanpc2) },
+	{ HP_POP(npc->check_areanpc, HP_npc_check_areanpc) },
+	{ HP_POP(npc->checknear, HP_npc_checknear) },
+	{ HP_POP(npc->globalmessage, HP_npc_globalmessage) },
+	{ HP_POP(npc->run_tomb, HP_npc_run_tomb) },
+	{ HP_POP(npc->click, HP_npc_click) },
+	{ HP_POP(npc->scriptcont, HP_npc_scriptcont) },
+	{ HP_POP(npc->buysellsel, HP_npc_buysellsel) },
+	{ HP_POP(npc->cashshop_buylist, HP_npc_cashshop_buylist) },
+	{ HP_POP(npc->buylist_sub, HP_npc_buylist_sub) },
+	{ HP_POP(npc->cashshop_buy, HP_npc_cashshop_buy) },
+	{ HP_POP(npc->buylist, HP_npc_buylist) },
+	{ HP_POP(npc->selllist_sub, HP_npc_selllist_sub) },
+	{ HP_POP(npc->selllist, HP_npc_selllist) },
+	{ HP_POP(npc->remove_map, HP_npc_remove_map) },
+	{ HP_POP(npc->unload_ev, HP_npc_unload_ev) },
+	{ HP_POP(npc->unload_ev_label, HP_npc_unload_ev_label) },
+	{ HP_POP(npc->unload_dup_sub, HP_npc_unload_dup_sub) },
+	{ HP_POP(npc->unload_duplicates, HP_npc_unload_duplicates) },
+	{ HP_POP(npc->unload, HP_npc_unload) },
+	{ HP_POP(npc->clearsrcfile, HP_npc_clearsrcfile) },
+	{ HP_POP(npc->addsrcfile, HP_npc_addsrcfile) },
+	{ HP_POP(npc->delsrcfile, HP_npc_delsrcfile) },
+	{ HP_POP(npc->parsename, HP_npc_parsename) },
+	{ HP_POP(npc->add_warp, HP_npc_add_warp) },
+	{ HP_POP(npc->parse_warp, HP_npc_parse_warp) },
+	{ HP_POP(npc->parse_shop, HP_npc_parse_shop) },
+	{ HP_POP(npc->convertlabel_db, HP_npc_convertlabel_db) },
+	{ HP_POP(npc->skip_script, HP_npc_skip_script) },
+	{ HP_POP(npc->parse_script, HP_npc_parse_script) },
+	{ HP_POP(npc->parse_duplicate, HP_npc_parse_duplicate) },
+	{ HP_POP(npc->duplicate4instance, HP_npc_duplicate4instance) },
+	{ HP_POP(npc->setcells, HP_npc_setcells) },
+	{ HP_POP(npc->unsetcells_sub, HP_npc_unsetcells_sub) },
+	{ HP_POP(npc->unsetcells, HP_npc_unsetcells) },
+	{ HP_POP(npc->movenpc, HP_npc_movenpc) },
+	{ HP_POP(npc->setdisplayname, HP_npc_setdisplayname) },
+	{ HP_POP(npc->setclass, HP_npc_setclass) },
+	{ HP_POP(npc->do_atcmd_event, HP_npc_do_atcmd_event) },
+	{ HP_POP(npc->parse_function, HP_npc_parse_function) },
+	{ HP_POP(npc->parse_mob2, HP_npc_parse_mob2) },
+	{ HP_POP(npc->parse_mob, HP_npc_parse_mob) },
+	{ HP_POP(npc->parse_mapflag, HP_npc_parse_mapflag) },
+	{ HP_POP(npc->parsesrcfile, HP_npc_parsesrcfile) },
+	{ HP_POP(npc->script_event, HP_npc_script_event) },
+	{ HP_POP(npc->read_event_script, HP_npc_read_event_script) },
+	{ HP_POP(npc->path_db_clear_sub, HP_npc_path_db_clear_sub) },
+	{ HP_POP(npc->ev_label_db_clear_sub, HP_npc_ev_label_db_clear_sub) },
+	{ HP_POP(npc->reload, HP_npc_reload) },
+	{ HP_POP(npc->unloadfile, HP_npc_unloadfile) },
+	{ HP_POP(npc->do_clear_npc, HP_npc_do_clear_npc) },
+	{ HP_POP(npc->debug_warps_sub, HP_npc_debug_warps_sub) },
+	{ HP_POP(npc->debug_warps, HP_npc_debug_warps) },
+	{ HP_POP(npc->secure_timeout_timer, HP_npc_secure_timeout_timer) },
 /* party */
-	{ HP_POP(party->init), HP_POP2(HP_party_init), 3290 },
-	{ HP_POP(party->final), HP_POP2(HP_party_final), 3292 },
-	{ HP_POP(party->search), HP_POP2(HP_party_search), 3294 },
-	{ HP_POP(party->searchname), HP_POP2(HP_party_searchname), 3296 },
-	{ HP_POP(party->getmemberid), HP_POP2(HP_party_getmemberid), 3298 },
-	{ HP_POP(party->getavailablesd), HP_POP2(HP_party_getavailablesd), 3300 },
-	{ HP_POP(party->create), HP_POP2(HP_party_create), 3302 },
-	{ HP_POP(party->created), HP_POP2(HP_party_created), 3304 },
-	{ HP_POP(party->request_info), HP_POP2(HP_party_request_info), 3306 },
-	{ HP_POP(party->invite), HP_POP2(HP_party_invite), 3308 },
-	{ HP_POP(party->member_joined), HP_POP2(HP_party_member_joined), 3310 },
-	{ HP_POP(party->member_added), HP_POP2(HP_party_member_added), 3312 },
-	{ HP_POP(party->leave), HP_POP2(HP_party_leave), 3314 },
-	{ HP_POP(party->removemember), HP_POP2(HP_party_removemember), 3316 },
-	{ HP_POP(party->member_withdraw), HP_POP2(HP_party_member_withdraw), 3318 },
-	{ HP_POP(party->reply_invite), HP_POP2(HP_party_reply_invite), 3320 },
-	{ HP_POP(party->recv_noinfo), HP_POP2(HP_party_recv_noinfo), 3322 },
-	{ HP_POP(party->recv_info), HP_POP2(HP_party_recv_info), 3324 },
-	{ HP_POP(party->recv_movemap), HP_POP2(HP_party_recv_movemap), 3326 },
-	{ HP_POP(party->broken), HP_POP2(HP_party_broken), 3328 },
-	{ HP_POP(party->optionchanged), HP_POP2(HP_party_optionchanged), 3330 },
-	{ HP_POP(party->changeoption), HP_POP2(HP_party_changeoption), 3332 },
-	{ HP_POP(party->changeleader), HP_POP2(HP_party_changeleader), 3334 },
-	{ HP_POP(party->send_movemap), HP_POP2(HP_party_send_movemap), 3336 },
-	{ HP_POP(party->send_levelup), HP_POP2(HP_party_send_levelup), 3338 },
-	{ HP_POP(party->send_logout), HP_POP2(HP_party_send_logout), 3340 },
-	{ HP_POP(party->send_message), HP_POP2(HP_party_send_message), 3342 },
-	{ HP_POP(party->recv_message), HP_POP2(HP_party_recv_message), 3344 },
-	{ HP_POP(party->skill_check), HP_POP2(HP_party_skill_check), 3346 },
-	{ HP_POP(party->send_xy_clear), HP_POP2(HP_party_send_xy_clear), 3348 },
-	{ HP_POP(party->exp_share), HP_POP2(HP_party_exp_share), 3350 },
-	{ HP_POP(party->share_loot), HP_POP2(HP_party_share_loot), 3352 },
-	{ HP_POP(party->send_dot_remove), HP_POP2(HP_party_send_dot_remove), 3354 },
-	{ HP_POP(party->sub_count), HP_POP2(HP_party_sub_count), 3356 },
-	{ HP_POP(party->booking_register), HP_POP2(HP_party_booking_register), 3358 },
-	{ HP_POP(party->booking_update), HP_POP2(HP_party_booking_update), 3360 },
-	{ HP_POP(party->booking_search), HP_POP2(HP_party_booking_search), 3362 },
-	{ HP_POP(party->recruit_register), HP_POP2(HP_party_recruit_register), 3364 },
-	{ HP_POP(party->recruit_update), HP_POP2(HP_party_recruit_update), 3366 },
-	{ HP_POP(party->recruit_search), HP_POP2(HP_party_recruit_search), 3368 },
-	{ HP_POP(party->booking_delete), HP_POP2(HP_party_booking_delete), 3370 },
-	{ HP_POP(party->vforeachsamemap), HP_POP2(HP_party_vforeachsamemap), 3372 },
-	{ HP_POP(party->send_xy_timer), HP_POP2(HP_party_send_xy_timer), 3374 },
-	{ HP_POP(party->fill_member), HP_POP2(HP_party_fill_member), 3376 },
-	{ HP_POP(party->sd_check), HP_POP2(HP_party_sd_check), 3378 },
-	{ HP_POP(party->check_state), HP_POP2(HP_party_check_state), 3380 },
-	{ HP_POP(party->create_booking_data), HP_POP2(HP_party_create_booking_data), 3382 },
-	{ HP_POP(party->db_final), HP_POP2(HP_party_db_final), 3384 },
+	{ HP_POP(party->init, HP_party_init) },
+	{ HP_POP(party->final, HP_party_final) },
+	{ HP_POP(party->search, HP_party_search) },
+	{ HP_POP(party->searchname, HP_party_searchname) },
+	{ HP_POP(party->getmemberid, HP_party_getmemberid) },
+	{ HP_POP(party->getavailablesd, HP_party_getavailablesd) },
+	{ HP_POP(party->create, HP_party_create) },
+	{ HP_POP(party->created, HP_party_created) },
+	{ HP_POP(party->request_info, HP_party_request_info) },
+	{ HP_POP(party->invite, HP_party_invite) },
+	{ HP_POP(party->member_joined, HP_party_member_joined) },
+	{ HP_POP(party->member_added, HP_party_member_added) },
+	{ HP_POP(party->leave, HP_party_leave) },
+	{ HP_POP(party->removemember, HP_party_removemember) },
+	{ HP_POP(party->member_withdraw, HP_party_member_withdraw) },
+	{ HP_POP(party->reply_invite, HP_party_reply_invite) },
+	{ HP_POP(party->recv_noinfo, HP_party_recv_noinfo) },
+	{ HP_POP(party->recv_info, HP_party_recv_info) },
+	{ HP_POP(party->recv_movemap, HP_party_recv_movemap) },
+	{ HP_POP(party->broken, HP_party_broken) },
+	{ HP_POP(party->optionchanged, HP_party_optionchanged) },
+	{ HP_POP(party->changeoption, HP_party_changeoption) },
+	{ HP_POP(party->changeleader, HP_party_changeleader) },
+	{ HP_POP(party->send_movemap, HP_party_send_movemap) },
+	{ HP_POP(party->send_levelup, HP_party_send_levelup) },
+	{ HP_POP(party->send_logout, HP_party_send_logout) },
+	{ HP_POP(party->send_message, HP_party_send_message) },
+	{ HP_POP(party->recv_message, HP_party_recv_message) },
+	{ HP_POP(party->skill_check, HP_party_skill_check) },
+	{ HP_POP(party->send_xy_clear, HP_party_send_xy_clear) },
+	{ HP_POP(party->exp_share, HP_party_exp_share) },
+	{ HP_POP(party->share_loot, HP_party_share_loot) },
+	{ HP_POP(party->send_dot_remove, HP_party_send_dot_remove) },
+	{ HP_POP(party->sub_count, HP_party_sub_count) },
+	{ HP_POP(party->booking_register, HP_party_booking_register) },
+	{ HP_POP(party->booking_update, HP_party_booking_update) },
+	{ HP_POP(party->booking_search, HP_party_booking_search) },
+	{ HP_POP(party->recruit_register, HP_party_recruit_register) },
+	{ HP_POP(party->recruit_update, HP_party_recruit_update) },
+	{ HP_POP(party->recruit_search, HP_party_recruit_search) },
+	{ HP_POP(party->booking_delete, HP_party_booking_delete) },
+	{ HP_POP(party->vforeachsamemap, HP_party_vforeachsamemap) },
+	{ HP_POP(party->send_xy_timer, HP_party_send_xy_timer) },
+	{ HP_POP(party->fill_member, HP_party_fill_member) },
+	{ HP_POP(party->sd_check, HP_party_sd_check) },
+	{ HP_POP(party->check_state, HP_party_check_state) },
+	{ HP_POP(party->create_booking_data, HP_party_create_booking_data) },
+	{ HP_POP(party->db_final, HP_party_db_final) },
 /* path */
-	{ HP_POP(path->blownpos), HP_POP2(HP_path_blownpos), 3386 },
-	{ HP_POP(path->search), HP_POP2(HP_path_search), 3388 },
-	{ HP_POP(path->search_long), HP_POP2(HP_path_search_long), 3390 },
-	{ HP_POP(path->check_distance), HP_POP2(HP_path_check_distance), 3392 },
-	{ HP_POP(path->distance), HP_POP2(HP_path_distance), 3394 },
+	{ HP_POP(path->blownpos, HP_path_blownpos) },
+	{ HP_POP(path->search, HP_path_search) },
+	{ HP_POP(path->search_long, HP_path_search_long) },
+	{ HP_POP(path->check_distance, HP_path_check_distance) },
+	{ HP_POP(path->distance, HP_path_distance) },
 /* pc */
-	{ HP_POP(pc->init), HP_POP2(HP_pc_init), 3396 },
-	{ HP_POP(pc->final), HP_POP2(HP_pc_final), 3398 },
-	{ HP_POP(pc->get_dummy_sd), HP_POP2(HP_pc_get_dummy_sd), 3400 },
-	{ HP_POP(pc->class2idx), HP_POP2(HP_pc_class2idx), 3402 },
-	{ HP_POP(pc->get_group_level), HP_POP2(HP_pc_get_group_level), 3404 },
-	{ HP_POP(pc->can_give_items), HP_POP2(HP_pc_can_give_items), 3406 },
-	{ HP_POP(pc->can_use_command), HP_POP2(HP_pc_can_use_command), 3408 },
-	{ HP_POP(pc->has_permission), HP_POP2(HP_pc_has_permission), 3410 },
-	{ HP_POP(pc->set_group), HP_POP2(HP_pc_set_group), 3412 },
-	{ HP_POP(pc->should_log_commands), HP_POP2(HP_pc_should_log_commands), 3414 },
-	{ HP_POP(pc->setrestartvalue), HP_POP2(HP_pc_setrestartvalue), 3416 },
-	{ HP_POP(pc->makesavestatus), HP_POP2(HP_pc_makesavestatus), 3418 },
-	{ HP_POP(pc->respawn), HP_POP2(HP_pc_respawn), 3420 },
-	{ HP_POP(pc->setnewpc), HP_POP2(HP_pc_setnewpc), 3422 },
-	{ HP_POP(pc->authok), HP_POP2(HP_pc_authok), 3424 },
-	{ HP_POP(pc->authfail), HP_POP2(HP_pc_authfail), 3426 },
-	{ HP_POP(pc->reg_received), HP_POP2(HP_pc_reg_received), 3428 },
-	{ HP_POP(pc->isequip), HP_POP2(HP_pc_isequip), 3430 },
-	{ HP_POP(pc->equippoint), HP_POP2(HP_pc_equippoint), 3432 },
-	{ HP_POP(pc->setinventorydata), HP_POP2(HP_pc_setinventorydata), 3434 },
-	{ HP_POP(pc->checkskill), HP_POP2(HP_pc_checkskill), 3436 },
-	{ HP_POP(pc->checkskill2), HP_POP2(HP_pc_checkskill2), 3438 },
-	{ HP_POP(pc->checkallowskill), HP_POP2(HP_pc_checkallowskill), 3440 },
-	{ HP_POP(pc->checkequip), HP_POP2(HP_pc_checkequip), 3442 },
-	{ HP_POP(pc->calc_skilltree), HP_POP2(HP_pc_calc_skilltree), 3444 },
-	{ HP_POP(pc->calc_skilltree_normalize_job), HP_POP2(HP_pc_calc_skilltree_normalize_job), 3446 },
-	{ HP_POP(pc->clean_skilltree), HP_POP2(HP_pc_clean_skilltree), 3448 },
-	{ HP_POP(pc->setpos), HP_POP2(HP_pc_setpos), 3450 },
-	{ HP_POP(pc->setsavepoint), HP_POP2(HP_pc_setsavepoint), 3452 },
-	{ HP_POP(pc->randomwarp), HP_POP2(HP_pc_randomwarp), 3454 },
-	{ HP_POP(pc->memo), HP_POP2(HP_pc_memo), 3456 },
-	{ HP_POP(pc->checkadditem), HP_POP2(HP_pc_checkadditem), 3458 },
-	{ HP_POP(pc->inventoryblank), HP_POP2(HP_pc_inventoryblank), 3460 },
-	{ HP_POP(pc->search_inventory), HP_POP2(HP_pc_search_inventory), 3462 },
-	{ HP_POP(pc->payzeny), HP_POP2(HP_pc_payzeny), 3464 },
-	{ HP_POP(pc->additem), HP_POP2(HP_pc_additem), 3466 },
-	{ HP_POP(pc->getzeny), HP_POP2(HP_pc_getzeny), 3468 },
-	{ HP_POP(pc->delitem), HP_POP2(HP_pc_delitem), 3470 },
-	{ HP_POP(pc->paycash), HP_POP2(HP_pc_paycash), 3472 },
-	{ HP_POP(pc->getcash), HP_POP2(HP_pc_getcash), 3474 },
-	{ HP_POP(pc->cart_additem), HP_POP2(HP_pc_cart_additem), 3476 },
-	{ HP_POP(pc->cart_delitem), HP_POP2(HP_pc_cart_delitem), 3478 },
-	{ HP_POP(pc->putitemtocart), HP_POP2(HP_pc_putitemtocart), 3480 },
-	{ HP_POP(pc->getitemfromcart), HP_POP2(HP_pc_getitemfromcart), 3482 },
-	{ HP_POP(pc->cartitem_amount), HP_POP2(HP_pc_cartitem_amount), 3484 },
-	{ HP_POP(pc->takeitem), HP_POP2(HP_pc_takeitem), 3486 },
-	{ HP_POP(pc->dropitem), HP_POP2(HP_pc_dropitem), 3488 },
-	{ HP_POP(pc->isequipped), HP_POP2(HP_pc_isequipped), 3490 },
-	{ HP_POP(pc->can_Adopt), HP_POP2(HP_pc_can_Adopt), 3492 },
-	{ HP_POP(pc->adoption), HP_POP2(HP_pc_adoption), 3494 },
-	{ HP_POP(pc->updateweightstatus), HP_POP2(HP_pc_updateweightstatus), 3496 },
-	{ HP_POP(pc->addautobonus), HP_POP2(HP_pc_addautobonus), 3498 },
-	{ HP_POP(pc->exeautobonus), HP_POP2(HP_pc_exeautobonus), 3500 },
-	{ HP_POP(pc->endautobonus), HP_POP2(HP_pc_endautobonus), 3502 },
-	{ HP_POP(pc->delautobonus), HP_POP2(HP_pc_delautobonus), 3504 },
-	{ HP_POP(pc->bonus), HP_POP2(HP_pc_bonus), 3506 },
-	{ HP_POP(pc->bonus2), HP_POP2(HP_pc_bonus2), 3508 },
-	{ HP_POP(pc->bonus3), HP_POP2(HP_pc_bonus3), 3510 },
-	{ HP_POP(pc->bonus4), HP_POP2(HP_pc_bonus4), 3512 },
-	{ HP_POP(pc->bonus5), HP_POP2(HP_pc_bonus5), 3514 },
-	{ HP_POP(pc->skill), HP_POP2(HP_pc_skill), 3516 },
-	{ HP_POP(pc->insert_card), HP_POP2(HP_pc_insert_card), 3518 },
-	{ HP_POP(pc->steal_item), HP_POP2(HP_pc_steal_item), 3520 },
-	{ HP_POP(pc->steal_coin), HP_POP2(HP_pc_steal_coin), 3522 },
-	{ HP_POP(pc->modifybuyvalue), HP_POP2(HP_pc_modifybuyvalue), 3524 },
-	{ HP_POP(pc->modifysellvalue), HP_POP2(HP_pc_modifysellvalue), 3526 },
-	{ HP_POP(pc->follow), HP_POP2(HP_pc_follow), 3528 },
-	{ HP_POP(pc->stop_following), HP_POP2(HP_pc_stop_following), 3530 },
-	{ HP_POP(pc->maxbaselv), HP_POP2(HP_pc_maxbaselv), 3532 },
-	{ HP_POP(pc->maxjoblv), HP_POP2(HP_pc_maxjoblv), 3534 },
-	{ HP_POP(pc->checkbaselevelup), HP_POP2(HP_pc_checkbaselevelup), 3536 },
-	{ HP_POP(pc->checkjoblevelup), HP_POP2(HP_pc_checkjoblevelup), 3538 },
-	{ HP_POP(pc->gainexp), HP_POP2(HP_pc_gainexp), 3540 },
-	{ HP_POP(pc->nextbaseexp), HP_POP2(HP_pc_nextbaseexp), 3542 },
-	{ HP_POP(pc->thisbaseexp), HP_POP2(HP_pc_thisbaseexp), 3544 },
-	{ HP_POP(pc->nextjobexp), HP_POP2(HP_pc_nextjobexp), 3546 },
-	{ HP_POP(pc->thisjobexp), HP_POP2(HP_pc_thisjobexp), 3548 },
-	{ HP_POP(pc->gets_status_point), HP_POP2(HP_pc_gets_status_point), 3550 },
-	{ HP_POP(pc->need_status_point), HP_POP2(HP_pc_need_status_point), 3552 },
-	{ HP_POP(pc->statusup), HP_POP2(HP_pc_statusup), 3554 },
-	{ HP_POP(pc->statusup2), HP_POP2(HP_pc_statusup2), 3556 },
-	{ HP_POP(pc->skillup), HP_POP2(HP_pc_skillup), 3558 },
-	{ HP_POP(pc->allskillup), HP_POP2(HP_pc_allskillup), 3560 },
-	{ HP_POP(pc->resetlvl), HP_POP2(HP_pc_resetlvl), 3562 },
-	{ HP_POP(pc->resetstate), HP_POP2(HP_pc_resetstate), 3564 },
-	{ HP_POP(pc->resetskill), HP_POP2(HP_pc_resetskill), 3566 },
-	{ HP_POP(pc->resetfeel), HP_POP2(HP_pc_resetfeel), 3568 },
-	{ HP_POP(pc->resethate), HP_POP2(HP_pc_resethate), 3570 },
-	{ HP_POP(pc->equipitem), HP_POP2(HP_pc_equipitem), 3572 },
-	{ HP_POP(pc->unequipitem), HP_POP2(HP_pc_unequipitem), 3574 },
-	{ HP_POP(pc->checkitem), HP_POP2(HP_pc_checkitem), 3576 },
-	{ HP_POP(pc->useitem), HP_POP2(HP_pc_useitem), 3578 },
-	{ HP_POP(pc->skillatk_bonus), HP_POP2(HP_pc_skillatk_bonus), 3580 },
-	{ HP_POP(pc->skillheal_bonus), HP_POP2(HP_pc_skillheal_bonus), 3582 },
-	{ HP_POP(pc->skillheal2_bonus), HP_POP2(HP_pc_skillheal2_bonus), 3584 },
-	{ HP_POP(pc->damage), HP_POP2(HP_pc_damage), 3586 },
-	{ HP_POP(pc->dead), HP_POP2(HP_pc_dead), 3588 },
-	{ HP_POP(pc->revive), HP_POP2(HP_pc_revive), 3590 },
-	{ HP_POP(pc->heal), HP_POP2(HP_pc_heal), 3592 },
-	{ HP_POP(pc->itemheal), HP_POP2(HP_pc_itemheal), 3594 },
-	{ HP_POP(pc->percentheal), HP_POP2(HP_pc_percentheal), 3596 },
-	{ HP_POP(pc->jobchange), HP_POP2(HP_pc_jobchange), 3598 },
-	{ HP_POP(pc->setoption), HP_POP2(HP_pc_setoption), 3600 },
-	{ HP_POP(pc->setcart), HP_POP2(HP_pc_setcart), 3602 },
-	{ HP_POP(pc->setfalcon), HP_POP2(HP_pc_setfalcon), 3604 },
-	{ HP_POP(pc->setriding), HP_POP2(HP_pc_setriding), 3606 },
-	{ HP_POP(pc->setmadogear), HP_POP2(HP_pc_setmadogear), 3608 },
-	{ HP_POP(pc->changelook), HP_POP2(HP_pc_changelook), 3610 },
-	{ HP_POP(pc->equiplookall), HP_POP2(HP_pc_equiplookall), 3612 },
-	{ HP_POP(pc->readparam), HP_POP2(HP_pc_readparam), 3614 },
-	{ HP_POP(pc->setparam), HP_POP2(HP_pc_setparam), 3616 },
-	{ HP_POP(pc->readreg), HP_POP2(HP_pc_readreg), 3618 },
-	{ HP_POP(pc->setreg), HP_POP2(HP_pc_setreg), 3620 },
-	{ HP_POP(pc->readregstr), HP_POP2(HP_pc_readregstr), 3622 },
-	{ HP_POP(pc->setregstr), HP_POP2(HP_pc_setregstr), 3624 },
-	{ HP_POP(pc->readregistry), HP_POP2(HP_pc_readregistry), 3626 },
-	{ HP_POP(pc->setregistry), HP_POP2(HP_pc_setregistry), 3628 },
-	{ HP_POP(pc->readregistry_str), HP_POP2(HP_pc_readregistry_str), 3630 },
-	{ HP_POP(pc->setregistry_str), HP_POP2(HP_pc_setregistry_str), 3632 },
-	{ HP_POP(pc->addeventtimer), HP_POP2(HP_pc_addeventtimer), 3634 },
-	{ HP_POP(pc->deleventtimer), HP_POP2(HP_pc_deleventtimer), 3636 },
-	{ HP_POP(pc->cleareventtimer), HP_POP2(HP_pc_cleareventtimer), 3638 },
-	{ HP_POP(pc->addeventtimercount), HP_POP2(HP_pc_addeventtimercount), 3640 },
-	{ HP_POP(pc->calc_pvprank), HP_POP2(HP_pc_calc_pvprank), 3642 },
-	{ HP_POP(pc->calc_pvprank_timer), HP_POP2(HP_pc_calc_pvprank_timer), 3644 },
-	{ HP_POP(pc->ismarried), HP_POP2(HP_pc_ismarried), 3646 },
-	{ HP_POP(pc->marriage), HP_POP2(HP_pc_marriage), 3648 },
-	{ HP_POP(pc->divorce), HP_POP2(HP_pc_divorce), 3650 },
-	{ HP_POP(pc->get_partner), HP_POP2(HP_pc_get_partner), 3652 },
-	{ HP_POP(pc->get_father), HP_POP2(HP_pc_get_father), 3654 },
-	{ HP_POP(pc->get_mother), HP_POP2(HP_pc_get_mother), 3656 },
-	{ HP_POP(pc->get_child), HP_POP2(HP_pc_get_child), 3658 },
-	{ HP_POP(pc->bleeding), HP_POP2(HP_pc_bleeding), 3660 },
-	{ HP_POP(pc->regen), HP_POP2(HP_pc_regen), 3662 },
-	{ HP_POP(pc->setstand), HP_POP2(HP_pc_setstand), 3664 },
-	{ HP_POP(pc->candrop), HP_POP2(HP_pc_candrop), 3666 },
-	{ HP_POP(pc->jobid2mapid), HP_POP2(HP_pc_jobid2mapid), 3668 },
-	{ HP_POP(pc->mapid2jobid), HP_POP2(HP_pc_mapid2jobid), 3670 },
-	{ HP_POP(pc->job_name), HP_POP2(HP_pc_job_name), 3672 },
-	{ HP_POP(pc->setinvincibletimer), HP_POP2(HP_pc_setinvincibletimer), 3674 },
-	{ HP_POP(pc->delinvincibletimer), HP_POP2(HP_pc_delinvincibletimer), 3676 },
-	{ HP_POP(pc->addspiritball), HP_POP2(HP_pc_addspiritball), 3678 },
-	{ HP_POP(pc->delspiritball), HP_POP2(HP_pc_delspiritball), 3680 },
-	{ HP_POP(pc->addfame), HP_POP2(HP_pc_addfame), 3682 },
-	{ HP_POP(pc->famerank), HP_POP2(HP_pc_famerank), 3684 },
-	{ HP_POP(pc->set_hate_mob), HP_POP2(HP_pc_set_hate_mob), 3686 },
-	{ HP_POP(pc->readdb), HP_POP2(HP_pc_readdb), 3688 },
-	{ HP_POP(pc->map_day_timer), HP_POP2(HP_pc_map_day_timer), 3690 },
-	{ HP_POP(pc->map_night_timer), HP_POP2(HP_pc_map_night_timer), 3692 },
-	{ HP_POP(pc->inventory_rentals), HP_POP2(HP_pc_inventory_rentals), 3694 },
-	{ HP_POP(pc->inventory_rental_clear), HP_POP2(HP_pc_inventory_rental_clear), 3696 },
-	{ HP_POP(pc->inventory_rental_add), HP_POP2(HP_pc_inventory_rental_add), 3698 },
-	{ HP_POP(pc->disguise), HP_POP2(HP_pc_disguise), 3700 },
-	{ HP_POP(pc->isautolooting), HP_POP2(HP_pc_isautolooting), 3702 },
-	{ HP_POP(pc->overheat), HP_POP2(HP_pc_overheat), 3704 },
-	{ HP_POP(pc->banding), HP_POP2(HP_pc_banding), 3706 },
-	{ HP_POP(pc->itemcd_do), HP_POP2(HP_pc_itemcd_do), 3708 },
-	{ HP_POP(pc->load_combo), HP_POP2(HP_pc_load_combo), 3710 },
-	{ HP_POP(pc->add_charm), HP_POP2(HP_pc_add_charm), 3712 },
-	{ HP_POP(pc->del_charm), HP_POP2(HP_pc_del_charm), 3714 },
-	{ HP_POP(pc->baselevelchanged), HP_POP2(HP_pc_baselevelchanged), 3716 },
-	{ HP_POP(pc->level_penalty_mod), HP_POP2(HP_pc_level_penalty_mod), 3718 },
-	{ HP_POP(pc->calc_skillpoint), HP_POP2(HP_pc_calc_skillpoint), 3720 },
-	{ HP_POP(pc->invincible_timer), HP_POP2(HP_pc_invincible_timer), 3722 },
-	{ HP_POP(pc->spiritball_timer), HP_POP2(HP_pc_spiritball_timer), 3724 },
-	{ HP_POP(pc->check_banding), HP_POP2(HP_pc_check_banding), 3726 },
-	{ HP_POP(pc->inventory_rental_end), HP_POP2(HP_pc_inventory_rental_end), 3728 },
-	{ HP_POP(pc->check_skilltree), HP_POP2(HP_pc_check_skilltree), 3730 },
-	{ HP_POP(pc->bonus_autospell), HP_POP2(HP_pc_bonus_autospell), 3732 },
-	{ HP_POP(pc->bonus_autospell_onskill), HP_POP2(HP_pc_bonus_autospell_onskill), 3734 },
-	{ HP_POP(pc->bonus_addeff), HP_POP2(HP_pc_bonus_addeff), 3736 },
-	{ HP_POP(pc->bonus_addeff_onskill), HP_POP2(HP_pc_bonus_addeff_onskill), 3738 },
-	{ HP_POP(pc->bonus_item_drop), HP_POP2(HP_pc_bonus_item_drop), 3740 },
-	{ HP_POP(pc->calcexp), HP_POP2(HP_pc_calcexp), 3742 },
-	{ HP_POP(pc->respawn_timer), HP_POP2(HP_pc_respawn_timer), 3744 },
-	{ HP_POP(pc->jobchange_killclone), HP_POP2(HP_pc_jobchange_killclone), 3746 },
-	{ HP_POP(pc->getstat), HP_POP2(HP_pc_getstat), 3748 },
-	{ HP_POP(pc->setstat), HP_POP2(HP_pc_setstat), 3750 },
-	{ HP_POP(pc->eventtimer), HP_POP2(HP_pc_eventtimer), 3752 },
-	{ HP_POP(pc->daynight_timer_sub), HP_POP2(HP_pc_daynight_timer_sub), 3754 },
-	{ HP_POP(pc->charm_timer), HP_POP2(HP_pc_charm_timer), 3756 },
-	{ HP_POP(pc->readdb_levelpenalty), HP_POP2(HP_pc_readdb_levelpenalty), 3758 },
-	{ HP_POP(pc->autosave), HP_POP2(HP_pc_autosave), 3760 },
-	{ HP_POP(pc->follow_timer), HP_POP2(HP_pc_follow_timer), 3762 },
-	{ HP_POP(pc->read_skill_tree), HP_POP2(HP_pc_read_skill_tree), 3764 },
-	{ HP_POP(pc->isUseitem), HP_POP2(HP_pc_isUseitem), 3766 },
-	{ HP_POP(pc->show_steal), HP_POP2(HP_pc_show_steal), 3768 },
-	{ HP_POP(pc->checkcombo), HP_POP2(HP_pc_checkcombo), 3770 },
-	{ HP_POP(pc->calcweapontype), HP_POP2(HP_pc_calcweapontype), 3772 },
-	{ HP_POP(pc->removecombo), HP_POP2(HP_pc_removecombo), 3774 },
-	{ HP_POP(pc->bank_deposit), HP_POP2(HP_pc_bank_deposit), 3776 },
-	{ HP_POP(pc->bank_withdraw), HP_POP2(HP_pc_bank_withdraw), 3778 },
+	{ HP_POP(pc->init, HP_pc_init) },
+	{ HP_POP(pc->final, HP_pc_final) },
+	{ HP_POP(pc->get_dummy_sd, HP_pc_get_dummy_sd) },
+	{ HP_POP(pc->class2idx, HP_pc_class2idx) },
+	{ HP_POP(pc->get_group_level, HP_pc_get_group_level) },
+	{ HP_POP(pc->can_give_items, HP_pc_can_give_items) },
+	{ HP_POP(pc->can_use_command, HP_pc_can_use_command) },
+	{ HP_POP(pc->has_permission, HP_pc_has_permission) },
+	{ HP_POP(pc->set_group, HP_pc_set_group) },
+	{ HP_POP(pc->should_log_commands, HP_pc_should_log_commands) },
+	{ HP_POP(pc->setrestartvalue, HP_pc_setrestartvalue) },
+	{ HP_POP(pc->makesavestatus, HP_pc_makesavestatus) },
+	{ HP_POP(pc->respawn, HP_pc_respawn) },
+	{ HP_POP(pc->setnewpc, HP_pc_setnewpc) },
+	{ HP_POP(pc->authok, HP_pc_authok) },
+	{ HP_POP(pc->authfail, HP_pc_authfail) },
+	{ HP_POP(pc->reg_received, HP_pc_reg_received) },
+	{ HP_POP(pc->isequip, HP_pc_isequip) },
+	{ HP_POP(pc->equippoint, HP_pc_equippoint) },
+	{ HP_POP(pc->setinventorydata, HP_pc_setinventorydata) },
+	{ HP_POP(pc->checkskill, HP_pc_checkskill) },
+	{ HP_POP(pc->checkskill2, HP_pc_checkskill2) },
+	{ HP_POP(pc->checkallowskill, HP_pc_checkallowskill) },
+	{ HP_POP(pc->checkequip, HP_pc_checkequip) },
+	{ HP_POP(pc->calc_skilltree, HP_pc_calc_skilltree) },
+	{ HP_POP(pc->calc_skilltree_normalize_job, HP_pc_calc_skilltree_normalize_job) },
+	{ HP_POP(pc->clean_skilltree, HP_pc_clean_skilltree) },
+	{ HP_POP(pc->setpos, HP_pc_setpos) },
+	{ HP_POP(pc->setsavepoint, HP_pc_setsavepoint) },
+	{ HP_POP(pc->randomwarp, HP_pc_randomwarp) },
+	{ HP_POP(pc->memo, HP_pc_memo) },
+	{ HP_POP(pc->checkadditem, HP_pc_checkadditem) },
+	{ HP_POP(pc->inventoryblank, HP_pc_inventoryblank) },
+	{ HP_POP(pc->search_inventory, HP_pc_search_inventory) },
+	{ HP_POP(pc->payzeny, HP_pc_payzeny) },
+	{ HP_POP(pc->additem, HP_pc_additem) },
+	{ HP_POP(pc->getzeny, HP_pc_getzeny) },
+	{ HP_POP(pc->delitem, HP_pc_delitem) },
+	{ HP_POP(pc->paycash, HP_pc_paycash) },
+	{ HP_POP(pc->getcash, HP_pc_getcash) },
+	{ HP_POP(pc->cart_additem, HP_pc_cart_additem) },
+	{ HP_POP(pc->cart_delitem, HP_pc_cart_delitem) },
+	{ HP_POP(pc->putitemtocart, HP_pc_putitemtocart) },
+	{ HP_POP(pc->getitemfromcart, HP_pc_getitemfromcart) },
+	{ HP_POP(pc->cartitem_amount, HP_pc_cartitem_amount) },
+	{ HP_POP(pc->takeitem, HP_pc_takeitem) },
+	{ HP_POP(pc->dropitem, HP_pc_dropitem) },
+	{ HP_POP(pc->isequipped, HP_pc_isequipped) },
+	{ HP_POP(pc->can_Adopt, HP_pc_can_Adopt) },
+	{ HP_POP(pc->adoption, HP_pc_adoption) },
+	{ HP_POP(pc->updateweightstatus, HP_pc_updateweightstatus) },
+	{ HP_POP(pc->addautobonus, HP_pc_addautobonus) },
+	{ HP_POP(pc->exeautobonus, HP_pc_exeautobonus) },
+	{ HP_POP(pc->endautobonus, HP_pc_endautobonus) },
+	{ HP_POP(pc->delautobonus, HP_pc_delautobonus) },
+	{ HP_POP(pc->bonus, HP_pc_bonus) },
+	{ HP_POP(pc->bonus2, HP_pc_bonus2) },
+	{ HP_POP(pc->bonus3, HP_pc_bonus3) },
+	{ HP_POP(pc->bonus4, HP_pc_bonus4) },
+	{ HP_POP(pc->bonus5, HP_pc_bonus5) },
+	{ HP_POP(pc->skill, HP_pc_skill) },
+	{ HP_POP(pc->insert_card, HP_pc_insert_card) },
+	{ HP_POP(pc->steal_item, HP_pc_steal_item) },
+	{ HP_POP(pc->steal_coin, HP_pc_steal_coin) },
+	{ HP_POP(pc->modifybuyvalue, HP_pc_modifybuyvalue) },
+	{ HP_POP(pc->modifysellvalue, HP_pc_modifysellvalue) },
+	{ HP_POP(pc->follow, HP_pc_follow) },
+	{ HP_POP(pc->stop_following, HP_pc_stop_following) },
+	{ HP_POP(pc->maxbaselv, HP_pc_maxbaselv) },
+	{ HP_POP(pc->maxjoblv, HP_pc_maxjoblv) },
+	{ HP_POP(pc->checkbaselevelup, HP_pc_checkbaselevelup) },
+	{ HP_POP(pc->checkjoblevelup, HP_pc_checkjoblevelup) },
+	{ HP_POP(pc->gainexp, HP_pc_gainexp) },
+	{ HP_POP(pc->nextbaseexp, HP_pc_nextbaseexp) },
+	{ HP_POP(pc->thisbaseexp, HP_pc_thisbaseexp) },
+	{ HP_POP(pc->nextjobexp, HP_pc_nextjobexp) },
+	{ HP_POP(pc->thisjobexp, HP_pc_thisjobexp) },
+	{ HP_POP(pc->gets_status_point, HP_pc_gets_status_point) },
+	{ HP_POP(pc->need_status_point, HP_pc_need_status_point) },
+	{ HP_POP(pc->statusup, HP_pc_statusup) },
+	{ HP_POP(pc->statusup2, HP_pc_statusup2) },
+	{ HP_POP(pc->skillup, HP_pc_skillup) },
+	{ HP_POP(pc->allskillup, HP_pc_allskillup) },
+	{ HP_POP(pc->resetlvl, HP_pc_resetlvl) },
+	{ HP_POP(pc->resetstate, HP_pc_resetstate) },
+	{ HP_POP(pc->resetskill, HP_pc_resetskill) },
+	{ HP_POP(pc->resetfeel, HP_pc_resetfeel) },
+	{ HP_POP(pc->resethate, HP_pc_resethate) },
+	{ HP_POP(pc->equipitem, HP_pc_equipitem) },
+	{ HP_POP(pc->unequipitem, HP_pc_unequipitem) },
+	{ HP_POP(pc->checkitem, HP_pc_checkitem) },
+	{ HP_POP(pc->useitem, HP_pc_useitem) },
+	{ HP_POP(pc->skillatk_bonus, HP_pc_skillatk_bonus) },
+	{ HP_POP(pc->skillheal_bonus, HP_pc_skillheal_bonus) },
+	{ HP_POP(pc->skillheal2_bonus, HP_pc_skillheal2_bonus) },
+	{ HP_POP(pc->damage, HP_pc_damage) },
+	{ HP_POP(pc->dead, HP_pc_dead) },
+	{ HP_POP(pc->revive, HP_pc_revive) },
+	{ HP_POP(pc->heal, HP_pc_heal) },
+	{ HP_POP(pc->itemheal, HP_pc_itemheal) },
+	{ HP_POP(pc->percentheal, HP_pc_percentheal) },
+	{ HP_POP(pc->jobchange, HP_pc_jobchange) },
+	{ HP_POP(pc->setoption, HP_pc_setoption) },
+	{ HP_POP(pc->setcart, HP_pc_setcart) },
+	{ HP_POP(pc->setfalcon, HP_pc_setfalcon) },
+	{ HP_POP(pc->setriding, HP_pc_setriding) },
+	{ HP_POP(pc->setmadogear, HP_pc_setmadogear) },
+	{ HP_POP(pc->changelook, HP_pc_changelook) },
+	{ HP_POP(pc->equiplookall, HP_pc_equiplookall) },
+	{ HP_POP(pc->readparam, HP_pc_readparam) },
+	{ HP_POP(pc->setparam, HP_pc_setparam) },
+	{ HP_POP(pc->readreg, HP_pc_readreg) },
+	{ HP_POP(pc->setreg, HP_pc_setreg) },
+	{ HP_POP(pc->readregstr, HP_pc_readregstr) },
+	{ HP_POP(pc->setregstr, HP_pc_setregstr) },
+	{ HP_POP(pc->readregistry, HP_pc_readregistry) },
+	{ HP_POP(pc->setregistry, HP_pc_setregistry) },
+	{ HP_POP(pc->readregistry_str, HP_pc_readregistry_str) },
+	{ HP_POP(pc->setregistry_str, HP_pc_setregistry_str) },
+	{ HP_POP(pc->addeventtimer, HP_pc_addeventtimer) },
+	{ HP_POP(pc->deleventtimer, HP_pc_deleventtimer) },
+	{ HP_POP(pc->cleareventtimer, HP_pc_cleareventtimer) },
+	{ HP_POP(pc->addeventtimercount, HP_pc_addeventtimercount) },
+	{ HP_POP(pc->calc_pvprank, HP_pc_calc_pvprank) },
+	{ HP_POP(pc->calc_pvprank_timer, HP_pc_calc_pvprank_timer) },
+	{ HP_POP(pc->ismarried, HP_pc_ismarried) },
+	{ HP_POP(pc->marriage, HP_pc_marriage) },
+	{ HP_POP(pc->divorce, HP_pc_divorce) },
+	{ HP_POP(pc->get_partner, HP_pc_get_partner) },
+	{ HP_POP(pc->get_father, HP_pc_get_father) },
+	{ HP_POP(pc->get_mother, HP_pc_get_mother) },
+	{ HP_POP(pc->get_child, HP_pc_get_child) },
+	{ HP_POP(pc->bleeding, HP_pc_bleeding) },
+	{ HP_POP(pc->regen, HP_pc_regen) },
+	{ HP_POP(pc->setstand, HP_pc_setstand) },
+	{ HP_POP(pc->candrop, HP_pc_candrop) },
+	{ HP_POP(pc->jobid2mapid, HP_pc_jobid2mapid) },
+	{ HP_POP(pc->mapid2jobid, HP_pc_mapid2jobid) },
+	{ HP_POP(pc->job_name, HP_pc_job_name) },
+	{ HP_POP(pc->setinvincibletimer, HP_pc_setinvincibletimer) },
+	{ HP_POP(pc->delinvincibletimer, HP_pc_delinvincibletimer) },
+	{ HP_POP(pc->addspiritball, HP_pc_addspiritball) },
+	{ HP_POP(pc->delspiritball, HP_pc_delspiritball) },
+	{ HP_POP(pc->addfame, HP_pc_addfame) },
+	{ HP_POP(pc->famerank, HP_pc_famerank) },
+	{ HP_POP(pc->set_hate_mob, HP_pc_set_hate_mob) },
+	{ HP_POP(pc->readdb, HP_pc_readdb) },
+	{ HP_POP(pc->map_day_timer, HP_pc_map_day_timer) },
+	{ HP_POP(pc->map_night_timer, HP_pc_map_night_timer) },
+	{ HP_POP(pc->inventory_rentals, HP_pc_inventory_rentals) },
+	{ HP_POP(pc->inventory_rental_clear, HP_pc_inventory_rental_clear) },
+	{ HP_POP(pc->inventory_rental_add, HP_pc_inventory_rental_add) },
+	{ HP_POP(pc->disguise, HP_pc_disguise) },
+	{ HP_POP(pc->isautolooting, HP_pc_isautolooting) },
+	{ HP_POP(pc->overheat, HP_pc_overheat) },
+	{ HP_POP(pc->banding, HP_pc_banding) },
+	{ HP_POP(pc->itemcd_do, HP_pc_itemcd_do) },
+	{ HP_POP(pc->load_combo, HP_pc_load_combo) },
+	{ HP_POP(pc->add_charm, HP_pc_add_charm) },
+	{ HP_POP(pc->del_charm, HP_pc_del_charm) },
+	{ HP_POP(pc->baselevelchanged, HP_pc_baselevelchanged) },
+	{ HP_POP(pc->level_penalty_mod, HP_pc_level_penalty_mod) },
+	{ HP_POP(pc->calc_skillpoint, HP_pc_calc_skillpoint) },
+	{ HP_POP(pc->invincible_timer, HP_pc_invincible_timer) },
+	{ HP_POP(pc->spiritball_timer, HP_pc_spiritball_timer) },
+	{ HP_POP(pc->check_banding, HP_pc_check_banding) },
+	{ HP_POP(pc->inventory_rental_end, HP_pc_inventory_rental_end) },
+	{ HP_POP(pc->check_skilltree, HP_pc_check_skilltree) },
+	{ HP_POP(pc->bonus_autospell, HP_pc_bonus_autospell) },
+	{ HP_POP(pc->bonus_autospell_onskill, HP_pc_bonus_autospell_onskill) },
+	{ HP_POP(pc->bonus_addeff, HP_pc_bonus_addeff) },
+	{ HP_POP(pc->bonus_addeff_onskill, HP_pc_bonus_addeff_onskill) },
+	{ HP_POP(pc->bonus_item_drop, HP_pc_bonus_item_drop) },
+	{ HP_POP(pc->calcexp, HP_pc_calcexp) },
+	{ HP_POP(pc->respawn_timer, HP_pc_respawn_timer) },
+	{ HP_POP(pc->jobchange_killclone, HP_pc_jobchange_killclone) },
+	{ HP_POP(pc->getstat, HP_pc_getstat) },
+	{ HP_POP(pc->setstat, HP_pc_setstat) },
+	{ HP_POP(pc->eventtimer, HP_pc_eventtimer) },
+	{ HP_POP(pc->daynight_timer_sub, HP_pc_daynight_timer_sub) },
+	{ HP_POP(pc->charm_timer, HP_pc_charm_timer) },
+	{ HP_POP(pc->readdb_levelpenalty, HP_pc_readdb_levelpenalty) },
+	{ HP_POP(pc->autosave, HP_pc_autosave) },
+	{ HP_POP(pc->follow_timer, HP_pc_follow_timer) },
+	{ HP_POP(pc->read_skill_tree, HP_pc_read_skill_tree) },
+	{ HP_POP(pc->isUseitem, HP_pc_isUseitem) },
+	{ HP_POP(pc->show_steal, HP_pc_show_steal) },
+	{ HP_POP(pc->checkcombo, HP_pc_checkcombo) },
+	{ HP_POP(pc->calcweapontype, HP_pc_calcweapontype) },
+	{ HP_POP(pc->removecombo, HP_pc_removecombo) },
+	{ HP_POP(pc->bank_deposit, HP_pc_bank_deposit) },
+	{ HP_POP(pc->bank_withdraw, HP_pc_bank_withdraw) },
 /* pet */
-	{ HP_POP(pet->init), HP_POP2(HP_pet_init), 3780 },
-	{ HP_POP(pet->final), HP_POP2(HP_pet_final), 3782 },
-	{ HP_POP(pet->hungry_val), HP_POP2(HP_pet_hungry_val), 3784 },
-	{ HP_POP(pet->set_intimate), HP_POP2(HP_pet_set_intimate), 3786 },
-	{ HP_POP(pet->create_egg), HP_POP2(HP_pet_create_egg), 3788 },
-	{ HP_POP(pet->unlocktarget), HP_POP2(HP_pet_unlocktarget), 3790 },
-	{ HP_POP(pet->attackskill), HP_POP2(HP_pet_attackskill), 3792 },
-	{ HP_POP(pet->target_check), HP_POP2(HP_pet_target_check), 3794 },
-	{ HP_POP(pet->sc_check), HP_POP2(HP_pet_sc_check), 3796 },
-	{ HP_POP(pet->hungry), HP_POP2(HP_pet_hungry), 3798 },
-	{ HP_POP(pet->search_petDB_index), HP_POP2(HP_pet_search_petDB_index), 3800 },
-	{ HP_POP(pet->hungry_timer_delete), HP_POP2(HP_pet_hungry_timer_delete), 3802 },
-	{ HP_POP(pet->performance), HP_POP2(HP_pet_performance), 3804 },
-	{ HP_POP(pet->return_egg), HP_POP2(HP_pet_return_egg), 3806 },
-	{ HP_POP(pet->data_init), HP_POP2(HP_pet_data_init), 3808 },
-	{ HP_POP(pet->birth_process), HP_POP2(HP_pet_birth_process), 3810 },
-	{ HP_POP(pet->recv_petdata), HP_POP2(HP_pet_recv_petdata), 3812 },
-	{ HP_POP(pet->select_egg), HP_POP2(HP_pet_select_egg), 3814 },
-	{ HP_POP(pet->catch_process1), HP_POP2(HP_pet_catch_process1), 3816 },
-	{ HP_POP(pet->catch_process2), HP_POP2(HP_pet_catch_process2), 3818 },
-	{ HP_POP(pet->get_egg), HP_POP2(HP_pet_get_egg), 3820 },
-	{ HP_POP(pet->unequipitem), HP_POP2(HP_pet_unequipitem), 3822 },
-	{ HP_POP(pet->food), HP_POP2(HP_pet_food), 3824 },
-	{ HP_POP(pet->ai_sub_hard_lootsearch), HP_POP2(HP_pet_ai_sub_hard_lootsearch), 3826 },
-	{ HP_POP(pet->menu), HP_POP2(HP_pet_menu), 3828 },
-	{ HP_POP(pet->change_name), HP_POP2(HP_pet_change_name), 3830 },
-	{ HP_POP(pet->change_name_ack), HP_POP2(HP_pet_change_name_ack), 3832 },
-	{ HP_POP(pet->equipitem), HP_POP2(HP_pet_equipitem), 3834 },
-	{ HP_POP(pet->randomwalk), HP_POP2(HP_pet_randomwalk), 3836 },
-	{ HP_POP(pet->ai_sub_hard), HP_POP2(HP_pet_ai_sub_hard), 3838 },
-	{ HP_POP(pet->ai_sub_foreachclient), HP_POP2(HP_pet_ai_sub_foreachclient), 3840 },
-	{ HP_POP(pet->ai_hard), HP_POP2(HP_pet_ai_hard), 3842 },
-	{ HP_POP(pet->delay_item_drop), HP_POP2(HP_pet_delay_item_drop), 3844 },
-	{ HP_POP(pet->lootitem_drop), HP_POP2(HP_pet_lootitem_drop), 3846 },
-	{ HP_POP(pet->skill_bonus_timer), HP_POP2(HP_pet_skill_bonus_timer), 3848 },
-	{ HP_POP(pet->recovery_timer), HP_POP2(HP_pet_recovery_timer), 3850 },
-	{ HP_POP(pet->heal_timer), HP_POP2(HP_pet_heal_timer), 3852 },
-	{ HP_POP(pet->skill_support_timer), HP_POP2(HP_pet_skill_support_timer), 3854 },
-	{ HP_POP(pet->read_db), HP_POP2(HP_pet_read_db), 3856 },
+	{ HP_POP(pet->init, HP_pet_init) },
+	{ HP_POP(pet->final, HP_pet_final) },
+	{ HP_POP(pet->hungry_val, HP_pet_hungry_val) },
+	{ HP_POP(pet->set_intimate, HP_pet_set_intimate) },
+	{ HP_POP(pet->create_egg, HP_pet_create_egg) },
+	{ HP_POP(pet->unlocktarget, HP_pet_unlocktarget) },
+	{ HP_POP(pet->attackskill, HP_pet_attackskill) },
+	{ HP_POP(pet->target_check, HP_pet_target_check) },
+	{ HP_POP(pet->sc_check, HP_pet_sc_check) },
+	{ HP_POP(pet->hungry, HP_pet_hungry) },
+	{ HP_POP(pet->search_petDB_index, HP_pet_search_petDB_index) },
+	{ HP_POP(pet->hungry_timer_delete, HP_pet_hungry_timer_delete) },
+	{ HP_POP(pet->performance, HP_pet_performance) },
+	{ HP_POP(pet->return_egg, HP_pet_return_egg) },
+	{ HP_POP(pet->data_init, HP_pet_data_init) },
+	{ HP_POP(pet->birth_process, HP_pet_birth_process) },
+	{ HP_POP(pet->recv_petdata, HP_pet_recv_petdata) },
+	{ HP_POP(pet->select_egg, HP_pet_select_egg) },
+	{ HP_POP(pet->catch_process1, HP_pet_catch_process1) },
+	{ HP_POP(pet->catch_process2, HP_pet_catch_process2) },
+	{ HP_POP(pet->get_egg, HP_pet_get_egg) },
+	{ HP_POP(pet->unequipitem, HP_pet_unequipitem) },
+	{ HP_POP(pet->food, HP_pet_food) },
+	{ HP_POP(pet->ai_sub_hard_lootsearch, HP_pet_ai_sub_hard_lootsearch) },
+	{ HP_POP(pet->menu, HP_pet_menu) },
+	{ HP_POP(pet->change_name, HP_pet_change_name) },
+	{ HP_POP(pet->change_name_ack, HP_pet_change_name_ack) },
+	{ HP_POP(pet->equipitem, HP_pet_equipitem) },
+	{ HP_POP(pet->randomwalk, HP_pet_randomwalk) },
+	{ HP_POP(pet->ai_sub_hard, HP_pet_ai_sub_hard) },
+	{ HP_POP(pet->ai_sub_foreachclient, HP_pet_ai_sub_foreachclient) },
+	{ HP_POP(pet->ai_hard, HP_pet_ai_hard) },
+	{ HP_POP(pet->delay_item_drop, HP_pet_delay_item_drop) },
+	{ HP_POP(pet->lootitem_drop, HP_pet_lootitem_drop) },
+	{ HP_POP(pet->skill_bonus_timer, HP_pet_skill_bonus_timer) },
+	{ HP_POP(pet->recovery_timer, HP_pet_recovery_timer) },
+	{ HP_POP(pet->heal_timer, HP_pet_heal_timer) },
+	{ HP_POP(pet->skill_support_timer, HP_pet_skill_support_timer) },
+	{ HP_POP(pet->read_db, HP_pet_read_db) },
 /* quest */
-	{ HP_POP(quest->init), HP_POP2(HP_quest_init), 3858 },
-	{ HP_POP(quest->reload), HP_POP2(HP_quest_reload), 3860 },
-	{ HP_POP(quest->search_db), HP_POP2(HP_quest_search_db), 3862 },
-	{ HP_POP(quest->pc_login), HP_POP2(HP_quest_pc_login), 3864 },
-	{ HP_POP(quest->add), HP_POP2(HP_quest_add), 3866 },
-	{ HP_POP(quest->change), HP_POP2(HP_quest_change), 3868 },
-	{ HP_POP(quest->delete), HP_POP2(HP_quest_delete), 3870 },
-	{ HP_POP(quest->update_objective_sub), HP_POP2(HP_quest_update_objective_sub), 3872 },
-	{ HP_POP(quest->update_objective), HP_POP2(HP_quest_update_objective), 3874 },
-	{ HP_POP(quest->update_status), HP_POP2(HP_quest_update_status), 3876 },
-	{ HP_POP(quest->check), HP_POP2(HP_quest_check), 3878 },
-	{ HP_POP(quest->read_db), HP_POP2(HP_quest_read_db), 3880 },
+	{ HP_POP(quest->init, HP_quest_init) },
+	{ HP_POP(quest->reload, HP_quest_reload) },
+	{ HP_POP(quest->search_db, HP_quest_search_db) },
+	{ HP_POP(quest->pc_login, HP_quest_pc_login) },
+	{ HP_POP(quest->add, HP_quest_add) },
+	{ HP_POP(quest->change, HP_quest_change) },
+	{ HP_POP(quest->delete, HP_quest_delete) },
+	{ HP_POP(quest->update_objective_sub, HP_quest_update_objective_sub) },
+	{ HP_POP(quest->update_objective, HP_quest_update_objective) },
+	{ HP_POP(quest->update_status, HP_quest_update_status) },
+	{ HP_POP(quest->check, HP_quest_check) },
+	{ HP_POP(quest->read_db, HP_quest_read_db) },
 /* script */
-	{ HP_POP(script->init), HP_POP2(HP_script_init), 3882 },
-	{ HP_POP(script->final), HP_POP2(HP_script_final), 3884 },
-	{ HP_POP(script->reload), HP_POP2(HP_script_reload), 3886 },
-	{ HP_POP(script->parse), HP_POP2(HP_script_parse), 3888 },
-	{ HP_POP(script->parse_builtin), HP_POP2(HP_script_parse_builtin), 3890 },
-	{ HP_POP(script->parse_subexpr), HP_POP2(HP_script_parse_subexpr), 3892 },
-	{ HP_POP(script->skip_space), HP_POP2(HP_script_skip_space), 3894 },
-	{ HP_POP(script->error), HP_POP2(HP_script_error), 3896 },
-	{ HP_POP(script->warning), HP_POP2(HP_script_warning), 3898 },
-	{ HP_POP(script->addScript), HP_POP2(HP_script_addScript), 3900 },
-	{ HP_POP(script->conv_num), HP_POP2(HP_script_conv_num), 3902 },
-	{ HP_POP(script->conv_str), HP_POP2(HP_script_conv_str), 3904 },
-	{ HP_POP(script->rid2sd), HP_POP2(HP_script_rid2sd), 3906 },
-	{ HP_POP(script->detach_rid), HP_POP2(HP_script_detach_rid), 3908 },
-	{ HP_POP(script->push_val), HP_POP2(HP_script_push_val), 3910 },
-	{ HP_POP(script->get_val), HP_POP2(HP_script_get_val), 3912 },
-	{ HP_POP(script->get_val2), HP_POP2(HP_script_get_val2), 3914 },
-	{ HP_POP(script->push_str), HP_POP2(HP_script_push_str), 3916 },
-	{ HP_POP(script->push_copy), HP_POP2(HP_script_push_copy), 3918 },
-	{ HP_POP(script->pop_stack), HP_POP2(HP_script_pop_stack), 3920 },
-	{ HP_POP(script->set_constant), HP_POP2(HP_script_set_constant), 3922 },
-	{ HP_POP(script->set_constant2), HP_POP2(HP_script_set_constant2), 3924 },
-	{ HP_POP(script->set_constant_force), HP_POP2(HP_script_set_constant_force), 3926 },
-	{ HP_POP(script->get_constant), HP_POP2(HP_script_get_constant), 3928 },
-	{ HP_POP(script->label_add), HP_POP2(HP_script_label_add), 3930 },
-	{ HP_POP(script->run), HP_POP2(HP_script_run), 3932 },
-	{ HP_POP(script->run_main), HP_POP2(HP_script_run_main), 3934 },
-	{ HP_POP(script->run_timer), HP_POP2(HP_script_run_timer), 3936 },
-	{ HP_POP(script->set_var), HP_POP2(HP_script_set_var), 3938 },
-	{ HP_POP(script->stop_instances), HP_POP2(HP_script_stop_instances), 3940 },
-	{ HP_POP(script->free_code), HP_POP2(HP_script_free_code), 3942 },
-	{ HP_POP(script->free_vars), HP_POP2(HP_script_free_vars), 3944 },
-	{ HP_POP(script->alloc_state), HP_POP2(HP_script_alloc_state), 3946 },
-	{ HP_POP(script->free_state), HP_POP2(HP_script_free_state), 3948 },
-	{ HP_POP(script->run_autobonus), HP_POP2(HP_script_run_autobonus), 3950 },
-	{ HP_POP(script->cleararray_pc), HP_POP2(HP_script_cleararray_pc), 3952 },
-	{ HP_POP(script->setarray_pc), HP_POP2(HP_script_setarray_pc), 3954 },
-	{ HP_POP(script->config_read), HP_POP2(HP_script_config_read), 3956 },
-	{ HP_POP(script->add_str), HP_POP2(HP_script_add_str), 3958 },
-	{ HP_POP(script->get_str), HP_POP2(HP_script_get_str), 3960 },
-	{ HP_POP(script->search_str), HP_POP2(HP_script_search_str), 3962 },
-	{ HP_POP(script->setd_sub), HP_POP2(HP_script_setd_sub), 3964 },
-	{ HP_POP(script->attach_state), HP_POP2(HP_script_attach_state), 3966 },
-	{ HP_POP(script->queue), HP_POP2(HP_script_queue), 3968 },
-	{ HP_POP(script->queue_add), HP_POP2(HP_script_queue_add), 3970 },
-	{ HP_POP(script->queue_del), HP_POP2(HP_script_queue_del), 3972 },
-	{ HP_POP(script->queue_remove), HP_POP2(HP_script_queue_remove), 3974 },
-	{ HP_POP(script->queue_create), HP_POP2(HP_script_queue_create), 3976 },
-	{ HP_POP(script->queue_clear), HP_POP2(HP_script_queue_clear), 3978 },
-	{ HP_POP(script->parse_curly_close), HP_POP2(HP_script_parse_curly_close), 3980 },
-	{ HP_POP(script->parse_syntax_close), HP_POP2(HP_script_parse_syntax_close), 3982 },
-	{ HP_POP(script->parse_syntax_close_sub), HP_POP2(HP_script_parse_syntax_close_sub), 3984 },
-	{ HP_POP(script->parse_syntax), HP_POP2(HP_script_parse_syntax), 3986 },
-	{ HP_POP(script->get_com), HP_POP2(HP_script_get_com), 3988 },
-	{ HP_POP(script->get_num), HP_POP2(HP_script_get_num), 3990 },
-	{ HP_POP(script->op2name), HP_POP2(HP_script_op2name), 3992 },
-	{ HP_POP(script->reportsrc), HP_POP2(HP_script_reportsrc), 3994 },
-	{ HP_POP(script->reportdata), HP_POP2(HP_script_reportdata), 3996 },
-	{ HP_POP(script->reportfunc), HP_POP2(HP_script_reportfunc), 3998 },
-	{ HP_POP(script->disp_error_message2), HP_POP2(HP_script_disp_error_message2), 4000 },
-	{ HP_POP(script->disp_warning_message), HP_POP2(HP_script_disp_warning_message), 4002 },
-	{ HP_POP(script->check_event), HP_POP2(HP_script_check_event), 4004 },
-	{ HP_POP(script->calc_hash), HP_POP2(HP_script_calc_hash), 4006 },
-	{ HP_POP(script->addb), HP_POP2(HP_script_addb), 4008 },
-	{ HP_POP(script->addc), HP_POP2(HP_script_addc), 4010 },
-	{ HP_POP(script->addi), HP_POP2(HP_script_addi), 4012 },
-	{ HP_POP(script->addl), HP_POP2(HP_script_addl), 4014 },
-	{ HP_POP(script->set_label), HP_POP2(HP_script_set_label), 4016 },
-	{ HP_POP(script->skip_word), HP_POP2(HP_script_skip_word), 4018 },
-	{ HP_POP(script->add_word), HP_POP2(HP_script_add_word), 4020 },
-	{ HP_POP(script->parse_callfunc), HP_POP2(HP_script_parse_callfunc), 4022 },
-	{ HP_POP(script->parse_nextline), HP_POP2(HP_script_parse_nextline), 4024 },
-	{ HP_POP(script->parse_variable), HP_POP2(HP_script_parse_variable), 4026 },
-	{ HP_POP(script->parse_simpleexpr), HP_POP2(HP_script_parse_simpleexpr), 4028 },
-	{ HP_POP(script->parse_expr), HP_POP2(HP_script_parse_expr), 4030 },
-	{ HP_POP(script->parse_line), HP_POP2(HP_script_parse_line), 4032 },
-	{ HP_POP(script->read_constdb), HP_POP2(HP_script_read_constdb), 4034 },
-	{ HP_POP(script->print_line), HP_POP2(HP_script_print_line), 4036 },
-	{ HP_POP(script->errorwarning_sub), HP_POP2(HP_script_errorwarning_sub), 4038 },
-	{ HP_POP(script->set_reg), HP_POP2(HP_script_set_reg), 4040 },
-	{ HP_POP(script->stack_expand), HP_POP2(HP_script_stack_expand), 4042 },
-	{ HP_POP(script->push_retinfo), HP_POP2(HP_script_push_retinfo), 4044 },
-	{ HP_POP(script->pop_val), HP_POP2(HP_script_pop_val), 4046 },
-	{ HP_POP(script->op_3), HP_POP2(HP_script_op_3), 4048 },
-	{ HP_POP(script->op_2str), HP_POP2(HP_script_op_2str), 4050 },
-	{ HP_POP(script->op_2num), HP_POP2(HP_script_op_2num), 4052 },
-	{ HP_POP(script->op_2), HP_POP2(HP_script_op_2), 4054 },
-	{ HP_POP(script->op_1), HP_POP2(HP_script_op_1), 4056 },
-	{ HP_POP(script->check_buildin_argtype), HP_POP2(HP_script_check_buildin_argtype), 4058 },
-	{ HP_POP(script->detach_state), HP_POP2(HP_script_detach_state), 4060 },
-	{ HP_POP(script->db_free_code_sub), HP_POP2(HP_script_db_free_code_sub), 4062 },
-	{ HP_POP(script->add_autobonus), HP_POP2(HP_script_add_autobonus), 4064 },
-	{ HP_POP(script->menu_countoptions), HP_POP2(HP_script_menu_countoptions), 4066 },
-	{ HP_POP(script->buildin_areawarp_sub), HP_POP2(HP_script_buildin_areawarp_sub), 4068 },
-	{ HP_POP(script->buildin_areapercentheal_sub), HP_POP2(HP_script_buildin_areapercentheal_sub), 4070 },
-	{ HP_POP(script->getarraysize), HP_POP2(HP_script_getarraysize), 4072 },
-	{ HP_POP(script->buildin_delitem_delete), HP_POP2(HP_script_buildin_delitem_delete), 4074 },
-	{ HP_POP(script->buildin_delitem_search), HP_POP2(HP_script_buildin_delitem_search), 4076 },
-	{ HP_POP(script->buildin_killmonster_sub_strip), HP_POP2(HP_script_buildin_killmonster_sub_strip), 4078 },
-	{ HP_POP(script->buildin_killmonster_sub), HP_POP2(HP_script_buildin_killmonster_sub), 4080 },
-	{ HP_POP(script->buildin_killmonsterall_sub_strip), HP_POP2(HP_script_buildin_killmonsterall_sub_strip), 4082 },
-	{ HP_POP(script->buildin_killmonsterall_sub), HP_POP2(HP_script_buildin_killmonsterall_sub), 4084 },
-	{ HP_POP(script->buildin_announce_sub), HP_POP2(HP_script_buildin_announce_sub), 4086 },
-	{ HP_POP(script->buildin_getareausers_sub), HP_POP2(HP_script_buildin_getareausers_sub), 4088 },
-	{ HP_POP(script->buildin_getareadropitem_sub), HP_POP2(HP_script_buildin_getareadropitem_sub), 4090 },
-	{ HP_POP(script->mapflag_pvp_sub), HP_POP2(HP_script_mapflag_pvp_sub), 4092 },
-	{ HP_POP(script->buildin_pvpoff_sub), HP_POP2(HP_script_buildin_pvpoff_sub), 4094 },
-	{ HP_POP(script->buildin_maprespawnguildid_sub_pc), HP_POP2(HP_script_buildin_maprespawnguildid_sub_pc), 4096 },
-	{ HP_POP(script->buildin_maprespawnguildid_sub_mob), HP_POP2(HP_script_buildin_maprespawnguildid_sub_mob), 4098 },
-	{ HP_POP(script->buildin_mobcount_sub), HP_POP2(HP_script_buildin_mobcount_sub), 4100 },
-	{ HP_POP(script->playBGM_sub), HP_POP2(HP_script_playBGM_sub), 4102 },
-	{ HP_POP(script->playBGM_foreachpc_sub), HP_POP2(HP_script_playBGM_foreachpc_sub), 4104 },
-	{ HP_POP(script->soundeffect_sub), HP_POP2(HP_script_soundeffect_sub), 4106 },
-	{ HP_POP(script->buildin_query_sql_sub), HP_POP2(HP_script_buildin_query_sql_sub), 4108 },
-	{ HP_POP(script->axtoi), HP_POP2(HP_script_axtoi), 4110 },
-	{ HP_POP(script->buildin_instance_warpall_sub), HP_POP2(HP_script_buildin_instance_warpall_sub), 4112 },
-	{ HP_POP(script->buildin_mobuseskill_sub), HP_POP2(HP_script_buildin_mobuseskill_sub), 4114 },
-	{ HP_POP(script->cleanfloor_sub), HP_POP2(HP_script_cleanfloor_sub), 4116 },
-	{ HP_POP(script->run_func), HP_POP2(HP_script_run_func), 4118 },
+	{ HP_POP(script->init, HP_script_init) },
+	{ HP_POP(script->final, HP_script_final) },
+	{ HP_POP(script->reload, HP_script_reload) },
+	{ HP_POP(script->parse, HP_script_parse) },
+	{ HP_POP(script->parse_builtin, HP_script_parse_builtin) },
+	{ HP_POP(script->parse_subexpr, HP_script_parse_subexpr) },
+	{ HP_POP(script->skip_space, HP_script_skip_space) },
+	{ HP_POP(script->error, HP_script_error) },
+	{ HP_POP(script->warning, HP_script_warning) },
+	{ HP_POP(script->addScript, HP_script_addScript) },
+	{ HP_POP(script->conv_num, HP_script_conv_num) },
+	{ HP_POP(script->conv_str, HP_script_conv_str) },
+	{ HP_POP(script->rid2sd, HP_script_rid2sd) },
+	{ HP_POP(script->detach_rid, HP_script_detach_rid) },
+	{ HP_POP(script->push_val, HP_script_push_val) },
+	{ HP_POP(script->get_val, HP_script_get_val) },
+	{ HP_POP(script->get_val2, HP_script_get_val2) },
+	{ HP_POP(script->push_str, HP_script_push_str) },
+	{ HP_POP(script->push_copy, HP_script_push_copy) },
+	{ HP_POP(script->pop_stack, HP_script_pop_stack) },
+	{ HP_POP(script->set_constant, HP_script_set_constant) },
+	{ HP_POP(script->set_constant2, HP_script_set_constant2) },
+	{ HP_POP(script->set_constant_force, HP_script_set_constant_force) },
+	{ HP_POP(script->get_constant, HP_script_get_constant) },
+	{ HP_POP(script->label_add, HP_script_label_add) },
+	{ HP_POP(script->run, HP_script_run) },
+	{ HP_POP(script->run_main, HP_script_run_main) },
+	{ HP_POP(script->run_timer, HP_script_run_timer) },
+	{ HP_POP(script->set_var, HP_script_set_var) },
+	{ HP_POP(script->stop_instances, HP_script_stop_instances) },
+	{ HP_POP(script->free_code, HP_script_free_code) },
+	{ HP_POP(script->free_vars, HP_script_free_vars) },
+	{ HP_POP(script->alloc_state, HP_script_alloc_state) },
+	{ HP_POP(script->free_state, HP_script_free_state) },
+	{ HP_POP(script->run_autobonus, HP_script_run_autobonus) },
+	{ HP_POP(script->cleararray_pc, HP_script_cleararray_pc) },
+	{ HP_POP(script->setarray_pc, HP_script_setarray_pc) },
+	{ HP_POP(script->config_read, HP_script_config_read) },
+	{ HP_POP(script->add_str, HP_script_add_str) },
+	{ HP_POP(script->get_str, HP_script_get_str) },
+	{ HP_POP(script->search_str, HP_script_search_str) },
+	{ HP_POP(script->setd_sub, HP_script_setd_sub) },
+	{ HP_POP(script->attach_state, HP_script_attach_state) },
+	{ HP_POP(script->queue, HP_script_queue) },
+	{ HP_POP(script->queue_add, HP_script_queue_add) },
+	{ HP_POP(script->queue_del, HP_script_queue_del) },
+	{ HP_POP(script->queue_remove, HP_script_queue_remove) },
+	{ HP_POP(script->queue_create, HP_script_queue_create) },
+	{ HP_POP(script->queue_clear, HP_script_queue_clear) },
+	{ HP_POP(script->parse_curly_close, HP_script_parse_curly_close) },
+	{ HP_POP(script->parse_syntax_close, HP_script_parse_syntax_close) },
+	{ HP_POP(script->parse_syntax_close_sub, HP_script_parse_syntax_close_sub) },
+	{ HP_POP(script->parse_syntax, HP_script_parse_syntax) },
+	{ HP_POP(script->get_com, HP_script_get_com) },
+	{ HP_POP(script->get_num, HP_script_get_num) },
+	{ HP_POP(script->op2name, HP_script_op2name) },
+	{ HP_POP(script->reportsrc, HP_script_reportsrc) },
+	{ HP_POP(script->reportdata, HP_script_reportdata) },
+	{ HP_POP(script->reportfunc, HP_script_reportfunc) },
+	{ HP_POP(script->disp_error_message2, HP_script_disp_error_message2) },
+	{ HP_POP(script->disp_warning_message, HP_script_disp_warning_message) },
+	{ HP_POP(script->check_event, HP_script_check_event) },
+	{ HP_POP(script->calc_hash, HP_script_calc_hash) },
+	{ HP_POP(script->addb, HP_script_addb) },
+	{ HP_POP(script->addc, HP_script_addc) },
+	{ HP_POP(script->addi, HP_script_addi) },
+	{ HP_POP(script->addl, HP_script_addl) },
+	{ HP_POP(script->set_label, HP_script_set_label) },
+	{ HP_POP(script->skip_word, HP_script_skip_word) },
+	{ HP_POP(script->add_word, HP_script_add_word) },
+	{ HP_POP(script->parse_callfunc, HP_script_parse_callfunc) },
+	{ HP_POP(script->parse_nextline, HP_script_parse_nextline) },
+	{ HP_POP(script->parse_variable, HP_script_parse_variable) },
+	{ HP_POP(script->parse_simpleexpr, HP_script_parse_simpleexpr) },
+	{ HP_POP(script->parse_expr, HP_script_parse_expr) },
+	{ HP_POP(script->parse_line, HP_script_parse_line) },
+	{ HP_POP(script->read_constdb, HP_script_read_constdb) },
+	{ HP_POP(script->print_line, HP_script_print_line) },
+	{ HP_POP(script->errorwarning_sub, HP_script_errorwarning_sub) },
+	{ HP_POP(script->set_reg, HP_script_set_reg) },
+	{ HP_POP(script->stack_expand, HP_script_stack_expand) },
+	{ HP_POP(script->push_retinfo, HP_script_push_retinfo) },
+	{ HP_POP(script->pop_val, HP_script_pop_val) },
+	{ HP_POP(script->op_3, HP_script_op_3) },
+	{ HP_POP(script->op_2str, HP_script_op_2str) },
+	{ HP_POP(script->op_2num, HP_script_op_2num) },
+	{ HP_POP(script->op_2, HP_script_op_2) },
+	{ HP_POP(script->op_1, HP_script_op_1) },
+	{ HP_POP(script->check_buildin_argtype, HP_script_check_buildin_argtype) },
+	{ HP_POP(script->detach_state, HP_script_detach_state) },
+	{ HP_POP(script->db_free_code_sub, HP_script_db_free_code_sub) },
+	{ HP_POP(script->add_autobonus, HP_script_add_autobonus) },
+	{ HP_POP(script->menu_countoptions, HP_script_menu_countoptions) },
+	{ HP_POP(script->buildin_areawarp_sub, HP_script_buildin_areawarp_sub) },
+	{ HP_POP(script->buildin_areapercentheal_sub, HP_script_buildin_areapercentheal_sub) },
+	{ HP_POP(script->getarraysize, HP_script_getarraysize) },
+	{ HP_POP(script->buildin_delitem_delete, HP_script_buildin_delitem_delete) },
+	{ HP_POP(script->buildin_delitem_search, HP_script_buildin_delitem_search) },
+	{ HP_POP(script->buildin_killmonster_sub_strip, HP_script_buildin_killmonster_sub_strip) },
+	{ HP_POP(script->buildin_killmonster_sub, HP_script_buildin_killmonster_sub) },
+	{ HP_POP(script->buildin_killmonsterall_sub_strip, HP_script_buildin_killmonsterall_sub_strip) },
+	{ HP_POP(script->buildin_killmonsterall_sub, HP_script_buildin_killmonsterall_sub) },
+	{ HP_POP(script->buildin_announce_sub, HP_script_buildin_announce_sub) },
+	{ HP_POP(script->buildin_getareausers_sub, HP_script_buildin_getareausers_sub) },
+	{ HP_POP(script->buildin_getareadropitem_sub, HP_script_buildin_getareadropitem_sub) },
+	{ HP_POP(script->mapflag_pvp_sub, HP_script_mapflag_pvp_sub) },
+	{ HP_POP(script->buildin_pvpoff_sub, HP_script_buildin_pvpoff_sub) },
+	{ HP_POP(script->buildin_maprespawnguildid_sub_pc, HP_script_buildin_maprespawnguildid_sub_pc) },
+	{ HP_POP(script->buildin_maprespawnguildid_sub_mob, HP_script_buildin_maprespawnguildid_sub_mob) },
+	{ HP_POP(script->buildin_mobcount_sub, HP_script_buildin_mobcount_sub) },
+	{ HP_POP(script->playBGM_sub, HP_script_playBGM_sub) },
+	{ HP_POP(script->playBGM_foreachpc_sub, HP_script_playBGM_foreachpc_sub) },
+	{ HP_POP(script->soundeffect_sub, HP_script_soundeffect_sub) },
+	{ HP_POP(script->buildin_query_sql_sub, HP_script_buildin_query_sql_sub) },
+	{ HP_POP(script->axtoi, HP_script_axtoi) },
+	{ HP_POP(script->buildin_instance_warpall_sub, HP_script_buildin_instance_warpall_sub) },
+	{ HP_POP(script->buildin_mobuseskill_sub, HP_script_buildin_mobuseskill_sub) },
+	{ HP_POP(script->cleanfloor_sub, HP_script_cleanfloor_sub) },
+	{ HP_POP(script->run_func, HP_script_run_func) },
 /* searchstore */
-	{ HP_POP(searchstore->open), HP_POP2(HP_searchstore_open), 4120 },
-	{ HP_POP(searchstore->query), HP_POP2(HP_searchstore_query), 4122 },
-	{ HP_POP(searchstore->querynext), HP_POP2(HP_searchstore_querynext), 4124 },
-	{ HP_POP(searchstore->next), HP_POP2(HP_searchstore_next), 4126 },
-	{ HP_POP(searchstore->clear), HP_POP2(HP_searchstore_clear), 4128 },
-	{ HP_POP(searchstore->close), HP_POP2(HP_searchstore_close), 4130 },
-	{ HP_POP(searchstore->click), HP_POP2(HP_searchstore_click), 4132 },
-	{ HP_POP(searchstore->queryremote), HP_POP2(HP_searchstore_queryremote), 4134 },
-	{ HP_POP(searchstore->clearremote), HP_POP2(HP_searchstore_clearremote), 4136 },
-	{ HP_POP(searchstore->result), HP_POP2(HP_searchstore_result), 4138 },
+	{ HP_POP(searchstore->open, HP_searchstore_open) },
+	{ HP_POP(searchstore->query, HP_searchstore_query) },
+	{ HP_POP(searchstore->querynext, HP_searchstore_querynext) },
+	{ HP_POP(searchstore->next, HP_searchstore_next) },
+	{ HP_POP(searchstore->clear, HP_searchstore_clear) },
+	{ HP_POP(searchstore->close, HP_searchstore_close) },
+	{ HP_POP(searchstore->click, HP_searchstore_click) },
+	{ HP_POP(searchstore->queryremote, HP_searchstore_queryremote) },
+	{ HP_POP(searchstore->clearremote, HP_searchstore_clearremote) },
+	{ HP_POP(searchstore->result, HP_searchstore_result) },
 /* skill */
-	{ HP_POP(skill->init), HP_POP2(HP_skill_init), 4140 },
-	{ HP_POP(skill->final), HP_POP2(HP_skill_final), 4142 },
-	{ HP_POP(skill->reload), HP_POP2(HP_skill_reload), 4144 },
-	{ HP_POP(skill->read_db), HP_POP2(HP_skill_read_db), 4146 },
-	{ HP_POP(skill->get_index), HP_POP2(HP_skill_get_index), 4148 },
-	{ HP_POP(skill->get_type), HP_POP2(HP_skill_get_type), 4150 },
-	{ HP_POP(skill->get_hit), HP_POP2(HP_skill_get_hit), 4152 },
-	{ HP_POP(skill->get_inf), HP_POP2(HP_skill_get_inf), 4154 },
-	{ HP_POP(skill->get_ele), HP_POP2(HP_skill_get_ele), 4156 },
-	{ HP_POP(skill->get_nk), HP_POP2(HP_skill_get_nk), 4158 },
-	{ HP_POP(skill->get_max), HP_POP2(HP_skill_get_max), 4160 },
-	{ HP_POP(skill->get_range), HP_POP2(HP_skill_get_range), 4162 },
-	{ HP_POP(skill->get_range2), HP_POP2(HP_skill_get_range2), 4164 },
-	{ HP_POP(skill->get_splash), HP_POP2(HP_skill_get_splash), 4166 },
-	{ HP_POP(skill->get_hp), HP_POP2(HP_skill_get_hp), 4168 },
-	{ HP_POP(skill->get_mhp), HP_POP2(HP_skill_get_mhp), 4170 },
-	{ HP_POP(skill->get_sp), HP_POP2(HP_skill_get_sp), 4172 },
-	{ HP_POP(skill->get_state), HP_POP2(HP_skill_get_state), 4174 },
-	{ HP_POP(skill->get_spiritball), HP_POP2(HP_skill_get_spiritball), 4176 },
-	{ HP_POP(skill->get_zeny), HP_POP2(HP_skill_get_zeny), 4178 },
-	{ HP_POP(skill->get_num), HP_POP2(HP_skill_get_num), 4180 },
-	{ HP_POP(skill->get_cast), HP_POP2(HP_skill_get_cast), 4182 },
-	{ HP_POP(skill->get_delay), HP_POP2(HP_skill_get_delay), 4184 },
-	{ HP_POP(skill->get_walkdelay), HP_POP2(HP_skill_get_walkdelay), 4186 },
-	{ HP_POP(skill->get_time), HP_POP2(HP_skill_get_time), 4188 },
-	{ HP_POP(skill->get_time2), HP_POP2(HP_skill_get_time2), 4190 },
-	{ HP_POP(skill->get_castnodex), HP_POP2(HP_skill_get_castnodex), 4192 },
-	{ HP_POP(skill->get_delaynodex), HP_POP2(HP_skill_get_delaynodex), 4194 },
-	{ HP_POP(skill->get_castdef), HP_POP2(HP_skill_get_castdef), 4196 },
-	{ HP_POP(skill->get_weapontype), HP_POP2(HP_skill_get_weapontype), 4198 },
-	{ HP_POP(skill->get_ammotype), HP_POP2(HP_skill_get_ammotype), 4200 },
-	{ HP_POP(skill->get_ammo_qty), HP_POP2(HP_skill_get_ammo_qty), 4202 },
-	{ HP_POP(skill->get_unit_id), HP_POP2(HP_skill_get_unit_id), 4204 },
-	{ HP_POP(skill->get_inf2), HP_POP2(HP_skill_get_inf2), 4206 },
-	{ HP_POP(skill->get_castcancel), HP_POP2(HP_skill_get_castcancel), 4208 },
-	{ HP_POP(skill->get_maxcount), HP_POP2(HP_skill_get_maxcount), 4210 },
-	{ HP_POP(skill->get_blewcount), HP_POP2(HP_skill_get_blewcount), 4212 },
-	{ HP_POP(skill->get_unit_flag), HP_POP2(HP_skill_get_unit_flag), 4214 },
-	{ HP_POP(skill->get_unit_target), HP_POP2(HP_skill_get_unit_target), 4216 },
-	{ HP_POP(skill->get_unit_interval), HP_POP2(HP_skill_get_unit_interval), 4218 },
-	{ HP_POP(skill->get_unit_bl_target), HP_POP2(HP_skill_get_unit_bl_target), 4220 },
-	{ HP_POP(skill->get_unit_layout_type), HP_POP2(HP_skill_get_unit_layout_type), 4222 },
-	{ HP_POP(skill->get_unit_range), HP_POP2(HP_skill_get_unit_range), 4224 },
-	{ HP_POP(skill->get_cooldown), HP_POP2(HP_skill_get_cooldown), 4226 },
-	{ HP_POP(skill->tree_get_max), HP_POP2(HP_skill_tree_get_max), 4228 },
-	{ HP_POP(skill->get_name), HP_POP2(HP_skill_get_name), 4230 },
-	{ HP_POP(skill->get_desc), HP_POP2(HP_skill_get_desc), 4232 },
-	{ HP_POP(skill->chk), HP_POP2(HP_skill_chk), 4234 },
-	{ HP_POP(skill->get_casttype), HP_POP2(HP_skill_get_casttype), 4236 },
-	{ HP_POP(skill->get_casttype2), HP_POP2(HP_skill_get_casttype2), 4238 },
-	{ HP_POP(skill->name2id), HP_POP2(HP_skill_name2id), 4240 },
-	{ HP_POP(skill->isammotype), HP_POP2(HP_skill_isammotype), 4242 },
-	{ HP_POP(skill->castend_id), HP_POP2(HP_skill_castend_id), 4244 },
-	{ HP_POP(skill->castend_pos), HP_POP2(HP_skill_castend_pos), 4246 },
-	{ HP_POP(skill->castend_map), HP_POP2(HP_skill_castend_map), 4248 },
-	{ HP_POP(skill->cleartimerskill), HP_POP2(HP_skill_cleartimerskill), 4250 },
-	{ HP_POP(skill->addtimerskill), HP_POP2(HP_skill_addtimerskill), 4252 },
-	{ HP_POP(skill->additional_effect), HP_POP2(HP_skill_additional_effect), 4254 },
-	{ HP_POP(skill->counter_additional_effect), HP_POP2(HP_skill_counter_additional_effect), 4256 },
-	{ HP_POP(skill->blown), HP_POP2(HP_skill_blown), 4258 },
-	{ HP_POP(skill->break_equip), HP_POP2(HP_skill_break_equip), 4260 },
-	{ HP_POP(skill->strip_equip), HP_POP2(HP_skill_strip_equip), 4262 },
-	{ HP_POP(skill->id2group), HP_POP2(HP_skill_id2group), 4264 },
-	{ HP_POP(skill->unitsetting), HP_POP2(HP_skill_unitsetting), 4266 },
-	{ HP_POP(skill->initunit), HP_POP2(HP_skill_initunit), 4268 },
-	{ HP_POP(skill->delunit), HP_POP2(HP_skill_delunit), 4270 },
-	{ HP_POP(skill->init_unitgroup), HP_POP2(HP_skill_init_unitgroup), 4272 },
-	{ HP_POP(skill->del_unitgroup), HP_POP2(HP_skill_del_unitgroup), 4274 },
-	{ HP_POP(skill->clear_unitgroup), HP_POP2(HP_skill_clear_unitgroup), 4276 },
-	{ HP_POP(skill->clear_group), HP_POP2(HP_skill_clear_group), 4278 },
-	{ HP_POP(skill->unit_onplace), HP_POP2(HP_skill_unit_onplace), 4280 },
-	{ HP_POP(skill->unit_ondamaged), HP_POP2(HP_skill_unit_ondamaged), 4282 },
-	{ HP_POP(skill->cast_fix), HP_POP2(HP_skill_cast_fix), 4284 },
-	{ HP_POP(skill->cast_fix_sc), HP_POP2(HP_skill_cast_fix_sc), 4286 },
-	{ HP_POP(skill->vf_cast_fix), HP_POP2(HP_skill_vf_cast_fix), 4288 },
-	{ HP_POP(skill->delay_fix), HP_POP2(HP_skill_delay_fix), 4290 },
-	{ HP_POP(skill->check_condition_castbegin), HP_POP2(HP_skill_check_condition_castbegin), 4292 },
-	{ HP_POP(skill->check_condition_castend), HP_POP2(HP_skill_check_condition_castend), 4294 },
-	{ HP_POP(skill->consume_requirement), HP_POP2(HP_skill_consume_requirement), 4296 },
-	{ HP_POP(skill->get_requirement), HP_POP2(HP_skill_get_requirement), 4298 },
-	{ HP_POP(skill->check_pc_partner), HP_POP2(HP_skill_check_pc_partner), 4300 },
-	{ HP_POP(skill->unit_move), HP_POP2(HP_skill_unit_move), 4302 },
-	{ HP_POP(skill->unit_onleft), HP_POP2(HP_skill_unit_onleft), 4304 },
-	{ HP_POP(skill->unit_onout), HP_POP2(HP_skill_unit_onout), 4306 },
-	{ HP_POP(skill->unit_move_unit_group), HP_POP2(HP_skill_unit_move_unit_group), 4308 },
-	{ HP_POP(skill->sit), HP_POP2(HP_skill_sit), 4310 },
-	{ HP_POP(skill->brandishspear), HP_POP2(HP_skill_brandishspear), 4312 },
-	{ HP_POP(skill->repairweapon), HP_POP2(HP_skill_repairweapon), 4314 },
-	{ HP_POP(skill->identify), HP_POP2(HP_skill_identify), 4316 },
-	{ HP_POP(skill->weaponrefine), HP_POP2(HP_skill_weaponrefine), 4318 },
-	{ HP_POP(skill->autospell), HP_POP2(HP_skill_autospell), 4320 },
-	{ HP_POP(skill->calc_heal), HP_POP2(HP_skill_calc_heal), 4322 },
-	{ HP_POP(skill->check_cloaking), HP_POP2(HP_skill_check_cloaking), 4324 },
-	{ HP_POP(skill->enchant_elemental_end), HP_POP2(HP_skill_enchant_elemental_end), 4326 },
-	{ HP_POP(skill->not_ok), HP_POP2(HP_skill_not_ok), 4328 },
-	{ HP_POP(skill->not_ok_hom), HP_POP2(HP_skill_not_ok_hom), 4330 },
-	{ HP_POP(skill->not_ok_mercenary), HP_POP2(HP_skill_not_ok_mercenary), 4332 },
-	{ HP_POP(skill->chastle_mob_changetarget), HP_POP2(HP_skill_chastle_mob_changetarget), 4334 },
-	{ HP_POP(skill->can_produce_mix), HP_POP2(HP_skill_can_produce_mix), 4336 },
-	{ HP_POP(skill->produce_mix), HP_POP2(HP_skill_produce_mix), 4338 },
-	{ HP_POP(skill->arrow_create), HP_POP2(HP_skill_arrow_create), 4340 },
-	{ HP_POP(skill->castend_nodamage_id), HP_POP2(HP_skill_castend_nodamage_id), 4342 },
-	{ HP_POP(skill->castend_damage_id), HP_POP2(HP_skill_castend_damage_id), 4344 },
-	{ HP_POP(skill->castend_pos2), HP_POP2(HP_skill_castend_pos2), 4346 },
-	{ HP_POP(skill->blockpc_start), HP_POP2(HP_skill_blockpc_start), 4348 },
-	{ HP_POP(skill->blockhomun_start), HP_POP2(HP_skill_blockhomun_start), 4350 },
-	{ HP_POP(skill->blockmerc_start), HP_POP2(HP_skill_blockmerc_start), 4352 },
-	{ HP_POP(skill->attack), HP_POP2(HP_skill_attack), 4354 },
-	{ HP_POP(skill->attack_area), HP_POP2(HP_skill_attack_area), 4356 },
-	{ HP_POP(skill->area_sub), HP_POP2(HP_skill_area_sub), 4358 },
-	{ HP_POP(skill->area_sub_count), HP_POP2(HP_skill_area_sub_count), 4360 },
-	{ HP_POP(skill->check_unit_range), HP_POP2(HP_skill_check_unit_range), 4362 },
-	{ HP_POP(skill->check_unit_range_sub), HP_POP2(HP_skill_check_unit_range_sub), 4364 },
-	{ HP_POP(skill->check_unit_range2), HP_POP2(HP_skill_check_unit_range2), 4366 },
-	{ HP_POP(skill->check_unit_range2_sub), HP_POP2(HP_skill_check_unit_range2_sub), 4368 },
-	{ HP_POP(skill->toggle_magicpower), HP_POP2(HP_skill_toggle_magicpower), 4370 },
-	{ HP_POP(skill->magic_reflect), HP_POP2(HP_skill_magic_reflect), 4372 },
-	{ HP_POP(skill->onskillusage), HP_POP2(HP_skill_onskillusage), 4374 },
-	{ HP_POP(skill->cell_overlap), HP_POP2(HP_skill_cell_overlap), 4376 },
-	{ HP_POP(skill->timerskill), HP_POP2(HP_skill_timerskill), 4378 },
-	{ HP_POP(skill->trap_splash), HP_POP2(HP_skill_trap_splash), 4380 },
-	{ HP_POP(skill->check_condition_mercenary), HP_POP2(HP_skill_check_condition_mercenary), 4382 },
-	{ HP_POP(skill->locate_element_field), HP_POP2(HP_skill_locate_element_field), 4384 },
-	{ HP_POP(skill->graffitiremover), HP_POP2(HP_skill_graffitiremover), 4386 },
-	{ HP_POP(skill->activate_reverberation), HP_POP2(HP_skill_activate_reverberation), 4388 },
-	{ HP_POP(skill->dance_overlap_sub), HP_POP2(HP_skill_dance_overlap_sub), 4390 },
-	{ HP_POP(skill->dance_overlap), HP_POP2(HP_skill_dance_overlap), 4392 },
-	{ HP_POP(skill->get_unit_layout), HP_POP2(HP_skill_get_unit_layout), 4394 },
-	{ HP_POP(skill->frostjoke_scream), HP_POP2(HP_skill_frostjoke_scream), 4396 },
-	{ HP_POP(skill->greed), HP_POP2(HP_skill_greed), 4398 },
-	{ HP_POP(skill->destroy_trap), HP_POP2(HP_skill_destroy_trap), 4400 },
-	{ HP_POP(skill->icewall_block), HP_POP2(HP_skill_icewall_block), 4402 },
-	{ HP_POP(skill->unitgrouptickset_search), HP_POP2(HP_skill_unitgrouptickset_search), 4404 },
-	{ HP_POP(skill->dance_switch), HP_POP2(HP_skill_dance_switch), 4406 },
-	{ HP_POP(skill->check_condition_char_sub), HP_POP2(HP_skill_check_condition_char_sub), 4408 },
-	{ HP_POP(skill->check_condition_mob_master_sub), HP_POP2(HP_skill_check_condition_mob_master_sub), 4410 },
-	{ HP_POP(skill->brandishspear_first), HP_POP2(HP_skill_brandishspear_first), 4412 },
-	{ HP_POP(skill->brandishspear_dir), HP_POP2(HP_skill_brandishspear_dir), 4414 },
-	{ HP_POP(skill->get_fixed_cast), HP_POP2(HP_skill_get_fixed_cast), 4416 },
-	{ HP_POP(skill->sit_count), HP_POP2(HP_skill_sit_count), 4418 },
-	{ HP_POP(skill->sit_in), HP_POP2(HP_skill_sit_in), 4420 },
-	{ HP_POP(skill->sit_out), HP_POP2(HP_skill_sit_out), 4422 },
-	{ HP_POP(skill->unitsetmapcell), HP_POP2(HP_skill_unitsetmapcell), 4424 },
-	{ HP_POP(skill->unit_onplace_timer), HP_POP2(HP_skill_unit_onplace_timer), 4426 },
-	{ HP_POP(skill->unit_effect), HP_POP2(HP_skill_unit_effect), 4428 },
-	{ HP_POP(skill->unit_timer_sub_onplace), HP_POP2(HP_skill_unit_timer_sub_onplace), 4430 },
-	{ HP_POP(skill->unit_move_sub), HP_POP2(HP_skill_unit_move_sub), 4432 },
-	{ HP_POP(skill->blockpc_end), HP_POP2(HP_skill_blockpc_end), 4434 },
-	{ HP_POP(skill->blockhomun_end), HP_POP2(HP_skill_blockhomun_end), 4436 },
-	{ HP_POP(skill->blockmerc_end), HP_POP2(HP_skill_blockmerc_end), 4438 },
-	{ HP_POP(skill->split_atoi), HP_POP2(HP_skill_split_atoi), 4440 },
-	{ HP_POP(skill->unit_timer), HP_POP2(HP_skill_unit_timer), 4442 },
-	{ HP_POP(skill->unit_timer_sub), HP_POP2(HP_skill_unit_timer_sub), 4444 },
-	{ HP_POP(skill->init_unit_layout), HP_POP2(HP_skill_init_unit_layout), 4446 },
-	{ HP_POP(skill->parse_row_skilldb), HP_POP2(HP_skill_parse_row_skilldb), 4448 },
-	{ HP_POP(skill->parse_row_requiredb), HP_POP2(HP_skill_parse_row_requiredb), 4450 },
-	{ HP_POP(skill->parse_row_castdb), HP_POP2(HP_skill_parse_row_castdb), 4452 },
-	{ HP_POP(skill->parse_row_castnodexdb), HP_POP2(HP_skill_parse_row_castnodexdb), 4454 },
-	{ HP_POP(skill->parse_row_unitdb), HP_POP2(HP_skill_parse_row_unitdb), 4456 },
-	{ HP_POP(skill->parse_row_producedb), HP_POP2(HP_skill_parse_row_producedb), 4458 },
-	{ HP_POP(skill->parse_row_createarrowdb), HP_POP2(HP_skill_parse_row_createarrowdb), 4460 },
-	{ HP_POP(skill->parse_row_abradb), HP_POP2(HP_skill_parse_row_abradb), 4462 },
-	{ HP_POP(skill->parse_row_spellbookdb), HP_POP2(HP_skill_parse_row_spellbookdb), 4464 },
-	{ HP_POP(skill->parse_row_magicmushroomdb), HP_POP2(HP_skill_parse_row_magicmushroomdb), 4466 },
-	{ HP_POP(skill->parse_row_reproducedb), HP_POP2(HP_skill_parse_row_reproducedb), 4468 },
-	{ HP_POP(skill->parse_row_improvisedb), HP_POP2(HP_skill_parse_row_improvisedb), 4470 },
-	{ HP_POP(skill->parse_row_changematerialdb), HP_POP2(HP_skill_parse_row_changematerialdb), 4472 },
-	{ HP_POP(skill->usave_add), HP_POP2(HP_skill_usave_add), 4474 },
-	{ HP_POP(skill->usave_trigger), HP_POP2(HP_skill_usave_trigger), 4476 },
-	{ HP_POP(skill->cooldown_load), HP_POP2(HP_skill_cooldown_load), 4478 },
-	{ HP_POP(skill->spellbook), HP_POP2(HP_skill_spellbook), 4480 },
-	{ HP_POP(skill->block_check), HP_POP2(HP_skill_block_check), 4482 },
-	{ HP_POP(skill->detonator), HP_POP2(HP_skill_detonator), 4484 },
-	{ HP_POP(skill->check_camouflage), HP_POP2(HP_skill_check_camouflage), 4486 },
-	{ HP_POP(skill->magicdecoy), HP_POP2(HP_skill_magicdecoy), 4488 },
-	{ HP_POP(skill->poisoningweapon), HP_POP2(HP_skill_poisoningweapon), 4490 },
-	{ HP_POP(skill->select_menu), HP_POP2(HP_skill_select_menu), 4492 },
-	{ HP_POP(skill->elementalanalysis), HP_POP2(HP_skill_elementalanalysis), 4494 },
-	{ HP_POP(skill->changematerial), HP_POP2(HP_skill_changematerial), 4496 },
-	{ HP_POP(skill->get_elemental_type), HP_POP2(HP_skill_get_elemental_type), 4498 },
-	{ HP_POP(skill->cooldown_save), HP_POP2(HP_skill_cooldown_save), 4500 },
-	{ HP_POP(skill->maelstrom_suction), HP_POP2(HP_skill_maelstrom_suction), 4502 },
-	{ HP_POP(skill->get_new_group_id), HP_POP2(HP_skill_get_new_group_id), 4504 },
+	{ HP_POP(skill->init, HP_skill_init) },
+	{ HP_POP(skill->final, HP_skill_final) },
+	{ HP_POP(skill->reload, HP_skill_reload) },
+	{ HP_POP(skill->read_db, HP_skill_read_db) },
+	{ HP_POP(skill->get_index, HP_skill_get_index) },
+	{ HP_POP(skill->get_type, HP_skill_get_type) },
+	{ HP_POP(skill->get_hit, HP_skill_get_hit) },
+	{ HP_POP(skill->get_inf, HP_skill_get_inf) },
+	{ HP_POP(skill->get_ele, HP_skill_get_ele) },
+	{ HP_POP(skill->get_nk, HP_skill_get_nk) },
+	{ HP_POP(skill->get_max, HP_skill_get_max) },
+	{ HP_POP(skill->get_range, HP_skill_get_range) },
+	{ HP_POP(skill->get_range2, HP_skill_get_range2) },
+	{ HP_POP(skill->get_splash, HP_skill_get_splash) },
+	{ HP_POP(skill->get_hp, HP_skill_get_hp) },
+	{ HP_POP(skill->get_mhp, HP_skill_get_mhp) },
+	{ HP_POP(skill->get_sp, HP_skill_get_sp) },
+	{ HP_POP(skill->get_state, HP_skill_get_state) },
+	{ HP_POP(skill->get_spiritball, HP_skill_get_spiritball) },
+	{ HP_POP(skill->get_zeny, HP_skill_get_zeny) },
+	{ HP_POP(skill->get_num, HP_skill_get_num) },
+	{ HP_POP(skill->get_cast, HP_skill_get_cast) },
+	{ HP_POP(skill->get_delay, HP_skill_get_delay) },
+	{ HP_POP(skill->get_walkdelay, HP_skill_get_walkdelay) },
+	{ HP_POP(skill->get_time, HP_skill_get_time) },
+	{ HP_POP(skill->get_time2, HP_skill_get_time2) },
+	{ HP_POP(skill->get_castnodex, HP_skill_get_castnodex) },
+	{ HP_POP(skill->get_delaynodex, HP_skill_get_delaynodex) },
+	{ HP_POP(skill->get_castdef, HP_skill_get_castdef) },
+	{ HP_POP(skill->get_weapontype, HP_skill_get_weapontype) },
+	{ HP_POP(skill->get_ammotype, HP_skill_get_ammotype) },
+	{ HP_POP(skill->get_ammo_qty, HP_skill_get_ammo_qty) },
+	{ HP_POP(skill->get_unit_id, HP_skill_get_unit_id) },
+	{ HP_POP(skill->get_inf2, HP_skill_get_inf2) },
+	{ HP_POP(skill->get_castcancel, HP_skill_get_castcancel) },
+	{ HP_POP(skill->get_maxcount, HP_skill_get_maxcount) },
+	{ HP_POP(skill->get_blewcount, HP_skill_get_blewcount) },
+	{ HP_POP(skill->get_unit_flag, HP_skill_get_unit_flag) },
+	{ HP_POP(skill->get_unit_target, HP_skill_get_unit_target) },
+	{ HP_POP(skill->get_unit_interval, HP_skill_get_unit_interval) },
+	{ HP_POP(skill->get_unit_bl_target, HP_skill_get_unit_bl_target) },
+	{ HP_POP(skill->get_unit_layout_type, HP_skill_get_unit_layout_type) },
+	{ HP_POP(skill->get_unit_range, HP_skill_get_unit_range) },
+	{ HP_POP(skill->get_cooldown, HP_skill_get_cooldown) },
+	{ HP_POP(skill->tree_get_max, HP_skill_tree_get_max) },
+	{ HP_POP(skill->get_name, HP_skill_get_name) },
+	{ HP_POP(skill->get_desc, HP_skill_get_desc) },
+	{ HP_POP(skill->chk, HP_skill_chk) },
+	{ HP_POP(skill->get_casttype, HP_skill_get_casttype) },
+	{ HP_POP(skill->get_casttype2, HP_skill_get_casttype2) },
+	{ HP_POP(skill->name2id, HP_skill_name2id) },
+	{ HP_POP(skill->isammotype, HP_skill_isammotype) },
+	{ HP_POP(skill->castend_id, HP_skill_castend_id) },
+	{ HP_POP(skill->castend_pos, HP_skill_castend_pos) },
+	{ HP_POP(skill->castend_map, HP_skill_castend_map) },
+	{ HP_POP(skill->cleartimerskill, HP_skill_cleartimerskill) },
+	{ HP_POP(skill->addtimerskill, HP_skill_addtimerskill) },
+	{ HP_POP(skill->additional_effect, HP_skill_additional_effect) },
+	{ HP_POP(skill->counter_additional_effect, HP_skill_counter_additional_effect) },
+	{ HP_POP(skill->blown, HP_skill_blown) },
+	{ HP_POP(skill->break_equip, HP_skill_break_equip) },
+	{ HP_POP(skill->strip_equip, HP_skill_strip_equip) },
+	{ HP_POP(skill->id2group, HP_skill_id2group) },
+	{ HP_POP(skill->unitsetting, HP_skill_unitsetting) },
+	{ HP_POP(skill->initunit, HP_skill_initunit) },
+	{ HP_POP(skill->delunit, HP_skill_delunit) },
+	{ HP_POP(skill->init_unitgroup, HP_skill_init_unitgroup) },
+	{ HP_POP(skill->del_unitgroup, HP_skill_del_unitgroup) },
+	{ HP_POP(skill->clear_unitgroup, HP_skill_clear_unitgroup) },
+	{ HP_POP(skill->clear_group, HP_skill_clear_group) },
+	{ HP_POP(skill->unit_onplace, HP_skill_unit_onplace) },
+	{ HP_POP(skill->unit_ondamaged, HP_skill_unit_ondamaged) },
+	{ HP_POP(skill->cast_fix, HP_skill_cast_fix) },
+	{ HP_POP(skill->cast_fix_sc, HP_skill_cast_fix_sc) },
+	{ HP_POP(skill->vf_cast_fix, HP_skill_vf_cast_fix) },
+	{ HP_POP(skill->delay_fix, HP_skill_delay_fix) },
+	{ HP_POP(skill->check_condition_castbegin, HP_skill_check_condition_castbegin) },
+	{ HP_POP(skill->check_condition_castend, HP_skill_check_condition_castend) },
+	{ HP_POP(skill->consume_requirement, HP_skill_consume_requirement) },
+	{ HP_POP(skill->get_requirement, HP_skill_get_requirement) },
+	{ HP_POP(skill->check_pc_partner, HP_skill_check_pc_partner) },
+	{ HP_POP(skill->unit_move, HP_skill_unit_move) },
+	{ HP_POP(skill->unit_onleft, HP_skill_unit_onleft) },
+	{ HP_POP(skill->unit_onout, HP_skill_unit_onout) },
+	{ HP_POP(skill->unit_move_unit_group, HP_skill_unit_move_unit_group) },
+	{ HP_POP(skill->sit, HP_skill_sit) },
+	{ HP_POP(skill->brandishspear, HP_skill_brandishspear) },
+	{ HP_POP(skill->repairweapon, HP_skill_repairweapon) },
+	{ HP_POP(skill->identify, HP_skill_identify) },
+	{ HP_POP(skill->weaponrefine, HP_skill_weaponrefine) },
+	{ HP_POP(skill->autospell, HP_skill_autospell) },
+	{ HP_POP(skill->calc_heal, HP_skill_calc_heal) },
+	{ HP_POP(skill->check_cloaking, HP_skill_check_cloaking) },
+	{ HP_POP(skill->enchant_elemental_end, HP_skill_enchant_elemental_end) },
+	{ HP_POP(skill->not_ok, HP_skill_not_ok) },
+	{ HP_POP(skill->not_ok_hom, HP_skill_not_ok_hom) },
+	{ HP_POP(skill->not_ok_mercenary, HP_skill_not_ok_mercenary) },
+	{ HP_POP(skill->chastle_mob_changetarget, HP_skill_chastle_mob_changetarget) },
+	{ HP_POP(skill->can_produce_mix, HP_skill_can_produce_mix) },
+	{ HP_POP(skill->produce_mix, HP_skill_produce_mix) },
+	{ HP_POP(skill->arrow_create, HP_skill_arrow_create) },
+	{ HP_POP(skill->castend_nodamage_id, HP_skill_castend_nodamage_id) },
+	{ HP_POP(skill->castend_damage_id, HP_skill_castend_damage_id) },
+	{ HP_POP(skill->castend_pos2, HP_skill_castend_pos2) },
+	{ HP_POP(skill->blockpc_start, HP_skill_blockpc_start) },
+	{ HP_POP(skill->blockhomun_start, HP_skill_blockhomun_start) },
+	{ HP_POP(skill->blockmerc_start, HP_skill_blockmerc_start) },
+	{ HP_POP(skill->attack, HP_skill_attack) },
+	{ HP_POP(skill->attack_area, HP_skill_attack_area) },
+	{ HP_POP(skill->area_sub, HP_skill_area_sub) },
+	{ HP_POP(skill->area_sub_count, HP_skill_area_sub_count) },
+	{ HP_POP(skill->check_unit_range, HP_skill_check_unit_range) },
+	{ HP_POP(skill->check_unit_range_sub, HP_skill_check_unit_range_sub) },
+	{ HP_POP(skill->check_unit_range2, HP_skill_check_unit_range2) },
+	{ HP_POP(skill->check_unit_range2_sub, HP_skill_check_unit_range2_sub) },
+	{ HP_POP(skill->toggle_magicpower, HP_skill_toggle_magicpower) },
+	{ HP_POP(skill->magic_reflect, HP_skill_magic_reflect) },
+	{ HP_POP(skill->onskillusage, HP_skill_onskillusage) },
+	{ HP_POP(skill->cell_overlap, HP_skill_cell_overlap) },
+	{ HP_POP(skill->timerskill, HP_skill_timerskill) },
+	{ HP_POP(skill->trap_splash, HP_skill_trap_splash) },
+	{ HP_POP(skill->check_condition_mercenary, HP_skill_check_condition_mercenary) },
+	{ HP_POP(skill->locate_element_field, HP_skill_locate_element_field) },
+	{ HP_POP(skill->graffitiremover, HP_skill_graffitiremover) },
+	{ HP_POP(skill->activate_reverberation, HP_skill_activate_reverberation) },
+	{ HP_POP(skill->dance_overlap_sub, HP_skill_dance_overlap_sub) },
+	{ HP_POP(skill->dance_overlap, HP_skill_dance_overlap) },
+	{ HP_POP(skill->get_unit_layout, HP_skill_get_unit_layout) },
+	{ HP_POP(skill->frostjoke_scream, HP_skill_frostjoke_scream) },
+	{ HP_POP(skill->greed, HP_skill_greed) },
+	{ HP_POP(skill->destroy_trap, HP_skill_destroy_trap) },
+	{ HP_POP(skill->icewall_block, HP_skill_icewall_block) },
+	{ HP_POP(skill->unitgrouptickset_search, HP_skill_unitgrouptickset_search) },
+	{ HP_POP(skill->dance_switch, HP_skill_dance_switch) },
+	{ HP_POP(skill->check_condition_char_sub, HP_skill_check_condition_char_sub) },
+	{ HP_POP(skill->check_condition_mob_master_sub, HP_skill_check_condition_mob_master_sub) },
+	{ HP_POP(skill->brandishspear_first, HP_skill_brandishspear_first) },
+	{ HP_POP(skill->brandishspear_dir, HP_skill_brandishspear_dir) },
+	{ HP_POP(skill->get_fixed_cast, HP_skill_get_fixed_cast) },
+	{ HP_POP(skill->sit_count, HP_skill_sit_count) },
+	{ HP_POP(skill->sit_in, HP_skill_sit_in) },
+	{ HP_POP(skill->sit_out, HP_skill_sit_out) },
+	{ HP_POP(skill->unitsetmapcell, HP_skill_unitsetmapcell) },
+	{ HP_POP(skill->unit_onplace_timer, HP_skill_unit_onplace_timer) },
+	{ HP_POP(skill->unit_effect, HP_skill_unit_effect) },
+	{ HP_POP(skill->unit_timer_sub_onplace, HP_skill_unit_timer_sub_onplace) },
+	{ HP_POP(skill->unit_move_sub, HP_skill_unit_move_sub) },
+	{ HP_POP(skill->blockpc_end, HP_skill_blockpc_end) },
+	{ HP_POP(skill->blockhomun_end, HP_skill_blockhomun_end) },
+	{ HP_POP(skill->blockmerc_end, HP_skill_blockmerc_end) },
+	{ HP_POP(skill->split_atoi, HP_skill_split_atoi) },
+	{ HP_POP(skill->unit_timer, HP_skill_unit_timer) },
+	{ HP_POP(skill->unit_timer_sub, HP_skill_unit_timer_sub) },
+	{ HP_POP(skill->init_unit_layout, HP_skill_init_unit_layout) },
+	{ HP_POP(skill->parse_row_skilldb, HP_skill_parse_row_skilldb) },
+	{ HP_POP(skill->parse_row_requiredb, HP_skill_parse_row_requiredb) },
+	{ HP_POP(skill->parse_row_castdb, HP_skill_parse_row_castdb) },
+	{ HP_POP(skill->parse_row_castnodexdb, HP_skill_parse_row_castnodexdb) },
+	{ HP_POP(skill->parse_row_unitdb, HP_skill_parse_row_unitdb) },
+	{ HP_POP(skill->parse_row_producedb, HP_skill_parse_row_producedb) },
+	{ HP_POP(skill->parse_row_createarrowdb, HP_skill_parse_row_createarrowdb) },
+	{ HP_POP(skill->parse_row_abradb, HP_skill_parse_row_abradb) },
+	{ HP_POP(skill->parse_row_spellbookdb, HP_skill_parse_row_spellbookdb) },
+	{ HP_POP(skill->parse_row_magicmushroomdb, HP_skill_parse_row_magicmushroomdb) },
+	{ HP_POP(skill->parse_row_reproducedb, HP_skill_parse_row_reproducedb) },
+	{ HP_POP(skill->parse_row_improvisedb, HP_skill_parse_row_improvisedb) },
+	{ HP_POP(skill->parse_row_changematerialdb, HP_skill_parse_row_changematerialdb) },
+	{ HP_POP(skill->usave_add, HP_skill_usave_add) },
+	{ HP_POP(skill->usave_trigger, HP_skill_usave_trigger) },
+	{ HP_POP(skill->cooldown_load, HP_skill_cooldown_load) },
+	{ HP_POP(skill->spellbook, HP_skill_spellbook) },
+	{ HP_POP(skill->block_check, HP_skill_block_check) },
+	{ HP_POP(skill->detonator, HP_skill_detonator) },
+	{ HP_POP(skill->check_camouflage, HP_skill_check_camouflage) },
+	{ HP_POP(skill->magicdecoy, HP_skill_magicdecoy) },
+	{ HP_POP(skill->poisoningweapon, HP_skill_poisoningweapon) },
+	{ HP_POP(skill->select_menu, HP_skill_select_menu) },
+	{ HP_POP(skill->elementalanalysis, HP_skill_elementalanalysis) },
+	{ HP_POP(skill->changematerial, HP_skill_changematerial) },
+	{ HP_POP(skill->get_elemental_type, HP_skill_get_elemental_type) },
+	{ HP_POP(skill->cooldown_save, HP_skill_cooldown_save) },
+	{ HP_POP(skill->maelstrom_suction, HP_skill_maelstrom_suction) },
+	{ HP_POP(skill->get_new_group_id, HP_skill_get_new_group_id) },
+	{ HP_POP(skill->check_shadowform, HP_skill_check_shadowform) },
 /* status */
-	{ HP_POP(status->init), HP_POP2(HP_status_init), 4506 },
-	{ HP_POP(status->final), HP_POP2(HP_status_final), 4508 },
-	{ HP_POP(status->get_refine_chance), HP_POP2(HP_status_get_refine_chance), 4510 },
-	{ HP_POP(status->skill2sc), HP_POP2(HP_status_skill2sc), 4512 },
-	{ HP_POP(status->sc2skill), HP_POP2(HP_status_sc2skill), 4514 },
-	{ HP_POP(status->sc2scb_flag), HP_POP2(HP_status_sc2scb_flag), 4516 },
-	{ HP_POP(status->type2relevant_bl_types), HP_POP2(HP_status_type2relevant_bl_types), 4518 },
-	{ HP_POP(status->get_sc_type), HP_POP2(HP_status_get_sc_type), 4520 },
-	{ HP_POP(status->damage), HP_POP2(HP_status_damage), 4522 },
-	{ HP_POP(status->charge), HP_POP2(HP_status_charge), 4524 },
-	{ HP_POP(status->percent_change), HP_POP2(HP_status_percent_change), 4526 },
-	{ HP_POP(status->set_hp), HP_POP2(HP_status_set_hp), 4528 },
-	{ HP_POP(status->set_sp), HP_POP2(HP_status_set_sp), 4530 },
-	{ HP_POP(status->heal), HP_POP2(HP_status_heal), 4532 },
-	{ HP_POP(status->revive), HP_POP2(HP_status_revive), 4534 },
-	{ HP_POP(status->get_regen_data), HP_POP2(HP_status_get_regen_data), 4536 },
-	{ HP_POP(status->get_status_data), HP_POP2(HP_status_get_status_data), 4538 },
-	{ HP_POP(status->get_base_status), HP_POP2(HP_status_get_base_status), 4540 },
-	{ HP_POP(status->get_name), HP_POP2(HP_status_get_name), 4542 },
-	{ HP_POP(status->get_class), HP_POP2(HP_status_get_class), 4544 },
-	{ HP_POP(status->get_lv), HP_POP2(HP_status_get_lv), 4546 },
-	{ HP_POP(status->get_def), HP_POP2(HP_status_get_def), 4548 },
-	{ HP_POP(status->get_speed), HP_POP2(HP_status_get_speed), 4550 },
-	{ HP_POP(status->calc_attack_element), HP_POP2(HP_status_calc_attack_element), 4552 },
-	{ HP_POP(status->get_party_id), HP_POP2(HP_status_get_party_id), 4554 },
-	{ HP_POP(status->get_guild_id), HP_POP2(HP_status_get_guild_id), 4556 },
-	{ HP_POP(status->get_emblem_id), HP_POP2(HP_status_get_emblem_id), 4558 },
-	{ HP_POP(status->get_mexp), HP_POP2(HP_status_get_mexp), 4560 },
-	{ HP_POP(status->get_race2), HP_POP2(HP_status_get_race2), 4562 },
-	{ HP_POP(status->get_viewdata), HP_POP2(HP_status_get_viewdata), 4564 },
-	{ HP_POP(status->set_viewdata), HP_POP2(HP_status_set_viewdata), 4566 },
-	{ HP_POP(status->change_init), HP_POP2(HP_status_change_init), 4568 },
-	{ HP_POP(status->get_sc), HP_POP2(HP_status_get_sc), 4570 },
-	{ HP_POP(status->isdead), HP_POP2(HP_status_isdead), 4572 },
-	{ HP_POP(status->isimmune), HP_POP2(HP_status_isimmune), 4574 },
-	{ HP_POP(status->get_sc_def), HP_POP2(HP_status_get_sc_def), 4576 },
-	{ HP_POP(status->change_start), HP_POP2(HP_status_change_start), 4578 },
-	{ HP_POP(status->change_end_), HP_POP2(HP_status_change_end_), 4580 },
-	{ HP_POP(status->kaahi_heal_timer), HP_POP2(HP_status_kaahi_heal_timer), 4582 },
-	{ HP_POP(status->change_timer), HP_POP2(HP_status_change_timer), 4584 },
-	{ HP_POP(status->change_timer_sub), HP_POP2(HP_status_change_timer_sub), 4586 },
-	{ HP_POP(status->change_clear), HP_POP2(HP_status_change_clear), 4588 },
-	{ HP_POP(status->change_clear_buffs), HP_POP2(HP_status_change_clear_buffs), 4590 },
-	{ HP_POP(status->calc_bl_), HP_POP2(HP_status_calc_bl_), 4592 },
-	{ HP_POP(status->calc_mob_), HP_POP2(HP_status_calc_mob_), 4594 },
-	{ HP_POP(status->calc_pet_), HP_POP2(HP_status_calc_pet_), 4596 },
-	{ HP_POP(status->calc_pc_), HP_POP2(HP_status_calc_pc_), 4598 },
-	{ HP_POP(status->calc_homunculus_), HP_POP2(HP_status_calc_homunculus_), 4600 },
-	{ HP_POP(status->calc_mercenary_), HP_POP2(HP_status_calc_mercenary_), 4602 },
-	{ HP_POP(status->calc_elemental_), HP_POP2(HP_status_calc_elemental_), 4604 },
-	{ HP_POP(status->calc_misc), HP_POP2(HP_status_calc_misc), 4606 },
-	{ HP_POP(status->calc_regen), HP_POP2(HP_status_calc_regen), 4608 },
-	{ HP_POP(status->calc_regen_rate), HP_POP2(HP_status_calc_regen_rate), 4610 },
-	{ HP_POP(status->check_skilluse), HP_POP2(HP_status_check_skilluse), 4612 },
-	{ HP_POP(status->check_visibility), HP_POP2(HP_status_check_visibility), 4614 },
-	{ HP_POP(status->change_spread), HP_POP2(HP_status_change_spread), 4616 },
-	{ HP_POP(status->calc_def), HP_POP2(HP_status_calc_def), 4618 },
-	{ HP_POP(status->calc_def2), HP_POP2(HP_status_calc_def2), 4620 },
-	{ HP_POP(status->calc_mdef), HP_POP2(HP_status_calc_mdef), 4622 },
-	{ HP_POP(status->calc_mdef2), HP_POP2(HP_status_calc_mdef2), 4624 },
-	{ HP_POP(status->calc_batk), HP_POP2(HP_status_calc_batk), 4626 },
-	{ HP_POP(status->base_matk), HP_POP2(HP_status_base_matk), 4628 },
-	{ HP_POP(status->get_weapon_atk), HP_POP2(HP_status_get_weapon_atk), 4630 },
-	{ HP_POP(status->get_total_mdef), HP_POP2(HP_status_get_total_mdef), 4632 },
-	{ HP_POP(status->get_total_def), HP_POP2(HP_status_get_total_def), 4634 },
-	{ HP_POP(status->get_matk), HP_POP2(HP_status_get_matk), 4636 },
-	{ HP_POP(status->readdb), HP_POP2(HP_status_readdb), 4638 },
-	{ HP_POP(status->initChangeTables), HP_POP2(HP_status_initChangeTables), 4640 },
-	{ HP_POP(status->initDummyData), HP_POP2(HP_status_initDummyData), 4642 },
-	{ HP_POP(status->base_amotion_pc), HP_POP2(HP_status_base_amotion_pc), 4644 },
-	{ HP_POP(status->base_atk), HP_POP2(HP_status_base_atk), 4646 },
-	{ HP_POP(status->calc_sigma), HP_POP2(HP_status_calc_sigma), 4648 },
-	{ HP_POP(status->base_pc_maxhp), HP_POP2(HP_status_base_pc_maxhp), 4650 },
-	{ HP_POP(status->base_pc_maxsp), HP_POP2(HP_status_base_pc_maxsp), 4652 },
-	{ HP_POP(status->calc_npc_), HP_POP2(HP_status_calc_npc_), 4654 },
-	{ HP_POP(status->calc_str), HP_POP2(HP_status_calc_str), 4656 },
-	{ HP_POP(status->calc_agi), HP_POP2(HP_status_calc_agi), 4658 },
-	{ HP_POP(status->calc_vit), HP_POP2(HP_status_calc_vit), 4660 },
-	{ HP_POP(status->calc_int), HP_POP2(HP_status_calc_int), 4662 },
-	{ HP_POP(status->calc_dex), HP_POP2(HP_status_calc_dex), 4664 },
-	{ HP_POP(status->calc_luk), HP_POP2(HP_status_calc_luk), 4666 },
-	{ HP_POP(status->calc_watk), HP_POP2(HP_status_calc_watk), 4668 },
-	{ HP_POP(status->calc_matk), HP_POP2(HP_status_calc_matk), 4670 },
-	{ HP_POP(status->calc_hit), HP_POP2(HP_status_calc_hit), 4672 },
-	{ HP_POP(status->calc_critical), HP_POP2(HP_status_calc_critical), 4674 },
-	{ HP_POP(status->calc_flee), HP_POP2(HP_status_calc_flee), 4676 },
-	{ HP_POP(status->calc_flee2), HP_POP2(HP_status_calc_flee2), 4678 },
-	{ HP_POP(status->calc_speed), HP_POP2(HP_status_calc_speed), 4680 },
-	{ HP_POP(status->calc_aspd_rate), HP_POP2(HP_status_calc_aspd_rate), 4682 },
-	{ HP_POP(status->calc_dmotion), HP_POP2(HP_status_calc_dmotion), 4684 },
-	{ HP_POP(status->calc_aspd), HP_POP2(HP_status_calc_aspd), 4686 },
-	{ HP_POP(status->calc_fix_aspd), HP_POP2(HP_status_calc_fix_aspd), 4688 },
-	{ HP_POP(status->calc_maxhp), HP_POP2(HP_status_calc_maxhp), 4690 },
-	{ HP_POP(status->calc_maxsp), HP_POP2(HP_status_calc_maxsp), 4692 },
-	{ HP_POP(status->calc_element), HP_POP2(HP_status_calc_element), 4694 },
-	{ HP_POP(status->calc_element_lv), HP_POP2(HP_status_calc_element_lv), 4696 },
-	{ HP_POP(status->calc_mode), HP_POP2(HP_status_calc_mode), 4698 },
-	{ HP_POP(status->calc_ematk), HP_POP2(HP_status_calc_ematk), 4700 },
-	{ HP_POP(status->calc_bl_main), HP_POP2(HP_status_calc_bl_main), 4702 },
-	{ HP_POP(status->display_add), HP_POP2(HP_status_display_add), 4704 },
-	{ HP_POP(status->display_remove), HP_POP2(HP_status_display_remove), 4706 },
-	{ HP_POP(status->natural_heal), HP_POP2(HP_status_natural_heal), 4708 },
-	{ HP_POP(status->natural_heal_timer), HP_POP2(HP_status_natural_heal_timer), 4710 },
-	{ HP_POP(status->readdb_job1), HP_POP2(HP_status_readdb_job1), 4712 },
-	{ HP_POP(status->readdb_job2), HP_POP2(HP_status_readdb_job2), 4714 },
-	{ HP_POP(status->readdb_sizefix), HP_POP2(HP_status_readdb_sizefix), 4716 },
-	{ HP_POP(status->readdb_refine), HP_POP2(HP_status_readdb_refine), 4718 },
-	{ HP_POP(status->readdb_scconfig), HP_POP2(HP_status_readdb_scconfig), 4720 },
+	{ HP_POP(status->init, HP_status_init) },
+	{ HP_POP(status->final, HP_status_final) },
+	{ HP_POP(status->get_refine_chance, HP_status_get_refine_chance) },
+	{ HP_POP(status->skill2sc, HP_status_skill2sc) },
+	{ HP_POP(status->sc2skill, HP_status_sc2skill) },
+	{ HP_POP(status->sc2scb_flag, HP_status_sc2scb_flag) },
+	{ HP_POP(status->type2relevant_bl_types, HP_status_type2relevant_bl_types) },
+	{ HP_POP(status->get_sc_type, HP_status_get_sc_type) },
+	{ HP_POP(status->damage, HP_status_damage) },
+	{ HP_POP(status->charge, HP_status_charge) },
+	{ HP_POP(status->percent_change, HP_status_percent_change) },
+	{ HP_POP(status->set_hp, HP_status_set_hp) },
+	{ HP_POP(status->set_sp, HP_status_set_sp) },
+	{ HP_POP(status->heal, HP_status_heal) },
+	{ HP_POP(status->revive, HP_status_revive) },
+	{ HP_POP(status->get_regen_data, HP_status_get_regen_data) },
+	{ HP_POP(status->get_status_data, HP_status_get_status_data) },
+	{ HP_POP(status->get_base_status, HP_status_get_base_status) },
+	{ HP_POP(status->get_name, HP_status_get_name) },
+	{ HP_POP(status->get_class, HP_status_get_class) },
+	{ HP_POP(status->get_lv, HP_status_get_lv) },
+	{ HP_POP(status->get_def, HP_status_get_def) },
+	{ HP_POP(status->get_speed, HP_status_get_speed) },
+	{ HP_POP(status->calc_attack_element, HP_status_calc_attack_element) },
+	{ HP_POP(status->get_party_id, HP_status_get_party_id) },
+	{ HP_POP(status->get_guild_id, HP_status_get_guild_id) },
+	{ HP_POP(status->get_emblem_id, HP_status_get_emblem_id) },
+	{ HP_POP(status->get_mexp, HP_status_get_mexp) },
+	{ HP_POP(status->get_race2, HP_status_get_race2) },
+	{ HP_POP(status->get_viewdata, HP_status_get_viewdata) },
+	{ HP_POP(status->set_viewdata, HP_status_set_viewdata) },
+	{ HP_POP(status->change_init, HP_status_change_init) },
+	{ HP_POP(status->get_sc, HP_status_get_sc) },
+	{ HP_POP(status->isdead, HP_status_isdead) },
+	{ HP_POP(status->isimmune, HP_status_isimmune) },
+	{ HP_POP(status->get_sc_def, HP_status_get_sc_def) },
+	{ HP_POP(status->change_start, HP_status_change_start) },
+	{ HP_POP(status->change_end_, HP_status_change_end_) },
+	{ HP_POP(status->kaahi_heal_timer, HP_status_kaahi_heal_timer) },
+	{ HP_POP(status->change_timer, HP_status_change_timer) },
+	{ HP_POP(status->change_timer_sub, HP_status_change_timer_sub) },
+	{ HP_POP(status->change_clear, HP_status_change_clear) },
+	{ HP_POP(status->change_clear_buffs, HP_status_change_clear_buffs) },
+	{ HP_POP(status->calc_bl_, HP_status_calc_bl_) },
+	{ HP_POP(status->calc_mob_, HP_status_calc_mob_) },
+	{ HP_POP(status->calc_pet_, HP_status_calc_pet_) },
+	{ HP_POP(status->calc_pc_, HP_status_calc_pc_) },
+	{ HP_POP(status->calc_homunculus_, HP_status_calc_homunculus_) },
+	{ HP_POP(status->calc_mercenary_, HP_status_calc_mercenary_) },
+	{ HP_POP(status->calc_elemental_, HP_status_calc_elemental_) },
+	{ HP_POP(status->calc_misc, HP_status_calc_misc) },
+	{ HP_POP(status->calc_regen, HP_status_calc_regen) },
+	{ HP_POP(status->calc_regen_rate, HP_status_calc_regen_rate) },
+	{ HP_POP(status->check_skilluse, HP_status_check_skilluse) },
+	{ HP_POP(status->check_visibility, HP_status_check_visibility) },
+	{ HP_POP(status->change_spread, HP_status_change_spread) },
+	{ HP_POP(status->calc_def, HP_status_calc_def) },
+	{ HP_POP(status->calc_def2, HP_status_calc_def2) },
+	{ HP_POP(status->calc_mdef, HP_status_calc_mdef) },
+	{ HP_POP(status->calc_mdef2, HP_status_calc_mdef2) },
+	{ HP_POP(status->calc_batk, HP_status_calc_batk) },
+	{ HP_POP(status->base_matk, HP_status_base_matk) },
+	{ HP_POP(status->get_weapon_atk, HP_status_get_weapon_atk) },
+	{ HP_POP(status->get_total_mdef, HP_status_get_total_mdef) },
+	{ HP_POP(status->get_total_def, HP_status_get_total_def) },
+	{ HP_POP(status->get_matk, HP_status_get_matk) },
+	{ HP_POP(status->readdb, HP_status_readdb) },
+	{ HP_POP(status->initChangeTables, HP_status_initChangeTables) },
+	{ HP_POP(status->initDummyData, HP_status_initDummyData) },
+	{ HP_POP(status->base_amotion_pc, HP_status_base_amotion_pc) },
+	{ HP_POP(status->base_atk, HP_status_base_atk) },
+	{ HP_POP(status->calc_sigma, HP_status_calc_sigma) },
+	{ HP_POP(status->base_pc_maxhp, HP_status_base_pc_maxhp) },
+	{ HP_POP(status->base_pc_maxsp, HP_status_base_pc_maxsp) },
+	{ HP_POP(status->calc_npc_, HP_status_calc_npc_) },
+	{ HP_POP(status->calc_str, HP_status_calc_str) },
+	{ HP_POP(status->calc_agi, HP_status_calc_agi) },
+	{ HP_POP(status->calc_vit, HP_status_calc_vit) },
+	{ HP_POP(status->calc_int, HP_status_calc_int) },
+	{ HP_POP(status->calc_dex, HP_status_calc_dex) },
+	{ HP_POP(status->calc_luk, HP_status_calc_luk) },
+	{ HP_POP(status->calc_watk, HP_status_calc_watk) },
+	{ HP_POP(status->calc_matk, HP_status_calc_matk) },
+	{ HP_POP(status->calc_hit, HP_status_calc_hit) },
+	{ HP_POP(status->calc_critical, HP_status_calc_critical) },
+	{ HP_POP(status->calc_flee, HP_status_calc_flee) },
+	{ HP_POP(status->calc_flee2, HP_status_calc_flee2) },
+	{ HP_POP(status->calc_speed, HP_status_calc_speed) },
+	{ HP_POP(status->calc_aspd_rate, HP_status_calc_aspd_rate) },
+	{ HP_POP(status->calc_dmotion, HP_status_calc_dmotion) },
+	{ HP_POP(status->calc_aspd, HP_status_calc_aspd) },
+	{ HP_POP(status->calc_fix_aspd, HP_status_calc_fix_aspd) },
+	{ HP_POP(status->calc_maxhp, HP_status_calc_maxhp) },
+	{ HP_POP(status->calc_maxsp, HP_status_calc_maxsp) },
+	{ HP_POP(status->calc_element, HP_status_calc_element) },
+	{ HP_POP(status->calc_element_lv, HP_status_calc_element_lv) },
+	{ HP_POP(status->calc_mode, HP_status_calc_mode) },
+	{ HP_POP(status->calc_ematk, HP_status_calc_ematk) },
+	{ HP_POP(status->calc_bl_main, HP_status_calc_bl_main) },
+	{ HP_POP(status->display_add, HP_status_display_add) },
+	{ HP_POP(status->display_remove, HP_status_display_remove) },
+	{ HP_POP(status->natural_heal, HP_status_natural_heal) },
+	{ HP_POP(status->natural_heal_timer, HP_status_natural_heal_timer) },
+	{ HP_POP(status->readdb_job1, HP_status_readdb_job1) },
+	{ HP_POP(status->readdb_job2, HP_status_readdb_job2) },
+	{ HP_POP(status->readdb_sizefix, HP_status_readdb_sizefix) },
+	{ HP_POP(status->readdb_refine, HP_status_readdb_refine) },
+	{ HP_POP(status->readdb_scconfig, HP_status_readdb_scconfig) },
 /* storage */
-	{ HP_POP(storage->reconnect), HP_POP2(HP_storage_reconnect), 4722 },
-	{ HP_POP(storage->delitem), HP_POP2(HP_storage_delitem), 4724 },
-	{ HP_POP(storage->open), HP_POP2(HP_storage_open), 4726 },
-	{ HP_POP(storage->add), HP_POP2(HP_storage_add), 4728 },
-	{ HP_POP(storage->get), HP_POP2(HP_storage_get), 4730 },
-	{ HP_POP(storage->additem), HP_POP2(HP_storage_additem), 4732 },
-	{ HP_POP(storage->addfromcart), HP_POP2(HP_storage_addfromcart), 4734 },
-	{ HP_POP(storage->gettocart), HP_POP2(HP_storage_gettocart), 4736 },
-	{ HP_POP(storage->close), HP_POP2(HP_storage_close), 4738 },
-	{ HP_POP(storage->pc_quit), HP_POP2(HP_storage_pc_quit), 4740 },
-	{ HP_POP(storage->comp_item), HP_POP2(HP_storage_comp_item), 4742 },
-	{ HP_POP(storage->sortitem), HP_POP2(HP_storage_sortitem), 4744 },
-	{ HP_POP(storage->reconnect_sub), HP_POP2(HP_storage_reconnect_sub), 4746 },
+	{ HP_POP(storage->reconnect, HP_storage_reconnect) },
+	{ HP_POP(storage->delitem, HP_storage_delitem) },
+	{ HP_POP(storage->open, HP_storage_open) },
+	{ HP_POP(storage->add, HP_storage_add) },
+	{ HP_POP(storage->get, HP_storage_get) },
+	{ HP_POP(storage->additem, HP_storage_additem) },
+	{ HP_POP(storage->addfromcart, HP_storage_addfromcart) },
+	{ HP_POP(storage->gettocart, HP_storage_gettocart) },
+	{ HP_POP(storage->close, HP_storage_close) },
+	{ HP_POP(storage->pc_quit, HP_storage_pc_quit) },
+	{ HP_POP(storage->comp_item, HP_storage_comp_item) },
+	{ HP_POP(storage->sortitem, HP_storage_sortitem) },
+	{ HP_POP(storage->reconnect_sub, HP_storage_reconnect_sub) },
 /* trade */
-	{ HP_POP(trade->request), HP_POP2(HP_trade_request), 4748 },
-	{ HP_POP(trade->ack), HP_POP2(HP_trade_ack), 4750 },
-	{ HP_POP(trade->check_impossible), HP_POP2(HP_trade_check_impossible), 4752 },
-	{ HP_POP(trade->check), HP_POP2(HP_trade_check), 4754 },
-	{ HP_POP(trade->additem), HP_POP2(HP_trade_additem), 4756 },
-	{ HP_POP(trade->addzeny), HP_POP2(HP_trade_addzeny), 4758 },
-	{ HP_POP(trade->ok), HP_POP2(HP_trade_ok), 4760 },
-	{ HP_POP(trade->cancel), HP_POP2(HP_trade_cancel), 4762 },
-	{ HP_POP(trade->commit), HP_POP2(HP_trade_commit), 4764 },
+	{ HP_POP(trade->request, HP_trade_request) },
+	{ HP_POP(trade->ack, HP_trade_ack) },
+	{ HP_POP(trade->check_impossible, HP_trade_check_impossible) },
+	{ HP_POP(trade->check, HP_trade_check) },
+	{ HP_POP(trade->additem, HP_trade_additem) },
+	{ HP_POP(trade->addzeny, HP_trade_addzeny) },
+	{ HP_POP(trade->ok, HP_trade_ok) },
+	{ HP_POP(trade->cancel, HP_trade_cancel) },
+	{ HP_POP(trade->commit, HP_trade_commit) },
 /* unit */
-	{ HP_POP(unit->init), HP_POP2(HP_unit_init), 4766 },
-	{ HP_POP(unit->final), HP_POP2(HP_unit_final), 4768 },
-	{ HP_POP(unit->bl2ud), HP_POP2(HP_unit_bl2ud), 4770 },
-	{ HP_POP(unit->bl2ud2), HP_POP2(HP_unit_bl2ud2), 4772 },
-	{ HP_POP(unit->attack_timer), HP_POP2(HP_unit_attack_timer), 4774 },
-	{ HP_POP(unit->walktoxy_timer), HP_POP2(HP_unit_walktoxy_timer), 4776 },
-	{ HP_POP(unit->walktoxy_sub), HP_POP2(HP_unit_walktoxy_sub), 4778 },
-	{ HP_POP(unit->delay_walktoxy_timer), HP_POP2(HP_unit_delay_walktoxy_timer), 4780 },
-	{ HP_POP(unit->walktoxy), HP_POP2(HP_unit_walktoxy), 4782 },
-	{ HP_POP(unit->walktobl_sub), HP_POP2(HP_unit_walktobl_sub), 4784 },
-	{ HP_POP(unit->walktobl), HP_POP2(HP_unit_walktobl), 4786 },
-	{ HP_POP(unit->run), HP_POP2(HP_unit_run), 4788 },
-	{ HP_POP(unit->wugdash), HP_POP2(HP_unit_wugdash), 4790 },
-	{ HP_POP(unit->escape), HP_POP2(HP_unit_escape), 4792 },
-	{ HP_POP(unit->movepos), HP_POP2(HP_unit_movepos), 4794 },
-	{ HP_POP(unit->setdir), HP_POP2(HP_unit_setdir), 4796 },
-	{ HP_POP(unit->getdir), HP_POP2(HP_unit_getdir), 4798 },
-	{ HP_POP(unit->blown), HP_POP2(HP_unit_blown), 4800 },
-	{ HP_POP(unit->warp), HP_POP2(HP_unit_warp), 4802 },
-	{ HP_POP(unit->stop_walking), HP_POP2(HP_unit_stop_walking), 4804 },
-	{ HP_POP(unit->skilluse_id), HP_POP2(HP_unit_skilluse_id), 4806 },
-	{ HP_POP(unit->is_walking), HP_POP2(HP_unit_is_walking), 4808 },
-	{ HP_POP(unit->can_move), HP_POP2(HP_unit_can_move), 4810 },
-	{ HP_POP(unit->resume_running), HP_POP2(HP_unit_resume_running), 4812 },
-	{ HP_POP(unit->set_walkdelay), HP_POP2(HP_unit_set_walkdelay), 4814 },
-	{ HP_POP(unit->skilluse_id2), HP_POP2(HP_unit_skilluse_id2), 4816 },
-	{ HP_POP(unit->skilluse_pos), HP_POP2(HP_unit_skilluse_pos), 4818 },
-	{ HP_POP(unit->skilluse_pos2), HP_POP2(HP_unit_skilluse_pos2), 4820 },
-	{ HP_POP(unit->set_target), HP_POP2(HP_unit_set_target), 4822 },
-	{ HP_POP(unit->stop_attack), HP_POP2(HP_unit_stop_attack), 4824 },
-	{ HP_POP(unit->unattackable), HP_POP2(HP_unit_unattackable), 4826 },
-	{ HP_POP(unit->attack), HP_POP2(HP_unit_attack), 4828 },
-	{ HP_POP(unit->cancel_combo), HP_POP2(HP_unit_cancel_combo), 4830 },
-	{ HP_POP(unit->can_reach_pos), HP_POP2(HP_unit_can_reach_pos), 4832 },
-	{ HP_POP(unit->can_reach_bl), HP_POP2(HP_unit_can_reach_bl), 4834 },
-	{ HP_POP(unit->calc_pos), HP_POP2(HP_unit_calc_pos), 4836 },
-	{ HP_POP(unit->attack_timer_sub), HP_POP2(HP_unit_attack_timer_sub), 4838 },
-	{ HP_POP(unit->skillcastcancel), HP_POP2(HP_unit_skillcastcancel), 4840 },
-	{ HP_POP(unit->dataset), HP_POP2(HP_unit_dataset), 4842 },
-	{ HP_POP(unit->counttargeted), HP_POP2(HP_unit_counttargeted), 4844 },
-	{ HP_POP(unit->fixdamage), HP_POP2(HP_unit_fixdamage), 4846 },
-	{ HP_POP(unit->changeviewsize), HP_POP2(HP_unit_changeviewsize), 4848 },
-	{ HP_POP(unit->remove_map), HP_POP2(HP_unit_remove_map), 4850 },
-	{ HP_POP(unit->remove_map_pc), HP_POP2(HP_unit_remove_map_pc), 4852 },
-	{ HP_POP(unit->free_pc), HP_POP2(HP_unit_free_pc), 4854 },
-	{ HP_POP(unit->free), HP_POP2(HP_unit_free), 4856 },
+	{ HP_POP(unit->init, HP_unit_init) },
+	{ HP_POP(unit->final, HP_unit_final) },
+	{ HP_POP(unit->bl2ud, HP_unit_bl2ud) },
+	{ HP_POP(unit->bl2ud2, HP_unit_bl2ud2) },
+	{ HP_POP(unit->attack_timer, HP_unit_attack_timer) },
+	{ HP_POP(unit->walktoxy_timer, HP_unit_walktoxy_timer) },
+	{ HP_POP(unit->walktoxy_sub, HP_unit_walktoxy_sub) },
+	{ HP_POP(unit->delay_walktoxy_timer, HP_unit_delay_walktoxy_timer) },
+	{ HP_POP(unit->walktoxy, HP_unit_walktoxy) },
+	{ HP_POP(unit->walktobl_sub, HP_unit_walktobl_sub) },
+	{ HP_POP(unit->walktobl, HP_unit_walktobl) },
+	{ HP_POP(unit->run, HP_unit_run) },
+	{ HP_POP(unit->wugdash, HP_unit_wugdash) },
+	{ HP_POP(unit->escape, HP_unit_escape) },
+	{ HP_POP(unit->movepos, HP_unit_movepos) },
+	{ HP_POP(unit->setdir, HP_unit_setdir) },
+	{ HP_POP(unit->getdir, HP_unit_getdir) },
+	{ HP_POP(unit->blown, HP_unit_blown) },
+	{ HP_POP(unit->warp, HP_unit_warp) },
+	{ HP_POP(unit->stop_walking, HP_unit_stop_walking) },
+	{ HP_POP(unit->skilluse_id, HP_unit_skilluse_id) },
+	{ HP_POP(unit->is_walking, HP_unit_is_walking) },
+	{ HP_POP(unit->can_move, HP_unit_can_move) },
+	{ HP_POP(unit->resume_running, HP_unit_resume_running) },
+	{ HP_POP(unit->set_walkdelay, HP_unit_set_walkdelay) },
+	{ HP_POP(unit->skilluse_id2, HP_unit_skilluse_id2) },
+	{ HP_POP(unit->skilluse_pos, HP_unit_skilluse_pos) },
+	{ HP_POP(unit->skilluse_pos2, HP_unit_skilluse_pos2) },
+	{ HP_POP(unit->set_target, HP_unit_set_target) },
+	{ HP_POP(unit->stop_attack, HP_unit_stop_attack) },
+	{ HP_POP(unit->unattackable, HP_unit_unattackable) },
+	{ HP_POP(unit->attack, HP_unit_attack) },
+	{ HP_POP(unit->cancel_combo, HP_unit_cancel_combo) },
+	{ HP_POP(unit->can_reach_pos, HP_unit_can_reach_pos) },
+	{ HP_POP(unit->can_reach_bl, HP_unit_can_reach_bl) },
+	{ HP_POP(unit->calc_pos, HP_unit_calc_pos) },
+	{ HP_POP(unit->attack_timer_sub, HP_unit_attack_timer_sub) },
+	{ HP_POP(unit->skillcastcancel, HP_unit_skillcastcancel) },
+	{ HP_POP(unit->dataset, HP_unit_dataset) },
+	{ HP_POP(unit->counttargeted, HP_unit_counttargeted) },
+	{ HP_POP(unit->fixdamage, HP_unit_fixdamage) },
+	{ HP_POP(unit->changeviewsize, HP_unit_changeviewsize) },
+	{ HP_POP(unit->remove_map, HP_unit_remove_map) },
+	{ HP_POP(unit->remove_map_pc, HP_unit_remove_map_pc) },
+	{ HP_POP(unit->free_pc, HP_unit_free_pc) },
+	{ HP_POP(unit->free, HP_unit_free) },
 /* vending */
-	{ HP_POP(vending->init), HP_POP2(HP_vending_init), 4858 },
-	{ HP_POP(vending->final), HP_POP2(HP_vending_final), 4860 },
-	{ HP_POP(vending->close), HP_POP2(HP_vending_close), 4862 },
-	{ HP_POP(vending->open), HP_POP2(HP_vending_open), 4864 },
-	{ HP_POP(vending->list), HP_POP2(HP_vending_list), 4866 },
-	{ HP_POP(vending->purchase), HP_POP2(HP_vending_purchase), 4868 },
-	{ HP_POP(vending->search), HP_POP2(HP_vending_search), 4870 },
-	{ HP_POP(vending->searchall), HP_POP2(HP_vending_searchall), 4872 },
+	{ HP_POP(vending->init, HP_vending_init) },
+	{ HP_POP(vending->final, HP_vending_final) },
+	{ HP_POP(vending->close, HP_vending_close) },
+	{ HP_POP(vending->open, HP_vending_open) },
+	{ HP_POP(vending->list, HP_vending_list) },
+	{ HP_POP(vending->purchase, HP_vending_purchase) },
+	{ HP_POP(vending->search, HP_vending_search) },
+	{ HP_POP(vending->searchall, HP_vending_searchall) },
 };
 
 int HookingPointsLenMax = 41;
diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
index 8823eedae..3d045ece6 100644
--- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
@@ -58454,6 +58454,32 @@ int HP_skill_get_new_group_id(void) {
 	}
 	return retVal___;
 }
+bool HP_skill_check_shadowform(struct block_list *bl, int64 damage, int hit) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if( HPMHooks.count.HP_skill_check_shadowform_pre ) {
+		bool (*preHookFunc) (struct block_list *bl, int64 *damage, int *hit);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_shadowform_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_skill_check_shadowform_pre[hIndex].func;
+			retVal___ = preHookFunc(bl, &damage, &hit);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.skill.check_shadowform(bl, damage, hit);
+	}
+	if( HPMHooks.count.HP_skill_check_shadowform_post ) {
+		bool (*postHookFunc) (bool retVal___, struct block_list *bl, int64 *damage, int *hit);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_check_shadowform_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_skill_check_shadowform_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, bl, &damage, &hit);
+		}
+	}
+	return retVal___;
+}
 /* status */
 int HP_status_init(void) {
 	int hIndex = 0;