25 files changed, 21869 insertions, 19250 deletions

diff --git a/src/map/achievement.c b/src/map/achievement.c
index e6a9ae3be..0b0d9749b 100644
--- a/src/map/achievement.c
+++ b/src/map/achievement.c
@@ -194,6 +194,8 @@ static void achievement_progress_add(struct map_session_data *sd, const struct a
 		// Check if the Achievement is complete.
 		if (achievement->check_complete(sd, ad)) {
 			achievement->validate_achieve(sd, ad->id);
+			if ((ach = achievement->ensure(sd, ad)) == NULL)
+				return;
 			ach->completed_at = time(NULL);
 		}
 
@@ -232,6 +234,8 @@ static void achievement_progress_set(struct map_session_data *sd, const struct a
 
 		if (achievement->check_complete(sd, ad)) {
 			achievement->validate_achieve(sd, ad->id);
+			if ((ach = achievement->ensure(sd, ad)) == NULL)
+				return;
 			ach->completed_at = time(NULL);
 		}
 
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 54cc9e2c9..76448b237 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -4499,6 +4499,7 @@ ACMD(loadnpc)
 	// add to list of script sources and run it
 	npc->addsrcfile(message);
 	npc->parsesrcfile(message,true);
+	npc->motd = npc->name2id("HerculesMOTD");
 	npc->read_event_script();
 
 	clif->message(fd, msg_fd(fd,262));
@@ -4533,6 +4534,7 @@ ACMD(unloadnpc)
 
 	npc->unload_duplicates(nd, (flag != 0));
 	npc->unload(nd, true, (flag != 0));
+	npc->motd = npc->name2id("HerculesMOTD");
 	npc->read_event_script();
 	clif->message(fd, msg_fd(fd, 112)); /// Npc Disabled.
 	return true;
@@ -4588,6 +4590,7 @@ ACMD(reloadnpc)
 	clif->message(fd, msg_fd(fd, 1386)); /// File unloaded. Be aware that...
 	npc->addsrcfile(file_path);
 	npc->parsesrcfile(file_path, true);
+	npc->motd = npc->name2id("HerculesMOTD");
 	npc->read_event_script();
 	clif->message(fd, msg_fd(fd, 262)); /// Script loaded.
 	return true;
diff --git a/src/map/battle.c b/src/map/battle.c
index a8193d24a..611154953 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -5934,14 +5934,14 @@ static void battle_reflect_damage(struct block_list *target, struct block_list *
 					enum autocast_type ac_type;
 
 					if (sd != NULL) {
-						ac_type = sd->autocast.type;
-						sd->autocast.type = AUTOCAST_TEMP;
+						ac_type = sd->auto_cast_current.type;
+						sd->auto_cast_current.type = AUTOCAST_TEMP;
 					}
 
 					map->foreachinshootrange(battle->damage_area,target,skill->get_splash(LG_REFLECTDAMAGE,1),BL_CHAR,tick,target,delay,wd->dmotion,rdamage,status_get_race(target));
 
 					if (sd != NULL)
-						sd->autocast.type = ac_type;
+						sd->auto_cast_current.type = ac_type;
 
 					delay += 150;/* gradual increase so the numbers don't clip in the client */
 
@@ -6131,7 +6131,7 @@ static int battle_damage_area(struct block_list *bl, va_list ap)
 		else
 			status_fix_damage(src,bl,damage,0);
 		clif->damage(bl,bl,amotion,dmotion,damage,1,BDT_ENDURE,0);
-		if (src->type != BL_PC || BL_UCCAST(BL_PC, src)->autocast.type != AUTOCAST_TEMP)
+		if (src->type != BL_PC || BL_UCCAST(BL_PC, src)->auto_cast_current.type != AUTOCAST_TEMP)
 			skill->additional_effect(src, bl, CR_REFLECTSHIELD, 1, BF_WEAPON|BF_SHORT|BF_NORMAL,ATK_DEF,tick);
 		map->freeblock_unlock();
 	}
@@ -6340,7 +6340,7 @@ static enum damage_lv battle_weapon_attack(struct block_list *src, struct block_
 				skill_id = AB_DUPLELIGHT_MELEE;
 			else
 				skill_id = AB_DUPLELIGHT_MAGIC;
-			skill->attack(skill->get_type(skill_id), src, src, target, skill_id, sc->data[SC_DUPLELIGHT]->val1, tick, SD_LEVEL);
+			skill->attack(skill->get_type(skill_id, sc->data[SC_DUPLELIGHT]->val1), src, src, target, skill_id, sc->data[SC_DUPLELIGHT]->val1, tick, SD_LEVEL);
 		}
 	}
 
@@ -6455,10 +6455,10 @@ static enum damage_lv battle_weapon_attack(struct block_list *src, struct block_
 					}
 				}
 
-				sd->autocast.type = AUTOCAST_TEMP;
+				sd->auto_cast_current.type = AUTOCAST_TEMP;
 				skill->consume_requirement(sd,r_skill,r_lv,3);
 				skill->castend_type(type, src, target, r_skill, r_lv, tick, flag);
-				sd->autocast.type = AUTOCAST_NONE;
+				sd->auto_cast_current.type = AUTOCAST_NONE;
 				sd->ud.canact_tick = tick + skill->delay_fix(src, r_skill, r_lv);
 				clif->status_change(src, status->get_sc_icon(SC_POSTDELAY), status->get_sc_relevant_bl_types(SC_POSTDELAY), 1, skill->delay_fix(src, r_skill, r_lv), 0, 0, 1);
 			}
@@ -7378,7 +7378,7 @@ static const struct battle_data {
 	{ "item_restricted_consumption_type",   &battle_config.item_restricted_consumption_type,1,      0,      1,              },
 	{ "unequip_restricted_equipment",       &battle_config.unequip_restricted_equipment,    0,      0,      3,              },
 	{ "max_walk_path",                      &battle_config.max_walk_path,                   17,     1,      MAX_WALKPATH,   },
-	{ "item_enabled_npc",                   &battle_config.item_enabled_npc,                1,      0,      1,              },
+	{ "item_enabled_npc",                   &battle_config.item_enabled_npc,                1,      0,      INT_MAX,        },
 	{ "gm_ignore_warpable_area",            &battle_config.gm_ignore_warpable_area,         0,      2,      100,            },
 	{ "packet_obfuscation",                 &battle_config.packet_obfuscation,              1,      0,      3,              },
 	{ "client_accept_chatdori",             &battle_config.client_accept_chatdori,          0,      0,      INT_MAX,        },
@@ -7425,6 +7425,7 @@ static const struct battle_data {
 	{ "min_item_sell_price",                &battle_config.min_item_sell_price,             0,      0,      INT_MAX,        },
 	{ "display_fake_hp_when_dead",          &battle_config.display_fake_hp_when_dead,       1,      0,      1,              },
 	{ "magicrod_type",                      &battle_config.magicrod_type,                   0,      0,      1,              },
+	{ "skill_enabled_npc",                  &battle_config.skill_enabled_npc,               0,      0,      INT_MAX,        },
 	{ "features/enable_achievement_system", &battle_config.feature_enable_achievement,      1,      0,      1,              },
 	{ "ping_timer_inverval",                &battle_config.ping_timer_interval,             30,     0,      99999999,       },
 	{ "ping_time",                          &battle_config.ping_time,                       20,     0,      99999999,       },
diff --git a/src/map/battle.h b/src/map/battle.h
index bb907d5b9..55ee32445 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -580,6 +580,8 @@ struct Battle_Config {
 
 	int magicrod_type;
 
+	int skill_enabled_npc;
+
 	int feature_enable_achievement;
 
 	int ping_timer_interval;
diff --git a/src/map/clif.c b/src/map/clif.c
index 634e2bae0..5cc11c494 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -936,19 +936,25 @@ static void clif_clearunit_area(struct block_list *bl, enum clr_type type)
 static int clif_clearunit_delayed_sub(int tid, int64 tick, int id, intptr_t data)
 {
 	struct block_list *bl = (struct block_list *)data;
+	nullpo_ret(bl);
+	Assert_ret(bl->m >= 0 && bl->m < map->count);
+	if (map->list[bl->m].block == NULL) {
+		// avoid error report for missing/removed map
+		ers_free(clif->delay_clearunit_ers, bl);
+		return 0;
+	}
 	clif->clearunit_area(bl, (enum clr_type) id);
-	ers_free(clif->delay_clearunit_ers,bl);
+	ers_free(clif->delay_clearunit_ers, bl);
 	return 0;
 }
 
 static void clif_clearunit_delayed(struct block_list *bl, enum clr_type type, int64 tick)
 {
-	struct block_list *tbl;
-
 	nullpo_retv(bl);
-	tbl = ers_alloc(clif->delay_clearunit_ers, struct block_list);
-	memcpy (tbl, bl, sizeof (struct block_list));
-	timer->add(tick, clif->clearunit_delayed_sub, (int)type, (intptr_t)tbl);
+	Assert_retv(bl->type == BL_MOB);
+	struct mob_data *md = ers_alloc(clif->delay_clearunit_ers, struct mob_data);
+	memcpy (md, bl, sizeof (struct mob_data));
+	timer->add(tick, clif->clearunit_delayed_sub, (int)type, (intptr_t)md);
 }
 
 /// Gets weapon view info from sd's inventory_data and points (*rhand,*lhand)
@@ -1031,6 +1037,7 @@ static void clif_set_unit_idle2(struct block_list *bl, struct map_session_data *
 	int g_id = status->get_guild_id(bl);
 
 	nullpo_retv(bl);
+	nullpo_retv(vd);
 	sd = BL_CAST(BL_PC, bl);
 
 	p.PacketType = idle_unit2Type;
@@ -1087,6 +1094,7 @@ static void clif_set_unit_idle(struct block_list *bl, struct map_session_data *t
 	int g_id = status->get_guild_id(bl);
 
 	nullpo_retv(bl);
+	nullpo_retv(vd);
 
 #if PACKETVER < 20091103
 	if (!pc->db_checkid(vd->class)) {
@@ -1197,6 +1205,7 @@ static void clif_spawn_unit2(struct block_list *bl, enum send_target target)
 	int g_id = status->get_guild_id(bl);
 
 	nullpo_retv(bl);
+	nullpo_retv(vd);
 	sd = BL_CAST(BL_PC, bl);
 
 	p.PacketType = spawn_unit2Type;
@@ -1244,6 +1253,7 @@ static void clif_spawn_unit(struct block_list *bl, enum send_target target)
 	int g_id = status->get_guild_id(bl);
 
 	nullpo_retv(bl);
+	nullpo_retv(vd);
 
 #if PACKETVER < 20091103
 	if (!pc->db_checkid(vd->class)) {
@@ -1357,6 +1367,7 @@ static void clif_set_unit_walking(struct block_list *bl, struct map_session_data
 
 	nullpo_retv(bl);
 	nullpo_retv(ud);
+	nullpo_retv(vd);
 
 	sd = BL_CAST(BL_PC, bl);
 
@@ -6766,7 +6777,7 @@ static void clif_item_skill(struct map_session_data *sd, uint16 skill_id, uint16
 	struct PACKET_ZC_AUTORUN_SKILL *p = WFIFOP(fd, 0);
 	int type = skill->get_inf(skill_id);
 
-	if (sd->autocast.itemskill_cast_on_self && sd->autocast.type == AUTOCAST_ITEM)
+	if (sd->auto_cast_current.itemskill_cast_on_self && sd->auto_cast_current.type == AUTOCAST_ITEM)
 		type = INF_SELF_SKILL;
 
 	p->packetType = HEADER_ZC_AUTORUN_SKILL;
@@ -12031,7 +12042,7 @@ static void clif_parse_EquipItem(int fd, struct map_session_data *sd)
 		return; //Out of bounds check.
 
 	if( sd->npc_id ) {
-		if ( !sd->npc_item_flag )
+		if ((sd->npc_item_flag & ITEMENABLEDNPC_EQUIP) == 0)
 			return;
 	} else if (sd->state.storage_flag != STORAGE_FLAG_CLOSED || sd->sc.opt1)
 		; //You can equip/unequip stuff while storage is open/under status changes
@@ -12076,7 +12087,7 @@ static void clif_parse_UnequipItem(int fd, struct map_session_data *sd)
 	}
 
 	if( sd->npc_id ) {
-		if ( !sd->npc_item_flag )
+		if ((sd->npc_item_flag & ITEMENABLEDNPC_EQUIP) == 0)
 			return;
 	} else if (sd->state.storage_flag != STORAGE_FLAG_CLOSED || sd->sc.opt1)
 		; //You can equip/unequip stuff while storage is open/under status changes
@@ -12797,13 +12808,15 @@ static void clif_useSkillToIdReal(int fd, struct map_session_data *sd, int skill
 {
 	int64 tick = timer->gettick();
 
+	pc->autocast_set_current(sd, skill_id);
+
 	/**
 	 * According to Skotlex' comment below, the client sometimes passes 0 for the skill level.
 	 * Even though this seems to only affect guild skills, sd->autocast.skill_lv is used
 	 * for the auto-cast data validation if skill_lv is 0.
 	 *
 	 **/
-	skill->validate_autocast_data(sd, skill_id, (skill_lv == 0) ? sd->autocast.skill_lv : skill_lv);
+	skill->validate_autocast_data(sd, skill_id, (skill_lv == 0) ? sd->auto_cast_current.skill_lv : skill_lv);
 
 	if (skill_lv < 1)
 		skill_lv = 1; //No clue, I have seen the client do this with guild skills :/ [Skotlex]
@@ -12825,7 +12838,11 @@ static void clif_useSkillToIdReal(int fd, struct map_session_data *sd, int skill
 	// Whether skill fails or not is irrelevant, the char ain't idle. [Skotlex]
 	pc->update_idle_time(sd, BCIDLE_USESKILLTOID);
 
-	if (sd->npc_id || sd->state.workinprogress & 1) {
+	bool allow_self_skill = ((tmp & INF_SELF_SKILL) != 0 && (skill->get_nk(skill_id) & NK_NO_DAMAGE) != 0);
+	allow_self_skill = (allow_self_skill && battle_config.skill_enabled_npc == SKILLENABLEDNPC_SELF);
+
+	if ((sd->npc_id != 0 && !allow_self_skill && battle_config.skill_enabled_npc != SKILLENABLEDNPC_ALL)
+	    || (sd->state.workinprogress & 1) != 0) {
 #if PACKETVER >= 20110308
 		clif->msgtable(sd, MSG_BUSY);
 #else
@@ -12834,7 +12851,7 @@ static void clif_useSkillToIdReal(int fd, struct map_session_data *sd, int skill
 		return;
 	}
 
-	if (pc_cant_act(sd)
+	if (pc_cant_act_except_npc(sd)
 		&& skill_id != RK_REFRESH
 		&& !(skill_id == SR_GENTLETOUCH_CURE && (sd->sc.opt1 == OPT1_STONE || sd->sc.opt1 == OPT1_FREEZE || sd->sc.opt1 == OPT1_STUN))
 		&& (sd->state.storage_flag != STORAGE_FLAG_CLOSED && !(tmp&INF_SELF_SKILL)) // SELF skills can be used with the storage open, issue: 8027
@@ -12855,10 +12872,10 @@ static void clif_useSkillToIdReal(int fd, struct map_session_data *sd, int skill
 		target_id = sd->bl.id;
 
 	if (sd->ud.skilltimer != INVALID_TIMER) {
-		if (skill_id != SA_CASTCANCEL && skill_id != SO_SPELLFIST)
+		if (skill_id != SA_CASTCANCEL && skill_id != SO_SPELLFIST && sd->auto_cast_current.type == AUTOCAST_NONE)
 			return;
 	} else if (DIFF_TICK(tick, sd->ud.canact_tick) < 0) {
-		if (sd->autocast.type == AUTOCAST_NONE) {
+		if (sd->auto_cast_current.type == AUTOCAST_NONE) {
 			clif->skill_fail(sd, skill_id, USESKILL_FAIL_SKILLINTERVAL, 0, 0);
 			return;
 		}
@@ -12876,9 +12893,9 @@ static void clif_useSkillToIdReal(int fd, struct map_session_data *sd, int skill
 		} else if (sd->menuskill_id != SA_AUTOSPELL)
 			return; //Can't use skills while a menu is open.
 	}
-	if (sd->autocast.type != AUTOCAST_NONE) {
-		if (skill_lv != sd->autocast.skill_lv)
-			skill_lv = sd->autocast.skill_lv;
+	if (sd->auto_cast_current.type != AUTOCAST_NONE) {
+		if (skill_lv != sd->auto_cast_current.skill_lv)
+			skill_lv = sd->auto_cast_current.skill_lv;
 		if (!(tmp&INF_SELF_SKILL))
 			pc->delinvincibletimer(sd); // Target skills through items cancel invincibility. [Inkfish]
 		unit->skilluse_id(&sd->bl, target_id, skill_id, skill_lv);
@@ -12946,6 +12963,8 @@ static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uin
 	int64 tick = timer->gettick();
 
 	nullpo_retv(sd);
+	
+	pc->autocast_set_current(sd, skill_id);
 
 	/**
 	 * When using clif_item_skill() to initiate the execution of ground skills,
@@ -12954,7 +12973,7 @@ static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uin
 	 * since clif_item_skill() is only used for auto-cast skills.
 	 *
 	 **/
-	skill->validate_autocast_data(sd, skill_id, (skill_lv == 0) ? sd->autocast.skill_lv : skill_lv);
+	skill->validate_autocast_data(sd, skill_id, (skill_lv == 0) ? sd->auto_cast_current.skill_lv : skill_lv);
 
 	if( !(skill->get_inf(skill_id)&INF_GROUND_SKILL) )
 		return; //Using a target skill on the ground? WRONG.
@@ -12969,7 +12988,8 @@ static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uin
 		return;
 	}
 
-	if (sd->state.workinprogress & 1) {
+	if ((sd->npc_id != 0 && battle_config.skill_enabled_npc != SKILLENABLEDNPC_ALL)
+	    || (sd->state.workinprogress & 1) != 0) {
 #if PACKETVER >= 20110308
 		clif->msgtable(sd, MSG_BUSY);
 #else
@@ -12992,11 +13012,11 @@ static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uin
 		safestrncpy(sd->message, RFIFOP(fd, skillmoreinfo), TALKBOX_MESSAGE_SIZE);
 	}
 
-	if( sd->ud.skilltimer != INVALID_TIMER )
+	if (sd->ud.skilltimer != INVALID_TIMER && sd->auto_cast_current.type == AUTOCAST_NONE)
 		return;
 
 	if( DIFF_TICK(tick, sd->ud.canact_tick) < 0 ) {
-		if (sd->autocast.type == AUTOCAST_NONE) {
+		if (sd->auto_cast_current.type == AUTOCAST_NONE) {
 			clif->skill_fail(sd, skill_id, USESKILL_FAIL_SKILLINTERVAL, 0, 0);
 			return;
 		}
@@ -13017,9 +13037,9 @@ static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uin
 
 	pc->delinvincibletimer(sd);
 
-	if (sd->autocast.type != AUTOCAST_NONE) {
-		if (skill_lv != sd->autocast.skill_lv)
-			skill_lv = sd->autocast.skill_lv;
+	if (sd->auto_cast_current.type != AUTOCAST_NONE) {
+		if (skill_lv != sd->auto_cast_current.skill_lv)
+			skill_lv = sd->auto_cast_current.skill_lv;
 		unit->skilluse_pos(&sd->bl, x, y, skill_id, skill_lv);
 	} else {
 		int lv;
@@ -13039,7 +13059,7 @@ static void clif_parse_UseSkillToPos(int fd, struct map_session_data *sd) __attr
 /// There are various variants of this packet, some of them have padding between fields.
 static void clif_parse_UseSkillToPos(int fd, struct map_session_data *sd)
 {
-	if (pc_cant_act(sd))
+	if (pc_cant_act_except_npc(sd))
 		return;
 	if (pc_issit(sd))
 		return;
@@ -13060,7 +13080,7 @@ static void clif_parse_UseSkillToPosMoreInfo(int fd, struct map_session_data *sd
 /// There are various variants of this packet, some of them have padding between fields.
 static void clif_parse_UseSkillToPosMoreInfo(int fd, struct map_session_data *sd)
 {
-	if (pc_cant_act(sd))
+	if (pc_cant_act_except_npc(sd))
 		return;
 	if (pc_issit(sd))
 		return;
@@ -13089,10 +13109,13 @@ static void clif_parse_UseSkillMap(int fd, struct map_session_data *sd)
 		return;
 
 	// It is possible to use teleport with the storage window open issue:8027
-	if (pc_cant_act(sd) && (sd->state.storage_flag == STORAGE_FLAG_CLOSED && skill_id != AL_TELEPORT)) {
+	if ((pc_cant_act_except_npc(sd) && sd->state.storage_flag == STORAGE_FLAG_CLOSED && skill_id != AL_TELEPORT)
+	    || (sd->npc_id != 0 && battle_config.skill_enabled_npc != SKILLENABLEDNPC_ALL)) {
 		clif_menuskill_clear(sd);
 		return;
 	}
+	
+	pc->autocast_set_current(sd, skill_id);
 
 	/**
 	 * Since no skill level was passed use 0 to notify skill_validate_autocast_data() of this special case.
@@ -15468,6 +15491,7 @@ static void clif_parse_GMKick(int fd, struct map_session_data *sd)
 			}
 			npc->unload_duplicates(nd, true);
 			npc->unload(nd, true, true);
+			npc->motd = npc->name2id("HerculesMOTD");
 			npc->read_event_script();
 		}
 		break;
@@ -19921,9 +19945,9 @@ static int clif_autoshadowspell_list(struct map_session_data *sd)
 	WFIFOHEAD(fd, 2 * 6 + 4);
 	WFIFOW(fd,0) = 0x442;
 	for (i = 0, c = 0; i < MAX_SKILL_DB; i++)
-		if( sd->status.skill[i].flag == SKILL_FLAG_PLAGIARIZED && sd->status.skill[i].id > 0 &&
-				sd->status.skill[i].id < GS_GLITTERING && skill->get_type(sd->status.skill[i].id) == BF_MAGIC )
-		{ // Can't auto cast both Extended class and 3rd class skills.
+		if (sd->status.skill[i].flag == SKILL_FLAG_PLAGIARIZED && sd->status.skill[i].id > 0 && sd->status.skill[i].id < GS_GLITTERING
+		    && skill->get_type(sd->status.skill[i].id, sd->status.skill[i].lv) == BF_MAGIC) {
+			// Can't auto cast both Extended class and 3rd class skills.
 			WFIFOW(fd,8+c*2) = sd->status.skill[i].id;
 			c++;
 		}
@@ -22290,7 +22314,7 @@ static void clif_rodex_checkname_result(struct map_session_data *sd, int char_id
 	sPacket->Class = class_;
 	sPacket->BaseLevel = base_level;
 #if PACKETVER >= 20160316
-	strncpy(sPacket->Name, name, NAME_LENGTH);
+	safestrncpy(sPacket->Name, name, NAME_LENGTH);
 #endif
 	WFIFOSET(fd, sizeof(*sPacket));
 #endif
@@ -24183,7 +24207,7 @@ static int do_init_clif(bool minimal)
 	timer->add_func_list(clif->clearunit_delayed_sub, "clif_clearunit_delayed_sub");
 	timer->add_func_list(clif->delayquit, "clif_delayquit");
 
-	clif->delay_clearunit_ers = ers_new(sizeof(struct block_list),"clif.c::delay_clearunit_ers",ERS_OPT_CLEAR);
+	clif->delay_clearunit_ers = ers_new(sizeof(struct mob_data), "clif.c::delay_clearunit_ers", ERS_OPT_CLEAR);
 	clif->delayed_damage_ers = ers_new(sizeof(struct cdelayed_damage),"clif.c::delayed_damage_ers",ERS_OPT_CLEAR);
 
 #if PACKETVER_MAIN_NUM >= 20190403 || PACKETVER_RE_NUM >= 20190320
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 5f0790b10..4b06a21d6 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -606,7 +606,6 @@ struct item_data {
 #define itemid_isgemstone(n)     ((n) >= ITEMID_YELLOW_GEMSTONE && (n) <= ITEMID_BLUE_GEMSTONE)
 #define itemdb_is_GNbomb(n)      ((n) >= ITEMID_APPLE_BOMB && (n) <= ITEMID_VERY_HARD_LUMP)
 #define itemdb_is_GNthrowable(n) ((n) >= ITEMID_MYSTERIOUS_POWDER && (n) <= ITEMID_BLACK_THING_TO_THROW)
-#define itemid_is_pilebunker(n)  ((n) == ITEMID_PILEBUNCKER || (n) == ITEMID_PILEBUNCKER_P || (n) == ITEMID_PILEBUNCKER_S || (n) == ITEMID_PILEBUNCKER_T)
 #define itemdb_is_shadowequip(n) ((n) & (EQP_SHADOW_ARMOR|EQP_SHADOW_WEAPON|EQP_SHADOW_SHIELD|EQP_SHADOW_SHOES|EQP_SHADOW_ACC_R|EQP_SHADOW_ACC_L))
 #define itemdb_is_costumeequip(n) ((n) & (EQP_COSTUME_HEAD_TOP|EQP_COSTUME_HEAD_MID|EQP_COSTUME_HEAD_LOW|EQP_COSTUME_GARMENT))
 
diff --git a/src/map/map.c b/src/map/map.c
index 63d05c1c0..24d571498 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -261,11 +261,13 @@ static int map_addblock(struct block_list *bl)
 	pos = x/BLOCK_SIZE+(y/BLOCK_SIZE)*map->list[m].bxs;
 
 	if (bl->type == BL_MOB) {
+		Assert_ret(map->list[m].block_mob != NULL);
 		bl->next = map->list[m].block_mob[pos];
 		bl->prev = &map->bl_head;
 		if (bl->next) bl->next->prev = bl;
 		map->list[m].block_mob[pos] = bl;
 	} else {
+		Assert_ret(map->list[m].block != NULL);
 		bl->next = map->list[m].block[pos];
 		bl->prev = &map->bl_head;
 		if (bl->next) bl->next->prev = bl;
@@ -307,8 +309,10 @@ static int map_delblock(struct block_list *bl)
 	if (bl->prev == &map->bl_head) {
 		//Since the head of the list, update the block_list map of []
 		if (bl->type == BL_MOB) {
+			Assert_ret(map->list[bl->m].block_mob != NULL);
 			map->list[bl->m].block_mob[pos] = bl->next;
 		} else {
+			Assert_ret(map->list[bl->m].block != NULL);
 			map->list[bl->m].block[pos] = bl->next;
 		}
 	} else {
@@ -450,6 +454,12 @@ static int map_count_oncell(int16 m, int16 x, int16 y, int type, int flag)
 	struct block_list *bl;
 	int count = 0;
 
+	Assert_ret(m >= -1);
+	if (m < 0)
+		return 0;
+	Assert_ret(m < map->count);
+	Assert_ret(map->list[m].block != NULL);
+
 	if (x < 0 || y < 0 || (x >= map->list[m].xs) || (y >= map->list[m].ys))
 		return 0;
 
@@ -512,6 +522,12 @@ static struct skill_unit *map_find_skill_unit_oncell(struct block_list *target,
 	nullpo_retr(NULL, target);
 	m = target->m;
 
+	Assert_ret(m >= -1);
+	if (m < 0)
+		return 0;
+	Assert_ret(m < map->count);
+	Assert_ret(map->list[m].block != NULL);
+
 	if (x < 0 || y < 0 || (x >= map->list[m].xs) || (y >= map->list[m].ys))
 		return NULL;
 
@@ -586,8 +602,11 @@ static int map_vforeachinmap(int (*func)(struct block_list*, va_list), int16 m,
 	struct block_list *bl;
 	int blockcount = map->bl_list_count;
 
+	Assert_ret(m >= -1);
 	if (m < 0)
 		return 0;
+	Assert_ret(m < map->count);
+	Assert_ret(map->list[m].block != NULL);
 
 	bsize = map->list[m].bxs * map->list[m].bys;
 	for (i = 0; i < bsize; i++) {
@@ -719,24 +738,28 @@ static int bl_getall_area(int type, int m, int x0, int y0, int x1, int y1, int (
 	struct block_list *bl;
 	int found = 0;
 
+	Assert_ret(m >= -1);
 	if (m < 0)
 		return 0;
+	Assert_ret(m < map->count);
+	const struct map_data *const listm = &map->list[m];
+	Assert_ret(listm->xs > 0 && listm->ys > 0);
+	Assert_ret(listm->block != NULL);
+
+	// Limit search area to map size
+	x0 = min(max(x0, 0), map->list[m].xs - 1);
+	y0 = min(max(y0, 0), map->list[m].ys - 1);
+	x1 = min(max(x1, 0), map->list[m].xs - 1);
+	y1 = min(max(y1, 0), map->list[m].ys - 1);
 
 	if (x1 < x0) swap(x0, x1);
 	if (y1 < y0) swap(y0, y1);
 
-	// Limit search area to map size
-	x0 = max(x0, 0);
-	y0 = max(y0, 0);
-	x1 = min(x1, map->list[m].xs - 1);
-	y1 = min(y1, map->list[m].ys - 1);
-
 	{
 		const int x0b = x0 / BLOCK_SIZE;
 		const int x1b = x1 / BLOCK_SIZE;
 		const int y0b = y0 / BLOCK_SIZE;
 		const int y1b = y1 / BLOCK_SIZE;
-		const struct map_data *const listm = &map->list[m];
 		const int bxs0 = listm->bxs;
 
 		// duplication for better performance
@@ -5265,7 +5288,7 @@ static bool map_zone_mf_cache(int m, char *flag, char *params)
 			}
 		}
 
-		if( modifier[0] == '\0' || !( skill_id = skill->name2id(skill_name) ) || !skill->get_unit_id( skill->name2id(skill_name), 0) || atoi(modifier) < 1 || atoi(modifier) > USHRT_MAX ) {
+		if (modifier[0] == '\0' || (skill_id = skill->name2id(skill_name)) == 0 || skill->get_unit_id(skill->name2id(skill_name), 1, 0) == 0 || atoi(modifier) < 1 || atoi(modifier) > USHRT_MAX) {
 			;/* we don't mind it, the server will take care of it next. */
 		} else {
 			int idx = map->list[m].unit_count;
diff --git a/src/map/messages_main.h b/src/map/messages_main.h
index 9f5a17662..dab537b6a 100644
--- a/src/map/messages_main.h
+++ b/src/map/messages_main.h
@@ -24,7 +24,7 @@
 
 /* This file is autogenerated, please do not commit manual changes
 
-Latest version: 20200304
+Latest version: 20200520
 */
 
 enum clif_messages {
@@ -13866,12 +13866,14 @@ Ghost %d
 Shadow %d
 */
 	MSG_NAVIGATION_PROPERTY8 = 0x8de,
-/*20120417 to latest
+/*20120417 to 20200506
 언데드%d
 Undead %d
 20130807 to 20130814
 염속성%d
 Ghost %d
+20200520 to latest
+불사%d
 */
 	MSG_NAVIGATION_PROPERTY9 = 0x8df,
 /*20120417 to latest
@@ -22612,6 +22614,28 @@ DEATH: %.1f%% (basic: 100.0%%, %s: %.1f%%)
 */
 	MSG_ID_EE3 = 0xee3,
 #endif
+#if PACKETVER >= 20200506
+/*20200506 to latest
+특성 마법 공격력이 증가되었습니다.
+*/
+	MSG_ID_EE4 = 0xee4,
+/*20200506 to latest
+스펠 인챈팅 효과가 해제되었습니다.
+*/
+	MSG_ID_EE5 = 0xee5,
+/*20200506 to latest
+프롬 디 어비스 효과가 해제되었습니다.
+*/
+	MSG_ID_EE6 = 0xee6,
+/*20200506 to latest
+특성 물리 공격력, 특성 마법 공격력 및 명중률이 증가되었습니다.
+*/
+	MSG_ID_EE7 = 0xee7,
+/*20200506 to latest
+어비스 슬레이어 효과가 해제되었습니다.
+*/
+	MSG_ID_EE8 = 0xee8,
+#endif
 
 };
 #endif /* MAP_MESSAGES_MAIN_H */
diff --git a/src/map/messages_zero.h b/src/map/messages_zero.h
index babe9384c..051d0e9df 100644
--- a/src/map/messages_zero.h
+++ b/src/map/messages_zero.h
@@ -24,7 +24,7 @@
 
 /* This file is autogenerated, please do not commit manual changes
 
-Latest version: 20200304
+Latest version: 20200520
 */
 
 enum clif_messages {
@@ -11263,9 +11263,11 @@ Shadow %d
 Ghost %d
 */
 	MSG_NAVIGATION_PROPERTY8 = 0x8de,
-/*20171018 to latest
+/*20171018 to 20200506
 언데드%d
 Undead %d
+20200520 to latest
+불사%d
 */
 	MSG_NAVIGATION_PROPERTY9 = 0x8df,
 /*20171018 to latest
@@ -18701,6 +18703,28 @@ DEATH: %.1f%% (basic: 100.0%%, %s: %.1f%%)
 */
 	MSG_ID_EE3 = 0xee3,
 #endif
+#if PACKETVER >= 20200506
+/*20200506 to latest
+특성 마법 공격력이 증가되었습니다.
+*/
+	MSG_ID_EE4 = 0xee4,
+/*20200506 to latest
+스펠 인챈팅 효과가 해제되었습니다.
+*/
+	MSG_ID_EE5 = 0xee5,
+/*20200506 to latest
+프롬 디 어비스 효과가 해제되었습니다.
+*/
+	MSG_ID_EE6 = 0xee6,
+/*20200506 to latest
+특성 물리 공격력, 특성 마법 공격력 및 명중률이 증가되었습니다.
+*/
+	MSG_ID_EE7 = 0xee7,
+/*20200506 to latest
+어비스 슬레이어 효과가 해제되었습니다.
+*/
+	MSG_ID_EE8 = 0xee8,
+#endif
 
 };
 #endif /* MAP_MESSAGES_ZERO_H */
diff --git a/src/map/mob.c b/src/map/mob.c
index b6ba5e5a9..849b962a1 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2426,6 +2426,7 @@ static int mob_dead(struct mob_data *md, struct block_list *src, int type)
 
 	nullpo_retr(3, md);
 	m = md->bl.m;
+	Assert_retr(false, m >= 0 && m < map->count);
 	mstatus = &md->status;
 
 	if( md->guardian_data && md->guardian_data->number >= 0 && md->guardian_data->number < MAX_GUARDIANS )
@@ -3871,7 +3872,7 @@ static int mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16
 			continue;
 
 		/// Normal aggressive mob. Disable skills that cannot help fighting against players. (Those with flags UF_NOMOB and UF_NOPC are specific to always aid players!) [Skotlex]
-		if (flag == 0 && skill->get_unit_id(skill_id, 0) != 0 &&
+		if (flag == 0 && skill->get_unit_id(skill_id, sd->status.skill[idx].lv, 0) != 0 &&
 		    (skill->get_unit_flag(skill_id) & (UF_NOMOB | UF_NOPC)) > 0)
 			continue;
 
@@ -3904,7 +3905,7 @@ static int mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16
 				mob_skills[i].state = MSS_IDLE;
 				mob_skills[i].target = MST_AROUND2;
 				mob_skills[i].delay = 60000;
-			} else if (skill->get_unit_target(skill_id) == BCT_ENEMY) { /// Target Enemy.
+			} else if (skill->get_unit_target(skill_id, sd->status.skill[idx].lv) == BCT_ENEMY) { /// Target Enemy.
 				mob_skills[i].state = MSS_ANYTARGET;
 				mob_skills[i].target = MST_TARGET;
 				mob_skills[i].cond1 = MSC_ALWAYS;
diff --git a/src/map/npc.c b/src/map/npc.c
index 2f03623e4..6ba088a80 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -5104,7 +5104,7 @@ static const char *npc_parse_mapflag(const char *w1, const char *w2, const char
 		else if (modifier[0] == '\0') {
 			ShowWarning("npc_parse_mapflag: Missing 5th param for 'adjust_unit_duration' flag! removing flag from %s in file '%s', line '%d'.\n", map->list[m].name, filepath, strline(buffer,start-buffer));
 			if (retval) *retval = EXIT_FAILURE;
-		} else if( !( skill_id = skill->name2id(skill_name) ) || !skill->get_unit_id( skill->name2id(skill_name), 0) ) {
+		} else if ((skill_id = skill->name2id(skill_name)) == 0 || skill->get_unit_id(skill->name2id(skill_name), 1, 0) == 0) {
 			ShowWarning("npc_parse_mapflag: Unknown skill (%s) for 'adjust_unit_duration' flag! removing flag from %s in file '%s', line '%d'.\n",skill_name, map->list[m].name, filepath, strline(buffer,start-buffer));
 			if (retval) *retval = EXIT_FAILURE;
 		} else if ( atoi(modifier) < 1 || atoi(modifier) > USHRT_MAX ) {
@@ -5728,8 +5728,10 @@ static bool npc_unloadfile(const char *filepath, bool unload_mobs)
 
 	dbi_destroy(iter);
 
-	if (found) /// Refresh event cache.
+	if (found) { /// Refresh event cache.
+		npc->motd = npc->name2id("HerculesMOTD");
 		npc->read_event_script();
+	}
 
 	return found;
 }
diff --git a/src/map/packets_keys_main.h b/src/map/packets_keys_main.h
index 8ebbb39be..5a2a1f846 100644
--- a/src/map/packets_keys_main.h
+++ b/src/map/packets_keys_main.h
@@ -37,7 +37,7 @@
 	packetKeys(0x49357d72,0x22c370a1,0x5f836591);
 #endif
 
-// 2010-11-23aRagexeRE, 2010-11-24aRagexeRE, 2010-11-24bRagexeRE, 2010-11-25aRagexeRE, 2010-11-26aRagexeRE, 2010-11-30aRagexeRE, 2010-12-07aRagexeRE, 2010-12-14aRagexeRE, 2010-12-21aRagexeRE, 2010-12-23aRagexeRE, 2010-12-28aRagexeRE, 2011-01-04aRagexeRE, 2011-01-05aRagexeRE, 2011-01-11aRagexeRE, 2011-01-18aRagexeRE, 2011-01-25aRagexeRE, 2011-01-26aRagexeRE, 2011-01-26bRagexeRE, 2011-01-31aRagexeRE, 2011-01-31bRagexeRE, 2011-01-31cRagexeRE, 2011-02-08aRagexeRE, 2011-02-15aRagexeRE, 2011-02-22aRagexeRE, 2011-02-23aRagexeRE, 2011-02-23bRagexeRE, 2011-02-24aRagexeRE, 2011-02-25aRagexeRE, 2011-02-28aRagexeRE, 2011-03-08aRagexeRE, 2011-03-09aRagexeRE, 2011-03-09bRagexeRE, 2011-03-09cRagexeRE, 2011-03-09dRagexeRE, 2011-03-15aRagexeRE, 2011-03-22aRagexeRE, 2011-03-29aRagexeRE, 2011-03-30aRagexeRE, 2011-03-30cRagexeRE, 2011-04-05aRagexeRE, 2011-04-12aRagexeRE, 2011-04-19aRagexeRE, 2011-04-20aRagexeRE, 2011-04-26aRagexeRE, 2011-04-27aRagexeRE, 2011-05-03aRagexeRE, 2011-05-11aRagexeRE, 2011-05-17bRagexeRE, 2011-05-24aRagexeRE, 2011-05-26aRagexeRE, 2011-05-31aRagexeRE, 2011-06-07aRagexeRE, 2011-06-08aRagexeRE, 2011-06-08bRagexeRE, 2011-06-08cRagexeRE, 2011-06-09aRagexeRE, 2011-06-14bRagexeRE, 2011-06-22aRagexeRE, 2011-06-28aRagexeRE, 2011-07-06aRagexeRE, 2011-07-13aRagexeRE, 2011-07-13bRagexeRE, 2011-07-13cRagexeRE, 2011-07-19aRagexeRE, 2011-07-26aRagexeRE, 2011-08-03aRagexeRE, 2011-08-03bRagexeRE, 2011-08-10aRagexeRE, 2013-12-23aRagexeRE, 2014-05-08aRagexe, 2014-05-08aRagexeRE, 2014-06-11eRagexe, 2015-02-25hRagexe, 2018-03-15aRagexe, 2018-03-21aRagexe, 2018-03-21aRagexeRE, 2018-03-28bRagexe, 2018-03-28bRagexeRE, 2018-04-04bRagexe, 2018-04-04cRagexeRE, 2018-04-18aRagexe, 2018-04-18bRagexeRE, 2018-04-25cRagexe, 2018-04-25cRagexeRE, 2018-05-02bRagexe, 2018-05-02bRagexeRE, 2018-05-02dRagexeRE, 2018-05-09aRagexe, 2018-05-16cRagexe, 2018-05-16cRagexeRE, 2018-05-23aRagexe, 2018-05-23aRagexeRE, 2018-05-30aRagexe, 2018-05-30bRagexeRE, 2018-05-30cRagexeRE, 2018-06-05bRagexe, 2018-06-05bRagexeRE, 2018-06-12aRagexeRE, 2018-06-12bRagexeRE, 2018-06-20cRagexe, 2018-06-20dRagexeRE, 2018-06-20eRagexe, 2018-06-20eRagexeRE, 2018-06-21aRagexe, 2018-06-21aRagexeRE, 2018-07-04aRagexe, 2018-07-04aRagexeRE, 2018-07-11aRagexeRE, 2018-07-18bRagexe, 2018-07-18bRagexeRE, 2018-07-18bRagexeRE1, 2018-07-18cRagexe, 2018-07-18cRagexeRE, 2018-08-01cRagexe, 2018-08-01cRagexeRE, 2018-08-08bRagexe, 2018-08-08bRagexeRE, 2018-08-22cRagexe, 2018-08-22cRagexeRE, 2018-08-29aRagexe, 2018-08-29aRagexeRE, 2018-08-29bRagexeRE, 2018-08-31aRagexe, 2018-09-12dRagexe, 2018-09-12dRagexeRE, 2018-09-19aRagexe, 2018-09-19aRagexeRE, 2018-10-02aRagexe, 2018-10-02aRagexeRE, 2018-10-02bRagexe, 2018-10-02bRagexeRE, 2018-10-17_02aRagexe, 2018-10-17_02aRagexeRE, 2018-10-17_03aRagexe, 2018-10-17_03aRagexeRE, 2018-10-17bRagexe, 2018-10-17bRagexeRE, 2018-10-24bRagexe, 2018-10-31aRagexe, 2018-10-31bRagexe, 2018-10-31cRagexeRE, 2018-11-07aRagexe, 2018-11-07aRagexeRE, 2018-11-14cRagexe, 2018-11-14cRagexeRE, 2018-11-14dRagexe, 2018-11-14dRagexeRE, 2018-11-21bRagexe, 2018-11-21cRagexeRE, 2018-11-28aRagexe, 2018-11-28aRagexeRE, 2018-11-28bRagexe, 2018-11-28cRagexe, 2018-12-05aRagexe, 2018-12-05bRagexeRE, 2018-12-12aRagexe, 2018-12-12aRagexeRE, 2018-12-12bRagexe, 2018-12-12bRagexeRE, 2018-12-19bRagexe, 2018-12-19bRagexeRE, 2018-12-26aRagexe, 2018-12-26aRagexeRE, 2019-01-09aRagexe, 2019-01-09bRagexeRE, 2019-01-16bRagexe, 2019-01-16bRagexeRE, 2019-01-16cRagexe, 2019-01-16cRagexeRE, 2019-01-23dRagexe, 2019-01-23dRagexeRE, 2019-02-13IRagexeRE, 2019-02-13bRagexe, 2019-02-13eRagexe, 2019-02-20aRagexeRE, 2019-02-27aRagexe, 2019-02-27bRagexeRE, 2019-02-28aRagexe, 2019-02-28aRagexeRE, 2019-03-06bRagexe, 2019-03-06bRagexeRE, 2019-03-06cRagexe, 2019-03-06cRagexeRE, 2019-03-13aRagexe, 2019-03-20aRagexe, 2019-03-20aRagexeRE, 2019-03-22aRagexe, 2019-03-22aRagexeRE, 2019-03-27bRagexe, 2019-03-27bRagexeRE, 2019-04-03aRagexe, 2019-04-03bRagexeRE, 2019-04-03cRagexeRE, 2019-04-17aRagexe, 2019-04-17cRagexeRE, 2019-04-18aRagexe, 2019-04-18aRagexeRE, 2019-05-08cRagexe, 2019-05-08dRagexeRE, 2019-05-08eRagexeRE, 2019-05-22bRagexe, 2019-05-22bRagexeRE, 2019-05-22cRagexe, 2019-05-22cRagexeRE, 2019-05-23aRagexe, 2019-05-29aRagexe, 2019-05-29bRagexeRE, 2019-05-29cRagexe, 2019-05-29cRagexeRE, 2019-05-30aRagexe, 2019-05-30aRagexeRE, 2019-06-05JRagexeRE, 2019-06-05KRagexe, 2019-06-05LRagexeRE, 2019-06-05fRagexe, 2019-06-05hRagexeRE, 2019-06-19bRagexe, 2019-06-19cRagexeRE, 2019-06-19eRagexe, 2019-06-19hRagexe, 2019-06-26bRagexeRE, 2019-07-03aRagexe, 2019-07-03bRagexeRE, 2019-07-17aRagexe, 2019-07-17cRagexeRE, 2019-07-17dRagexe, 2019-07-17dRagexeRE, 2019-07-24aRagexe, 2019-07-24bRagexeRE, 2019-07-31bRagexe, 2019-07-31bRagexeRE, 2019-08-02aRagexe, 2019-08-02aRagexeRE, 2019-08-07aRagexe, 2019-08-07dRagexeRE, 2019-08-21aRagexe, 2019-08-21cRagexeRE, 2019-08-21dRagexeRE, 2019-08-28aRagexe, 2019-08-28aRagexeRE, 2019-09-04aRagexe, 2019-09-04bRagexe, 2019-09-04bRagexeRE, 2019-09-18bRagexe, 2019-09-18cRagexeRE, 2019-09-25aRagexe, 2019-09-25aRagexeRE, 2019-09-25bRagexe, 2019-09-25bRagexeRE, 2019-10-02bRagexeRE, 2019-10-02cRagexe, 2019-10-02dRagexe, 2019-10-02dRagexeRE, 2019-10-02dRagexeRE_2, 2019-10-16fRagexe, 2019-10-16fRagexeRE, 2019-10-16gRagexe, 2019-10-16gRagexeRE, 2019-10-18aRagexe, 2019-10-23aRagexe, 2019-10-23aRagexeRE, 2019-10-30bRagexeRE, 2019-10-30cRagexe, 2019-11-06aRagexe, 2019-11-06bRagexeRE, 2019-11-07aRagexe, 2019-11-07aRagexeRE, 2019-11-13cRagexe, 2019-11-13eRagexe, 2019-11-13eRagexeRE, 2019-11-20aRagexe, 2019-11-20cRagexeRE, 2019-11-20dRagexe, 2019-11-27aRagexe, 2019-11-27aRagexeRE, 2019-11-27bRagexe, 2019-12-04aRagexe, 2019-12-04aRagexeRE, 2019-12-04bRagexe, 2019-12-04bRagexeRE, 2019-12-04cRagexeRE, 2019-12-11aRagexe, 2019-12-11fRagexeRE, 2019-12-18bRagexe, 2019-12-18bRagexeRE, 2019-12-24aRagexe, 2019-12-24aRagexeRE, 2019-12-24bRagexe, 2019-12-24bRagexeRE, 2020-01-08aRagexe, 2020-01-08bRagexeRE, 2020-01-22cRagexe, 2020-01-22cRagexeRE, 2020-01-29bRagexe, 2020-01-30aRagexe, 2020-02-05aRagexe, 2020-02-05aRagexeRE, 2020-02-06aRagexe, 2020-02-12aRagexe, 2020-02-12aRagexeRE, 2020-02-19dRagexe, 2020-02-19eRagexeRE, 2020-03-04aRagexe, 2020-03-04aRagexeRE, 2020-03-18bRagexe, 2020-04-01bRagexe, 2020-04-14_6aRagexe, 2020-04-14eRagexe
+// 2010-11-23aRagexeRE, 2010-11-24aRagexeRE, 2010-11-24bRagexeRE, 2010-11-25aRagexeRE, 2010-11-26aRagexeRE, 2010-11-30aRagexeRE, 2010-12-07aRagexeRE, 2010-12-14aRagexeRE, 2010-12-21aRagexeRE, 2010-12-23aRagexeRE, 2010-12-28aRagexeRE, 2011-01-04aRagexeRE, 2011-01-05aRagexeRE, 2011-01-11aRagexeRE, 2011-01-18aRagexeRE, 2011-01-25aRagexeRE, 2011-01-26aRagexeRE, 2011-01-26bRagexeRE, 2011-01-31aRagexeRE, 2011-01-31bRagexeRE, 2011-01-31cRagexeRE, 2011-02-08aRagexeRE, 2011-02-15aRagexeRE, 2011-02-22aRagexeRE, 2011-02-23aRagexeRE, 2011-02-23bRagexeRE, 2011-02-24aRagexeRE, 2011-02-25aRagexeRE, 2011-02-28aRagexeRE, 2011-03-08aRagexeRE, 2011-03-09aRagexeRE, 2011-03-09bRagexeRE, 2011-03-09cRagexeRE, 2011-03-09dRagexeRE, 2011-03-15aRagexeRE, 2011-03-22aRagexeRE, 2011-03-29aRagexeRE, 2011-03-30aRagexeRE, 2011-03-30cRagexeRE, 2011-04-05aRagexeRE, 2011-04-12aRagexeRE, 2011-04-19aRagexeRE, 2011-04-20aRagexeRE, 2011-04-26aRagexeRE, 2011-04-27aRagexeRE, 2011-05-03aRagexeRE, 2011-05-11aRagexeRE, 2011-05-17bRagexeRE, 2011-05-24aRagexeRE, 2011-05-26aRagexeRE, 2011-05-31aRagexeRE, 2011-06-07aRagexeRE, 2011-06-08aRagexeRE, 2011-06-08bRagexeRE, 2011-06-08cRagexeRE, 2011-06-09aRagexeRE, 2011-06-14bRagexeRE, 2011-06-22aRagexeRE, 2011-06-28aRagexeRE, 2011-07-06aRagexeRE, 2011-07-13aRagexeRE, 2011-07-13bRagexeRE, 2011-07-13cRagexeRE, 2011-07-19aRagexeRE, 2011-07-26aRagexeRE, 2011-08-03aRagexeRE, 2011-08-03bRagexeRE, 2011-08-10aRagexeRE, 2013-12-23aRagexeRE, 2014-05-08aRagexe, 2014-05-08aRagexeRE, 2014-06-11eRagexe, 2015-02-25hRagexe, 2018-03-15aRagexe, 2018-03-21aRagexe, 2018-03-21aRagexeRE, 2018-03-28bRagexe, 2018-03-28bRagexeRE, 2018-04-04bRagexe, 2018-04-04cRagexeRE, 2018-04-18aRagexe, 2018-04-18bRagexeRE, 2018-04-25cRagexe, 2018-04-25cRagexeRE, 2018-05-02bRagexe, 2018-05-02bRagexeRE, 2018-05-02dRagexeRE, 2018-05-09aRagexe, 2018-05-16cRagexe, 2018-05-16cRagexeRE, 2018-05-23aRagexe, 2018-05-23aRagexeRE, 2018-05-30aRagexe, 2018-05-30bRagexeRE, 2018-05-30cRagexeRE, 2018-06-05bRagexe, 2018-06-05bRagexeRE, 2018-06-12aRagexeRE, 2018-06-12bRagexeRE, 2018-06-20cRagexe, 2018-06-20dRagexeRE, 2018-06-20eRagexe, 2018-06-20eRagexeRE, 2018-06-21aRagexe, 2018-06-21aRagexeRE, 2018-07-04aRagexe, 2018-07-04aRagexeRE, 2018-07-11aRagexeRE, 2018-07-18bRagexe, 2018-07-18bRagexeRE, 2018-07-18bRagexeRE1, 2018-07-18cRagexe, 2018-07-18cRagexeRE, 2018-08-01cRagexe, 2018-08-01cRagexeRE, 2018-08-08bRagexe, 2018-08-08bRagexeRE, 2018-08-22cRagexe, 2018-08-22cRagexeRE, 2018-08-29aRagexe, 2018-08-29aRagexeRE, 2018-08-29bRagexeRE, 2018-08-31aRagexe, 2018-09-12dRagexe, 2018-09-12dRagexeRE, 2018-09-19aRagexe, 2018-09-19aRagexeRE, 2018-10-02aRagexe, 2018-10-02aRagexeRE, 2018-10-02bRagexe, 2018-10-02bRagexeRE, 2018-10-17_02aRagexe, 2018-10-17_02aRagexeRE, 2018-10-17_03aRagexe, 2018-10-17_03aRagexeRE, 2018-10-17bRagexe, 2018-10-17bRagexeRE, 2018-10-24bRagexe, 2018-10-31aRagexe, 2018-10-31bRagexe, 2018-10-31cRagexeRE, 2018-11-07aRagexe, 2018-11-07aRagexeRE, 2018-11-14cRagexe, 2018-11-14cRagexeRE, 2018-11-14dRagexe, 2018-11-14dRagexeRE, 2018-11-21bRagexe, 2018-11-21cRagexeRE, 2018-11-28aRagexe, 2018-11-28aRagexeRE, 2018-11-28bRagexe, 2018-11-28cRagexe, 2018-12-05aRagexe, 2018-12-05bRagexeRE, 2018-12-12aRagexe, 2018-12-12aRagexeRE, 2018-12-12bRagexe, 2018-12-12bRagexeRE, 2018-12-19bRagexe, 2018-12-19bRagexeRE, 2018-12-26aRagexe, 2018-12-26aRagexeRE, 2019-01-09aRagexe, 2019-01-09bRagexeRE, 2019-01-16bRagexe, 2019-01-16bRagexeRE, 2019-01-16cRagexe, 2019-01-16cRagexeRE, 2019-01-23dRagexe, 2019-01-23dRagexeRE, 2019-02-13IRagexeRE, 2019-02-13bRagexe, 2019-02-13eRagexe, 2019-02-20aRagexeRE, 2019-02-27aRagexe, 2019-02-27bRagexeRE, 2019-02-28aRagexe, 2019-02-28aRagexeRE, 2019-03-06bRagexe, 2019-03-06bRagexeRE, 2019-03-06cRagexe, 2019-03-06cRagexeRE, 2019-03-13aRagexe, 2019-03-20aRagexe, 2019-03-20aRagexeRE, 2019-03-22aRagexe, 2019-03-22aRagexeRE, 2019-03-27bRagexe, 2019-03-27bRagexeRE, 2019-04-03aRagexe, 2019-04-03bRagexeRE, 2019-04-03cRagexeRE, 2019-04-17aRagexe, 2019-04-17cRagexeRE, 2019-04-18aRagexe, 2019-04-18aRagexeRE, 2019-05-08cRagexe, 2019-05-08dRagexeRE, 2019-05-08eRagexeRE, 2019-05-22bRagexe, 2019-05-22bRagexeRE, 2019-05-22cRagexe, 2019-05-22cRagexeRE, 2019-05-23aRagexe, 2019-05-29aRagexe, 2019-05-29bRagexeRE, 2019-05-29cRagexe, 2019-05-29cRagexeRE, 2019-05-30aRagexe, 2019-05-30aRagexeRE, 2019-06-05JRagexeRE, 2019-06-05KRagexe, 2019-06-05LRagexeRE, 2019-06-05fRagexe, 2019-06-05hRagexeRE, 2019-06-19bRagexe, 2019-06-19cRagexeRE, 2019-06-19eRagexe, 2019-06-19hRagexe, 2019-06-26bRagexeRE, 2019-07-03aRagexe, 2019-07-03bRagexeRE, 2019-07-17aRagexe, 2019-07-17cRagexeRE, 2019-07-17dRagexe, 2019-07-17dRagexeRE, 2019-07-24aRagexe, 2019-07-24bRagexeRE, 2019-07-31bRagexe, 2019-07-31bRagexeRE, 2019-08-02aRagexe, 2019-08-02aRagexeRE, 2019-08-07aRagexe, 2019-08-07dRagexeRE, 2019-08-21aRagexe, 2019-08-21cRagexeRE, 2019-08-21dRagexeRE, 2019-08-28aRagexe, 2019-08-28aRagexeRE, 2019-09-04aRagexe, 2019-09-04bRagexe, 2019-09-04bRagexeRE, 2019-09-18bRagexe, 2019-09-18cRagexeRE, 2019-09-25aRagexe, 2019-09-25aRagexeRE, 2019-09-25bRagexe, 2019-09-25bRagexeRE, 2019-10-02bRagexeRE, 2019-10-02cRagexe, 2019-10-02dRagexe, 2019-10-02dRagexeRE, 2019-10-02dRagexeRE_2, 2019-10-16fRagexe, 2019-10-16fRagexeRE, 2019-10-16gRagexe, 2019-10-16gRagexeRE, 2019-10-18aRagexe, 2019-10-23aRagexe, 2019-10-23aRagexeRE, 2019-10-30bRagexeRE, 2019-10-30cRagexe, 2019-11-06aRagexe, 2019-11-06bRagexeRE, 2019-11-07aRagexe, 2019-11-07aRagexeRE, 2019-11-13cRagexe, 2019-11-13eRagexe, 2019-11-13eRagexeRE, 2019-11-20aRagexe, 2019-11-20cRagexeRE, 2019-11-20dRagexe, 2019-11-27aRagexe, 2019-11-27aRagexeRE, 2019-11-27bRagexe, 2019-12-04aRagexe, 2019-12-04aRagexeRE, 2019-12-04bRagexe, 2019-12-04bRagexeRE, 2019-12-04cRagexeRE, 2019-12-11aRagexe, 2019-12-11fRagexeRE, 2019-12-18bRagexe, 2019-12-18bRagexeRE, 2019-12-24aRagexe, 2019-12-24aRagexeRE, 2019-12-24bRagexe, 2019-12-24bRagexeRE, 2020-01-08aRagexe, 2020-01-08bRagexeRE, 2020-01-22cRagexe, 2020-01-22cRagexeRE, 2020-01-29bRagexe, 2020-01-30aRagexe, 2020-02-05aRagexe, 2020-02-05aRagexeRE, 2020-02-06aRagexe, 2020-02-12aRagexe, 2020-02-12aRagexeRE, 2020-02-19dRagexe, 2020-02-19eRagexeRE, 2020-03-04aRagexe, 2020-03-04aRagexeRE, 2020-03-18bRagexe, 2020-04-01bRagexe, 2020-04-14_6aRagexe, 2020-04-14eRagexe, 2020-05-06aRagexe, 2020-05-20bRagexe
 #if PACKETVER == 20101123 || \
     PACKETVER == 20101124 || \
     PACKETVER == 20101125 || \
@@ -192,7 +192,9 @@
     PACKETVER == 20200304 || \
     PACKETVER == 20200318 || \
     PACKETVER == 20200401 || \
-    PACKETVER >= 20200414
+    PACKETVER == 20200414 || \
+    PACKETVER == 20200506 || \
+    PACKETVER >= 20200520
 	packetKeys(0x00000000,0x00000000,0x00000000);
 #endif
 
diff --git a/src/map/packets_keys_zero.h b/src/map/packets_keys_zero.h
index 904159d37..700ff4c6c 100644
--- a/src/map/packets_keys_zero.h
+++ b/src/map/packets_keys_zero.h
@@ -30,7 +30,7 @@
 
 /* This file is autogenerated, please do not commit manual changes */
 
-// 2017-10-18aRagexe_zero, 2017-10-19aRagexe_zero, 2017-10-23aRagexe_zero, 2017-10-23bRagexe_zero, 2017-10-23cRagexe_zero, 2017-10-24aRagexe_2_zero, 2017-10-24aRagexe_zero, 2017-10-25bRagexe_zero, 2017-10-27aRagexe_zero, 2017-10-27bRagexe_zero, 2017-10-30aRagexe_zero, 2017-10-31aRagexe_zero, 2017-11-09aRagexe_zero, 2017-11-13aRagexe_zero, 2017-11-13bRagexe_zero, 2018-03-15aRagexe_zero, 2018-03-21aRagexe_zero, 2018-03-21bRagexe_zero, 2018-03-28_1aRagexe_zero, 2018-03-28cRagexe_zero, 2018-04-11aRagexe_zero, 2018-04-25_3aRagexe_zero, 2018-05-09_3aRagexe_zero, 2018-05-23aRagexe_zero, 2018-06-05bRagexe_zero, 2018-06-05cRagexe_zero, 2018-06-27aRagexe_zero, 2018-07-03aRagexe_zero, 2018-07-11_2aRagexe_zero, 2018-07-25_2aRagexe_zero, 2018-08-01aRagexe_zero, 2018-08-08_2aRagexe_zero, 2018-08-22aRagexe_zero, 2018-08-29aRagexe_zero, 2018-09-05aRagexe_zero, 2018-09-12aRagexe_zero, 2018-09-19aRagexe_zero, 2018-09-28aRagexe_zero, 2018-10-10_2aRagexe_zero, 2018-10-24_2aRagexe_zero, 2018-11-14aRagexe_zero, 2018-11-20aRagexe_zero, 2018-11-28aRagexe_zero, 2018-12-12aRagexe_zero, 2018-12-19aRagexe_zero, 2018-12-26_2aRagexe_zero, 2019-01-16_2aRagexe_zero, 2019-01-17_1aRagexe_zero, 2019-01-30_2aRagexe_zero, 2019-02-13aRagexe_zero, 2019-02-20aRagexe_zero, 2019-02-27aRagexe_zero, 2019-03-13aRagexe_zero, 2019-03-27_2aRagexe_zero, 2019-03-27_3aRagexe_zero, 2019-04-03aRagexe_zero, 2019-04-10bRagexe_zero, 2019-04-24aRagexe_zero, 2019-05-02aRagexe_zero, 2019-05-08_2aRagexe_zero, 2019-05-08aRagexe_zero, 2019-05-15aRagexe_zero, 2019-05-29aRagexe_zero, 2019-05-30aRagexe_zero, 2019-06-05_2aRagexe_zero, 2019-06-26_2aRagexe_zero, 2019-06-26_3aRagexe_zero, 2019-07-09aRagexe_zero, 2019-07-10_3aRagexe_zero, 2019-07-17aRagexe_zero, 2019-07-24aRagexe_zero, 2019-08-14_3aRagexe_zero, 2019-08-28_2aRagexe_zero, 2019-08-28_3aRagexe_zero, 2019-09-11aRagexe_zero, 2019-09-18_2aRagexe_zero, 2019-09-18aRagexe_zero, 2019-09-25_3aRagexe_zero, 2019-09-25_5aRagexe_zero, 2019-10-08_2aRagexe_zero, 2019-10-23_2aRagexe_zero, 2019-11-06aRagexe_zero, 2019-11-13aRagexe_zero, 2019-11-27_2aRagexe_zero, 2019-11-27aRagexe_zero, 2019-12-04aRagexe_zero, 2019-12-11_2aRagexe_zero, 2019-12-24_4aRagexe_zero, 2019-12-24_5aRagexe_zero, 2020-01-15_2aRagexe_zero, 2020-01-15aRagexe_zero, 2020-01-29_2aRagexe_zero, 2020-01-29aRagexe_zero, 2020-02-12aRagexe_zero, 2020-02-26aRagexe_zero, 2020-02-26bRagexe_zero, 2020-03-04aRagexe_zero, 2020-03-18_2aRagexe_zero, 2020-04-01_2aRagexe_zero, 2020-04-14bRagexe_zero
+// 2017-10-18aRagexe_zero, 2017-10-19aRagexe_zero, 2017-10-23aRagexe_zero, 2017-10-23bRagexe_zero, 2017-10-23cRagexe_zero, 2017-10-24aRagexe_2_zero, 2017-10-24aRagexe_zero, 2017-10-25bRagexe_zero, 2017-10-27aRagexe_zero, 2017-10-27bRagexe_zero, 2017-10-30aRagexe_zero, 2017-10-31aRagexe_zero, 2017-11-09aRagexe_zero, 2017-11-13aRagexe_zero, 2017-11-13bRagexe_zero, 2018-03-15aRagexe_zero, 2018-03-21aRagexe_zero, 2018-03-21bRagexe_zero, 2018-03-28_1aRagexe_zero, 2018-03-28cRagexe_zero, 2018-04-11aRagexe_zero, 2018-04-25_3aRagexe_zero, 2018-05-09_3aRagexe_zero, 2018-05-23aRagexe_zero, 2018-06-05bRagexe_zero, 2018-06-05cRagexe_zero, 2018-06-27aRagexe_zero, 2018-07-03aRagexe_zero, 2018-07-11_2aRagexe_zero, 2018-07-25_2aRagexe_zero, 2018-08-01aRagexe_zero, 2018-08-08_2aRagexe_zero, 2018-08-22aRagexe_zero, 2018-08-29aRagexe_zero, 2018-09-05aRagexe_zero, 2018-09-12aRagexe_zero, 2018-09-19aRagexe_zero, 2018-09-28aRagexe_zero, 2018-10-10_2aRagexe_zero, 2018-10-24_2aRagexe_zero, 2018-11-14aRagexe_zero, 2018-11-20aRagexe_zero, 2018-11-28aRagexe_zero, 2018-12-12aRagexe_zero, 2018-12-19aRagexe_zero, 2018-12-26_2aRagexe_zero, 2019-01-16_2aRagexe_zero, 2019-01-17_1aRagexe_zero, 2019-01-30_2aRagexe_zero, 2019-02-13aRagexe_zero, 2019-02-20aRagexe_zero, 2019-02-27aRagexe_zero, 2019-03-13aRagexe_zero, 2019-03-27_2aRagexe_zero, 2019-03-27_3aRagexe_zero, 2019-04-03aRagexe_zero, 2019-04-10bRagexe_zero, 2019-04-24aRagexe_zero, 2019-05-02aRagexe_zero, 2019-05-08_2aRagexe_zero, 2019-05-08aRagexe_zero, 2019-05-15aRagexe_zero, 2019-05-29aRagexe_zero, 2019-05-30aRagexe_zero, 2019-06-05_2aRagexe_zero, 2019-06-26_2aRagexe_zero, 2019-06-26_3aRagexe_zero, 2019-07-09aRagexe_zero, 2019-07-10_3aRagexe_zero, 2019-07-17aRagexe_zero, 2019-07-24aRagexe_zero, 2019-08-14_3aRagexe_zero, 2019-08-28_2aRagexe_zero, 2019-08-28_3aRagexe_zero, 2019-09-11aRagexe_zero, 2019-09-18_2aRagexe_zero, 2019-09-18aRagexe_zero, 2019-09-25_3aRagexe_zero, 2019-09-25_5aRagexe_zero, 2019-10-08_2aRagexe_zero, 2019-10-23_2aRagexe_zero, 2019-11-06aRagexe_zero, 2019-11-13aRagexe_zero, 2019-11-27_2aRagexe_zero, 2019-11-27aRagexe_zero, 2019-12-04aRagexe_zero, 2019-12-11_2aRagexe_zero, 2019-12-24_4aRagexe_zero, 2019-12-24_5aRagexe_zero, 2020-01-15_2aRagexe_zero, 2020-01-15aRagexe_zero, 2020-01-29_2aRagexe_zero, 2020-01-29aRagexe_zero, 2020-02-12aRagexe_zero, 2020-02-26aRagexe_zero, 2020-02-26bRagexe_zero, 2020-03-04aRagexe_zero, 2020-03-18_2aRagexe_zero, 2020-04-01_2aRagexe_zero, 2020-04-14bRagexe_zero, 2020-05-06aRagexe_zero, 2020-05-20_5aRagexe_zero
 #if PACKETVER == 20171018 || \
     PACKETVER == 20171019 || \
     PACKETVER == 20171023 || \
@@ -111,7 +111,9 @@
     PACKETVER == 20200304 || \
     PACKETVER == 20200318 || \
     PACKETVER == 20200401 || \
-    PACKETVER >= 20200414
+    PACKETVER == 20200414 || \
+    PACKETVER == 20200506 || \
+    PACKETVER >= 20200520
 	packetKeys(0x00000000,0x00000000,0x00000000);
 #endif
 
diff --git a/src/map/packets_shuffle_main.h b/src/map/packets_shuffle_main.h
index d643f3b0e..ba234bdb8 100644
--- a/src/map/packets_shuffle_main.h
+++ b/src/map/packets_shuffle_main.h
@@ -40,3312 +40,3312 @@
 // 2012-07-10aRagexe, 2012-07-12aRagexe
 #if PACKETVER == 20120710 || \
     PACKETVER == 20120712
-	packet(0x0202,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x02c4,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0362,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0365,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0367,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0436,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x07e4,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0811,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x085b,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0877,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0878,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x087f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x088d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0893,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0899,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a3,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a6,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a8,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08aa,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0936,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0948,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0953,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0956,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0958,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0960,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
+	packet(0x0202,clif->pSolveCharName,2);
+	packet(0x02c4,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0362,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0365,clif->pFriendsListAdd,2);
+	packet(0x0367,clif->pMoveToKafra,2,4);
+	packet(0x0436,clif->pActionRequest,2,6);
+	packet(0x07e4,clif->pTickSend,2);
+	packet(0x0811,clif->pReqClickBuyingStore,2);
+	packet(0x085b,clif->pUseSkillToId,2,4,6);
+	packet(0x0877,clif->pGetCharNameRequest,2);
+	packet(0x0878,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x087f,clif->pWalkToXY,2);
+	packet(0x088d,clif->pChangeDir,2,4);
+	packet(0x0893,clif->pStoragePassword,0);
+	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0899,clif->pTakeItem,2);
+	packet(0x08a3,clif->pDropItem,2,4);
+	packet(0x08a6,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a8,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08aa,clif->pMoveFromKafra,2,4);
+	packet(0x092d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0936,clif->pDull/*,XXX*/);
+	packet(0x0948,clif->pReqCloseBuyingStore,0);
+	packet(0x094b,clif->pHomMenu,2,4);
+	packet(0x094e,clif->pPartyInvite2,2);
+	packet(0x0953,clif->pDull/*,XXX*/);
+	packet(0x0956,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0958,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0960,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
 #endif
 
 // 2012-07-16aRagexe
 #if PACKETVER == 20120716
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x089f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x089f,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2012-07-24aRagexe
 #if PACKETVER == 20120724
-	packet(0x035f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0815,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0835,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0865,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0866,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0872,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0877,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x087c,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0887,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0888,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x088e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a1,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08a9,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08ab,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x091f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0928,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0929,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x092b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0935,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0938,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x093c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0945,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0957,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0959,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0963,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0965,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0966,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
+	packet(0x035f,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pReqClickBuyingStore,2);
+	packet(0x0815,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0835,clif->pPartyInvite2,2);
+	packet(0x0865,clif->pReqCloseBuyingStore,0);
+	packet(0x0866,clif->pDull/*,XXX*/);
+	packet(0x0872,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0877,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x087c,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0887,clif->pChangeDir,2,4);
+	packet(0x0888,clif->pHomMenu,2,4);
+	packet(0x088e,clif->pUseSkillToId,2,4,6);
+	packet(0x08a1,clif->pGetCharNameRequest,2);
+	packet(0x08a9,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08ab,clif->pTakeItem,2);
+	packet(0x091c,clif->pWalkToXY,2);
+	packet(0x091f,clif->pTickSend,2);
+	packet(0x0928,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0929,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x092b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0935,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0938,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x093c,clif->pMoveToKafra,2,4);
+	packet(0x0945,clif->pActionRequest,2,6);
+	packet(0x0957,clif->pStoragePassword,0);
+	packet(0x0959,clif->pFriendsListAdd,2);
+	packet(0x0963,clif->pDropItem,2,4);
+	packet(0x0965,clif->pSolveCharName,2);
+	packet(0x0966,clif->pMoveFromKafra,2,4);
 #endif
 
 // 2012-08-01aRagexe, 2012-08-01bRagexe
 #if PACKETVER == 20120801
-	packet(0x0360,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0438,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x086a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x086f,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0873,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0875,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x087b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x088b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0890,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0895,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x089c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x089d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a2,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08aa,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ab,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0917,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x092a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x092e,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0930,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0934,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x093c,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0941,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0946,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x094e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0964,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
+	packet(0x0360,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0438,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x085d,clif->pSolveCharName,2);
+	packet(0x086a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086b,clif->pGetCharNameRequest,2);
+	packet(0x086f,clif->pReqCloseBuyingStore,0);
+	packet(0x0873,clif->pUseSkillToId,2,4,6);
+	packet(0x0875,clif->pTakeItem,2);
+	packet(0x087b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x088b,clif->pHomMenu,2,4);
+	packet(0x0890,clif->pActionRequest,2,6);
+	packet(0x0895,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x089c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x089d,clif->pDropItem,2,4);
+	packet(0x089f,clif->pWalkToXY,2);
+	packet(0x08a2,clif->pFriendsListAdd,2);
+	packet(0x08aa,clif->pChangeDir,2,4);
+	packet(0x08ab,clif->pMoveFromKafra,2,4);
+	packet(0x0917,clif->pStoragePassword,0);
+	packet(0x091d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x092a,clif->pDull/*,XXX*/);
+	packet(0x092e,clif->pReqClickBuyingStore,2);
+	packet(0x0930,clif->pTickSend,2);
+	packet(0x0934,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x093c,clif->pPartyInvite2,2);
+	packet(0x0941,clif->pMoveToKafra,2,4);
+	packet(0x0946,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x094e,clif->pDull/*,XXX*/);
+	packet(0x0964,clif->pSearchStoreInfoListItemClick,2,6,10);
 #endif
 
 // 2012-08-08aRagexe, 2012-08-08bRagexe, 2012-08-08cRagexe
 #if PACKETVER == 20120808
-	packet(0x0202,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088f,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x093d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pFriendsListAdd,2);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085f,clif->pStoragePassword,0);
+	packet(0x088f,clif->pChangeDir,2,4);
+	packet(0x093d,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2012-08-14aRagexe, 2012-08-14bRagexe
 #if PACKETVER == 20120814
-	packet(0x0281,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0361,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0365,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0366,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0438,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x07ec,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0815,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0838,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x085e,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0861,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0862,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0865,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0868,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x086f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0875,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0882,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x088b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x088d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0895,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08a8,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x091f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0920,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0929,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0932,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0934,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0941,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0967,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0969,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x0281,clif->pHomMenu,2,4);
+	packet(0x0361,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0365,clif->pSolveCharName,2);
+	packet(0x0366,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0438,clif->pTickSend,2);
+	packet(0x07ec,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0815,clif->pDropItem,2,4);
+	packet(0x0838,clif->pReqCloseBuyingStore,0);
+	packet(0x085e,clif->pMoveToKafra,2,4);
+	packet(0x0861,clif->pReqClickBuyingStore,2);
+	packet(0x0862,clif->pTakeItem,2);
+	packet(0x0865,clif->pMoveFromKafra,2,4);
+	packet(0x0868,clif->pActionRequest,2,6);
+	packet(0x086f,clif->pStoragePassword,0);
+	packet(0x0875,clif->pWalkToXY,2);
+	packet(0x087f,clif->pPartyInvite2,2);
+	packet(0x0882,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x088b,clif->pFriendsListAdd,2);
+	packet(0x088d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0895,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08a8,clif->pDull/*,XXX*/);
+	packet(0x091f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0920,clif->pGetCharNameRequest,2);
+	packet(0x0929,clif->pDull/*,XXX*/);
+	packet(0x0932,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0934,clif->pUseSkillToId,2,4,6);
+	packet(0x0941,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0967,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0969,clif->pChangeDir,2,4);
 #endif
 
 // 2012-08-22aRagexe, 2012-08-22bRagexe, 2012-08-22cRagexe
 #if PACKETVER == 20120822
-	packet(0x0365,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0437,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x085a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x085c,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x085d,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x086e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0872,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x087c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x087d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0885,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0899,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a5,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08ab,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0917,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0924,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0927,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0935,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0937,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0940,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0943,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x094d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094e,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0953,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0955,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0958,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x095b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
+	packet(0x0365,clif->pFriendsListAdd,2);
+	packet(0x0437,clif->pTakeItem,2);
+	packet(0x085a,clif->pWalkToXY,2);
+	packet(0x085c,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x085d,clif->pUseSkillToId,2,4,6);
+	packet(0x086b,clif->pSolveCharName,2);
+	packet(0x086e,clif->pChangeDir,2,4);
+	packet(0x0872,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x087c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x087d,clif->pTickSend,2);
+	packet(0x0885,clif->pDull/*,XXX*/);
+	packet(0x088a,clif->pMoveToKafra,2,4);
+	packet(0x0899,clif->pPartyInvite2,2);
+	packet(0x089f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a5,clif->pDull/*,XXX*/);
+	packet(0x08ab,clif->pActionRequest,2,6);
+	packet(0x0917,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0924,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0927,clif->pGetCharNameRequest,2);
+	packet(0x0935,clif->pHomMenu,2,4);
+	packet(0x0937,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0940,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0943,clif->pMoveFromKafra,2,4);
+	packet(0x094d,clif->pStoragePassword,0);
+	packet(0x094e,clif->pDropItem,2,4);
+	packet(0x0953,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0955,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0958,clif->pReqCloseBuyingStore,0);
+	packet(0x095b,clif->pReqClickBuyingStore,2);
 #endif
 
 // 2012-08-30aRagexe
 #if PACKETVER == 20120830
-	packet(0x022d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0364,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0802,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0838,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0861,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0872,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0887,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0888,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0890,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x091d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0926,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0934,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0945,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x094b,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0964,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0364,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pPartyInvite2,2);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0802,clif->pStoragePassword,0);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pMoveToKafra,2,4);
+	packet(0x0838,clif->pHomMenu,2,4);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0861,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0872,clif->pFriendsListAdd,2);
+	packet(0x0887,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0888,clif->pDull/*,XXX*/);
+	packet(0x0890,clif->pDull/*,XXX*/);
+	packet(0x091d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0926,clif->pMoveFromKafra,2,4);
+	packet(0x0934,clif->pChangeDir,2,4);
+	packet(0x0945,clif->pDropItem,2,4);
+	packet(0x094b,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0964,clif->pTakeItem,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2012-09-05aRagexe
 #if PACKETVER == 20120905
-	packet(0x022d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0365,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0817,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x085a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x085d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x086f,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0876,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0877,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0878,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087a,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x087e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0887,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0895,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0897,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a0,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a6,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0917,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0918,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x091a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0927,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x093c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0944,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0945,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0950,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0954,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0959,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0960,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0967,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
+	packet(0x022d,clif->pMoveToKafra,2,4);
+	packet(0x0365,clif->pDull/*,XXX*/);
+	packet(0x0817,clif->pStoragePassword,0);
+	packet(0x085a,clif->pSearchStoreInfoNextPage,0);
+	packet(0x085d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x086f,clif->pSolveCharName,2);
+	packet(0x0876,clif->pHomMenu,2,4);
+	packet(0x0877,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0878,clif->pWalkToXY,2);
+	packet(0x087a,clif->pUseSkillToId,2,4,6);
+	packet(0x087b,clif->pTickSend,2);
+	packet(0x087e,clif->pMoveFromKafra,2,4);
+	packet(0x0887,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0895,clif->pChangeDir,2,4);
+	packet(0x0897,clif->pTakeItem,2);
+	packet(0x08a0,clif->pDull/*,XXX*/);
+	packet(0x08a6,clif->pFriendsListAdd,2);
+	packet(0x0917,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0918,clif->pItemListWindowSelected,2,4,8);
+	packet(0x091a,clif->pGetCharNameRequest,2);
+	packet(0x0927,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x093c,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0944,clif->pPartyInvite2,2);
+	packet(0x0945,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0950,clif->pDropItem,2,4);
+	packet(0x0954,clif->pReqCloseBuyingStore,0);
+	packet(0x0959,clif->pReqClickBuyingStore,2);
+	packet(0x0960,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0967,clif->pActionRequest,2,6);
 #endif
 
 // 2012-09-11aRagexe
 #if PACKETVER == 20120911
-	packet(0x0438,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0819,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0868,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0876,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0877,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0879,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x087a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x088f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a4,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a5,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08a6,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a7,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08ad,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0930,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0935,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x093e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0948,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0949,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x094b,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0958,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0959,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0962,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0963,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0966,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0968,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
+	packet(0x0438,clif->pTickSend,2);
+	packet(0x0819,clif->pMoveFromKafra,2,4);
+	packet(0x0868,clif->pTakeItem,2);
+	packet(0x086f,clif->pWalkToXY,2);
+	packet(0x0876,clif->pHomMenu,2,4);
+	packet(0x0877,clif->pPartyInvite2,2);
+	packet(0x0879,clif->pReqClickBuyingStore,2);
+	packet(0x087a,clif->pDull/*,XXX*/);
+	packet(0x088a,clif->pGetCharNameRequest,2);
+	packet(0x088f,clif->pFriendsListAdd,2);
+	packet(0x08a4,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x08a5,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08a6,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a7,clif->pDropItem,2,4);
+	packet(0x08ad,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0930,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0935,clif->pReqCloseBuyingStore,0);
+	packet(0x093e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0948,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0949,clif->pDull/*,XXX*/);
+	packet(0x094b,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0958,clif->pUseSkillToId,2,4,6);
+	packet(0x0959,clif->pActionRequest,2,6);
+	packet(0x0962,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0963,clif->pSolveCharName,2);
+	packet(0x0966,clif->pMoveToKafra,2,4);
+	packet(0x0968,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pStoragePassword,0);
 #endif
 
 // 2012-09-19aRagexe
 #if PACKETVER == 20120919
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0956,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0956,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2012-09-25aRagexe, 2012-09-26aRagexe
 #if PACKETVER == 20120925 || \
     PACKETVER == 20120926
-	packet(0x07e4,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0815,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0819,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0835,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0838,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x085d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0869,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0873,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x087a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x087e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0887,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x088a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x088d,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x089d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a4,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x091c,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x091e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0923,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0927,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0932,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0942,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0948,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0950,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0956,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0957,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0958,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x095e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0963,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
+	packet(0x07e4,clif->pDull/*,XXX*/);
+	packet(0x0815,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0819,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0835,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0838,clif->pGetCharNameRequest,2);
+	packet(0x085d,clif->pHomMenu,2,4);
+	packet(0x0869,clif->pMoveToKafra,2,4);
+	packet(0x0873,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x087a,clif->pDropItem,2,4);
+	packet(0x087e,clif->pFriendsListAdd,2);
+	packet(0x0887,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x088a,clif->pPartyInvite2,2);
+	packet(0x088d,clif->pUseSkillToId,2,4,6);
+	packet(0x088f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x089d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a4,clif->pActionRequest,2,6);
+	packet(0x091c,clif->pSearchStoreInfoNextPage,0);
+	packet(0x091e,clif->pReqCloseBuyingStore,0);
+	packet(0x0923,clif->pTakeItem,2);
+	packet(0x0927,clif->pReqClickBuyingStore,2);
+	packet(0x0932,clif->pTickSend,2);
+	packet(0x0942,clif->pStoragePassword,0);
+	packet(0x0948,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0950,clif->pWalkToXY,2);
+	packet(0x0956,clif->pDull/*,XXX*/);
+	packet(0x0957,clif->pChangeDir,2,4);
+	packet(0x0958,clif->pSolveCharName,2);
+	packet(0x095e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0963,clif->pMoveFromKafra,2,4);
 #endif
 
 // 2012-10-10aRagexe, 2012-10-10bRagexe
 #if PACKETVER == 20121010
-	packet(0x0202,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0817,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x085a,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0869,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086c,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0874,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0883,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0888,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0891,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0896,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0898,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a1,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a9,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0925,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0934,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x093c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0942,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0946,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0947,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x094c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0957,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0958,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0959,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x095c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0964,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0969,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x0202,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0817,clif->pGetCharNameRequest,2);
+	packet(0x085a,clif->pReqCloseBuyingStore,0);
+	packet(0x0869,clif->pTakeItem,2);
+	packet(0x086c,clif->pDull/*,XXX*/);
+	packet(0x0874,clif->pMoveFromKafra,2,4);
+	packet(0x087d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0883,clif->pWalkToXY,2);
+	packet(0x0888,clif->pDull/*,XXX*/);
+	packet(0x088f,clif->pPartyInvite2,2);
+	packet(0x0891,clif->pUseSkillToId,2,4,6);
+	packet(0x0896,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0898,clif->pStoragePassword,0);
+	packet(0x08a1,clif->pActionRequest,2,6);
+	packet(0x08a6,clif->pSolveCharName,2);
+	packet(0x08a9,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0925,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0934,clif->pTickSend,2);
+	packet(0x093c,clif->pMoveToKafra,2,4);
+	packet(0x0942,clif->pReqClickBuyingStore,2);
+	packet(0x0946,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0947,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x094c,clif->pDropItem,2,4);
+	packet(0x0957,clif->pChangeDir,2,4);
+	packet(0x0958,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0959,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x095c,clif->pHomMenu,2,4);
+	packet(0x0964,clif->pFriendsListAdd,2);
+	packet(0x0969,clif->pPartyBookingRegisterReq,2,4,6);
 #endif
 
 // 2012-10-17aRagexe, 2012-10-17bRagexe
 #if PACKETVER == 20121017
-	packet(0x023b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0365,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0868,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x086b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0887,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0888,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0897,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x089a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a6,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0918,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0920,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0960,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0962,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0965,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pPartyInvite2,2);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0365,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pMoveFromKafra,2,4);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0868,clif->pDull/*,XXX*/);
+	packet(0x086b,clif->pDropItem,2,4);
+	packet(0x0887,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0888,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0897,clif->pMoveToKafra,2,4);
+	packet(0x089a,clif->pFriendsListAdd,2);
+	packet(0x08a6,clif->pChangeDir,2,4);
+	packet(0x0918,clif->pStoragePassword,0);
+	packet(0x0920,clif->pDull/*,XXX*/);
+	packet(0x0960,clif->pHomMenu,2,4);
+	packet(0x0962,clif->pTakeItem,2);
+	packet(0x0965,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2012-10-24aRagexe
 #if PACKETVER == 20121024
-	packet(0x0436,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0437,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0438,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0817,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0838,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0868,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0872,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0875,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x087e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0882,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0888,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0889,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x088a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x089c,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a9,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08aa,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0931,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0938,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x093a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0942,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0947,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0954,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0955,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x095d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095e,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0965,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
+	packet(0x0436,clif->pWalkToXY,2);
+	packet(0x0437,clif->pUseSkillToId,2,4,6);
+	packet(0x0438,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0817,clif->pActionRequest,2,6);
+	packet(0x0838,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x085a,clif->pMoveFromKafra,2,4);
+	packet(0x0868,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0872,clif->pGetCharNameRequest,2);
+	packet(0x0875,clif->pDull/*,XXX*/);
+	packet(0x087a,clif->pMoveToKafra,2,4);
+	packet(0x087b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x087e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0882,clif->pStoragePassword,0);
+	packet(0x0888,clif->pHomMenu,2,4);
+	packet(0x0889,clif->pDropItem,2,4);
+	packet(0x088a,clif->pReqClickBuyingStore,2);
+	packet(0x089c,clif->pPartyInvite2,2);
+	packet(0x08a9,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08aa,clif->pChangeDir,2,4);
+	packet(0x0931,clif->pTakeItem,2);
+	packet(0x0938,clif->pReqCloseBuyingStore,0);
+	packet(0x093a,clif->pDull/*,XXX*/);
+	packet(0x0942,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0947,clif->pTickSend,2);
+	packet(0x0954,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0955,clif->pSearchStoreInfoNextPage,0);
+	packet(0x095d,clif->pFriendsListAdd,2);
+	packet(0x095e,clif->pSolveCharName,2);
+	packet(0x0965,clif->pWantToConnection,2,6,10,14,18);
 #endif
 
 // 2012-10-31aRagexe
 #if PACKETVER == 20121031
-	packet(0x022d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0871,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0877,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0898,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pTickSend,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pHomMenu,2,4);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pFriendsListAdd,2);
+	packet(0x0871,clif->pChangeDir,2,4);
+	packet(0x0877,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0898,clif->pStoragePassword,0);
+	packet(0x092b,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2012-11-07aRagexe
 #if PACKETVER == 20121107
-	packet(0x0360,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0361,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0365,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x085c,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0861,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0865,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x086c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x086d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0871,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0873,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0878,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x087f,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x088f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0890,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0891,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0896,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x089a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x089b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x08a2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08ad,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0922,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0934,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x093b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0945,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x094d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0960,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0963,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0966,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x096a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
+	packet(0x0360,clif->pTakeItem,2);
+	packet(0x0361,clif->pStoragePassword,0);
+	packet(0x0365,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x085c,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0861,clif->pTickSend,2);
+	packet(0x0865,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x086c,clif->pHomMenu,2,4);
+	packet(0x086d,clif->pSolveCharName,2);
+	packet(0x0871,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0873,clif->pMoveToKafra,2,4);
+	packet(0x0878,clif->pPartyInvite2,2);
+	packet(0x087f,clif->pChangeDir,2,4);
+	packet(0x088f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0890,clif->pUseSkillToId,2,4,6);
+	packet(0x0891,clif->pMoveFromKafra,2,4);
+	packet(0x0896,clif->pReqClickBuyingStore,2);
+	packet(0x089a,clif->pActionRequest,2,6);
+	packet(0x089b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x08a2,clif->pReqCloseBuyingStore,0);
+	packet(0x08ad,clif->pGetCharNameRequest,2);
+	packet(0x0922,clif->pDull/*,XXX*/);
+	packet(0x0934,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x093b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0945,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x094d,clif->pWalkToXY,2);
+	packet(0x0960,clif->pDropItem,2,4);
+	packet(0x0963,clif->pDull/*,XXX*/);
+	packet(0x0966,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x096a,clif->pFriendsListAdd,2);
 #endif
 
 // 2012-11-14aRagexe
 #if PACKETVER == 20121114
-	packet(0x0364,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0365,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0437,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0815,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0838,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0862,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0876,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0879,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0881,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0898,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0899,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a9,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08aa,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08ab,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0930,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0935,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0938,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x093b,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x093c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0941,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0944,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0949,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x094b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x094f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x095c,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0965,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x096a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
+	packet(0x0364,clif->pStoragePassword,0);
+	packet(0x0365,clif->pHomMenu,2,4);
+	packet(0x0437,clif->pDropItem,2,4);
+	packet(0x0815,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0838,clif->pPartyInvite2,2);
+	packet(0x0862,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0876,clif->pSolveCharName,2);
+	packet(0x0879,clif->pGetCharNameRequest,2);
+	packet(0x0881,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0898,clif->pActionRequest,2,6);
+	packet(0x0899,clif->pWalkToXY,2);
+	packet(0x08a9,clif->pTickSend,2);
+	packet(0x08aa,clif->pReqCloseBuyingStore,0);
+	packet(0x08ab,clif->pChangeDir,2,4);
+	packet(0x091a,clif->pMoveFromKafra,2,4);
+	packet(0x0930,clif->pDull/*,XXX*/);
+	packet(0x0935,clif->pUseSkillToId,2,4,6);
+	packet(0x0938,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x093b,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x093c,clif->pMoveToKafra,2,4);
+	packet(0x0941,clif->pFriendsListAdd,2);
+	packet(0x0944,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0949,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x094a,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x094b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x094f,clif->pReqClickBuyingStore,2);
+	packet(0x095c,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0965,clif->pTakeItem,2);
+	packet(0x096a,clif->pDull/*,XXX*/);
 #endif
 
 // 2012-11-21aRagexe
 #if PACKETVER == 20121121
-	packet(0x0202,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0362,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0437,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0863,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x086c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x086d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x086f,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0872,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0875,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087e,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0880,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0892,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0899,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089a,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a7,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08aa,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x091a,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0921,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0927,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0929,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0938,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0946,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x094d,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0950,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0952,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0954,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0957,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0958,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
+	packet(0x0202,clif->pUseSkillToId,2,4,6);
+	packet(0x0362,clif->pReqCloseBuyingStore,0);
+	packet(0x0437,clif->pTakeItem,2);
+	packet(0x0863,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x086c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x086d,clif->pSolveCharName,2);
+	packet(0x086f,clif->pMoveFromKafra,2,4);
+	packet(0x0872,clif->pGetCharNameRequest,2);
+	packet(0x0875,clif->pMoveToKafra,2,4);
+	packet(0x087e,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0880,clif->pChangeDir,2,4);
+	packet(0x0892,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0899,clif->pFriendsListAdd,2);
+	packet(0x089a,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x08a7,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08aa,clif->pActionRequest,2,6);
+	packet(0x091a,clif->pTickSend,2);
+	packet(0x0921,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0927,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0929,clif->pDull/*,XXX*/);
+	packet(0x0938,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0946,clif->pWalkToXY,2);
+	packet(0x094d,clif->pDull/*,XXX*/);
+	packet(0x0950,clif->pHomMenu,2,4);
+	packet(0x0952,clif->pDropItem,2,4);
+	packet(0x0954,clif->pStoragePassword,0);
+	packet(0x0957,clif->pPartyInvite2,2);
+	packet(0x0958,clif->pReqClickBuyingStore,2);
 #endif
 
 // 2012-11-28aRagexe
 #if PACKETVER == 20121128
-	packet(0x0362,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0363,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x07ec,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0802,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0861,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0867,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x086c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x086e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0872,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0888,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x088b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0894,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0895,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a8,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08ad,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x091b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x091c,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x091e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x091f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0921,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0922,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0931,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0945,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0947,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0950,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0953,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0954,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0960,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
+	packet(0x0362,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0363,clif->pFriendsListAdd,2);
+	packet(0x07ec,clif->pPartyInvite2,2);
+	packet(0x0802,clif->pStoragePassword,0);
+	packet(0x0861,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0867,clif->pTickSend,2);
+	packet(0x086c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x086e,clif->pDull/*,XXX*/);
+	packet(0x0872,clif->pUseSkillToId,2,4,6);
+	packet(0x0888,clif->pChangeDir,2,4);
+	packet(0x088b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0894,clif->pDull/*,XXX*/);
+	packet(0x0895,clif->pTakeItem,2);
+	packet(0x08a8,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08ad,clif->pWalkToXY,2);
+	packet(0x091b,clif->pSolveCharName,2);
+	packet(0x091c,clif->pGetCharNameRequest,2);
+	packet(0x091e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x091f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0921,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0922,clif->pMoveFromKafra,2,4);
+	packet(0x092f,clif->pReqClickBuyingStore,2);
+	packet(0x0931,clif->pActionRequest,2,6);
+	packet(0x0945,clif->pHomMenu,2,4);
+	packet(0x0947,clif->pReqCloseBuyingStore,0);
+	packet(0x0950,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0953,clif->pDropItem,2,4);
+	packet(0x0954,clif->pMoveToKafra,2,4);
+	packet(0x0960,clif->pReqTradeBuyingStore,2,4,8,12);
 #endif
 
 // 2012-12-05aRagexe, 2012-12-05bRagexe
 #if PACKETVER == 20121205
-	packet(0x035f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0360,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0815,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0863,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0864,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x086c,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0870,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0873,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0875,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0878,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0888,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0889,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x088b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x089a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08ad,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x091a,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x091c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0921,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x093a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x093e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0946,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x094b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0954,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0959,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0966,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0968,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x035f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0360,clif->pWalkToXY,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0815,clif->pTakeItem,2);
+	packet(0x0863,clif->pTickSend,2);
+	packet(0x0864,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x086c,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0870,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0873,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0875,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0878,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0888,clif->pStoragePassword,0);
+	packet(0x0889,clif->pDropItem,2,4);
+	packet(0x088b,clif->pDull/*,XXX*/);
+	packet(0x089a,clif->pFriendsListAdd,2);
+	packet(0x089d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08ad,clif->pSolveCharName,2);
+	packet(0x091a,clif->pReqCloseBuyingStore,0);
+	packet(0x091c,clif->pMoveFromKafra,2,4);
+	packet(0x0921,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x093a,clif->pReqClickBuyingStore,2);
+	packet(0x093e,clif->pDull/*,XXX*/);
+	packet(0x093f,clif->pUseSkillToId,2,4,6);
+	packet(0x0946,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x094b,clif->pGetCharNameRequest,2);
+	packet(0x0954,clif->pActionRequest,2,6);
+	packet(0x0959,clif->pPartyInvite2,2);
+	packet(0x0966,clif->pMoveToKafra,2,4);
+	packet(0x0968,clif->pChangeDir,2,4);
 #endif
 
 // 2012-12-12aRagexe, 2012-12-12bRagexe
 #if PACKETVER == 20121212
-	packet(0x0362,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0368,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0369,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0436,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0438,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0817,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x085c,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0877,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x087d,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087f,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0893,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0895,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08a3,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a7,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a9,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08aa,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08ac,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0917,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0920,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0932,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0947,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0951,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0953,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0957,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x095b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0965,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0966,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0362,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0368,clif->pFriendsListAdd,2);
+	packet(0x0369,clif->pPartyInvite2,2);
+	packet(0x0436,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0438,clif->pReqCloseBuyingStore,0);
+	packet(0x0817,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x085c,clif->pActionRequest,2,6);
+	packet(0x0877,clif->pTickSend,2);
+	packet(0x087d,clif->pUseSkillToId,2,4,6);
+	packet(0x087f,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0893,clif->pSolveCharName,2);
+	packet(0x0895,clif->pReqClickBuyingStore,2);
+	packet(0x08a3,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a7,clif->pWalkToXY,2);
+	packet(0x08a9,clif->pStoragePassword,0);
+	packet(0x08aa,clif->pDull/*,XXX*/);
+	packet(0x08ac,clif->pDropItem,2,4);
+	packet(0x0917,clif->pMoveFromKafra,2,4);
+	packet(0x091a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0920,clif->pChangeDir,2,4);
+	packet(0x0932,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0947,clif->pHomMenu,2,4);
+	packet(0x0951,clif->pDull/*,XXX*/);
+	packet(0x0953,clif->pTakeItem,2);
+	packet(0x0957,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x095b,clif->pMoveToKafra,2,4);
+	packet(0x0965,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0966,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2012-12-18aRagexe, 2012-12-18bRagexe
 #if PACKETVER == 20121218
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0363,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0867,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0872,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0886,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0889,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0890,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x091a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0935,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0946,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0957,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pUseSkillToId,2,4,6);
+	packet(0x0363,clif->pTakeItem,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pDropItem,2,4);
+	packet(0x0867,clif->pHomMenu,2,4);
+	packet(0x0872,clif->pDull/*,XXX*/);
+	packet(0x087a,clif->pChangeDir,2,4);
+	packet(0x087b,clif->pPartyInvite2,2);
+	packet(0x0886,clif->pMoveToKafra,2,4);
+	packet(0x0889,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0890,clif->pDull/*,XXX*/);
+	packet(0x091a,clif->pMoveFromKafra,2,4);
+	packet(0x091c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0935,clif->pFriendsListAdd,2);
+	packet(0x0946,clif->pStoragePassword,0);
+	packet(0x0957,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2012-12-27aRagexe
 #if PACKETVER == 20121227
-	packet(0x0202,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x02c4,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0361,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0368,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0437,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0860,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0870,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0872,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x087a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0886,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0888,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x088e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0890,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0894,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0896,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08aa,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0917,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x091f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0920,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0932,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0933,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0940,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0943,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0947,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0953,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0958,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x095d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0962,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
+	packet(0x0202,clif->pHomMenu,2,4);
+	packet(0x02c4,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0361,clif->pStoragePassword,0);
+	packet(0x0368,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0437,clif->pDropItem,2,4);
+	packet(0x0860,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0870,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0872,clif->pReqClickBuyingStore,2);
+	packet(0x087a,clif->pActionRequest,2,6);
+	packet(0x0886,clif->pMoveFromKafra,2,4);
+	packet(0x0888,clif->pTickSend,2);
+	packet(0x088e,clif->pChangeDir,2,4);
+	packet(0x0890,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0894,clif->pFriendsListAdd,2);
+	packet(0x0896,clif->pSolveCharName,2);
+	packet(0x08a6,clif->pTakeItem,2);
+	packet(0x08aa,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0917,clif->pReqCloseBuyingStore,0);
+	packet(0x091f,clif->pDull/*,XXX*/);
+	packet(0x0920,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0932,clif->pWalkToXY,2);
+	packet(0x0933,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0940,clif->pUseSkillToId,2,4,6);
+	packet(0x0943,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0947,clif->pGetCharNameRequest,2);
+	packet(0x0953,clif->pDull/*,XXX*/);
+	packet(0x0958,clif->pMoveToKafra,2,4);
+	packet(0x095d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0962,clif->pPartyInvite2,2);
 #endif
 
 // 2013-01-03aRagexe, 2013-01-07aRagexe
 #if PACKETVER == 20130103 || \
     PACKETVER == 20130107
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0940,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pDull/*,XXX*/);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pStoragePassword,0);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0940,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-01-09aRagexe
 #if PACKETVER == 20130109
-	packet(0x0281,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0365,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0368,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0437,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0838,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0866,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0886,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0888,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x088a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0891,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0892,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a2,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08aa,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08ac,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0918,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x091b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0922,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0927,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0928,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0930,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0931,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0938,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x093e,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0950,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0951,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0955,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x095e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
+	packet(0x0281,clif->pGetCharNameRequest,2);
+	packet(0x0365,clif->pDull/*,XXX*/);
+	packet(0x0368,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0437,clif->pActionRequest,2,6);
+	packet(0x0838,clif->pMoveFromKafra,2,4);
+	packet(0x0866,clif->pWalkToXY,2);
+	packet(0x0886,clif->pMoveToKafra,2,4);
+	packet(0x0888,clif->pChangeDir,2,4);
+	packet(0x088a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0891,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0892,clif->pUseSkillToId,2,4,6);
+	packet(0x08a2,clif->pSolveCharName,2);
+	packet(0x08aa,clif->pDull/*,XXX*/);
+	packet(0x08ac,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0918,clif->pFriendsListAdd,2);
+	packet(0x091b,clif->pDropItem,2,4);
+	packet(0x0922,clif->pReqClickBuyingStore,2);
+	packet(0x0927,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0928,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0930,clif->pHomMenu,2,4);
+	packet(0x0931,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0938,clif->pPartyInvite2,2);
+	packet(0x093e,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x094f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0950,clif->pStoragePassword,0);
+	packet(0x0951,clif->pTickSend,2);
+	packet(0x0955,clif->pReqCloseBuyingStore,0);
+	packet(0x095e,clif->pTakeItem,2);
 #endif
 
 // 2013-01-15bRagexe, 2013-01-16aRagexe, 2013-01-16bRagexe
 #if PACKETVER == 20130115 || \
     PACKETVER == 20130116
-	packet(0x0361,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x07ec,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0817,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x085e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0861,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0863,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x086b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0870,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0871,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0877,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0879,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087c,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0888,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x088b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0894,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0895,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a0,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a4,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08ac,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0918,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0928,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x092d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x092e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0939,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0946,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x094b,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094e,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x095a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
+	packet(0x0361,clif->pDull/*,XXX*/);
+	packet(0x07ec,clif->pDull/*,XXX*/);
+	packet(0x0817,clif->pWalkToXY,2);
+	packet(0x085e,clif->pReqCloseBuyingStore,0);
+	packet(0x0861,clif->pMoveFromKafra,2,4);
+	packet(0x0863,clif->pActionRequest,2,6);
+	packet(0x086b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0870,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0871,clif->pFriendsListAdd,2);
+	packet(0x0877,clif->pReqClickBuyingStore,2);
+	packet(0x0879,clif->pChangeDir,2,4);
+	packet(0x087c,clif->pSolveCharName,2);
+	packet(0x0888,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x088b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0894,clif->pHomMenu,2,4);
+	packet(0x0895,clif->pTickSend,2);
+	packet(0x08a0,clif->pPartyInvite2,2);
+	packet(0x08a4,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08ac,clif->pMoveToKafra,2,4);
+	packet(0x0918,clif->pUseSkillToId,2,4,6);
+	packet(0x0928,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x092d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x092e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0939,clif->pGetCharNameRequest,2);
+	packet(0x0946,clif->pItemListWindowSelected,2,4,8);
+	packet(0x094b,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x094c,clif->pTakeItem,2);
+	packet(0x094e,clif->pDropItem,2,4);
+	packet(0x095a,clif->pStoragePassword,0);
 #endif
 
 // 2013-01-21aRagexe
 #if PACKETVER == 20130121
-	packet(0x023b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x035f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07ec,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0802,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0815,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0817,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x085d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x086c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0874,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0884,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0893,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x091f,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0940,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x094f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0956,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x095b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0963,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0969,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pReqCloseBuyingStore,0);
+	packet(0x035f,clif->pDull/*,XXX*/);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07ec,clif->pTickSend,2);
+	packet(0x0802,clif->pActionRequest,2,6);
+	packet(0x0815,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0817,clif->pStoragePassword,0);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pDull/*,XXX*/);
+	packet(0x085d,clif->pHomMenu,2,4);
+	packet(0x086c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0874,clif->pMoveToKafra,2,4);
+	packet(0x0884,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0893,clif->pFriendsListAdd,2);
+	packet(0x091f,clif->pTakeItem,2);
+	packet(0x0940,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x094f,clif->pDropItem,2,4);
+	packet(0x0956,clif->pChangeDir,2,4);
+	packet(0x095b,clif->pPartyInvite2,2);
+	packet(0x0963,clif->pMoveFromKafra,2,4);
+	packet(0x0969,clif->pItemListWindowSelected,2,4,8);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-01-30aRagexe
 #if PACKETVER == 20130130
-	packet(0x035f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0362,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0367,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0368,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0437,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x085f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0862,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x086b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0885,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0886,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0887,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0889,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x089a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a0,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08a4,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a9,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x091a,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0920,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0924,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x093a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x093d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0956,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0957,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x095b,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x095c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x095d,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
+	packet(0x035f,clif->pMoveToKafra,2,4);
+	packet(0x0362,clif->pHomMenu,2,4);
+	packet(0x0367,clif->pGetCharNameRequest,2);
+	packet(0x0368,clif->pChangeDir,2,4);
+	packet(0x0437,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x085f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0862,clif->pReqCloseBuyingStore,0);
+	packet(0x086b,clif->pDull/*,XXX*/);
+	packet(0x087d,clif->pWalkToXY,2);
+	packet(0x087f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0885,clif->pActionRequest,2,6);
+	packet(0x0886,clif->pTakeItem,2);
+	packet(0x0887,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0889,clif->pTickSend,2);
+	packet(0x089a,clif->pPartyInvite2,2);
+	packet(0x089f,clif->pDropItem,2,4);
+	packet(0x08a0,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08a4,clif->pUseSkillToId,2,4,6);
+	packet(0x08a9,clif->pDull/*,XXX*/);
+	packet(0x091a,clif->pSolveCharName,2);
+	packet(0x0920,clif->pFriendsListAdd,2);
+	packet(0x0924,clif->pReqClickBuyingStore,2);
+	packet(0x093a,clif->pStoragePassword,0);
+	packet(0x093d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0956,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0957,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x095b,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x095c,clif->pMoveFromKafra,2,4);
+	packet(0x095d,clif->pSearchStoreInfoNextPage,0);
 #endif
 
 // 2013-02-06aRagexe
 #if PACKETVER == 20130206
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0811,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0876,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0883,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0885,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0899,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a0,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ac,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0920,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0925,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x093a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x093c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0950,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pStoragePassword,0);
+	packet(0x0811,clif->pTakeItem,2);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085d,clif->pMoveFromKafra,2,4);
+	packet(0x0876,clif->pDull/*,XXX*/);
+	packet(0x0883,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0885,clif->pMoveToKafra,2,4);
+	packet(0x0899,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a0,clif->pChangeDir,2,4);
+	packet(0x08ac,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0920,clif->pPartyInvite2,2);
+	packet(0x0925,clif->pDropItem,2,4);
+	packet(0x093a,clif->pHomMenu,2,4);
+	packet(0x093c,clif->pFriendsListAdd,2);
+	packet(0x0950,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-02-15aRagexe, 2013-02-15bRagexe
 #if PACKETVER == 20130215
-	packet(0x023b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0869,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x086f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0886,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x089f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08ad,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0923,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0941,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0956,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x095d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0962,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pReqClickBuyingStore,2);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pStoragePassword,0);
+	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0869,clif->pMoveToKafra,2,4);
+	packet(0x086f,clif->pDull/*,XXX*/);
+	packet(0x0886,clif->pDropItem,2,4);
+	packet(0x089e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x089f,clif->pDull/*,XXX*/);
+	packet(0x08ad,clif->pTakeItem,2);
+	packet(0x0923,clif->pHomMenu,2,4);
+	packet(0x0941,clif->pFriendsListAdd,2);
+	packet(0x0956,clif->pPartyInvite2,2);
+	packet(0x095d,clif->pChangeDir,2,4);
+	packet(0x0962,clif->pMoveFromKafra,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-02-20aRagexe
 #if PACKETVER == 20130220
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x094b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x094b,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-02-27aRagexe
 #if PACKETVER == 20130227
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x035f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0360,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0811,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0815,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0817,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x085a,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0863,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0867,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0869,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x086e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0893,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0898,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a0,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08a1,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x091b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x091f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0924,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x092b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x092f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0936,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0946,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0951,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x095b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x095e,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x095f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0967,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x035f,clif->pHomMenu,2,4);
+	packet(0x0360,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0811,clif->pTickSend,2);
+	packet(0x0815,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0817,clif->pReqClickBuyingStore,2);
+	packet(0x085a,clif->pUseSkillToId,2,4,6);
+	packet(0x0863,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0867,clif->pTakeItem,2);
+	packet(0x0869,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x086e,clif->pDull/*,XXX*/);
+	packet(0x087b,clif->pPartyInvite2,2);
+	packet(0x0893,clif->pMoveFromKafra,2,4);
+	packet(0x0898,clif->pChangeDir,2,4);
+	packet(0x08a0,clif->pReqCloseBuyingStore,0);
+	packet(0x08a1,clif->pDull/*,XXX*/);
+	packet(0x091b,clif->pGetCharNameRequest,2);
+	packet(0x091f,clif->pDropItem,2,4);
+	packet(0x0924,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x092b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x092f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0936,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0946,clif->pMoveToKafra,2,4);
+	packet(0x0951,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x095b,clif->pSolveCharName,2);
+	packet(0x095e,clif->pStoragePassword,0);
+	packet(0x095f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0967,clif->pActionRequest,2,6);
 #endif
 
 // 2013-03-06aRagexe
 #if PACKETVER == 20130306
-	packet(0x022d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0367,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0368,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0802,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0817,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x085b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x085c,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0860,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x086d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0881,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0890,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0898,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x089f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a4,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08ac,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0917,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091e,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0926,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0934,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0936,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0943,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0944,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0945,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0946,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x094a,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094e,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0951,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0960,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0962,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
+	packet(0x022d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0367,clif->pSolveCharName,2);
+	packet(0x0368,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0802,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0817,clif->pHomMenu,2,4);
+	packet(0x085b,clif->pWalkToXY,2);
+	packet(0x085c,clif->pReqClickBuyingStore,2);
+	packet(0x0860,clif->pChangeDir,2,4);
+	packet(0x086d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0881,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0890,clif->pDull/*,XXX*/);
+	packet(0x0898,clif->pActionRequest,2,6);
+	packet(0x089f,clif->pTickSend,2);
+	packet(0x08a4,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08ac,clif->pDull/*,XXX*/);
+	packet(0x0917,clif->pMoveFromKafra,2,4);
+	packet(0x091e,clif->pMoveToKafra,2,4);
+	packet(0x0926,clif->pStoragePassword,0);
+	packet(0x0934,clif->pFriendsListAdd,2);
+	packet(0x0936,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0943,clif->pUseSkillToId,2,4,6);
+	packet(0x0944,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0945,clif->pReqCloseBuyingStore,0);
+	packet(0x0946,clif->pPartyInvite2,2);
+	packet(0x094a,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x094e,clif->pGetCharNameRequest,2);
+	packet(0x0951,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0960,clif->pDropItem,2,4);
+	packet(0x0962,clif->pTakeItem,2);
 #endif
 
 // 2013-03-13aRagexe
 #if PACKETVER == 20130313
-	packet(0x0202,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0887,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0920,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0947,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pPartyInvite2,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pFriendsListAdd,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0887,clif->pChangeDir,2,4);
+	packet(0x0920,clif->pStoragePassword,0);
+	packet(0x092d,clif->pHomMenu,2,4);
+	packet(0x0947,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-03-20dRagexe, 2013-03-20eRagexe
 #if PACKETVER == 20130320
-	packet(0x035f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0363,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0365,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0438,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x085a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x085d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0868,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x086f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0874,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0881,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0886,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0888,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088e,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0890,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0897,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0898,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089b,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08ac,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0922,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x092e,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0933,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0938,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x093f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0947,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094c,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x094e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0959,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x095a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
+	packet(0x035f,clif->pReqClickBuyingStore,2);
+	packet(0x0363,clif->pTickSend,2);
+	packet(0x0365,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0438,clif->pDropItem,2,4);
+	packet(0x085a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x085d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0868,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086d,clif->pPartyInvite2,2);
+	packet(0x086f,clif->pFriendsListAdd,2);
+	packet(0x0874,clif->pMoveFromKafra,2,4);
+	packet(0x0881,clif->pWalkToXY,2);
+	packet(0x0886,clif->pReqCloseBuyingStore,0);
+	packet(0x0888,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088e,clif->pActionRequest,2,6);
+	packet(0x0890,clif->pDull/*,XXX*/);
+	packet(0x0897,clif->pChangeDir,2,4);
+	packet(0x0898,clif->pGetCharNameRequest,2);
+	packet(0x089b,clif->pUseSkillToId,2,4,6);
+	packet(0x08ac,clif->pMoveToKafra,2,4);
+	packet(0x0922,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x092e,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0933,clif->pTakeItem,2);
+	packet(0x0938,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x093f,clif->pHomMenu,2,4);
+	packet(0x0947,clif->pStoragePassword,0);
+	packet(0x094c,clif->pSolveCharName,2);
+	packet(0x094e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0959,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x095a,clif->pDull/*,XXX*/);
 #endif
 
 // 2013-03-27bRagexe
 #if PACKETVER == 20130327
-	packet(0x02c4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x07ec,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0835,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x086d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0873,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0878,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x087a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0885,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x088f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0891,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0893,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0899,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a1,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08a2,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x091f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x092b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x092d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x092e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x092f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0933,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0938,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0939,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x094a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x094b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0955,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0960,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0961,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0967,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
+	packet(0x02c4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x07ec,clif->pReqClickBuyingStore,2);
+	packet(0x0835,clif->pHomMenu,2,4);
+	packet(0x086d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0873,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0878,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x087a,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0885,clif->pDropItem,2,4);
+	packet(0x088f,clif->pUseSkillToId,2,4,6);
+	packet(0x0891,clif->pMoveToKafra,2,4);
+	packet(0x0893,clif->pReqCloseBuyingStore,0);
+	packet(0x0899,clif->pTakeItem,2);
+	packet(0x08a1,clif->pGetCharNameRequest,2);
+	packet(0x08a2,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x091f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x092b,clif->pWalkToXY,2);
+	packet(0x092d,clif->pPartyInvite2,2);
+	packet(0x092e,clif->pDull/*,XXX*/);
+	packet(0x092f,clif->pDull/*,XXX*/);
+	packet(0x0933,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0938,clif->pMoveFromKafra,2,4);
+	packet(0x0939,clif->pTickSend,2);
+	packet(0x094a,clif->pChangeDir,2,4);
+	packet(0x094b,clif->pStoragePassword,0);
+	packet(0x094f,clif->pFriendsListAdd,2);
+	packet(0x0955,clif->pActionRequest,2,6);
+	packet(0x0960,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0961,clif->pSolveCharName,2);
+	packet(0x0967,clif->pItemListWindowSelected,2,4,8);
 #endif
 
 // 2013-04-03aRagexe
 #if PACKETVER == 20130403
-	packet(0x023b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0884,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a5,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0926,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0942,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0950,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pReqClickBuyingStore,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pStoragePassword,0);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0884,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a5,clif->pDull/*,XXX*/);
+	packet(0x0926,clif->pHomMenu,2,4);
+	packet(0x0942,clif->pChangeDir,2,4);
+	packet(0x0950,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-04-10aRagexe
 #if PACKETVER == 20130410
-	packet(0x0367,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0437,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0860,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0865,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x086c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0879,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0881,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x088c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0890,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0891,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x089c,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x089e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08a0,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x08a7,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0917,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x091d,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0933,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0939,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x093d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0944,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0945,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0955,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0960,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0967,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x096a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
+	packet(0x0367,clif->pReqClickBuyingStore,2);
+	packet(0x0437,clif->pTakeItem,2);
+	packet(0x0860,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0865,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x086c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0879,clif->pMoveToKafra,2,4);
+	packet(0x087c,clif->pWalkToXY,2);
+	packet(0x087d,clif->pGetCharNameRequest,2);
+	packet(0x0881,clif->pReqCloseBuyingStore,0);
+	packet(0x088c,clif->pStoragePassword,0);
+	packet(0x088d,clif->pHomMenu,2,4);
+	packet(0x0890,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0891,clif->pDull/*,XXX*/);
+	packet(0x089c,clif->pSolveCharName,2);
+	packet(0x089e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08a0,clif->pTickSend,2);
+	packet(0x08a4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x08a7,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0917,clif->pPartyInvite2,2);
+	packet(0x091d,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0933,clif->pUseSkillToId,2,4,6);
+	packet(0x0939,clif->pActionRequest,2,6);
+	packet(0x093d,clif->pMoveFromKafra,2,4);
+	packet(0x0944,clif->pDull/*,XXX*/);
+	packet(0x0945,clif->pChangeDir,2,4);
+	packet(0x0955,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0960,clif->pFriendsListAdd,2);
+	packet(0x0967,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x096a,clif->pDropItem,2,4);
 #endif
 
 // 2013-04-17aRagexe
 #if PACKETVER == 20130417
-	packet(0x0202,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0875,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0929,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0962,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0969,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x096a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
+	packet(0x0202,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pFriendsListAdd,2);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0875,clif->pStoragePassword,0);
+	packet(0x0929,clif->pChangeDir,2,4);
+	packet(0x0962,clif->pHomMenu,2,4);
+	packet(0x0969,clif->pGetCharNameRequest,2);
+	packet(0x096a,clif->pDull/*,XXX*/);
 #endif
 
 // 2013-04-24aRagexe
 #if PACKETVER == 20130424
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0969,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0969,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-05-02aRagexe, 2013-05-02bRagexe
 #if PACKETVER == 20130502
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x07ec,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0867,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0870,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0874,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0875,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0877,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0888,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0889,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a1,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a3,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0961,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0967,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pStoragePassword,0);
+	packet(0x07ec,clif->pChangeDir,2,4);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pDull/*,XXX*/);
+	packet(0x0867,clif->pHomMenu,2,4);
+	packet(0x0870,clif->pPartyInvite2,2);
+	packet(0x0874,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0875,clif->pFriendsListAdd,2);
+	packet(0x0877,clif->pMoveToKafra,2,4);
+	packet(0x087c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0888,clif->pGetCharNameRequest,2);
+	packet(0x0889,clif->pDull/*,XXX*/);
+	packet(0x08a1,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08a3,clif->pDropItem,2,4);
+	packet(0x0961,clif->pMoveFromKafra,2,4);
+	packet(0x0967,clif->pTakeItem,2);
 #endif
 
 // 2013-05-08bRagexe, 2013-05-08cRagexe, 2013-05-08dRagexe, 2013-05-08eRagexe, 2013-05-08fRagexe
 #if PACKETVER == 20130508
-	packet(0x022d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0868,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0878,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0893,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0895,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0897,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08ab,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x092d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0944,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x094d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0957,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x095c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pMoveToKafra,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pFriendsListAdd,2);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0868,clif->pStoragePassword,0);
+	packet(0x0878,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088b,clif->pTakeItem,2);
+	packet(0x0893,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0895,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0897,clif->pDull/*,XXX*/);
+	packet(0x08ab,clif->pPartyInvite2,2);
+	packet(0x092d,clif->pDropItem,2,4);
+	packet(0x0944,clif->pDull/*,XXX*/);
+	packet(0x094d,clif->pHomMenu,2,4);
+	packet(0x0957,clif->pMoveFromKafra,2,4);
+	packet(0x095c,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-05-15aRagexe
 #if PACKETVER == 20130515
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0862,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0887,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a1,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08aa,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08ac,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0931,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x093e,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0943,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0944,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0947,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0962,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0963,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pChangeDir,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0862,clif->pDull/*,XXX*/);
+	packet(0x0887,clif->pMoveToKafra,2,4);
+	packet(0x08a1,clif->pTakeItem,2);
+	packet(0x08aa,clif->pDull/*,XXX*/);
+	packet(0x08ac,clif->pMoveFromKafra,2,4);
+	packet(0x092d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0931,clif->pHomMenu,2,4);
+	packet(0x093e,clif->pStoragePassword,0);
+	packet(0x0943,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0944,clif->pDropItem,2,4);
+	packet(0x0947,clif->pPartyInvite2,2);
+	packet(0x0962,clif->pFriendsListAdd,2);
+	packet(0x0963,clif->pItemListWindowSelected,2,4,8);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-05-22aRagexe
 #if PACKETVER == 20130522
-	packet(0x0360,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0362,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0368,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0369,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x07ec,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0811,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x086a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0874,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x087e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x088e,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x089c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a2,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a3,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a6,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08a9,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08aa,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x08ac,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0925,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0926,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x093e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0950,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0952,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x095b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x095c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x095e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0964,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0965,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
+	packet(0x0360,clif->pWalkToXY,2);
+	packet(0x0362,clif->pFriendsListAdd,2);
+	packet(0x0368,clif->pReqClickBuyingStore,2);
+	packet(0x0369,clif->pSolveCharName,2);
+	packet(0x07ec,clif->pTickSend,2);
+	packet(0x0811,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x086a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086e,clif->pReqCloseBuyingStore,0);
+	packet(0x0874,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x087e,clif->pMoveFromKafra,2,4);
+	packet(0x088e,clif->pStoragePassword,0);
+	packet(0x089b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x089c,clif->pDropItem,2,4);
+	packet(0x08a2,clif->pActionRequest,2,6);
+	packet(0x08a3,clif->pMoveToKafra,2,4);
+	packet(0x08a6,clif->pGetCharNameRequest,2);
+	packet(0x08a9,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08aa,clif->pSearchStoreInfoNextPage,0);
+	packet(0x08ac,clif->pDull/*,XXX*/);
+	packet(0x0925,clif->pChangeDir,2,4);
+	packet(0x0926,clif->pHomMenu,2,4);
+	packet(0x093e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0950,clif->pPartyInvite2,2);
+	packet(0x0952,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x095b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x095c,clif->pUseSkillToId,2,4,6);
+	packet(0x095e,clif->pTakeItem,2);
+	packet(0x0964,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0965,clif->pDull/*,XXX*/);
 #endif
 
 // 2013-05-29aRagexe
 #if PACKETVER == 20130529
-	packet(0x023b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0438,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x085e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0863,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0869,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0874,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0876,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0877,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0888,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0890,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0892,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0895,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0897,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a7,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a8,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0917,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0918,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0919,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0936,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0937,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0938,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0941,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0951,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0956,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0957,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0958,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0964,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
+	packet(0x023b,clif->pHomMenu,2,4);
+	packet(0x0438,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x085e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0863,clif->pGetCharNameRequest,2);
+	packet(0x0869,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0874,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0876,clif->pWalkToXY,2);
+	packet(0x0877,clif->pFriendsListAdd,2);
+	packet(0x0888,clif->pDull/*,XXX*/);
+	packet(0x088e,clif->pDull/*,XXX*/);
+	packet(0x0890,clif->pActionRequest,2,6);
+	packet(0x0892,clif->pReqClickBuyingStore,2);
+	packet(0x0895,clif->pTakeItem,2);
+	packet(0x0897,clif->pTickSend,2);
+	packet(0x08a7,clif->pDropItem,2,4);
+	packet(0x08a8,clif->pPartyInvite2,2);
+	packet(0x0917,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0918,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0919,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0936,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0937,clif->pSolveCharName,2);
+	packet(0x0938,clif->pMoveToKafra,2,4);
+	packet(0x0941,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0951,clif->pChangeDir,2,4);
+	packet(0x0956,clif->pStoragePassword,0);
+	packet(0x0957,clif->pMoveFromKafra,2,4);
+	packet(0x0958,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0964,clif->pReqCloseBuyingStore,0);
 #endif
 
 // 2013-06-05aRagexe, 2013-06-05bRagexe
 #if PACKETVER == 20130605
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0883,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0883,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-06-12aRagexe, 2013-06-12bRagexe, 2013-06-12cRagexe, 2013-06-12dRagexe, 2013-06-12eRagexe
 #if PACKETVER == 20130612
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0919,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x093a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0964,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087e,clif->pChangeDir,2,4);
+	packet(0x0919,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x093a,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pFriendsListAdd,2);
+	packet(0x0964,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-06-18#1aRagexe
 #if PACKETVER == 20130618
-	packet(0x0281,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x02c4,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0363,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x085a,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0862,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0864,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0878,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0885,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0887,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0889,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x088e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0890,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0891,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08a6,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a7,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0917,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0930,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0932,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0936,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0942,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0944,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0945,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x094f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0951,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0953,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0962,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x096a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
+	packet(0x0281,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x02c4,clif->pHomMenu,2,4);
+	packet(0x0363,clif->pSearchStoreInfoNextPage,0);
+	packet(0x085a,clif->pReqCloseBuyingStore,0);
+	packet(0x0862,clif->pReqClickBuyingStore,2);
+	packet(0x0864,clif->pStoragePassword,0);
+	packet(0x0878,clif->pDull/*,XXX*/);
+	packet(0x087a,clif->pDull/*,XXX*/);
+	packet(0x0885,clif->pMoveToKafra,2,4);
+	packet(0x0887,clif->pPartyInvite2,2);
+	packet(0x0889,clif->pActionRequest,2,6);
+	packet(0x088e,clif->pWalkToXY,2);
+	packet(0x0890,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0891,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08a6,clif->pChangeDir,2,4);
+	packet(0x08a7,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0917,clif->pDropItem,2,4);
+	packet(0x0930,clif->pTickSend,2);
+	packet(0x0932,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0936,clif->pMoveFromKafra,2,4);
+	packet(0x0942,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0944,clif->pGetCharNameRequest,2);
+	packet(0x0945,clif->pSolveCharName,2);
+	packet(0x094f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0951,clif->pUseSkillToId,2,4,6);
+	packet(0x0953,clif->pFriendsListAdd,2);
+	packet(0x095b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0962,clif->pTakeItem,2);
+	packet(0x096a,clif->pUseSkillToPos,2,4,6,8);
 #endif
 
 // 2013-06-26_3cRagexe, 2013-06-26bRagexe
 #if PACKETVER == 20130626
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0365,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0860,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x088c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0894,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0895,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a5,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08ab,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0921,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0930,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0952,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0960,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0365,clif->pReqCloseBuyingStore,0);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pMoveFromKafra,2,4);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0860,clif->pDull/*,XXX*/);
+	packet(0x088b,clif->pTakeItem,2);
+	packet(0x088c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088f,clif->pDull/*,XXX*/);
+	packet(0x0894,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0895,clif->pPartyInvite2,2);
+	packet(0x08a5,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08ab,clif->pFriendsListAdd,2);
+	packet(0x0921,clif->pMoveToKafra,2,4);
+	packet(0x0930,clif->pStoragePassword,0);
+	packet(0x094d,clif->pChangeDir,2,4);
+	packet(0x0952,clif->pDropItem,2,4);
+	packet(0x0960,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-07-03aRagexe
 #if PACKETVER == 20130703
-	packet(0x0202,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0873,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0930,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x094a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pReqClickBuyingStore,2);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pFriendsListAdd,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0873,clif->pStoragePassword,0);
+	packet(0x0930,clif->pChangeDir,2,4);
+	packet(0x094a,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-07-10bRagexe
 #if PACKETVER == 20130710
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0880,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0880,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-07-17cRagexe
 #if PACKETVER == 20130717
-	packet(0x02c4,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0819,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x083c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0862,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0863,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x086b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x086c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0882,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x088a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x088c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0897,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0898,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x089b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a6,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a9,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08aa,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0917,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0918,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x091d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x091e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x092f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x093b,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0956,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0958,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x095b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0960,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0967,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x096a,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
+	packet(0x02c4,clif->pTickSend,2);
+	packet(0x0819,clif->pSearchStoreInfoNextPage,0);
+	packet(0x083c,clif->pWalkToXY,2);
+	packet(0x0862,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0863,clif->pFriendsListAdd,2);
+	packet(0x086b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x086c,clif->pDull/*,XXX*/);
+	packet(0x0882,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x088a,clif->pHomMenu,2,4);
+	packet(0x088c,clif->pChangeDir,2,4);
+	packet(0x0897,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0898,clif->pReqClickBuyingStore,2);
+	packet(0x089b,clif->pMoveToKafra,2,4);
+	packet(0x08a6,clif->pDull/*,XXX*/);
+	packet(0x08a9,clif->pTakeItem,2);
+	packet(0x08aa,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0917,clif->pDropItem,2,4);
+	packet(0x0918,clif->pActionRequest,2,6);
+	packet(0x091d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x091e,clif->pUseSkillToId,2,4,6);
+	packet(0x092f,clif->pPartyInvite2,2);
+	packet(0x093b,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0956,clif->pMoveFromKafra,2,4);
+	packet(0x0958,clif->pGetCharNameRequest,2);
+	packet(0x095b,clif->pStoragePassword,0);
+	packet(0x0960,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0967,clif->pSolveCharName,2);
+	packet(0x096a,clif->pReqCloseBuyingStore,0);
 #endif
 
 // 2013-07-24eRagexe
 #if PACKETVER == 20130724
-	packet(0x023b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0437,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x085a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0860,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0867,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x086a,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0874,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0876,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0890,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0891,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0893,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x089c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08ab,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0921,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0924,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0927,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x092b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x094a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0953,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0954,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0956,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0958,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x095c,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x095d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0965,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0966,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x023b,clif->pReqCloseBuyingStore,0);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0437,clif->pDull/*,XXX*/);
+	packet(0x085a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x085e,clif->pMoveFromKafra,2,4);
+	packet(0x0860,clif->pStoragePassword,0);
+	packet(0x0867,clif->pGetCharNameRequest,2);
+	packet(0x086a,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0874,clif->pHomMenu,2,4);
+	packet(0x0876,clif->pActionRequest,2,6);
+	packet(0x0890,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0891,clif->pDropItem,2,4);
+	packet(0x0893,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x089c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08ab,clif->pDull/*,XXX*/);
+	packet(0x0921,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0924,clif->pReqClickBuyingStore,2);
+	packet(0x0927,clif->pPartyInvite2,2);
+	packet(0x092b,clif->pFriendsListAdd,2);
+	packet(0x092e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x094a,clif->pTakeItem,2);
+	packet(0x0953,clif->pWalkToXY,2);
+	packet(0x0954,clif->pSolveCharName,2);
+	packet(0x0956,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0958,clif->pUseSkillToId,2,4,6);
+	packet(0x095c,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x095d,clif->pMoveToKafra,2,4);
+	packet(0x0965,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0966,clif->pChangeDir,2,4);
 #endif
 
 // 2013-07-31cRagexe
 #if PACKETVER == 20130731
-	packet(0x022d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0366,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0863,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0865,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0878,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x087e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0884,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0889,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0894,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0895,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0923,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0925,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x092b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x092d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0935,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0941,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x094c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0956,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0957,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0958,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x095b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x095d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x095f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0962,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
+	packet(0x022d,clif->pFriendsListAdd,2);
+	packet(0x0366,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pChangeDir,2,4);
+	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0863,clif->pReqClickBuyingStore,2);
+	packet(0x0865,clif->pUseSkillToId,2,4,6);
+	packet(0x0878,clif->pActionRequest,2,6);
+	packet(0x087e,clif->pReqCloseBuyingStore,0);
+	packet(0x0884,clif->pStoragePassword,0);
+	packet(0x0889,clif->pDull/*,XXX*/);
+	packet(0x088b,clif->pGetCharNameRequest,2);
+	packet(0x0894,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0895,clif->pDull/*,XXX*/);
+	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0923,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0925,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x092b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x092d,clif->pHomMenu,2,4);
+	packet(0x0935,clif->pTakeItem,2);
+	packet(0x0941,clif->pMoveToKafra,2,4);
+	packet(0x094c,clif->pMoveFromKafra,2,4);
+	packet(0x0956,clif->pPartyInvite2,2);
+	packet(0x0957,clif->pSolveCharName,2);
+	packet(0x0958,clif->pItemListWindowSelected,2,4,8);
+	packet(0x095b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x095d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x095f,clif->pTickSend,2);
+	packet(0x0962,clif->pDropItem,2,4);
 #endif
 
 // 2013-08-07aRagexe
 #if PACKETVER == 20130807
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0887,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0887,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-08-14aRagexe
 #if PACKETVER == 20130814
-	packet(0x0202,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0281,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0368,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0815,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0835,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0868,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0873,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0874,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0885,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0887,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0889,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x088a,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x088c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0895,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0896,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0923,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0926,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0927,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0936,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0937,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x093a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0941,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0947,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x094e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0958,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0959,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x095f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0962,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
+	packet(0x0202,clif->pMoveToKafra,2,4);
+	packet(0x0281,clif->pFriendsListAdd,2);
+	packet(0x0368,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0815,clif->pDull/*,XXX*/);
+	packet(0x0835,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0868,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0873,clif->pMoveFromKafra,2,4);
+	packet(0x0874,clif->pActionRequest,2,6);
+	packet(0x0885,clif->pStoragePassword,0);
+	packet(0x0887,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0889,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x088a,clif->pTickSend,2);
+	packet(0x088c,clif->pChangeDir,2,4);
+	packet(0x0895,clif->pReqClickBuyingStore,2);
+	packet(0x0896,clif->pDull/*,XXX*/);
+	packet(0x08a4,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0923,clif->pSolveCharName,2);
+	packet(0x0926,clif->pTakeItem,2);
+	packet(0x0927,clif->pPartyInvite2,2);
+	packet(0x0936,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0937,clif->pGetCharNameRequest,2);
+	packet(0x093a,clif->pWalkToXY,2);
+	packet(0x0941,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0947,clif->pUseSkillToId,2,4,6);
+	packet(0x094e,clif->pReqCloseBuyingStore,0);
+	packet(0x0958,clif->pHomMenu,2,4);
+	packet(0x0959,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x095f,clif->pDropItem,2,4);
+	packet(0x0962,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
 #endif
 
 // 2013-08-21bRagexe
 #if PACKETVER == 20130821
-	packet(0x0202,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0360,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0437,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0438,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x07ec,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0815,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0862,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0863,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x086e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0879,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0881,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x088d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x088f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0892,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08a6,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08ad,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x091d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0923,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x092d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x093e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0947,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0954,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x095e,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0962,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0964,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0967,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0969,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
+	packet(0x0202,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0360,clif->pStoragePassword,0);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0437,clif->pMoveToKafra,2,4);
+	packet(0x0438,clif->pDull/*,XXX*/);
+	packet(0x07ec,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0815,clif->pWalkToXY,2);
+	packet(0x0862,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0863,clif->pActionRequest,2,6);
+	packet(0x086e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0879,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0881,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x088d,clif->pTickSend,2);
+	packet(0x088f,clif->pFriendsListAdd,2);
+	packet(0x0892,clif->pReqClickBuyingStore,2);
+	packet(0x08a6,clif->pReqCloseBuyingStore,0);
+	packet(0x08ad,clif->pDull/*,XXX*/);
+	packet(0x091d,clif->pChangeDir,2,4);
+	packet(0x0923,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x092d,clif->pGetCharNameRequest,2);
+	packet(0x093e,clif->pMoveFromKafra,2,4);
+	packet(0x0947,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0954,clif->pUseSkillToId,2,4,6);
+	packet(0x095e,clif->pSolveCharName,2);
+	packet(0x0962,clif->pTakeItem,2);
+	packet(0x0964,clif->pDropItem,2,4);
+	packet(0x0967,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0969,clif->pPartyInvite2,2);
 #endif
 
 // 2013-08-28bRagexe, 2013-08-28cRagexe
 #if PACKETVER == 20130828
-	packet(0x023b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0361,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0364,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x07ec,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0817,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0873,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x087e,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0889,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0893,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x089f,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a3,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08ac,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0917,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0919,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x091e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0923,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0924,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0928,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0929,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0930,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0944,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0946,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x094a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x094c,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x094f,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x095d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0966,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
+	packet(0x023b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0361,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0364,clif->pDull/*,XXX*/);
+	packet(0x07ec,clif->pReqClickBuyingStore,2);
+	packet(0x0817,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0873,clif->pSearchStoreInfoNextPage,0);
+	packet(0x087e,clif->pDropItem,2,4);
+	packet(0x0889,clif->pHomMenu,2,4);
+	packet(0x0893,clif->pStoragePassword,0);
+	packet(0x089e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x089f,clif->pChangeDir,2,4);
+	packet(0x08a3,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08ac,clif->pGetCharNameRequest,2);
+	packet(0x0917,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0919,clif->pReqCloseBuyingStore,0);
+	packet(0x091e,clif->pTakeItem,2);
+	packet(0x0923,clif->pUseSkillToId,2,4,6);
+	packet(0x0924,clif->pTickSend,2);
+	packet(0x0928,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0929,clif->pMoveFromKafra,2,4);
+	packet(0x0930,clif->pSolveCharName,2);
+	packet(0x0944,clif->pFriendsListAdd,2);
+	packet(0x0946,clif->pDull/*,XXX*/);
+	packet(0x094a,clif->pPartyInvite2,2);
+	packet(0x094c,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x094f,clif->pActionRequest,2,6);
+	packet(0x095d,clif->pWalkToXY,2);
+	packet(0x0966,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pWantToConnection,2,6,10,14,18);
 #endif
 
 // 2013-09-04aRagexe
 #if PACKETVER == 20130904
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0838,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0937,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x093a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0956,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pChangeDir,2,4);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0838,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0937,clif->pFriendsListAdd,2);
+	packet(0x093a,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0956,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-09-11aRagexe, 2013-09-11bRagexe
 #if PACKETVER == 20130911
-	packet(0x035f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0364,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085c,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0868,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x086b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x086d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0889,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0891,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x091e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x093a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0940,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0948,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0967,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x096a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
+	packet(0x035f,clif->pReqClickBuyingStore,2);
+	packet(0x0364,clif->pGetCharNameRequest,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085c,clif->pPartyInvite2,2);
+	packet(0x0868,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x086b,clif->pStoragePassword,0);
+	packet(0x086d,clif->pMoveFromKafra,2,4);
+	packet(0x087b,clif->pDull/*,XXX*/);
+	packet(0x0889,clif->pTakeItem,2);
+	packet(0x0891,clif->pHomMenu,2,4);
+	packet(0x08a4,clif->pItemListWindowSelected,2,4,8);
+	packet(0x091e,clif->pChangeDir,2,4);
+	packet(0x093a,clif->pDull/*,XXX*/);
+	packet(0x0940,clif->pTickSend,2);
+	packet(0x0948,clif->pFriendsListAdd,2);
+	packet(0x0967,clif->pDropItem,2,4);
+	packet(0x096a,clif->pMoveToKafra,2,4);
 #endif
 
 // 2013-09-17aRagexe
 #if PACKETVER == 20130917
-	packet(0x035f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0811,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0838,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x083c,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0863,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0868,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x086e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x086f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x087a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x087e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0895,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x089b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x089d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a0,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a2,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08a8,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0918,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0921,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0923,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0934,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x094c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0957,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0959,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x095b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x096a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
+	packet(0x035f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0811,clif->pActionRequest,2,6);
+	packet(0x0838,clif->pReqClickBuyingStore,2);
+	packet(0x083c,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0863,clif->pMoveFromKafra,2,4);
+	packet(0x0868,clif->pPartyInvite2,2);
+	packet(0x086e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x086f,clif->pTickSend,2);
+	packet(0x087a,clif->pTakeItem,2);
+	packet(0x087e,clif->pUseSkillToId,2,4,6);
+	packet(0x088a,clif->pStoragePassword,0);
+	packet(0x0895,clif->pSolveCharName,2);
+	packet(0x089b,clif->pReqCloseBuyingStore,0);
+	packet(0x089d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a0,clif->pMoveToKafra,2,4);
+	packet(0x08a2,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08a8,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0918,clif->pChangeDir,2,4);
+	packet(0x091c,clif->pDropItem,2,4);
+	packet(0x091e,clif->pDull/*,XXX*/);
+	packet(0x0921,clif->pGetCharNameRequest,2);
+	packet(0x0923,clif->pHomMenu,2,4);
+	packet(0x0934,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x094c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x094e,clif->pDull/*,XXX*/);
+	packet(0x0957,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0959,clif->pItemListWindowSelected,2,4,8);
+	packet(0x095b,clif->pWalkToXY,2);
+	packet(0x096a,clif->pFriendsListAdd,2);
 #endif
 
 // 2013-09-25aRagexe, 2013-09-25bRagexe, 2013-09-25cRagexe
 #if PACKETVER == 20130925
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x086e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0875,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0876,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0885,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0887,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0890,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0940,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0958,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x095b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x095c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0969,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086d,clif->pStoragePassword,0);
+	packet(0x086e,clif->pPartyInvite2,2);
+	packet(0x0875,clif->pHomMenu,2,4);
+	packet(0x0876,clif->pMoveFromKafra,2,4);
+	packet(0x087d,clif->pDropItem,2,4);
+	packet(0x0885,clif->pChangeDir,2,4);
+	packet(0x0887,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088f,clif->pFriendsListAdd,2);
+	packet(0x0890,clif->pDull/*,XXX*/);
+	packet(0x0940,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0958,clif->pTakeItem,2);
+	packet(0x095a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x095b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x095c,clif->pMoveToKafra,2,4);
+	packet(0x0969,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-10-02aRagexe
 #if PACKETVER == 20131002
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0940,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pStoragePassword,0);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pTickSend,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0940,clif->pWalkToXY,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-10-08aRagexe
 #if PACKETVER == 20131008
-	packet(0x0202,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0362,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x07e4,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x083c,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x085d,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x085e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0863,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x086c,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0883,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0884,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0885,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0896,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x089c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a9,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0917,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0923,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0927,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0932,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0934,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0936,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x093c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0947,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0952,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0954,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0956,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x095d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0969,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
+	packet(0x0202,clif->pGetCharNameRequest,2);
+	packet(0x0362,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x07e4,clif->pActionRequest,2,6);
+	packet(0x083c,clif->pReqCloseBuyingStore,0);
+	packet(0x085d,clif->pDull/*,XXX*/);
+	packet(0x085e,clif->pWalkToXY,2);
+	packet(0x0863,clif->pPartyInvite2,2);
+	packet(0x086c,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086d,clif->pSolveCharName,2);
+	packet(0x0883,clif->pMoveToKafra,2,4);
+	packet(0x0884,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0885,clif->pDull/*,XXX*/);
+	packet(0x0896,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x089c,clif->pChangeDir,2,4);
+	packet(0x08a9,clif->pUseSkillToId,2,4,6);
+	packet(0x0917,clif->pMoveFromKafra,2,4);
+	packet(0x091c,clif->pTakeItem,2);
+	packet(0x0923,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0927,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0932,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0934,clif->pTickSend,2);
+	packet(0x0936,clif->pReqClickBuyingStore,2);
+	packet(0x093c,clif->pHomMenu,2,4);
+	packet(0x0947,clif->pStoragePassword,0);
+	packet(0x0952,clif->pDropItem,2,4);
+	packet(0x0954,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0956,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x095d,clif->pFriendsListAdd,2);
+	packet(0x0969,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #endif
 
 // 2013-10-16aRagexe, 2013-10-16bRagexe
 #if PACKETVER == 20131016
-	packet(0x022d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0281,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0361,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0364,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0366,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x07ec,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0802,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x085a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x085d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0863,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0864,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0867,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x086c,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0870,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0875,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0887,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0888,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x088b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0890,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0894,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x091a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x091e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0927,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0946,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x095e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0962,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0966,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x022d,clif->pMoveToKafra,2,4);
+	packet(0x0281,clif->pPartyInvite2,2);
+	packet(0x0361,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0364,clif->pDropItem,2,4);
+	packet(0x0366,clif->pReqClickBuyingStore,2);
+	packet(0x07ec,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0802,clif->pDull/*,XXX*/);
+	packet(0x085a,clif->pDull/*,XXX*/);
+	packet(0x085d,clif->pGetCharNameRequest,2);
+	packet(0x0863,clif->pUseSkillToId,2,4,6);
+	packet(0x0864,clif->pStoragePassword,0);
+	packet(0x0867,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x086c,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0870,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0875,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0887,clif->pTakeItem,2);
+	packet(0x0888,clif->pHomMenu,2,4);
+	packet(0x088b,clif->pFriendsListAdd,2);
+	packet(0x0890,clif->pSolveCharName,2);
+	packet(0x0894,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x091a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x091e,clif->pMoveFromKafra,2,4);
+	packet(0x091f,clif->pWalkToXY,2);
+	packet(0x0927,clif->pTickSend,2);
+	packet(0x0946,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x094e,clif->pReqCloseBuyingStore,0);
+	packet(0x095e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0962,clif->pActionRequest,2,6);
+	packet(0x0966,clif->pChangeDir,2,4);
 #endif
 
 // 2013-10-23aRagexe
 #if PACKETVER == 20131023
-	packet(0x0366,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0438,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0819,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0835,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x085b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0862,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x086e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0872,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0876,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0885,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x088f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a7,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08ab,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ac,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0919,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x091d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0923,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0924,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0935,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0937,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0944,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x094a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0951,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0954,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x095b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
+	packet(0x0366,clif->pReqCloseBuyingStore,0);
+	packet(0x0438,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0819,clif->pDropItem,2,4);
+	packet(0x0835,clif->pDull/*,XXX*/);
+	packet(0x085b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0862,clif->pDull/*,XXX*/);
+	packet(0x086e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0872,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0876,clif->pUseSkillToId,2,4,6);
+	packet(0x087f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0885,clif->pStoragePassword,0);
+	packet(0x088a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088b,clif->pTakeItem,2);
+	packet(0x088f,clif->pMoveToKafra,2,4);
+	packet(0x08a7,clif->pHomMenu,2,4);
+	packet(0x08ab,clif->pChangeDir,2,4);
+	packet(0x08ac,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0919,clif->pSolveCharName,2);
+	packet(0x091d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0923,clif->pActionRequest,2,6);
+	packet(0x0924,clif->pTickSend,2);
+	packet(0x0935,clif->pReqClickBuyingStore,2);
+	packet(0x0937,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0944,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x094a,clif->pFriendsListAdd,2);
+	packet(0x0951,clif->pGetCharNameRequest,2);
+	packet(0x0954,clif->pMoveFromKafra,2,4);
+	packet(0x095b,clif->pWalkToXY,2);
 #endif
 
 // 2013-10-30aRagexe
 #if PACKETVER == 20131030
-	packet(0x022d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0887,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a2,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0925,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pHomMenu,2,4);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087d,clif->pFriendsListAdd,2);
+	packet(0x0887,clif->pStoragePassword,0);
+	packet(0x08a2,clif->pDull/*,XXX*/);
+	packet(0x0925,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-11-06aRagexe, 2013-11-07aRagexe, 2013-11-07bRagexe, 2013-11-07cRagexe, 2013-11-08aRagexe
 #if PACKETVER == 20131106 || \
     PACKETVER == 20131107 || \
     PACKETVER == 20131108
-	packet(0x0281,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0363,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0369,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0436,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0802,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0817,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0866,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0867,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0870,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0875,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0887,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0891,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0893,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0894,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a2,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0919,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x091d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0929,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0935,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x093b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0942,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0946,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0947,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0948,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0950,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0954,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x095d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0962,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0967,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
+	packet(0x0281,clif->pGetCharNameRequest,2);
+	packet(0x0363,clif->pUseSkillToId,2,4,6);
+	packet(0x0369,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0436,clif->pStoragePassword,0);
+	packet(0x0802,clif->pChangeDir,2,4);
+	packet(0x0817,clif->pDull/*,XXX*/);
+	packet(0x0866,clif->pWalkToXY,2);
+	packet(0x0867,clif->pMoveToKafra,2,4);
+	packet(0x0870,clif->pReqCloseBuyingStore,0);
+	packet(0x0875,clif->pDropItem,2,4);
+	packet(0x0887,clif->pTickSend,2);
+	packet(0x0891,clif->pSolveCharName,2);
+	packet(0x0893,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0894,clif->pHomMenu,2,4);
+	packet(0x08a2,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0919,clif->pSearchStoreInfoNextPage,0);
+	packet(0x091d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0929,clif->pMoveFromKafra,2,4);
+	packet(0x0935,clif->pFriendsListAdd,2);
+	packet(0x093b,clif->pTakeItem,2);
+	packet(0x0942,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0946,clif->pReqClickBuyingStore,2);
+	packet(0x0947,clif->pActionRequest,2,6);
+	packet(0x0948,clif->pDull/*,XXX*/);
+	packet(0x0950,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0954,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x095d,clif->pPartyInvite2,2);
+	packet(0x0962,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0967,clif->pReqTradeBuyingStore,2,4,8,12);
 #endif
 
 // 2013-11-13bRagexe
 #if PACKETVER == 20131113
-	packet(0x0364,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x086d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0879,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x088c,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x088f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a8,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x091c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0920,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0926,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0927,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0928,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0929,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x092b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092d,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x092e,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x092f,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0934,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0936,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x093c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0949,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0950,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x095d,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x095f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0960,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0964,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0969,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
+	packet(0x0364,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x086d,clif->pReqCloseBuyingStore,0);
+	packet(0x0879,clif->pSearchStoreInfoNextPage,0);
+	packet(0x088c,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x088f,clif->pDropItem,2,4);
+	packet(0x089a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a4,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a8,clif->pDull/*,XXX*/);
+	packet(0x091c,clif->pMoveFromKafra,2,4);
+	packet(0x0920,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0926,clif->pHomMenu,2,4);
+	packet(0x0927,clif->pPartyInvite2,2);
+	packet(0x0928,clif->pStoragePassword,0);
+	packet(0x0929,clif->pTickSend,2);
+	packet(0x092b,clif->pTakeItem,2);
+	packet(0x092c,clif->pFriendsListAdd,2);
+	packet(0x092d,clif->pReqClickBuyingStore,2);
+	packet(0x092e,clif->pGetCharNameRequest,2);
+	packet(0x092f,clif->pSolveCharName,2);
+	packet(0x0934,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0936,clif->pWalkToXY,2);
+	packet(0x093c,clif->pChangeDir,2,4);
+	packet(0x0949,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0950,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x095d,clif->pActionRequest,2,6);
+	packet(0x095f,clif->pUseSkillToId,2,4,6);
+	packet(0x0960,clif->pMoveToKafra,2,4);
+	packet(0x0964,clif->pDull/*,XXX*/);
+	packet(0x0969,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
 #endif
 
 // 2013-11-20dRagexe
 #if PACKETVER == 20131120
-	packet(0x0361,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0368,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0802,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0811,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0817,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x085a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x085f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0862,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0884,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a1,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a8,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0917,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0926,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0927,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x092b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x092d,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x093e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x093f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0940,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0950,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0953,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0955,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0956,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x095e,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x0361,clif->pSolveCharName,2);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0368,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0802,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0811,clif->pDull/*,XXX*/);
+	packet(0x0817,clif->pTickSend,2);
+	packet(0x085a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x085f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0862,clif->pReqCloseBuyingStore,0);
+	packet(0x0884,clif->pUseSkillToId,2,4,6);
+	packet(0x088c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088d,clif->pFriendsListAdd,2);
+	packet(0x089e,clif->pTakeItem,2);
+	packet(0x08a1,clif->pHomMenu,2,4);
+	packet(0x08a4,clif->pStoragePassword,0);
+	packet(0x08a8,clif->pActionRequest,2,6);
+	packet(0x0917,clif->pDropItem,2,4);
+	packet(0x0926,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0927,clif->pMoveToKafra,2,4);
+	packet(0x092b,clif->pWalkToXY,2);
+	packet(0x092d,clif->pSearchStoreInfoNextPage,0);
+	packet(0x093e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x093f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0940,clif->pDull/*,XXX*/);
+	packet(0x0950,clif->pGetCharNameRequest,2);
+	packet(0x0953,clif->pPartyInvite2,2);
+	packet(0x0955,clif->pReqClickBuyingStore,2);
+	packet(0x0956,clif->pChangeDir,2,4);
+	packet(0x095e,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2013-11-27bRagexe
 #if PACKETVER == 20131127
-	packet(0x035f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0364,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0365,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0366,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0881,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0884,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x088d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0894,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0930,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x093a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0940,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x094c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x095c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0967,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x096a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
+	packet(0x035f,clif->pReqClickBuyingStore,2);
+	packet(0x0364,clif->pGetCharNameRequest,2);
+	packet(0x0365,clif->pWalkToXY,2);
+	packet(0x0366,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pMoveFromKafra,2,4);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0881,clif->pDull/*,XXX*/);
+	packet(0x0884,clif->pHomMenu,2,4);
+	packet(0x088d,clif->pChangeDir,2,4);
+	packet(0x0894,clif->pStoragePassword,0);
+	packet(0x089e,clif->pDull/*,XXX*/);
+	packet(0x0930,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x093a,clif->pFriendsListAdd,2);
+	packet(0x0940,clif->pTickSend,2);
+	packet(0x094c,clif->pTakeItem,2);
+	packet(0x094f,clif->pDropItem,2,4);
+	packet(0x095c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0967,clif->pPartyInvite2,2);
+	packet(0x096a,clif->pMoveToKafra,2,4);
 #endif
 
 // 2013-12-04eRagexe
 #if PACKETVER == 20131204
-	packet(0x0365,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0366,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x07e4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x07ec,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x085a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0862,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0869,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x086c,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0877,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0879,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x087f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0882,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a0,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08a4,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a7,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08ad,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x091f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0928,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x092d,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x092f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0932,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x093b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0941,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0951,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0958,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0959,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x095b,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0961,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0967,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
+	packet(0x0365,clif->pReqCloseBuyingStore,0);
+	packet(0x0366,clif->pTickSend,2);
+	packet(0x07e4,clif->pStoragePassword,0);
+	packet(0x07ec,clif->pReqClickBuyingStore,2);
+	packet(0x085a,clif->pPartyInvite2,2);
+	packet(0x0862,clif->pChangeDir,2,4);
+	packet(0x0869,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x086c,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0877,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0879,clif->pSolveCharName,2);
+	packet(0x087f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0882,clif->pFriendsListAdd,2);
+	packet(0x08a0,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08a4,clif->pDropItem,2,4);
+	packet(0x08a7,clif->pTakeItem,2);
+	packet(0x08ad,clif->pGetCharNameRequest,2);
+	packet(0x091f,clif->pHomMenu,2,4);
+	packet(0x0928,clif->pActionRequest,2,6);
+	packet(0x092d,clif->pUseSkillToId,2,4,6);
+	packet(0x092f,clif->pWalkToXY,2);
+	packet(0x0932,clif->pSearchStoreInfoNextPage,0);
+	packet(0x093b,clif->pDull/*,XXX*/);
+	packet(0x0941,clif->pMoveToKafra,2,4);
+	packet(0x0951,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0958,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0959,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x095b,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0961,clif->pDull/*,XXX*/);
+	packet(0x0967,clif->pMoveFromKafra,2,4);
 #endif
 
 // 2013-12-11cRagexe, 2013-12-11dRagexe
 #if PACKETVER == 20131211
-	packet(0x0202,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0366,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0865,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x086e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0873,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0881,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0886,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0892,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a3,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a4,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ab,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x092b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0931,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x094c,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pUseSkillToId,2,4,6);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0366,clif->pTakeItem,2);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pFriendsListAdd,2);
+	packet(0x0865,clif->pPartyInvite2,2);
+	packet(0x086e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0873,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0881,clif->pDull/*,XXX*/);
+	packet(0x0886,clif->pHomMenu,2,4);
+	packet(0x0892,clif->pMoveToKafra,2,4);
+	packet(0x08a3,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08a4,clif->pChangeDir,2,4);
+	packet(0x08ab,clif->pDropItem,2,4);
+	packet(0x092b,clif->pStoragePassword,0);
+	packet(0x0931,clif->pMoveFromKafra,2,4);
+	packet(0x094c,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-12-18bRagexe
 #if PACKETVER == 20131218
-	packet(0x022d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x087b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08ab,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0947,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pHomMenu,2,4);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085c,clif->pStoragePassword,0);
+	packet(0x087b,clif->pDull/*,XXX*/);
+	packet(0x08ab,clif->pFriendsListAdd,2);
+	packet(0x092f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0947,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-12-23bRagexe, 2013-12-23cRagexe
 #if PACKETVER == 20131223
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x08a4,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-12-30aRagexe
 #if PACKETVER == 20131230
-	packet(0x022d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x02c4,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x035f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0365,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0369,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0438,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0860,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0871,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x087b,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x087e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0895,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0898,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x089c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a9,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x091d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x091f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0926,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x092a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x093d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x093e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0943,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0949,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x094c,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0968,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0969,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x096a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
+	packet(0x022d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x02c4,clif->pUseSkillToId,2,4,6);
+	packet(0x035f,clif->pWalkToXY,2);
+	packet(0x0365,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0369,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0438,clif->pTickSend,2);
+	packet(0x0860,clif->pDropItem,2,4);
+	packet(0x0871,clif->pActionRequest,2,6);
+	packet(0x087b,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x087e,clif->pDull/*,XXX*/);
+	packet(0x087f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0895,clif->pMoveFromKafra,2,4);
+	packet(0x0898,clif->pSolveCharName,2);
+	packet(0x089c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a9,clif->pPartyInvite2,2);
+	packet(0x091d,clif->pStoragePassword,0);
+	packet(0x091e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x091f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0926,clif->pGetCharNameRequest,2);
+	packet(0x092a,clif->pTakeItem,2);
+	packet(0x093d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x093e,clif->pDull/*,XXX*/);
+	packet(0x0943,clif->pFriendsListAdd,2);
+	packet(0x0949,clif->pHomMenu,2,4);
+	packet(0x094a,clif->pChangeDir,2,4);
+	packet(0x094c,clif->pReqCloseBuyingStore,0);
+	packet(0x0968,clif->pMoveToKafra,2,4);
+	packet(0x0969,clif->pReqClickBuyingStore,2);
+	packet(0x096a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
 #endif
 
 // 2014-01-08cRagexe, 2014-01-08dRagexe
 #if PACKETVER == 20140108
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0936,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0936,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-01-15aRagexe, 2014-01-15bRagexe, 2014-01-15cRagexe, 2014-01-15eRagexe
 #if PACKETVER == 20140115
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0367,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0865,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0887,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x088a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088e,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x089b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a7,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x092d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x095d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0965,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0966,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pDropItem,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0367,clif->pMoveFromKafra,2,4);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pGetCharNameRequest,2);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0865,clif->pStoragePassword,0);
+	packet(0x0887,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x088a,clif->pDull/*,XXX*/);
+	packet(0x088e,clif->pMoveToKafra,2,4);
+	packet(0x089b,clif->pFriendsListAdd,2);
+	packet(0x08a7,clif->pChangeDir,2,4);
+	packet(0x092d,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pTakeItem,2);
+	packet(0x095b,clif->pDull/*,XXX*/);
+	packet(0x095d,clif->pPartyInvite2,2);
+	packet(0x0965,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0966,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2014-01-22aRagexe
 #if PACKETVER == 20140122
-	packet(0x0360,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x07ec,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0811,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0863,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0870,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0871,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0872,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x088c,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0890,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0893,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0899,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x089d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08a2,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08aa,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0917,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x091a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0925,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x092f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0940,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0941,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0942,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x094c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0950,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0952,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0955,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0957,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x095d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x095f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
+	packet(0x0360,clif->pActionRequest,2,6);
+	packet(0x07ec,clif->pReqClickBuyingStore,2);
+	packet(0x0811,clif->pReqCloseBuyingStore,0);
+	packet(0x0863,clif->pHomMenu,2,4);
+	packet(0x0870,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0871,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0872,clif->pPartyInvite2,2);
+	packet(0x088c,clif->pDull/*,XXX*/);
+	packet(0x0890,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0893,clif->pFriendsListAdd,2);
+	packet(0x0899,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x089d,clif->pGetCharNameRequest,2);
+	packet(0x08a2,clif->pDull/*,XXX*/);
+	packet(0x08aa,clif->pDropItem,2,4);
+	packet(0x0917,clif->pTickSend,2);
+	packet(0x091a,clif->pChangeDir,2,4);
+	packet(0x0925,clif->pWalkToXY,2);
+	packet(0x092f,clif->pMoveToKafra,2,4);
+	packet(0x0940,clif->pUseSkillToId,2,4,6);
+	packet(0x0941,clif->pSolveCharName,2);
+	packet(0x0942,clif->pTakeItem,2);
+	packet(0x094b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x094c,clif->pMoveFromKafra,2,4);
+	packet(0x0950,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0952,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0955,clif->pStoragePassword,0);
+	packet(0x0957,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x095d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x095f,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #endif
 
 // 2014-01-29aRagexe, 2014-01-29cRagexe
 #if PACKETVER == 20140129
-	packet(0x0281,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0367,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07ec,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0802,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0884,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0885,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0889,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0921,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0924,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x092c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0958,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0961,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pUseSkillToId,2,4,6);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pDull/*,XXX*/);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0367,clif->pDropItem,2,4);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07ec,clif->pChangeDir,2,4);
+	packet(0x0802,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pDull/*,XXX*/);
+	packet(0x0884,clif->pHomMenu,2,4);
+	packet(0x0885,clif->pTakeItem,2);
+	packet(0x0889,clif->pMoveFromKafra,2,4);
+	packet(0x0921,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0924,clif->pItemListWindowSelected,2,4,8);
+	packet(0x092c,clif->pStoragePassword,0);
+	packet(0x094d,clif->pMoveToKafra,2,4);
+	packet(0x0958,clif->pPartyInvite2,2);
+	packet(0x0961,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-02-05bRagexe
 #if PACKETVER == 20140205
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0938,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0938,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-02-12aRagexe
 #if PACKETVER == 20140212
-	packet(0x02c4,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0369,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0438,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x086e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0874,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0877,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0878,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x087e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0888,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x088c,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x089d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x089e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x08a0,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a1,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a7,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08ac,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08ad,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0919,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0928,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0930,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0934,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0936,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x093d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0944,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0952,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0953,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0960,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
+	packet(0x02c4,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0369,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0438,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x086e,clif->pUseSkillToId,2,4,6);
+	packet(0x0874,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0877,clif->pReqClickBuyingStore,2);
+	packet(0x0878,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x087e,clif->pWalkToXY,2);
+	packet(0x0888,clif->pMoveFromKafra,2,4);
+	packet(0x088c,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x089d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x089e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x08a0,clif->pStoragePassword,0);
+	packet(0x08a1,clif->pPartyInvite2,2);
+	packet(0x08a7,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08ac,clif->pMoveToKafra,2,4);
+	packet(0x08ad,clif->pDropItem,2,4);
+	packet(0x0919,clif->pChangeDir,2,4);
+	packet(0x091b,clif->pFriendsListAdd,2);
+	packet(0x0928,clif->pSolveCharName,2);
+	packet(0x0930,clif->pTickSend,2);
+	packet(0x0934,clif->pActionRequest,2,6);
+	packet(0x0936,clif->pDull/*,XXX*/);
+	packet(0x093d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0944,clif->pHomMenu,2,4);
+	packet(0x094e,clif->pDull/*,XXX*/);
+	packet(0x0952,clif->pGetCharNameRequest,2);
+	packet(0x0953,clif->pTakeItem,2);
+	packet(0x0960,clif->pReqCloseBuyingStore,0);
 #endif
 
 // 2014-02-19aRagexe
 #if PACKETVER == 20140219
-	packet(0x0202,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0360,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0364,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0802,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0838,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x085c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x085d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x085f,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0860,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0868,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x086f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x087c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0889,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0898,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x089f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a6,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08aa,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08ac,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0921,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0927,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0939,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0946,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0949,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0953,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x095a,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0961,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
+	packet(0x0202,clif->pFriendsListAdd,2);
+	packet(0x0360,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pSolveCharName,2);
+	packet(0x0802,clif->pTakeItem,2);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0838,clif->pUseSkillToId,2,4,6);
+	packet(0x085b,clif->pReqClickBuyingStore,2);
+	packet(0x085c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x085d,clif->pWalkToXY,2);
+	packet(0x085f,clif->pGetCharNameRequest,2);
+	packet(0x0860,clif->pHomMenu,2,4);
+	packet(0x0868,clif->pStoragePassword,0);
+	packet(0x086f,clif->pPartyInvite2,2);
+	packet(0x087c,clif->pMoveToKafra,2,4);
+	packet(0x0889,clif->pDull/*,XXX*/);
+	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0898,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x089f,clif->pDropItem,2,4);
+	packet(0x08a6,clif->pChangeDir,2,4);
+	packet(0x08aa,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08ac,clif->pMoveFromKafra,2,4);
+	packet(0x0921,clif->pActionRequest,2,6);
+	packet(0x0927,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0939,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0946,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0949,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0953,clif->pSearchStoreInfoNextPage,0);
+	packet(0x095a,clif->pReqCloseBuyingStore,0);
+	packet(0x0961,clif->pTickSend,2);
 #endif
 
 // 2014-02-26aRagexe
 #if PACKETVER == 20140226
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0362,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0364,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0867,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0877,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0887,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0894,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0895,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0921,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0931,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0941,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0962,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0964,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0969,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0362,clif->pFriendsListAdd,2);
+	packet(0x0364,clif->pStoragePassword,0);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pChangeDir,2,4);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0867,clif->pHomMenu,2,4);
+	packet(0x0877,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0887,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0894,clif->pDropItem,2,4);
+	packet(0x0895,clif->pMoveFromKafra,2,4);
+	packet(0x091a,clif->pMoveToKafra,2,4);
+	packet(0x0921,clif->pPartyInvite2,2);
+	packet(0x0931,clif->pDull/*,XXX*/);
+	packet(0x0941,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0962,clif->pDull/*,XXX*/);
+	packet(0x0964,clif->pTakeItem,2);
+	packet(0x0969,clif->pItemListWindowSelected,2,4,8);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-03-05aRagexe, 2014-03-05bRagexe
 #if PACKETVER == 20140305
-	packet(0x0202,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x07e4,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0878,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0934,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095e,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pTakeItem,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x07e4,clif->pFriendsListAdd,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pChangeDir,2,4);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0878,clif->pDull/*,XXX*/);
+	packet(0x0934,clif->pHomMenu,2,4);
+	packet(0x095e,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-03-12dRagexe
 #if PACKETVER == 20140312
-	packet(0x0202,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x023b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0366,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x085e,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x086f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0889,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x088d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088e,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0891,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0894,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x089b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x089e,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a6,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a9,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08ad,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x091b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x091c,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x091e,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x092a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0948,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x094c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0957,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x095d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x095e,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0966,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
+	packet(0x0202,clif->pUseSkillToId,2,4,6);
+	packet(0x023b,clif->pDull/*,XXX*/);
+	packet(0x0366,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x085e,clif->pReqClickBuyingStore,2);
+	packet(0x086f,clif->pTickSend,2);
+	packet(0x0889,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x088d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088e,clif->pActionRequest,2,6);
+	packet(0x0891,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0894,clif->pWalkToXY,2);
+	packet(0x089b,clif->pGetCharNameRequest,2);
+	packet(0x089d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x089e,clif->pDropItem,2,4);
+	packet(0x08a6,clif->pDull/*,XXX*/);
+	packet(0x08a9,clif->pFriendsListAdd,2);
+	packet(0x08ad,clif->pSolveCharName,2);
+	packet(0x091b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x091c,clif->pPartyInvite2,2);
+	packet(0x091e,clif->pHomMenu,2,4);
+	packet(0x092a,clif->pTakeItem,2);
+	packet(0x0948,clif->pReqCloseBuyingStore,0);
+	packet(0x094a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x094b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x094c,clif->pChangeDir,2,4);
+	packet(0x0957,clif->pMoveFromKafra,2,4);
+	packet(0x095d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x095e,clif->pStoragePassword,0);
+	packet(0x0966,clif->pMoveToKafra,2,4);
 #endif
 
 // 2014-03-19aRagexe
 #if PACKETVER == 20140319
-	packet(0x02c4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07e4,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0802,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0811,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0815,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x085a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0864,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0865,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0866,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x086e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0872,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0883,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x088e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0890,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0893,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x089f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08a2,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091f,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0923,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0933,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0942,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0944,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0947,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x094c,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0954,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0955,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0964,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x096a,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
+	packet(0x02c4,clif->pTakeItem,2);
+	packet(0x07e4,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0802,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0811,clif->pReqClickBuyingStore,2);
+	packet(0x0815,clif->pHomMenu,2,4);
+	packet(0x085a,clif->pWalkToXY,2);
+	packet(0x0864,clif->pActionRequest,2,6);
+	packet(0x0865,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0866,clif->pChangeDir,2,4);
+	packet(0x086e,clif->pDull/*,XXX*/);
+	packet(0x0872,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0883,clif->pDropItem,2,4);
+	packet(0x088e,clif->pPartyInvite2,2);
+	packet(0x0890,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0893,clif->pDull/*,XXX*/);
+	packet(0x089f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08a2,clif->pMoveToKafra,2,4);
+	packet(0x091f,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0923,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0933,clif->pReqCloseBuyingStore,0);
+	packet(0x0942,clif->pStoragePassword,0);
+	packet(0x0944,clif->pUseSkillToId,2,4,6);
+	packet(0x0947,clif->pMoveFromKafra,2,4);
+	packet(0x094c,clif->pGetCharNameRequest,2);
+	packet(0x0954,clif->pFriendsListAdd,2);
+	packet(0x0955,clif->pTickSend,2);
+	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0964,clif->pSolveCharName,2);
+	packet(0x096a,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #endif
 
 // 2014-03-26aRagexe
 #if PACKETVER == 20140326
-	packet(0x0362,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0365,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x07ec,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x083c,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x085b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0865,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0867,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0869,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x086b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x087f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0887,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0898,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08aa,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08ac,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x08ad,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0918,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0928,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x092a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x093d,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0942,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0945,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0946,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0956,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0959,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x095a,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x095c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0969,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
+	packet(0x0362,clif->pGetCharNameRequest,2);
+	packet(0x0365,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x07ec,clif->pTakeItem,2);
+	packet(0x083c,clif->pReqClickBuyingStore,2);
+	packet(0x085b,clif->pReqCloseBuyingStore,0);
+	packet(0x0865,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0867,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0869,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x086b,clif->pMoveFromKafra,2,4);
+	packet(0x087c,clif->pWalkToXY,2);
+	packet(0x087e,clif->pFriendsListAdd,2);
+	packet(0x087f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0887,clif->pDull/*,XXX*/);
+	packet(0x0898,clif->pDropItem,2,4);
+	packet(0x08aa,clif->pDull/*,XXX*/);
+	packet(0x08ac,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x08ad,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0918,clif->pTickSend,2);
+	packet(0x0928,clif->pSearchStoreInfoNextPage,0);
+	packet(0x092a,clif->pStoragePassword,0);
+	packet(0x093d,clif->pActionRequest,2,6);
+	packet(0x0942,clif->pHomMenu,2,4);
+	packet(0x0945,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0946,clif->pPartyInvite2,2);
+	packet(0x0956,clif->pChangeDir,2,4);
+	packet(0x0959,clif->pMoveToKafra,2,4);
+	packet(0x095a,clif->pSolveCharName,2);
+	packet(0x095c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0969,clif->pUseSkillToId,2,4,6);
 #endif
 
 // 2014-04-02fRagexe, 2014-04-02gRagexe
 #if PACKETVER == 20140402
-	packet(0x023b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0360,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0364,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07ec,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x085b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x085d,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0867,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0868,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0882,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0883,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x088c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0890,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0896,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x089a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08ac,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x091f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0920,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0926,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0933,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x093f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0944,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0946,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x094c,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0950,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0958,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0965,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
+	packet(0x023b,clif->pReqClickBuyingStore,2);
+	packet(0x0360,clif->pChangeDir,2,4);
+	packet(0x0364,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07ec,clif->pSolveCharName,2);
+	packet(0x085b,clif->pMoveFromKafra,2,4);
+	packet(0x085d,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0867,clif->pReqCloseBuyingStore,0);
+	packet(0x0868,clif->pUseSkillToId,2,4,6);
+	packet(0x0882,clif->pDropItem,2,4);
+	packet(0x0883,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088a,clif->pGetCharNameRequest,2);
+	packet(0x088c,clif->pDull/*,XXX*/);
+	packet(0x0890,clif->pPartyInvite2,2);
+	packet(0x0896,clif->pHomMenu,2,4);
+	packet(0x089a,clif->pFriendsListAdd,2);
+	packet(0x08ac,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x091f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0920,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0926,clif->pStoragePassword,0);
+	packet(0x092d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0933,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x093f,clif->pWalkToXY,2);
+	packet(0x0944,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0946,clif->pActionRequest,2,6);
+	packet(0x094c,clif->pDull/*,XXX*/);
+	packet(0x0950,clif->pTickSend,2);
+	packet(0x0958,clif->pTakeItem,2);
+	packet(0x095c,clif->pMoveToKafra,2,4);
+	packet(0x0965,clif->pSearchStoreInfoListItemClick,2,6,10);
 #endif
 
 // 2014-04-09aRagexe, 2014-04-09bRagexe
 #if PACKETVER == 20140409
-	packet(0x0819,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x085b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0868,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x086a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0873,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0875,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x087e,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0883,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0884,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x088a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0890,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0893,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0896,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0899,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a2,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a4,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08a6,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x08a7,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a9,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0918,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x092e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0942,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0947,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x095a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x095e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
+	packet(0x0819,clif->pMoveFromKafra,2,4);
+	packet(0x085b,clif->pSolveCharName,2);
+	packet(0x0868,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x086a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0873,clif->pReqCloseBuyingStore,0);
+	packet(0x0875,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x087e,clif->pTickSend,2);
+	packet(0x0883,clif->pWalkToXY,2);
+	packet(0x0884,clif->pGetCharNameRequest,2);
+	packet(0x088a,clif->pDull/*,XXX*/);
+	packet(0x0890,clif->pTakeItem,2);
+	packet(0x0893,clif->pActionRequest,2,6);
+	packet(0x0896,clif->pUseSkillToId,2,4,6);
+	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0899,clif->pFriendsListAdd,2);
+	packet(0x08a2,clif->pDull/*,XXX*/);
+	packet(0x08a4,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08a6,clif->pSearchStoreInfoNextPage,0);
+	packet(0x08a7,clif->pChangeDir,2,4);
+	packet(0x08a9,clif->pStoragePassword,0);
+	packet(0x0918,clif->pDropItem,2,4);
+	packet(0x091c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x092e,clif->pPartyInvite2,2);
+	packet(0x0942,clif->pMoveToKafra,2,4);
+	packet(0x0947,clif->pHomMenu,2,4);
+	packet(0x094c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x095a,clif->pReqClickBuyingStore,2);
+	packet(0x095e,clif->pWantToConnection,2,6,10,14,18);
 #endif
 
 // 2014-04-16aRagexe, 2014-04-16bRagexe
 #if PACKETVER == 20140416
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x095c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x095c,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-04-23aRagexe
 #if PACKETVER == 20140423
-	packet(0x022d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0360,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0436,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0811,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x083c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x085a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x085b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0862,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0863,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0866,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x086b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x086f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0873,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0890,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0895,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0896,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0898,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x089b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x089d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089f,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08a8,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08ad,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x091a,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0920,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x094f,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x095e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
+	packet(0x022d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0360,clif->pStoragePassword,0);
+	packet(0x0436,clif->pFriendsListAdd,2);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x0811,clif->pMoveFromKafra,2,4);
+	packet(0x083c,clif->pChangeDir,2,4);
+	packet(0x085a,clif->pSearchStoreInfoNextPage,0);
+	packet(0x085b,clif->pWalkToXY,2);
+	packet(0x0862,clif->pMoveToKafra,2,4);
+	packet(0x0863,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0866,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x086b,clif->pDropItem,2,4);
+	packet(0x086f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0873,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088b,clif->pSolveCharName,2);
+	packet(0x0890,clif->pUseSkillToId,2,4,6);
+	packet(0x0895,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0896,clif->pActionRequest,2,6);
+	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0898,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x089b,clif->pReqClickBuyingStore,2);
+	packet(0x089d,clif->pGetCharNameRequest,2);
+	packet(0x089f,clif->pReqCloseBuyingStore,0);
+	packet(0x08a8,clif->pHomMenu,2,4);
+	packet(0x08ad,clif->pDull/*,XXX*/);
+	packet(0x091a,clif->pTickSend,2);
+	packet(0x0920,clif->pPartyInvite2,2);
+	packet(0x094f,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x095e,clif->pDull/*,XXX*/);
 #endif
 
 // 2014-04-30aRagexe
 #if PACKETVER == 20140430
-	packet(0x023b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x035f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0363,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0860,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0870,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0871,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0875,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087f,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0884,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0899,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a1,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0940,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x094b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0953,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0956,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
+	packet(0x023b,clif->pTickSend,2);
+	packet(0x035f,clif->pStoragePassword,0);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0363,clif->pUseSkillToId,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pDropItem,2,4);
+	packet(0x0860,clif->pFriendsListAdd,2);
+	packet(0x0870,clif->pPartyInvite2,2);
+	packet(0x0871,clif->pHomMenu,2,4);
+	packet(0x0875,clif->pMoveFromKafra,2,4);
+	packet(0x087f,clif->pTakeItem,2);
+	packet(0x0884,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0899,clif->pChangeDir,2,4);
+	packet(0x08a1,clif->pDull/*,XXX*/);
+	packet(0x093b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0940,clif->pGetCharNameRequest,2);
+	packet(0x094b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0953,clif->pDull/*,XXX*/);
+	packet(0x0956,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pSolveCharName,2);
 #endif
 
 // 2014-05-08bRagexe
 #if PACKETVER == 20140508
-	packet(0x022d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x02c4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0366,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0368,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0802,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0861,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0886,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x089b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08ab,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0927,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0930,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0932,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0934,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x094e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x022d,clif->pSolveCharName,2);
+	packet(0x02c4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pChangeDir,2,4);
+	packet(0x0366,clif->pPartyInvite2,2);
+	packet(0x0368,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pHomMenu,2,4);
+	packet(0x0802,clif->pGetCharNameRequest,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0861,clif->pTakeItem,2);
+	packet(0x0886,clif->pMoveToKafra,2,4);
+	packet(0x089b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08ab,clif->pDull/*,XXX*/);
+	packet(0x0927,clif->pStoragePassword,0);
+	packet(0x0930,clif->pMoveFromKafra,2,4);
+	packet(0x0932,clif->pDropItem,2,4);
+	packet(0x0934,clif->pDull/*,XXX*/);
+	packet(0x094e,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2014-05-14bRagexe
 #if PACKETVER == 20140514
-	packet(0x0437,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0817,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0865,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0867,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0868,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0876,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0877,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0885,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0886,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x088a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x088b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0895,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x089a,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x089c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a5,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0918,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x091d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0921,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0925,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x092c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x092f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x094d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0958,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0962,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0965,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x096a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
+	packet(0x0437,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0817,clif->pDull/*,XXX*/);
+	packet(0x0865,clif->pActionRequest,2,6);
+	packet(0x0867,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0868,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0876,clif->pUseSkillToId,2,4,6);
+	packet(0x0877,clif->pDull/*,XXX*/);
+	packet(0x087d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0885,clif->pStoragePassword,0);
+	packet(0x0886,clif->pTickSend,2);
+	packet(0x088a,clif->pChangeDir,2,4);
+	packet(0x088b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0895,clif->pTakeItem,2);
+	packet(0x089a,clif->pSolveCharName,2);
+	packet(0x089c,clif->pFriendsListAdd,2);
+	packet(0x08a5,clif->pGetCharNameRequest,2);
+	packet(0x0918,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x091d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0921,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0925,clif->pReqClickBuyingStore,2);
+	packet(0x092c,clif->pMoveToKafra,2,4);
+	packet(0x092f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x094d,clif->pReqCloseBuyingStore,0);
+	packet(0x094e,clif->pMoveFromKafra,2,4);
+	packet(0x0958,clif->pHomMenu,2,4);
+	packet(0x095f,clif->pWalkToXY,2);
+	packet(0x0962,clif->pPartyInvite2,2);
+	packet(0x0965,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x096a,clif->pDropItem,2,4);
 #endif
 
 // 2014-05-21bRagexe
 #if PACKETVER == 20140521
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0869,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x089c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08ac,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0968,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0869,clif->pStoragePassword,0);
+	packet(0x088b,clif->pDull/*,XXX*/);
+	packet(0x088d,clif->pChangeDir,2,4);
+	packet(0x089c,clif->pFriendsListAdd,2);
+	packet(0x08ac,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0968,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-05-28aRagexe
 #if PACKETVER == 20140528
-	packet(0x0202,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0360,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x085f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0862,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0872,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0875,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0877,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0879,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x088a,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x088f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0894,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0896,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x089d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a4,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08a8,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x08ab,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x091d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0929,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0930,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0938,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x093a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x093f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x094a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x094b,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x095f,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0963,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0964,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0966,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
+	packet(0x0202,clif->pWalkToXY,2);
+	packet(0x0360,clif->pStoragePassword,0);
+	packet(0x085f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0862,clif->pSolveCharName,2);
+	packet(0x0872,clif->pHomMenu,2,4);
+	packet(0x0875,clif->pDropItem,2,4);
+	packet(0x0877,clif->pTickSend,2);
+	packet(0x0879,clif->pMoveFromKafra,2,4);
+	packet(0x087e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x088a,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x088f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0894,clif->pDull/*,XXX*/);
+	packet(0x0896,clif->pItemListWindowSelected,2,4,8);
+	packet(0x089d,clif->pTakeItem,2);
+	packet(0x08a4,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08a8,clif->pSearchStoreInfoNextPage,0);
+	packet(0x08ab,clif->pDull/*,XXX*/);
+	packet(0x091d,clif->pFriendsListAdd,2);
+	packet(0x0929,clif->pActionRequest,2,6);
+	packet(0x0930,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0938,clif->pReqCloseBuyingStore,0);
+	packet(0x093a,clif->pMoveToKafra,2,4);
+	packet(0x093f,clif->pPartyInvite2,2);
+	packet(0x094a,clif->pReqClickBuyingStore,2);
+	packet(0x094b,clif->pChangeDir,2,4);
+	packet(0x095f,clif->pGetCharNameRequest,2);
+	packet(0x0963,clif->pUseSkillToId,2,4,6);
+	packet(0x0964,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0966,clif->pReqTradeBuyingStore,2,4,8,12);
 #endif
 
 // 2014-06-05aRagexe, 2014-06-05bRagexe
 #if PACKETVER == 20140605
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0369,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0921,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0931,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x094c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pReqCloseBuyingStore,0);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pActionRequest,2,6);
+	packet(0x0369,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pChangeDir,2,4);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0921,clif->pStoragePassword,0);
+	packet(0x0931,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pSolveCharName,2);
+	packet(0x094c,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-06-11cRagexe, 2014-06-11dRagexe, 2014-06-11hRagexe, 2014-06-12aRagexe, 2014-06-13aRagexe
 #if PACKETVER == 20140611 || \
     PACKETVER == 20140612 || \
     PACKETVER == 20140613
-	packet(0x0364,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0438,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x07e4,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0838,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0864,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0867,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x086c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0874,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0878,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x088c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0891,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0893,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0894,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x089b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a1,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a2,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0924,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0936,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0941,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x094f,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0950,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0951,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0952,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0957,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0958,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0963,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0965,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0969,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-#endif
-
-// 2014-06-11eRagexe, 2015-02-25hRagexe, 2018-03-15aRagexe, 2018-03-21aRagexe, 2018-03-28bRagexe, 2018-04-04bRagexe, 2018-04-18aRagexe, 2018-04-25cRagexe, 2018-05-02bRagexe, 2018-05-09aRagexe, 2018-05-16cRagexe, 2018-05-23aRagexe, 2018-05-30aRagexe, 2018-06-05bRagexe, 2018-06-20cRagexe, 2018-06-20eRagexe, 2018-06-21aRagexe, 2018-07-04aRagexe, 2018-07-18bRagexe, 2018-07-18cRagexe, 2018-08-01cRagexe, 2018-08-08bRagexe, 2018-08-22cRagexe, 2018-08-29aRagexe, 2018-08-31aRagexe, 2018-09-12dRagexe, 2018-09-19aRagexe, 2018-10-02aRagexe, 2018-10-02bRagexe, 2018-10-17_02aRagexe, 2018-10-17_03aRagexe, 2018-10-17bRagexe, 2018-10-24bRagexe, 2018-10-31aRagexe, 2018-10-31bRagexe, 2018-11-07aRagexe, 2018-11-14cRagexe, 2018-11-14dRagexe
+	packet(0x0364,clif->pReqCloseBuyingStore,0);
+	packet(0x0438,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x07e4,clif->pMoveToKafra,2,4);
+	packet(0x0838,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0864,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0867,clif->pTickSend,2);
+	packet(0x086c,clif->pDull/*,XXX*/);
+	packet(0x0874,clif->pPartyInvite2,2);
+	packet(0x0878,clif->pTakeItem,2);
+	packet(0x088c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0891,clif->pActionRequest,2,6);
+	packet(0x0893,clif->pWalkToXY,2);
+	packet(0x0894,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x089b,clif->pFriendsListAdd,2);
+	packet(0x08a1,clif->pUseSkillToId,2,4,6);
+	packet(0x08a2,clif->pDull/*,XXX*/);
+	packet(0x0924,clif->pGetCharNameRequest,2);
+	packet(0x0936,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0941,clif->pStoragePassword,0);
+	packet(0x094a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x094f,clif->pSolveCharName,2);
+	packet(0x0950,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0951,clif->pChangeDir,2,4);
+	packet(0x0952,clif->pMoveFromKafra,2,4);
+	packet(0x0957,clif->pReqClickBuyingStore,2);
+	packet(0x0958,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0963,clif->pDropItem,2,4);
+	packet(0x0965,clif->pHomMenu,2,4);
+	packet(0x0969,clif->pSearchStoreInfoNextPage,0);
+#endif
+
+// 2014-06-11eRagexe, 2015-02-25hRagexe, 2018-03-15aRagexe, 2018-03-21aRagexe, 2018-03-28bRagexe, 2018-04-04bRagexe, 2018-04-18aRagexe, 2018-04-25cRagexe, 2018-05-02bRagexe, 2018-05-09aRagexe, 2018-05-16cRagexe, 2018-05-23aRagexe, 2018-05-30aRagexe, 2018-06-05bRagexe, 2018-06-20cRagexe, 2018-06-20eRagexe, 2018-06-21aRagexe, 2018-07-04aRagexe, 2018-07-18bRagexe, 2018-07-18cRagexe, 2018-08-01cRagexe, 2018-08-08bRagexe, 2018-08-22cRagexe, 2018-08-29aRagexe, 2018-08-31aRagexe, 2018-09-12dRagexe, 2018-09-19aRagexe, 2018-10-02aRagexe, 2018-10-02bRagexe, 2018-10-17_02aRagexe, 2018-10-17_03aRagexe, 2018-10-17bRagexe, 2018-10-24bRagexe, 2018-10-31aRagexe, 2018-10-31bRagexe, 2018-11-07aRagexe, 2018-11-14cRagexe, 2018-11-14dRagexe, 2018-11-21bRagexe, 2018-11-28aRagexe, 2018-11-28bRagexe, 2018-11-28cRagexe, 2018-12-05aRagexe, 2018-12-12aRagexe, 2018-12-12bRagexe, 2018-12-19bRagexe, 2018-12-26aRagexe, 2019-01-09aRagexe, 2019-01-16bRagexe, 2019-01-16cRagexe, 2019-01-23dRagexe, 2019-02-13bRagexe, 2019-02-13eRagexe, 2019-02-27aRagexe, 2019-02-28aRagexe, 2019-03-06bRagexe, 2019-03-06cRagexe, 2019-03-13aRagexe, 2019-03-20aRagexe, 2019-03-22aRagexe, 2019-03-27bRagexe, 2019-04-03aRagexe, 2019-04-17aRagexe, 2019-04-18aRagexe, 2019-05-08cRagexe, 2019-05-22bRagexe, 2019-05-22cRagexe, 2019-05-23aRagexe, 2019-05-29aRagexe, 2019-05-29cRagexe, 2019-05-30aRagexe, 2019-06-05fRagexe, 2019-06-05KRagexe, 2019-06-19bRagexe, 2019-06-19eRagexe, 2019-06-19hRagexe, 2019-07-03aRagexe, 2019-07-17aRagexe, 2019-07-17dRagexe, 2019-07-24aRagexe, 2019-07-31bRagexe, 2019-08-02aRagexe, 2019-08-07aRagexe, 2019-08-21aRagexe, 2019-08-28aRagexe, 2019-09-04aRagexe, 2019-09-04bRagexe, 2019-09-18bRagexe, 2019-09-25aRagexe, 2019-09-25bRagexe, 2019-10-02cRagexe, 2019-10-02dRagexe, 2019-10-16fRagexe, 2019-10-16gRagexe, 2019-10-18aRagexe, 2019-10-23aRagexe, 2019-10-30cRagexe, 2019-11-06aRagexe, 2019-11-07aRagexe, 2019-11-13cRagexe, 2019-11-13eRagexe, 2019-11-20aRagexe, 2019-11-20dRagexe, 2019-11-27aRagexe, 2019-11-27bRagexe, 2019-12-04aRagexe, 2019-12-04bRagexe, 2019-12-11aRagexe, 2019-12-18bRagexe, 2019-12-24aRagexe, 2019-12-24bRagexe, 2020-01-08aRagexe, 2020-01-22cRagexe, 2020-01-29bRagexe, 2020-01-30aRagexe, 2020-02-05aRagexe, 2020-02-06aRagexe, 2020-02-12aRagexe, 2020-02-19dRagexe, 2020-03-04aRagexe, 2020-03-18bRagexe, 2020-04-01bRagexe, 2020-04-14_6aRagexe, 2020-04-14eRagexe, 2020-05-06aRagexe, 2020-05-20bRagexe
 #if PACKETVER == 20140611 || \
     PACKETVER == 20150225 || \
     PACKETVER == 20180315 || \
@@ -3376,6483 +3376,6421 @@
     PACKETVER == 20181024 || \
     PACKETVER == 20181031 || \
     PACKETVER == 20181107 || \
-    PACKETVER == 20181114
-	packet(0x0202,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x022d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x023b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0281,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x02c4,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x035f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0360,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0361,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0362,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0363,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0364,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0365,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0366,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0369,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0437,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0438,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x07e4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x07ec,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0811,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0815,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0817,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0838,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
+    PACKETVER == 20181114 || \
+    PACKETVER == 20181121 || \
+    PACKETVER == 20181128 || \
+    PACKETVER == 20181205 || \
+    PACKETVER == 20181212 || \
+    PACKETVER == 20181219 || \
+    PACKETVER == 20181226 || \
+    PACKETVER == 20190109 || \
+    PACKETVER == 20190116 || \
+    PACKETVER == 20190123 || \
+    PACKETVER == 20190213 || \
+    PACKETVER == 20190227 || \
+    PACKETVER == 20190228 || \
+    PACKETVER == 20190306 || \
+    PACKETVER == 20190313 || \
+    PACKETVER == 20190320 || \
+    PACKETVER == 20190322 || \
+    PACKETVER == 20190327 || \
+    PACKETVER == 20190403 || \
+    PACKETVER == 20190417 || \
+    PACKETVER == 20190418 || \
+    PACKETVER == 20190508 || \
+    PACKETVER == 20190522 || \
+    PACKETVER == 20190523 || \
+    PACKETVER == 20190529 || \
+    PACKETVER == 20190530 || \
+    PACKETVER == 20190605 || \
+    PACKETVER == 20190619 || \
+    PACKETVER == 20190703 || \
+    PACKETVER == 20190717 || \
+    PACKETVER == 20190724 || \
+    PACKETVER == 20190731 || \
+    PACKETVER == 20190802 || \
+    PACKETVER == 20190807 || \
+    PACKETVER == 20190821 || \
+    PACKETVER == 20190828 || \
+    PACKETVER == 20190904 || \
+    PACKETVER == 20190918 || \
+    PACKETVER == 20190925 || \
+    PACKETVER == 20191002 || \
+    PACKETVER == 20191016 || \
+    PACKETVER == 20191018 || \
+    PACKETVER == 20191023 || \
+    PACKETVER == 20191030 || \
+    PACKETVER == 20191106 || \
+    PACKETVER == 20191107 || \
+    PACKETVER == 20191113 || \
+    PACKETVER == 20191120 || \
+    PACKETVER == 20191127 || \
+    PACKETVER == 20191204 || \
+    PACKETVER == 20191211 || \
+    PACKETVER == 20191218 || \
+    PACKETVER == 20191224 || \
+    PACKETVER == 20200108 || \
+    PACKETVER == 20200122 || \
+    PACKETVER == 20200129 || \
+    PACKETVER == 20200130 || \
+    PACKETVER == 20200205 || \
+    PACKETVER == 20200206 || \
+    PACKETVER == 20200212 || \
+    PACKETVER == 20200219 || \
+    PACKETVER == 20200304 || \
+    PACKETVER == 20200318 || \
+    PACKETVER == 20200401 || \
+    PACKETVER == 20200414 || \
+    PACKETVER == 20200506 || \
+    PACKETVER >= 20200520
+	packet(0x0202,clif->pFriendsListAdd,2);
+	packet(0x022d,clif->pHomMenu,2,4);
+	packet(0x023b,clif->pStoragePassword,0);
+	packet(0x0281,clif->pDull/*,XXX*/);
+	packet(0x02c4,clif->pPartyInvite2,2);
+	packet(0x035f,clif->pWalkToXY,2);
+	packet(0x0360,clif->pTickSend,2);
+	packet(0x0361,clif->pChangeDir,2,4);
+	packet(0x0362,clif->pTakeItem,2);
+	packet(0x0363,clif->pDropItem,2,4);
+	packet(0x0364,clif->pMoveToKafra,2,4);
+	packet(0x0365,clif->pMoveFromKafra,2,4);
+	packet(0x0366,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pGetCharNameRequest,2);
+	packet(0x0369,clif->pSolveCharName,2);
+	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0437,clif->pActionRequest,2,6);
+	packet(0x0438,clif->pUseSkillToId,2,4,6);
+	packet(0x07e4,clif->pItemListWindowSelected,2,4,8);
+	packet(0x07ec,clif->pDull/*,XXX*/);
+	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0811,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0815,clif->pReqCloseBuyingStore,0);
+	packet(0x0817,clif->pReqClickBuyingStore,2);
+	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0838,clif->pSearchStoreInfoNextPage,0);
+	packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10);
 #endif
 
 // 2014-06-18aRagexe
 #if PACKETVER == 20140618
-	packet(0x085d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x085f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0860,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0861,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x086c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0878,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x087d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0884,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0885,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0886,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0890,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0892,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08a7,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08ac,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0917,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x091f,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0929,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0935,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0938,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0939,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x093b,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0945,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0954,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0957,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x095d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x095e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0962,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0967,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
+	packet(0x085d,clif->pMoveToKafra,2,4);
+	packet(0x085f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0860,clif->pTickSend,2);
+	packet(0x0861,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x086c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0878,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x087d,clif->pSolveCharName,2);
+	packet(0x0884,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0885,clif->pMoveFromKafra,2,4);
+	packet(0x0886,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0890,clif->pChangeDir,2,4);
+	packet(0x0892,clif->pUseSkillToId,2,4,6);
+	packet(0x08a6,clif->pReqClickBuyingStore,2);
+	packet(0x08a7,clif->pWalkToXY,2);
+	packet(0x08ac,clif->pDull/*,XXX*/);
+	packet(0x0917,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x091f,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0929,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0935,clif->pTakeItem,2);
+	packet(0x0938,clif->pPartyInvite2,2);
+	packet(0x0939,clif->pReqCloseBuyingStore,0);
+	packet(0x093b,clif->pActionRequest,2,6);
+	packet(0x0945,clif->pDropItem,2,4);
+	packet(0x0954,clif->pFriendsListAdd,2);
+	packet(0x0957,clif->pStoragePassword,0);
+	packet(0x095d,clif->pGetCharNameRequest,2);
+	packet(0x095e,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0962,clif->pDull/*,XXX*/);
+	packet(0x0967,clif->pHomMenu,2,4);
 #endif
 
 // 2014-06-25aRagexe, 2014-06-25bRagexe
 #if PACKETVER == 20140625
-	packet(0x0202,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x023b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0815,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0817,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0835,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x085a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0861,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0875,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x087b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0885,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0886,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0888,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x088a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0897,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a1,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a2,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0923,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0928,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0940,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0946,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0959,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0960,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0968,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0969,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pMoveToKafra,2,4);
+	packet(0x023b,clif->pMoveFromKafra,2,4);
+	packet(0x0815,clif->pDull/*,XXX*/);
+	packet(0x0817,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0835,clif->pWalkToXY,2);
+	packet(0x085a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0861,clif->pUseSkillToId,2,4,6);
+	packet(0x086b,clif->pPartyInvite2,2);
+	packet(0x0875,clif->pSolveCharName,2);
+	packet(0x087b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0885,clif->pDropItem,2,4);
+	packet(0x0886,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0888,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x088a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088e,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0897,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08a1,clif->pTickSend,2);
+	packet(0x08a2,clif->pChangeDir,2,4);
+	packet(0x091a,clif->pTakeItem,2);
+	packet(0x0923,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0928,clif->pReqCloseBuyingStore,0);
+	packet(0x0940,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0946,clif->pHomMenu,2,4);
+	packet(0x094e,clif->pDull/*,XXX*/);
+	packet(0x0959,clif->pActionRequest,2,6);
+	packet(0x0960,clif->pStoragePassword,0);
+	packet(0x0968,clif->pReqClickBuyingStore,2);
+	packet(0x0969,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-07-02aRagexe
 #if PACKETVER == 20140702
-	packet(0x022d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x023b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0364,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0438,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x07e4,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0835,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x086c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0887,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0892,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0895,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a0,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a2,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0925,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x092c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0933,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0940,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x023b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0364,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pFriendsListAdd,2);
+	packet(0x0438,clif->pMoveToKafra,2,4);
+	packet(0x07e4,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pStoragePassword,0);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pHomMenu,2,4);
+	packet(0x0835,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pDropItem,2,4);
+	packet(0x086c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0887,clif->pWalkToXY,2);
+	packet(0x0892,clif->pMoveFromKafra,2,4);
+	packet(0x0895,clif->pDull/*,XXX*/);
+	packet(0x08a0,clif->pPartyInvite2,2);
+	packet(0x08a2,clif->pTakeItem,2);
+	packet(0x0925,clif->pChangeDir,2,4);
+	packet(0x092c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0933,clif->pDull/*,XXX*/);
+	packet(0x0940,clif->pSearchStoreInfoNextPage,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-07-09aRagexe
 #if PACKETVER == 20140709
-	packet(0x0364,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0437,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0860,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0866,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0869,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0875,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0877,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0879,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x087a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0887,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0888,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0894,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0897,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0898,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08ad,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0925,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x092f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0931,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0934,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0939,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x093f,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0940,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x094d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x094f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0961,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
+	packet(0x0364,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0437,clif->pActionRequest,2,6);
+	packet(0x0860,clif->pStoragePassword,0);
+	packet(0x0866,clif->pDull/*,XXX*/);
+	packet(0x0869,clif->pChangeDir,2,4);
+	packet(0x0875,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0877,clif->pUseSkillToId,2,4,6);
+	packet(0x0879,clif->pGetCharNameRequest,2);
+	packet(0x087a,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0887,clif->pMoveToKafra,2,4);
+	packet(0x0888,clif->pDull/*,XXX*/);
+	packet(0x088b,clif->pPartyInvite2,2);
+	packet(0x0894,clif->pReqCloseBuyingStore,0);
+	packet(0x0897,clif->pReqClickBuyingStore,2);
+	packet(0x0898,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08ad,clif->pDropItem,2,4);
+	packet(0x091a,clif->pWalkToXY,2);
+	packet(0x0925,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x092f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0931,clif->pSolveCharName,2);
+	packet(0x0934,clif->pTickSend,2);
+	packet(0x0939,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x093f,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0940,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x094d,clif->pHomMenu,2,4);
+	packet(0x094e,clif->pMoveFromKafra,2,4);
+	packet(0x094f,clif->pFriendsListAdd,2);
+	packet(0x095f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0961,clif->pTakeItem,2);
 #endif
 
 // 2014-07-16aRagexe, 2014-07-16bRagexe, 2014-07-16cRagexe
 #if PACKETVER == 20140716
-	packet(0x0362,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x07e4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0811,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085c,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x085f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0868,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0871,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0881,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x088d,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0896,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x089a,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x089f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08a2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08a4,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08ac,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0918,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x091f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0926,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x092c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092f,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0938,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x093b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0947,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0952,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0958,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0959,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0969,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
+	packet(0x0362,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x07e4,clif->pStoragePassword,0);
+	packet(0x0811,clif->pActionRequest,2,6);
+	packet(0x085c,clif->pGetCharNameRequest,2);
+	packet(0x085f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0868,clif->pPartyInvite2,2);
+	packet(0x0871,clif->pMoveToKafra,2,4);
+	packet(0x0881,clif->pUseSkillToId,2,4,6);
+	packet(0x088b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x088d,clif->pDull/*,XXX*/);
+	packet(0x088f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0896,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x089a,clif->pSolveCharName,2);
+	packet(0x089f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08a2,clif->pReqCloseBuyingStore,0);
+	packet(0x08a4,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08ac,clif->pHomMenu,2,4);
+	packet(0x0918,clif->pWalkToXY,2);
+	packet(0x091f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0926,clif->pDropItem,2,4);
+	packet(0x092c,clif->pFriendsListAdd,2);
+	packet(0x092f,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0938,clif->pMoveFromKafra,2,4);
+	packet(0x093b,clif->pReqClickBuyingStore,2);
+	packet(0x0947,clif->pDull/*,XXX*/);
+	packet(0x0952,clif->pChangeDir,2,4);
+	packet(0x0958,clif->pTakeItem,2);
+	packet(0x0959,clif->pTickSend,2);
+	packet(0x0969,clif->pItemListWindowSelected,2,4,8);
 #endif
 
 // 2014-07-23aRagexe, 2014-07-23bRagexe
 #if PACKETVER == 20140723
-	packet(0x02c4,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0364,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0368,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0436,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0819,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0838,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x085f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0869,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x086d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x087d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0888,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0891,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0896,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0898,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x089e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08a2,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08ad,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0927,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x092f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0934,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0935,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0939,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x093d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0945,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0947,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0948,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0960,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x02c4,clif->pTickSend,2);
+	packet(0x0364,clif->pStoragePassword,0);
+	packet(0x0368,clif->pGetCharNameRequest,2);
+	packet(0x0436,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0819,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0838,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pSearchStoreInfoNextPage,0);
+	packet(0x085f,clif->pWalkToXY,2);
+	packet(0x0869,clif->pMoveToKafra,2,4);
+	packet(0x086d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x087d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0888,clif->pReqClickBuyingStore,2);
+	packet(0x0891,clif->pReqCloseBuyingStore,0);
+	packet(0x0896,clif->pDropItem,2,4);
+	packet(0x0898,clif->pDull/*,XXX*/);
+	packet(0x089e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08a2,clif->pMoveFromKafra,2,4);
+	packet(0x08ad,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0927,clif->pSolveCharName,2);
+	packet(0x092f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0934,clif->pFriendsListAdd,2);
+	packet(0x0935,clif->pPartyInvite2,2);
+	packet(0x0939,clif->pItemListWindowSelected,2,4,8);
+	packet(0x093d,clif->pTakeItem,2);
+	packet(0x0945,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0947,clif->pActionRequest,2,6);
+	packet(0x0948,clif->pHomMenu,2,4);
+	packet(0x095f,clif->pDull/*,XXX*/);
+	packet(0x0960,clif->pChangeDir,2,4);
 #endif
 
 // 2014-07-30aRagexe
 #if PACKETVER == 20140730
-	packet(0x022d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0364,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0366,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0367,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0437,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x07ec,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0802,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0815,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0817,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x085f,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x087d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x087f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0889,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x088b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x088d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0892,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a0,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08a7,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a9,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x08ad,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0924,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x092a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0934,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0940,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0946,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
+	packet(0x022d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0364,clif->pGetCharNameRequest,2);
+	packet(0x0366,clif->pUseSkillToId,2,4,6);
+	packet(0x0367,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0437,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x07ec,clif->pDull/*,XXX*/);
+	packet(0x0802,clif->pDull/*,XXX*/);
+	packet(0x0815,clif->pFriendsListAdd,2);
+	packet(0x0817,clif->pActionRequest,2,6);
+	packet(0x085e,clif->pWalkToXY,2);
+	packet(0x085f,clif->pReqCloseBuyingStore,0);
+	packet(0x087d,clif->pMoveFromKafra,2,4);
+	packet(0x087e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x087f,clif->pDropItem,2,4);
+	packet(0x0889,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x088b,clif->pTickSend,2);
+	packet(0x088d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0892,clif->pMoveToKafra,2,4);
+	packet(0x08a0,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a6,clif->pReqClickBuyingStore,2);
+	packet(0x08a7,clif->pSolveCharName,2);
+	packet(0x08a9,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x08ad,clif->pStoragePassword,0);
+	packet(0x091e,clif->pPartyInvite2,2);
+	packet(0x0924,clif->pSearchStoreInfoNextPage,0);
+	packet(0x092a,clif->pTakeItem,2);
+	packet(0x0934,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0940,clif->pChangeDir,2,4);
+	packet(0x0946,clif->pHomMenu,2,4);
 #endif
 
 // 2014-08-06aRagexe, 2014-08-06bRagexe
 #if PACKETVER == 20140806
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0948,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0948,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-08-13aRagexe, 2014-08-13bRagexe, 2014-08-14aRagexe
 #if PACKETVER == 20140813 || \
     PACKETVER == 20140814
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0365,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0802,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0868,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0878,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087c,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0882,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0895,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0897,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0899,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a3,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a7,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08ab,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0967,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0365,clif->pStoragePassword,0);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0802,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0868,clif->pHomMenu,2,4);
+	packet(0x0878,clif->pChangeDir,2,4);
+	packet(0x087c,clif->pPartyInvite2,2);
+	packet(0x0882,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0895,clif->pMoveFromKafra,2,4);
+	packet(0x0897,clif->pFriendsListAdd,2);
+	packet(0x0899,clif->pDropItem,2,4);
+	packet(0x08a3,clif->pTakeItem,2);
+	packet(0x08a7,clif->pDull/*,XXX*/);
+	packet(0x08ab,clif->pDull/*,XXX*/);
+	packet(0x0967,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-08-20aRagexe
 #if PACKETVER == 20140820
-	packet(0x035f,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0835,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0861,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0864,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0869,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x086c,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0872,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0876,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0891,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0899,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x089a,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x089b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a3,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a7,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x091d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x092f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0936,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0937,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x093a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x093e,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x094a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0951,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0952,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0956,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0958,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x035f,clif->pReqCloseBuyingStore,0);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0835,clif->pChangeDir,2,4);
+	packet(0x0861,clif->pTickSend,2);
+	packet(0x0864,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0869,clif->pDull/*,XXX*/);
+	packet(0x086c,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086e,clif->pPartyInvite2,2);
+	packet(0x0872,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0876,clif->pDropItem,2,4);
+	packet(0x0891,clif->pGetCharNameRequest,2);
+	packet(0x0899,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x089a,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x089b,clif->pMoveFromKafra,2,4);
+	packet(0x08a3,clif->pWalkToXY,2);
+	packet(0x08a7,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x091d,clif->pSolveCharName,2);
+	packet(0x092f,clif->pUseSkillToId,2,4,6);
+	packet(0x0936,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0937,clif->pHomMenu,2,4);
+	packet(0x093a,clif->pStoragePassword,0);
+	packet(0x093e,clif->pReqClickBuyingStore,2);
+	packet(0x094a,clif->pFriendsListAdd,2);
+	packet(0x0951,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0952,clif->pActionRequest,2,6);
+	packet(0x0956,clif->pMoveToKafra,2,4);
+	packet(0x0958,clif->pDull/*,XXX*/);
+	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2014-08-27aRagexe
 #if PACKETVER == 20140827
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0943,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0943,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-09-03aRagexe
 #if PACKETVER == 20140903
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x089b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0931,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0941,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0943,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0945,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x088f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x089b,clif->pFriendsListAdd,2);
+	packet(0x0931,clif->pHomMenu,2,4);
+	packet(0x0941,clif->pStoragePassword,0);
+	packet(0x0943,clif->pDull/*,XXX*/);
+	packet(0x0945,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-09-17aRagexe
 #if PACKETVER == 20140917
-	packet(0x022d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0364,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0365,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0367,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0369,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0838,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0864,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0889,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0895,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0897,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0898,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089c,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08a8,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0919,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x091e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x092a,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0930,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0949,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x094f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0951,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0955,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0956,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0957,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x095a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x095c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x095e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0966,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
+	packet(0x022d,clif->pPartyInvite2,2);
+	packet(0x0364,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0365,clif->pMoveToKafra,2,4);
+	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0367,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0369,clif->pSolveCharName,2);
+	packet(0x0838,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0864,clif->pTakeItem,2);
+	packet(0x086d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0889,clif->pActionRequest,2,6);
+	packet(0x0895,clif->pHomMenu,2,4);
+	packet(0x0897,clif->pTickSend,2);
+	packet(0x0898,clif->pGetCharNameRequest,2);
+	packet(0x089c,clif->pReqClickBuyingStore,2);
+	packet(0x08a8,clif->pStoragePassword,0);
+	packet(0x0919,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x091e,clif->pReqCloseBuyingStore,0);
+	packet(0x092a,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0930,clif->pMoveFromKafra,2,4);
+	packet(0x0949,clif->pUseSkillToId,2,4,6);
+	packet(0x094f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0951,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0955,clif->pFriendsListAdd,2);
+	packet(0x0956,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0957,clif->pDull/*,XXX*/);
+	packet(0x095a,clif->pDropItem,2,4);
+	packet(0x095c,clif->pWalkToXY,2);
+	packet(0x095e,clif->pChangeDir,2,4);
+	packet(0x0966,clif->pDull/*,XXX*/);
 #endif
 
 // 2014-09-24cRagexe
 #if PACKETVER == 20140924
-	packet(0x0366,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0367,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x07e4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0815,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0862,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0864,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0865,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0867,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x086b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x086d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086e,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0886,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x088b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0894,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0898,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x089c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a5,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a7,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0918,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x091b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0925,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0926,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0928,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x092d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0934,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0949,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0952,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
+	packet(0x0366,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0367,clif->pPartyInvite2,2);
+	packet(0x07e4,clif->pStoragePassword,0);
+	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0815,clif->pWalkToXY,2);
+	packet(0x0862,clif->pDull/*,XXX*/);
+	packet(0x0864,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0865,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0867,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x086b,clif->pReqCloseBuyingStore,0);
+	packet(0x086d,clif->pTakeItem,2);
+	packet(0x086e,clif->pHomMenu,2,4);
+	packet(0x0886,clif->pGetCharNameRequest,2);
+	packet(0x088b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0894,clif->pActionRequest,2,6);
+	packet(0x0898,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x089c,clif->pMoveToKafra,2,4);
+	packet(0x08a5,clif->pSolveCharName,2);
+	packet(0x08a7,clif->pUseSkillToId,2,4,6);
+	packet(0x0918,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x091b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0925,clif->pDull/*,XXX*/);
+	packet(0x0926,clif->pTickSend,2);
+	packet(0x0928,clif->pMoveFromKafra,2,4);
+	packet(0x092b,clif->pReqClickBuyingStore,2);
+	packet(0x092d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0934,clif->pChangeDir,2,4);
+	packet(0x0949,clif->pDropItem,2,4);
+	packet(0x0952,clif->pFriendsListAdd,2);
 #endif
 
 // 2014-10-01aRagexe
 #if PACKETVER == 20141001
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0365,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0884,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0885,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x089d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08ad,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x092a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0937,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0939,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093f,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0952,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pDropItem,2,4);
+	packet(0x0365,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pMoveFromKafra,2,4);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087c,clif->pMoveToKafra,2,4);
+	packet(0x0884,clif->pPartyInvite2,2);
+	packet(0x0885,clif->pGetCharNameRequest,2);
+	packet(0x089c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x089d,clif->pFriendsListAdd,2);
+	packet(0x08ad,clif->pChangeDir,2,4);
+	packet(0x091c,clif->pDull/*,XXX*/);
+	packet(0x092a,clif->pStoragePassword,0);
+	packet(0x0937,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0939,clif->pDull/*,XXX*/);
+	packet(0x093f,clif->pTakeItem,2);
+	packet(0x094b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0952,clif->pHomMenu,2,4);
 #endif
 
 // 2014-10-08aRagexe, 2014-10-08bRagexe, 2014-10-08cRagexe, 2014-10-08dRagexe
 #if PACKETVER == 20141008
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0942,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0942,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-10-15bRagexe, 2014-10-15cRagexe, 2014-10-15dRagexe, 2014-10-16aRagexe
 #if PACKETVER == 20141015 || \
     PACKETVER == 20141016
-	packet(0x022d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0922,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0936,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0967,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pMoveFromKafra,2,4);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pHomMenu,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086e,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0922,clif->pDull/*,XXX*/);
+	packet(0x0936,clif->pStoragePassword,0);
+	packet(0x094b,clif->pFriendsListAdd,2);
+	packet(0x0967,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-10-22bRagexe
 #if PACKETVER == 20141022
-	packet(0x023b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0878,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0896,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0899,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08aa,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08ab,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08ad,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0940,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x094e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0955,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pStoragePassword,0);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0878,clif->pMoveToKafra,2,4);
+	packet(0x087d,clif->pDropItem,2,4);
+	packet(0x0896,clif->pPartyInvite2,2);
+	packet(0x0899,clif->pHomMenu,2,4);
+	packet(0x08aa,clif->pMoveFromKafra,2,4);
+	packet(0x08ab,clif->pDull/*,XXX*/);
+	packet(0x08ad,clif->pChangeDir,2,4);
+	packet(0x091a,clif->pFriendsListAdd,2);
+	packet(0x092b,clif->pDull/*,XXX*/);
+	packet(0x093b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0940,clif->pSearchStoreInfoNextPage,0);
+	packet(0x094e,clif->pTakeItem,2);
+	packet(0x0955,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-10-29aRagexe
 #if PACKETVER == 20141029
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0940,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pWalkToXY,2);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pStoragePassword,0);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0940,clif->pActionRequest,2,6);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-11-05aRagexe, 2014-11-05bRagexe
 #if PACKETVER == 20141105
-	packet(0x022d,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x035f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0360,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x085c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0863,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0864,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0865,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0871,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0874,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0875,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0877,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0879,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0887,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0892,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0898,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a0,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a7,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08ad,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x091e,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x092b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x093e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0944,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0948,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0950,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0957,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x095f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0968,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x022d,clif->pDull/*,XXX*/);
+	packet(0x035f,clif->pUseSkillToId,2,4,6);
+	packet(0x0360,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x085c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0863,clif->pGetCharNameRequest,2);
+	packet(0x0864,clif->pTickSend,2);
+	packet(0x0865,clif->pFriendsListAdd,2);
+	packet(0x0871,clif->pStoragePassword,0);
+	packet(0x0874,clif->pDull/*,XXX*/);
+	packet(0x0875,clif->pActionRequest,2,6);
+	packet(0x0877,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0879,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0887,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0892,clif->pDropItem,2,4);
+	packet(0x0898,clif->pMoveFromKafra,2,4);
+	packet(0x08a0,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a5,clif->pChangeDir,2,4);
+	packet(0x08a7,clif->pReqCloseBuyingStore,0);
+	packet(0x08ad,clif->pMoveToKafra,2,4);
+	packet(0x091d,clif->pSolveCharName,2);
+	packet(0x091e,clif->pReqClickBuyingStore,2);
+	packet(0x092b,clif->pTakeItem,2);
+	packet(0x093e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0944,clif->pHomMenu,2,4);
+	packet(0x0948,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0950,clif->pPartyInvite2,2);
+	packet(0x0957,clif->pWalkToXY,2);
+	packet(0x095f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0968,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2014-11-12cRagexe, 2014-11-12dRagexe
 #if PACKETVER == 20141112
-	packet(0x0362,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0438,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x07e4,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0835,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0838,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x083c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x085f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0863,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0869,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x086c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0871,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0885,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0886,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0887,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x088d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x08a0,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a1,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08ab,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0919,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0926,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0929,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0943,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x094b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x094c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x094f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0955,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x095d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0960,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0962,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
+	packet(0x0362,clif->pFriendsListAdd,2);
+	packet(0x0438,clif->pSolveCharName,2);
+	packet(0x07e4,clif->pReqCloseBuyingStore,0);
+	packet(0x0835,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0838,clif->pSearchStoreInfoNextPage,0);
+	packet(0x083c,clif->pMoveToKafra,2,4);
+	packet(0x085f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0863,clif->pUseSkillToId,2,4,6);
+	packet(0x0869,clif->pGetCharNameRequest,2);
+	packet(0x086c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0871,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0885,clif->pChangeDir,2,4);
+	packet(0x0886,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0887,clif->pPartyInvite2,2);
+	packet(0x088d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x08a0,clif->pWalkToXY,2);
+	packet(0x08a1,clif->pReqClickBuyingStore,2);
+	packet(0x08ab,clif->pStoragePassword,0);
+	packet(0x0919,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0926,clif->pHomMenu,2,4);
+	packet(0x0929,clif->pActionRequest,2,6);
+	packet(0x0943,clif->pDropItem,2,4);
+	packet(0x094b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x094c,clif->pDull/*,XXX*/);
+	packet(0x094f,clif->pDull/*,XXX*/);
+	packet(0x0955,clif->pMoveFromKafra,2,4);
+	packet(0x095d,clif->pTickSend,2);
+	packet(0x0960,clif->pTakeItem,2);
+	packet(0x0962,clif->pUseSkillToPos,2,4,6,8);
 #endif
 
 // 2014-11-19dRagexe
 #if PACKETVER == 20141119
-	packet(0x0202,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x085a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0861,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0865,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0866,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0872,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0873,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0875,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x087c,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0885,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0887,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0888,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x088d,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0895,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a8,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08aa,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0918,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0920,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0921,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0929,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0933,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0938,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0940,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0941,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0942,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0948,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x094c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0963,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
+	packet(0x0202,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x085a,clif->pReqClickBuyingStore,2);
+	packet(0x0861,clif->pFriendsListAdd,2);
+	packet(0x0865,clif->pPartyInvite2,2);
+	packet(0x0866,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0872,clif->pActionRequest,2,6);
+	packet(0x0873,clif->pUseSkillToId,2,4,6);
+	packet(0x0875,clif->pGetCharNameRequest,2);
+	packet(0x087c,clif->pSolveCharName,2);
+	packet(0x0885,clif->pDull/*,XXX*/);
+	packet(0x0887,clif->pReqCloseBuyingStore,0);
+	packet(0x0888,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x088d,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0895,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a8,clif->pTakeItem,2);
+	packet(0x08aa,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0918,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0920,clif->pChangeDir,2,4);
+	packet(0x0921,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0929,clif->pMoveFromKafra,2,4);
+	packet(0x092f,clif->pDull/*,XXX*/);
+	packet(0x0933,clif->pStoragePassword,0);
+	packet(0x0938,clif->pTickSend,2);
+	packet(0x0940,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0941,clif->pMoveToKafra,2,4);
+	packet(0x0942,clif->pHomMenu,2,4);
+	packet(0x0948,clif->pWalkToXY,2);
+	packet(0x094c,clif->pDropItem,2,4);
+	packet(0x0963,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
 #endif
 
 // 2014-11-26aRagexe, 2014-11-26bRagexe, 2014-11-26cRagexe, 2014-11-26dRagexe
 #if PACKETVER == 20141126
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0367,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0871,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0884,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0896,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a4,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ad,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0920,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0942,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0965,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0367,clif->pDull/*,XXX*/);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086e,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0871,clif->pMoveFromKafra,2,4);
+	packet(0x0884,clif->pDull/*,XXX*/);
+	packet(0x0896,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a4,clif->pChangeDir,2,4);
+	packet(0x08ad,clif->pStoragePassword,0);
+	packet(0x0920,clif->pDropItem,2,4);
+	packet(0x0942,clif->pFriendsListAdd,2);
+	packet(0x095a,clif->pTakeItem,2);
+	packet(0x095b,clif->pHomMenu,2,4);
+	packet(0x095f,clif->pMoveToKafra,2,4);
+	packet(0x0965,clif->pPartyInvite2,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-12-03aRagexe
 #if PACKETVER == 20141203
-	packet(0x0202,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0281,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0362,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0367,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0368,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0802,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0861,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x086c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x086d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x086e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x087b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0880,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0889,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0898,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x089d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08a5,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08aa,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0917,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x091c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x091d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0928,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x092a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0936,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0957,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x095c,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0962,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
+	packet(0x0202,clif->pSolveCharName,2);
+	packet(0x0281,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0362,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0367,clif->pGetCharNameRequest,2);
+	packet(0x0368,clif->pDull/*,XXX*/);
+	packet(0x0802,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0861,clif->pMoveToKafra,2,4);
+	packet(0x086c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x086d,clif->pMoveFromKafra,2,4);
+	packet(0x086e,clif->pTakeItem,2);
+	packet(0x087b,clif->pWalkToXY,2);
+	packet(0x087e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0880,clif->pChangeDir,2,4);
+	packet(0x0889,clif->pFriendsListAdd,2);
+	packet(0x0898,clif->pStoragePassword,0);
+	packet(0x089c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x089d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08a5,clif->pActionRequest,2,6);
+	packet(0x08aa,clif->pDropItem,2,4);
+	packet(0x0917,clif->pSearchStoreInfoNextPage,0);
+	packet(0x091c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x091d,clif->pPartyInvite2,2);
+	packet(0x0928,clif->pTickSend,2);
+	packet(0x092a,clif->pDull/*,XXX*/);
+	packet(0x0936,clif->pHomMenu,2,4);
+	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0957,clif->pReqCloseBuyingStore,0);
+	packet(0x095c,clif->pReqClickBuyingStore,2);
+	packet(0x0962,clif->pUseSkillToId,2,4,6);
 #endif
 
 // 2014-12-10bRagexe, 2014-12-10cRagexe
 #if PACKETVER == 20141210
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0885,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08ac,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0917,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0927,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x092b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0947,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0954,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0955,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0958,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0961,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0963,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0967,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pHomMenu,2,4);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pChangeDir,2,4);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087b,clif->pTakeItem,2);
+	packet(0x0885,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08ac,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0917,clif->pPartyInvite2,2);
+	packet(0x0927,clif->pDull/*,XXX*/);
+	packet(0x092b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0947,clif->pDull/*,XXX*/);
+	packet(0x0954,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0955,clif->pMoveFromKafra,2,4);
+	packet(0x0958,clif->pDropItem,2,4);
+	packet(0x0961,clif->pFriendsListAdd,2);
+	packet(0x0963,clif->pStoragePassword,0);
+	packet(0x0967,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-12-17aRagexe
 #if PACKETVER == 20141217
-	packet(0x0360,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x085b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0860,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x086c,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0875,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0878,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0879,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0883,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0889,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x088e,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x089f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a1,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08a2,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a8,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08ab,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08ac,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0919,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0924,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0930,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0932,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0933,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0936,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0939,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0940,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0944,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0945,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0948,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0960,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
+	packet(0x0360,clif->pMoveToKafra,2,4);
+	packet(0x085b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0860,clif->pStoragePassword,0);
+	packet(0x086c,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0875,clif->pMoveFromKafra,2,4);
+	packet(0x0878,clif->pWalkToXY,2);
+	packet(0x0879,clif->pHomMenu,2,4);
+	packet(0x0883,clif->pTakeItem,2);
+	packet(0x0889,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x088e,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x089f,clif->pDropItem,2,4);
+	packet(0x08a1,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08a2,clif->pDull/*,XXX*/);
+	packet(0x08a8,clif->pPartyInvite2,2);
+	packet(0x08ab,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08ac,clif->pTickSend,2);
+	packet(0x0919,clif->pChangeDir,2,4);
+	packet(0x091f,clif->pUseSkillToId,2,4,6);
+	packet(0x0924,clif->pActionRequest,2,6);
+	packet(0x0930,clif->pReqCloseBuyingStore,0);
+	packet(0x0932,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0933,clif->pFriendsListAdd,2);
+	packet(0x0936,clif->pGetCharNameRequest,2);
+	packet(0x0939,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0940,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0944,clif->pReqClickBuyingStore,2);
+	packet(0x0945,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0948,clif->pSolveCharName,2);
+	packet(0x0960,clif->pDull/*,XXX*/);
 #endif
 
 // 2014-12-24aRagexe
 #if PACKETVER == 20141224
-	packet(0x0361,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0438,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0835,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x085a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x085e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0865,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0867,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x086c,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0870,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x087b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x089a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x089b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a3,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a8,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08ac,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0930,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0932,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0945,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0946,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0949,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x094f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0950,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0953,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0956,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x095b,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x095f,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
+	packet(0x0361,clif->pMoveToKafra,2,4);
+	packet(0x0438,clif->pFriendsListAdd,2);
+	packet(0x0835,clif->pItemListWindowSelected,2,4,8);
+	packet(0x085a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x085e,clif->pReqCloseBuyingStore,0);
+	packet(0x0865,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0867,clif->pHomMenu,2,4);
+	packet(0x086c,clif->pReqClickBuyingStore,2);
+	packet(0x0870,clif->pChangeDir,2,4);
+	packet(0x087a,clif->pTakeItem,2);
+	packet(0x087b,clif->pDull/*,XXX*/);
+	packet(0x089a,clif->pWalkToXY,2);
+	packet(0x089b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08a3,clif->pPartyInvite2,2);
+	packet(0x08a4,clif->pStoragePassword,0);
+	packet(0x08a8,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08ac,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0930,clif->pDropItem,2,4);
+	packet(0x0932,clif->pDull/*,XXX*/);
+	packet(0x093a,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0945,clif->pTickSend,2);
+	packet(0x0946,clif->pGetCharNameRequest,2);
+	packet(0x0949,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x094f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0950,clif->pSolveCharName,2);
+	packet(0x0953,clif->pMoveFromKafra,2,4);
+	packet(0x0956,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x095b,clif->pUseSkillToId,2,4,6);
+	packet(0x095f,clif->pActionRequest,2,6);
 #endif
 
 // 2014-12-31aRagexe
 #if PACKETVER == 20141231
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086d,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-01-07aRagexe
 #if PACKETVER == 20150107
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0895,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0943,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0947,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087c,clif->pFriendsListAdd,2);
+	packet(0x0895,clif->pStoragePassword,0);
+	packet(0x092d,clif->pHomMenu,2,4);
+	packet(0x0943,clif->pChangeDir,2,4);
+	packet(0x0947,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-01-14aRagexe, 2015-01-14bRagexe, 2015-01-14cRagexe, 2015-01-14dRagexe
 #if PACKETVER == 20150114
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0868,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0899,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0946,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0955,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0957,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pUseSkillToId,2,4,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0868,clif->pFriendsListAdd,2);
+	packet(0x0899,clif->pHomMenu,2,4);
+	packet(0x0946,clif->pStoragePassword,0);
+	packet(0x0955,clif->pDull/*,XXX*/);
+	packet(0x0957,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-01-21aRagexe
 #if PACKETVER == 20150121
-	packet(0x0281,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x089e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ab,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0918,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0919,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0955,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0959,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0963,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0967,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087c,clif->pDull/*,XXX*/);
+	packet(0x088b,clif->pFriendsListAdd,2);
+	packet(0x089d,clif->pHomMenu,2,4);
+	packet(0x089e,clif->pChangeDir,2,4);
+	packet(0x08ab,clif->pStoragePassword,0);
+	packet(0x0918,clif->pDull/*,XXX*/);
+	packet(0x0919,clif->pDropItem,2,4);
+	packet(0x091d,clif->pTakeItem,2);
+	packet(0x0955,clif->pMoveToKafra,2,4);
+	packet(0x0959,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0963,clif->pMoveFromKafra,2,4);
+	packet(0x0967,clif->pPartyInvite2,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-01-28aRagexe, 2015-01-29aRagexe, 2015-01-30aRagexe
 #if PACKETVER == 20150128 || \
     PACKETVER == 20150129 || \
     PACKETVER == 20150130
-	packet(0x0202,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x023b,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x035f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0365,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0368,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0838,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085a,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0864,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x086d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0870,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0874,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0875,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0876,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x087d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0888,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x089a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08ab,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0927,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0929,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092d,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0938,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x093a,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0944,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x094d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0963,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0968,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
+	packet(0x0202,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x023b,clif->pChangeDir,2,4);
+	packet(0x035f,clif->pReqClickBuyingStore,2);
+	packet(0x0365,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0368,clif->pDull/*,XXX*/);
+	packet(0x0838,clif->pActionRequest,2,6);
+	packet(0x085a,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0864,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x086d,clif->pMoveToKafra,2,4);
+	packet(0x0870,clif->pWalkToXY,2);
+	packet(0x0874,clif->pGetCharNameRequest,2);
+	packet(0x0875,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0876,clif->pHomMenu,2,4);
+	packet(0x087d,clif->pSolveCharName,2);
+	packet(0x0888,clif->pItemListWindowSelected,2,4,8);
+	packet(0x089a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08ab,clif->pTakeItem,2);
+	packet(0x091f,clif->pTickSend,2);
+	packet(0x0927,clif->pPartyInvite2,2);
+	packet(0x0929,clif->pStoragePassword,0);
+	packet(0x092d,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0938,clif->pDull/*,XXX*/);
+	packet(0x093a,clif->pUseSkillToId,2,4,6);
+	packet(0x0944,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x094d,clif->pReqCloseBuyingStore,0);
+	packet(0x094e,clif->pMoveFromKafra,2,4);
+	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0963,clif->pFriendsListAdd,2);
+	packet(0x0968,clif->pDropItem,2,4);
 #endif
 
 // 2015-02-04aRagexe
 #if PACKETVER == 20150204
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0966,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0966,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-02-11aRagexe
 #if PACKETVER == 20150211
-	packet(0x023b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0368,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0369,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0436,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0437,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x07e4,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0817,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0819,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0835,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0862,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0863,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0870,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0873,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x087f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0882,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0883,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0885,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0886,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x089c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a0,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a4,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08aa,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0919,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0920,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0944,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0951,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0957,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0958,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
+	packet(0x023b,clif->pDull/*,XXX*/);
+	packet(0x0368,clif->pHomMenu,2,4);
+	packet(0x0369,clif->pChangeDir,2,4);
+	packet(0x0436,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0437,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x07e4,clif->pDropItem,2,4);
+	packet(0x0817,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0819,clif->pReqCloseBuyingStore,0);
+	packet(0x0835,clif->pDull/*,XXX*/);
+	packet(0x0862,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0863,clif->pUseSkillToId,2,4,6);
+	packet(0x0870,clif->pTakeItem,2);
+	packet(0x0873,clif->pWalkToXY,2);
+	packet(0x087b,clif->pGetCharNameRequest,2);
+	packet(0x087f,clif->pStoragePassword,0);
+	packet(0x0882,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0883,clif->pMoveFromKafra,2,4);
+	packet(0x0885,clif->pTickSend,2);
+	packet(0x0886,clif->pReqClickBuyingStore,2);
+	packet(0x089c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08a0,clif->pFriendsListAdd,2);
+	packet(0x08a4,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08aa,clif->pActionRequest,2,6);
+	packet(0x0919,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0920,clif->pSolveCharName,2);
+	packet(0x0944,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0951,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0957,clif->pPartyInvite2,2);
+	packet(0x0958,clif->pMoveToKafra,2,4);
 #endif
 
 // 2015-02-17aRagexe
 #if PACKETVER == 20150217
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085b,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-02-25eRagexe, 2015-02-25fRagexe, 2015-02-25gRagexe, 2015-02-25iRagexe, 2015-02-25jRagexe, 2015-02-26aRagexe
 #if PACKETVER == 20150225 || \
     PACKETVER == 20150226
-	packet(0x02c4,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0362,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0819,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0867,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0885,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0896,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x089b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x089c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0940,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0946,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0948,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x094f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0952,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0955,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
+	packet(0x02c4,clif->pReqClickBuyingStore,2);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pPartyInvite2,2);
+	packet(0x0362,clif->pReqCloseBuyingStore,0);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pGetCharNameRequest,2);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pTakeItem,2);
+	packet(0x0819,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0867,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0885,clif->pDull/*,XXX*/);
+	packet(0x0896,clif->pItemListWindowSelected,2,4,8);
+	packet(0x089b,clif->pDull/*,XXX*/);
+	packet(0x089c,clif->pMoveToKafra,2,4);
+	packet(0x08a4,clif->pStoragePassword,0);
+	packet(0x0940,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0946,clif->pFriendsListAdd,2);
+	packet(0x0948,clif->pDropItem,2,4);
+	packet(0x094f,clif->pHomMenu,2,4);
+	packet(0x0952,clif->pMoveFromKafra,2,4);
+	packet(0x0955,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pWantToConnection,2,6,10,14,18);
 #endif
 
 // 2015-03-04aRagexe
 #if PACKETVER == 20150304
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0862,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x086d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0879,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0892,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x093a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0947,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x095d,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0960,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0961,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pTakeItem,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pDull/*,XXX*/);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0862,clif->pMoveFromKafra,2,4);
+	packet(0x086d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0879,clif->pChangeDir,2,4);
+	packet(0x087e,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0892,clif->pStoragePassword,0);
+	packet(0x089a,clif->pPartyInvite2,2);
+	packet(0x093a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0947,clif->pMoveToKafra,2,4);
+	packet(0x095d,clif->pDull/*,XXX*/);
+	packet(0x0960,clif->pFriendsListAdd,2);
+	packet(0x0961,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-03-11aRagexe, 2015-03-11bRagexe
 #if PACKETVER == 20150311
-	packet(0x023b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0360,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0436,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0438,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0838,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x086a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x086c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x087b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0883,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0886,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0888,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0896,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a1,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a3,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a5,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08a6,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x091c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0928,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x092a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x092e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x093b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0943,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0946,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0957,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0958,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x095b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0963,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0964,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
+	packet(0x023b,clif->pHomMenu,2,4);
+	packet(0x0360,clif->pReqCloseBuyingStore,0);
+	packet(0x0436,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0438,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0838,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x086a,clif->pGetCharNameRequest,2);
+	packet(0x086c,clif->pStoragePassword,0);
+	packet(0x087b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0883,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0886,clif->pWalkToXY,2);
+	packet(0x0888,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0896,clif->pActionRequest,2,6);
+	packet(0x08a1,clif->pUseSkillToId,2,4,6);
+	packet(0x08a3,clif->pTakeItem,2);
+	packet(0x08a5,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08a6,clif->pFriendsListAdd,2);
+	packet(0x091c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0928,clif->pChangeDir,2,4);
+	packet(0x092a,clif->pDull/*,XXX*/);
+	packet(0x092e,clif->pMoveFromKafra,2,4);
+	packet(0x093b,clif->pPartyInvite2,2);
+	packet(0x0943,clif->pSolveCharName,2);
+	packet(0x0946,clif->pDull/*,XXX*/);
+	packet(0x0957,clif->pReqClickBuyingStore,2);
+	packet(0x0958,clif->pTickSend,2);
+	packet(0x095b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0963,clif->pDropItem,2,4);
+	packet(0x0964,clif->pMoveToKafra,2,4);
 #endif
 
 // 2015-03-18aRagexe, 2015-03-18bRagexe
 #if PACKETVER == 20150318
-	packet(0x0202,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x023b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0281,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x07e4,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0802,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0862,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0863,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0873,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0885,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0889,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x088c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x089c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a4,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x091d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0920,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0927,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0928,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0936,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0937,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0938,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x093a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x093c,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x094c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0951,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0958,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0959,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0960,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x0202,clif->pDull/*,XXX*/);
+	packet(0x023b,clif->pTickSend,2);
+	packet(0x0281,clif->pDull/*,XXX*/);
+	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x07e4,clif->pFriendsListAdd,2);
+	packet(0x0802,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0862,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0863,clif->pReqClickBuyingStore,2);
+	packet(0x0873,clif->pStoragePassword,0);
+	packet(0x0885,clif->pReqCloseBuyingStore,0);
+	packet(0x0889,clif->pActionRequest,2,6);
+	packet(0x088c,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x089c,clif->pMoveToKafra,2,4);
+	packet(0x08a4,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x091d,clif->pMoveFromKafra,2,4);
+	packet(0x0920,clif->pDropItem,2,4);
+	packet(0x0927,clif->pChangeDir,2,4);
+	packet(0x0928,clif->pTakeItem,2);
+	packet(0x0936,clif->pUseSkillToId,2,4,6);
+	packet(0x0937,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0938,clif->pPartyInvite2,2);
+	packet(0x093a,clif->pWalkToXY,2);
+	packet(0x093c,clif->pSolveCharName,2);
+	packet(0x094c,clif->pHomMenu,2,4);
+	packet(0x0951,clif->pGetCharNameRequest,2);
+	packet(0x0958,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0959,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0960,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2015-03-25aRagexe
 #if PACKETVER == 20150325
-	packet(0x0202,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0363,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0365,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0438,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0802,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0819,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x085d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x086f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x087c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0883,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0885,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0891,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0893,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0897,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0899,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a1,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a7,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0919,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0931,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0932,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0938,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0947,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0950,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0954,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0969,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
+	packet(0x0202,clif->pPartyInvite2,2);
+	packet(0x0363,clif->pDropItem,2,4);
+	packet(0x0365,clif->pUseSkillToId,2,4,6);
+	packet(0x0438,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0802,clif->pDull/*,XXX*/);
+	packet(0x0819,clif->pReqClickBuyingStore,2);
+	packet(0x085d,clif->pSolveCharName,2);
+	packet(0x086f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x087c,clif->pMoveToKafra,2,4);
+	packet(0x087e,clif->pChangeDir,2,4);
+	packet(0x0883,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0885,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0891,clif->pGetCharNameRequest,2);
+	packet(0x0893,clif->pDull/*,XXX*/);
+	packet(0x0897,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0899,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08a1,clif->pActionRequest,2,6);
+	packet(0x08a7,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0919,clif->pStoragePassword,0);
+	packet(0x092c,clif->pTakeItem,2);
+	packet(0x0931,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0932,clif->pWalkToXY,2);
+	packet(0x0938,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pFriendsListAdd,2);
+	packet(0x0947,clif->pReqCloseBuyingStore,0);
+	packet(0x094a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0950,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0954,clif->pTickSend,2);
+	packet(0x0969,clif->pMoveFromKafra,2,4);
 #endif
 
 // 2015-04-01aRagexe
 #if PACKETVER == 20150401
-	packet(0x0362,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0367,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0437,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x083c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x085e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x086f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0875,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x087e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x088f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0895,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0898,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x089c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a5,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x091c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0922,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0924,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0938,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0939,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x093a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x093b,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x093e,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0946,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0949,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094b,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0953,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095f,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0964,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x0362,clif->pActionRequest,2,6);
+	packet(0x0367,clif->pGetCharNameRequest,2);
+	packet(0x0437,clif->pReqClickBuyingStore,2);
+	packet(0x083c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x085e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x086f,clif->pWalkToXY,2);
+	packet(0x0875,clif->pItemListWindowSelected,2,4,8);
+	packet(0x087e,clif->pDull/*,XXX*/);
+	packet(0x088c,clif->pDropItem,2,4);
+	packet(0x088f,clif->pTickSend,2);
+	packet(0x0895,clif->pMoveFromKafra,2,4);
+	packet(0x0898,clif->pHomMenu,2,4);
+	packet(0x089c,clif->pStoragePassword,0);
+	packet(0x08a5,clif->pMoveToKafra,2,4);
+	packet(0x091b,clif->pPartyInvite2,2);
+	packet(0x091c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0922,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0924,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0938,clif->pReqCloseBuyingStore,0);
+	packet(0x0939,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x093a,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x093b,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x093e,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0946,clif->pDull/*,XXX*/);
+	packet(0x0949,clif->pTakeItem,2);
+	packet(0x094b,clif->pUseSkillToId,2,4,6);
+	packet(0x0953,clif->pFriendsListAdd,2);
+	packet(0x095f,clif->pSolveCharName,2);
+	packet(0x0964,clif->pChangeDir,2,4);
 #endif
 
 // 2015-04-08aRagexe
 #if PACKETVER == 20150408
-	packet(0x0819,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x085a,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x085c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085e,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0865,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0868,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x086b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x086e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0878,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x087e,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x087f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0888,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0889,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0891,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0898,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a2,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a4,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x091b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x091e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0922,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x092a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0946,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0955,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0957,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0959,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0963,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
+	packet(0x0819,clif->pMoveFromKafra,2,4);
+	packet(0x085a,clif->pTickSend,2);
+	packet(0x085c,clif->pUseSkillToId,2,4,6);
+	packet(0x085e,clif->pHomMenu,2,4);
+	packet(0x0865,clif->pActionRequest,2,6);
+	packet(0x0868,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x086b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x086e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0878,clif->pPartyInvite2,2);
+	packet(0x087e,clif->pGetCharNameRequest,2);
+	packet(0x087f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0888,clif->pMoveToKafra,2,4);
+	packet(0x0889,clif->pStoragePassword,0);
+	packet(0x0891,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0898,clif->pDropItem,2,4);
+	packet(0x089c,clif->pWalkToXY,2);
+	packet(0x08a2,clif->pSolveCharName,2);
+	packet(0x08a4,clif->pFriendsListAdd,2);
+	packet(0x091b,clif->pDull/*,XXX*/);
+	packet(0x091e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0922,clif->pChangeDir,2,4);
+	packet(0x092a,clif->pDull/*,XXX*/);
+	packet(0x0946,clif->pReqCloseBuyingStore,0);
+	packet(0x094f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0955,clif->pReqClickBuyingStore,2);
+	packet(0x0957,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0959,clif->pTakeItem,2);
+	packet(0x095e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0963,clif->pSearchStoreInfoNextPage,0);
 #endif
 
 // 2015-04-15aRagexe
 #if PACKETVER == 20150415
-	packet(0x0361,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0364,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0366,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0368,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0802,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0817,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0835,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x085e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0863,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0867,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0868,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0869,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x086c,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0880,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0891,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0898,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a0,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0922,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092e,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x093c,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x093e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0941,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0946,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0953,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x095c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0960,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x0361,clif->pMoveToKafra,2,4);
+	packet(0x0364,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0366,clif->pWalkToXY,2);
+	packet(0x0368,clif->pReqClickBuyingStore,2);
+	packet(0x0802,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0817,clif->pTakeItem,2);
+	packet(0x0835,clif->pDropItem,2,4);
+	packet(0x085e,clif->pDull/*,XXX*/);
+	packet(0x0863,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0867,clif->pPartyInvite2,2);
+	packet(0x0868,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0869,clif->pHomMenu,2,4);
+	packet(0x086c,clif->pActionRequest,2,6);
+	packet(0x0880,clif->pDull/*,XXX*/);
+	packet(0x088e,clif->pUseSkillToId,2,4,6);
+	packet(0x0891,clif->pGetCharNameRequest,2);
+	packet(0x0898,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a0,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0922,clif->pMoveFromKafra,2,4);
+	packet(0x092e,clif->pSolveCharName,2);
+	packet(0x093c,clif->pTickSend,2);
+	packet(0x093e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0941,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0946,clif->pReqCloseBuyingStore,0);
+	packet(0x094d,clif->pChangeDir,2,4);
+	packet(0x0953,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x095c,clif->pFriendsListAdd,2);
+	packet(0x0960,clif->pStoragePassword,0);
+	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2015-04-22aRagexe
 #if PACKETVER == 20150422
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0955,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0955,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-04-29aRagexe
 #if PACKETVER == 20150429
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0363,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0867,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x086a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0886,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x088f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0894,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0899,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x089f,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a6,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a8,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08ad,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0929,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x093d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0943,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0363,clif->pChangeDir,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0867,clif->pStoragePassword,0);
+	packet(0x086a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0886,clif->pPartyInvite2,2);
+	packet(0x088f,clif->pHomMenu,2,4);
+	packet(0x0894,clif->pDropItem,2,4);
+	packet(0x0899,clif->pMoveToKafra,2,4);
+	packet(0x089f,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a6,clif->pDull/*,XXX*/);
+	packet(0x08a8,clif->pDull/*,XXX*/);
+	packet(0x08ad,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0929,clif->pMoveFromKafra,2,4);
+	packet(0x093d,clif->pFriendsListAdd,2);
+	packet(0x0943,clif->pTakeItem,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-05-07bRagexe, 2015-05-07cRagexe
 #if PACKETVER == 20150507
-	packet(0x023b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0864,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0887,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0889,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0924,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x092e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x093b,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0941,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0942,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0953,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0955,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0958,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pHomMenu,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pReqCloseBuyingStore,0);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pTakeItem,2);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pMoveToKafra,2,4);
+	packet(0x0864,clif->pPartyInvite2,2);
+	packet(0x0887,clif->pDull/*,XXX*/);
+	packet(0x0889,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0924,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x092e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x093b,clif->pChangeDir,2,4);
+	packet(0x0941,clif->pMoveFromKafra,2,4);
+	packet(0x0942,clif->pDull/*,XXX*/);
+	packet(0x0953,clif->pStoragePassword,0);
+	packet(0x0955,clif->pDropItem,2,4);
+	packet(0x0958,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-05-13aRagexe
 #if PACKETVER == 20150513
-	packet(0x022d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x02c4,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0363,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0864,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0879,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0883,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0885,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a8,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0923,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0924,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0927,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x094a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0958,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0960,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pReqCloseBuyingStore,0);
+	packet(0x02c4,clif->pDull/*,XXX*/);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0363,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pHomMenu,2,4);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0864,clif->pMoveFromKafra,2,4);
+	packet(0x0879,clif->pMoveToKafra,2,4);
+	packet(0x0883,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0885,clif->pDropItem,2,4);
+	packet(0x08a8,clif->pFriendsListAdd,2);
+	packet(0x0923,clif->pStoragePassword,0);
+	packet(0x0924,clif->pChangeDir,2,4);
+	packet(0x0927,clif->pDull/*,XXX*/);
+	packet(0x094a,clif->pPartyInvite2,2);
+	packet(0x0958,clif->pTakeItem,2);
+	packet(0x0960,clif->pItemListWindowSelected,2,4,8);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-05-20aRagexe
 #if PACKETVER == 20150520
-	packet(0x0202,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0361,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0835,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x085e,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0865,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0868,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x087d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0880,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0882,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x089c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089e,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a2,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08ad,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091d,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0924,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0931,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0936,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x093d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0940,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0945,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x094e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x095b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0960,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0961,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x0202,clif->pTickSend,2);
+	packet(0x0361,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0835,clif->pReqCloseBuyingStore,0);
+	packet(0x085e,clif->pReqClickBuyingStore,2);
+	packet(0x0865,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0868,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x087d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0880,clif->pPartyInvite2,2);
+	packet(0x0882,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x089c,clif->pStoragePassword,0);
+	packet(0x089e,clif->pDropItem,2,4);
+	packet(0x08a2,clif->pGetCharNameRequest,2);
+	packet(0x08ad,clif->pChangeDir,2,4);
+	packet(0x091c,clif->pTakeItem,2);
+	packet(0x091d,clif->pActionRequest,2,6);
+	packet(0x0924,clif->pMoveFromKafra,2,4);
+	packet(0x092b,clif->pWalkToXY,2);
+	packet(0x0931,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0936,clif->pUseSkillToId,2,4,6);
+	packet(0x093d,clif->pFriendsListAdd,2);
+	packet(0x0940,clif->pDull/*,XXX*/);
+	packet(0x0945,clif->pSolveCharName,2);
+	packet(0x094e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x095b,clif->pHomMenu,2,4);
+	packet(0x095f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0960,clif->pDull/*,XXX*/);
+	packet(0x0961,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2015-05-27aRagexe
 #if PACKETVER == 20150527
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x083c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0940,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pUseSkillToId,2,4,6);
+	packet(0x083c,clif->pStoragePassword,0);
+	packet(0x0940,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-06-03aRagexe
 #if PACKETVER == 20150603
-	packet(0x0361,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0437,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0811,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0819,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0860,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0864,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0867,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x086a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0873,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0877,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0881,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0884,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0897,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x089a,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x089d,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x089e,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a1,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08ad,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x091b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0922,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x093b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x093f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0955,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0956,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0960,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0969,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x096a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
+	packet(0x0361,clif->pPartyInvite2,2);
+	packet(0x0437,clif->pDull/*,XXX*/);
+	packet(0x0811,clif->pChangeDir,2,4);
+	packet(0x0819,clif->pReqClickBuyingStore,2);
+	packet(0x0860,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0864,clif->pFriendsListAdd,2);
+	packet(0x0867,clif->pMoveToKafra,2,4);
+	packet(0x086a,clif->pMoveFromKafra,2,4);
+	packet(0x0873,clif->pActionRequest,2,6);
+	packet(0x0877,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0881,clif->pGetCharNameRequest,2);
+	packet(0x0884,clif->pDull/*,XXX*/);
+	packet(0x088b,clif->pDropItem,2,4);
+	packet(0x0897,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x089a,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x089d,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x089e,clif->pTickSend,2);
+	packet(0x08a1,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08ad,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x091b,clif->pSolveCharName,2);
+	packet(0x0922,clif->pStoragePassword,0);
+	packet(0x092d,clif->pTakeItem,2);
+	packet(0x093b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x093f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0955,clif->pHomMenu,2,4);
+	packet(0x0956,clif->pReqCloseBuyingStore,0);
+	packet(0x0960,clif->pUseSkillToId,2,4,6);
+	packet(0x0969,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x096a,clif->pWalkToXY,2);
 #endif
 
 // 2015-06-10aRagexe
 #if PACKETVER == 20150610
-	packet(0x022d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0438,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x07e4,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0835,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0870,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0872,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0877,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x087e,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0884,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0885,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0888,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x088d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x088f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0897,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a0,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08ac,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0925,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x092c,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x092e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0932,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x093e,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0940,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0946,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0949,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0957,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x095d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0964,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x022d,clif->pReqCloseBuyingStore,0);
+	packet(0x0438,clif->pItemListWindowSelected,2,4,8);
+	packet(0x07e4,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0835,clif->pDull/*,XXX*/);
+	packet(0x0870,clif->pPartyInvite2,2);
+	packet(0x0872,clif->pSolveCharName,2);
+	packet(0x0877,clif->pReqClickBuyingStore,2);
+	packet(0x087e,clif->pGetCharNameRequest,2);
+	packet(0x0884,clif->pMoveFromKafra,2,4);
+	packet(0x0885,clif->pHomMenu,2,4);
+	packet(0x0888,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088c,clif->pMoveToKafra,2,4);
+	packet(0x088d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x088f,clif->pWalkToXY,2);
+	packet(0x0897,clif->pFriendsListAdd,2);
+	packet(0x08a0,clif->pStoragePassword,0);
+	packet(0x08ac,clif->pDropItem,2,4);
+	packet(0x0925,clif->pTakeItem,2);
+	packet(0x092b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x092c,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x092e,clif->pDull/*,XXX*/);
+	packet(0x0932,clif->pSearchStoreInfoNextPage,0);
+	packet(0x093e,clif->pActionRequest,2,6);
+	packet(0x0940,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0946,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0949,clif->pUseSkillToId,2,4,6);
+	packet(0x0957,clif->pTickSend,2);
+	packet(0x095d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0964,clif->pChangeDir,2,4);
 #endif
 
 // 2015-06-17aRagexe, 2015-06-18aRagexe
 #if PACKETVER == 20150617 || \
     PACKETVER == 20150618
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0362,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0363,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0365,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07ec,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0811,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0869,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x086a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x086b,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0870,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x087a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0886,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0894,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0940,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x094e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pTakeItem,2);
+	packet(0x0362,clif->pReqClickBuyingStore,2);
+	packet(0x0363,clif->pStoragePassword,0);
+	packet(0x0365,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07ec,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0811,clif->pDull/*,XXX*/);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0869,clif->pMoveFromKafra,2,4);
+	packet(0x086a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x086b,clif->pChangeDir,2,4);
+	packet(0x0870,clif->pPartyInvite2,2);
+	packet(0x087a,clif->pMoveToKafra,2,4);
+	packet(0x0886,clif->pHomMenu,2,4);
+	packet(0x0894,clif->pDull/*,XXX*/);
+	packet(0x0940,clif->pDropItem,2,4);
+	packet(0x094e,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-06-24aRagexe
 #if PACKETVER == 20150624
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0365,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0870,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0940,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0941,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0966,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0365,clif->pHomMenu,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0870,clif->pStoragePassword,0);
+	packet(0x0940,clif->pMoveFromKafra,2,4);
+	packet(0x0941,clif->pFriendsListAdd,2);
+	packet(0x0966,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-07-01bRagexe, 2015-07-02aRagexe
 #if PACKETVER == 20150701 || \
     PACKETVER == 20150702
-	packet(0x023b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0281,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x07e4,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0802,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x086d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x087d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x087e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0883,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x088e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0893,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a0,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a4,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08a5,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a6,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08ad,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0919,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0923,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0928,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x092c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x093e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x093f,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0946,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094e,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0954,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0956,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0958,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x095f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0960,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0968,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x023b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0281,clif->pSearchStoreInfoNextPage,0);
+	packet(0x07e4,clif->pMoveFromKafra,2,4);
+	packet(0x0802,clif->pGetCharNameRequest,2);
+	packet(0x086d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x087d,clif->pTickSend,2);
+	packet(0x087e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0883,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x088e,clif->pReqCloseBuyingStore,0);
+	packet(0x0893,clif->pDull/*,XXX*/);
+	packet(0x08a0,clif->pDropItem,2,4);
+	packet(0x08a4,clif->pReqClickBuyingStore,2);
+	packet(0x08a5,clif->pPartyInvite2,2);
+	packet(0x08a6,clif->pUseSkillToId,2,4,6);
+	packet(0x08ad,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0919,clif->pStoragePassword,0);
+	packet(0x0923,clif->pDull/*,XXX*/);
+	packet(0x0928,clif->pMoveToKafra,2,4);
+	packet(0x092c,clif->pWalkToXY,2);
+	packet(0x093e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x093f,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0946,clif->pTakeItem,2);
+	packet(0x094e,clif->pSolveCharName,2);
+	packet(0x0954,clif->pHomMenu,2,4);
+	packet(0x0956,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0958,clif->pActionRequest,2,6);
+	packet(0x095f,clif->pFriendsListAdd,2);
+	packet(0x0960,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0968,clif->pChangeDir,2,4);
 #endif
 
 // 2015-07-08cRagexe
 #if PACKETVER == 20150708
-	packet(0x022d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x02c4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0368,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085e,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0872,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x087f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0884,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x089d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a5,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08ad,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x092a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x093c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0962,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pSolveCharName,2);
+	packet(0x02c4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pPartyInvite2,2);
+	packet(0x0368,clif->pHomMenu,2,4);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085e,clif->pMoveToKafra,2,4);
+	packet(0x0872,clif->pTakeItem,2);
+	packet(0x087f,clif->pDull/*,XXX*/);
+	packet(0x0884,clif->pWalkToXY,2);
+	packet(0x089d,clif->pChangeDir,2,4);
+	packet(0x08a5,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08ad,clif->pStoragePassword,0);
+	packet(0x091f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x092a,clif->pMoveFromKafra,2,4);
+	packet(0x093c,clif->pFriendsListAdd,2);
+	packet(0x095b,clif->pDropItem,2,4);
+	packet(0x0962,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-07-15aRagexe
 #if PACKETVER == 20150715
-	packet(0x023b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0362,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0364,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0436,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0437,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0438,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0835,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x083c,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085c,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x086f,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0873,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0879,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x087c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x087f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0886,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0895,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0896,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0897,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0899,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x089a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a4,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08ac,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0917,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x093e,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0944,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0950,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0956,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0961,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0965,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x023b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0362,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0364,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0436,clif->pSolveCharName,2);
+	packet(0x0437,clif->pUseSkillToId,2,4,6);
+	packet(0x0438,clif->pWalkToXY,2);
+	packet(0x0835,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x083c,clif->pActionRequest,2,6);
+	packet(0x085c,clif->pGetCharNameRequest,2);
+	packet(0x086f,clif->pMoveFromKafra,2,4);
+	packet(0x0873,clif->pTickSend,2);
+	packet(0x0879,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x087c,clif->pDropItem,2,4);
+	packet(0x087f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0886,clif->pDull/*,XXX*/);
+	packet(0x0895,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0896,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0897,clif->pPartyInvite2,2);
+	packet(0x0899,clif->pReqCloseBuyingStore,0);
+	packet(0x089a,clif->pTakeItem,2);
+	packet(0x08a4,clif->pDull/*,XXX*/);
+	packet(0x08ac,clif->pChangeDir,2,4);
+	packet(0x0917,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x093e,clif->pHomMenu,2,4);
+	packet(0x0944,clif->pFriendsListAdd,2);
+	packet(0x0950,clif->pReqClickBuyingStore,2);
+	packet(0x0956,clif->pStoragePassword,0);
+	packet(0x0961,clif->pMoveToKafra,2,4);
+	packet(0x0965,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2015-07-22bRagexe
 #if PACKETVER == 20150722
-	packet(0x023b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0281,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0360,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0361,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0368,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0436,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0811,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0815,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0817,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0869,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0878,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x087b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x087d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087e,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0880,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0884,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x088d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0899,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a8,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0919,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0921,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0925,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x092e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x093c,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x093d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x094c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x094f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0951,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0958,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
+	packet(0x023b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0281,clif->pGetCharNameRequest,2);
+	packet(0x0360,clif->pActionRequest,2,6);
+	packet(0x0361,clif->pDropItem,2,4);
+	packet(0x0368,clif->pPartyInvite2,2);
+	packet(0x0436,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0811,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0815,clif->pReqCloseBuyingStore,0);
+	packet(0x0817,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0869,clif->pTakeItem,2);
+	packet(0x0878,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x087b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x087d,clif->pWalkToXY,2);
+	packet(0x087e,clif->pSolveCharName,2);
+	packet(0x0880,clif->pReqClickBuyingStore,2);
+	packet(0x0884,clif->pHomMenu,2,4);
+	packet(0x088d,clif->pTickSend,2);
+	packet(0x0899,clif->pMoveFromKafra,2,4);
+	packet(0x08a8,clif->pChangeDir,2,4);
+	packet(0x0919,clif->pDull/*,XXX*/);
+	packet(0x0921,clif->pMoveToKafra,2,4);
+	packet(0x0925,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x092e,clif->pFriendsListAdd,2);
+	packet(0x093c,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x093d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x094c,clif->pUseSkillToId,2,4,6);
+	packet(0x094f,clif->pDull/*,XXX*/);
+	packet(0x0951,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0958,clif->pStoragePassword,0);
 #endif
 
 // 2015-07-29aRagexe
 #if PACKETVER == 20150729
-	packet(0x0437,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0438,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x085b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0860,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x086d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x086e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x086f,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0870,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0880,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0881,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0886,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x089a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x089b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a3,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a4,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ac,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08ad,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0920,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x092b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x092f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x093a,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x093f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0940,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x094f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0955,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x095e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0961,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
+	packet(0x0437,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0438,clif->pHomMenu,2,4);
+	packet(0x085b,clif->pDull/*,XXX*/);
+	packet(0x0860,clif->pTakeItem,2);
+	packet(0x086c,clif->pMoveToKafra,2,4);
+	packet(0x086d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x086e,clif->pWalkToXY,2);
+	packet(0x086f,clif->pMoveFromKafra,2,4);
+	packet(0x0870,clif->pGetCharNameRequest,2);
+	packet(0x0880,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0881,clif->pActionRequest,2,6);
+	packet(0x0886,clif->pSolveCharName,2);
+	packet(0x089a,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x089b,clif->pFriendsListAdd,2);
+	packet(0x08a3,clif->pDull/*,XXX*/);
+	packet(0x08a4,clif->pChangeDir,2,4);
+	packet(0x08ac,clif->pPartyInvite2,2);
+	packet(0x08ad,clif->pReqClickBuyingStore,2);
+	packet(0x0920,clif->pSearchStoreInfoNextPage,0);
+	packet(0x092b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x092f,clif->pUseSkillToId,2,4,6);
+	packet(0x093a,clif->pTickSend,2);
+	packet(0x093f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0940,clif->pDropItem,2,4);
+	packet(0x094f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0955,clif->pItemListWindowSelected,2,4,8);
+	packet(0x095e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0961,clif->pStoragePassword,0);
+	packet(0x096a,clif->pReqCloseBuyingStore,0);
 #endif
 
 // 2015-08-05aRagexe
 #if PACKETVER == 20150805
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x088a,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-08-12aRagexe
 #if PACKETVER == 20150812
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087f,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-08-19aRagexe
 #if PACKETVER == 20150819
-	packet(0x0202,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x022d,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0281,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x085d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0862,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0865,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0871,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0888,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0919,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091e,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0927,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0940,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0961,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0967,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pItemListWindowSelected,2,4,8);
+	packet(0x022d,clif->pUseSkillToId,2,4,6);
+	packet(0x0281,clif->pTakeItem,2);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x085d,clif->pMoveFromKafra,2,4);
+	packet(0x0862,clif->pDull/*,XXX*/);
+	packet(0x0865,clif->pFriendsListAdd,2);
+	packet(0x0871,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0888,clif->pHomMenu,2,4);
+	packet(0x0919,clif->pMoveToKafra,2,4);
+	packet(0x091e,clif->pStoragePassword,0);
+	packet(0x0927,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0940,clif->pDropItem,2,4);
+	packet(0x0961,clif->pPartyInvite2,2);
+	packet(0x0967,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-08-26aRagexe, 2015-08-26bRagexe
 #if PACKETVER == 20150826
-	packet(0x0362,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0368,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0436,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x07ec,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0819,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0861,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0865,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x086b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0870,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x087b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x088b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x088d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0890,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0891,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a0,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08a1,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a8,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0924,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0928,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x092e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x093b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0945,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094f,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0951,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0959,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0964,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0968,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0969,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
+	packet(0x0362,clif->pStoragePassword,0);
+	packet(0x0368,clif->pMoveFromKafra,2,4);
+	packet(0x0436,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x07ec,clif->pActionRequest,2,6);
+	packet(0x0819,clif->pReqClickBuyingStore,2);
+	packet(0x0861,clif->pDull/*,XXX*/);
+	packet(0x0865,clif->pWalkToXY,2);
+	packet(0x086b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0870,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x087b,clif->pSolveCharName,2);
+	packet(0x088b,clif->pPartyInvite2,2);
+	packet(0x088d,clif->pFriendsListAdd,2);
+	packet(0x0890,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0891,clif->pUseSkillToId,2,4,6);
+	packet(0x08a0,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08a1,clif->pMoveToKafra,2,4);
+	packet(0x08a4,clif->pTakeItem,2);
+	packet(0x08a8,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0924,clif->pDropItem,2,4);
+	packet(0x0928,clif->pReqCloseBuyingStore,0);
+	packet(0x092e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x093b,clif->pGetCharNameRequest,2);
+	packet(0x0945,clif->pHomMenu,2,4);
+	packet(0x094f,clif->pChangeDir,2,4);
+	packet(0x0951,clif->pTickSend,2);
+	packet(0x0959,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0964,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0968,clif->pDull/*,XXX*/);
+	packet(0x0969,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
 #endif
 
 // 2015-09-02aRagexe
 #if PACKETVER == 20150902
-	packet(0x023b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0360,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0367,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0802,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x083c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x085b,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0863,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x087b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0886,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0887,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0889,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x088d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0892,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0897,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0899,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08a9,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0923,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0928,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x092d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0941,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0947,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x094f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0953,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x095b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0960,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
+	packet(0x023b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0360,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0367,clif->pTickSend,2);
+	packet(0x0802,clif->pStoragePassword,0);
+	packet(0x083c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x085b,clif->pActionRequest,2,6);
+	packet(0x085d,clif->pSolveCharName,2);
+	packet(0x0863,clif->pUseSkillToId,2,4,6);
+	packet(0x086f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x087b,clif->pWalkToXY,2);
+	packet(0x087f,clif->pDull/*,XXX*/);
+	packet(0x0886,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0887,clif->pDull/*,XXX*/);
+	packet(0x0889,clif->pReqCloseBuyingStore,0);
+	packet(0x088d,clif->pMoveFromKafra,2,4);
+	packet(0x0892,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0897,clif->pMoveToKafra,2,4);
+	packet(0x0899,clif->pGetCharNameRequest,2);
+	packet(0x08a9,clif->pDropItem,2,4);
+	packet(0x0923,clif->pFriendsListAdd,2);
+	packet(0x0928,clif->pTakeItem,2);
+	packet(0x092a,clif->pHomMenu,2,4);
+	packet(0x092d,clif->pPartyInvite2,2);
+	packet(0x0941,clif->pChangeDir,2,4);
+	packet(0x0947,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x094f,clif->pReqClickBuyingStore,2);
+	packet(0x0953,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x095b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0960,clif->pSearchStoreInfoNextPage,0);
 #endif
 
 // 2015-09-09aRagexe
 #if PACKETVER == 20150909
-	packet(0x023b,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0361,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0365,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0437,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0861,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0871,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x087b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0883,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0886,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0895,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0928,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0940,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0941,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095e,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0962,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x023b,clif->pActionRequest,2,6);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqCloseBuyingStore,0);
+	packet(0x0361,clif->pGetCharNameRequest,2);
+	packet(0x0365,clif->pWalkToXY,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pStoragePassword,0);
+	packet(0x0437,clif->pMoveFromKafra,2,4);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0861,clif->pDull/*,XXX*/);
+	packet(0x0871,clif->pItemListWindowSelected,2,4,8);
+	packet(0x087b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0883,clif->pTakeItem,2);
+	packet(0x0886,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088f,clif->pPartyInvite2,2);
+	packet(0x0895,clif->pFriendsListAdd,2);
+	packet(0x0928,clif->pDull/*,XXX*/);
+	packet(0x0940,clif->pReqClickBuyingStore,2);
+	packet(0x0941,clif->pHomMenu,2,4);
+	packet(0x095e,clif->pDropItem,2,4);
+	packet(0x0962,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pChangeDir,2,4);
 #endif
 
 // 2015-09-16aRagexe, 2015-09-16cRagexe
 #if PACKETVER == 20150916
-	packet(0x022d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0817,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0835,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x085e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0869,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0873,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0877,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087f,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0881,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x089b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x089c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x089e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08ac,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0920,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0924,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x092e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x092f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0934,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0936,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0938,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x093e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0941,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0942,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0948,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x094f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x095a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0960,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0961,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0969,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
+	packet(0x022d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0817,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0835,clif->pReqClickBuyingStore,2);
+	packet(0x085e,clif->pMoveFromKafra,2,4);
+	packet(0x0869,clif->pActionRequest,2,6);
+	packet(0x0873,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0877,clif->pWalkToXY,2);
+	packet(0x087f,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0881,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x089b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x089c,clif->pTakeItem,2);
+	packet(0x089e,clif->pFriendsListAdd,2);
+	packet(0x08ac,clif->pTickSend,2);
+	packet(0x0920,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0924,clif->pPartyInvite2,2);
+	packet(0x092e,clif->pReqCloseBuyingStore,0);
+	packet(0x092f,clif->pDropItem,2,4);
+	packet(0x0934,clif->pMoveToKafra,2,4);
+	packet(0x0936,clif->pChangeDir,2,4);
+	packet(0x0938,clif->pDull/*,XXX*/);
+	packet(0x093e,clif->pUseSkillToId,2,4,6);
+	packet(0x0941,clif->pStoragePassword,0);
+	packet(0x0942,clif->pSolveCharName,2);
+	packet(0x0948,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x094f,clif->pDull/*,XXX*/);
+	packet(0x095a,clif->pGetCharNameRequest,2);
+	packet(0x0960,clif->pHomMenu,2,4);
+	packet(0x0961,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0969,clif->pWantToConnection,2,6,10,14,18);
 #endif
 
 // 2015-09-23bRagexe, 2015-09-23cRagexe, 2015-09-23dRagexe, 2015-09-23eRagexe, 2015-09-23fRagexe
 #if PACKETVER == 20150923
-	packet(0x0361,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x07e4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0817,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x085c,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x085d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0864,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x086e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x086f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0870,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0879,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0886,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x088e,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0892,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0895,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x089b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x089f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a0,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a2,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a5,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08a6,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x091e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x092b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0930,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0936,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x093b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0951,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0961,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
+	packet(0x0361,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x07e4,clif->pStoragePassword,0);
+	packet(0x0817,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x085c,clif->pSolveCharName,2);
+	packet(0x085d,clif->pFriendsListAdd,2);
+	packet(0x0864,clif->pHomMenu,2,4);
+	packet(0x086e,clif->pReqCloseBuyingStore,0);
+	packet(0x086f,clif->pUseSkillToId,2,4,6);
+	packet(0x0870,clif->pChangeDir,2,4);
+	packet(0x0879,clif->pMoveFromKafra,2,4);
+	packet(0x087f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0886,clif->pWalkToXY,2);
+	packet(0x088e,clif->pReqClickBuyingStore,2);
+	packet(0x0892,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0895,clif->pDull/*,XXX*/);
+	packet(0x089b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x089f,clif->pMoveToKafra,2,4);
+	packet(0x08a0,clif->pTickSend,2);
+	packet(0x08a2,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a5,clif->pGetCharNameRequest,2);
+	packet(0x08a6,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x091e,clif->pDull/*,XXX*/);
+	packet(0x092b,clif->pTakeItem,2);
+	packet(0x0930,clif->pDropItem,2,4);
+	packet(0x0936,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x093b,clif->pPartyInvite2,2);
+	packet(0x0951,clif->pActionRequest,2,6);
+	packet(0x0961,clif->pItemListWindowSelected,2,4,8);
 #endif
 
 // 2015-10-01aRagexe
 #if PACKETVER == 20151001
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0960,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0960,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-10-07aRagexe
 #if PACKETVER == 20151007
-	packet(0x0202,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0862,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x093f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095f,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0961,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0967,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pFriendsListAdd,2);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0862,clif->pDull/*,XXX*/);
+	packet(0x093f,clif->pHomMenu,2,4);
+	packet(0x095f,clif->pChangeDir,2,4);
+	packet(0x0961,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0967,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-10-14bRagexe
 #if PACKETVER == 20151014
-	packet(0x0202,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0817,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0838,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x085a,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085c,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0860,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0863,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0867,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0872,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0874,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0881,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0883,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0884,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0889,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x088e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x089a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x089b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x089f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08aa,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091c,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x091d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0930,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0934,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0944,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x094f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0956,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x095e,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0961,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0964,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
+	packet(0x0202,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0817,clif->pFriendsListAdd,2);
+	packet(0x0838,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x085a,clif->pUseSkillToId,2,4,6);
+	packet(0x085c,clif->pActionRequest,2,6);
+	packet(0x0860,clif->pDropItem,2,4);
+	packet(0x0863,clif->pChangeDir,2,4);
+	packet(0x0867,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0872,clif->pHomMenu,2,4);
+	packet(0x0874,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0881,clif->pMoveFromKafra,2,4);
+	packet(0x0883,clif->pTickSend,2);
+	packet(0x0884,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0889,clif->pReqClickBuyingStore,2);
+	packet(0x088e,clif->pDull/*,XXX*/);
+	packet(0x089a,clif->pDull/*,XXX*/);
+	packet(0x089b,clif->pReqCloseBuyingStore,0);
+	packet(0x089f,clif->pWalkToXY,2);
+	packet(0x08aa,clif->pTakeItem,2);
+	packet(0x091c,clif->pPartyInvite2,2);
+	packet(0x091d,clif->pStoragePassword,0);
+	packet(0x0930,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0934,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0944,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x094f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0956,clif->pSolveCharName,2);
+	packet(0x095e,clif->pMoveToKafra,2,4);
+	packet(0x0961,clif->pGetCharNameRequest,2);
+	packet(0x0964,clif->pWantToConnection,2,6,10,14,18);
 #endif
 
 // 2015-10-21aRagexe, 2015-10-22aRagexe
 #if PACKETVER == 20151021 || \
     PACKETVER == 20151022
-	packet(0x023b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x02c4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x091d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x02c4,clif->pStoragePassword,0);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pMoveToKafra,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pChangeDir,2,4);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086a,clif->pFriendsListAdd,2);
+	packet(0x091d,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pPartyInvite2,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-10-28cRagexe, 2015-10-28dRagexe, 2015-10-29aRagexe
 #if PACKETVER == 20151028 || \
     PACKETVER == 20151029
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0860,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0860,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-11-04aRagexe
 #if PACKETVER == 20151104
-	packet(0x023b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0360,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0363,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0437,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07ec,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0811,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0815,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0886,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0887,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x088b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x088d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a3,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a5,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0928,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0939,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093a,clif->pItemListWindowSelected,2,4,8,12);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0940,clif->pStoragePassword,2,4,20);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0964,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
+	packet(0x023b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0360,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0363,clif->pWalkToXY,2);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pReqClickBuyingStore,2);
+	packet(0x0437,clif->pDropItem,2,4);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07ec,clif->pFriendsListAdd,2);
+	packet(0x0811,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0815,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0886,clif->pTickSend,2);
+	packet(0x0887,clif->pGetCharNameRequest,2);
+	packet(0x088b,clif->pMoveToKafra,2,4);
+	packet(0x088d,clif->pHomMenu,2,4);
+	packet(0x08a3,clif->pDull/*,XXX*/);
+	packet(0x08a5,clif->pPartyInvite2,2);
+	packet(0x0928,clif->pChangeDir,2,4);
+	packet(0x0939,clif->pDull/*,XXX*/);
+	packet(0x093a,clif->pItemListWindowSelected,2,4,8,12);
+	packet(0x0940,clif->pStoragePassword,2,4,20);
+	packet(0x0964,clif->pTakeItem,2);
 #endif
 
 // 2015-11-11aRagexe, 2015-11-11bRagexe
 #if PACKETVER == 20151111
-	packet(0x02c4,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085d,clif->pItemListWindowSelected,2,4,8,12);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0862,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0871,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0885,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x089c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0942,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0958,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0966,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0967,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0969,clif->pStoragePassword,2,4,20);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x02c4,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pHomMenu,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pMoveToKafra,2,4);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pDull/*,XXX*/);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pPartyInvite2,2);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085d,clif->pItemListWindowSelected,2,4,8,12);
+	packet(0x0862,clif->pDropItem,2,4);
+	packet(0x0871,clif->pFriendsListAdd,2);
+	packet(0x0885,clif->pActionRequest,2,6);
+	packet(0x089c,clif->pChangeDir,2,4);
+	packet(0x0942,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x094a,clif->pTakeItem,2);
+	packet(0x0958,clif->pDull/*,XXX*/);
+	packet(0x0966,clif->pMoveFromKafra,2,4);
+	packet(0x0967,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0969,clif->pStoragePassword,2,4,20);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-11-18aRagexe
 #if PACKETVER == 20151118
-	packet(0x022d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x035f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0365,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x088b,clif->pStoragePassword,2,4,20);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08ab,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0921,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0925,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x092e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x092f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0943,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0946,clif->pItemListWindowSelected,2,4,8,12);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0957,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x095c,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pTickSend,2);
+	packet(0x035f,clif->pHomMenu,2,4);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0365,clif->pPartyInvite2,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086b,clif->pMoveToKafra,2,4);
+	packet(0x088b,clif->pStoragePassword,2,4,20);
+	packet(0x08ab,clif->pMoveFromKafra,2,4);
+	packet(0x0921,clif->pFriendsListAdd,2);
+	packet(0x0925,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x092e,clif->pChangeDir,2,4);
+	packet(0x092f,clif->pDull/*,XXX*/);
+	packet(0x093c,clif->pDropItem,2,4);
+	packet(0x0943,clif->pTakeItem,2);
+	packet(0x0946,clif->pItemListWindowSelected,2,4,8,12);
+	packet(0x0957,clif->pDull/*,XXX*/);
+	packet(0x095c,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-11-25bRagexe, 2015-11-25dRagexe
 #if PACKETVER == 20151125
-	packet(0x0361,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0365,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0366,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0368,clif->pItemListWindowSelected,2,4,8,12);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0438,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0802,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0838,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085e,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x085f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0863,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0883,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0884,clif->pStoragePassword,2,4,20);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0885,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088c,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x088d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0899,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089c,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x089f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x08a9,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08ad,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0920,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x092a,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x092e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0939,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x093e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0951,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0956,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0957,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0959,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
+	packet(0x0361,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0365,clif->pWalkToXY,2);
+	packet(0x0366,clif->pMoveFromKafra,2,4);
+	packet(0x0368,clif->pItemListWindowSelected,2,4,8,12);
+	packet(0x0438,clif->pTakeItem,2);
+	packet(0x0802,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0838,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x085e,clif->pGetCharNameRequest,2);
+	packet(0x085f,clif->pMoveToKafra,2,4);
+	packet(0x0863,clif->pReqCloseBuyingStore,0);
+	packet(0x0883,clif->pChangeDir,2,4);
+	packet(0x0884,clif->pStoragePassword,2,4,20);
+	packet(0x0885,clif->pDull/*,XXX*/);
+	packet(0x088c,clif->pTickSend,2);
+	packet(0x088d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0899,clif->pFriendsListAdd,2);
+	packet(0x089c,clif->pActionRequest,2,6);
+	packet(0x089f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x08a9,clif->pDropItem,2,4);
+	packet(0x08ad,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0920,clif->pSolveCharName,2);
+	packet(0x092a,clif->pUseSkillToId,2,4,6);
+	packet(0x092e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0939,clif->pReqClickBuyingStore,2);
+	packet(0x093e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0951,clif->pHomMenu,2,4);
+	packet(0x0956,clif->pPartyInvite2,2);
+	packet(0x0957,clif->pDull/*,XXX*/);
+	packet(0x0959,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
 #endif
 
 // 2015-12-02aRagexe
 #if PACKETVER == 20151202
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8,12);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0870,clif->pStoragePassword,2,4,20);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8,12);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0870,clif->pStoragePassword,2,4,20);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-12-09aRagexe
 #if PACKETVER == 20151209
-	packet(0x0365,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0369,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x07e4,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x07ec,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0811,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0819,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x085b,clif->pStoragePassword,2,4,20);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x085d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x085e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0861,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0866,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0875,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x087a,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x087f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x088e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0894,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08a1,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0920,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x092d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0930,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0932,clif->pItemListWindowSelected,2,4,8,12);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x093b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0948,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x094a,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0956,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x095c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0961,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0964,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
+	packet(0x0365,clif->pWalkToXY,2);
+	packet(0x0369,clif->pSolveCharName,2);
+	packet(0x07e4,clif->pPartyInvite2,2);
+	packet(0x07ec,clif->pTakeItem,2);
+	packet(0x0811,clif->pTickSend,2);
+	packet(0x0819,clif->pReqCloseBuyingStore,0);
+	packet(0x085b,clif->pStoragePassword,2,4,20);
+	packet(0x085d,clif->pGetCharNameRequest,2);
+	packet(0x085e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0861,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0866,clif->pChangeDir,2,4);
+	packet(0x0875,clif->pSearchStoreInfoNextPage,0);
+	packet(0x087a,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x087f,clif->pReqClickBuyingStore,2);
+	packet(0x088e,clif->pUseSkillToId,2,4,6);
+	packet(0x088f,clif->pDull/*,XXX*/);
+	packet(0x0894,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08a1,clif->pHomMenu,2,4);
+	packet(0x0920,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x092d,clif->pMoveFromKafra,2,4);
+	packet(0x0930,clif->pDropItem,2,4);
+	packet(0x0932,clif->pItemListWindowSelected,2,4,8,12);
+	packet(0x093b,clif->pMoveToKafra,2,4);
+	packet(0x0948,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x094a,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0956,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x095c,clif->pDull/*,XXX*/);
+	packet(0x0961,clif->pActionRequest,2,6);
+	packet(0x0964,clif->pFriendsListAdd,2);
 #endif
 
 // 2015-12-16aRagexe
 #if PACKETVER == 20151216
-	packet(0x022d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0361,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0364,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0436,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x085b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0864,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0865,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x086a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x086e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0870,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0874,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0885,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089d,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x089e,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a2,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a9,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08ac,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0944,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0947,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0949,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0954,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0960,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0966,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0968,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
+	packet(0x022d,clif->pChangeDir,2,4);
+	packet(0x0361,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pHomMenu,2,4);
+	packet(0x0364,clif->pDull/*,XXX*/);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0436,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pReqCloseBuyingStore,0);
+	packet(0x085b,clif->pTickSend,2);
+	packet(0x0864,clif->pMoveFromKafra,2,4);
+	packet(0x0865,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x086a,clif->pDull/*,XXX*/);
+	packet(0x086e,clif->pPartyInvite2,2);
+	packet(0x0870,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0874,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0885,clif->pStoragePassword,0);
+	packet(0x088b,clif->pGetCharNameRequest,2);
+	packet(0x089d,clif->pActionRequest,2,6);
+	packet(0x089e,clif->pSolveCharName,2);
+	packet(0x08a2,clif->pWalkToXY,2);
+	packet(0x08a9,clif->pTakeItem,2);
+	packet(0x08ac,clif->pMoveToKafra,2,4);
+	packet(0x091d,clif->pFriendsListAdd,2);
+	packet(0x0944,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0947,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0949,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0954,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0960,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0966,clif->pDropItem,2,4);
+	packet(0x0968,clif->pUseSkillToId,2,4,6);
 #endif
 
 // 2015-12-23bRagexe
 #if PACKETVER == 20151223
-	packet(0x02c4,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0362,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0802,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0815,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0864,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0866,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x086e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0872,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0875,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0876,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0881,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0884,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0886,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x088d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0890,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0891,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0898,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x08aa,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0918,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x091a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x091b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0920,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0923,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0924,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x095e,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x095f,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0965,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0967,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
+	packet(0x02c4,clif->pMoveToKafra,2,4);
+	packet(0x0362,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pTakeItem,2);
+	packet(0x0802,clif->pDull/*,XXX*/);
+	packet(0x0815,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0864,clif->pGetCharNameRequest,2);
+	packet(0x0866,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x086e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0872,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0875,clif->pUseSkillToId,2,4,6);
+	packet(0x0876,clif->pDropItem,2,4);
+	packet(0x0881,clif->pActionRequest,2,6);
+	packet(0x0884,clif->pMoveFromKafra,2,4);
+	packet(0x0886,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x088d,clif->pHomMenu,2,4);
+	packet(0x0890,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0891,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0898,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x08aa,clif->pPartyInvite2,2);
+	packet(0x0918,clif->pSearchStoreInfoNextPage,0);
+	packet(0x091a,clif->pReqClickBuyingStore,2);
+	packet(0x091b,clif->pFriendsListAdd,2);
+	packet(0x0920,clif->pWalkToXY,2);
+	packet(0x0923,clif->pChangeDir,2,4);
+	packet(0x0924,clif->pTickSend,2);
+	packet(0x095e,clif->pSolveCharName,2);
+	packet(0x095f,clif->pReqCloseBuyingStore,0);
+	packet(0x0965,clif->pStoragePassword,0);
+	packet(0x0967,clif->pSearchStoreInfoListItemClick,2,6,10);
 #endif
 
 // 2015-12-30aRagexe
 #if PACKETVER == 20151230
-	packet(0x02c4,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x07ec,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0861,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0869,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0886,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x088e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0897,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0923,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x093a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0949,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x02c4,clif->pMoveToKafra,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pDull/*,XXX*/);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x07ec,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0861,clif->pPartyInvite2,2);
+	packet(0x0869,clif->pChangeDir,2,4);
+	packet(0x0886,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x088e,clif->pFriendsListAdd,2);
+	packet(0x0897,clif->pDropItem,2,4);
+	packet(0x091d,clif->pMoveFromKafra,2,4);
+	packet(0x0923,clif->pStoragePassword,0);
+	packet(0x093a,clif->pDull/*,XXX*/);
+	packet(0x0949,clif->pHomMenu,2,4);
+	packet(0x094e,clif->pTakeItem,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-01-06aRagexe
 #if PACKETVER == 20160106
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07ec,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0861,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x086c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0878,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x087a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x087f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0885,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0889,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x088a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0891,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a0,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x091d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0940,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07ec,clif->pHomMenu,2,4);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0861,clif->pTakeItem,2);
+	packet(0x086a,clif->pDropItem,2,4);
+	packet(0x086c,clif->pDull/*,XXX*/);
+	packet(0x0878,clif->pStoragePassword,0);
+	packet(0x087a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x087f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0885,clif->pMoveToKafra,2,4);
+	packet(0x0889,clif->pChangeDir,2,4);
+	packet(0x088a,clif->pPartyInvite2,2);
+	packet(0x0891,clif->pMoveFromKafra,2,4);
+	packet(0x08a0,clif->pFriendsListAdd,2);
+	packet(0x091d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0940,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-01-13aRagexe, 2016-01-13bRagexe, 2016-01-13bRagexe_2
 #if PACKETVER == 20160113
-	packet(0x022d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x023b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x035f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0815,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x085b,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0864,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x086d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0873,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0875,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0888,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x088b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x088c,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0892,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0893,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0899,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a0,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08aa,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0919,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x091b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0924,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0930,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0932,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x093c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0941,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x094d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x094f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0967,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
+	packet(0x022d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x023b,clif->pWalkToXY,2);
+	packet(0x035f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0815,clif->pStoragePassword,0);
+	packet(0x085b,clif->pChangeDir,2,4);
+	packet(0x0864,clif->pReqClickBuyingStore,2);
+	packet(0x086d,clif->pHomMenu,2,4);
+	packet(0x0873,clif->pDull/*,XXX*/);
+	packet(0x0875,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0888,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x088b,clif->pPartyInvite2,2);
+	packet(0x088c,clif->pReqCloseBuyingStore,0);
+	packet(0x0892,clif->pUseSkillToId,2,4,6);
+	packet(0x0893,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0899,clif->pFriendsListAdd,2);
+	packet(0x089a,clif->pActionRequest,2,6);
+	packet(0x08a0,clif->pTickSend,2);
+	packet(0x08a6,clif->pTakeItem,2);
+	packet(0x08aa,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0919,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x091b,clif->pGetCharNameRequest,2);
+	packet(0x0924,clif->pDropItem,2,4);
+	packet(0x0930,clif->pSolveCharName,2);
+	packet(0x0932,clif->pMoveToKafra,2,4);
+	packet(0x093c,clif->pMoveFromKafra,2,4);
+	packet(0x0941,clif->pItemListWindowSelected,2,4,8);
+	packet(0x094d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x094f,clif->pDull/*,XXX*/);
+	packet(0x0967,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #endif
 
 // 2016-01-20aRagexe
 #if PACKETVER == 20160120
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0865,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0865,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-01-27cRagexe, 2016-01-27dRagexe
 #if PACKETVER == 20160127
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0922,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0961,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085e,clif->pChangeDir,2,4);
+	packet(0x0922,clif->pHomMenu,2,4);
+	packet(0x095a,clif->pStoragePassword,0);
+	packet(0x0961,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-02-03aRagexe
 #if PACKETVER == 20160203
-	packet(0x0202,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0437,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0811,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0835,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0872,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0873,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0918,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0940,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0947,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0954,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x095a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pFriendsListAdd,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0437,clif->pTickSend,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0811,clif->pChangeDir,2,4);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0835,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0872,clif->pHomMenu,2,4);
+	packet(0x0873,clif->pStoragePassword,0);
+	packet(0x088c,clif->pDull/*,XXX*/);
+	packet(0x0918,clif->pDull/*,XXX*/);
+	packet(0x093e,clif->pPartyInvite2,2);
+	packet(0x0940,clif->pWalkToXY,2);
+	packet(0x0947,clif->pDropItem,2,4);
+	packet(0x0954,clif->pMoveFromKafra,2,4);
+	packet(0x095a,clif->pTakeItem,2);
+	packet(0x095d,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-02-11aRagexe
 #if PACKETVER == 20160211
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0870,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0886,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pStoragePassword,0);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086c,clif->pChangeDir,2,4);
+	packet(0x0870,clif->pFriendsListAdd,2);
+	packet(0x0886,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-02-17aRagexe
 #if PACKETVER == 20160217
-	packet(0x0202,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x023b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0362,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0365,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0864,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0870,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0873,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x087a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0888,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x088d,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x088f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0899,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a0,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a9,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08ac,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08ad,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x091d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0920,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0926,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x092e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x093b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x093e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0941,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x094f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x095e,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0966,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0967,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0969,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
+	packet(0x0202,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x023b,clif->pReqCloseBuyingStore,0);
+	packet(0x0362,clif->pChangeDir,2,4);
+	packet(0x0365,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0864,clif->pMoveToKafra,2,4);
+	packet(0x0870,clif->pFriendsListAdd,2);
+	packet(0x0873,clif->pHomMenu,2,4);
+	packet(0x087a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0888,clif->pTickSend,2);
+	packet(0x088d,clif->pReqClickBuyingStore,2);
+	packet(0x088f,clif->pDropItem,2,4);
+	packet(0x0899,clif->pDull/*,XXX*/);
+	packet(0x08a0,clif->pMoveFromKafra,2,4);
+	packet(0x08a9,clif->pPartyInvite2,2);
+	packet(0x08ac,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08ad,clif->pSearchStoreInfoNextPage,0);
+	packet(0x091d,clif->pWalkToXY,2);
+	packet(0x0920,clif->pActionRequest,2,6);
+	packet(0x0926,clif->pUseSkillToId,2,4,6);
+	packet(0x092e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x093b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x093e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0941,clif->pTakeItem,2);
+	packet(0x094a,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x094f,clif->pDull/*,XXX*/);
+	packet(0x095e,clif->pStoragePassword,0);
+	packet(0x0966,clif->pGetCharNameRequest,2);
+	packet(0x0967,clif->pSolveCharName,2);
+	packet(0x0969,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #endif
 
 // 2016-02-24aRagexe
 #if PACKETVER == 20160224
-	packet(0x022d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0364,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0436,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0861,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x086b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0884,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0885,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0888,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a9,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0920,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0929,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x092f,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0936,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0938,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0961,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pPartyInvite2,2);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0364,clif->pUseSkillToId,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pMoveFromKafra,2,4);
+	packet(0x0436,clif->pDropItem,2,4);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pMoveToKafra,2,4);
+	packet(0x0861,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x086b,clif->pDull/*,XXX*/);
+	packet(0x0884,clif->pActionRequest,2,6);
+	packet(0x0885,clif->pReqClickBuyingStore,2);
+	packet(0x0888,clif->pWalkToXY,2);
+	packet(0x08a9,clif->pFriendsListAdd,2);
+	packet(0x0920,clif->pDull/*,XXX*/);
+	packet(0x0929,clif->pChangeDir,2,4);
+	packet(0x092f,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0936,clif->pStoragePassword,0);
+	packet(0x0938,clif->pTakeItem,2);
+	packet(0x094c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0961,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-03-02bRagexe
 #if PACKETVER == 20160302
-	packet(0x022d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0367,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0802,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0819,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x085b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0864,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0865,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0867,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0868,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0873,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0875,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x087a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x087d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0883,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a6,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08a9,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0927,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092d,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x092f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0945,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x094e,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0950,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0957,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x095a,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0960,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0967,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0968,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
+	packet(0x022d,clif->pChangeDir,2,4);
+	packet(0x0367,clif->pReqClickBuyingStore,2);
+	packet(0x0802,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0819,clif->pWalkToXY,2);
+	packet(0x085b,clif->pFriendsListAdd,2);
+	packet(0x0864,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0865,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0867,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0868,clif->pHomMenu,2,4);
+	packet(0x0873,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0875,clif->pSearchStoreInfoNextPage,0);
+	packet(0x087a,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x087d,clif->pPartyInvite2,2);
+	packet(0x0883,clif->pUseSkillToId,2,4,6);
+	packet(0x08a6,clif->pReqCloseBuyingStore,0);
+	packet(0x08a9,clif->pMoveFromKafra,2,4);
+	packet(0x091a,clif->pDropItem,2,4);
+	packet(0x0927,clif->pTakeItem,2);
+	packet(0x092d,clif->pDull/*,XXX*/);
+	packet(0x092f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0945,clif->pGetCharNameRequest,2);
+	packet(0x094e,clif->pStoragePassword,0);
+	packet(0x0950,clif->pDull/*,XXX*/);
+	packet(0x0957,clif->pItemListWindowSelected,2,4,8);
+	packet(0x095a,clif->pTickSend,2);
+	packet(0x0960,clif->pMoveToKafra,2,4);
+	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0967,clif->pSolveCharName,2);
+	packet(0x0968,clif->pActionRequest,2,6);
 #endif
 
 // 2016-03-09cRagexe
 #if PACKETVER == 20160309
-	packet(0x023b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0281,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0364,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0819,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0838,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x083c,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x085a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x085f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0866,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x086a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0873,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x087e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x089b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x089d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a7,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x091d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0920,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0922,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0929,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x092a,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x092e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0932,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094f,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0956,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x095e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x096a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
+	packet(0x023b,clif->pDropItem,2,4);
+	packet(0x0281,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pFriendsListAdd,2);
+	packet(0x0364,clif->pStoragePassword,0);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0819,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0838,clif->pWalkToXY,2);
+	packet(0x083c,clif->pPartyInvite2,2);
+	packet(0x085a,clif->pMoveToKafra,2,4);
+	packet(0x085f,clif->pUseSkillToId,2,4,6);
+	packet(0x0866,clif->pSearchStoreInfoNextPage,0);
+	packet(0x086a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0873,clif->pDull/*,XXX*/);
+	packet(0x087c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x087e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x089b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x089d,clif->pChangeDir,2,4);
+	packet(0x08a7,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x091d,clif->pGetCharNameRequest,2);
+	packet(0x0920,clif->pMoveFromKafra,2,4);
+	packet(0x0922,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0929,clif->pDull/*,XXX*/);
+	packet(0x092a,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x092e,clif->pReqCloseBuyingStore,0);
+	packet(0x0932,clif->pHomMenu,2,4);
+	packet(0x094f,clif->pActionRequest,2,6);
+	packet(0x0956,clif->pTickSend,2);
+	packet(0x095e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x096a,clif->pTakeItem,2);
 #endif
 
 // 2016-03-16aRagexe, 2016-03-18aRagexe
 #if PACKETVER == 20160316 || \
     PACKETVER == 20160318
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0922,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0922,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-03-23aRagexe, 2016-03-23bRagexe
 #if PACKETVER == 20160323
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0365,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0867,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0869,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0872,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0878,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0883,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0896,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x089a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x091b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0926,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0927,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0933,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x093c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0365,clif->pFriendsListAdd,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0867,clif->pDull/*,XXX*/);
+	packet(0x0869,clif->pTakeItem,2);
+	packet(0x086a,clif->pMoveFromKafra,2,4);
+	packet(0x0872,clif->pStoragePassword,0);
+	packet(0x0878,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0883,clif->pPartyInvite2,2);
+	packet(0x0896,clif->pItemListWindowSelected,2,4,8);
+	packet(0x089a,clif->pHomMenu,2,4);
+	packet(0x091b,clif->pDull/*,XXX*/);
+	packet(0x0926,clif->pMoveToKafra,2,4);
+	packet(0x0927,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0933,clif->pChangeDir,2,4);
+	packet(0x093c,clif->pDropItem,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-03-30aRagexe, 2016-03-30bRagexe
 #if PACKETVER == 20160330
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0365,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0867,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x086d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0878,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087f,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0889,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x088b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x088d,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0918,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0925,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x092a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x092c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0930,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0939,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x093b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0365,clif->pStoragePassword,0);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0867,clif->pPartyInvite2,2);
+	packet(0x086d,clif->pTakeItem,2);
+	packet(0x0878,clif->pDull/*,XXX*/);
+	packet(0x087f,clif->pMoveFromKafra,2,4);
+	packet(0x0889,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x088b,clif->pHomMenu,2,4);
+	packet(0x088d,clif->pDull/*,XXX*/);
+	packet(0x0918,clif->pMoveToKafra,2,4);
+	packet(0x0925,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x092a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x092c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0930,clif->pChangeDir,2,4);
+	packet(0x0939,clif->pDropItem,2,4);
+	packet(0x093b,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-04-06aRagexe, 2016-04-06bRagexe
 #if PACKETVER == 20160406
-	packet(0x0364,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x07e4,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0819,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x085a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0869,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0877,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0878,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0879,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0884,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0892,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0895,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0898,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a1,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a9,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08ac,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0927,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x092d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0933,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0934,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0940,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0949,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x094d,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0953,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x095d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0962,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
+	packet(0x0364,clif->pSolveCharName,2);
+	packet(0x07e4,clif->pDropItem,2,4);
+	packet(0x0819,clif->pSearchStoreInfoNextPage,0);
+	packet(0x085a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x085c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0869,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0877,clif->pTakeItem,2);
+	packet(0x0878,clif->pFriendsListAdd,2);
+	packet(0x0879,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0884,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0892,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0895,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0898,clif->pPartyInvite2,2);
+	packet(0x089b,clif->pGetCharNameRequest,2);
+	packet(0x089e,clif->pMoveFromKafra,2,4);
+	packet(0x08a1,clif->pActionRequest,2,6);
+	packet(0x08a9,clif->pReqCloseBuyingStore,0);
+	packet(0x08ac,clif->pDull/*,XXX*/);
+	packet(0x0927,clif->pMoveToKafra,2,4);
+	packet(0x092d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0933,clif->pChangeDir,2,4);
+	packet(0x0934,clif->pUseSkillToId,2,4,6);
+	packet(0x0940,clif->pTickSend,2);
+	packet(0x0949,clif->pItemListWindowSelected,2,4,8);
+	packet(0x094d,clif->pReqClickBuyingStore,2);
+	packet(0x0953,clif->pStoragePassword,0);
+	packet(0x095d,clif->pHomMenu,2,4);
+	packet(0x095f,clif->pWalkToXY,2);
+	packet(0x0962,clif->pDull/*,XXX*/);
 #endif
 
 // 2016-04-14aRagexe, 2016-04-14bRagexe, 2016-04-14bRagexe_2, 2016-04-14cRagexe
 #if PACKETVER == 20160414
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0363,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0862,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x087a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0880,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0885,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x089e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0918,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0922,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0927,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0931,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0934,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0945,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0953,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0363,clif->pTakeItem,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0862,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x087a,clif->pDull/*,XXX*/);
+	packet(0x0880,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0885,clif->pMoveFromKafra,2,4);
+	packet(0x089e,clif->pPartyInvite2,2);
+	packet(0x0918,clif->pDull/*,XXX*/);
+	packet(0x0922,clif->pChangeDir,2,4);
+	packet(0x0927,clif->pStoragePassword,0);
+	packet(0x0931,clif->pDropItem,2,4);
+	packet(0x0934,clif->pHomMenu,2,4);
+	packet(0x0945,clif->pFriendsListAdd,2);
+	packet(0x0953,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-04-20cRagexe
 #if PACKETVER == 20160420
-	packet(0x022d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x02c4,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x035f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0864,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0870,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0872,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0874,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0884,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0888,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a5,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0935,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x094e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x095c,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x02c4,clif->pTickSend,2);
+	packet(0x035f,clif->pPartyInvite2,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pHomMenu,2,4);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0864,clif->pTakeItem,2);
+	packet(0x0870,clif->pDull/*,XXX*/);
+	packet(0x0872,clif->pChangeDir,2,4);
+	packet(0x0874,clif->pMoveToKafra,2,4);
+	packet(0x0884,clif->pDropItem,2,4);
+	packet(0x0888,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088b,clif->pMoveFromKafra,2,4);
+	packet(0x08a5,clif->pStoragePassword,0);
+	packet(0x092f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0935,clif->pFriendsListAdd,2);
+	packet(0x094e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x095c,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-04-27aRagexe
 #if PACKETVER == 20160427
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0835,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0940,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0835,clif->pStoragePassword,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0940,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-05-04aRagexe
 #if PACKETVER == 20160504
-	packet(0x0202,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0363,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0365,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x083c,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x085f,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x086b,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x087f,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0884,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0886,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0887,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x088a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x088d,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088f,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0890,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0893,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0898,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x089d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08ad,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0918,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0921,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0922,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0924,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x093e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0940,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0941,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0948,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0952,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0969,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
+	packet(0x0202,clif->pHomMenu,2,4);
+	packet(0x0363,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0365,clif->pDull/*,XXX*/);
+	packet(0x083c,clif->pSearchStoreInfoNextPage,0);
+	packet(0x085f,clif->pActionRequest,2,6);
+	packet(0x086b,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x087f,clif->pReqCloseBuyingStore,0);
+	packet(0x0884,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0886,clif->pMoveToKafra,2,4);
+	packet(0x0887,clif->pPartyInvite2,2);
+	packet(0x088a,clif->pTakeItem,2);
+	packet(0x088d,clif->pUseSkillToId,2,4,6);
+	packet(0x088f,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0890,clif->pDropItem,2,4);
+	packet(0x0893,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0898,clif->pDull/*,XXX*/);
+	packet(0x089d,clif->pSolveCharName,2);
+	packet(0x08ad,clif->pChangeDir,2,4);
+	packet(0x0918,clif->pTickSend,2);
+	packet(0x0921,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0922,clif->pGetCharNameRequest,2);
+	packet(0x0924,clif->pWalkToXY,2);
+	packet(0x093e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0940,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0941,clif->pMoveFromKafra,2,4);
+	packet(0x0948,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0952,clif->pFriendsListAdd,2);
+	packet(0x095b,clif->pReqClickBuyingStore,2);
+	packet(0x0969,clif->pStoragePassword,0);
 #endif
 
 // 2016-05-11aRagexe
 #if PACKETVER == 20160511
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0894,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0918,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0920,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0940,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085e,clif->pChangeDir,2,4);
+	packet(0x0894,clif->pFriendsListAdd,2);
+	packet(0x089b,clif->pDull/*,XXX*/);
+	packet(0x0918,clif->pHomMenu,2,4);
+	packet(0x0920,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0940,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-05-18aRagexe
 #if PACKETVER == 20160518
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0874,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x089a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a9,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0928,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086c,clif->pChangeDir,2,4);
+	packet(0x0874,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x089a,clif->pStoragePassword,0);
+	packet(0x08a9,clif->pFriendsListAdd,2);
+	packet(0x0928,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-05-25aRagexe, 2016-05-26aRagexe
 #if PACKETVER == 20160525 || \
     PACKETVER == 20160526
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x085e,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0867,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x086a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0899,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x089c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0937,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0945,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x094a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x094e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0951,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0956,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pDull/*,XXX*/);
+	packet(0x085e,clif->pDropItem,2,4);
+	packet(0x0867,clif->pHomMenu,2,4);
+	packet(0x086a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0899,clif->pTakeItem,2);
+	packet(0x089c,clif->pChangeDir,2,4);
+	packet(0x091d,clif->pStoragePassword,0);
+	packet(0x092c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0937,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0945,clif->pPartyInvite2,2);
+	packet(0x094a,clif->pMoveToKafra,2,4);
+	packet(0x094e,clif->pDull/*,XXX*/);
+	packet(0x0951,clif->pFriendsListAdd,2);
+	packet(0x0956,clif->pMoveFromKafra,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-06-01aRagexe
 #if PACKETVER == 20160601
-	packet(0x0202,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x02c4,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0863,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0870,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x088f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0895,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a7,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08ac,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0924,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x095b,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x095f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pReqCloseBuyingStore,0);
+	packet(0x02c4,clif->pPartyInvite2,2);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pFriendsListAdd,2);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0863,clif->pTakeItem,2);
+	packet(0x0870,clif->pMoveFromKafra,2,4);
+	packet(0x087d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088d,clif->pDropItem,2,4);
+	packet(0x088f,clif->pMoveToKafra,2,4);
+	packet(0x0895,clif->pHomMenu,2,4);
+	packet(0x08a7,clif->pDull/*,XXX*/);
+	packet(0x08ac,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0924,clif->pDull/*,XXX*/);
+	packet(0x095b,clif->pChangeDir,2,4);
+	packet(0x095f,clif->pStoragePassword,0);
+	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-06-08aRagexe, 2016-06-08bRagexe, 2016-06-09aRagexe
 #if PACKETVER == 20160608 || \
     PACKETVER == 20160609
-	packet(0x022d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x02c4,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x035f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0437,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07ec,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0802,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085c,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0885,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0889,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0899,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x089b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a6,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x093b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x094d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0958,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x095b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0969,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x02c4,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x035f,clif->pPartyInvite2,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pWalkToXY,2);
+	packet(0x0437,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07ec,clif->pChangeDir,2,4);
+	packet(0x0802,clif->pTickSend,2);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085c,clif->pDull/*,XXX*/);
+	packet(0x0885,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0889,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0899,clif->pTakeItem,2);
+	packet(0x089b,clif->pHomMenu,2,4);
+	packet(0x08a6,clif->pMoveFromKafra,2,4);
+	packet(0x093b,clif->pDull/*,XXX*/);
+	packet(0x094d,clif->pDropItem,2,4);
+	packet(0x0958,clif->pStoragePassword,0);
+	packet(0x095b,clif->pMoveToKafra,2,4);
+	packet(0x0969,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-06-15aRagexe
 #if PACKETVER == 20160615
-	packet(0x0281,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0363,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0364,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0369,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x083c,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0866,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0870,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x087e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x087f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0884,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0887,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0888,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088a,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x088d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0891,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0898,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x092f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x093e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0947,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0948,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x094a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x094b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0954,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0957,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0958,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x095c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x095e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0961,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
+	packet(0x0281,clif->pFriendsListAdd,2);
+	packet(0x0363,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0364,clif->pStoragePassword,0);
+	packet(0x0369,clif->pHomMenu,2,4);
+	packet(0x083c,clif->pGetCharNameRequest,2);
+	packet(0x0866,clif->pWalkToXY,2);
+	packet(0x0870,clif->pDull/*,XXX*/);
+	packet(0x087d,clif->pSolveCharName,2);
+	packet(0x087e,clif->pTakeItem,2);
+	packet(0x087f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0884,clif->pDull/*,XXX*/);
+	packet(0x0887,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0888,clif->pUseSkillToId,2,4,6);
+	packet(0x088a,clif->pTickSend,2);
+	packet(0x088d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0891,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0898,clif->pDropItem,2,4);
+	packet(0x092f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x093e,clif->pPartyInvite2,2);
+	packet(0x0947,clif->pReqCloseBuyingStore,0);
+	packet(0x0948,clif->pActionRequest,2,6);
+	packet(0x094a,clif->pReqClickBuyingStore,2);
+	packet(0x094b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0954,clif->pChangeDir,2,4);
+	packet(0x0957,clif->pMoveToKafra,2,4);
+	packet(0x0958,clif->pMoveFromKafra,2,4);
+	packet(0x095c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x095e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0961,clif->pSearchStoreInfoListItemClick,2,6,10);
 #endif
 
 // 2016-06-22aRagexe
 #if PACKETVER == 20160622
-	packet(0x023b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x035f,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0361,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x07e4,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0861,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0865,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0867,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0880,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0887,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0890,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0891,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0892,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x089a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x089e,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a2,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a8,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x092f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0936,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0937,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x093b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x093f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0946,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0959,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0965,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0969,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
+	packet(0x023b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x035f,clif->pMoveFromKafra,2,4);
+	packet(0x0361,clif->pPartyInvite2,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x07e4,clif->pHomMenu,2,4);
+	packet(0x0861,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0865,clif->pDull/*,XXX*/);
+	packet(0x0867,clif->pDull/*,XXX*/);
+	packet(0x0880,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0887,clif->pReqCloseBuyingStore,0);
+	packet(0x0890,clif->pFriendsListAdd,2);
+	packet(0x0891,clif->pReqClickBuyingStore,2);
+	packet(0x0892,clif->pSearchStoreInfoNextPage,0);
+	packet(0x089a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x089e,clif->pActionRequest,2,6);
+	packet(0x08a2,clif->pSolveCharName,2);
+	packet(0x08a8,clif->pStoragePassword,0);
+	packet(0x091c,clif->pTakeItem,2);
+	packet(0x092d,clif->pTickSend,2);
+	packet(0x092f,clif->pUseSkillToId,2,4,6);
+	packet(0x0936,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0937,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x093b,clif->pMoveToKafra,2,4);
+	packet(0x093f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0946,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0959,clif->pGetCharNameRequest,2);
+	packet(0x0965,clif->pChangeDir,2,4);
+	packet(0x0969,clif->pDropItem,2,4);
 #endif
 
 // 2016-06-29aRagexe, 2016-06-30aRagexe
 #if PACKETVER == 20160629 || \
     PACKETVER == 20160630
-	packet(0x0202,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x022d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x035f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0363,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0368,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x085c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x085e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0860,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0861,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0863,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0867,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x086b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0881,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0885,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x088e,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0893,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x091e,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0922,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0925,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0926,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x093e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0946,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0948,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x094a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0957,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x095a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0968,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0969,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x096a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
+	packet(0x0202,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x022d,clif->pWalkToXY,2);
+	packet(0x035f,clif->pDull/*,XXX*/);
+	packet(0x0363,clif->pReqClickBuyingStore,2);
+	packet(0x0368,clif->pItemListWindowSelected,2,4,8);
+	packet(0x085c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x085e,clif->pDull/*,XXX*/);
+	packet(0x0860,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0861,clif->pDropItem,2,4);
+	packet(0x0863,clif->pSolveCharName,2);
+	packet(0x0867,clif->pStoragePassword,0);
+	packet(0x086b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0881,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0885,clif->pHomMenu,2,4);
+	packet(0x088e,clif->pGetCharNameRequest,2);
+	packet(0x0893,clif->pTickSend,2);
+	packet(0x091e,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0922,clif->pMoveFromKafra,2,4);
+	packet(0x0925,clif->pUseSkillToId,2,4,6);
+	packet(0x0926,clif->pPartyInvite2,2);
+	packet(0x093e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0946,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0948,clif->pChangeDir,2,4);
+	packet(0x094a,clif->pFriendsListAdd,2);
+	packet(0x0957,clif->pReqCloseBuyingStore,0);
+	packet(0x095a,clif->pActionRequest,2,6);
+	packet(0x0968,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0969,clif->pTakeItem,2);
+	packet(0x096a,clif->pMoveToKafra,2,4);
 #endif
 
 // 2016-07-06bRagexe
 #if PACKETVER == 20160706
-	packet(0x0362,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0436,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x085f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0860,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0869,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x086b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0884,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0886,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0889,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0892,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0899,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a4,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a5,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a8,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0918,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x091b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0924,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0926,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0927,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0929,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0939,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x093d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0944,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0945,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x094c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0952,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0957,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0958,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
+	packet(0x0362,clif->pSolveCharName,2);
+	packet(0x0436,clif->pReqClickBuyingStore,2);
+	packet(0x085f,clif->pPartyInvite2,2);
+	packet(0x0860,clif->pActionRequest,2,6);
+	packet(0x0869,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x086b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0884,clif->pFriendsListAdd,2);
+	packet(0x0886,clif->pDull/*,XXX*/);
+	packet(0x0889,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0892,clif->pHomMenu,2,4);
+	packet(0x0899,clif->pUseSkillToId,2,4,6);
+	packet(0x08a4,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08a5,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a8,clif->pTickSend,2);
+	packet(0x0918,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x091b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0924,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0926,clif->pChangeDir,2,4);
+	packet(0x0927,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0929,clif->pMoveFromKafra,2,4);
+	packet(0x092d,clif->pWalkToXY,2);
+	packet(0x0939,clif->pMoveToKafra,2,4);
+	packet(0x093d,clif->pDropItem,2,4);
+	packet(0x0944,clif->pDull/*,XXX*/);
+	packet(0x0945,clif->pGetCharNameRequest,2);
+	packet(0x094c,clif->pStoragePassword,0);
+	packet(0x0952,clif->pReqCloseBuyingStore,0);
+	packet(0x0957,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0958,clif->pTakeItem,2);
 #endif
 
 // 2016-07-13aRagexe, 2016-07-13bRagexe, 2016-07-13cRagexe, 2016-07-13dRagexe
 #if PACKETVER == 20160713
-	packet(0x022d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0363,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0364,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0838,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0860,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0865,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0869,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0875,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0877,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x087b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0883,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x088d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0892,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x089a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a2,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a4,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x091c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x091d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0921,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0922,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x092c,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0931,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0939,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0944,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0945,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0947,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0957,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x095b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
+	packet(0x022d,clif->pStoragePassword,0);
+	packet(0x0363,clif->pChangeDir,2,4);
+	packet(0x0364,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0838,clif->pTakeItem,2);
+	packet(0x0860,clif->pReqClickBuyingStore,2);
+	packet(0x0865,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0869,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0875,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0877,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x087b,clif->pTickSend,2);
+	packet(0x0883,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x088d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0892,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x089a,clif->pPartyInvite2,2);
+	packet(0x089f,clif->pDull/*,XXX*/);
+	packet(0x08a2,clif->pMoveFromKafra,2,4);
+	packet(0x08a4,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x091c,clif->pWalkToXY,2);
+	packet(0x091d,clif->pSolveCharName,2);
+	packet(0x0921,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0922,clif->pHomMenu,2,4);
+	packet(0x092c,clif->pGetCharNameRequest,2);
+	packet(0x0931,clif->pUseSkillToId,2,4,6);
+	packet(0x0939,clif->pFriendsListAdd,2);
+	packet(0x0944,clif->pReqCloseBuyingStore,0);
+	packet(0x0945,clif->pActionRequest,2,6);
+	packet(0x0947,clif->pMoveToKafra,2,4);
+	packet(0x0957,clif->pDropItem,2,4);
+	packet(0x095b,clif->pDull/*,XXX*/);
 #endif
 
 // 2016-07-20aRagexe, 2016-07-20bRagexe
 #if PACKETVER == 20160720
-	packet(0x0362,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0363,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0365,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x07e4,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0838,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x085b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x086a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x086d,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x087f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0883,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0887,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0897,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x089a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x089e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a0,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08aa,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0917,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x091c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x093b,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x093e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0946,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x094d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0953,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x095b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0960,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0969,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
+	packet(0x0362,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0363,clif->pUseSkillToId,2,4,6);
+	packet(0x0365,clif->pActionRequest,2,6);
+	packet(0x07e4,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0838,clif->pWalkToXY,2);
+	packet(0x085b,clif->pReqCloseBuyingStore,0);
+	packet(0x086a,clif->pSearchStoreInfoNextPage,0);
+	packet(0x086d,clif->pReqClickBuyingStore,2);
+	packet(0x087f,clif->pDropItem,2,4);
+	packet(0x0883,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0887,clif->pGetCharNameRequest,2);
+	packet(0x0897,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x089a,clif->pStoragePassword,0);
+	packet(0x089c,clif->pHomMenu,2,4);
+	packet(0x089e,clif->pMoveFromKafra,2,4);
+	packet(0x08a0,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08aa,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0917,clif->pDull/*,XXX*/);
+	packet(0x091c,clif->pTakeItem,2);
+	packet(0x092a,clif->pFriendsListAdd,2);
+	packet(0x093b,clif->pChangeDir,2,4);
+	packet(0x093e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0946,clif->pTickSend,2);
+	packet(0x094d,clif->pSolveCharName,2);
+	packet(0x0953,clif->pDull/*,XXX*/);
+	packet(0x095b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0960,clif->pMoveToKafra,2,4);
+	packet(0x0969,clif->pPartyInvite2,2);
 #endif
 
 // 2016-07-27aRagexe, 2016-07-27bRagexe
 #if PACKETVER == 20160727
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x023b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0362,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0363,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0436,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0438,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x07ec,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0866,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0868,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0869,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0874,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0877,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0883,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0887,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0891,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x089f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08a2,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a4,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a7,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0936,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0941,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0946,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0949,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0951,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x095f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0966,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0969,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x023b,clif->pDull/*,XXX*/);
+	packet(0x0362,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0363,clif->pFriendsListAdd,2);
+	packet(0x0436,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0438,clif->pTickSend,2);
+	packet(0x07ec,clif->pDropItem,2,4);
+	packet(0x0866,clif->pDull/*,XXX*/);
+	packet(0x0868,clif->pPartyInvite2,2);
+	packet(0x0869,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0874,clif->pReqClickBuyingStore,2);
+	packet(0x0877,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0883,clif->pActionRequest,2,6);
+	packet(0x0887,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088e,clif->pUseSkillToId,2,4,6);
+	packet(0x0891,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x089f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08a2,clif->pStoragePassword,0);
+	packet(0x08a4,clif->pSolveCharName,2);
+	packet(0x08a7,clif->pTakeItem,2);
+	packet(0x092e,clif->pWalkToXY,2);
+	packet(0x0936,clif->pHomMenu,2,4);
+	packet(0x0941,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0946,clif->pGetCharNameRequest,2);
+	packet(0x0949,clif->pMoveFromKafra,2,4);
+	packet(0x0951,clif->pMoveToKafra,2,4);
+	packet(0x095f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0966,clif->pReqCloseBuyingStore,0);
+	packet(0x0969,clif->pItemListWindowSelected,2,4,8);
 #endif
 
 // 2016-08-03bRagexe
 #if PACKETVER == 20160803
-	packet(0x0364,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x085d,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0878,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0881,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0886,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0887,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0888,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x088b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0891,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0895,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089e,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x08a1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x091b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0929,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0930,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0932,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0934,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0937,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x093a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093e,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x093f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0952,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0955,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0956,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0959,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x095a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x096a,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
+	packet(0x0364,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x085d,clif->pReqClickBuyingStore,2);
+	packet(0x0878,clif->pDull/*,XXX*/);
+	packet(0x087f,clif->pWalkToXY,2);
+	packet(0x0881,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0886,clif->pMoveToKafra,2,4);
+	packet(0x0887,clif->pGetCharNameRequest,2);
+	packet(0x0888,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x088b,clif->pReqCloseBuyingStore,0);
+	packet(0x0891,clif->pChangeDir,2,4);
+	packet(0x0895,clif->pFriendsListAdd,2);
+	packet(0x089c,clif->pDropItem,2,4);
+	packet(0x089e,clif->pSearchStoreInfoNextPage,0);
+	packet(0x08a1,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x091b,clif->pTakeItem,2);
+	packet(0x0929,clif->pStoragePassword,0);
+	packet(0x0930,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0932,clif->pUseSkillToId,2,4,6);
+	packet(0x0934,clif->pActionRequest,2,6);
+	packet(0x0937,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x093a,clif->pDull/*,XXX*/);
+	packet(0x093e,clif->pTickSend,2);
+	packet(0x093f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0952,clif->pHomMenu,2,4);
+	packet(0x0955,clif->pMoveFromKafra,2,4);
+	packet(0x0956,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0959,clif->pSolveCharName,2);
+	packet(0x095a,clif->pPartyInvite2,2);
+	packet(0x096a,clif->pReqTradeBuyingStore,2,4,8,12);
 #endif
 
 // 2016-08-10aRagexe
 #if PACKETVER == 20160810
-	packet(0x0361,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0819,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0838,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x085d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x085e,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x085f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0860,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x086f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0875,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0879,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x087a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0885,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0888,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0890,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x089d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x089f,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a9,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x091c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0926,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x092b,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x092d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0935,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0943,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x094b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0959,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x095b,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0967,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
+	packet(0x0361,clif->pStoragePassword,0);
+	packet(0x0819,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0838,clif->pPartyInvite2,2);
+	packet(0x085d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x085e,clif->pDropItem,2,4);
+	packet(0x085f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0860,clif->pSolveCharName,2);
+	packet(0x086f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0875,clif->pHomMenu,2,4);
+	packet(0x0879,clif->pReqClickBuyingStore,2);
+	packet(0x087a,clif->pWalkToXY,2);
+	packet(0x0885,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0888,clif->pFriendsListAdd,2);
+	packet(0x0890,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x089d,clif->pChangeDir,2,4);
+	packet(0x089f,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a9,clif->pMoveToKafra,2,4);
+	packet(0x091a,clif->pTakeItem,2);
+	packet(0x091b,clif->pGetCharNameRequest,2);
+	packet(0x091c,clif->pUseSkillToId,2,4,6);
+	packet(0x0926,clif->pDull/*,XXX*/);
+	packet(0x092b,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x092d,clif->pMoveFromKafra,2,4);
+	packet(0x0935,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0943,clif->pTickSend,2);
+	packet(0x094b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0959,clif->pReqCloseBuyingStore,0);
+	packet(0x095b,clif->pActionRequest,2,6);
+	packet(0x0967,clif->pDull/*,XXX*/);
 #endif
 
 // 2016-08-17aRagexe
 #if PACKETVER == 20160817
-	packet(0x0364,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0437,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x07e4,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0811,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0819,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x083c,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x085c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0867,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x086b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0875,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x087f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0886,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0891,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x089c,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08a5,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a6,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a9,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x08ab,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08ac,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08ad,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0929,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x092d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0930,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0939,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x093c,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0957,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0960,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0963,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x0364,clif->pReqClickBuyingStore,2);
+	packet(0x0437,clif->pFriendsListAdd,2);
+	packet(0x07e4,clif->pGetCharNameRequest,2);
+	packet(0x0811,clif->pDull/*,XXX*/);
+	packet(0x0819,clif->pTickSend,2);
+	packet(0x083c,clif->pItemListWindowSelected,2,4,8);
+	packet(0x085c,clif->pTakeItem,2);
+	packet(0x0867,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x086b,clif->pSolveCharName,2);
+	packet(0x0875,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x087f,clif->pDropItem,2,4);
+	packet(0x0886,clif->pActionRequest,2,6);
+	packet(0x0891,clif->pUseSkillToId,2,4,6);
+	packet(0x089c,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08a5,clif->pStoragePassword,0);
+	packet(0x08a6,clif->pPartyInvite2,2);
+	packet(0x08a9,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x08ab,clif->pHomMenu,2,4);
+	packet(0x08ac,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08ad,clif->pMoveToKafra,2,4);
+	packet(0x091b,clif->pReqCloseBuyingStore,0);
+	packet(0x0929,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x092d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0930,clif->pWalkToXY,2);
+	packet(0x0939,clif->pMoveFromKafra,2,4);
+	packet(0x093c,clif->pDull/*,XXX*/);
+	packet(0x0957,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0960,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0963,clif->pChangeDir,2,4);
 #endif
 
 // 2016-08-24aRagexe
 #if PACKETVER == 20160824
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0934,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0934,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-08-31aRagexe, 2016-08-31bRagexe
 #if PACKETVER == 20160831
-	packet(0x022d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0366,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x07ec,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0835,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0865,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x086d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0870,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0874,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0876,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0878,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x087c,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08a8,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08a9,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0917,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x092c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0938,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x093a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0946,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x094a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x094f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0950,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0954,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0957,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x095e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0960,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0964,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0967,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
+	packet(0x022d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0366,clif->pDropItem,2,4);
+	packet(0x07ec,clif->pReqClickBuyingStore,2);
+	packet(0x0835,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0865,clif->pWalkToXY,2);
+	packet(0x086d,clif->pReqCloseBuyingStore,0);
+	packet(0x0870,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0874,clif->pPartyInvite2,2);
+	packet(0x0876,clif->pDull/*,XXX*/);
+	packet(0x0878,clif->pActionRequest,2,6);
+	packet(0x087c,clif->pGetCharNameRequest,2);
+	packet(0x08a8,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08a9,clif->pTickSend,2);
+	packet(0x0917,clif->pStoragePassword,0);
+	packet(0x091b,clif->pDull/*,XXX*/);
+	packet(0x092c,clif->pFriendsListAdd,2);
+	packet(0x092e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0938,clif->pSearchStoreInfoNextPage,0);
+	packet(0x093a,clif->pHomMenu,2,4);
+	packet(0x0946,clif->pSolveCharName,2);
+	packet(0x094a,clif->pChangeDir,2,4);
+	packet(0x094f,clif->pMoveToKafra,2,4);
+	packet(0x0950,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0954,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0957,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x095e,clif->pMoveFromKafra,2,4);
+	packet(0x0960,clif->pTakeItem,2);
+	packet(0x0964,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0967,clif->pUseSkillToId,2,4,6);
 #endif
 
 // 2016-09-07aRagexe
 #if PACKETVER == 20160907
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x091c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x091c,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-09-13aRagexe
 #if PACKETVER == 20160913
-	packet(0x0361,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0817,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x085b,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0865,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0874,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0875,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0879,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x087a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0887,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0889,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x088e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0891,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0892,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x089b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x089c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0928,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0935,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x093a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0949,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x094a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0950,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0952,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0954,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0962,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0963,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0968,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
+	packet(0x0361,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0817,clif->pMoveToKafra,2,4);
+	packet(0x085b,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0865,clif->pGetCharNameRequest,2);
+	packet(0x0874,clif->pReqClickBuyingStore,2);
+	packet(0x0875,clif->pTickSend,2);
+	packet(0x0879,clif->pDropItem,2,4);
+	packet(0x087a,clif->pDull/*,XXX*/);
+	packet(0x087b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0887,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0889,clif->pTakeItem,2);
+	packet(0x088e,clif->pUseSkillToId,2,4,6);
+	packet(0x088f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0891,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0892,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x089b,clif->pMoveFromKafra,2,4);
+	packet(0x089c,clif->pStoragePassword,0);
+	packet(0x08a5,clif->pChangeDir,2,4);
+	packet(0x0928,clif->pFriendsListAdd,2);
+	packet(0x0935,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x093a,clif->pHomMenu,2,4);
+	packet(0x0949,clif->pPartyInvite2,2);
+	packet(0x094a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0950,clif->pActionRequest,2,6);
+	packet(0x0952,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0954,clif->pWalkToXY,2);
+	packet(0x0962,clif->pDull/*,XXX*/);
+	packet(0x0963,clif->pSolveCharName,2);
+	packet(0x0968,clif->pReqCloseBuyingStore,0);
 #endif
 
 // 2016-09-21aRagexe
 #if PACKETVER == 20160921
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x094a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x094a,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-09-28cRagexe
 #if PACKETVER == 20160928
-	packet(0x0202,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0366,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0436,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0811,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0838,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0864,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0866,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x086d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0872,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0878,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x087f,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0889,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0897,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x089a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a2,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a9,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0919,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x091e,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0927,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x092d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0944,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x094d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0953,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0955,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0957,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
+	packet(0x0202,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pGetCharNameRequest,2);
+	packet(0x0366,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0436,clif->pReqClickBuyingStore,2);
+	packet(0x0811,clif->pDull/*,XXX*/);
+	packet(0x0838,clif->pPartyInvite2,2);
+	packet(0x0864,clif->pMoveFromKafra,2,4);
+	packet(0x0866,clif->pSearchStoreInfoNextPage,0);
+	packet(0x086d,clif->pDropItem,2,4);
+	packet(0x0872,clif->pHomMenu,2,4);
+	packet(0x0878,clif->pSolveCharName,2);
+	packet(0x087f,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0889,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0897,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x089a,clif->pActionRequest,2,6);
+	packet(0x08a2,clif->pStoragePassword,0);
+	packet(0x08a9,clif->pMoveToKafra,2,4);
+	packet(0x0919,clif->pWalkToXY,2);
+	packet(0x091e,clif->pTickSend,2);
+	packet(0x0927,clif->pUseSkillToId,2,4,6);
+	packet(0x092d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0944,clif->pChangeDir,2,4);
+	packet(0x094d,clif->pReqCloseBuyingStore,0);
+	packet(0x094e,clif->pFriendsListAdd,2);
+	packet(0x0953,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0955,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0957,clif->pTakeItem,2);
+	packet(0x095a,clif->pDull/*,XXX*/);
 #endif
 
 // 2016-10-05aRagexe
 #if PACKETVER == 20161005
-	packet(0x0202,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0838,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0863,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0886,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0891,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0892,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x089b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a0,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08ac,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08ad,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0918,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0919,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x091e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x092b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0931,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0932,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x093b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0942,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0944,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0945,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x094a,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x094d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0952,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x095a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x095b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0967,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
+	packet(0x0202,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pActionRequest,2,6);
+	packet(0x0838,clif->pStoragePassword,0);
+	packet(0x0863,clif->pGetCharNameRequest,2);
+	packet(0x0886,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088e,clif->pMoveFromKafra,2,4);
+	packet(0x0891,clif->pChangeDir,2,4);
+	packet(0x0892,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x089b,clif->pPartyInvite2,2);
+	packet(0x089c,clif->pTakeItem,2);
+	packet(0x08a0,clif->pMoveToKafra,2,4);
+	packet(0x08ac,clif->pReqCloseBuyingStore,0);
+	packet(0x08ad,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0918,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0919,clif->pSolveCharName,2);
+	packet(0x091e,clif->pDull/*,XXX*/);
+	packet(0x092b,clif->pTickSend,2);
+	packet(0x0931,clif->pFriendsListAdd,2);
+	packet(0x0932,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x093b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0942,clif->pDropItem,2,4);
+	packet(0x0944,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0945,clif->pWalkToXY,2);
+	packet(0x094a,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x094d,clif->pHomMenu,2,4);
+	packet(0x0952,clif->pDull/*,XXX*/);
+	packet(0x095a,clif->pReqClickBuyingStore,2);
+	packet(0x095b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0967,clif->pUseSkillToId,2,4,6);
 #endif
 
 // 2016-10-12aRagexe
 #if PACKETVER == 20161012
-	packet(0x023b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0364,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0365,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0369,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x07ec,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0819,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x085b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x085e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0863,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0868,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0872,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0875,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0880,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0893,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a0,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x092d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0936,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0937,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0939,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0943,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0944,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x094f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0951,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x095c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0962,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0966,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0967,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
+	packet(0x023b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0364,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0365,clif->pTickSend,2);
+	packet(0x0369,clif->pPartyInvite2,2);
+	packet(0x07ec,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0819,clif->pFriendsListAdd,2);
+	packet(0x085b,clif->pDull/*,XXX*/);
+	packet(0x085e,clif->pReqCloseBuyingStore,0);
+	packet(0x0863,clif->pActionRequest,2,6);
+	packet(0x0868,clif->pTakeItem,2);
+	packet(0x086d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0872,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0875,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0880,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0893,clif->pMoveToKafra,2,4);
+	packet(0x08a0,clif->pChangeDir,2,4);
+	packet(0x092d,clif->pSolveCharName,2);
+	packet(0x0936,clif->pGetCharNameRequest,2);
+	packet(0x0937,clif->pReqClickBuyingStore,2);
+	packet(0x0939,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0943,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0944,clif->pMoveFromKafra,2,4);
+	packet(0x094f,clif->pDull/*,XXX*/);
+	packet(0x0951,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x095c,clif->pHomMenu,2,4);
+	packet(0x0962,clif->pUseSkillToId,2,4,6);
+	packet(0x0966,clif->pWalkToXY,2);
+	packet(0x0967,clif->pStoragePassword,0);
 #endif
 
 // 2016-10-19aRagexe
 #if PACKETVER == 20161019
-	packet(0x022d,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0361,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0889,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0892,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0946,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0963,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pReqClickBuyingStore,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pHomMenu,2,4);
+	packet(0x0361,clif->pWalkToXY,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pChangeDir,2,4);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0889,clif->pStoragePassword,0);
+	packet(0x0892,clif->pDull/*,XXX*/);
+	packet(0x0946,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0963,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-10-26bRagexe, 2016-10-26cRagexe
 #if PACKETVER == 20161026
-	packet(0x0363,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0438,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x085f,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0861,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0862,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x086a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x086c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x086e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x087c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0886,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0891,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0894,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0898,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x091a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x091b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0926,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x092c,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x092e,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x092f,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0930,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x094b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0953,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x095c,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x095e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0962,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x0363,clif->pStoragePassword,0);
+	packet(0x0438,clif->pWalkToXY,2);
+	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x085a,clif->pMoveToKafra,2,4);
+	packet(0x085f,clif->pActionRequest,2,6);
+	packet(0x0861,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0862,clif->pTickSend,2);
+	packet(0x086a,clif->pSearchStoreInfoNextPage,0);
+	packet(0x086c,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x086e,clif->pDull/*,XXX*/);
+	packet(0x087a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x087c,clif->pDull/*,XXX*/);
+	packet(0x087f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0886,clif->pDropItem,2,4);
+	packet(0x0891,clif->pReqClickBuyingStore,2);
+	packet(0x0894,clif->pUseSkillToId,2,4,6);
+	packet(0x0898,clif->pFriendsListAdd,2);
+	packet(0x091a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x091b,clif->pTakeItem,2);
+	packet(0x0926,clif->pSolveCharName,2);
+	packet(0x092c,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x092e,clif->pHomMenu,2,4);
+	packet(0x092f,clif->pReqCloseBuyingStore,0);
+	packet(0x0930,clif->pGetCharNameRequest,2);
+	packet(0x094b,clif->pMoveFromKafra,2,4);
+	packet(0x0953,clif->pPartyInvite2,2);
+	packet(0x095c,clif->pItemListWindowSelected,2,4,8);
+	packet(0x095e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0962,clif->pChangeDir,2,4);
 #endif
 
 // 2016-11-02aRagexe, 2016-11-03aRagexe
 #if PACKETVER == 20161102 || \
     PACKETVER == 20161103
-	packet(0x0361,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0367,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0436,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0802,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0838,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x083c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0869,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x086c,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x086f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0874,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0886,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x088f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0890,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a2,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08aa,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x091b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0922,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0925,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0928,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092f,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0936,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0946,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0949,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x095e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0964,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0965,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0966,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
+	packet(0x0361,clif->pMoveFromKafra,2,4);
+	packet(0x0367,clif->pDull/*,XXX*/);
+	packet(0x0436,clif->pActionRequest,2,6);
+	packet(0x0802,clif->pTakeItem,2);
+	packet(0x0838,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x083c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x085f,clif->pUseSkillToId,2,4,6);
+	packet(0x0869,clif->pMoveToKafra,2,4);
+	packet(0x086c,clif->pSearchStoreInfoNextPage,0);
+	packet(0x086f,clif->pDull/*,XXX*/);
+	packet(0x0874,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0886,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x088f,clif->pHomMenu,2,4);
+	packet(0x0890,clif->pDropItem,2,4);
+	packet(0x089f,clif->pPartyInvite2,2);
+	packet(0x08a2,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08aa,clif->pWalkToXY,2);
+	packet(0x091b,clif->pStoragePassword,0);
+	packet(0x0922,clif->pReqClickBuyingStore,2);
+	packet(0x0925,clif->pSolveCharName,2);
+	packet(0x0928,clif->pFriendsListAdd,2);
+	packet(0x092f,clif->pGetCharNameRequest,2);
+	packet(0x0936,clif->pReqCloseBuyingStore,0);
+	packet(0x0946,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0949,clif->pChangeDir,2,4);
+	packet(0x095e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0964,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0965,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0966,clif->pTickSend,2);
 #endif
 
 // 2016-11-09aRagexe, 2016-11-09bRagexe
 #if PACKETVER == 20161109
-	packet(0x02c4,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0361,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0362,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0366,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x085d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x085e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0865,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x086a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x086d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0870,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0876,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x087a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0881,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x088e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0891,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0898,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x089a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089d,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x089f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a7,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08ad,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0927,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0937,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x093c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x093f,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0954,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0956,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x02c4,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0361,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0362,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pTickSend,2);
+	packet(0x0366,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSolveCharName,2);
+	packet(0x085d,clif->pReqCloseBuyingStore,0);
+	packet(0x085e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0865,clif->pWalkToXY,2);
+	packet(0x086a,clif->pActionRequest,2,6);
+	packet(0x086d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0870,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0876,clif->pReqClickBuyingStore,2);
+	packet(0x087a,clif->pDull/*,XXX*/);
+	packet(0x0881,clif->pMoveToKafra,2,4);
+	packet(0x088e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0891,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0898,clif->pTakeItem,2);
+	packet(0x089a,clif->pDropItem,2,4);
+	packet(0x089d,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x089f,clif->pDull/*,XXX*/);
+	packet(0x08a7,clif->pHomMenu,2,4);
+	packet(0x08ad,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0927,clif->pPartyInvite2,2);
+	packet(0x0937,clif->pFriendsListAdd,2);
+	packet(0x093c,clif->pStoragePassword,0);
+	packet(0x093f,clif->pGetCharNameRequest,2);
+	packet(0x0954,clif->pUseSkillToId,2,4,6);
+	packet(0x0956,clif->pChangeDir,2,4);
 #endif
 
 // 2016-11-16aRagexe
 #if PACKETVER == 20161116
-	packet(0x0368,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0369,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0835,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x085f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0864,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x086f,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0885,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x088b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x088d,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x088f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0890,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0892,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0893,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a1,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a2,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08aa,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08ac,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0920,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0925,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x092a,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0931,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x093c,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x094a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0952,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0957,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x095b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x095d,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x095f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0967,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
+	packet(0x0368,clif->pTickSend,2);
+	packet(0x0369,clif->pMoveToKafra,2,4);
+	packet(0x0835,clif->pFriendsListAdd,2);
+	packet(0x085f,clif->pDropItem,2,4);
+	packet(0x0864,clif->pPartyInvite2,2);
+	packet(0x086f,clif->pTakeItem,2);
+	packet(0x0885,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x088b,clif->pHomMenu,2,4);
+	packet(0x088d,clif->pReqClickBuyingStore,2);
+	packet(0x088f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0890,clif->pWalkToXY,2);
+	packet(0x0892,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0893,clif->pActionRequest,2,6);
+	packet(0x08a1,clif->pChangeDir,2,4);
+	packet(0x08a2,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08aa,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08ac,clif->pMoveFromKafra,2,4);
+	packet(0x0920,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0925,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x092a,clif->pUseSkillToId,2,4,6);
+	packet(0x0931,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x093c,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x094a,clif->pGetCharNameRequest,2);
+	packet(0x0952,clif->pReqCloseBuyingStore,0);
+	packet(0x0957,clif->pSolveCharName,2);
+	packet(0x095b,clif->pStoragePassword,0);
+	packet(0x095d,clif->pDull/*,XXX*/);
+	packet(0x095f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0967,clif->pDull/*,XXX*/);
 #endif
 
 // 2016-11-23aRagexe
 #if PACKETVER == 20161123
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0362,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0437,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x085c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0861,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0862,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0866,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x086f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0871,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0880,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0882,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x088b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a9,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08aa,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x091a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0926,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x092a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x092f,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0930,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0941,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x094d,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x094f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x095a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x095b,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0962,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x096a,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0362,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0437,clif->pTickSend,2);
+	packet(0x085c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0861,clif->pWalkToXY,2);
+	packet(0x0862,clif->pReqCloseBuyingStore,0);
+	packet(0x0866,clif->pSearchStoreInfoNextPage,0);
+	packet(0x086f,clif->pDropItem,2,4);
+	packet(0x0871,clif->pDull/*,XXX*/);
+	packet(0x087f,clif->pPartyInvite2,2);
+	packet(0x0880,clif->pStoragePassword,0);
+	packet(0x0882,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x088b,clif->pGetCharNameRequest,2);
+	packet(0x089c,clif->pChangeDir,2,4);
+	packet(0x08a9,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08aa,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x091a,clif->pMoveToKafra,2,4);
+	packet(0x0926,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x092a,clif->pReqClickBuyingStore,2);
+	packet(0x092f,clif->pTakeItem,2);
+	packet(0x0930,clif->pHomMenu,2,4);
+	packet(0x0941,clif->pFriendsListAdd,2);
+	packet(0x094d,clif->pUseSkillToId,2,4,6);
+	packet(0x094f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x095a,clif->pDull/*,XXX*/);
+	packet(0x095b,clif->pActionRequest,2,6);
+	packet(0x0962,clif->pMoveFromKafra,2,4);
+	packet(0x096a,clif->pSolveCharName,2);
 #endif
 
 // 2016-11-30aRagexe, 2016-11-30bRagexe
 #if PACKETVER == 20161130
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0931,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0943,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0954,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0959,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pChangeDir,2,4);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pTickSend,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x088f,clif->pDull/*,XXX*/);
+	packet(0x0931,clif->pHomMenu,2,4);
+	packet(0x0943,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0954,clif->pStoragePassword,0);
+	packet(0x0959,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-12-07cRagexe, 2016-12-07eRagexe
 #if PACKETVER == 20161207
-	packet(0x023b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0867,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0868,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0875,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0886,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a1,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a2,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08ad,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0918,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x091d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0943,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x095d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0965,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pHomMenu,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0867,clif->pFriendsListAdd,2);
+	packet(0x0868,clif->pDull/*,XXX*/);
+	packet(0x0875,clif->pMoveToKafra,2,4);
+	packet(0x087e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0886,clif->pActionRequest,2,6);
+	packet(0x08a1,clif->pChangeDir,2,4);
+	packet(0x08a2,clif->pTakeItem,2);
+	packet(0x08ad,clif->pDropItem,2,4);
+	packet(0x0918,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x091d,clif->pMoveFromKafra,2,4);
+	packet(0x0943,clif->pDull/*,XXX*/);
+	packet(0x095d,clif->pStoragePassword,0);
+	packet(0x0965,clif->pPartyInvite2,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-12-14bRagexe, 2016-12-14cRagexe
 #if PACKETVER == 20161214
-	packet(0x022d,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0281,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x02c4,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0364,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0436,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0862,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x086d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0887,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0895,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0899,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a6,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x092e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x093d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pReqClickBuyingStore,2);
+	packet(0x0281,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x02c4,clif->pMoveFromKafra,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pHomMenu,2,4);
+	packet(0x0364,clif->pMoveToKafra,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0436,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pDull/*,XXX*/);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0862,clif->pFriendsListAdd,2);
+	packet(0x086d,clif->pPartyInvite2,2);
+	packet(0x0887,clif->pDropItem,2,4);
+	packet(0x0895,clif->pDull/*,XXX*/);
+	packet(0x0899,clif->pStoragePassword,0);
+	packet(0x08a6,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x092e,clif->pTakeItem,2);
+	packet(0x093d,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-12-21aRagexe, 2016-12-21bRagexe
 #if PACKETVER == 20161221
-	packet(0x035f,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0366,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0438,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0817,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x085b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0866,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0876,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0881,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0884,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0885,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088c,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0890,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0899,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x089a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x089b,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08aa,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x091e,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0926,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0928,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092c,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x092e,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0930,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0943,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0946,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x094b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x095a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0964,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0965,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x035f,clif->pTakeItem,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0366,clif->pSolveCharName,2);
+	packet(0x0438,clif->pWalkToXY,2);
+	packet(0x0817,clif->pMoveToKafra,2,4);
+	packet(0x085b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0866,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0876,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0881,clif->pGetCharNameRequest,2);
+	packet(0x0884,clif->pDull/*,XXX*/);
+	packet(0x0885,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088c,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0890,clif->pStoragePassword,0);
+	packet(0x0899,clif->pDull/*,XXX*/);
+	packet(0x089a,clif->pMoveFromKafra,2,4);
+	packet(0x089b,clif->pActionRequest,2,6);
+	packet(0x08aa,clif->pTickSend,2);
+	packet(0x091e,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0926,clif->pPartyInvite2,2);
+	packet(0x0928,clif->pFriendsListAdd,2);
+	packet(0x092c,clif->pReqCloseBuyingStore,0);
+	packet(0x092e,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0930,clif->pHomMenu,2,4);
+	packet(0x0943,clif->pUseSkillToId,2,4,6);
+	packet(0x0946,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x094b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x095a,clif->pReqClickBuyingStore,2);
+	packet(0x0964,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0965,clif->pChangeDir,2,4);
 #endif
 
 // 2016-12-28aRagexe
 #if PACKETVER == 20161228
-	packet(0x0362,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x085a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x085e,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0865,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x086a,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x086c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0870,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0871,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0875,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x087f,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0886,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0889,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0893,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a2,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a3,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08a5,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08ab,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08ac,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08ad,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0929,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x092c,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0934,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0935,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0938,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x093d,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0944,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
+	packet(0x0362,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x085a,clif->pGetCharNameRequest,2);
+	packet(0x085e,clif->pHomMenu,2,4);
+	packet(0x0865,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x086a,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x086c,clif->pTakeItem,2);
+	packet(0x086d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0870,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0871,clif->pChangeDir,2,4);
+	packet(0x0875,clif->pReqCloseBuyingStore,0);
+	packet(0x087f,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0886,clif->pWalkToXY,2);
+	packet(0x0889,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0893,clif->pDropItem,2,4);
+	packet(0x089f,clif->pMoveToKafra,2,4);
+	packet(0x08a2,clif->pUseSkillToId,2,4,6);
+	packet(0x08a3,clif->pReqClickBuyingStore,2);
+	packet(0x08a5,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08ab,clif->pMoveFromKafra,2,4);
+	packet(0x08ac,clif->pSolveCharName,2);
+	packet(0x08ad,clif->pStoragePassword,0);
+	packet(0x091c,clif->pFriendsListAdd,2);
+	packet(0x0929,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x092c,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0934,clif->pPartyInvite2,2);
+	packet(0x0935,clif->pDull/*,XXX*/);
+	packet(0x0938,clif->pDull/*,XXX*/);
+	packet(0x093d,clif->pActionRequest,2,6);
+	packet(0x0944,clif->pTickSend,2);
 #endif
 
 // 2017-01-04aRagexe
 #if PACKETVER == 20170104
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x085a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x087f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0896,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x085a,clif->pFriendsListAdd,2);
+	packet(0x087f,clif->pStoragePassword,0);
+	packet(0x0896,clif->pChangeDir,2,4);
+	packet(0x091b,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pUseSkillToId,2,4,6);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-01-11aRagexe
 #if PACKETVER == 20170111
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0877,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x087f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a1,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a3,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a6,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x091a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0940,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x094c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0961,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0969,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085d,clif->pHomMenu,2,4);
+	packet(0x0877,clif->pFriendsListAdd,2);
+	packet(0x087f,clif->pDull/*,XXX*/);
+	packet(0x088a,clif->pMoveToKafra,2,4);
+	packet(0x08a1,clif->pChangeDir,2,4);
+	packet(0x08a3,clif->pTakeItem,2);
+	packet(0x08a6,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x091a,clif->pStoragePassword,0);
+	packet(0x091b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0940,clif->pDropItem,2,4);
+	packet(0x094c,clif->pMoveFromKafra,2,4);
+	packet(0x0961,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0969,clif->pPartyInvite2,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-01-18aRagexe
 #if PACKETVER == 20170118
-	packet(0x022d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0364,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0862,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0865,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x086f,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0873,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x089e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08ad,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x091f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0927,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0933,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0958,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0962,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
+	packet(0x022d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0364,clif->pGetCharNameRequest,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pHomMenu,2,4);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0862,clif->pMoveFromKafra,2,4);
+	packet(0x0865,clif->pChangeDir,2,4);
+	packet(0x086f,clif->pTakeItem,2);
+	packet(0x0873,clif->pDull/*,XXX*/);
+	packet(0x089e,clif->pPartyInvite2,2);
+	packet(0x08ad,clif->pItemListWindowSelected,2,4,8);
+	packet(0x091f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0927,clif->pDull/*,XXX*/);
+	packet(0x0933,clif->pDropItem,2,4);
+	packet(0x0958,clif->pStoragePassword,0);
+	packet(0x0962,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pMoveToKafra,2,4);
 #endif
 
 // 2017-01-25aRagexe
 #if PACKETVER == 20170125
-	packet(0x0438,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x086e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0876,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0877,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0879,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x087d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0881,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0884,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0893,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0894,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0895,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0898,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x089b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x08a5,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x091b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x091c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0920,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0929,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x092b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0930,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x093c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0943,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0944,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x095c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0965,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0968,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
+	packet(0x0438,clif->pActionRequest,2,6);
+	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x086e,clif->pPartyInvite2,2);
+	packet(0x0876,clif->pHomMenu,2,4);
+	packet(0x0877,clif->pDropItem,2,4);
+	packet(0x0879,clif->pUseSkillToId,2,4,6);
+	packet(0x087b,clif->pTakeItem,2);
+	packet(0x087d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0881,clif->pChangeDir,2,4);
+	packet(0x0884,clif->pDull/*,XXX*/);
+	packet(0x0893,clif->pStoragePassword,0);
+	packet(0x0894,clif->pDull/*,XXX*/);
+	packet(0x0895,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0898,clif->pSolveCharName,2);
+	packet(0x089b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x08a5,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x091b,clif->pReqClickBuyingStore,2);
+	packet(0x091c,clif->pMoveToKafra,2,4);
+	packet(0x091d,clif->pReqCloseBuyingStore,0);
+	packet(0x0920,clif->pFriendsListAdd,2);
+	packet(0x0929,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x092b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0930,clif->pWalkToXY,2);
+	packet(0x093c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0943,clif->pTickSend,2);
+	packet(0x0944,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x095c,clif->pMoveFromKafra,2,4);
+	packet(0x0965,clif->pGetCharNameRequest,2);
+	packet(0x0968,clif->pSearchStoreInfoNextPage,0);
 #endif
 
 // 2017-02-01aRagexe
 #if PACKETVER == 20170201
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0815,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0875,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0879,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0881,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0884,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0885,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0886,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a4,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0919,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0920,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0938,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x094c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0966,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0969,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0815,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x085e,clif->pChangeDir,2,4);
+	packet(0x0875,clif->pTakeItem,2);
+	packet(0x0879,clif->pDull/*,XXX*/);
+	packet(0x0881,clif->pMoveToKafra,2,4);
+	packet(0x0884,clif->pWalkToXY,2);
+	packet(0x0885,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0886,clif->pStoragePassword,0);
+	packet(0x088b,clif->pDropItem,2,4);
+	packet(0x08a4,clif->pDull/*,XXX*/);
+	packet(0x0919,clif->pFriendsListAdd,2);
+	packet(0x0920,clif->pPartyInvite2,2);
+	packet(0x0938,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x094c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0966,clif->pMoveFromKafra,2,4);
+	packet(0x0969,clif->pItemListWindowSelected,2,4,8);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-02-08bRagexe
 #if PACKETVER == 20170208
-	packet(0x02c4,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0367,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085c,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0860,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0892,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a1,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08ac,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0921,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0923,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0932,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0937,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x02c4,clif->pDull/*,XXX*/);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0367,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085c,clif->pPartyInvite2,2);
+	packet(0x0860,clif->pChangeDir,2,4);
+	packet(0x087a,clif->pDull/*,XXX*/);
+	packet(0x088c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0892,clif->pFriendsListAdd,2);
+	packet(0x08a1,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08ac,clif->pMoveToKafra,2,4);
+	packet(0x0921,clif->pDropItem,2,4);
+	packet(0x0923,clif->pTakeItem,2);
+	packet(0x092d,clif->pHomMenu,2,4);
+	packet(0x0932,clif->pMoveFromKafra,2,4);
+	packet(0x0937,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-02-15aRagexe
 #if PACKETVER == 20170215
-	packet(0x02c4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x035f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0360,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x083c,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0876,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x087c,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x087d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0883,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0884,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x088b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x088c,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0890,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0896,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x089b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a2,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08a8,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x091c,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0925,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x092d,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0942,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094e,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x095f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0962,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0969,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
+	packet(0x02c4,clif->pStoragePassword,0);
+	packet(0x035f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0360,clif->pTickSend,2);
+	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x083c,clif->pActionRequest,2,6);
+	packet(0x085c,clif->pDropItem,2,4);
+	packet(0x0876,clif->pFriendsListAdd,2);
+	packet(0x087c,clif->pItemListWindowSelected,2,4,8);
+	packet(0x087d,clif->pChangeDir,2,4);
+	packet(0x087e,clif->pUseSkillToId,2,4,6);
+	packet(0x0883,clif->pSolveCharName,2);
+	packet(0x0884,clif->pDull/*,XXX*/);
+	packet(0x088a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x088b,clif->pPartyInvite2,2);
+	packet(0x088c,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0890,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0896,clif->pDull/*,XXX*/);
+	packet(0x089b,clif->pMoveToKafra,2,4);
+	packet(0x08a2,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08a8,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x091c,clif->pReqCloseBuyingStore,0);
+	packet(0x0925,clif->pMoveFromKafra,2,4);
+	packet(0x092b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x092d,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0942,clif->pTakeItem,2);
+	packet(0x094e,clif->pGetCharNameRequest,2);
+	packet(0x095f,clif->pReqClickBuyingStore,2);
+	packet(0x0962,clif->pHomMenu,2,4);
+	packet(0x0969,clif->pWalkToXY,2);
 #endif
 
 // 2017-02-22aRagexe
 #if PACKETVER == 20170222
-	packet(0x0202,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0866,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0870,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0871,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0877,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0889,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0894,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a3,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a8,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0937,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0939,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0943,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x095d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0962,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pHomMenu,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085f,clif->pFriendsListAdd,2);
+	packet(0x0866,clif->pDropItem,2,4);
+	packet(0x0870,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0871,clif->pDull/*,XXX*/);
+	packet(0x0877,clif->pDull/*,XXX*/);
+	packet(0x0889,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0894,clif->pTakeItem,2);
+	packet(0x08a3,clif->pChangeDir,2,4);
+	packet(0x08a8,clif->pPartyInvite2,2);
+	packet(0x0937,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0939,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0943,clif->pStoragePassword,0);
+	packet(0x095d,clif->pMoveToKafra,2,4);
+	packet(0x0962,clif->pMoveFromKafra,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-02-28aRagexe, 2017-02-28bRagexe
 #if PACKETVER == 20170228
-	packet(0x022d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0360,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0362,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0819,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x085e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0863,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x086b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0873,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0874,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0876,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0883,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0884,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0889,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0893,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089e,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a0,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a2,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a6,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a7,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x091f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x092a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0937,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x093e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0944,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0947,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0948,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0952,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0955,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x022d,clif->pDropItem,2,4);
+	packet(0x0360,clif->pActionRequest,2,6);
+	packet(0x0362,clif->pHomMenu,2,4);
+	packet(0x0819,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x085e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0863,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x086b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0873,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0874,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0876,clif->pReqCloseBuyingStore,0);
+	packet(0x0883,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0884,clif->pWalkToXY,2);
+	packet(0x0889,clif->pChangeDir,2,4);
+	packet(0x0893,clif->pGetCharNameRequest,2);
+	packet(0x089e,clif->pMoveToKafra,2,4);
+	packet(0x08a0,clif->pFriendsListAdd,2);
+	packet(0x08a2,clif->pStoragePassword,0);
+	packet(0x08a6,clif->pDull/*,XXX*/);
+	packet(0x08a7,clif->pReqClickBuyingStore,2);
+	packet(0x091f,clif->pUseSkillToId,2,4,6);
+	packet(0x092a,clif->pTakeItem,2);
+	packet(0x092e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0937,clif->pTickSend,2);
+	packet(0x093e,clif->pDull/*,XXX*/);
+	packet(0x0944,clif->pMoveFromKafra,2,4);
+	packet(0x0947,clif->pSolveCharName,2);
+	packet(0x0948,clif->pPartyInvite2,2);
+	packet(0x0952,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0955,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2017-03-08aRagexe
 #if PACKETVER == 20170308
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087d,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-03-15cRagexe
 #if PACKETVER == 20170315
-	packet(0x02c4,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x035f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0360,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0366,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0436,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x07ec,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x085c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0863,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x086a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0872,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x087b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0884,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x088b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x088d,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0892,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x089c,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08aa,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x091d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0920,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0922,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0944,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x094a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x094e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0950,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0952,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
+	packet(0x02c4,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x035f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0360,clif->pChangeDir,2,4);
+	packet(0x0366,clif->pTakeItem,2);
+	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0436,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x07ec,clif->pTickSend,2);
+	packet(0x085c,clif->pDull/*,XXX*/);
+	packet(0x0863,clif->pHomMenu,2,4);
+	packet(0x086a,clif->pMoveFromKafra,2,4);
+	packet(0x0872,clif->pFriendsListAdd,2);
+	packet(0x087b,clif->pPartyInvite2,2);
+	packet(0x0884,clif->pActionRequest,2,6);
+	packet(0x088b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x088d,clif->pDull/*,XXX*/);
+	packet(0x088f,clif->pWalkToXY,2);
+	packet(0x0892,clif->pUseSkillToId,2,4,6);
+	packet(0x089c,clif->pReqCloseBuyingStore,0);
+	packet(0x08aa,clif->pMoveToKafra,2,4);
+	packet(0x091a,clif->pDropItem,2,4);
+	packet(0x091b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x091d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0920,clif->pSolveCharName,2);
+	packet(0x0922,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0944,clif->pGetCharNameRequest,2);
+	packet(0x094a,clif->pReqClickBuyingStore,2);
+	packet(0x094e,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0950,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0952,clif->pStoragePassword,0);
 #endif
 
 // 2017-03-22aRagexe, 2017-03-22bRagexe
 #if PACKETVER == 20170322
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x091a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x091a,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-03-29bRagexe, 2017-03-29cRagexe
 #if PACKETVER == 20170329
-	packet(0x0281,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0363,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x087a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0888,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x08a8,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0917,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0926,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0929,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0937,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0939,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0949,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x095f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pPartyInvite2,2);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pHomMenu,2,4);
+	packet(0x0363,clif->pMoveToKafra,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085d,clif->pStoragePassword,0);
+	packet(0x087a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0888,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x08a8,clif->pDropItem,2,4);
+	packet(0x0917,clif->pDull/*,XXX*/);
+	packet(0x0926,clif->pChangeDir,2,4);
+	packet(0x0929,clif->pTakeItem,2);
+	packet(0x092e,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0937,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0939,clif->pFriendsListAdd,2);
+	packet(0x0949,clif->pMoveFromKafra,2,4);
+	packet(0x095f,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-04-05bRagexe, 2017-04-05cRagexe
 #if PACKETVER == 20170405
-	packet(0x022d,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0281,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0860,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0864,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0865,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x086f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0893,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a5,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x094c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0964,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0281,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pActionRequest,2,6);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pTakeItem,2);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pHomMenu,2,4);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085f,clif->pMoveToKafra,2,4);
+	packet(0x0860,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0864,clif->pPartyInvite2,2);
+	packet(0x0865,clif->pChangeDir,2,4);
+	packet(0x086f,clif->pFriendsListAdd,2);
+	packet(0x0893,clif->pMoveFromKafra,2,4);
+	packet(0x08a5,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x094c,clif->pStoragePassword,0);
+	packet(0x094f,clif->pDull/*,XXX*/);
+	packet(0x0964,clif->pDropItem,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-04-12aRagexe
 #if PACKETVER == 20170412
-	packet(0x023b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0365,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0863,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0869,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x086d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0878,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0879,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087b,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0890,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0893,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0898,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x089a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x089c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a1,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x091a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0929,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x092e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0938,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0942,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0945,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0949,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x094f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0952,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0959,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x095c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x095d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
+	packet(0x023b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0365,clif->pReqClickBuyingStore,2);
+	packet(0x0863,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0869,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x086d,clif->pMoveFromKafra,2,4);
+	packet(0x0878,clif->pWalkToXY,2);
+	packet(0x0879,clif->pDull/*,XXX*/);
+	packet(0x087b,clif->pUseSkillToId,2,4,6);
+	packet(0x088b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0890,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0893,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0898,clif->pSolveCharName,2);
+	packet(0x089a,clif->pHomMenu,2,4);
+	packet(0x089c,clif->pDropItem,2,4);
+	packet(0x08a1,clif->pActionRequest,2,6);
+	packet(0x091a,clif->pChangeDir,2,4);
+	packet(0x091e,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0929,clif->pTickSend,2);
+	packet(0x092e,clif->pDull/*,XXX*/);
+	packet(0x0938,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0942,clif->pFriendsListAdd,2);
+	packet(0x0945,clif->pMoveToKafra,2,4);
+	packet(0x0949,clif->pSearchStoreInfoNextPage,0);
+	packet(0x094f,clif->pPartyInvite2,2);
+	packet(0x0952,clif->pReqCloseBuyingStore,0);
+	packet(0x0959,clif->pTakeItem,2);
+	packet(0x095b,clif->pGetCharNameRequest,2);
+	packet(0x095c,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x095d,clif->pStoragePassword,0);
 #endif
 
 // 2017-04-19aRagexe
 #if PACKETVER == 20170419
-	packet(0x0811,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0819,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0838,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x085a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0862,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0868,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x086a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0872,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0881,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0897,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0898,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x089d,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08aa,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0920,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0922,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0930,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0931,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0935,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x093a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x093f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0942,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x095c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0963,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0965,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
+	packet(0x0811,clif->pChangeDir,2,4);
+	packet(0x0819,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0838,clif->pGetCharNameRequest,2);
+	packet(0x085a,clif->pActionRequest,2,6);
+	packet(0x085e,clif->pWalkToXY,2);
+	packet(0x0862,clif->pPartyInvite2,2);
+	packet(0x0868,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x086a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0872,clif->pDull/*,XXX*/);
+	packet(0x0881,clif->pStoragePassword,0);
+	packet(0x088d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088f,clif->pHomMenu,2,4);
+	packet(0x0897,clif->pDropItem,2,4);
+	packet(0x0898,clif->pTickSend,2);
+	packet(0x089d,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08aa,clif->pMoveToKafra,2,4);
+	packet(0x091b,clif->pSolveCharName,2);
+	packet(0x0920,clif->pUseSkillToId,2,4,6);
+	packet(0x0922,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0930,clif->pMoveFromKafra,2,4);
+	packet(0x0931,clif->pReqCloseBuyingStore,0);
+	packet(0x0935,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x093a,clif->pFriendsListAdd,2);
+	packet(0x093f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0942,clif->pSearchStoreInfoNextPage,0);
+	packet(0x095c,clif->pTakeItem,2);
+	packet(0x095d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0963,clif->pDull/*,XXX*/);
+	packet(0x0965,clif->pReqClickBuyingStore,2);
 #endif
 
 // 2017-04-26bRagexe
 #if PACKETVER == 20170426
-	packet(0x0281,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0866,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0887,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0899,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x089c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a2,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0927,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0940,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0958,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0963,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pStoragePassword,0);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0866,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086f,clif->pDull/*,XXX*/);
+	packet(0x087a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0887,clif->pSolveCharName,2);
+	packet(0x0899,clif->pMoveFromKafra,2,4);
+	packet(0x089c,clif->pHomMenu,2,4);
+	packet(0x08a2,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a4,clif->pTakeItem,2);
+	packet(0x091f,clif->pDull/*,XXX*/);
+	packet(0x0927,clif->pChangeDir,2,4);
+	packet(0x0940,clif->pDropItem,2,4);
+	packet(0x0958,clif->pFriendsListAdd,2);
+	packet(0x0963,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-05-02aRagexe, 2017-05-02bRagexe
 #if PACKETVER == 20170502
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0875,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0894,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x089c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x093c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0950,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0875,clif->pStoragePassword,0);
+	packet(0x0894,clif->pChangeDir,2,4);
+	packet(0x089c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x093c,clif->pFriendsListAdd,2);
+	packet(0x0950,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-05-17aRagexe
 #if PACKETVER == 20170517
-	packet(0x0364,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0367,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0437,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0815,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0817,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0868,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0875,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x087b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x087d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x088c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x088d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0894,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0896,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0899,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x089f,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08a2,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a8,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08aa,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091b,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0923,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x093b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0945,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0946,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0947,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0958,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0960,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0964,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
+	packet(0x0364,clif->pDull/*,XXX*/);
+	packet(0x0367,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0437,clif->pActionRequest,2,6);
+	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0815,clif->pUseSkillToId,2,4,6);
+	packet(0x0817,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0868,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0875,clif->pSearchStoreInfoNextPage,0);
+	packet(0x087b,clif->pSolveCharName,2);
+	packet(0x087d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x088c,clif->pMoveFromKafra,2,4);
+	packet(0x088d,clif->pChangeDir,2,4);
+	packet(0x0894,clif->pGetCharNameRequest,2);
+	packet(0x0896,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0899,clif->pPartyInvite2,2);
+	packet(0x089e,clif->pDull/*,XXX*/);
+	packet(0x089f,clif->pReqCloseBuyingStore,0);
+	packet(0x08a2,clif->pTickSend,2);
+	packet(0x08a8,clif->pWalkToXY,2);
+	packet(0x08aa,clif->pMoveToKafra,2,4);
+	packet(0x091b,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0923,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x093b,clif->pDropItem,2,4);
+	packet(0x0945,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0946,clif->pReqClickBuyingStore,2);
+	packet(0x0947,clif->pStoragePassword,0);
+	packet(0x0958,clif->pHomMenu,2,4);
+	packet(0x0960,clif->pFriendsListAdd,2);
+	packet(0x0964,clif->pTakeItem,2);
 #endif
 
 // 2017-05-24aRagexe, 2017-05-24bRagexe
 #if PACKETVER == 20170524
-	packet(0x0364,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0368,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0802,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x085e,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0860,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0864,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0866,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0868,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x086d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0873,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0874,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x087d,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0882,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x088d,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0894,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x089c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a1,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x091e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0923,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0925,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0934,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0946,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0958,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x095a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x095b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0964,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0967,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0968,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
+	packet(0x0364,clif->pPartyInvite2,2);
+	packet(0x0368,clif->pStoragePassword,0);
+	packet(0x0802,clif->pDropItem,2,4);
+	packet(0x085e,clif->pActionRequest,2,6);
+	packet(0x085f,clif->pReqClickBuyingStore,2);
+	packet(0x0860,clif->pTickSend,2);
+	packet(0x0864,clif->pTakeItem,2);
+	packet(0x0866,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0868,clif->pMoveToKafra,2,4);
+	packet(0x086d,clif->pHomMenu,2,4);
+	packet(0x0873,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0874,clif->pSearchStoreInfoNextPage,0);
+	packet(0x087d,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0882,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x088d,clif->pUseSkillToId,2,4,6);
+	packet(0x0894,clif->pMoveFromKafra,2,4);
+	packet(0x089c,clif->pWalkToXY,2);
+	packet(0x08a1,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x091e,clif->pDull/*,XXX*/);
+	packet(0x0923,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0925,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0934,clif->pChangeDir,2,4);
+	packet(0x0946,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0958,clif->pDull/*,XXX*/);
+	packet(0x095a,clif->pGetCharNameRequest,2);
+	packet(0x095b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0964,clif->pReqCloseBuyingStore,0);
+	packet(0x0967,clif->pFriendsListAdd,2);
+	packet(0x0968,clif->pSolveCharName,2);
 #endif
 
 // 2017-05-31aRagexe
 #if PACKETVER == 20170531
-	packet(0x0361,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0369,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x07e4,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x07ec,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0819,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x085b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x085f,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0861,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0868,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0873,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0875,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0878,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x087b,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0885,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x088d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0894,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x089a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x08ac,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x08ad,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x092d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0933,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0937,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0940,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0945,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0963,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0968,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
+	packet(0x0361,clif->pChangeDir,2,4);
+	packet(0x0369,clif->pUseSkillToId,2,4,6);
+	packet(0x07e4,clif->pWalkToXY,2);
+	packet(0x07ec,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0819,clif->pTickSend,2);
+	packet(0x085b,clif->pDull/*,XXX*/);
+	packet(0x085f,clif->pSolveCharName,2);
+	packet(0x0861,clif->pFriendsListAdd,2);
+	packet(0x0868,clif->pDull/*,XXX*/);
+	packet(0x0873,clif->pReqCloseBuyingStore,0);
+	packet(0x0875,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0878,clif->pPartyInvite2,2);
+	packet(0x087b,clif->pActionRequest,2,6);
+	packet(0x0885,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x088d,clif->pDropItem,2,4);
+	packet(0x0894,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x089a,clif->pStoragePassword,0);
+	packet(0x089c,clif->pHomMenu,2,4);
+	packet(0x08a2,clif->pSearchStoreInfoNextPage,0);
+	packet(0x08ac,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x08ad,clif->pMoveToKafra,2,4);
+	packet(0x092d,clif->pGetCharNameRequest,2);
+	packet(0x0933,clif->pMoveFromKafra,2,4);
+	packet(0x0937,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0940,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0945,clif->pReqClickBuyingStore,2);
+	packet(0x0963,clif->pTakeItem,2);
+	packet(0x0968,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
 #endif
 
 // 2017-06-07cRagexe
 #if PACKETVER == 20170607
-	packet(0x0361,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0364,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x07e4,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x085a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x085e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0862,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0863,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0864,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0871,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0873,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0875,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0885,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x088a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0897,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x089d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a9,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08ab,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0917,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0918,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0919,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0925,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0927,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0931,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0934,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0938,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x093d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0942,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0944,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0949,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
+	packet(0x0361,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0364,clif->pStoragePassword,0);
+	packet(0x07e4,clif->pTickSend,2);
+	packet(0x085a,clif->pChangeDir,2,4);
+	packet(0x085e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0862,clif->pGetCharNameRequest,2);
+	packet(0x0863,clif->pReqClickBuyingStore,2);
+	packet(0x0864,clif->pDropItem,2,4);
+	packet(0x0871,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0873,clif->pDull/*,XXX*/);
+	packet(0x0875,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0885,clif->pFriendsListAdd,2);
+	packet(0x088a,clif->pMoveFromKafra,2,4);
+	packet(0x0897,clif->pTakeItem,2);
+	packet(0x089d,clif->pMoveToKafra,2,4);
+	packet(0x08a9,clif->pUseSkillToId,2,4,6);
+	packet(0x08ab,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0917,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0918,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0919,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0925,clif->pPartyInvite2,2);
+	packet(0x0927,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0931,clif->pDull/*,XXX*/);
+	packet(0x0934,clif->pWalkToXY,2);
+	packet(0x0938,clif->pActionRequest,2,6);
+	packet(0x093d,clif->pReqCloseBuyingStore,0);
+	packet(0x0942,clif->pHomMenu,2,4);
+	packet(0x0944,clif->pSolveCharName,2);
+	packet(0x0949,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #endif
 
 // 2017-06-14bRagexe
 #if PACKETVER == 20170614
-	packet(0x023b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0361,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0364,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0367,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0437,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0838,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x083c,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0860,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0865,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0866,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0867,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x086b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x086c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0877,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0879,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x087e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0889,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0899,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a2,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08ad,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091b,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0928,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x092f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0936,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0944,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0957,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0963,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
+	packet(0x023b,clif->pMoveFromKafra,2,4);
+	packet(0x0361,clif->pWalkToXY,2);
+	packet(0x0364,clif->pHomMenu,2,4);
+	packet(0x0367,clif->pDropItem,2,4);
+	packet(0x0437,clif->pStoragePassword,0);
+	packet(0x0838,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x083c,clif->pActionRequest,2,6);
+	packet(0x0860,clif->pReqClickBuyingStore,2);
+	packet(0x0865,clif->pDull/*,XXX*/);
+	packet(0x0866,clif->pTickSend,2);
+	packet(0x0867,clif->pFriendsListAdd,2);
+	packet(0x086b,clif->pReqCloseBuyingStore,0);
+	packet(0x086c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0877,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0879,clif->pMoveToKafra,2,4);
+	packet(0x087d,clif->pSolveCharName,2);
+	packet(0x087e,clif->pChangeDir,2,4);
+	packet(0x0889,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0899,clif->pPartyInvite2,2);
+	packet(0x089d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a2,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08ad,clif->pTakeItem,2);
+	packet(0x091b,clif->pUseSkillToId,2,4,6);
+	packet(0x0928,clif->pSearchStoreInfoNextPage,0);
+	packet(0x092f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0936,clif->pGetCharNameRequest,2);
+	packet(0x0944,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0957,clif->pDull/*,XXX*/);
+	packet(0x0963,clif->pSearchStoreInfoListItemClick,2,6,10);
 #endif
 
 // 2017-06-21bRagexe
 #if PACKETVER == 20170621
-	packet(0x0202,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0365,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0366,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0802,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0885,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0889,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a8,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0956,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0957,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x095b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x095c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0961,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pTakeItem,2);
+	packet(0x0365,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0366,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pFriendsListAdd,2);
+	packet(0x0802,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085d,clif->pChangeDir,2,4);
+	packet(0x087d,clif->pDropItem,2,4);
+	packet(0x0885,clif->pPartyInvite2,2);
+	packet(0x0889,clif->pMoveFromKafra,2,4);
+	packet(0x08a8,clif->pHomMenu,2,4);
+	packet(0x0956,clif->pDull/*,XXX*/);
+	packet(0x0957,clif->pStoragePassword,0);
+	packet(0x095b,clif->pDull/*,XXX*/);
+	packet(0x095c,clif->pMoveToKafra,2,4);
+	packet(0x0961,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-06-28bRagexe
 #if PACKETVER == 20170628
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0863,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0863,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-07-05aRagexe
 #if PACKETVER == 20170705
-	packet(0x0202,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x02c4,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0879,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0886,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x088d,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x089d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x092f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0930,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0932,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0934,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x094c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pStoragePassword,0);
+	packet(0x02c4,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0879,clif->pMoveToKafra,2,4);
+	packet(0x0886,clif->pFriendsListAdd,2);
+	packet(0x088d,clif->pDull/*,XXX*/);
+	packet(0x088e,clif->pPartyInvite2,2);
+	packet(0x089a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x089d,clif->pDropItem,2,4);
+	packet(0x091a,clif->pChangeDir,2,4);
+	packet(0x092f,clif->pDull/*,XXX*/);
+	packet(0x0930,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0932,clif->pTakeItem,2);
+	packet(0x0934,clif->pMoveFromKafra,2,4);
+	packet(0x094c,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-07-12bRagexe
 #if PACKETVER == 20170712
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0944,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0944,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-07-19aRagexe
 #if PACKETVER == 20170719
-	packet(0x022d,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0367,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0368,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0369,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x07e4,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x085a,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x085e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0863,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x086e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x087d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0881,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0882,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0885,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0891,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0898,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x089a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x08a6,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a8,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x091b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091f,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x092c,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x092e,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x092f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x093d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x093e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0944,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0946,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0966,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
+	packet(0x022d,clif->pActionRequest,2,6);
+	packet(0x0367,clif->pReqCloseBuyingStore,0);
+	packet(0x0368,clif->pDull/*,XXX*/);
+	packet(0x0369,clif->pHomMenu,2,4);
+	packet(0x07e4,clif->pGetCharNameRequest,2);
+	packet(0x085a,clif->pTickSend,2);
+	packet(0x085e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0863,clif->pReqClickBuyingStore,2);
+	packet(0x086e,clif->pPartyInvite2,2);
+	packet(0x087d,clif->pTakeItem,2);
+	packet(0x0881,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0882,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0885,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0891,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0898,clif->pUseSkillToId,2,4,6);
+	packet(0x089a,clif->pStoragePassword,0);
+	packet(0x089d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x08a6,clif->pMoveFromKafra,2,4);
+	packet(0x08a8,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x091b,clif->pDropItem,2,4);
+	packet(0x091f,clif->pSolveCharName,2);
+	packet(0x092c,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x092e,clif->pSearchStoreInfoNextPage,0);
+	packet(0x092f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x093d,clif->pWalkToXY,2);
+	packet(0x093e,clif->pDull/*,XXX*/);
+	packet(0x0944,clif->pChangeDir,2,4);
+	packet(0x0946,clif->pFriendsListAdd,2);
+	packet(0x0966,clif->pMoveToKafra,2,4);
 #endif
 
 // 2017-07-26aRagexe
 #if PACKETVER == 20170726
-	packet(0x0363,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0364,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0369,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0438,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0838,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0873,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0874,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0878,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0881,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0888,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x088e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a3,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a7,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08aa,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08ab,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08ac,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x091d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x091e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x091f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0921,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0923,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0943,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x094f,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0950,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0952,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0954,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x095a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0963,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
+	packet(0x0363,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0364,clif->pMoveToKafra,2,4);
+	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0369,clif->pUseSkillToId,2,4,6);
+	packet(0x0438,clif->pPartyInvite2,2);
+	packet(0x0838,clif->pReqCloseBuyingStore,0);
+	packet(0x0873,clif->pReqClickBuyingStore,2);
+	packet(0x0874,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0878,clif->pActionRequest,2,6);
+	packet(0x0881,clif->pDull/*,XXX*/);
+	packet(0x0888,clif->pSearchStoreInfoNextPage,0);
+	packet(0x088e,clif->pWalkToXY,2);
+	packet(0x08a3,clif->pDull/*,XXX*/);
+	packet(0x08a7,clif->pStoragePassword,0);
+	packet(0x08aa,clif->pGetCharNameRequest,2);
+	packet(0x08ab,clif->pTakeItem,2);
+	packet(0x08ac,clif->pTickSend,2);
+	packet(0x091d,clif->pFriendsListAdd,2);
+	packet(0x091e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x091f,clif->pHomMenu,2,4);
+	packet(0x0921,clif->pSolveCharName,2);
+	packet(0x0923,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0943,clif->pDropItem,2,4);
+	packet(0x094f,clif->pMoveFromKafra,2,4);
+	packet(0x0950,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0952,clif->pChangeDir,2,4);
+	packet(0x0954,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x095a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0963,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
 #endif
 
 // 2017-08-01aRagexe, 2017-08-01bRagexe
 #if PACKETVER == 20170801
-	packet(0x022d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0281,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0362,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a6,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x094f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pDropItem,2,4);
+	packet(0x0281,clif->pChangeDir,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0362,clif->pHomMenu,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087d,clif->pStoragePassword,0);
+	packet(0x08a6,clif->pDull/*,XXX*/);
+	packet(0x094f,clif->pFriendsListAdd,2);
+	packet(0x095a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-08-09cRagexe
 #if PACKETVER == 20170809
-	packet(0x022d,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0281,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0364,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0366,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0367,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x07e4,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0802,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0835,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0868,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x086e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x086f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0876,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x087d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0880,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x088c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0890,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0892,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0895,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0899,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a3,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08a6,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0918,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0921,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x092a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x092b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0931,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0939,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x093b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0940,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x022d,clif->pDull/*,XXX*/);
+	packet(0x0281,clif->pMoveFromKafra,2,4);
+	packet(0x0364,clif->pPartyInvite2,2);
+	packet(0x0366,clif->pFriendsListAdd,2);
+	packet(0x0367,clif->pReqCloseBuyingStore,0);
+	packet(0x07e4,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0802,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0835,clif->pDropItem,2,4);
+	packet(0x0868,clif->pActionRequest,2,6);
+	packet(0x086e,clif->pChangeDir,2,4);
+	packet(0x086f,clif->pHomMenu,2,4);
+	packet(0x0876,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x087d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0880,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x088c,clif->pUseSkillToId,2,4,6);
+	packet(0x0890,clif->pStoragePassword,0);
+	packet(0x0892,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0895,clif->pWalkToXY,2);
+	packet(0x0899,clif->pDull/*,XXX*/);
+	packet(0x08a3,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08a6,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0918,clif->pTakeItem,2);
+	packet(0x0921,clif->pMoveToKafra,2,4);
+	packet(0x092a,clif->pGetCharNameRequest,2);
+	packet(0x092b,clif->pTickSend,2);
+	packet(0x0931,clif->pSolveCharName,2);
+	packet(0x0939,clif->pReqClickBuyingStore,2);
+	packet(0x093b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0940,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2017-08-16cRagexe, 2017-08-16dRagexe
 #if PACKETVER == 20170816
-	packet(0x022d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x035f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0361,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0362,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0438,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085a,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0862,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0864,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x087e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0881,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0882,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0884,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0888,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0889,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a3,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a7,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a9,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08ac,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x091c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0921,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0925,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092c,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x093a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x093d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0940,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0941,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0950,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0959,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0960,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
+	packet(0x022d,clif->pGetCharNameRequest,2);
+	packet(0x035f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0361,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0362,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0438,clif->pActionRequest,2,6);
+	packet(0x085a,clif->pSolveCharName,2);
+	packet(0x0862,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0864,clif->pReqCloseBuyingStore,0);
+	packet(0x087e,clif->pTakeItem,2);
+	packet(0x0881,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0882,clif->pStoragePassword,0);
+	packet(0x0884,clif->pDull/*,XXX*/);
+	packet(0x0888,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0889,clif->pTickSend,2);
+	packet(0x08a3,clif->pFriendsListAdd,2);
+	packet(0x08a7,clif->pDull/*,XXX*/);
+	packet(0x08a9,clif->pWalkToXY,2);
+	packet(0x08ac,clif->pHomMenu,2,4);
+	packet(0x091c,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0921,clif->pReqClickBuyingStore,2);
+	packet(0x0925,clif->pMoveFromKafra,2,4);
+	packet(0x092c,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x093a,clif->pPartyInvite2,2);
+	packet(0x093d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0940,clif->pUseSkillToId,2,4,6);
+	packet(0x0941,clif->pDropItem,2,4);
+	packet(0x0950,clif->pChangeDir,2,4);
+	packet(0x0959,clif->pMoveToKafra,2,4);
+	packet(0x0960,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
 #endif
 
 // 2017-08-23aRagexe
 #if PACKETVER == 20170823
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x086d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08ac,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pPartyInvite2,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pChangeDir,2,4);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x086d,clif->pStoragePassword,0);
+	packet(0x08ac,clif->pFriendsListAdd,2);
+	packet(0x095b,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-08-30aRagexe, 2017-08-30bRagexe
 #if PACKETVER == 20170830
-	packet(0x0281,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x02c4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0363,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0364,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0860,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0865,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x086a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0875,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0884,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0885,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0888,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0899,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x089e,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a2,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091e,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0921,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0925,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x092e,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0939,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x093e,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0940,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0942,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0943,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0947,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0951,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0959,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
+	packet(0x0281,clif->pChangeDir,2,4);
+	packet(0x02c4,clif->pTakeItem,2);
+	packet(0x0363,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0364,clif->pDull/*,XXX*/);
+	packet(0x0860,clif->pReqCloseBuyingStore,0);
+	packet(0x0865,clif->pWalkToXY,2);
+	packet(0x086a,clif->pPartyInvite2,2);
+	packet(0x0875,clif->pDull/*,XXX*/);
+	packet(0x0884,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0885,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0888,clif->pUseSkillToId,2,4,6);
+	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0899,clif->pDropItem,2,4);
+	packet(0x089a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x089e,clif->pMoveToKafra,2,4);
+	packet(0x08a2,clif->pStoragePassword,0);
+	packet(0x08a8,clif->pMoveFromKafra,2,4);
+	packet(0x091e,clif->pTickSend,2);
+	packet(0x0921,clif->pHomMenu,2,4);
+	packet(0x0925,clif->pReqClickBuyingStore,2);
+	packet(0x092e,clif->pGetCharNameRequest,2);
+	packet(0x0939,clif->pFriendsListAdd,2);
+	packet(0x093e,clif->pActionRequest,2,6);
+	packet(0x0940,clif->pSolveCharName,2);
+	packet(0x0942,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0943,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0947,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0951,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0959,clif->pUseSkillToPos,2,4,6,8);
 #endif
 
 // 2017-09-06cRagexe
 #if PACKETVER == 20170906
-	packet(0x0202,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0281,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x02c4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0860,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0866,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086c,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a2,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a3,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a7,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x091a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091e,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0953,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pDull/*,XXX*/);
+	packet(0x0281,clif->pStoragePassword,0);
+	packet(0x02c4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pPartyInvite2,2);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pChangeDir,2,4);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0860,clif->pDropItem,2,4);
+	packet(0x0866,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086c,clif->pDull/*,XXX*/);
+	packet(0x087b,clif->pMoveToKafra,2,4);
+	packet(0x08a2,clif->pMoveFromKafra,2,4);
+	packet(0x08a3,clif->pFriendsListAdd,2);
+	packet(0x08a7,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x091a,clif->pTakeItem,2);
+	packet(0x091e,clif->pHomMenu,2,4);
+	packet(0x0953,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-09-13cRagexe
 #if PACKETVER == 20170913
-	packet(0x0281,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x035f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0437,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x07e4,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0817,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0835,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x085a,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0860,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0865,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0866,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x088c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0890,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0891,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0892,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08a7,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08aa,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08ab,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08ac,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ad,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x091b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x091d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0920,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0923,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0925,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0927,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x095a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x095c,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
+	packet(0x0281,clif->pGetCharNameRequest,2);
+	packet(0x035f,clif->pFriendsListAdd,2);
+	packet(0x0437,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x07e4,clif->pMoveFromKafra,2,4);
+	packet(0x0817,clif->pActionRequest,2,6);
+	packet(0x0835,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x085a,clif->pReqCloseBuyingStore,0);
+	packet(0x0860,clif->pTakeItem,2);
+	packet(0x0865,clif->pPartyInvite2,2);
+	packet(0x0866,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x088c,clif->pHomMenu,2,4);
+	packet(0x0890,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0891,clif->pMoveToKafra,2,4);
+	packet(0x0892,clif->pStoragePassword,0);
+	packet(0x08a6,clif->pReqClickBuyingStore,2);
+	packet(0x08a7,clif->pDull/*,XXX*/);
+	packet(0x08aa,clif->pUseSkillToId,2,4,6);
+	packet(0x08ab,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08ac,clif->pChangeDir,2,4);
+	packet(0x08ad,clif->pItemListWindowSelected,2,4,8);
+	packet(0x091b,clif->pTickSend,2);
+	packet(0x091d,clif->pDropItem,2,4);
+	packet(0x091e,clif->pDull/*,XXX*/);
+	packet(0x0920,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0923,clif->pWalkToXY,2);
+	packet(0x0925,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0927,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x095a,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x095c,clif->pSolveCharName,2);
 #endif
 
 // 2017-09-20aRagexe
 #if PACKETVER == 20170920
-	packet(0x0369,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0436,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x07ec,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x085a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0861,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0862,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0864,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0865,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x086a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x086c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0874,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0875,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0889,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x088e,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x089b,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0919,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x091e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0921,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0923,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0926,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x092e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0937,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0939,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0945,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x095d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0961,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0966,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x096a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
+	packet(0x0369,clif->pTakeItem,2);
+	packet(0x0436,clif->pItemListWindowSelected,2,4,8);
+	packet(0x07ec,clif->pMoveFromKafra,2,4);
+	packet(0x085a,clif->pWalkToXY,2);
+	packet(0x0861,clif->pFriendsListAdd,2);
+	packet(0x0862,clif->pUseSkillToId,2,4,6);
+	packet(0x0864,clif->pStoragePassword,0);
+	packet(0x0865,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x086a,clif->pPartyInvite2,2);
+	packet(0x086c,clif->pDropItem,2,4);
+	packet(0x0874,clif->pReqCloseBuyingStore,0);
+	packet(0x0875,clif->pDull/*,XXX*/);
+	packet(0x0889,clif->pGetCharNameRequest,2);
+	packet(0x088e,clif->pTickSend,2);
+	packet(0x089b,clif->pActionRequest,2,6);
+	packet(0x0919,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x091e,clif->pDull/*,XXX*/);
+	packet(0x0921,clif->pSolveCharName,2);
+	packet(0x0923,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0926,clif->pMoveToKafra,2,4);
+	packet(0x092e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0937,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0939,clif->pChangeDir,2,4);
+	packet(0x0945,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x094c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x095d,clif->pHomMenu,2,4);
+	packet(0x0961,clif->pReqClickBuyingStore,2);
+	packet(0x0966,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x096a,clif->pSearchStoreInfoNextPage,0);
 #endif
 
 // 2017-09-27bRagexe, 2017-09-27cRagexe, 2017-09-27dRagexe
 #if PACKETVER == 20170927
-	packet(0x02c4,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x035f,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0361,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0362,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x085c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0873,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0875,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x087d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x087e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x088b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0899,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x089a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a3,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08a5,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a6,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08ad,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x091e,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0922,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0923,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0927,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x093b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0942,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0945,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x094b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x094d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0959,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x095a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
+	packet(0x02c4,clif->pHomMenu,2,4);
+	packet(0x035f,clif->pGetCharNameRequest,2);
+	packet(0x0361,clif->pDull/*,XXX*/);
+	packet(0x0362,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x085c,clif->pUseSkillToId,2,4,6);
+	packet(0x0873,clif->pSolveCharName,2);
+	packet(0x0875,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x087d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x087e,clif->pChangeDir,2,4);
+	packet(0x088b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0899,clif->pActionRequest,2,6);
+	packet(0x089a,clif->pStoragePassword,0);
+	packet(0x089b,clif->pMoveFromKafra,2,4);
+	packet(0x08a3,clif->pReqCloseBuyingStore,0);
+	packet(0x08a5,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a6,clif->pDull/*,XXX*/);
+	packet(0x08ad,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x091e,clif->pReqClickBuyingStore,2);
+	packet(0x0922,clif->pPartyInvite2,2);
+	packet(0x0923,clif->pDropItem,2,4);
+	packet(0x0927,clif->pWalkToXY,2);
+	packet(0x093b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0942,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0945,clif->pTickSend,2);
+	packet(0x094b,clif->pFriendsListAdd,2);
+	packet(0x094d,clif->pTakeItem,2);
+	packet(0x0959,clif->pMoveToKafra,2,4);
+	packet(0x095a,clif->pUseSkillToPos,2,4,6,8);
 #endif
 
 // 2017-10-02cRagexe
 #if PACKETVER == 20171002
-	packet(0x022d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0363,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0885,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0897,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0899,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0928,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x092d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0934,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x093b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x093d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x093e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0943,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x095f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pDropItem,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0363,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pHomMenu,2,4);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0885,clif->pMoveToKafra,2,4);
+	packet(0x0897,clif->pChangeDir,2,4);
+	packet(0x0899,clif->pFriendsListAdd,2);
+	packet(0x089d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0928,clif->pItemListWindowSelected,2,4,8);
+	packet(0x092d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0934,clif->pStoragePassword,0);
+	packet(0x093b,clif->pMoveFromKafra,2,4);
+	packet(0x093d,clif->pTakeItem,2);
+	packet(0x093e,clif->pDull/*,XXX*/);
+	packet(0x0943,clif->pPartyInvite2,2);
+	packet(0x095f,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-10-11aRagexe, 2017-10-11bRagexe
 #if PACKETVER == 20171011
-	packet(0x023b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0882,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0950,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0954,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pWalkToXY,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pStoragePassword,0);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087b,clif->pFriendsListAdd,2);
+	packet(0x0882,clif->pHomMenu,2,4);
+	packet(0x0950,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0954,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-10-18aRagexe
 #if PACKETVER == 20171018
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0363,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0364,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087e,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0889,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x089a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a6,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0938,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0944,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x094f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0363,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0364,clif->pMoveToKafra,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pTakeItem,2);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086a,clif->pDull/*,XXX*/);
+	packet(0x087a,clif->pDull/*,XXX*/);
+	packet(0x087e,clif->pHomMenu,2,4);
+	packet(0x0889,clif->pMoveFromKafra,2,4);
+	packet(0x089a,clif->pDropItem,2,4);
+	packet(0x089f,clif->pPartyInvite2,2);
+	packet(0x08a6,clif->pChangeDir,2,4);
+	packet(0x0938,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0944,clif->pStoragePassword,0);
+	packet(0x094a,clif->pFriendsListAdd,2);
+	packet(0x094f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-10-25bRagexe, 2017-10-25cRagexe, 2017-10-25dRagexe, 2017-10-25eRagexe
 #if PACKETVER == 20171025
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a2,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x08a2,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-11-01aRagexe
 #if PACKETVER == 20171101
-	packet(0x022d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0368,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0369,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0438,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0835,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x085b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0860,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x086c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0872,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0876,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0886,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088e,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0890,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0895,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0899,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x089c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a0,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08ab,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08ad,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x091b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0939,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x094a,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0957,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x095a,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0962,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0966,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
+	packet(0x022d,clif->pStoragePassword,0);
+	packet(0x0368,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0369,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0438,clif->pTickSend,2);
+	packet(0x0835,clif->pDropItem,2,4);
+	packet(0x085b,clif->pHomMenu,2,4);
+	packet(0x0860,clif->pGetCharNameRequest,2);
+	packet(0x086c,clif->pUseSkillToId,2,4,6);
+	packet(0x0872,clif->pFriendsListAdd,2);
+	packet(0x0876,clif->pChangeDir,2,4);
+	packet(0x0886,clif->pDull/*,XXX*/);
+	packet(0x088e,clif->pReqClickBuyingStore,2);
+	packet(0x0890,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0895,clif->pDull/*,XXX*/);
+	packet(0x0899,clif->pPartyInvite2,2);
+	packet(0x089b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x089c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08a0,clif->pMoveFromKafra,2,4);
+	packet(0x08ab,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08ad,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x091b,clif->pMoveToKafra,2,4);
+	packet(0x0939,clif->pWalkToXY,2);
+	packet(0x094a,clif->pReqCloseBuyingStore,0);
+	packet(0x094d,clif->pSolveCharName,2);
+	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0957,clif->pActionRequest,2,6);
+	packet(0x095a,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0962,clif->pTakeItem,2);
+	packet(0x0966,clif->pUseSkillToPos,2,4,6,8);
 #endif
 
 // 2017-11-08aRagexe
 #if PACKETVER == 20171108
-	packet(0x0202,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0361,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x07e4,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0815,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0819,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0838,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x085d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0863,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0878,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x087e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0884,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0896,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0897,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x08a2,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a9,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08ad,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x091d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x091f,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0940,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0941,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0945,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0947,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0949,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x094e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0958,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x095a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0963,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0965,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0967,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
+	packet(0x0202,clif->pTickSend,2);
+	packet(0x0361,clif->pSearchStoreInfoNextPage,0);
+	packet(0x07e4,clif->pSolveCharName,2);
+	packet(0x0815,clif->pStoragePassword,0);
+	packet(0x0819,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0838,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x085d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0863,clif->pWalkToXY,2);
+	packet(0x0878,clif->pFriendsListAdd,2);
+	packet(0x087e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0884,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0896,clif->pDull/*,XXX*/);
+	packet(0x0897,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x08a2,clif->pUseSkillToId,2,4,6);
+	packet(0x08a9,clif->pHomMenu,2,4);
+	packet(0x08ad,clif->pGetCharNameRequest,2);
+	packet(0x091d,clif->pReqCloseBuyingStore,0);
+	packet(0x091f,clif->pChangeDir,2,4);
+	packet(0x0940,clif->pReqClickBuyingStore,2);
+	packet(0x0941,clif->pMoveToKafra,2,4);
+	packet(0x0945,clif->pTakeItem,2);
+	packet(0x0947,clif->pDull/*,XXX*/);
+	packet(0x0949,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x094e,clif->pPartyInvite2,2);
+	packet(0x0958,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x095a,clif->pMoveFromKafra,2,4);
+	packet(0x0963,clif->pActionRequest,2,6);
+	packet(0x0965,clif->pDropItem,2,4);
+	packet(0x0967,clif->pUseSkillToPos,2,4,6,8);
 #endif
 
 // 2017-11-15aRagexe
 #if PACKETVER == 20171115
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0365,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086d,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x086f,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x087e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0883,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0890,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0898,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a4,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0926,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0958,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0365,clif->pDropItem,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pReqClickBuyingStore,2);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pFriendsListAdd,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086d,clif->pDull/*,XXX*/);
+	packet(0x086f,clif->pItemListWindowSelected,2,4,8);
+	packet(0x087e,clif->pMoveFromKafra,2,4);
+	packet(0x0883,clif->pDull/*,XXX*/);
+	packet(0x088b,clif->pMoveToKafra,2,4);
+	packet(0x0890,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0898,clif->pStoragePassword,0);
+	packet(0x08a4,clif->pChangeDir,2,4);
+	packet(0x0926,clif->pTakeItem,2);
+	packet(0x0958,clif->pHomMenu,2,4);
+	packet(0x095a,clif->pPartyInvite2,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-11-22aRagexe
 #if PACKETVER == 20171122
-	packet(0x0281,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x02c4,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x035f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0838,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x083c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x085b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0862,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0867,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0877,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0885,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0890,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0891,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0893,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0897,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0898,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x089e,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a6,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08a9,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x091e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0920,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0923,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0934,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x093b,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0945,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0946,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0947,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0962,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0968,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
+	packet(0x0281,clif->pSolveCharName,2);
+	packet(0x02c4,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x035f,clif->pDull/*,XXX*/);
+	packet(0x0838,clif->pMoveToKafra,2,4);
+	packet(0x083c,clif->pHomMenu,2,4);
+	packet(0x085b,clif->pGetCharNameRequest,2);
+	packet(0x0862,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0867,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0877,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0885,clif->pDull/*,XXX*/);
+	packet(0x0890,clif->pTickSend,2);
+	packet(0x0891,clif->pTakeItem,2);
+	packet(0x0893,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0897,clif->pChangeDir,2,4);
+	packet(0x0898,clif->pDropItem,2,4);
+	packet(0x089a,clif->pMoveFromKafra,2,4);
+	packet(0x089e,clif->pActionRequest,2,6);
+	packet(0x08a6,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08a9,clif->pReqClickBuyingStore,2);
+	packet(0x091e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0920,clif->pReqCloseBuyingStore,0);
+	packet(0x0923,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0934,clif->pStoragePassword,0);
+	packet(0x093b,clif->pUseSkillToId,2,4,6);
+	packet(0x0945,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0946,clif->pFriendsListAdd,2);
+	packet(0x0947,clif->pWalkToXY,2);
+	packet(0x0962,clif->pPartyInvite2,2);
+	packet(0x0968,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #endif
 
 // 2017-11-29aRagexe
 #if PACKETVER == 20171129
-	packet(0x02c4,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x035f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0363,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0365,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0862,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0876,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0878,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x089c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a5,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0940,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x094b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0953,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0966,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x02c4,clif->pChangeDir,2,4);
+	packet(0x035f,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0363,clif->pFriendsListAdd,2);
+	packet(0x0365,clif->pDropItem,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pPartyInvite2,2);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0862,clif->pTakeItem,2);
+	packet(0x086d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0876,clif->pDull/*,XXX*/);
+	packet(0x0878,clif->pStoragePassword,0);
+	packet(0x088a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x089c,clif->pHomMenu,2,4);
+	packet(0x08a5,clif->pMoveToKafra,2,4);
+	packet(0x0940,clif->pTickSend,2);
+	packet(0x094b,clif->pDull/*,XXX*/);
+	packet(0x0953,clif->pMoveFromKafra,2,4);
+	packet(0x0966,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-12-06bRagexe, 2017-12-06cRagexe
 #if PACKETVER == 20171206
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0867,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x086a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x086e,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0885,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0888,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0897,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x089d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a2,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a4,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0923,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x092e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0936,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0942,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0958,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0961,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0867,clif->pDropItem,2,4);
+	packet(0x086a,clif->pDull/*,XXX*/);
+	packet(0x086e,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0885,clif->pTickSend,2);
+	packet(0x0888,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0897,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x089d,clif->pStoragePassword,0);
+	packet(0x08a2,clif->pPartyInvite2,2);
+	packet(0x08a4,clif->pMoveFromKafra,2,4);
+	packet(0x091d,clif->pFriendsListAdd,2);
+	packet(0x0923,clif->pMoveToKafra,2,4);
+	packet(0x092e,clif->pDull/*,XXX*/);
+	packet(0x0936,clif->pChangeDir,2,4);
+	packet(0x0942,clif->pHomMenu,2,4);
+	packet(0x0958,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0961,clif->pTakeItem,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-12-13bRagexe
 #if PACKETVER == 20171213
-	packet(0x0202,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0860,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0881,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0890,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0957,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pPartyInvite2,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pFriendsListAdd,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0860,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0881,clif->pDull/*,XXX*/);
+	packet(0x0890,clif->pStoragePassword,0);
+	packet(0x091a,clif->pChangeDir,2,4);
+	packet(0x0957,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-12-20aRagexe
 #if PACKETVER == 20171220
-	packet(0x0281,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0366,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0369,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0436,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0437,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0861,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0872,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0873,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0880,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0882,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0885,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0899,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a7,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x091b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091e,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0924,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0929,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0933,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x093e,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0941,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0946,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x094e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0951,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0957,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0960,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0964,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
+	packet(0x0281,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0366,clif->pMoveFromKafra,2,4);
+	packet(0x0369,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0436,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0437,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x085e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0861,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0872,clif->pUseSkillToId,2,4,6);
+	packet(0x0873,clif->pGetCharNameRequest,2);
+	packet(0x0880,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0882,clif->pTickSend,2);
+	packet(0x0885,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0899,clif->pStoragePassword,0);
+	packet(0x089e,clif->pWalkToXY,2);
+	packet(0x08a7,clif->pReqCloseBuyingStore,0);
+	packet(0x091b,clif->pTakeItem,2);
+	packet(0x091e,clif->pSolveCharName,2);
+	packet(0x0924,clif->pMoveToKafra,2,4);
+	packet(0x0929,clif->pDropItem,2,4);
+	packet(0x0933,clif->pChangeDir,2,4);
+	packet(0x093e,clif->pActionRequest,2,6);
+	packet(0x0941,clif->pReqClickBuyingStore,2);
+	packet(0x0946,clif->pDull/*,XXX*/);
+	packet(0x094e,clif->pDull/*,XXX*/);
+	packet(0x0951,clif->pHomMenu,2,4);
+	packet(0x0957,clif->pFriendsListAdd,2);
+	packet(0x0960,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0964,clif->pPartyInvite2,2);
 #endif
 
 // 2017-12-27aRagexe
 #if PACKETVER == 20171227
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0888,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x088a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a0,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x092c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x092e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0938,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0945,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0946,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0969,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x096a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pActionRequest,2,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pChangeDir,2,4);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pGetCharNameRequest,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087d,clif->pStoragePassword,0);
+	packet(0x0888,clif->pMoveFromKafra,2,4);
+	packet(0x088a,clif->pDull/*,XXX*/);
+	packet(0x088d,clif->pTakeItem,2);
+	packet(0x08a0,clif->pMoveToKafra,2,4);
+	packet(0x08a5,clif->pHomMenu,2,4);
+	packet(0x092c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x092e,clif->pDull/*,XXX*/);
+	packet(0x0938,clif->pPartyInvite2,2);
+	packet(0x0945,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0946,clif->pFriendsListAdd,2);
+	packet(0x0969,clif->pDropItem,2,4);
+	packet(0x096a,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2018-01-03aRagexe, 2018-01-03bRagexe
 #if PACKETVER == 20180103
-	packet(0x02c4,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0363,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0865,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x086b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x086d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0872,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0876,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0879,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x088e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0899,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089f,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a9,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ab,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08ac,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x091d,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0922,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0926,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0927,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x092c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0935,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0938,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0941,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0946,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0948,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x095d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x095f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0960,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
+	packet(0x02c4,clif->pMoveToKafra,2,4);
+	packet(0x0363,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0865,clif->pDull/*,XXX*/);
+	packet(0x086b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x086d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0872,clif->pReqClickBuyingStore,2);
+	packet(0x0876,clif->pTickSend,2);
+	packet(0x0879,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x088e,clif->pReqCloseBuyingStore,0);
+	packet(0x0899,clif->pFriendsListAdd,2);
+	packet(0x089f,clif->pSolveCharName,2);
+	packet(0x08a9,clif->pChangeDir,2,4);
+	packet(0x08ab,clif->pGetCharNameRequest,2);
+	packet(0x08ac,clif->pItemListWindowSelected,2,4,8);
+	packet(0x091d,clif->pActionRequest,2,6);
+	packet(0x0922,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0926,clif->pDull/*,XXX*/);
+	packet(0x0927,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x092c,clif->pMoveFromKafra,2,4);
+	packet(0x0935,clif->pTakeItem,2);
+	packet(0x0938,clif->pUseSkillToId,2,4,6);
+	packet(0x0941,clif->pWalkToXY,2);
+	packet(0x0946,clif->pStoragePassword,0);
+	packet(0x0948,clif->pHomMenu,2,4);
+	packet(0x094e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x095d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x095f,clif->pDropItem,2,4);
+	packet(0x0960,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
 #endif
 
 // 2018-01-17aRagexe
 #if PACKETVER == 20180117
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0875,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0875,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2018-01-24bRagexe, 2018-01-31Ragexe
 #if PACKETVER == 20180124 || \
     PACKETVER == 20180131
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0868,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x086a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x086f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0888,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0890,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0919,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0940,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0946,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x094d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0958,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0961,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pMoveToKafra,2,4);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pDropItem,2,4);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085f,clif->pStoragePassword,0);
+	packet(0x0868,clif->pDull/*,XXX*/);
+	packet(0x086a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x086f,clif->pDull/*,XXX*/);
+	packet(0x087a,clif->pPartyInvite2,2);
+	packet(0x0888,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0890,clif->pMoveFromKafra,2,4);
+	packet(0x0919,clif->pFriendsListAdd,2);
+	packet(0x0940,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0946,clif->pItemListWindowSelected,2,4,8);
+	packet(0x094d,clif->pTakeItem,2);
+	packet(0x0958,clif->pChangeDir,2,4);
+	packet(0x0961,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2018-02-07bRagexe, 2018-02-07cRagexe
 #if PACKETVER == 20180207
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0360,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0870,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0881,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x092e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0940,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0950,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pReqClickBuyingStore,2);
+	packet(0x0360,clif->pDull/*,XXX*/);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0870,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0881,clif->pFriendsListAdd,2);
+	packet(0x092c,clif->pHomMenu,2,4);
+	packet(0x092e,clif->pChangeDir,2,4);
+	packet(0x0940,clif->pTickSend,2);
+	packet(0x0950,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2018-02-13aRagexe, 2018-02-13bRagexe
 #if PACKETVER == 20180213
-	packet(0x0369,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0802,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0817,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x085a,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x086f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0874,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0875,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0878,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0882,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0892,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0898,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x089c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a3,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a5,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08a9,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08ad,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0917,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0922,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0924,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0926,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0933,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0936,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x093c,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0943,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0955,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x095a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0962,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
+	packet(0x0369,clif->pStoragePassword,0);
+	packet(0x0802,clif->pDropItem,2,4);
+	packet(0x0817,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x085a,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x086f,clif->pPartyInvite2,2);
+	packet(0x0874,clif->pTickSend,2);
+	packet(0x0875,clif->pMoveFromKafra,2,4);
+	packet(0x0878,clif->pChangeDir,2,4);
+	packet(0x087b,clif->pReqClickBuyingStore,2);
+	packet(0x0882,clif->pUseSkillToId,2,4,6);
+	packet(0x088c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0892,clif->pTakeItem,2);
+	packet(0x0898,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x089c,clif->pDull/*,XXX*/);
+	packet(0x08a3,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a5,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08a9,clif->pReqCloseBuyingStore,0);
+	packet(0x08ad,clif->pSolveCharName,2);
+	packet(0x0917,clif->pFriendsListAdd,2);
+	packet(0x0922,clif->pWalkToXY,2);
+	packet(0x0924,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0926,clif->pDull/*,XXX*/);
+	packet(0x0933,clif->pActionRequest,2,6);
+	packet(0x0936,clif->pSearchStoreInfoNextPage,0);
+	packet(0x093c,clif->pGetCharNameRequest,2);
+	packet(0x0943,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0955,clif->pMoveToKafra,2,4);
+	packet(0x095a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0962,clif->pHomMenu,2,4);
 #endif
 
 // 2018-02-21bRagexe
 #if PACKETVER == 20180221
-	packet(0x0202,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0366,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0436,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0838,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0867,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x086c,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x086f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0871,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0876,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0879,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0880,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0881,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0883,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x088f,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0891,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0897,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0899,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x089d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0917,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0929,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x093d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x094b,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x094d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x094e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0957,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0964,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x096a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
+	packet(0x0202,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0366,clif->pDull/*,XXX*/);
+	packet(0x0436,clif->pFriendsListAdd,2);
+	packet(0x0838,clif->pChangeDir,2,4);
+	packet(0x0867,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x086c,clif->pReqClickBuyingStore,2);
+	packet(0x086f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0871,clif->pDropItem,2,4);
+	packet(0x0876,clif->pHomMenu,2,4);
+	packet(0x0879,clif->pMoveToKafra,2,4);
+	packet(0x087d,clif->pWalkToXY,2);
+	packet(0x0880,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0881,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0883,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x088f,clif->pSolveCharName,2);
+	packet(0x0891,clif->pDull/*,XXX*/);
+	packet(0x0897,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0899,clif->pSearchStoreInfoNextPage,0);
+	packet(0x089d,clif->pTickSend,2);
+	packet(0x0917,clif->pStoragePassword,0);
+	packet(0x091e,clif->pMoveFromKafra,2,4);
+	packet(0x0929,clif->pReqCloseBuyingStore,0);
+	packet(0x093d,clif->pPartyInvite2,2);
+	packet(0x094b,clif->pUseSkillToId,2,4,6);
+	packet(0x094d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x094e,clif->pTakeItem,2);
+	packet(0x0957,clif->pGetCharNameRequest,2);
+	packet(0x0964,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x096a,clif->pActionRequest,2,6);
 #endif
 
 // 2018-03-07bRagexe, 2018-03-09aRagexe
 #if PACKETVER == 20180307 || \
     PACKETVER == 20180309
-	packet(0x0281,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x035f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0437,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x07e4,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0861,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0862,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0864,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x086c,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0870,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0872,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0877,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x088d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0893,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x089b,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08a6,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x08aa,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08ab,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0917,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0920,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0937,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0939,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x093d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0941,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0944,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0948,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0951,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0954,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0957,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0969,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
+	packet(0x0281,clif->pDull/*,XXX*/);
+	packet(0x035f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0437,clif->pDropItem,2,4);
+	packet(0x07e4,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0861,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0862,clif->pReqClickBuyingStore,2);
+	packet(0x0864,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x086c,clif->pTickSend,2);
+	packet(0x0870,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0872,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0877,clif->pWalkToXY,2);
+	packet(0x088d,clif->pMoveFromKafra,2,4);
+	packet(0x0893,clif->pUseSkillToId,2,4,6);
+	packet(0x089b,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08a6,clif->pSearchStoreInfoNextPage,0);
+	packet(0x08aa,clif->pFriendsListAdd,2);
+	packet(0x08ab,clif->pChangeDir,2,4);
+	packet(0x0917,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0920,clif->pMoveToKafra,2,4);
+	packet(0x0937,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0939,clif->pStoragePassword,0);
+	packet(0x093d,clif->pReqCloseBuyingStore,0);
+	packet(0x0941,clif->pGetCharNameRequest,2);
+	packet(0x0944,clif->pHomMenu,2,4);
+	packet(0x0948,clif->pPartyInvite2,2);
+	packet(0x0951,clif->pDull/*,XXX*/);
+	packet(0x0954,clif->pTakeItem,2);
+	packet(0x0957,clif->pSolveCharName,2);
+	packet(0x0969,clif->pActionRequest,2,6);
 #endif
 
 // 2018-03-14nRagexe
 #if PACKETVER == 20180314
-	packet(0x0361,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0366,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0369,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0436,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x085a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0862,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0863,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0868,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x086e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0874,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x087a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0888,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x088a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x088d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0894,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x089b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0921,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0927,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x092f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0933,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0935,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0945,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094d,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x094e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0956,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0959,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x095f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0962,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0967,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-#endif
-
-// 2018-11-21bRagexe, 2018-11-28aRagexe, 2018-11-28bRagexe, 2018-11-28cRagexe, 2018-12-05aRagexe, 2018-12-12aRagexe, 2018-12-12bRagexe, 2018-12-19bRagexe, 2018-12-26aRagexe, 2019-01-09aRagexe, 2019-01-16bRagexe, 2019-01-16cRagexe, 2019-01-23dRagexe, 2019-02-13bRagexe, 2019-02-13eRagexe, 2019-02-27aRagexe, 2019-02-28aRagexe, 2019-03-06bRagexe, 2019-03-06cRagexe, 2019-03-13aRagexe, 2019-03-20aRagexe, 2019-03-22aRagexe, 2019-03-27bRagexe, 2019-04-03aRagexe, 2019-04-17aRagexe, 2019-04-18aRagexe, 2019-05-08cRagexe, 2019-05-22bRagexe, 2019-05-22cRagexe, 2019-05-23aRagexe, 2019-05-29aRagexe, 2019-05-29cRagexe, 2019-05-30aRagexe, 2019-06-05fRagexe, 2019-06-05KRagexe, 2019-06-19bRagexe, 2019-06-19eRagexe, 2019-06-19hRagexe, 2019-07-03aRagexe, 2019-07-17aRagexe, 2019-07-17dRagexe, 2019-07-24aRagexe, 2019-07-31bRagexe, 2019-08-02aRagexe, 2019-08-07aRagexe, 2019-08-21aRagexe, 2019-08-28aRagexe
-#if PACKETVER == 20181121 || \
-    PACKETVER == 20181128 || \
-    PACKETVER == 20181205 || \
-    PACKETVER == 20181212 || \
-    PACKETVER == 20181219 || \
-    PACKETVER == 20181226 || \
-    PACKETVER == 20190109 || \
-    PACKETVER == 20190116 || \
-    PACKETVER == 20190123 || \
-    PACKETVER == 20190213 || \
-    PACKETVER == 20190227 || \
-    PACKETVER == 20190228 || \
-    PACKETVER == 20190306 || \
-    PACKETVER == 20190313 || \
-    PACKETVER == 20190320 || \
-    PACKETVER == 20190322 || \
-    PACKETVER == 20190327 || \
-    PACKETVER == 20190403 || \
-    PACKETVER == 20190417 || \
-    PACKETVER == 20190418 || \
-    PACKETVER == 20190508 || \
-    PACKETVER == 20190522 || \
-    PACKETVER == 20190523 || \
-    PACKETVER == 20190529 || \
-    PACKETVER == 20190530 || \
-    PACKETVER == 20190605 || \
-    PACKETVER == 20190619 || \
-    PACKETVER == 20190703 || \
-    PACKETVER == 20190717 || \
-    PACKETVER == 20190724 || \
-    PACKETVER == 20190731 || \
-    PACKETVER == 20190802 || \
-    PACKETVER == 20190807 || \
-    PACKETVER == 20190821 || \
-    PACKETVER >= 20190828
-	packet(0x0202,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x022d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x023b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0281,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x02c4,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x035f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0360,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0361,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0362,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0363,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0364,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0365,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0366,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0369,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0437,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0438,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x07e4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x07ec,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0811,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0815,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0817,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0838,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 14
-#endif
-
-// 2019-09-04aRagexe, 2019-09-04bRagexe, 2019-09-18bRagexe, 2019-09-25aRagexe, 2019-09-25bRagexe, 2019-10-02cRagexe, 2019-10-02dRagexe, 2019-10-16fRagexe, 2019-10-16gRagexe, 2019-10-18aRagexe, 2019-10-23aRagexe, 2019-10-30cRagexe, 2019-11-06aRagexe, 2019-11-07aRagexe, 2019-11-13cRagexe, 2019-11-13eRagexe, 2019-11-20aRagexe, 2019-11-20dRagexe, 2019-11-27aRagexe, 2019-11-27bRagexe, 2019-12-04aRagexe, 2019-12-04bRagexe, 2019-12-11aRagexe, 2019-12-18bRagexe, 2019-12-24aRagexe, 2019-12-24bRagexe, 2020-01-08aRagexe, 2020-01-22cRagexe, 2020-01-29bRagexe, 2020-01-30aRagexe, 2020-02-05aRagexe, 2020-02-06aRagexe, 2020-02-12aRagexe, 2020-02-19dRagexe, 2020-03-04aRagexe, 2020-03-18bRagexe, 2020-04-01bRagexe, 2020-04-14_6aRagexe, 2020-04-14eRagexe
-#if PACKETVER == 20190904 || \
-    PACKETVER == 20190918 || \
-    PACKETVER == 20190925 || \
-    PACKETVER == 20191002 || \
-    PACKETVER == 20191016 || \
-    PACKETVER == 20191018 || \
-    PACKETVER == 20191023 || \
-    PACKETVER == 20191030 || \
-    PACKETVER == 20191106 || \
-    PACKETVER == 20191107 || \
-    PACKETVER == 20191113 || \
-    PACKETVER == 20191120 || \
-    PACKETVER == 20191127 || \
-    PACKETVER == 20191204 || \
-    PACKETVER == 20191211 || \
-    PACKETVER == 20191218 || \
-    PACKETVER == 20191224 || \
-    PACKETVER == 20200108 || \
-    PACKETVER == 20200122 || \
-    PACKETVER == 20200129 || \
-    PACKETVER == 20200130 || \
-    PACKETVER == 20200205 || \
-    PACKETVER == 20200206 || \
-    PACKETVER == 20200212 || \
-    PACKETVER == 20200219 || \
-    PACKETVER == 20200304 || \
-    PACKETVER == 20200318 || \
-    PACKETVER == 20200401 || \
-    PACKETVER == 20200414
-	packet(0x0202,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x022d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x023b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0281,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x02c4,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x035f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0360,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0361,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0362,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0363,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0364,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0365,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0366,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 31
-	packet(0x0368,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0369,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0437,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0438,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x07e4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x07ec,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0811,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0815,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0817,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0838,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 14
+	packet(0x0361,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0366,clif->pUseSkillToId,2,4,6);
+	packet(0x0369,clif->pHomMenu,2,4);
+	packet(0x0436,clif->pDropItem,2,4);
+	packet(0x085a,clif->pGetCharNameRequest,2);
+	packet(0x0862,clif->pTakeItem,2);
+	packet(0x0863,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0868,clif->pDull/*,XXX*/);
+	packet(0x086e,clif->pMoveFromKafra,2,4);
+	packet(0x0874,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x087a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0888,clif->pChangeDir,2,4);
+	packet(0x088a,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x088d,clif->pStoragePassword,0);
+	packet(0x0894,clif->pReqCloseBuyingStore,0);
+	packet(0x089b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0921,clif->pActionRequest,2,6);
+	packet(0x0927,clif->pSearchStoreInfoNextPage,0);
+	packet(0x092f,clif->pWalkToXY,2);
+	packet(0x0933,clif->pMoveToKafra,2,4);
+	packet(0x0935,clif->pPartyInvite2,2);
+	packet(0x0945,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x094d,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x094e,clif->pFriendsListAdd,2);
+	packet(0x0956,clif->pDull/*,XXX*/);
+	packet(0x0959,clif->pReqClickBuyingStore,2);
+	packet(0x095f,clif->pTickSend,2);
+	packet(0x0962,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0967,clif->pSolveCharName,2);
 #endif
 
 
diff --git a/src/map/packets_shuffle_re.h b/src/map/packets_shuffle_re.h
index 490d517fd..46829fec1 100644
--- a/src/map/packets_shuffle_re.h
+++ b/src/map/packets_shuffle_re.h
@@ -40,9585 +40,9585 @@
 // 2012-07-10aRagexeRE, 2012-07-12aRagexeRE
 #if PACKETVER == 20120710 || \
     PACKETVER == 20120712
-	packet(0x0202,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x02c4,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0362,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0365,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0367,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0436,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x07e4,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0811,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x085b,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0877,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0878,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x087f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x088d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0893,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0899,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a3,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a6,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a8,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08aa,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0936,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0948,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0953,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0956,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0958,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0960,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
+	packet(0x0202,clif->pSolveCharName,2);
+	packet(0x02c4,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0362,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0365,clif->pFriendsListAdd,2);
+	packet(0x0367,clif->pMoveToKafra,2,4);
+	packet(0x0436,clif->pActionRequest,2,6);
+	packet(0x07e4,clif->pTickSend,2);
+	packet(0x0811,clif->pReqClickBuyingStore,2);
+	packet(0x085b,clif->pUseSkillToId,2,4,6);
+	packet(0x0877,clif->pGetCharNameRequest,2);
+	packet(0x0878,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x087f,clif->pWalkToXY,2);
+	packet(0x088d,clif->pChangeDir,2,4);
+	packet(0x0893,clif->pStoragePassword,0);
+	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0899,clif->pTakeItem,2);
+	packet(0x08a3,clif->pDropItem,2,4);
+	packet(0x08a6,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a8,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08aa,clif->pMoveFromKafra,2,4);
+	packet(0x092d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0936,clif->pDull/*,XXX*/);
+	packet(0x0948,clif->pReqCloseBuyingStore,0);
+	packet(0x094b,clif->pHomMenu,2,4);
+	packet(0x094e,clif->pPartyInvite2,2);
+	packet(0x0953,clif->pDull/*,XXX*/);
+	packet(0x0956,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0958,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0960,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
 #endif
 
 // 2012-07-16aRagexeRE
 #if PACKETVER == 20120716
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x089f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x089f,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2012-07-24aRagexeRE
 #if PACKETVER == 20120724
-	packet(0x035f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0815,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0835,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0865,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0866,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0872,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0877,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x087c,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0887,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0888,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x088e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a1,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08a9,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08ab,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x091f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0928,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0929,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x092b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0935,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0938,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x093c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0945,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0957,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0959,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0963,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0965,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0966,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
+	packet(0x035f,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pReqClickBuyingStore,2);
+	packet(0x0815,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0835,clif->pPartyInvite2,2);
+	packet(0x0865,clif->pReqCloseBuyingStore,0);
+	packet(0x0866,clif->pDull/*,XXX*/);
+	packet(0x0872,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0877,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x087c,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0887,clif->pChangeDir,2,4);
+	packet(0x0888,clif->pHomMenu,2,4);
+	packet(0x088e,clif->pUseSkillToId,2,4,6);
+	packet(0x08a1,clif->pGetCharNameRequest,2);
+	packet(0x08a9,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08ab,clif->pTakeItem,2);
+	packet(0x091c,clif->pWalkToXY,2);
+	packet(0x091f,clif->pTickSend,2);
+	packet(0x0928,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0929,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x092b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0935,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0938,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x093c,clif->pMoveToKafra,2,4);
+	packet(0x0945,clif->pActionRequest,2,6);
+	packet(0x0957,clif->pStoragePassword,0);
+	packet(0x0959,clif->pFriendsListAdd,2);
+	packet(0x0963,clif->pDropItem,2,4);
+	packet(0x0965,clif->pSolveCharName,2);
+	packet(0x0966,clif->pMoveFromKafra,2,4);
 #endif
 
 // 2012-08-01aRagexeRE, 2012-08-01bRagexeRE
 #if PACKETVER == 20120801
-	packet(0x0360,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0438,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x086a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x086f,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0873,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0875,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x087b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x088b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0890,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0895,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x089c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x089d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a2,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08aa,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ab,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0917,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x092a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x092e,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0930,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0934,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x093c,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0941,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0946,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x094e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0964,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
+	packet(0x0360,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0438,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x085d,clif->pSolveCharName,2);
+	packet(0x086a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086b,clif->pGetCharNameRequest,2);
+	packet(0x086f,clif->pReqCloseBuyingStore,0);
+	packet(0x0873,clif->pUseSkillToId,2,4,6);
+	packet(0x0875,clif->pTakeItem,2);
+	packet(0x087b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x088b,clif->pHomMenu,2,4);
+	packet(0x0890,clif->pActionRequest,2,6);
+	packet(0x0895,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x089c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x089d,clif->pDropItem,2,4);
+	packet(0x089f,clif->pWalkToXY,2);
+	packet(0x08a2,clif->pFriendsListAdd,2);
+	packet(0x08aa,clif->pChangeDir,2,4);
+	packet(0x08ab,clif->pMoveFromKafra,2,4);
+	packet(0x0917,clif->pStoragePassword,0);
+	packet(0x091d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x092a,clif->pDull/*,XXX*/);
+	packet(0x092e,clif->pReqClickBuyingStore,2);
+	packet(0x0930,clif->pTickSend,2);
+	packet(0x0934,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x093c,clif->pPartyInvite2,2);
+	packet(0x0941,clif->pMoveToKafra,2,4);
+	packet(0x0946,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x094e,clif->pDull/*,XXX*/);
+	packet(0x0964,clif->pSearchStoreInfoListItemClick,2,6,10);
 #endif
 
 // 2012-08-08aRagexeRE, 2012-08-08bRagexeRE, 2012-08-08cRagexeRE, 2012-08-08dRagexeRE
 #if PACKETVER == 20120808
-	packet(0x0202,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088f,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x093d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pFriendsListAdd,2);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085f,clif->pStoragePassword,0);
+	packet(0x088f,clif->pChangeDir,2,4);
+	packet(0x093d,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2012-08-14aRagexeRE, 2012-08-14bRagexeRE
 #if PACKETVER == 20120814
-	packet(0x0281,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0361,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0365,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0366,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0438,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x07ec,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0815,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0838,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x085e,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0861,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0862,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0865,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0868,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x086f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0875,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0882,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x088b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x088d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0895,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08a8,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x091f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0920,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0929,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0932,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0934,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0941,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0967,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0969,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x0281,clif->pHomMenu,2,4);
+	packet(0x0361,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0365,clif->pSolveCharName,2);
+	packet(0x0366,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0438,clif->pTickSend,2);
+	packet(0x07ec,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0815,clif->pDropItem,2,4);
+	packet(0x0838,clif->pReqCloseBuyingStore,0);
+	packet(0x085e,clif->pMoveToKafra,2,4);
+	packet(0x0861,clif->pReqClickBuyingStore,2);
+	packet(0x0862,clif->pTakeItem,2);
+	packet(0x0865,clif->pMoveFromKafra,2,4);
+	packet(0x0868,clif->pActionRequest,2,6);
+	packet(0x086f,clif->pStoragePassword,0);
+	packet(0x0875,clif->pWalkToXY,2);
+	packet(0x087f,clif->pPartyInvite2,2);
+	packet(0x0882,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x088b,clif->pFriendsListAdd,2);
+	packet(0x088d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0895,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08a8,clif->pDull/*,XXX*/);
+	packet(0x091f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0920,clif->pGetCharNameRequest,2);
+	packet(0x0929,clif->pDull/*,XXX*/);
+	packet(0x0932,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0934,clif->pUseSkillToId,2,4,6);
+	packet(0x0941,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0967,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0969,clif->pChangeDir,2,4);
 #endif
 
 // 2012-08-22aRagexeRE, 2012-08-22bRagexeRE, 2012-08-22cRagexeRE
 #if PACKETVER == 20120822
-	packet(0x0365,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0437,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x085a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x085c,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x085d,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x086e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0872,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x087c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x087d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0885,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0899,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a5,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08ab,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0917,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0924,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0927,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0935,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0937,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0940,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0943,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x094d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094e,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0953,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0955,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0958,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x095b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
+	packet(0x0365,clif->pFriendsListAdd,2);
+	packet(0x0437,clif->pTakeItem,2);
+	packet(0x085a,clif->pWalkToXY,2);
+	packet(0x085c,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x085d,clif->pUseSkillToId,2,4,6);
+	packet(0x086b,clif->pSolveCharName,2);
+	packet(0x086e,clif->pChangeDir,2,4);
+	packet(0x0872,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x087c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x087d,clif->pTickSend,2);
+	packet(0x0885,clif->pDull/*,XXX*/);
+	packet(0x088a,clif->pMoveToKafra,2,4);
+	packet(0x0899,clif->pPartyInvite2,2);
+	packet(0x089f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a5,clif->pDull/*,XXX*/);
+	packet(0x08ab,clif->pActionRequest,2,6);
+	packet(0x0917,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0924,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0927,clif->pGetCharNameRequest,2);
+	packet(0x0935,clif->pHomMenu,2,4);
+	packet(0x0937,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0940,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0943,clif->pMoveFromKafra,2,4);
+	packet(0x094d,clif->pStoragePassword,0);
+	packet(0x094e,clif->pDropItem,2,4);
+	packet(0x0953,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0955,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0958,clif->pReqCloseBuyingStore,0);
+	packet(0x095b,clif->pReqClickBuyingStore,2);
 #endif
 
 // 2012-08-30aRagexeRE, 2012-08-30bRagexeRE
 #if PACKETVER == 20120830
-	packet(0x022d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0364,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0802,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0838,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0861,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0872,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0887,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0888,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0890,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x091d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0926,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0934,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0945,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x094b,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0964,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0364,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pPartyInvite2,2);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0802,clif->pStoragePassword,0);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pMoveToKafra,2,4);
+	packet(0x0838,clif->pHomMenu,2,4);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0861,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0872,clif->pFriendsListAdd,2);
+	packet(0x0887,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0888,clif->pDull/*,XXX*/);
+	packet(0x0890,clif->pDull/*,XXX*/);
+	packet(0x091d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0926,clif->pMoveFromKafra,2,4);
+	packet(0x0934,clif->pChangeDir,2,4);
+	packet(0x0945,clif->pDropItem,2,4);
+	packet(0x094b,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0964,clif->pTakeItem,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2012-09-05aRagexeRE
 #if PACKETVER == 20120905
-	packet(0x022d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0365,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0817,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x085a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x085d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x086f,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0876,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0877,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0878,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087a,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x087e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0887,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0895,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0897,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a0,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a6,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0917,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0918,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x091a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0927,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x093c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0944,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0945,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0950,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0954,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0959,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0960,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0967,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
+	packet(0x022d,clif->pMoveToKafra,2,4);
+	packet(0x0365,clif->pDull/*,XXX*/);
+	packet(0x0817,clif->pStoragePassword,0);
+	packet(0x085a,clif->pSearchStoreInfoNextPage,0);
+	packet(0x085d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x086f,clif->pSolveCharName,2);
+	packet(0x0876,clif->pHomMenu,2,4);
+	packet(0x0877,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0878,clif->pWalkToXY,2);
+	packet(0x087a,clif->pUseSkillToId,2,4,6);
+	packet(0x087b,clif->pTickSend,2);
+	packet(0x087e,clif->pMoveFromKafra,2,4);
+	packet(0x0887,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0895,clif->pChangeDir,2,4);
+	packet(0x0897,clif->pTakeItem,2);
+	packet(0x08a0,clif->pDull/*,XXX*/);
+	packet(0x08a6,clif->pFriendsListAdd,2);
+	packet(0x0917,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0918,clif->pItemListWindowSelected,2,4,8);
+	packet(0x091a,clif->pGetCharNameRequest,2);
+	packet(0x0927,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x093c,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0944,clif->pPartyInvite2,2);
+	packet(0x0945,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0950,clif->pDropItem,2,4);
+	packet(0x0954,clif->pReqCloseBuyingStore,0);
+	packet(0x0959,clif->pReqClickBuyingStore,2);
+	packet(0x0960,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0967,clif->pActionRequest,2,6);
 #endif
 
 // 2012-09-11aRagexeRE
 #if PACKETVER == 20120911
-	packet(0x0438,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0819,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0868,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0876,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0877,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0879,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x087a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x088f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a4,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a5,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08a6,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a7,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08ad,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0930,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0935,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x093e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0948,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0949,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x094b,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0958,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0959,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0962,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0963,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0966,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0968,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
+	packet(0x0438,clif->pTickSend,2);
+	packet(0x0819,clif->pMoveFromKafra,2,4);
+	packet(0x0868,clif->pTakeItem,2);
+	packet(0x086f,clif->pWalkToXY,2);
+	packet(0x0876,clif->pHomMenu,2,4);
+	packet(0x0877,clif->pPartyInvite2,2);
+	packet(0x0879,clif->pReqClickBuyingStore,2);
+	packet(0x087a,clif->pDull/*,XXX*/);
+	packet(0x088a,clif->pGetCharNameRequest,2);
+	packet(0x088f,clif->pFriendsListAdd,2);
+	packet(0x08a4,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x08a5,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08a6,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a7,clif->pDropItem,2,4);
+	packet(0x08ad,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0930,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0935,clif->pReqCloseBuyingStore,0);
+	packet(0x093e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0948,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0949,clif->pDull/*,XXX*/);
+	packet(0x094b,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0958,clif->pUseSkillToId,2,4,6);
+	packet(0x0959,clif->pActionRequest,2,6);
+	packet(0x0962,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0963,clif->pSolveCharName,2);
+	packet(0x0966,clif->pMoveToKafra,2,4);
+	packet(0x0968,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pStoragePassword,0);
 #endif
 
 // 2012-09-19aRagexeRE
 #if PACKETVER == 20120919
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0956,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0956,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2012-09-25aRagexeRE, 2012-09-26aRagexeRE
 #if PACKETVER == 20120925 || \
     PACKETVER == 20120926
-	packet(0x07e4,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0815,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0819,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0835,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0838,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x085d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0869,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0873,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x087a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x087e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0887,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x088a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x088d,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x089d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a4,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x091c,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x091e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0923,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0927,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0932,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0942,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0948,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0950,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0956,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0957,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0958,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x095e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0963,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
+	packet(0x07e4,clif->pDull/*,XXX*/);
+	packet(0x0815,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0819,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0835,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0838,clif->pGetCharNameRequest,2);
+	packet(0x085d,clif->pHomMenu,2,4);
+	packet(0x0869,clif->pMoveToKafra,2,4);
+	packet(0x0873,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x087a,clif->pDropItem,2,4);
+	packet(0x087e,clif->pFriendsListAdd,2);
+	packet(0x0887,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x088a,clif->pPartyInvite2,2);
+	packet(0x088d,clif->pUseSkillToId,2,4,6);
+	packet(0x088f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x089d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a4,clif->pActionRequest,2,6);
+	packet(0x091c,clif->pSearchStoreInfoNextPage,0);
+	packet(0x091e,clif->pReqCloseBuyingStore,0);
+	packet(0x0923,clif->pTakeItem,2);
+	packet(0x0927,clif->pReqClickBuyingStore,2);
+	packet(0x0932,clif->pTickSend,2);
+	packet(0x0942,clif->pStoragePassword,0);
+	packet(0x0948,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0950,clif->pWalkToXY,2);
+	packet(0x0956,clif->pDull/*,XXX*/);
+	packet(0x0957,clif->pChangeDir,2,4);
+	packet(0x0958,clif->pSolveCharName,2);
+	packet(0x095e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0963,clif->pMoveFromKafra,2,4);
 #endif
 
 // 2012-10-10aRagexeRE, 2012-10-10bRagexeRE, 2012-10-11aRagexeRE
 #if PACKETVER == 20121010 || \
     PACKETVER == 20121011
-	packet(0x0202,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0817,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x085a,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0869,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086c,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0874,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0883,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0888,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0891,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0896,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0898,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a1,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a9,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0925,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0934,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x093c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0942,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0946,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0947,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x094c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0957,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0958,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0959,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x095c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0964,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0969,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x0202,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0817,clif->pGetCharNameRequest,2);
+	packet(0x085a,clif->pReqCloseBuyingStore,0);
+	packet(0x0869,clif->pTakeItem,2);
+	packet(0x086c,clif->pDull/*,XXX*/);
+	packet(0x0874,clif->pMoveFromKafra,2,4);
+	packet(0x087d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0883,clif->pWalkToXY,2);
+	packet(0x0888,clif->pDull/*,XXX*/);
+	packet(0x088f,clif->pPartyInvite2,2);
+	packet(0x0891,clif->pUseSkillToId,2,4,6);
+	packet(0x0896,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0898,clif->pStoragePassword,0);
+	packet(0x08a1,clif->pActionRequest,2,6);
+	packet(0x08a6,clif->pSolveCharName,2);
+	packet(0x08a9,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0925,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0934,clif->pTickSend,2);
+	packet(0x093c,clif->pMoveToKafra,2,4);
+	packet(0x0942,clif->pReqClickBuyingStore,2);
+	packet(0x0946,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0947,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x094c,clif->pDropItem,2,4);
+	packet(0x0957,clif->pChangeDir,2,4);
+	packet(0x0958,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0959,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x095c,clif->pHomMenu,2,4);
+	packet(0x0964,clif->pFriendsListAdd,2);
+	packet(0x0969,clif->pPartyBookingRegisterReq,2,4,6);
 #endif
 
 // 2012-10-17aRagexeRE, 2012-10-17bRagexeRE
 #if PACKETVER == 20121017
-	packet(0x023b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0365,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0868,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x086b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0887,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0888,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0897,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x089a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a6,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0918,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0920,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0960,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0962,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0965,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pPartyInvite2,2);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0365,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pMoveFromKafra,2,4);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0868,clif->pDull/*,XXX*/);
+	packet(0x086b,clif->pDropItem,2,4);
+	packet(0x0887,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0888,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0897,clif->pMoveToKafra,2,4);
+	packet(0x089a,clif->pFriendsListAdd,2);
+	packet(0x08a6,clif->pChangeDir,2,4);
+	packet(0x0918,clif->pStoragePassword,0);
+	packet(0x0920,clif->pDull/*,XXX*/);
+	packet(0x0960,clif->pHomMenu,2,4);
+	packet(0x0962,clif->pTakeItem,2);
+	packet(0x0965,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2012-10-24aRagexeRE
 #if PACKETVER == 20121024
-	packet(0x0436,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0437,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0438,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0817,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0838,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0868,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0872,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0875,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x087e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0882,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0888,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0889,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x088a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x089c,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a9,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08aa,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0931,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0938,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x093a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0942,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0947,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0954,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0955,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x095d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095e,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0965,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
+	packet(0x0436,clif->pWalkToXY,2);
+	packet(0x0437,clif->pUseSkillToId,2,4,6);
+	packet(0x0438,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0817,clif->pActionRequest,2,6);
+	packet(0x0838,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x085a,clif->pMoveFromKafra,2,4);
+	packet(0x0868,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0872,clif->pGetCharNameRequest,2);
+	packet(0x0875,clif->pDull/*,XXX*/);
+	packet(0x087a,clif->pMoveToKafra,2,4);
+	packet(0x087b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x087e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0882,clif->pStoragePassword,0);
+	packet(0x0888,clif->pHomMenu,2,4);
+	packet(0x0889,clif->pDropItem,2,4);
+	packet(0x088a,clif->pReqClickBuyingStore,2);
+	packet(0x089c,clif->pPartyInvite2,2);
+	packet(0x08a9,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08aa,clif->pChangeDir,2,4);
+	packet(0x0931,clif->pTakeItem,2);
+	packet(0x0938,clif->pReqCloseBuyingStore,0);
+	packet(0x093a,clif->pDull/*,XXX*/);
+	packet(0x0942,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0947,clif->pTickSend,2);
+	packet(0x0954,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0955,clif->pSearchStoreInfoNextPage,0);
+	packet(0x095d,clif->pFriendsListAdd,2);
+	packet(0x095e,clif->pSolveCharName,2);
+	packet(0x0965,clif->pWantToConnection,2,6,10,14,18);
 #endif
 
 // 2012-10-31aRagexeRE
 #if PACKETVER == 20121031
-	packet(0x022d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0871,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0877,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0898,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pTickSend,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pHomMenu,2,4);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pFriendsListAdd,2);
+	packet(0x0871,clif->pChangeDir,2,4);
+	packet(0x0877,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0898,clif->pStoragePassword,0);
+	packet(0x092b,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2012-11-07aRagexeRE
 #if PACKETVER == 20121107
-	packet(0x0360,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0361,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0365,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x085c,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0861,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0865,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x086c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x086d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0871,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0873,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0878,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x087f,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x088f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0890,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0891,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0896,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x089a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x089b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x08a2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08ad,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0922,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0934,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x093b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0945,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x094d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0960,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0963,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0966,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x096a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
+	packet(0x0360,clif->pTakeItem,2);
+	packet(0x0361,clif->pStoragePassword,0);
+	packet(0x0365,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x085c,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0861,clif->pTickSend,2);
+	packet(0x0865,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x086c,clif->pHomMenu,2,4);
+	packet(0x086d,clif->pSolveCharName,2);
+	packet(0x0871,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0873,clif->pMoveToKafra,2,4);
+	packet(0x0878,clif->pPartyInvite2,2);
+	packet(0x087f,clif->pChangeDir,2,4);
+	packet(0x088f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0890,clif->pUseSkillToId,2,4,6);
+	packet(0x0891,clif->pMoveFromKafra,2,4);
+	packet(0x0896,clif->pReqClickBuyingStore,2);
+	packet(0x089a,clif->pActionRequest,2,6);
+	packet(0x089b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x08a2,clif->pReqCloseBuyingStore,0);
+	packet(0x08ad,clif->pGetCharNameRequest,2);
+	packet(0x0922,clif->pDull/*,XXX*/);
+	packet(0x0934,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x093b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0945,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x094d,clif->pWalkToXY,2);
+	packet(0x0960,clif->pDropItem,2,4);
+	packet(0x0963,clif->pDull/*,XXX*/);
+	packet(0x0966,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x096a,clif->pFriendsListAdd,2);
 #endif
 
 // 2012-11-14aRagexeRE
 #if PACKETVER == 20121114
-	packet(0x0364,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0365,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0437,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0815,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0838,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0862,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0876,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0879,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0881,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0898,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0899,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a9,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08aa,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08ab,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0930,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0935,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0938,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x093b,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x093c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0941,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0944,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0949,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x094b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x094f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x095c,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0965,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x096a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
+	packet(0x0364,clif->pStoragePassword,0);
+	packet(0x0365,clif->pHomMenu,2,4);
+	packet(0x0437,clif->pDropItem,2,4);
+	packet(0x0815,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0838,clif->pPartyInvite2,2);
+	packet(0x0862,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0876,clif->pSolveCharName,2);
+	packet(0x0879,clif->pGetCharNameRequest,2);
+	packet(0x0881,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0898,clif->pActionRequest,2,6);
+	packet(0x0899,clif->pWalkToXY,2);
+	packet(0x08a9,clif->pTickSend,2);
+	packet(0x08aa,clif->pReqCloseBuyingStore,0);
+	packet(0x08ab,clif->pChangeDir,2,4);
+	packet(0x091a,clif->pMoveFromKafra,2,4);
+	packet(0x0930,clif->pDull/*,XXX*/);
+	packet(0x0935,clif->pUseSkillToId,2,4,6);
+	packet(0x0938,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x093b,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x093c,clif->pMoveToKafra,2,4);
+	packet(0x0941,clif->pFriendsListAdd,2);
+	packet(0x0944,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0949,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x094a,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x094b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x094f,clif->pReqClickBuyingStore,2);
+	packet(0x095c,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0965,clif->pTakeItem,2);
+	packet(0x096a,clif->pDull/*,XXX*/);
 #endif
 
 // 2012-11-21aRagexeRE
 #if PACKETVER == 20121121
-	packet(0x0202,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0362,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0437,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0863,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x086c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x086d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x086f,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0872,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0875,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087e,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0880,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0892,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0899,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089a,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a7,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08aa,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x091a,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0921,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0927,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0929,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0938,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0946,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x094d,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0950,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0952,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0954,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0957,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0958,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
+	packet(0x0202,clif->pUseSkillToId,2,4,6);
+	packet(0x0362,clif->pReqCloseBuyingStore,0);
+	packet(0x0437,clif->pTakeItem,2);
+	packet(0x0863,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x086c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x086d,clif->pSolveCharName,2);
+	packet(0x086f,clif->pMoveFromKafra,2,4);
+	packet(0x0872,clif->pGetCharNameRequest,2);
+	packet(0x0875,clif->pMoveToKafra,2,4);
+	packet(0x087e,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0880,clif->pChangeDir,2,4);
+	packet(0x0892,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0899,clif->pFriendsListAdd,2);
+	packet(0x089a,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x08a7,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08aa,clif->pActionRequest,2,6);
+	packet(0x091a,clif->pTickSend,2);
+	packet(0x0921,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0927,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0929,clif->pDull/*,XXX*/);
+	packet(0x0938,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0946,clif->pWalkToXY,2);
+	packet(0x094d,clif->pDull/*,XXX*/);
+	packet(0x0950,clif->pHomMenu,2,4);
+	packet(0x0952,clif->pDropItem,2,4);
+	packet(0x0954,clif->pStoragePassword,0);
+	packet(0x0957,clif->pPartyInvite2,2);
+	packet(0x0958,clif->pReqClickBuyingStore,2);
 #endif
 
 // 2012-11-28aRagexeRE
 #if PACKETVER == 20121128
-	packet(0x0362,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0363,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x07ec,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0802,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0861,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0867,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x086c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x086e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0872,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0888,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x088b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0894,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0895,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a8,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08ad,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x091b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x091c,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x091e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x091f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0921,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0922,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0931,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0945,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0947,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0950,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0953,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0954,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0960,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
+	packet(0x0362,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0363,clif->pFriendsListAdd,2);
+	packet(0x07ec,clif->pPartyInvite2,2);
+	packet(0x0802,clif->pStoragePassword,0);
+	packet(0x0861,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0867,clif->pTickSend,2);
+	packet(0x086c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x086e,clif->pDull/*,XXX*/);
+	packet(0x0872,clif->pUseSkillToId,2,4,6);
+	packet(0x0888,clif->pChangeDir,2,4);
+	packet(0x088b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0894,clif->pDull/*,XXX*/);
+	packet(0x0895,clif->pTakeItem,2);
+	packet(0x08a8,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08ad,clif->pWalkToXY,2);
+	packet(0x091b,clif->pSolveCharName,2);
+	packet(0x091c,clif->pGetCharNameRequest,2);
+	packet(0x091e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x091f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0921,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0922,clif->pMoveFromKafra,2,4);
+	packet(0x092f,clif->pReqClickBuyingStore,2);
+	packet(0x0931,clif->pActionRequest,2,6);
+	packet(0x0945,clif->pHomMenu,2,4);
+	packet(0x0947,clif->pReqCloseBuyingStore,0);
+	packet(0x0950,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0953,clif->pDropItem,2,4);
+	packet(0x0954,clif->pMoveToKafra,2,4);
+	packet(0x0960,clif->pReqTradeBuyingStore,2,4,8,12);
 #endif
 
 // 2012-12-05aRagexeRE, 2012-12-05bRagexeRE
 #if PACKETVER == 20121205
-	packet(0x035f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0360,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0815,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0863,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0864,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x086c,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0870,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0873,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0875,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0878,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0888,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0889,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x088b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x089a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08ad,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x091a,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x091c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0921,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x093a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x093e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0946,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x094b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0954,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0959,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0966,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0968,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x035f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0360,clif->pWalkToXY,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0815,clif->pTakeItem,2);
+	packet(0x0863,clif->pTickSend,2);
+	packet(0x0864,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x086c,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0870,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0873,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0875,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0878,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0888,clif->pStoragePassword,0);
+	packet(0x0889,clif->pDropItem,2,4);
+	packet(0x088b,clif->pDull/*,XXX*/);
+	packet(0x089a,clif->pFriendsListAdd,2);
+	packet(0x089d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08ad,clif->pSolveCharName,2);
+	packet(0x091a,clif->pReqCloseBuyingStore,0);
+	packet(0x091c,clif->pMoveFromKafra,2,4);
+	packet(0x0921,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x093a,clif->pReqClickBuyingStore,2);
+	packet(0x093e,clif->pDull/*,XXX*/);
+	packet(0x093f,clif->pUseSkillToId,2,4,6);
+	packet(0x0946,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x094b,clif->pGetCharNameRequest,2);
+	packet(0x0954,clif->pActionRequest,2,6);
+	packet(0x0959,clif->pPartyInvite2,2);
+	packet(0x0966,clif->pMoveToKafra,2,4);
+	packet(0x0968,clif->pChangeDir,2,4);
 #endif
 
 // 2012-12-12aRagexeRE, 2012-12-12bRagexeRE, 2012-12-12cRagexeRE
 #if PACKETVER == 20121212
-	packet(0x0362,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0368,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0369,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0436,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0438,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0817,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x085c,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0877,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x087d,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087f,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0893,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0895,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08a3,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a7,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a9,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08aa,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08ac,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0917,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0920,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0932,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0947,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0951,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0953,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0957,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x095b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0965,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0966,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0362,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0368,clif->pFriendsListAdd,2);
+	packet(0x0369,clif->pPartyInvite2,2);
+	packet(0x0436,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0438,clif->pReqCloseBuyingStore,0);
+	packet(0x0817,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x085c,clif->pActionRequest,2,6);
+	packet(0x0877,clif->pTickSend,2);
+	packet(0x087d,clif->pUseSkillToId,2,4,6);
+	packet(0x087f,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0893,clif->pSolveCharName,2);
+	packet(0x0895,clif->pReqClickBuyingStore,2);
+	packet(0x08a3,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a7,clif->pWalkToXY,2);
+	packet(0x08a9,clif->pStoragePassword,0);
+	packet(0x08aa,clif->pDull/*,XXX*/);
+	packet(0x08ac,clif->pDropItem,2,4);
+	packet(0x0917,clif->pMoveFromKafra,2,4);
+	packet(0x091a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0920,clif->pChangeDir,2,4);
+	packet(0x0932,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0947,clif->pHomMenu,2,4);
+	packet(0x0951,clif->pDull/*,XXX*/);
+	packet(0x0953,clif->pTakeItem,2);
+	packet(0x0957,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x095b,clif->pMoveToKafra,2,4);
+	packet(0x0965,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0966,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2012-12-18aRagexeRE, 2012-12-18bRagexeRE
 #if PACKETVER == 20121218
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0363,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0867,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0872,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0886,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0889,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0890,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x091a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0935,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0946,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0957,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pUseSkillToId,2,4,6);
+	packet(0x0363,clif->pTakeItem,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pDropItem,2,4);
+	packet(0x0867,clif->pHomMenu,2,4);
+	packet(0x0872,clif->pDull/*,XXX*/);
+	packet(0x087a,clif->pChangeDir,2,4);
+	packet(0x087b,clif->pPartyInvite2,2);
+	packet(0x0886,clif->pMoveToKafra,2,4);
+	packet(0x0889,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0890,clif->pDull/*,XXX*/);
+	packet(0x091a,clif->pMoveFromKafra,2,4);
+	packet(0x091c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0935,clif->pFriendsListAdd,2);
+	packet(0x0946,clif->pStoragePassword,0);
+	packet(0x0957,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2012-12-27aRagexeRE
 #if PACKETVER == 20121227
-	packet(0x0202,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x02c4,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0361,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0368,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0437,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0860,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0870,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0872,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x087a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0886,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0888,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x088e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0890,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0894,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0896,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08aa,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0917,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x091f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0920,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0932,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0933,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0940,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0943,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0947,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0953,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0958,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x095d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0962,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
+	packet(0x0202,clif->pHomMenu,2,4);
+	packet(0x02c4,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0361,clif->pStoragePassword,0);
+	packet(0x0368,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0437,clif->pDropItem,2,4);
+	packet(0x0860,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0870,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0872,clif->pReqClickBuyingStore,2);
+	packet(0x087a,clif->pActionRequest,2,6);
+	packet(0x0886,clif->pMoveFromKafra,2,4);
+	packet(0x0888,clif->pTickSend,2);
+	packet(0x088e,clif->pChangeDir,2,4);
+	packet(0x0890,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0894,clif->pFriendsListAdd,2);
+	packet(0x0896,clif->pSolveCharName,2);
+	packet(0x08a6,clif->pTakeItem,2);
+	packet(0x08aa,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0917,clif->pReqCloseBuyingStore,0);
+	packet(0x091f,clif->pDull/*,XXX*/);
+	packet(0x0920,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0932,clif->pWalkToXY,2);
+	packet(0x0933,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0940,clif->pUseSkillToId,2,4,6);
+	packet(0x0943,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0947,clif->pGetCharNameRequest,2);
+	packet(0x0953,clif->pDull/*,XXX*/);
+	packet(0x0958,clif->pMoveToKafra,2,4);
+	packet(0x095d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0962,clif->pPartyInvite2,2);
 #endif
 
 // 2013-01-03aRagexeRE
 #if PACKETVER == 20130103
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0940,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pDull/*,XXX*/);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pStoragePassword,0);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0940,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-01-09aRagexeRE
 #if PACKETVER == 20130109
-	packet(0x0281,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0365,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0368,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0437,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0838,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0866,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0886,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0888,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x088a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0891,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0892,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a2,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08aa,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08ac,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0918,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x091b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0922,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0927,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0928,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0930,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0931,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0938,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x093e,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0950,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0951,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0955,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x095e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
+	packet(0x0281,clif->pGetCharNameRequest,2);
+	packet(0x0365,clif->pDull/*,XXX*/);
+	packet(0x0368,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0437,clif->pActionRequest,2,6);
+	packet(0x0838,clif->pMoveFromKafra,2,4);
+	packet(0x0866,clif->pWalkToXY,2);
+	packet(0x0886,clif->pMoveToKafra,2,4);
+	packet(0x0888,clif->pChangeDir,2,4);
+	packet(0x088a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0891,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0892,clif->pUseSkillToId,2,4,6);
+	packet(0x08a2,clif->pSolveCharName,2);
+	packet(0x08aa,clif->pDull/*,XXX*/);
+	packet(0x08ac,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0918,clif->pFriendsListAdd,2);
+	packet(0x091b,clif->pDropItem,2,4);
+	packet(0x0922,clif->pReqClickBuyingStore,2);
+	packet(0x0927,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0928,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0930,clif->pHomMenu,2,4);
+	packet(0x0931,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0938,clif->pPartyInvite2,2);
+	packet(0x093e,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x094f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0950,clif->pStoragePassword,0);
+	packet(0x0951,clif->pTickSend,2);
+	packet(0x0955,clif->pReqCloseBuyingStore,0);
+	packet(0x095e,clif->pTakeItem,2);
 #endif
 
 // 2013-01-15aRagexeRE, 2013-01-16aRagexeRE
 #if PACKETVER == 20130115 || \
     PACKETVER == 20130116
-	packet(0x0361,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x07ec,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0817,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x085e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0861,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0863,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x086b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0870,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0871,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0877,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0879,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087c,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0888,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x088b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0894,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0895,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a0,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a4,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08ac,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0918,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0928,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x092d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x092e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0939,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0946,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x094b,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094e,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x095a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
+	packet(0x0361,clif->pDull/*,XXX*/);
+	packet(0x07ec,clif->pDull/*,XXX*/);
+	packet(0x0817,clif->pWalkToXY,2);
+	packet(0x085e,clif->pReqCloseBuyingStore,0);
+	packet(0x0861,clif->pMoveFromKafra,2,4);
+	packet(0x0863,clif->pActionRequest,2,6);
+	packet(0x086b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0870,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0871,clif->pFriendsListAdd,2);
+	packet(0x0877,clif->pReqClickBuyingStore,2);
+	packet(0x0879,clif->pChangeDir,2,4);
+	packet(0x087c,clif->pSolveCharName,2);
+	packet(0x0888,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x088b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0894,clif->pHomMenu,2,4);
+	packet(0x0895,clif->pTickSend,2);
+	packet(0x08a0,clif->pPartyInvite2,2);
+	packet(0x08a4,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08ac,clif->pMoveToKafra,2,4);
+	packet(0x0918,clif->pUseSkillToId,2,4,6);
+	packet(0x0928,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x092d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x092e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0939,clif->pGetCharNameRequest,2);
+	packet(0x0946,clif->pItemListWindowSelected,2,4,8);
+	packet(0x094b,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x094c,clif->pTakeItem,2);
+	packet(0x094e,clif->pDropItem,2,4);
+	packet(0x095a,clif->pStoragePassword,0);
 #endif
 
 // 2013-01-21aRagexeRE
 #if PACKETVER == 20130121
-	packet(0x023b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x035f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07ec,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0802,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0815,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0817,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x085d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x086c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0874,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0884,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0893,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x091f,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0940,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x094f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0956,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x095b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0963,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0969,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pReqCloseBuyingStore,0);
+	packet(0x035f,clif->pDull/*,XXX*/);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07ec,clif->pTickSend,2);
+	packet(0x0802,clif->pActionRequest,2,6);
+	packet(0x0815,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0817,clif->pStoragePassword,0);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pDull/*,XXX*/);
+	packet(0x085d,clif->pHomMenu,2,4);
+	packet(0x086c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0874,clif->pMoveToKafra,2,4);
+	packet(0x0884,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0893,clif->pFriendsListAdd,2);
+	packet(0x091f,clif->pTakeItem,2);
+	packet(0x0940,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x094f,clif->pDropItem,2,4);
+	packet(0x0956,clif->pChangeDir,2,4);
+	packet(0x095b,clif->pPartyInvite2,2);
+	packet(0x0963,clif->pMoveFromKafra,2,4);
+	packet(0x0969,clif->pItemListWindowSelected,2,4,8);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-01-30aRagexeRE
 #if PACKETVER == 20130130
-	packet(0x035f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0362,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0367,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0368,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0437,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x085f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0862,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x086b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0885,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0886,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0887,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0889,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x089a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a0,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08a4,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a9,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x091a,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0920,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0924,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x093a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x093d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0956,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0957,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x095b,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x095c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x095d,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
+	packet(0x035f,clif->pMoveToKafra,2,4);
+	packet(0x0362,clif->pHomMenu,2,4);
+	packet(0x0367,clif->pGetCharNameRequest,2);
+	packet(0x0368,clif->pChangeDir,2,4);
+	packet(0x0437,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x085f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0862,clif->pReqCloseBuyingStore,0);
+	packet(0x086b,clif->pDull/*,XXX*/);
+	packet(0x087d,clif->pWalkToXY,2);
+	packet(0x087f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0885,clif->pActionRequest,2,6);
+	packet(0x0886,clif->pTakeItem,2);
+	packet(0x0887,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0889,clif->pTickSend,2);
+	packet(0x089a,clif->pPartyInvite2,2);
+	packet(0x089f,clif->pDropItem,2,4);
+	packet(0x08a0,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08a4,clif->pUseSkillToId,2,4,6);
+	packet(0x08a9,clif->pDull/*,XXX*/);
+	packet(0x091a,clif->pSolveCharName,2);
+	packet(0x0920,clif->pFriendsListAdd,2);
+	packet(0x0924,clif->pReqClickBuyingStore,2);
+	packet(0x093a,clif->pStoragePassword,0);
+	packet(0x093d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0956,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0957,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x095b,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x095c,clif->pMoveFromKafra,2,4);
+	packet(0x095d,clif->pSearchStoreInfoNextPage,0);
 #endif
 
 // 2013-02-06aRagexeRE
 #if PACKETVER == 20130206
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0811,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0876,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0883,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0885,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0899,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a0,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ac,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0920,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0925,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x093a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x093c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0950,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pStoragePassword,0);
+	packet(0x0811,clif->pTakeItem,2);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085d,clif->pMoveFromKafra,2,4);
+	packet(0x0876,clif->pDull/*,XXX*/);
+	packet(0x0883,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0885,clif->pMoveToKafra,2,4);
+	packet(0x0899,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a0,clif->pChangeDir,2,4);
+	packet(0x08ac,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0920,clif->pPartyInvite2,2);
+	packet(0x0925,clif->pDropItem,2,4);
+	packet(0x093a,clif->pHomMenu,2,4);
+	packet(0x093c,clif->pFriendsListAdd,2);
+	packet(0x0950,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-02-15aRagexeRE
 #if PACKETVER == 20130215
-	packet(0x023b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0869,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x086f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0886,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x089f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08ad,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0923,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0941,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0956,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x095d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0962,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pReqClickBuyingStore,2);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pStoragePassword,0);
+	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0869,clif->pMoveToKafra,2,4);
+	packet(0x086f,clif->pDull/*,XXX*/);
+	packet(0x0886,clif->pDropItem,2,4);
+	packet(0x089e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x089f,clif->pDull/*,XXX*/);
+	packet(0x08ad,clif->pTakeItem,2);
+	packet(0x0923,clif->pHomMenu,2,4);
+	packet(0x0941,clif->pFriendsListAdd,2);
+	packet(0x0956,clif->pPartyInvite2,2);
+	packet(0x095d,clif->pChangeDir,2,4);
+	packet(0x0962,clif->pMoveFromKafra,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-02-20bRagexeRE
 #if PACKETVER == 20130220
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x094b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x094b,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-02-27aRagexeRE
 #if PACKETVER == 20130227
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x035f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0360,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0811,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0815,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0817,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x085a,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0863,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0867,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0869,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x086e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0893,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0898,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a0,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08a1,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x091b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x091f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0924,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x092b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x092f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0936,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0946,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0951,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x095b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x095e,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x095f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0967,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x035f,clif->pHomMenu,2,4);
+	packet(0x0360,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0811,clif->pTickSend,2);
+	packet(0x0815,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0817,clif->pReqClickBuyingStore,2);
+	packet(0x085a,clif->pUseSkillToId,2,4,6);
+	packet(0x0863,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0867,clif->pTakeItem,2);
+	packet(0x0869,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x086e,clif->pDull/*,XXX*/);
+	packet(0x087b,clif->pPartyInvite2,2);
+	packet(0x0893,clif->pMoveFromKafra,2,4);
+	packet(0x0898,clif->pChangeDir,2,4);
+	packet(0x08a0,clif->pReqCloseBuyingStore,0);
+	packet(0x08a1,clif->pDull/*,XXX*/);
+	packet(0x091b,clif->pGetCharNameRequest,2);
+	packet(0x091f,clif->pDropItem,2,4);
+	packet(0x0924,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x092b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x092f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0936,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0946,clif->pMoveToKafra,2,4);
+	packet(0x0951,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x095b,clif->pSolveCharName,2);
+	packet(0x095e,clif->pStoragePassword,0);
+	packet(0x095f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0967,clif->pActionRequest,2,6);
 #endif
 
 // 2013-03-06aRagexeRE, 2013-03-06bRagexeRE
 #if PACKETVER == 20130306
-	packet(0x022d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0367,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0368,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0802,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0817,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x085b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x085c,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0860,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x086d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0881,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0890,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0898,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x089f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a4,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08ac,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0917,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091e,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0926,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0934,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0936,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0943,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0944,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0945,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0946,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x094a,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094e,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0951,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0960,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0962,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
+	packet(0x022d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0367,clif->pSolveCharName,2);
+	packet(0x0368,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0802,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0817,clif->pHomMenu,2,4);
+	packet(0x085b,clif->pWalkToXY,2);
+	packet(0x085c,clif->pReqClickBuyingStore,2);
+	packet(0x0860,clif->pChangeDir,2,4);
+	packet(0x086d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0881,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0890,clif->pDull/*,XXX*/);
+	packet(0x0898,clif->pActionRequest,2,6);
+	packet(0x089f,clif->pTickSend,2);
+	packet(0x08a4,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08ac,clif->pDull/*,XXX*/);
+	packet(0x0917,clif->pMoveFromKafra,2,4);
+	packet(0x091e,clif->pMoveToKafra,2,4);
+	packet(0x0926,clif->pStoragePassword,0);
+	packet(0x0934,clif->pFriendsListAdd,2);
+	packet(0x0936,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0943,clif->pUseSkillToId,2,4,6);
+	packet(0x0944,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0945,clif->pReqCloseBuyingStore,0);
+	packet(0x0946,clif->pPartyInvite2,2);
+	packet(0x094a,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x094e,clif->pGetCharNameRequest,2);
+	packet(0x0951,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0960,clif->pDropItem,2,4);
+	packet(0x0962,clif->pTakeItem,2);
 #endif
 
 // 2013-03-13aRagexeRE, 2013-03-13bRagexeRE, 2013-03-13cRagexeRE
 #if PACKETVER == 20130313
-	packet(0x0202,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0887,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0920,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0947,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pPartyInvite2,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pFriendsListAdd,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0887,clif->pChangeDir,2,4);
+	packet(0x0920,clif->pStoragePassword,0);
+	packet(0x092d,clif->pHomMenu,2,4);
+	packet(0x0947,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-03-20bRagexeRE, 2013-03-20cRagexeRE
 #if PACKETVER == 20130320
-	packet(0x035f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0363,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0365,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0438,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x085a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x085d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0868,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x086f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0874,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0881,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0886,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0888,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088e,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0890,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0897,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0898,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089b,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08ac,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0922,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x092e,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0933,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0938,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x093f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0947,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094c,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x094e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0959,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x095a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
+	packet(0x035f,clif->pReqClickBuyingStore,2);
+	packet(0x0363,clif->pTickSend,2);
+	packet(0x0365,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0438,clif->pDropItem,2,4);
+	packet(0x085a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x085d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0868,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086d,clif->pPartyInvite2,2);
+	packet(0x086f,clif->pFriendsListAdd,2);
+	packet(0x0874,clif->pMoveFromKafra,2,4);
+	packet(0x0881,clif->pWalkToXY,2);
+	packet(0x0886,clif->pReqCloseBuyingStore,0);
+	packet(0x0888,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088e,clif->pActionRequest,2,6);
+	packet(0x0890,clif->pDull/*,XXX*/);
+	packet(0x0897,clif->pChangeDir,2,4);
+	packet(0x0898,clif->pGetCharNameRequest,2);
+	packet(0x089b,clif->pUseSkillToId,2,4,6);
+	packet(0x08ac,clif->pMoveToKafra,2,4);
+	packet(0x0922,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x092e,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0933,clif->pTakeItem,2);
+	packet(0x0938,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x093f,clif->pHomMenu,2,4);
+	packet(0x0947,clif->pStoragePassword,0);
+	packet(0x094c,clif->pSolveCharName,2);
+	packet(0x094e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0959,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x095a,clif->pDull/*,XXX*/);
 #endif
 
 // 2013-03-27bRagexeRE
 #if PACKETVER == 20130327
-	packet(0x02c4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x07ec,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0835,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x086d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0873,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0878,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x087a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0885,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x088f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0891,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0893,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0899,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a1,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08a2,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x091f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x092b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x092d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x092e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x092f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0933,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0938,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0939,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x094a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x094b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0955,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0960,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0961,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0967,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
+	packet(0x02c4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x07ec,clif->pReqClickBuyingStore,2);
+	packet(0x0835,clif->pHomMenu,2,4);
+	packet(0x086d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0873,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0878,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x087a,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0885,clif->pDropItem,2,4);
+	packet(0x088f,clif->pUseSkillToId,2,4,6);
+	packet(0x0891,clif->pMoveToKafra,2,4);
+	packet(0x0893,clif->pReqCloseBuyingStore,0);
+	packet(0x0899,clif->pTakeItem,2);
+	packet(0x08a1,clif->pGetCharNameRequest,2);
+	packet(0x08a2,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x091f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x092b,clif->pWalkToXY,2);
+	packet(0x092d,clif->pPartyInvite2,2);
+	packet(0x092e,clif->pDull/*,XXX*/);
+	packet(0x092f,clif->pDull/*,XXX*/);
+	packet(0x0933,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0938,clif->pMoveFromKafra,2,4);
+	packet(0x0939,clif->pTickSend,2);
+	packet(0x094a,clif->pChangeDir,2,4);
+	packet(0x094b,clif->pStoragePassword,0);
+	packet(0x094f,clif->pFriendsListAdd,2);
+	packet(0x0955,clif->pActionRequest,2,6);
+	packet(0x0960,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0961,clif->pSolveCharName,2);
+	packet(0x0967,clif->pItemListWindowSelected,2,4,8);
 #endif
 
 // 2013-04-03aRagexeRE
 #if PACKETVER == 20130403
-	packet(0x023b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0884,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a5,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0926,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0942,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0950,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pReqClickBuyingStore,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pStoragePassword,0);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0884,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a5,clif->pDull/*,XXX*/);
+	packet(0x0926,clif->pHomMenu,2,4);
+	packet(0x0942,clif->pChangeDir,2,4);
+	packet(0x0950,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-04-10aRagexeRE
 #if PACKETVER == 20130410
-	packet(0x0367,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0437,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0860,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0865,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x086c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0879,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0881,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x088c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0890,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0891,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x089c,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x089e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08a0,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x08a7,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0917,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x091d,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0933,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0939,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x093d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0944,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0945,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0955,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0960,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0967,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x096a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
+	packet(0x0367,clif->pReqClickBuyingStore,2);
+	packet(0x0437,clif->pTakeItem,2);
+	packet(0x0860,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0865,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x086c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0879,clif->pMoveToKafra,2,4);
+	packet(0x087c,clif->pWalkToXY,2);
+	packet(0x087d,clif->pGetCharNameRequest,2);
+	packet(0x0881,clif->pReqCloseBuyingStore,0);
+	packet(0x088c,clif->pStoragePassword,0);
+	packet(0x088d,clif->pHomMenu,2,4);
+	packet(0x0890,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0891,clif->pDull/*,XXX*/);
+	packet(0x089c,clif->pSolveCharName,2);
+	packet(0x089e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08a0,clif->pTickSend,2);
+	packet(0x08a4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x08a7,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0917,clif->pPartyInvite2,2);
+	packet(0x091d,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0933,clif->pUseSkillToId,2,4,6);
+	packet(0x0939,clif->pActionRequest,2,6);
+	packet(0x093d,clif->pMoveFromKafra,2,4);
+	packet(0x0944,clif->pDull/*,XXX*/);
+	packet(0x0945,clif->pChangeDir,2,4);
+	packet(0x0955,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0960,clif->pFriendsListAdd,2);
+	packet(0x0967,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x096a,clif->pDropItem,2,4);
 #endif
 
 // 2013-04-17aRagexeRE
 #if PACKETVER == 20130417
-	packet(0x0202,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0875,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0929,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0962,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0969,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x096a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
+	packet(0x0202,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pFriendsListAdd,2);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0875,clif->pStoragePassword,0);
+	packet(0x0929,clif->pChangeDir,2,4);
+	packet(0x0962,clif->pHomMenu,2,4);
+	packet(0x0969,clif->pGetCharNameRequest,2);
+	packet(0x096a,clif->pDull/*,XXX*/);
 #endif
 
 // 2013-04-24aRagexeRE
 #if PACKETVER == 20130424
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0969,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0969,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-05-02aRagexeRE
 #if PACKETVER == 20130502
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x07ec,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0867,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0870,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0874,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0875,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0877,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0888,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0889,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a1,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a3,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0961,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0967,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pStoragePassword,0);
+	packet(0x07ec,clif->pChangeDir,2,4);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pDull/*,XXX*/);
+	packet(0x0867,clif->pHomMenu,2,4);
+	packet(0x0870,clif->pPartyInvite2,2);
+	packet(0x0874,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0875,clif->pFriendsListAdd,2);
+	packet(0x0877,clif->pMoveToKafra,2,4);
+	packet(0x087c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0888,clif->pGetCharNameRequest,2);
+	packet(0x0889,clif->pDull/*,XXX*/);
+	packet(0x08a1,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08a3,clif->pDropItem,2,4);
+	packet(0x0961,clif->pMoveFromKafra,2,4);
+	packet(0x0967,clif->pTakeItem,2);
 #endif
 
 // 2013-05-08bRagexeRE
 #if PACKETVER == 20130508
-	packet(0x022d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0868,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0878,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0893,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0895,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0897,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08ab,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x092d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0944,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x094d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0957,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x095c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pMoveToKafra,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pFriendsListAdd,2);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0868,clif->pStoragePassword,0);
+	packet(0x0878,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088b,clif->pTakeItem,2);
+	packet(0x0893,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0895,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0897,clif->pDull/*,XXX*/);
+	packet(0x08ab,clif->pPartyInvite2,2);
+	packet(0x092d,clif->pDropItem,2,4);
+	packet(0x0944,clif->pDull/*,XXX*/);
+	packet(0x094d,clif->pHomMenu,2,4);
+	packet(0x0957,clif->pMoveFromKafra,2,4);
+	packet(0x095c,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-05-15aRagexeRE
 #if PACKETVER == 20130515
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0862,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0887,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a1,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08aa,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08ac,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0931,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x093e,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0943,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0944,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0947,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0962,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0963,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pChangeDir,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0862,clif->pDull/*,XXX*/);
+	packet(0x0887,clif->pMoveToKafra,2,4);
+	packet(0x08a1,clif->pTakeItem,2);
+	packet(0x08aa,clif->pDull/*,XXX*/);
+	packet(0x08ac,clif->pMoveFromKafra,2,4);
+	packet(0x092d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0931,clif->pHomMenu,2,4);
+	packet(0x093e,clif->pStoragePassword,0);
+	packet(0x0943,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0944,clif->pDropItem,2,4);
+	packet(0x0947,clif->pPartyInvite2,2);
+	packet(0x0962,clif->pFriendsListAdd,2);
+	packet(0x0963,clif->pItemListWindowSelected,2,4,8);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-05-22aRagexeRE
 #if PACKETVER == 20130522
-	packet(0x0360,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0362,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0368,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0369,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x07ec,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0811,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x086a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0874,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x087e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x088e,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x089c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a2,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a3,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a6,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08a9,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08aa,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x08ac,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0925,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0926,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x093e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0950,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0952,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x095b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x095c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x095e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0964,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0965,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
+	packet(0x0360,clif->pWalkToXY,2);
+	packet(0x0362,clif->pFriendsListAdd,2);
+	packet(0x0368,clif->pReqClickBuyingStore,2);
+	packet(0x0369,clif->pSolveCharName,2);
+	packet(0x07ec,clif->pTickSend,2);
+	packet(0x0811,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x086a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086e,clif->pReqCloseBuyingStore,0);
+	packet(0x0874,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x087e,clif->pMoveFromKafra,2,4);
+	packet(0x088e,clif->pStoragePassword,0);
+	packet(0x089b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x089c,clif->pDropItem,2,4);
+	packet(0x08a2,clif->pActionRequest,2,6);
+	packet(0x08a3,clif->pMoveToKafra,2,4);
+	packet(0x08a6,clif->pGetCharNameRequest,2);
+	packet(0x08a9,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08aa,clif->pSearchStoreInfoNextPage,0);
+	packet(0x08ac,clif->pDull/*,XXX*/);
+	packet(0x0925,clif->pChangeDir,2,4);
+	packet(0x0926,clif->pHomMenu,2,4);
+	packet(0x093e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0950,clif->pPartyInvite2,2);
+	packet(0x0952,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x095b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x095c,clif->pUseSkillToId,2,4,6);
+	packet(0x095e,clif->pTakeItem,2);
+	packet(0x0964,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0965,clif->pDull/*,XXX*/);
 #endif
 
 // 2013-05-29aRagexeRE
 #if PACKETVER == 20130529
-	packet(0x023b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0438,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x085e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0863,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0869,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0874,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0876,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0877,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0888,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0890,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0892,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0895,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0897,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a7,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a8,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0917,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0918,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0919,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0936,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0937,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0938,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0941,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0951,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0956,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0957,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0958,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0964,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
+	packet(0x023b,clif->pHomMenu,2,4);
+	packet(0x0438,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x085e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0863,clif->pGetCharNameRequest,2);
+	packet(0x0869,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0874,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0876,clif->pWalkToXY,2);
+	packet(0x0877,clif->pFriendsListAdd,2);
+	packet(0x0888,clif->pDull/*,XXX*/);
+	packet(0x088e,clif->pDull/*,XXX*/);
+	packet(0x0890,clif->pActionRequest,2,6);
+	packet(0x0892,clif->pReqClickBuyingStore,2);
+	packet(0x0895,clif->pTakeItem,2);
+	packet(0x0897,clif->pTickSend,2);
+	packet(0x08a7,clif->pDropItem,2,4);
+	packet(0x08a8,clif->pPartyInvite2,2);
+	packet(0x0917,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0918,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0919,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0936,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0937,clif->pSolveCharName,2);
+	packet(0x0938,clif->pMoveToKafra,2,4);
+	packet(0x0941,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0951,clif->pChangeDir,2,4);
+	packet(0x0956,clif->pStoragePassword,0);
+	packet(0x0957,clif->pMoveFromKafra,2,4);
+	packet(0x0958,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0964,clif->pReqCloseBuyingStore,0);
 #endif
 
 // 2013-06-05cRagexeRE
 #if PACKETVER == 20130605
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0883,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0883,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-06-12bRagexeRE
 #if PACKETVER == 20130612
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0919,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x093a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0964,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087e,clif->pChangeDir,2,4);
+	packet(0x0919,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x093a,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pFriendsListAdd,2);
+	packet(0x0964,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-06-18#1aRagexeRE
 #if PACKETVER == 20130618
-	packet(0x0281,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x02c4,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0363,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x085a,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0862,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0864,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0878,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0885,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0887,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0889,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x088e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0890,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0891,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08a6,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a7,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0917,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0930,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0932,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0936,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0942,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0944,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0945,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x094f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0951,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0953,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0962,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x096a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
+	packet(0x0281,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x02c4,clif->pHomMenu,2,4);
+	packet(0x0363,clif->pSearchStoreInfoNextPage,0);
+	packet(0x085a,clif->pReqCloseBuyingStore,0);
+	packet(0x0862,clif->pReqClickBuyingStore,2);
+	packet(0x0864,clif->pStoragePassword,0);
+	packet(0x0878,clif->pDull/*,XXX*/);
+	packet(0x087a,clif->pDull/*,XXX*/);
+	packet(0x0885,clif->pMoveToKafra,2,4);
+	packet(0x0887,clif->pPartyInvite2,2);
+	packet(0x0889,clif->pActionRequest,2,6);
+	packet(0x088e,clif->pWalkToXY,2);
+	packet(0x0890,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0891,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08a6,clif->pChangeDir,2,4);
+	packet(0x08a7,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0917,clif->pDropItem,2,4);
+	packet(0x0930,clif->pTickSend,2);
+	packet(0x0932,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0936,clif->pMoveFromKafra,2,4);
+	packet(0x0942,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0944,clif->pGetCharNameRequest,2);
+	packet(0x0945,clif->pSolveCharName,2);
+	packet(0x094f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0951,clif->pUseSkillToId,2,4,6);
+	packet(0x0953,clif->pFriendsListAdd,2);
+	packet(0x095b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0962,clif->pTakeItem,2);
+	packet(0x096a,clif->pUseSkillToPos,2,4,6,8);
 #endif
 
 // 2013-06-26_3bRagexeRE, 2013-06-26aRagexeRE
 #if PACKETVER == 20130626
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0365,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0860,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x088c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0894,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0895,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a5,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08ab,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0921,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0930,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0952,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0960,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0365,clif->pReqCloseBuyingStore,0);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pMoveFromKafra,2,4);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0860,clif->pDull/*,XXX*/);
+	packet(0x088b,clif->pTakeItem,2);
+	packet(0x088c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088f,clif->pDull/*,XXX*/);
+	packet(0x0894,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0895,clif->pPartyInvite2,2);
+	packet(0x08a5,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08ab,clif->pFriendsListAdd,2);
+	packet(0x0921,clif->pMoveToKafra,2,4);
+	packet(0x0930,clif->pStoragePassword,0);
+	packet(0x094d,clif->pChangeDir,2,4);
+	packet(0x0952,clif->pDropItem,2,4);
+	packet(0x0960,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-07-03bRagexeRE
 #if PACKETVER == 20130703
-	packet(0x0202,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0873,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0930,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x094a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pReqClickBuyingStore,2);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pFriendsListAdd,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0873,clif->pStoragePassword,0);
+	packet(0x0930,clif->pChangeDir,2,4);
+	packet(0x094a,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-07-10aRagexeRE, 2013-07-10bRagexeRE, 2013-07-10cRagexeRE, 2013-07-10dRagexeRE, 2013-07-10eRagexeRE
 #if PACKETVER == 20130710
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0880,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0880,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-07-17cRagexeRE, 2013-07-17dRagexeRE, 2013-07-17eRagexeRE
 #if PACKETVER == 20130717
-	packet(0x02c4,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0819,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x083c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0862,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0863,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x086b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x086c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0882,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x088a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x088c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0897,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0898,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x089b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a6,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a9,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08aa,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0917,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0918,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x091d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x091e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x092f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x093b,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0956,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0958,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x095b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0960,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0967,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x096a,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
+	packet(0x02c4,clif->pTickSend,2);
+	packet(0x0819,clif->pSearchStoreInfoNextPage,0);
+	packet(0x083c,clif->pWalkToXY,2);
+	packet(0x0862,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0863,clif->pFriendsListAdd,2);
+	packet(0x086b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x086c,clif->pDull/*,XXX*/);
+	packet(0x0882,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x088a,clif->pHomMenu,2,4);
+	packet(0x088c,clif->pChangeDir,2,4);
+	packet(0x0897,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0898,clif->pReqClickBuyingStore,2);
+	packet(0x089b,clif->pMoveToKafra,2,4);
+	packet(0x08a6,clif->pDull/*,XXX*/);
+	packet(0x08a9,clif->pTakeItem,2);
+	packet(0x08aa,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0917,clif->pDropItem,2,4);
+	packet(0x0918,clif->pActionRequest,2,6);
+	packet(0x091d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x091e,clif->pUseSkillToId,2,4,6);
+	packet(0x092f,clif->pPartyInvite2,2);
+	packet(0x093b,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0956,clif->pMoveFromKafra,2,4);
+	packet(0x0958,clif->pGetCharNameRequest,2);
+	packet(0x095b,clif->pStoragePassword,0);
+	packet(0x0960,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0967,clif->pSolveCharName,2);
+	packet(0x096a,clif->pReqCloseBuyingStore,0);
 #endif
 
 // 2013-07-24eRagexeRE, 2013-07-24fRagexeRE
 #if PACKETVER == 20130724
-	packet(0x023b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0437,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x085a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0860,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0867,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x086a,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0874,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0876,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0890,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0891,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0893,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x089c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08ab,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0921,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0924,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0927,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x092b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x094a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0953,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0954,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0956,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0958,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x095c,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x095d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0965,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0966,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x023b,clif->pReqCloseBuyingStore,0);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0437,clif->pDull/*,XXX*/);
+	packet(0x085a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x085e,clif->pMoveFromKafra,2,4);
+	packet(0x0860,clif->pStoragePassword,0);
+	packet(0x0867,clif->pGetCharNameRequest,2);
+	packet(0x086a,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0874,clif->pHomMenu,2,4);
+	packet(0x0876,clif->pActionRequest,2,6);
+	packet(0x0890,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0891,clif->pDropItem,2,4);
+	packet(0x0893,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x089c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08ab,clif->pDull/*,XXX*/);
+	packet(0x0921,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0924,clif->pReqClickBuyingStore,2);
+	packet(0x0927,clif->pPartyInvite2,2);
+	packet(0x092b,clif->pFriendsListAdd,2);
+	packet(0x092e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x094a,clif->pTakeItem,2);
+	packet(0x0953,clif->pWalkToXY,2);
+	packet(0x0954,clif->pSolveCharName,2);
+	packet(0x0956,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0958,clif->pUseSkillToId,2,4,6);
+	packet(0x095c,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x095d,clif->pMoveToKafra,2,4);
+	packet(0x0965,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0966,clif->pChangeDir,2,4);
 #endif
 
 // 2013-07-31cRagexeRE
 #if PACKETVER == 20130731
-	packet(0x022d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0366,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0863,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0865,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0878,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x087e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0884,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0889,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0894,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0895,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0923,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0925,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x092b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x092d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0935,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0941,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x094c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0956,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0957,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0958,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x095b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x095d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x095f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0962,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
+	packet(0x022d,clif->pFriendsListAdd,2);
+	packet(0x0366,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pChangeDir,2,4);
+	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0863,clif->pReqClickBuyingStore,2);
+	packet(0x0865,clif->pUseSkillToId,2,4,6);
+	packet(0x0878,clif->pActionRequest,2,6);
+	packet(0x087e,clif->pReqCloseBuyingStore,0);
+	packet(0x0884,clif->pStoragePassword,0);
+	packet(0x0889,clif->pDull/*,XXX*/);
+	packet(0x088b,clif->pGetCharNameRequest,2);
+	packet(0x0894,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0895,clif->pDull/*,XXX*/);
+	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0923,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0925,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x092b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x092d,clif->pHomMenu,2,4);
+	packet(0x0935,clif->pTakeItem,2);
+	packet(0x0941,clif->pMoveToKafra,2,4);
+	packet(0x094c,clif->pMoveFromKafra,2,4);
+	packet(0x0956,clif->pPartyInvite2,2);
+	packet(0x0957,clif->pSolveCharName,2);
+	packet(0x0958,clif->pItemListWindowSelected,2,4,8);
+	packet(0x095b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x095d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x095f,clif->pTickSend,2);
+	packet(0x0962,clif->pDropItem,2,4);
 #endif
 
 // 2013-08-07aRagexeRE
 #if PACKETVER == 20130807
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0887,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0887,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-08-14aRagexeRE
 #if PACKETVER == 20130814
-	packet(0x0202,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0281,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0368,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0815,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0835,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0868,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0873,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0874,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0885,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0887,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0889,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x088a,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x088c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0895,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0896,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0923,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0926,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0927,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0936,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0937,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x093a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0941,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0947,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x094e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0958,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0959,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x095f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0962,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
+	packet(0x0202,clif->pMoveToKafra,2,4);
+	packet(0x0281,clif->pFriendsListAdd,2);
+	packet(0x0368,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0815,clif->pDull/*,XXX*/);
+	packet(0x0835,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0868,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0873,clif->pMoveFromKafra,2,4);
+	packet(0x0874,clif->pActionRequest,2,6);
+	packet(0x0885,clif->pStoragePassword,0);
+	packet(0x0887,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0889,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x088a,clif->pTickSend,2);
+	packet(0x088c,clif->pChangeDir,2,4);
+	packet(0x0895,clif->pReqClickBuyingStore,2);
+	packet(0x0896,clif->pDull/*,XXX*/);
+	packet(0x08a4,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0923,clif->pSolveCharName,2);
+	packet(0x0926,clif->pTakeItem,2);
+	packet(0x0927,clif->pPartyInvite2,2);
+	packet(0x0936,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0937,clif->pGetCharNameRequest,2);
+	packet(0x093a,clif->pWalkToXY,2);
+	packet(0x0941,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0947,clif->pUseSkillToId,2,4,6);
+	packet(0x094e,clif->pReqCloseBuyingStore,0);
+	packet(0x0958,clif->pHomMenu,2,4);
+	packet(0x0959,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x095f,clif->pDropItem,2,4);
+	packet(0x0962,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
 #endif
 
 // 2013-08-21dRagexeRE
 #if PACKETVER == 20130821
-	packet(0x0202,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0360,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0437,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0438,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x07ec,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0815,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0862,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0863,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x086e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0879,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0881,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x088d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x088f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0892,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08a6,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08ad,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x091d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0923,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x092d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x093e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0947,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0954,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x095e,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0962,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0964,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0967,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0969,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
+	packet(0x0202,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0360,clif->pStoragePassword,0);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0437,clif->pMoveToKafra,2,4);
+	packet(0x0438,clif->pDull/*,XXX*/);
+	packet(0x07ec,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0815,clif->pWalkToXY,2);
+	packet(0x0862,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0863,clif->pActionRequest,2,6);
+	packet(0x086e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0879,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0881,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x088d,clif->pTickSend,2);
+	packet(0x088f,clif->pFriendsListAdd,2);
+	packet(0x0892,clif->pReqClickBuyingStore,2);
+	packet(0x08a6,clif->pReqCloseBuyingStore,0);
+	packet(0x08ad,clif->pDull/*,XXX*/);
+	packet(0x091d,clif->pChangeDir,2,4);
+	packet(0x0923,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x092d,clif->pGetCharNameRequest,2);
+	packet(0x093e,clif->pMoveFromKafra,2,4);
+	packet(0x0947,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0954,clif->pUseSkillToId,2,4,6);
+	packet(0x095e,clif->pSolveCharName,2);
+	packet(0x0962,clif->pTakeItem,2);
+	packet(0x0964,clif->pDropItem,2,4);
+	packet(0x0967,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0969,clif->pPartyInvite2,2);
 #endif
 
 // 2013-08-28bRagexeRE, 2013-08-28cRagexeRE
 #if PACKETVER == 20130828
-	packet(0x023b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0361,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0364,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x07ec,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0817,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0873,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x087e,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0889,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0893,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x089f,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a3,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08ac,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0917,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0919,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x091e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0923,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0924,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0928,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0929,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0930,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0944,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0946,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x094a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x094c,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x094f,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x095d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0966,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
+	packet(0x023b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0361,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0364,clif->pDull/*,XXX*/);
+	packet(0x07ec,clif->pReqClickBuyingStore,2);
+	packet(0x0817,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0873,clif->pSearchStoreInfoNextPage,0);
+	packet(0x087e,clif->pDropItem,2,4);
+	packet(0x0889,clif->pHomMenu,2,4);
+	packet(0x0893,clif->pStoragePassword,0);
+	packet(0x089e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x089f,clif->pChangeDir,2,4);
+	packet(0x08a3,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08ac,clif->pGetCharNameRequest,2);
+	packet(0x0917,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0919,clif->pReqCloseBuyingStore,0);
+	packet(0x091e,clif->pTakeItem,2);
+	packet(0x0923,clif->pUseSkillToId,2,4,6);
+	packet(0x0924,clif->pTickSend,2);
+	packet(0x0928,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0929,clif->pMoveFromKafra,2,4);
+	packet(0x0930,clif->pSolveCharName,2);
+	packet(0x0944,clif->pFriendsListAdd,2);
+	packet(0x0946,clif->pDull/*,XXX*/);
+	packet(0x094a,clif->pPartyInvite2,2);
+	packet(0x094c,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x094f,clif->pActionRequest,2,6);
+	packet(0x095d,clif->pWalkToXY,2);
+	packet(0x0966,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pWantToConnection,2,6,10,14,18);
 #endif
 
 // 2013-09-04bRagexeRE
 #if PACKETVER == 20130904
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0838,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0937,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x093a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0956,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pChangeDir,2,4);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0838,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0937,clif->pFriendsListAdd,2);
+	packet(0x093a,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0956,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-09-11aRagexeRE, 2013-09-11bRagexeRE
 #if PACKETVER == 20130911
-	packet(0x035f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0364,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085c,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0868,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x086b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x086d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0889,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0891,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x091e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x093a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0940,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0948,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0967,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x096a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
+	packet(0x035f,clif->pReqClickBuyingStore,2);
+	packet(0x0364,clif->pGetCharNameRequest,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085c,clif->pPartyInvite2,2);
+	packet(0x0868,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x086b,clif->pStoragePassword,0);
+	packet(0x086d,clif->pMoveFromKafra,2,4);
+	packet(0x087b,clif->pDull/*,XXX*/);
+	packet(0x0889,clif->pTakeItem,2);
+	packet(0x0891,clif->pHomMenu,2,4);
+	packet(0x08a4,clif->pItemListWindowSelected,2,4,8);
+	packet(0x091e,clif->pChangeDir,2,4);
+	packet(0x093a,clif->pDull/*,XXX*/);
+	packet(0x0940,clif->pTickSend,2);
+	packet(0x0948,clif->pFriendsListAdd,2);
+	packet(0x0967,clif->pDropItem,2,4);
+	packet(0x096a,clif->pMoveToKafra,2,4);
 #endif
 
 // 2013-09-17aRagexeRE
 #if PACKETVER == 20130917
-	packet(0x035f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0811,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0838,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x083c,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0863,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0868,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x086e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x086f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x087a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x087e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0895,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x089b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x089d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a0,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a2,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08a8,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0918,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0921,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0923,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0934,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x094c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0957,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0959,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x095b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x096a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
+	packet(0x035f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0811,clif->pActionRequest,2,6);
+	packet(0x0838,clif->pReqClickBuyingStore,2);
+	packet(0x083c,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0863,clif->pMoveFromKafra,2,4);
+	packet(0x0868,clif->pPartyInvite2,2);
+	packet(0x086e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x086f,clif->pTickSend,2);
+	packet(0x087a,clif->pTakeItem,2);
+	packet(0x087e,clif->pUseSkillToId,2,4,6);
+	packet(0x088a,clif->pStoragePassword,0);
+	packet(0x0895,clif->pSolveCharName,2);
+	packet(0x089b,clif->pReqCloseBuyingStore,0);
+	packet(0x089d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a0,clif->pMoveToKafra,2,4);
+	packet(0x08a2,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08a8,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0918,clif->pChangeDir,2,4);
+	packet(0x091c,clif->pDropItem,2,4);
+	packet(0x091e,clif->pDull/*,XXX*/);
+	packet(0x0921,clif->pGetCharNameRequest,2);
+	packet(0x0923,clif->pHomMenu,2,4);
+	packet(0x0934,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x094c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x094e,clif->pDull/*,XXX*/);
+	packet(0x0957,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0959,clif->pItemListWindowSelected,2,4,8);
+	packet(0x095b,clif->pWalkToXY,2);
+	packet(0x096a,clif->pFriendsListAdd,2);
 #endif
 
 // 2013-09-25aRagexeRE, 2013-09-25bRagexeRE
 #if PACKETVER == 20130925
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x086e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0875,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0876,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0885,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0887,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0890,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0940,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0958,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x095b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x095c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0969,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086d,clif->pStoragePassword,0);
+	packet(0x086e,clif->pPartyInvite2,2);
+	packet(0x0875,clif->pHomMenu,2,4);
+	packet(0x0876,clif->pMoveFromKafra,2,4);
+	packet(0x087d,clif->pDropItem,2,4);
+	packet(0x0885,clif->pChangeDir,2,4);
+	packet(0x0887,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088f,clif->pFriendsListAdd,2);
+	packet(0x0890,clif->pDull/*,XXX*/);
+	packet(0x0940,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0958,clif->pTakeItem,2);
+	packet(0x095a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x095b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x095c,clif->pMoveToKafra,2,4);
+	packet(0x0969,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-10-02aRagexeRE
 #if PACKETVER == 20131002
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0940,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pStoragePassword,0);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pTickSend,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0940,clif->pWalkToXY,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-10-08bRagexeRE
 #if PACKETVER == 20131008
-	packet(0x0202,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0362,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x07e4,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x083c,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x085d,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x085e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0863,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x086c,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0883,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0884,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0885,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0896,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x089c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a9,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0917,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0923,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0927,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0932,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0934,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0936,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x093c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0947,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0952,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0954,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0956,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x095d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0969,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
+	packet(0x0202,clif->pGetCharNameRequest,2);
+	packet(0x0362,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x07e4,clif->pActionRequest,2,6);
+	packet(0x083c,clif->pReqCloseBuyingStore,0);
+	packet(0x085d,clif->pDull/*,XXX*/);
+	packet(0x085e,clif->pWalkToXY,2);
+	packet(0x0863,clif->pPartyInvite2,2);
+	packet(0x086c,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086d,clif->pSolveCharName,2);
+	packet(0x0883,clif->pMoveToKafra,2,4);
+	packet(0x0884,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0885,clif->pDull/*,XXX*/);
+	packet(0x0896,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x089c,clif->pChangeDir,2,4);
+	packet(0x08a9,clif->pUseSkillToId,2,4,6);
+	packet(0x0917,clif->pMoveFromKafra,2,4);
+	packet(0x091c,clif->pTakeItem,2);
+	packet(0x0923,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0927,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0932,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0934,clif->pTickSend,2);
+	packet(0x0936,clif->pReqClickBuyingStore,2);
+	packet(0x093c,clif->pHomMenu,2,4);
+	packet(0x0947,clif->pStoragePassword,0);
+	packet(0x0952,clif->pDropItem,2,4);
+	packet(0x0954,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0956,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x095d,clif->pFriendsListAdd,2);
+	packet(0x0969,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #endif
 
 // 2013-10-16aRagexeRE, 2013-10-16bRagexeRE
 #if PACKETVER == 20131016
-	packet(0x022d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0281,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0361,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0364,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0366,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x07ec,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0802,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x085a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x085d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0863,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0864,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0867,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x086c,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0870,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0875,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0887,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0888,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x088b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0890,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0894,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x091a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x091e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0927,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0946,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x095e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0962,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0966,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x022d,clif->pMoveToKafra,2,4);
+	packet(0x0281,clif->pPartyInvite2,2);
+	packet(0x0361,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0364,clif->pDropItem,2,4);
+	packet(0x0366,clif->pReqClickBuyingStore,2);
+	packet(0x07ec,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0802,clif->pDull/*,XXX*/);
+	packet(0x085a,clif->pDull/*,XXX*/);
+	packet(0x085d,clif->pGetCharNameRequest,2);
+	packet(0x0863,clif->pUseSkillToId,2,4,6);
+	packet(0x0864,clif->pStoragePassword,0);
+	packet(0x0867,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x086c,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0870,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0875,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0887,clif->pTakeItem,2);
+	packet(0x0888,clif->pHomMenu,2,4);
+	packet(0x088b,clif->pFriendsListAdd,2);
+	packet(0x0890,clif->pSolveCharName,2);
+	packet(0x0894,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x091a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x091e,clif->pMoveFromKafra,2,4);
+	packet(0x091f,clif->pWalkToXY,2);
+	packet(0x0927,clif->pTickSend,2);
+	packet(0x0946,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x094e,clif->pReqCloseBuyingStore,0);
+	packet(0x095e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0962,clif->pActionRequest,2,6);
+	packet(0x0966,clif->pChangeDir,2,4);
 #endif
 
 // 2013-10-23aRagexeRE
 #if PACKETVER == 20131023
-	packet(0x0366,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0438,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0819,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0835,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x085b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0862,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x086e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0872,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0876,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0885,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x088f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a7,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08ab,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ac,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0919,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x091d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0923,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0924,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0935,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0937,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0944,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x094a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0951,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0954,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x095b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
+	packet(0x0366,clif->pReqCloseBuyingStore,0);
+	packet(0x0438,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0819,clif->pDropItem,2,4);
+	packet(0x0835,clif->pDull/*,XXX*/);
+	packet(0x085b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0862,clif->pDull/*,XXX*/);
+	packet(0x086e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0872,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0876,clif->pUseSkillToId,2,4,6);
+	packet(0x087f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0885,clif->pStoragePassword,0);
+	packet(0x088a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088b,clif->pTakeItem,2);
+	packet(0x088f,clif->pMoveToKafra,2,4);
+	packet(0x08a7,clif->pHomMenu,2,4);
+	packet(0x08ab,clif->pChangeDir,2,4);
+	packet(0x08ac,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0919,clif->pSolveCharName,2);
+	packet(0x091d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0923,clif->pActionRequest,2,6);
+	packet(0x0924,clif->pTickSend,2);
+	packet(0x0935,clif->pReqClickBuyingStore,2);
+	packet(0x0937,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0944,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x094a,clif->pFriendsListAdd,2);
+	packet(0x0951,clif->pGetCharNameRequest,2);
+	packet(0x0954,clif->pMoveFromKafra,2,4);
+	packet(0x095b,clif->pWalkToXY,2);
 #endif
 
 // 2013-10-30aRagexeRE
 #if PACKETVER == 20131030
-	packet(0x022d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0887,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a2,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0925,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pHomMenu,2,4);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087d,clif->pFriendsListAdd,2);
+	packet(0x0887,clif->pStoragePassword,0);
+	packet(0x08a2,clif->pDull/*,XXX*/);
+	packet(0x0925,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-11-06aRagexeRE
 #if PACKETVER == 20131106
-	packet(0x0281,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0363,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0369,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0436,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0802,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0817,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0866,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0867,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0870,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0875,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0887,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0891,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0893,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0894,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a2,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0919,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x091d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0929,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0935,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x093b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0942,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0946,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0947,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0948,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0950,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0954,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x095d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0962,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0967,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
+	packet(0x0281,clif->pGetCharNameRequest,2);
+	packet(0x0363,clif->pUseSkillToId,2,4,6);
+	packet(0x0369,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0436,clif->pStoragePassword,0);
+	packet(0x0802,clif->pChangeDir,2,4);
+	packet(0x0817,clif->pDull/*,XXX*/);
+	packet(0x0866,clif->pWalkToXY,2);
+	packet(0x0867,clif->pMoveToKafra,2,4);
+	packet(0x0870,clif->pReqCloseBuyingStore,0);
+	packet(0x0875,clif->pDropItem,2,4);
+	packet(0x0887,clif->pTickSend,2);
+	packet(0x0891,clif->pSolveCharName,2);
+	packet(0x0893,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0894,clif->pHomMenu,2,4);
+	packet(0x08a2,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0919,clif->pSearchStoreInfoNextPage,0);
+	packet(0x091d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0929,clif->pMoveFromKafra,2,4);
+	packet(0x0935,clif->pFriendsListAdd,2);
+	packet(0x093b,clif->pTakeItem,2);
+	packet(0x0942,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0946,clif->pReqClickBuyingStore,2);
+	packet(0x0947,clif->pActionRequest,2,6);
+	packet(0x0948,clif->pDull/*,XXX*/);
+	packet(0x0950,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0954,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x095d,clif->pPartyInvite2,2);
+	packet(0x0962,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0967,clif->pReqTradeBuyingStore,2,4,8,12);
 #endif
 
 // 2013-11-13aRagexeRE
 #if PACKETVER == 20131113
-	packet(0x0364,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x086d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0879,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x088c,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x088f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a8,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x091c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0920,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0926,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0927,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0928,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0929,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x092b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092d,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x092e,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x092f,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0934,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0936,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x093c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0949,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0950,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x095d,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x095f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0960,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0964,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0969,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
+	packet(0x0364,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x086d,clif->pReqCloseBuyingStore,0);
+	packet(0x0879,clif->pSearchStoreInfoNextPage,0);
+	packet(0x088c,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x088f,clif->pDropItem,2,4);
+	packet(0x089a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a4,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a8,clif->pDull/*,XXX*/);
+	packet(0x091c,clif->pMoveFromKafra,2,4);
+	packet(0x0920,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0926,clif->pHomMenu,2,4);
+	packet(0x0927,clif->pPartyInvite2,2);
+	packet(0x0928,clif->pStoragePassword,0);
+	packet(0x0929,clif->pTickSend,2);
+	packet(0x092b,clif->pTakeItem,2);
+	packet(0x092c,clif->pFriendsListAdd,2);
+	packet(0x092d,clif->pReqClickBuyingStore,2);
+	packet(0x092e,clif->pGetCharNameRequest,2);
+	packet(0x092f,clif->pSolveCharName,2);
+	packet(0x0934,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0936,clif->pWalkToXY,2);
+	packet(0x093c,clif->pChangeDir,2,4);
+	packet(0x0949,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0950,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x095d,clif->pActionRequest,2,6);
+	packet(0x095f,clif->pUseSkillToId,2,4,6);
+	packet(0x0960,clif->pMoveToKafra,2,4);
+	packet(0x0964,clif->pDull/*,XXX*/);
+	packet(0x0969,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
 #endif
 
 // 2013-11-20eRagexeRE
 #if PACKETVER == 20131120
-	packet(0x0361,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0368,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0802,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0811,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0817,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x085a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x085f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0862,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0884,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a1,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a8,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0917,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0926,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0927,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x092b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x092d,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x093e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x093f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0940,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0950,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0953,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0955,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0956,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x095e,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x0361,clif->pSolveCharName,2);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0368,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0802,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0811,clif->pDull/*,XXX*/);
+	packet(0x0817,clif->pTickSend,2);
+	packet(0x085a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x085f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0862,clif->pReqCloseBuyingStore,0);
+	packet(0x0884,clif->pUseSkillToId,2,4,6);
+	packet(0x088c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088d,clif->pFriendsListAdd,2);
+	packet(0x089e,clif->pTakeItem,2);
+	packet(0x08a1,clif->pHomMenu,2,4);
+	packet(0x08a4,clif->pStoragePassword,0);
+	packet(0x08a8,clif->pActionRequest,2,6);
+	packet(0x0917,clif->pDropItem,2,4);
+	packet(0x0926,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0927,clif->pMoveToKafra,2,4);
+	packet(0x092b,clif->pWalkToXY,2);
+	packet(0x092d,clif->pSearchStoreInfoNextPage,0);
+	packet(0x093e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x093f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0940,clif->pDull/*,XXX*/);
+	packet(0x0950,clif->pGetCharNameRequest,2);
+	packet(0x0953,clif->pPartyInvite2,2);
+	packet(0x0955,clif->pReqClickBuyingStore,2);
+	packet(0x0956,clif->pChangeDir,2,4);
+	packet(0x095e,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2013-11-27aRagexeRE, 2013-11-27bRagexeRE
 #if PACKETVER == 20131127
-	packet(0x035f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0364,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0365,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0366,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0881,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0884,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x088d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0894,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0930,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x093a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0940,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x094c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x095c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0967,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x096a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
+	packet(0x035f,clif->pReqClickBuyingStore,2);
+	packet(0x0364,clif->pGetCharNameRequest,2);
+	packet(0x0365,clif->pWalkToXY,2);
+	packet(0x0366,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pMoveFromKafra,2,4);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0881,clif->pDull/*,XXX*/);
+	packet(0x0884,clif->pHomMenu,2,4);
+	packet(0x088d,clif->pChangeDir,2,4);
+	packet(0x0894,clif->pStoragePassword,0);
+	packet(0x089e,clif->pDull/*,XXX*/);
+	packet(0x0930,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x093a,clif->pFriendsListAdd,2);
+	packet(0x0940,clif->pTickSend,2);
+	packet(0x094c,clif->pTakeItem,2);
+	packet(0x094f,clif->pDropItem,2,4);
+	packet(0x095c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0967,clif->pPartyInvite2,2);
+	packet(0x096a,clif->pMoveToKafra,2,4);
 #endif
 
 // 2013-12-04dRagexeRE, 2013-12-04eRagexeRE
 #if PACKETVER == 20131204
-	packet(0x0365,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0366,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x07e4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x07ec,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x085a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0862,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0869,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x086c,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0877,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0879,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x087f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0882,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a0,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08a4,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a7,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08ad,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x091f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0928,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x092d,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x092f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0932,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x093b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0941,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0951,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0958,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0959,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x095b,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0961,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0967,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
+	packet(0x0365,clif->pReqCloseBuyingStore,0);
+	packet(0x0366,clif->pTickSend,2);
+	packet(0x07e4,clif->pStoragePassword,0);
+	packet(0x07ec,clif->pReqClickBuyingStore,2);
+	packet(0x085a,clif->pPartyInvite2,2);
+	packet(0x0862,clif->pChangeDir,2,4);
+	packet(0x0869,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x086c,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0877,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0879,clif->pSolveCharName,2);
+	packet(0x087f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0882,clif->pFriendsListAdd,2);
+	packet(0x08a0,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08a4,clif->pDropItem,2,4);
+	packet(0x08a7,clif->pTakeItem,2);
+	packet(0x08ad,clif->pGetCharNameRequest,2);
+	packet(0x091f,clif->pHomMenu,2,4);
+	packet(0x0928,clif->pActionRequest,2,6);
+	packet(0x092d,clif->pUseSkillToId,2,4,6);
+	packet(0x092f,clif->pWalkToXY,2);
+	packet(0x0932,clif->pSearchStoreInfoNextPage,0);
+	packet(0x093b,clif->pDull/*,XXX*/);
+	packet(0x0941,clif->pMoveToKafra,2,4);
+	packet(0x0951,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0958,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0959,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x095b,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0961,clif->pDull/*,XXX*/);
+	packet(0x0967,clif->pMoveFromKafra,2,4);
 #endif
 
 // 2013-12-11cRagexeRE, 2013-12-11eRagexeRE
 #if PACKETVER == 20131211
-	packet(0x0202,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0366,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0865,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x086e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0873,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0881,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0886,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0892,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a3,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a4,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ab,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x092b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0931,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x094c,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pUseSkillToId,2,4,6);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0366,clif->pTakeItem,2);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pFriendsListAdd,2);
+	packet(0x0865,clif->pPartyInvite2,2);
+	packet(0x086e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0873,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0881,clif->pDull/*,XXX*/);
+	packet(0x0886,clif->pHomMenu,2,4);
+	packet(0x0892,clif->pMoveToKafra,2,4);
+	packet(0x08a3,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08a4,clif->pChangeDir,2,4);
+	packet(0x08ab,clif->pDropItem,2,4);
+	packet(0x092b,clif->pStoragePassword,0);
+	packet(0x0931,clif->pMoveFromKafra,2,4);
+	packet(0x094c,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-12-18aRagexeRE
 #if PACKETVER == 20131218
-	packet(0x022d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x087b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08ab,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0947,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pHomMenu,2,4);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085c,clif->pStoragePassword,0);
+	packet(0x087b,clif->pDull/*,XXX*/);
+	packet(0x08ab,clif->pFriendsListAdd,2);
+	packet(0x092f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0947,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-12-23bRagexeRE, 2013-12-23xRagexeRE
 #if PACKETVER == 20131223
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x08a4,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2013-12-30aRagexeRE
 #if PACKETVER == 20131230
-	packet(0x022d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x02c4,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x035f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0365,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0369,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0438,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0860,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0871,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x087b,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x087e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0895,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0898,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x089c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a9,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x091d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x091f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0926,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x092a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x093d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x093e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0943,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0949,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x094c,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0968,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0969,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x096a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
+	packet(0x022d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x02c4,clif->pUseSkillToId,2,4,6);
+	packet(0x035f,clif->pWalkToXY,2);
+	packet(0x0365,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0369,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0438,clif->pTickSend,2);
+	packet(0x0860,clif->pDropItem,2,4);
+	packet(0x0871,clif->pActionRequest,2,6);
+	packet(0x087b,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x087e,clif->pDull/*,XXX*/);
+	packet(0x087f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0895,clif->pMoveFromKafra,2,4);
+	packet(0x0898,clif->pSolveCharName,2);
+	packet(0x089c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a9,clif->pPartyInvite2,2);
+	packet(0x091d,clif->pStoragePassword,0);
+	packet(0x091e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x091f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0926,clif->pGetCharNameRequest,2);
+	packet(0x092a,clif->pTakeItem,2);
+	packet(0x093d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x093e,clif->pDull/*,XXX*/);
+	packet(0x0943,clif->pFriendsListAdd,2);
+	packet(0x0949,clif->pHomMenu,2,4);
+	packet(0x094a,clif->pChangeDir,2,4);
+	packet(0x094c,clif->pReqCloseBuyingStore,0);
+	packet(0x0968,clif->pMoveToKafra,2,4);
+	packet(0x0969,clif->pReqClickBuyingStore,2);
+	packet(0x096a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
 #endif
 
 // 2014-01-08bRagexeRE, 2014-01-08cRagexeRE
 #if PACKETVER == 20140108
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0936,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0936,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-01-15cRagexeRE, 2014-01-15dRagexeRE, 2014-01-15eRagexeRE
 #if PACKETVER == 20140115
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0367,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0865,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0887,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x088a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088e,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x089b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a7,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x092d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x095d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0965,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0966,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pDropItem,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0367,clif->pMoveFromKafra,2,4);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pGetCharNameRequest,2);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0865,clif->pStoragePassword,0);
+	packet(0x0887,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x088a,clif->pDull/*,XXX*/);
+	packet(0x088e,clif->pMoveToKafra,2,4);
+	packet(0x089b,clif->pFriendsListAdd,2);
+	packet(0x08a7,clif->pChangeDir,2,4);
+	packet(0x092d,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pTakeItem,2);
+	packet(0x095b,clif->pDull/*,XXX*/);
+	packet(0x095d,clif->pPartyInvite2,2);
+	packet(0x0965,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0966,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2014-01-22aRagexeRE
 #if PACKETVER == 20140122
-	packet(0x0360,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x07ec,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0811,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0863,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0870,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0871,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0872,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x088c,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0890,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0893,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0899,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x089d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08a2,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08aa,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0917,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x091a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0925,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x092f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0940,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0941,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0942,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x094c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0950,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0952,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0955,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0957,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x095d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x095f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
+	packet(0x0360,clif->pActionRequest,2,6);
+	packet(0x07ec,clif->pReqClickBuyingStore,2);
+	packet(0x0811,clif->pReqCloseBuyingStore,0);
+	packet(0x0863,clif->pHomMenu,2,4);
+	packet(0x0870,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0871,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0872,clif->pPartyInvite2,2);
+	packet(0x088c,clif->pDull/*,XXX*/);
+	packet(0x0890,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0893,clif->pFriendsListAdd,2);
+	packet(0x0899,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x089d,clif->pGetCharNameRequest,2);
+	packet(0x08a2,clif->pDull/*,XXX*/);
+	packet(0x08aa,clif->pDropItem,2,4);
+	packet(0x0917,clif->pTickSend,2);
+	packet(0x091a,clif->pChangeDir,2,4);
+	packet(0x0925,clif->pWalkToXY,2);
+	packet(0x092f,clif->pMoveToKafra,2,4);
+	packet(0x0940,clif->pUseSkillToId,2,4,6);
+	packet(0x0941,clif->pSolveCharName,2);
+	packet(0x0942,clif->pTakeItem,2);
+	packet(0x094b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x094c,clif->pMoveFromKafra,2,4);
+	packet(0x0950,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0952,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0955,clif->pStoragePassword,0);
+	packet(0x0957,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x095d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x095f,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #endif
 
 // 2014-01-29bRagexeRE
 #if PACKETVER == 20140129
-	packet(0x0281,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0367,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07ec,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0802,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0884,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0885,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0889,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0921,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0924,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x092c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0958,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0961,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pUseSkillToId,2,4,6);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pDull/*,XXX*/);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0367,clif->pDropItem,2,4);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07ec,clif->pChangeDir,2,4);
+	packet(0x0802,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pDull/*,XXX*/);
+	packet(0x0884,clif->pHomMenu,2,4);
+	packet(0x0885,clif->pTakeItem,2);
+	packet(0x0889,clif->pMoveFromKafra,2,4);
+	packet(0x0921,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0924,clif->pItemListWindowSelected,2,4,8);
+	packet(0x092c,clif->pStoragePassword,0);
+	packet(0x094d,clif->pMoveToKafra,2,4);
+	packet(0x0958,clif->pPartyInvite2,2);
+	packet(0x0961,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-02-05bRagexeRE
 #if PACKETVER == 20140205
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0938,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0938,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-02-12aRagexeRE
 #if PACKETVER == 20140212
-	packet(0x02c4,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0369,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0438,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x086e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0874,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0877,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0878,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x087e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0888,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x088c,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x089d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x089e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x08a0,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a1,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a7,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08ac,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08ad,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0919,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0928,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0930,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0934,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0936,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x093d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0944,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0952,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0953,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0960,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
+	packet(0x02c4,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0369,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0438,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x086e,clif->pUseSkillToId,2,4,6);
+	packet(0x0874,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0877,clif->pReqClickBuyingStore,2);
+	packet(0x0878,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x087e,clif->pWalkToXY,2);
+	packet(0x0888,clif->pMoveFromKafra,2,4);
+	packet(0x088c,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x089d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x089e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x08a0,clif->pStoragePassword,0);
+	packet(0x08a1,clif->pPartyInvite2,2);
+	packet(0x08a7,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08ac,clif->pMoveToKafra,2,4);
+	packet(0x08ad,clif->pDropItem,2,4);
+	packet(0x0919,clif->pChangeDir,2,4);
+	packet(0x091b,clif->pFriendsListAdd,2);
+	packet(0x0928,clif->pSolveCharName,2);
+	packet(0x0930,clif->pTickSend,2);
+	packet(0x0934,clif->pActionRequest,2,6);
+	packet(0x0936,clif->pDull/*,XXX*/);
+	packet(0x093d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0944,clif->pHomMenu,2,4);
+	packet(0x094e,clif->pDull/*,XXX*/);
+	packet(0x0952,clif->pGetCharNameRequest,2);
+	packet(0x0953,clif->pTakeItem,2);
+	packet(0x0960,clif->pReqCloseBuyingStore,0);
 #endif
 
 // 2014-02-19aRagexeRE, 2014-02-19bRagexeRE
 #if PACKETVER == 20140219
-	packet(0x0202,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0360,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0364,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0802,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0838,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x085c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x085d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x085f,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0860,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0868,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x086f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x087c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0889,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0898,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x089f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a6,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08aa,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08ac,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0921,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0927,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0939,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0946,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0949,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0953,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x095a,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0961,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
+	packet(0x0202,clif->pFriendsListAdd,2);
+	packet(0x0360,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pSolveCharName,2);
+	packet(0x0802,clif->pTakeItem,2);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0838,clif->pUseSkillToId,2,4,6);
+	packet(0x085b,clif->pReqClickBuyingStore,2);
+	packet(0x085c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x085d,clif->pWalkToXY,2);
+	packet(0x085f,clif->pGetCharNameRequest,2);
+	packet(0x0860,clif->pHomMenu,2,4);
+	packet(0x0868,clif->pStoragePassword,0);
+	packet(0x086f,clif->pPartyInvite2,2);
+	packet(0x087c,clif->pMoveToKafra,2,4);
+	packet(0x0889,clif->pDull/*,XXX*/);
+	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0898,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x089f,clif->pDropItem,2,4);
+	packet(0x08a6,clif->pChangeDir,2,4);
+	packet(0x08aa,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08ac,clif->pMoveFromKafra,2,4);
+	packet(0x0921,clif->pActionRequest,2,6);
+	packet(0x0927,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0939,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0946,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0949,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0953,clif->pSearchStoreInfoNextPage,0);
+	packet(0x095a,clif->pReqCloseBuyingStore,0);
+	packet(0x0961,clif->pTickSend,2);
 #endif
 
 // 2014-02-26aRagexeRE, 2014-02-26bRagexeRE
 #if PACKETVER == 20140226
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0362,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0364,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0867,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0877,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0887,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0894,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0895,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0921,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0931,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0941,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0962,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0964,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0969,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0362,clif->pFriendsListAdd,2);
+	packet(0x0364,clif->pStoragePassword,0);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pChangeDir,2,4);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0867,clif->pHomMenu,2,4);
+	packet(0x0877,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0887,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0894,clif->pDropItem,2,4);
+	packet(0x0895,clif->pMoveFromKafra,2,4);
+	packet(0x091a,clif->pMoveToKafra,2,4);
+	packet(0x0921,clif->pPartyInvite2,2);
+	packet(0x0931,clif->pDull/*,XXX*/);
+	packet(0x0941,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0962,clif->pDull/*,XXX*/);
+	packet(0x0964,clif->pTakeItem,2);
+	packet(0x0969,clif->pItemListWindowSelected,2,4,8);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-03-05aRagexeRE, 2014-03-05bRagexeRE
 #if PACKETVER == 20140305
-	packet(0x0202,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x07e4,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0878,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0934,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095e,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pTakeItem,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x07e4,clif->pFriendsListAdd,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pChangeDir,2,4);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0878,clif->pDull/*,XXX*/);
+	packet(0x0934,clif->pHomMenu,2,4);
+	packet(0x095e,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-03-12bRagexeRE
 #if PACKETVER == 20140312
-	packet(0x0202,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x023b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0366,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x085e,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x086f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0889,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x088d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088e,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0891,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0894,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x089b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x089e,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a6,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a9,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08ad,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x091b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x091c,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x091e,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x092a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0948,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x094c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0957,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x095d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x095e,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0966,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
+	packet(0x0202,clif->pUseSkillToId,2,4,6);
+	packet(0x023b,clif->pDull/*,XXX*/);
+	packet(0x0366,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x085e,clif->pReqClickBuyingStore,2);
+	packet(0x086f,clif->pTickSend,2);
+	packet(0x0889,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x088d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088e,clif->pActionRequest,2,6);
+	packet(0x0891,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0894,clif->pWalkToXY,2);
+	packet(0x089b,clif->pGetCharNameRequest,2);
+	packet(0x089d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x089e,clif->pDropItem,2,4);
+	packet(0x08a6,clif->pDull/*,XXX*/);
+	packet(0x08a9,clif->pFriendsListAdd,2);
+	packet(0x08ad,clif->pSolveCharName,2);
+	packet(0x091b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x091c,clif->pPartyInvite2,2);
+	packet(0x091e,clif->pHomMenu,2,4);
+	packet(0x092a,clif->pTakeItem,2);
+	packet(0x0948,clif->pReqCloseBuyingStore,0);
+	packet(0x094a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x094b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x094c,clif->pChangeDir,2,4);
+	packet(0x0957,clif->pMoveFromKafra,2,4);
+	packet(0x095d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x095e,clif->pStoragePassword,0);
+	packet(0x0966,clif->pMoveToKafra,2,4);
 #endif
 
 // 2014-03-19aRagexeRE
 #if PACKETVER == 20140319
-	packet(0x02c4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07e4,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0802,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0811,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0815,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x085a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0864,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0865,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0866,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x086e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0872,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0883,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x088e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0890,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0893,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x089f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08a2,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091f,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0923,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0933,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0942,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0944,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0947,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x094c,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0954,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0955,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0964,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x096a,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
+	packet(0x02c4,clif->pTakeItem,2);
+	packet(0x07e4,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0802,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0811,clif->pReqClickBuyingStore,2);
+	packet(0x0815,clif->pHomMenu,2,4);
+	packet(0x085a,clif->pWalkToXY,2);
+	packet(0x0864,clif->pActionRequest,2,6);
+	packet(0x0865,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0866,clif->pChangeDir,2,4);
+	packet(0x086e,clif->pDull/*,XXX*/);
+	packet(0x0872,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0883,clif->pDropItem,2,4);
+	packet(0x088e,clif->pPartyInvite2,2);
+	packet(0x0890,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0893,clif->pDull/*,XXX*/);
+	packet(0x089f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08a2,clif->pMoveToKafra,2,4);
+	packet(0x091f,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0923,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0933,clif->pReqCloseBuyingStore,0);
+	packet(0x0942,clif->pStoragePassword,0);
+	packet(0x0944,clif->pUseSkillToId,2,4,6);
+	packet(0x0947,clif->pMoveFromKafra,2,4);
+	packet(0x094c,clif->pGetCharNameRequest,2);
+	packet(0x0954,clif->pFriendsListAdd,2);
+	packet(0x0955,clif->pTickSend,2);
+	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0964,clif->pSolveCharName,2);
+	packet(0x096a,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #endif
 
 // 2014-03-26cRagexeRE
 #if PACKETVER == 20140326
-	packet(0x0362,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0365,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x07ec,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x083c,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x085b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0865,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0867,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0869,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x086b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x087f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0887,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0898,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08aa,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08ac,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x08ad,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0918,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0928,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x092a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x093d,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0942,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0945,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0946,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0956,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0959,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x095a,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x095c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0969,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
+	packet(0x0362,clif->pGetCharNameRequest,2);
+	packet(0x0365,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x07ec,clif->pTakeItem,2);
+	packet(0x083c,clif->pReqClickBuyingStore,2);
+	packet(0x085b,clif->pReqCloseBuyingStore,0);
+	packet(0x0865,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0867,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0869,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x086b,clif->pMoveFromKafra,2,4);
+	packet(0x087c,clif->pWalkToXY,2);
+	packet(0x087e,clif->pFriendsListAdd,2);
+	packet(0x087f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0887,clif->pDull/*,XXX*/);
+	packet(0x0898,clif->pDropItem,2,4);
+	packet(0x08aa,clif->pDull/*,XXX*/);
+	packet(0x08ac,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x08ad,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0918,clif->pTickSend,2);
+	packet(0x0928,clif->pSearchStoreInfoNextPage,0);
+	packet(0x092a,clif->pStoragePassword,0);
+	packet(0x093d,clif->pActionRequest,2,6);
+	packet(0x0942,clif->pHomMenu,2,4);
+	packet(0x0945,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0946,clif->pPartyInvite2,2);
+	packet(0x0956,clif->pChangeDir,2,4);
+	packet(0x0959,clif->pMoveToKafra,2,4);
+	packet(0x095a,clif->pSolveCharName,2);
+	packet(0x095c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0969,clif->pUseSkillToId,2,4,6);
 #endif
 
 // 2014-04-02eRagexeRE, 2014-04-02fRagexeRE
 #if PACKETVER == 20140402
-	packet(0x023b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0360,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0364,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07ec,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x085b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x085d,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0867,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0868,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0882,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0883,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x088c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0890,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0896,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x089a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08ac,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x091f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0920,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0926,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0933,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x093f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0944,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0946,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x094c,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0950,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0958,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0965,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
+	packet(0x023b,clif->pReqClickBuyingStore,2);
+	packet(0x0360,clif->pChangeDir,2,4);
+	packet(0x0364,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07ec,clif->pSolveCharName,2);
+	packet(0x085b,clif->pMoveFromKafra,2,4);
+	packet(0x085d,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0867,clif->pReqCloseBuyingStore,0);
+	packet(0x0868,clif->pUseSkillToId,2,4,6);
+	packet(0x0882,clif->pDropItem,2,4);
+	packet(0x0883,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088a,clif->pGetCharNameRequest,2);
+	packet(0x088c,clif->pDull/*,XXX*/);
+	packet(0x0890,clif->pPartyInvite2,2);
+	packet(0x0896,clif->pHomMenu,2,4);
+	packet(0x089a,clif->pFriendsListAdd,2);
+	packet(0x08ac,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x091f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0920,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0926,clif->pStoragePassword,0);
+	packet(0x092d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0933,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x093f,clif->pWalkToXY,2);
+	packet(0x0944,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0946,clif->pActionRequest,2,6);
+	packet(0x094c,clif->pDull/*,XXX*/);
+	packet(0x0950,clif->pTickSend,2);
+	packet(0x0958,clif->pTakeItem,2);
+	packet(0x095c,clif->pMoveToKafra,2,4);
+	packet(0x0965,clif->pSearchStoreInfoListItemClick,2,6,10);
 #endif
 
 // 2014-04-09aRagexeRE
 #if PACKETVER == 20140409
-	packet(0x0819,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x085b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0868,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x086a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0873,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0875,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x087e,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0883,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0884,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x088a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0890,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0893,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0896,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0899,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a2,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a4,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08a6,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x08a7,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a9,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0918,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x092e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0942,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0947,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x095a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x095e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
+	packet(0x0819,clif->pMoveFromKafra,2,4);
+	packet(0x085b,clif->pSolveCharName,2);
+	packet(0x0868,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x086a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0873,clif->pReqCloseBuyingStore,0);
+	packet(0x0875,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x087e,clif->pTickSend,2);
+	packet(0x0883,clif->pWalkToXY,2);
+	packet(0x0884,clif->pGetCharNameRequest,2);
+	packet(0x088a,clif->pDull/*,XXX*/);
+	packet(0x0890,clif->pTakeItem,2);
+	packet(0x0893,clif->pActionRequest,2,6);
+	packet(0x0896,clif->pUseSkillToId,2,4,6);
+	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0899,clif->pFriendsListAdd,2);
+	packet(0x08a2,clif->pDull/*,XXX*/);
+	packet(0x08a4,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08a6,clif->pSearchStoreInfoNextPage,0);
+	packet(0x08a7,clif->pChangeDir,2,4);
+	packet(0x08a9,clif->pStoragePassword,0);
+	packet(0x0918,clif->pDropItem,2,4);
+	packet(0x091c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x092e,clif->pPartyInvite2,2);
+	packet(0x0942,clif->pMoveToKafra,2,4);
+	packet(0x0947,clif->pHomMenu,2,4);
+	packet(0x094c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x095a,clif->pReqClickBuyingStore,2);
+	packet(0x095e,clif->pWantToConnection,2,6,10,14,18);
 #endif
 
 // 2014-04-16aRagexeRE
 #if PACKETVER == 20140416
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x095c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x095c,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-04-23aRagexeRE
 #if PACKETVER == 20140423
-	packet(0x022d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0360,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0436,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0811,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x083c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x085a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x085b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0862,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0863,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0866,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x086b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x086f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0873,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0890,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0895,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0896,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0898,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x089b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x089d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089f,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08a8,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08ad,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x091a,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0920,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x094f,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x095e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
+	packet(0x022d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0360,clif->pStoragePassword,0);
+	packet(0x0436,clif->pFriendsListAdd,2);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x0811,clif->pMoveFromKafra,2,4);
+	packet(0x083c,clif->pChangeDir,2,4);
+	packet(0x085a,clif->pSearchStoreInfoNextPage,0);
+	packet(0x085b,clif->pWalkToXY,2);
+	packet(0x0862,clif->pMoveToKafra,2,4);
+	packet(0x0863,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0866,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x086b,clif->pDropItem,2,4);
+	packet(0x086f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0873,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088b,clif->pSolveCharName,2);
+	packet(0x0890,clif->pUseSkillToId,2,4,6);
+	packet(0x0895,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0896,clif->pActionRequest,2,6);
+	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0898,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x089b,clif->pReqClickBuyingStore,2);
+	packet(0x089d,clif->pGetCharNameRequest,2);
+	packet(0x089f,clif->pReqCloseBuyingStore,0);
+	packet(0x08a8,clif->pHomMenu,2,4);
+	packet(0x08ad,clif->pDull/*,XXX*/);
+	packet(0x091a,clif->pTickSend,2);
+	packet(0x0920,clif->pPartyInvite2,2);
+	packet(0x094f,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x095e,clif->pDull/*,XXX*/);
 #endif
 
 // 2014-04-30aRagexeRE
 #if PACKETVER == 20140430
-	packet(0x023b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x035f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0363,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0860,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0870,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0871,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0875,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087f,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0884,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0899,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a1,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0940,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x094b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0953,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0956,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
+	packet(0x023b,clif->pTickSend,2);
+	packet(0x035f,clif->pStoragePassword,0);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0363,clif->pUseSkillToId,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pDropItem,2,4);
+	packet(0x0860,clif->pFriendsListAdd,2);
+	packet(0x0870,clif->pPartyInvite2,2);
+	packet(0x0871,clif->pHomMenu,2,4);
+	packet(0x0875,clif->pMoveFromKafra,2,4);
+	packet(0x087f,clif->pTakeItem,2);
+	packet(0x0884,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0899,clif->pChangeDir,2,4);
+	packet(0x08a1,clif->pDull/*,XXX*/);
+	packet(0x093b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0940,clif->pGetCharNameRequest,2);
+	packet(0x094b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0953,clif->pDull/*,XXX*/);
+	packet(0x0956,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pSolveCharName,2);
 #endif
 
 // 2014-05-08bRagexeRE
 #if PACKETVER == 20140508
-	packet(0x022d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x02c4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0366,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0368,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0802,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0861,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0886,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x089b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08ab,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0927,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0930,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0932,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0934,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x094e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x022d,clif->pSolveCharName,2);
+	packet(0x02c4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pChangeDir,2,4);
+	packet(0x0366,clif->pPartyInvite2,2);
+	packet(0x0368,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pHomMenu,2,4);
+	packet(0x0802,clif->pGetCharNameRequest,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0861,clif->pTakeItem,2);
+	packet(0x0886,clif->pMoveToKafra,2,4);
+	packet(0x089b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08ab,clif->pDull/*,XXX*/);
+	packet(0x0927,clif->pStoragePassword,0);
+	packet(0x0930,clif->pMoveFromKafra,2,4);
+	packet(0x0932,clif->pDropItem,2,4);
+	packet(0x0934,clif->pDull/*,XXX*/);
+	packet(0x094e,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2014-05-14bRagexeRE, 2014-05-14cRagexeRE
 #if PACKETVER == 20140514
-	packet(0x0437,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0817,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0865,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0867,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0868,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0876,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0877,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0885,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0886,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x088a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x088b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0895,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x089a,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x089c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a5,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0918,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x091d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0921,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0925,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x092c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x092f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x094d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0958,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0962,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0965,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x096a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
+	packet(0x0437,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0817,clif->pDull/*,XXX*/);
+	packet(0x0865,clif->pActionRequest,2,6);
+	packet(0x0867,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0868,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0876,clif->pUseSkillToId,2,4,6);
+	packet(0x0877,clif->pDull/*,XXX*/);
+	packet(0x087d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0885,clif->pStoragePassword,0);
+	packet(0x0886,clif->pTickSend,2);
+	packet(0x088a,clif->pChangeDir,2,4);
+	packet(0x088b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0895,clif->pTakeItem,2);
+	packet(0x089a,clif->pSolveCharName,2);
+	packet(0x089c,clif->pFriendsListAdd,2);
+	packet(0x08a5,clif->pGetCharNameRequest,2);
+	packet(0x0918,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x091d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0921,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0925,clif->pReqClickBuyingStore,2);
+	packet(0x092c,clif->pMoveToKafra,2,4);
+	packet(0x092f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x094d,clif->pReqCloseBuyingStore,0);
+	packet(0x094e,clif->pMoveFromKafra,2,4);
+	packet(0x0958,clif->pHomMenu,2,4);
+	packet(0x095f,clif->pWalkToXY,2);
+	packet(0x0962,clif->pPartyInvite2,2);
+	packet(0x0965,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x096a,clif->pDropItem,2,4);
 #endif
 
 // 2014-05-21aRagexeRE
 #if PACKETVER == 20140521
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0869,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x089c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08ac,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0968,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0869,clif->pStoragePassword,0);
+	packet(0x088b,clif->pDull/*,XXX*/);
+	packet(0x088d,clif->pChangeDir,2,4);
+	packet(0x089c,clif->pFriendsListAdd,2);
+	packet(0x08ac,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0968,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-05-28aRagexeRE
 #if PACKETVER == 20140528
-	packet(0x0202,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0360,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x085f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0862,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0872,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0875,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0877,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0879,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x088a,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x088f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0894,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0896,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x089d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a4,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08a8,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x08ab,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x091d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0929,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0930,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0938,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x093a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x093f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x094a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x094b,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x095f,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0963,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0964,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0966,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
+	packet(0x0202,clif->pWalkToXY,2);
+	packet(0x0360,clif->pStoragePassword,0);
+	packet(0x085f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0862,clif->pSolveCharName,2);
+	packet(0x0872,clif->pHomMenu,2,4);
+	packet(0x0875,clif->pDropItem,2,4);
+	packet(0x0877,clif->pTickSend,2);
+	packet(0x0879,clif->pMoveFromKafra,2,4);
+	packet(0x087e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x088a,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x088f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0894,clif->pDull/*,XXX*/);
+	packet(0x0896,clif->pItemListWindowSelected,2,4,8);
+	packet(0x089d,clif->pTakeItem,2);
+	packet(0x08a4,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08a8,clif->pSearchStoreInfoNextPage,0);
+	packet(0x08ab,clif->pDull/*,XXX*/);
+	packet(0x091d,clif->pFriendsListAdd,2);
+	packet(0x0929,clif->pActionRequest,2,6);
+	packet(0x0930,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0938,clif->pReqCloseBuyingStore,0);
+	packet(0x093a,clif->pMoveToKafra,2,4);
+	packet(0x093f,clif->pPartyInvite2,2);
+	packet(0x094a,clif->pReqClickBuyingStore,2);
+	packet(0x094b,clif->pChangeDir,2,4);
+	packet(0x095f,clif->pGetCharNameRequest,2);
+	packet(0x0963,clif->pUseSkillToId,2,4,6);
+	packet(0x0964,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0966,clif->pReqTradeBuyingStore,2,4,8,12);
 #endif
 
 // 2014-06-05aRagexeRE
 #if PACKETVER == 20140605
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0369,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0921,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0931,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x094c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pReqCloseBuyingStore,0);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pActionRequest,2,6);
+	packet(0x0369,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pChangeDir,2,4);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0921,clif->pStoragePassword,0);
+	packet(0x0931,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pSolveCharName,2);
+	packet(0x094c,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-06-11bRagexeRE
 #if PACKETVER == 20140611
-	packet(0x0364,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0438,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x07e4,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0838,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0864,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0867,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x086c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0874,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0878,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x088c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0891,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0893,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0894,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x089b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a1,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a2,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0924,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0936,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0941,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x094f,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0950,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0951,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0952,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0957,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0958,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0963,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0965,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0969,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
+	packet(0x0364,clif->pReqCloseBuyingStore,0);
+	packet(0x0438,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x07e4,clif->pMoveToKafra,2,4);
+	packet(0x0838,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0864,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0867,clif->pTickSend,2);
+	packet(0x086c,clif->pDull/*,XXX*/);
+	packet(0x0874,clif->pPartyInvite2,2);
+	packet(0x0878,clif->pTakeItem,2);
+	packet(0x088c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0891,clif->pActionRequest,2,6);
+	packet(0x0893,clif->pWalkToXY,2);
+	packet(0x0894,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x089b,clif->pFriendsListAdd,2);
+	packet(0x08a1,clif->pUseSkillToId,2,4,6);
+	packet(0x08a2,clif->pDull/*,XXX*/);
+	packet(0x0924,clif->pGetCharNameRequest,2);
+	packet(0x0936,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0941,clif->pStoragePassword,0);
+	packet(0x094a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x094f,clif->pSolveCharName,2);
+	packet(0x0950,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0951,clif->pChangeDir,2,4);
+	packet(0x0952,clif->pMoveFromKafra,2,4);
+	packet(0x0957,clif->pReqClickBuyingStore,2);
+	packet(0x0958,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0963,clif->pDropItem,2,4);
+	packet(0x0965,clif->pHomMenu,2,4);
+	packet(0x0969,clif->pSearchStoreInfoNextPage,0);
 #endif
 
 // 2014-06-18cRagexeRE
 #if PACKETVER == 20140618
-	packet(0x085d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x085f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0860,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0861,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x086c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0878,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x087d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0884,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0885,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0886,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0890,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0892,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08a7,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08ac,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0917,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x091f,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0929,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0935,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0938,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0939,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x093b,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0945,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0954,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0957,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x095d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x095e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0962,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0967,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
+	packet(0x085d,clif->pMoveToKafra,2,4);
+	packet(0x085f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0860,clif->pTickSend,2);
+	packet(0x0861,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x086c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0878,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x087d,clif->pSolveCharName,2);
+	packet(0x0884,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0885,clif->pMoveFromKafra,2,4);
+	packet(0x0886,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0890,clif->pChangeDir,2,4);
+	packet(0x0892,clif->pUseSkillToId,2,4,6);
+	packet(0x08a6,clif->pReqClickBuyingStore,2);
+	packet(0x08a7,clif->pWalkToXY,2);
+	packet(0x08ac,clif->pDull/*,XXX*/);
+	packet(0x0917,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x091f,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0929,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0935,clif->pTakeItem,2);
+	packet(0x0938,clif->pPartyInvite2,2);
+	packet(0x0939,clif->pReqCloseBuyingStore,0);
+	packet(0x093b,clif->pActionRequest,2,6);
+	packet(0x0945,clif->pDropItem,2,4);
+	packet(0x0954,clif->pFriendsListAdd,2);
+	packet(0x0957,clif->pStoragePassword,0);
+	packet(0x095d,clif->pGetCharNameRequest,2);
+	packet(0x095e,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0962,clif->pDull/*,XXX*/);
+	packet(0x0967,clif->pHomMenu,2,4);
 #endif
 
 // 2014-06-25aRagexeRE
 #if PACKETVER == 20140625
-	packet(0x0202,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x023b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0815,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0817,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0835,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x085a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0861,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0875,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x087b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0885,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0886,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0888,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x088a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0897,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a1,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a2,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0923,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0928,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0940,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0946,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0959,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0960,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0968,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0969,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pMoveToKafra,2,4);
+	packet(0x023b,clif->pMoveFromKafra,2,4);
+	packet(0x0815,clif->pDull/*,XXX*/);
+	packet(0x0817,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0835,clif->pWalkToXY,2);
+	packet(0x085a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0861,clif->pUseSkillToId,2,4,6);
+	packet(0x086b,clif->pPartyInvite2,2);
+	packet(0x0875,clif->pSolveCharName,2);
+	packet(0x087b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0885,clif->pDropItem,2,4);
+	packet(0x0886,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0888,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x088a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088e,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0897,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08a1,clif->pTickSend,2);
+	packet(0x08a2,clif->pChangeDir,2,4);
+	packet(0x091a,clif->pTakeItem,2);
+	packet(0x0923,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0928,clif->pReqCloseBuyingStore,0);
+	packet(0x0940,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0946,clif->pHomMenu,2,4);
+	packet(0x094e,clif->pDull/*,XXX*/);
+	packet(0x0959,clif->pActionRequest,2,6);
+	packet(0x0960,clif->pStoragePassword,0);
+	packet(0x0968,clif->pReqClickBuyingStore,2);
+	packet(0x0969,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-07-02aRagexeRE
 #if PACKETVER == 20140702
-	packet(0x022d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x023b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0364,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0438,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x07e4,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0835,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x086c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0887,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0892,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0895,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a0,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a2,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0925,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x092c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0933,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0940,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x023b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0364,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pFriendsListAdd,2);
+	packet(0x0438,clif->pMoveToKafra,2,4);
+	packet(0x07e4,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pStoragePassword,0);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pHomMenu,2,4);
+	packet(0x0835,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pDropItem,2,4);
+	packet(0x086c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0887,clif->pWalkToXY,2);
+	packet(0x0892,clif->pMoveFromKafra,2,4);
+	packet(0x0895,clif->pDull/*,XXX*/);
+	packet(0x08a0,clif->pPartyInvite2,2);
+	packet(0x08a2,clif->pTakeItem,2);
+	packet(0x0925,clif->pChangeDir,2,4);
+	packet(0x092c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0933,clif->pDull/*,XXX*/);
+	packet(0x0940,clif->pSearchStoreInfoNextPage,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-07-09aRagexeRE
 #if PACKETVER == 20140709
-	packet(0x0364,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0437,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0860,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0866,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0869,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0875,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0877,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0879,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x087a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0887,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0888,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0894,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0897,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0898,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08ad,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0925,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x092f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0931,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0934,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0939,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x093f,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0940,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x094d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x094f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0961,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
+	packet(0x0364,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0437,clif->pActionRequest,2,6);
+	packet(0x0860,clif->pStoragePassword,0);
+	packet(0x0866,clif->pDull/*,XXX*/);
+	packet(0x0869,clif->pChangeDir,2,4);
+	packet(0x0875,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0877,clif->pUseSkillToId,2,4,6);
+	packet(0x0879,clif->pGetCharNameRequest,2);
+	packet(0x087a,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0887,clif->pMoveToKafra,2,4);
+	packet(0x0888,clif->pDull/*,XXX*/);
+	packet(0x088b,clif->pPartyInvite2,2);
+	packet(0x0894,clif->pReqCloseBuyingStore,0);
+	packet(0x0897,clif->pReqClickBuyingStore,2);
+	packet(0x0898,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08ad,clif->pDropItem,2,4);
+	packet(0x091a,clif->pWalkToXY,2);
+	packet(0x0925,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x092f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0931,clif->pSolveCharName,2);
+	packet(0x0934,clif->pTickSend,2);
+	packet(0x0939,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x093f,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0940,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x094d,clif->pHomMenu,2,4);
+	packet(0x094e,clif->pMoveFromKafra,2,4);
+	packet(0x094f,clif->pFriendsListAdd,2);
+	packet(0x095f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0961,clif->pTakeItem,2);
 #endif
 
 // 2014-07-16aRagexeRE
 #if PACKETVER == 20140716
-	packet(0x0362,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x07e4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0811,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085c,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x085f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0868,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0871,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0881,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x088d,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0896,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x089a,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x089f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08a2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08a4,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08ac,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0918,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x091f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0926,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x092c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092f,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0938,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x093b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0947,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0952,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0958,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0959,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0969,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
+	packet(0x0362,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x07e4,clif->pStoragePassword,0);
+	packet(0x0811,clif->pActionRequest,2,6);
+	packet(0x085c,clif->pGetCharNameRequest,2);
+	packet(0x085f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0868,clif->pPartyInvite2,2);
+	packet(0x0871,clif->pMoveToKafra,2,4);
+	packet(0x0881,clif->pUseSkillToId,2,4,6);
+	packet(0x088b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x088d,clif->pDull/*,XXX*/);
+	packet(0x088f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0896,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x089a,clif->pSolveCharName,2);
+	packet(0x089f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08a2,clif->pReqCloseBuyingStore,0);
+	packet(0x08a4,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08ac,clif->pHomMenu,2,4);
+	packet(0x0918,clif->pWalkToXY,2);
+	packet(0x091f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0926,clif->pDropItem,2,4);
+	packet(0x092c,clif->pFriendsListAdd,2);
+	packet(0x092f,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0938,clif->pMoveFromKafra,2,4);
+	packet(0x093b,clif->pReqClickBuyingStore,2);
+	packet(0x0947,clif->pDull/*,XXX*/);
+	packet(0x0952,clif->pChangeDir,2,4);
+	packet(0x0958,clif->pTakeItem,2);
+	packet(0x0959,clif->pTickSend,2);
+	packet(0x0969,clif->pItemListWindowSelected,2,4,8);
 #endif
 
 // 2014-07-23aRagexeRE, 2014-07-23bRagexeRE
 #if PACKETVER == 20140723
-	packet(0x02c4,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0364,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0368,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0436,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0819,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0838,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x085f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0869,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x086d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x087d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0888,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0891,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0896,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0898,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x089e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08a2,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08ad,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0927,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x092f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0934,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0935,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0939,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x093d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0945,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0947,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0948,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0960,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x02c4,clif->pTickSend,2);
+	packet(0x0364,clif->pStoragePassword,0);
+	packet(0x0368,clif->pGetCharNameRequest,2);
+	packet(0x0436,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0819,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0838,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pSearchStoreInfoNextPage,0);
+	packet(0x085f,clif->pWalkToXY,2);
+	packet(0x0869,clif->pMoveToKafra,2,4);
+	packet(0x086d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x087d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0888,clif->pReqClickBuyingStore,2);
+	packet(0x0891,clif->pReqCloseBuyingStore,0);
+	packet(0x0896,clif->pDropItem,2,4);
+	packet(0x0898,clif->pDull/*,XXX*/);
+	packet(0x089e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08a2,clif->pMoveFromKafra,2,4);
+	packet(0x08ad,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0927,clif->pSolveCharName,2);
+	packet(0x092f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0934,clif->pFriendsListAdd,2);
+	packet(0x0935,clif->pPartyInvite2,2);
+	packet(0x0939,clif->pItemListWindowSelected,2,4,8);
+	packet(0x093d,clif->pTakeItem,2);
+	packet(0x0945,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0947,clif->pActionRequest,2,6);
+	packet(0x0948,clif->pHomMenu,2,4);
+	packet(0x095f,clif->pDull/*,XXX*/);
+	packet(0x0960,clif->pChangeDir,2,4);
 #endif
 
 // 2014-07-30bRagexeRE
 #if PACKETVER == 20140730
-	packet(0x022d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0364,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0366,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0367,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0437,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x07ec,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0802,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0815,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0817,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x085f,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x087d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x087f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0889,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x088b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x088d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0892,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a0,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08a7,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a9,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x08ad,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0924,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x092a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0934,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0940,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0946,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
+	packet(0x022d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0364,clif->pGetCharNameRequest,2);
+	packet(0x0366,clif->pUseSkillToId,2,4,6);
+	packet(0x0367,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0437,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x07ec,clif->pDull/*,XXX*/);
+	packet(0x0802,clif->pDull/*,XXX*/);
+	packet(0x0815,clif->pFriendsListAdd,2);
+	packet(0x0817,clif->pActionRequest,2,6);
+	packet(0x085e,clif->pWalkToXY,2);
+	packet(0x085f,clif->pReqCloseBuyingStore,0);
+	packet(0x087d,clif->pMoveFromKafra,2,4);
+	packet(0x087e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x087f,clif->pDropItem,2,4);
+	packet(0x0889,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x088b,clif->pTickSend,2);
+	packet(0x088d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0892,clif->pMoveToKafra,2,4);
+	packet(0x08a0,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a6,clif->pReqClickBuyingStore,2);
+	packet(0x08a7,clif->pSolveCharName,2);
+	packet(0x08a9,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x08ad,clif->pStoragePassword,0);
+	packet(0x091e,clif->pPartyInvite2,2);
+	packet(0x0924,clif->pSearchStoreInfoNextPage,0);
+	packet(0x092a,clif->pTakeItem,2);
+	packet(0x0934,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0940,clif->pChangeDir,2,4);
+	packet(0x0946,clif->pHomMenu,2,4);
 #endif
 
 // 2014-08-06aRagexeRE
 #if PACKETVER == 20140806
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0948,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0948,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-08-13aRagexeRE
 #if PACKETVER == 20140813
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0365,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0802,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0868,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0878,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087c,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0882,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0895,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0897,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0899,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a3,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a7,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08ab,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0967,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0365,clif->pStoragePassword,0);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0802,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0868,clif->pHomMenu,2,4);
+	packet(0x0878,clif->pChangeDir,2,4);
+	packet(0x087c,clif->pPartyInvite2,2);
+	packet(0x0882,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0895,clif->pMoveFromKafra,2,4);
+	packet(0x0897,clif->pFriendsListAdd,2);
+	packet(0x0899,clif->pDropItem,2,4);
+	packet(0x08a3,clif->pTakeItem,2);
+	packet(0x08a7,clif->pDull/*,XXX*/);
+	packet(0x08ab,clif->pDull/*,XXX*/);
+	packet(0x0967,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-08-20aRagexeRE
 #if PACKETVER == 20140820
-	packet(0x035f,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0835,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0861,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0864,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0869,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x086c,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0872,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0876,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0891,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0899,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x089a,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x089b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a3,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a7,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x091d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x092f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0936,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0937,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x093a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x093e,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x094a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0951,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0952,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0956,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0958,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x035f,clif->pReqCloseBuyingStore,0);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0835,clif->pChangeDir,2,4);
+	packet(0x0861,clif->pTickSend,2);
+	packet(0x0864,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0869,clif->pDull/*,XXX*/);
+	packet(0x086c,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086e,clif->pPartyInvite2,2);
+	packet(0x0872,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0876,clif->pDropItem,2,4);
+	packet(0x0891,clif->pGetCharNameRequest,2);
+	packet(0x0899,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x089a,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x089b,clif->pMoveFromKafra,2,4);
+	packet(0x08a3,clif->pWalkToXY,2);
+	packet(0x08a7,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x091d,clif->pSolveCharName,2);
+	packet(0x092f,clif->pUseSkillToId,2,4,6);
+	packet(0x0936,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0937,clif->pHomMenu,2,4);
+	packet(0x093a,clif->pStoragePassword,0);
+	packet(0x093e,clif->pReqClickBuyingStore,2);
+	packet(0x094a,clif->pFriendsListAdd,2);
+	packet(0x0951,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0952,clif->pActionRequest,2,6);
+	packet(0x0956,clif->pMoveToKafra,2,4);
+	packet(0x0958,clif->pDull/*,XXX*/);
+	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2014-08-27aRagexeRE
 #if PACKETVER == 20140827
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0943,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0943,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-09-03aRagexeRE
 #if PACKETVER == 20140903
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x089b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0931,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0941,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0943,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0945,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x088f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x089b,clif->pFriendsListAdd,2);
+	packet(0x0931,clif->pHomMenu,2,4);
+	packet(0x0941,clif->pStoragePassword,0);
+	packet(0x0943,clif->pDull/*,XXX*/);
+	packet(0x0945,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-09-17cRagexeRE
 #if PACKETVER == 20140917
-	packet(0x022d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0364,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0365,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0367,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0369,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0838,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0864,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0889,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0895,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0897,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0898,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089c,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08a8,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0919,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x091e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x092a,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0930,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0949,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x094f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0951,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0955,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0956,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0957,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x095a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x095c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x095e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0966,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
+	packet(0x022d,clif->pPartyInvite2,2);
+	packet(0x0364,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0365,clif->pMoveToKafra,2,4);
+	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0367,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0369,clif->pSolveCharName,2);
+	packet(0x0838,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0864,clif->pTakeItem,2);
+	packet(0x086d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0889,clif->pActionRequest,2,6);
+	packet(0x0895,clif->pHomMenu,2,4);
+	packet(0x0897,clif->pTickSend,2);
+	packet(0x0898,clif->pGetCharNameRequest,2);
+	packet(0x089c,clif->pReqClickBuyingStore,2);
+	packet(0x08a8,clif->pStoragePassword,0);
+	packet(0x0919,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x091e,clif->pReqCloseBuyingStore,0);
+	packet(0x092a,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0930,clif->pMoveFromKafra,2,4);
+	packet(0x0949,clif->pUseSkillToId,2,4,6);
+	packet(0x094f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0951,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0955,clif->pFriendsListAdd,2);
+	packet(0x0956,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0957,clif->pDull/*,XXX*/);
+	packet(0x095a,clif->pDropItem,2,4);
+	packet(0x095c,clif->pWalkToXY,2);
+	packet(0x095e,clif->pChangeDir,2,4);
+	packet(0x0966,clif->pDull/*,XXX*/);
 #endif
 
 // 2014-09-24bRagexeRE, 2014-09-24cRagexeRE
 #if PACKETVER == 20140924
-	packet(0x0366,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0367,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x07e4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0815,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0862,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0864,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0865,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0867,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x086b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x086d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086e,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0886,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x088b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0894,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0898,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x089c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a5,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a7,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0918,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x091b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0925,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0926,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0928,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x092d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0934,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0949,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0952,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
+	packet(0x0366,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0367,clif->pPartyInvite2,2);
+	packet(0x07e4,clif->pStoragePassword,0);
+	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0815,clif->pWalkToXY,2);
+	packet(0x0862,clif->pDull/*,XXX*/);
+	packet(0x0864,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0865,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0867,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x086b,clif->pReqCloseBuyingStore,0);
+	packet(0x086d,clif->pTakeItem,2);
+	packet(0x086e,clif->pHomMenu,2,4);
+	packet(0x0886,clif->pGetCharNameRequest,2);
+	packet(0x088b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0894,clif->pActionRequest,2,6);
+	packet(0x0898,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x089c,clif->pMoveToKafra,2,4);
+	packet(0x08a5,clif->pSolveCharName,2);
+	packet(0x08a7,clif->pUseSkillToId,2,4,6);
+	packet(0x0918,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x091b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0925,clif->pDull/*,XXX*/);
+	packet(0x0926,clif->pTickSend,2);
+	packet(0x0928,clif->pMoveFromKafra,2,4);
+	packet(0x092b,clif->pReqClickBuyingStore,2);
+	packet(0x092d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0934,clif->pChangeDir,2,4);
+	packet(0x0949,clif->pDropItem,2,4);
+	packet(0x0952,clif->pFriendsListAdd,2);
 #endif
 
 // 2014-10-01bRagexeRE, 2014-10-01cRagexeRE
 #if PACKETVER == 20141001
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0365,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0884,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0885,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x089d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08ad,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x092a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0937,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0939,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093f,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0952,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pDropItem,2,4);
+	packet(0x0365,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pMoveFromKafra,2,4);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087c,clif->pMoveToKafra,2,4);
+	packet(0x0884,clif->pPartyInvite2,2);
+	packet(0x0885,clif->pGetCharNameRequest,2);
+	packet(0x089c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x089d,clif->pFriendsListAdd,2);
+	packet(0x08ad,clif->pChangeDir,2,4);
+	packet(0x091c,clif->pDull/*,XXX*/);
+	packet(0x092a,clif->pStoragePassword,0);
+	packet(0x0937,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0939,clif->pDull/*,XXX*/);
+	packet(0x093f,clif->pTakeItem,2);
+	packet(0x094b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0952,clif->pHomMenu,2,4);
 #endif
 
 // 2014-10-08bRagexeRE, 2014-10-08cRagexeRE
 #if PACKETVER == 20141008
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0942,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0942,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-10-15bRagexeRE, 2014-10-16aRagexeRE
 #if PACKETVER == 20141015 || \
     PACKETVER == 20141016
-	packet(0x022d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0922,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0936,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0967,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pMoveFromKafra,2,4);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pHomMenu,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086e,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0922,clif->pDull/*,XXX*/);
+	packet(0x0936,clif->pStoragePassword,0);
+	packet(0x094b,clif->pFriendsListAdd,2);
+	packet(0x0967,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-10-22aRagexeRE
 #if PACKETVER == 20141022
-	packet(0x023b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0878,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0896,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0899,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08aa,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08ab,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08ad,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0940,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x094e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0955,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pStoragePassword,0);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0878,clif->pMoveToKafra,2,4);
+	packet(0x087d,clif->pDropItem,2,4);
+	packet(0x0896,clif->pPartyInvite2,2);
+	packet(0x0899,clif->pHomMenu,2,4);
+	packet(0x08aa,clif->pMoveFromKafra,2,4);
+	packet(0x08ab,clif->pDull/*,XXX*/);
+	packet(0x08ad,clif->pChangeDir,2,4);
+	packet(0x091a,clif->pFriendsListAdd,2);
+	packet(0x092b,clif->pDull/*,XXX*/);
+	packet(0x093b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0940,clif->pSearchStoreInfoNextPage,0);
+	packet(0x094e,clif->pTakeItem,2);
+	packet(0x0955,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-10-29aRagexeRE
 #if PACKETVER == 20141029
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0940,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pWalkToXY,2);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pStoragePassword,0);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0940,clif->pActionRequest,2,6);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-11-05aRagexeRE, 2014-11-05bRagexeRE
 #if PACKETVER == 20141105
-	packet(0x022d,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x035f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0360,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x085c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0863,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0864,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0865,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0871,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0874,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0875,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0877,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0879,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0887,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0892,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0898,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a0,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a7,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08ad,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x091e,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x092b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x093e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0944,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0948,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0950,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0957,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x095f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0968,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x022d,clif->pDull/*,XXX*/);
+	packet(0x035f,clif->pUseSkillToId,2,4,6);
+	packet(0x0360,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x085c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0863,clif->pGetCharNameRequest,2);
+	packet(0x0864,clif->pTickSend,2);
+	packet(0x0865,clif->pFriendsListAdd,2);
+	packet(0x0871,clif->pStoragePassword,0);
+	packet(0x0874,clif->pDull/*,XXX*/);
+	packet(0x0875,clif->pActionRequest,2,6);
+	packet(0x0877,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0879,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0887,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0892,clif->pDropItem,2,4);
+	packet(0x0898,clif->pMoveFromKafra,2,4);
+	packet(0x08a0,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a5,clif->pChangeDir,2,4);
+	packet(0x08a7,clif->pReqCloseBuyingStore,0);
+	packet(0x08ad,clif->pMoveToKafra,2,4);
+	packet(0x091d,clif->pSolveCharName,2);
+	packet(0x091e,clif->pReqClickBuyingStore,2);
+	packet(0x092b,clif->pTakeItem,2);
+	packet(0x093e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0944,clif->pHomMenu,2,4);
+	packet(0x0948,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0950,clif->pPartyInvite2,2);
+	packet(0x0957,clif->pWalkToXY,2);
+	packet(0x095f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0968,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2014-11-12aRagexeRE
 #if PACKETVER == 20141112
-	packet(0x0362,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0438,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x07e4,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0835,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0838,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x083c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x085f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0863,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0869,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x086c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0871,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0885,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0886,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0887,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x088d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x08a0,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a1,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08ab,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0919,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0926,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0929,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0943,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x094b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x094c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x094f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0955,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x095d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0960,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0962,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
+	packet(0x0362,clif->pFriendsListAdd,2);
+	packet(0x0438,clif->pSolveCharName,2);
+	packet(0x07e4,clif->pReqCloseBuyingStore,0);
+	packet(0x0835,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0838,clif->pSearchStoreInfoNextPage,0);
+	packet(0x083c,clif->pMoveToKafra,2,4);
+	packet(0x085f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0863,clif->pUseSkillToId,2,4,6);
+	packet(0x0869,clif->pGetCharNameRequest,2);
+	packet(0x086c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0871,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0885,clif->pChangeDir,2,4);
+	packet(0x0886,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0887,clif->pPartyInvite2,2);
+	packet(0x088d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x08a0,clif->pWalkToXY,2);
+	packet(0x08a1,clif->pReqClickBuyingStore,2);
+	packet(0x08ab,clif->pStoragePassword,0);
+	packet(0x0919,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0926,clif->pHomMenu,2,4);
+	packet(0x0929,clif->pActionRequest,2,6);
+	packet(0x0943,clif->pDropItem,2,4);
+	packet(0x094b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x094c,clif->pDull/*,XXX*/);
+	packet(0x094f,clif->pDull/*,XXX*/);
+	packet(0x0955,clif->pMoveFromKafra,2,4);
+	packet(0x095d,clif->pTickSend,2);
+	packet(0x0960,clif->pTakeItem,2);
+	packet(0x0962,clif->pUseSkillToPos,2,4,6,8);
 #endif
 
 // 2014-11-19bRagexeRE
 #if PACKETVER == 20141119
-	packet(0x0202,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x085a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0861,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0865,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0866,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0872,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0873,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0875,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x087c,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0885,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0887,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0888,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x088d,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0895,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a8,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08aa,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0918,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0920,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0921,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0929,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0933,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0938,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0940,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0941,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0942,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0948,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x094c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0963,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
+	packet(0x0202,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x085a,clif->pReqClickBuyingStore,2);
+	packet(0x0861,clif->pFriendsListAdd,2);
+	packet(0x0865,clif->pPartyInvite2,2);
+	packet(0x0866,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0872,clif->pActionRequest,2,6);
+	packet(0x0873,clif->pUseSkillToId,2,4,6);
+	packet(0x0875,clif->pGetCharNameRequest,2);
+	packet(0x087c,clif->pSolveCharName,2);
+	packet(0x0885,clif->pDull/*,XXX*/);
+	packet(0x0887,clif->pReqCloseBuyingStore,0);
+	packet(0x0888,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x088d,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0895,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a8,clif->pTakeItem,2);
+	packet(0x08aa,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0918,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0920,clif->pChangeDir,2,4);
+	packet(0x0921,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0929,clif->pMoveFromKafra,2,4);
+	packet(0x092f,clif->pDull/*,XXX*/);
+	packet(0x0933,clif->pStoragePassword,0);
+	packet(0x0938,clif->pTickSend,2);
+	packet(0x0940,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0941,clif->pMoveToKafra,2,4);
+	packet(0x0942,clif->pHomMenu,2,4);
+	packet(0x0948,clif->pWalkToXY,2);
+	packet(0x094c,clif->pDropItem,2,4);
+	packet(0x0963,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
 #endif
 
 // 2014-11-26aRagexeRE, 2014-11-26bRagexeRE, 2014-11-26cRagexeRE, 2014-11-26dRagexeRE, 2014-11-26eRagexeRE
 #if PACKETVER == 20141126
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0367,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0871,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0884,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0896,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a4,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ad,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0920,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0942,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0965,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0367,clif->pDull/*,XXX*/);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086e,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0871,clif->pMoveFromKafra,2,4);
+	packet(0x0884,clif->pDull/*,XXX*/);
+	packet(0x0896,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a4,clif->pChangeDir,2,4);
+	packet(0x08ad,clif->pStoragePassword,0);
+	packet(0x0920,clif->pDropItem,2,4);
+	packet(0x0942,clif->pFriendsListAdd,2);
+	packet(0x095a,clif->pTakeItem,2);
+	packet(0x095b,clif->pHomMenu,2,4);
+	packet(0x095f,clif->pMoveToKafra,2,4);
+	packet(0x0965,clif->pPartyInvite2,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-12-03aRagexeRE
 #if PACKETVER == 20141203
-	packet(0x0202,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0281,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0362,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0367,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0368,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0802,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0861,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x086c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x086d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x086e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x087b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0880,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0889,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0898,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x089d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08a5,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08aa,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0917,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x091c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x091d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0928,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x092a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0936,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0957,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x095c,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0962,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
+	packet(0x0202,clif->pSolveCharName,2);
+	packet(0x0281,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0362,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0367,clif->pGetCharNameRequest,2);
+	packet(0x0368,clif->pDull/*,XXX*/);
+	packet(0x0802,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0861,clif->pMoveToKafra,2,4);
+	packet(0x086c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x086d,clif->pMoveFromKafra,2,4);
+	packet(0x086e,clif->pTakeItem,2);
+	packet(0x087b,clif->pWalkToXY,2);
+	packet(0x087e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0880,clif->pChangeDir,2,4);
+	packet(0x0889,clif->pFriendsListAdd,2);
+	packet(0x0898,clif->pStoragePassword,0);
+	packet(0x089c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x089d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08a5,clif->pActionRequest,2,6);
+	packet(0x08aa,clif->pDropItem,2,4);
+	packet(0x0917,clif->pSearchStoreInfoNextPage,0);
+	packet(0x091c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x091d,clif->pPartyInvite2,2);
+	packet(0x0928,clif->pTickSend,2);
+	packet(0x092a,clif->pDull/*,XXX*/);
+	packet(0x0936,clif->pHomMenu,2,4);
+	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0957,clif->pReqCloseBuyingStore,0);
+	packet(0x095c,clif->pReqClickBuyingStore,2);
+	packet(0x0962,clif->pUseSkillToId,2,4,6);
 #endif
 
 // 2014-12-10cRagexeRE
 #if PACKETVER == 20141210
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0885,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08ac,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0917,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0927,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x092b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0947,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0954,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0955,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0958,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0961,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0963,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0967,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pHomMenu,2,4);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pChangeDir,2,4);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087b,clif->pTakeItem,2);
+	packet(0x0885,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08ac,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0917,clif->pPartyInvite2,2);
+	packet(0x0927,clif->pDull/*,XXX*/);
+	packet(0x092b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0947,clif->pDull/*,XXX*/);
+	packet(0x0954,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0955,clif->pMoveFromKafra,2,4);
+	packet(0x0958,clif->pDropItem,2,4);
+	packet(0x0961,clif->pFriendsListAdd,2);
+	packet(0x0963,clif->pStoragePassword,0);
+	packet(0x0967,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2014-12-17aRagexeRE
 #if PACKETVER == 20141217
-	packet(0x0360,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x085b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0860,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x086c,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0875,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0878,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0879,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0883,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0889,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x088e,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x089f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a1,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08a2,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a8,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08ab,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08ac,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0919,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0924,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0930,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0932,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0933,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0936,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0939,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0940,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0944,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0945,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0948,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0960,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
+	packet(0x0360,clif->pMoveToKafra,2,4);
+	packet(0x085b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0860,clif->pStoragePassword,0);
+	packet(0x086c,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0875,clif->pMoveFromKafra,2,4);
+	packet(0x0878,clif->pWalkToXY,2);
+	packet(0x0879,clif->pHomMenu,2,4);
+	packet(0x0883,clif->pTakeItem,2);
+	packet(0x0889,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x088e,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x089f,clif->pDropItem,2,4);
+	packet(0x08a1,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08a2,clif->pDull/*,XXX*/);
+	packet(0x08a8,clif->pPartyInvite2,2);
+	packet(0x08ab,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08ac,clif->pTickSend,2);
+	packet(0x0919,clif->pChangeDir,2,4);
+	packet(0x091f,clif->pUseSkillToId,2,4,6);
+	packet(0x0924,clif->pActionRequest,2,6);
+	packet(0x0930,clif->pReqCloseBuyingStore,0);
+	packet(0x0932,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0933,clif->pFriendsListAdd,2);
+	packet(0x0936,clif->pGetCharNameRequest,2);
+	packet(0x0939,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0940,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0944,clif->pReqClickBuyingStore,2);
+	packet(0x0945,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0948,clif->pSolveCharName,2);
+	packet(0x0960,clif->pDull/*,XXX*/);
 #endif
 
 // 2014-12-23cRagexeRE
 #if PACKETVER == 20141223
-	packet(0x0361,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0438,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0835,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x085a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x085e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0865,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0867,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x086c,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0870,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x087b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x089a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x089b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a3,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a8,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08ac,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0930,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0932,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0945,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0946,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0949,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x094f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0950,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0953,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0956,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x095b,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x095f,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
+	packet(0x0361,clif->pMoveToKafra,2,4);
+	packet(0x0438,clif->pFriendsListAdd,2);
+	packet(0x0835,clif->pItemListWindowSelected,2,4,8);
+	packet(0x085a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x085e,clif->pReqCloseBuyingStore,0);
+	packet(0x0865,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0867,clif->pHomMenu,2,4);
+	packet(0x086c,clif->pReqClickBuyingStore,2);
+	packet(0x0870,clif->pChangeDir,2,4);
+	packet(0x087a,clif->pTakeItem,2);
+	packet(0x087b,clif->pDull/*,XXX*/);
+	packet(0x089a,clif->pWalkToXY,2);
+	packet(0x089b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08a3,clif->pPartyInvite2,2);
+	packet(0x08a4,clif->pStoragePassword,0);
+	packet(0x08a8,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08ac,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0930,clif->pDropItem,2,4);
+	packet(0x0932,clif->pDull/*,XXX*/);
+	packet(0x093a,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0945,clif->pTickSend,2);
+	packet(0x0946,clif->pGetCharNameRequest,2);
+	packet(0x0949,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x094f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0950,clif->pSolveCharName,2);
+	packet(0x0953,clif->pMoveFromKafra,2,4);
+	packet(0x0956,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x095b,clif->pUseSkillToId,2,4,6);
+	packet(0x095f,clif->pActionRequest,2,6);
 #endif
 
 // 2014-12-31aRagexeRE
 #if PACKETVER == 20141231
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086d,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-01-07aRagexeRE
 #if PACKETVER == 20150107
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0895,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0943,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0947,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087c,clif->pFriendsListAdd,2);
+	packet(0x0895,clif->pStoragePassword,0);
+	packet(0x092d,clif->pHomMenu,2,4);
+	packet(0x0943,clif->pChangeDir,2,4);
+	packet(0x0947,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-01-14aRagexeRE
 #if PACKETVER == 20150114
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0868,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0899,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0946,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0955,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0957,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pUseSkillToId,2,4,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0868,clif->pFriendsListAdd,2);
+	packet(0x0899,clif->pHomMenu,2,4);
+	packet(0x0946,clif->pStoragePassword,0);
+	packet(0x0955,clif->pDull/*,XXX*/);
+	packet(0x0957,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-01-21aRagexeRE, 2015-01-21bRagexeRE
 #if PACKETVER == 20150121
-	packet(0x0281,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x089e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ab,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0918,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0919,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0955,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0959,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0963,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0967,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087c,clif->pDull/*,XXX*/);
+	packet(0x088b,clif->pFriendsListAdd,2);
+	packet(0x089d,clif->pHomMenu,2,4);
+	packet(0x089e,clif->pChangeDir,2,4);
+	packet(0x08ab,clif->pStoragePassword,0);
+	packet(0x0918,clif->pDull/*,XXX*/);
+	packet(0x0919,clif->pDropItem,2,4);
+	packet(0x091d,clif->pTakeItem,2);
+	packet(0x0955,clif->pMoveToKafra,2,4);
+	packet(0x0959,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0963,clif->pMoveFromKafra,2,4);
+	packet(0x0967,clif->pPartyInvite2,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-01-28aRagexeRE
 #if PACKETVER == 20150128
-	packet(0x0202,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x023b,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x035f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0365,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0368,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0838,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085a,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0864,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x086d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0870,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0874,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0875,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0876,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x087d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0888,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x089a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08ab,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0927,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0929,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092d,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0938,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x093a,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0944,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x094d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0963,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0968,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
+	packet(0x0202,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x023b,clif->pChangeDir,2,4);
+	packet(0x035f,clif->pReqClickBuyingStore,2);
+	packet(0x0365,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0368,clif->pDull/*,XXX*/);
+	packet(0x0838,clif->pActionRequest,2,6);
+	packet(0x085a,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0864,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x086d,clif->pMoveToKafra,2,4);
+	packet(0x0870,clif->pWalkToXY,2);
+	packet(0x0874,clif->pGetCharNameRequest,2);
+	packet(0x0875,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0876,clif->pHomMenu,2,4);
+	packet(0x087d,clif->pSolveCharName,2);
+	packet(0x0888,clif->pItemListWindowSelected,2,4,8);
+	packet(0x089a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08ab,clif->pTakeItem,2);
+	packet(0x091f,clif->pTickSend,2);
+	packet(0x0927,clif->pPartyInvite2,2);
+	packet(0x0929,clif->pStoragePassword,0);
+	packet(0x092d,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0938,clif->pDull/*,XXX*/);
+	packet(0x093a,clif->pUseSkillToId,2,4,6);
+	packet(0x0944,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x094d,clif->pReqCloseBuyingStore,0);
+	packet(0x094e,clif->pMoveFromKafra,2,4);
+	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0963,clif->pFriendsListAdd,2);
+	packet(0x0968,clif->pDropItem,2,4);
 #endif
 
 // 2015-02-04cRagexeRE
 #if PACKETVER == 20150204
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0966,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0966,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-02-11aRagexeRE
 #if PACKETVER == 20150211
-	packet(0x023b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0368,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0369,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0436,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0437,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x07e4,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0817,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0819,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0835,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0862,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0863,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0870,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0873,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x087f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0882,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0883,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0885,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0886,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x089c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a0,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a4,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08aa,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0919,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0920,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0944,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0951,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0957,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0958,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
+	packet(0x023b,clif->pDull/*,XXX*/);
+	packet(0x0368,clif->pHomMenu,2,4);
+	packet(0x0369,clif->pChangeDir,2,4);
+	packet(0x0436,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0437,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x07e4,clif->pDropItem,2,4);
+	packet(0x0817,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0819,clif->pReqCloseBuyingStore,0);
+	packet(0x0835,clif->pDull/*,XXX*/);
+	packet(0x0862,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0863,clif->pUseSkillToId,2,4,6);
+	packet(0x0870,clif->pTakeItem,2);
+	packet(0x0873,clif->pWalkToXY,2);
+	packet(0x087b,clif->pGetCharNameRequest,2);
+	packet(0x087f,clif->pStoragePassword,0);
+	packet(0x0882,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0883,clif->pMoveFromKafra,2,4);
+	packet(0x0885,clif->pTickSend,2);
+	packet(0x0886,clif->pReqClickBuyingStore,2);
+	packet(0x089c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08a0,clif->pFriendsListAdd,2);
+	packet(0x08a4,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08aa,clif->pActionRequest,2,6);
+	packet(0x0919,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0920,clif->pSolveCharName,2);
+	packet(0x0944,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0951,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0957,clif->pPartyInvite2,2);
+	packet(0x0958,clif->pMoveToKafra,2,4);
 #endif
 
 // 2015-02-17aRagexeRE
 #if PACKETVER == 20150217
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085b,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-02-25aRagexeRE, 2015-02-25bRagexeRE, 2015-02-25cRagexeRE, 2015-02-25dRagexeRE, 2015-02-25eRagexeRE, 2015-02-26aRagexeRE
 #if PACKETVER == 20150225 || \
     PACKETVER == 20150226
-	packet(0x02c4,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0362,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0819,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0867,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0885,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0896,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x089b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x089c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0940,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0946,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0948,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x094f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0952,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0955,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
+	packet(0x02c4,clif->pReqClickBuyingStore,2);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pPartyInvite2,2);
+	packet(0x0362,clif->pReqCloseBuyingStore,0);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pGetCharNameRequest,2);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pTakeItem,2);
+	packet(0x0819,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0867,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0885,clif->pDull/*,XXX*/);
+	packet(0x0896,clif->pItemListWindowSelected,2,4,8);
+	packet(0x089b,clif->pDull/*,XXX*/);
+	packet(0x089c,clif->pMoveToKafra,2,4);
+	packet(0x08a4,clif->pStoragePassword,0);
+	packet(0x0940,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0946,clif->pFriendsListAdd,2);
+	packet(0x0948,clif->pDropItem,2,4);
+	packet(0x094f,clif->pHomMenu,2,4);
+	packet(0x0952,clif->pMoveFromKafra,2,4);
+	packet(0x0955,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pWantToConnection,2,6,10,14,18);
 #endif
 
 // 2015-03-04aRagexeRE, 2015-03-04bRagexeRE
 #if PACKETVER == 20150304
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0862,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x086d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0879,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0892,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x093a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0947,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x095d,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0960,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0961,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pTakeItem,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pDull/*,XXX*/);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0862,clif->pMoveFromKafra,2,4);
+	packet(0x086d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0879,clif->pChangeDir,2,4);
+	packet(0x087e,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0892,clif->pStoragePassword,0);
+	packet(0x089a,clif->pPartyInvite2,2);
+	packet(0x093a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0947,clif->pMoveToKafra,2,4);
+	packet(0x095d,clif->pDull/*,XXX*/);
+	packet(0x0960,clif->pFriendsListAdd,2);
+	packet(0x0961,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-03-11aRagexeRE, 2015-03-11bRagexeRE
 #if PACKETVER == 20150311
-	packet(0x023b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0360,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0436,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0438,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0838,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x086a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x086c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x087b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0883,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0886,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0888,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0896,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a1,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a3,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a5,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08a6,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x091c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0928,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x092a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x092e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x093b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0943,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0946,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0957,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0958,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x095b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0963,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0964,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
+	packet(0x023b,clif->pHomMenu,2,4);
+	packet(0x0360,clif->pReqCloseBuyingStore,0);
+	packet(0x0436,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0438,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0838,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x086a,clif->pGetCharNameRequest,2);
+	packet(0x086c,clif->pStoragePassword,0);
+	packet(0x087b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0883,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0886,clif->pWalkToXY,2);
+	packet(0x0888,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0896,clif->pActionRequest,2,6);
+	packet(0x08a1,clif->pUseSkillToId,2,4,6);
+	packet(0x08a3,clif->pTakeItem,2);
+	packet(0x08a5,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08a6,clif->pFriendsListAdd,2);
+	packet(0x091c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0928,clif->pChangeDir,2,4);
+	packet(0x092a,clif->pDull/*,XXX*/);
+	packet(0x092e,clif->pMoveFromKafra,2,4);
+	packet(0x093b,clif->pPartyInvite2,2);
+	packet(0x0943,clif->pSolveCharName,2);
+	packet(0x0946,clif->pDull/*,XXX*/);
+	packet(0x0957,clif->pReqClickBuyingStore,2);
+	packet(0x0958,clif->pTickSend,2);
+	packet(0x095b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0963,clif->pDropItem,2,4);
+	packet(0x0964,clif->pMoveToKafra,2,4);
 #endif
 
 // 2015-03-18aRagexeRE, 2015-03-18bRagexeRE, 2015-03-18cRagexeRE
 #if PACKETVER == 20150318
-	packet(0x0202,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x023b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0281,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x07e4,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0802,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0862,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0863,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0873,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0885,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0889,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x088c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x089c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a4,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x091d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0920,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0927,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0928,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0936,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0937,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0938,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x093a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x093c,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x094c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0951,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0958,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0959,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0960,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x0202,clif->pDull/*,XXX*/);
+	packet(0x023b,clif->pTickSend,2);
+	packet(0x0281,clif->pDull/*,XXX*/);
+	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x07e4,clif->pFriendsListAdd,2);
+	packet(0x0802,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0862,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0863,clif->pReqClickBuyingStore,2);
+	packet(0x0873,clif->pStoragePassword,0);
+	packet(0x0885,clif->pReqCloseBuyingStore,0);
+	packet(0x0889,clif->pActionRequest,2,6);
+	packet(0x088c,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x089c,clif->pMoveToKafra,2,4);
+	packet(0x08a4,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x091d,clif->pMoveFromKafra,2,4);
+	packet(0x0920,clif->pDropItem,2,4);
+	packet(0x0927,clif->pChangeDir,2,4);
+	packet(0x0928,clif->pTakeItem,2);
+	packet(0x0936,clif->pUseSkillToId,2,4,6);
+	packet(0x0937,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0938,clif->pPartyInvite2,2);
+	packet(0x093a,clif->pWalkToXY,2);
+	packet(0x093c,clif->pSolveCharName,2);
+	packet(0x094c,clif->pHomMenu,2,4);
+	packet(0x0951,clif->pGetCharNameRequest,2);
+	packet(0x0958,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0959,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0960,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2015-03-25bRagexeRE, 2015-03-25cRagexeRE
 #if PACKETVER == 20150325
-	packet(0x0202,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0363,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0365,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0438,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0802,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0819,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x085d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x086f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x087c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0883,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0885,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0891,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0893,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0897,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0899,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a1,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a7,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0919,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0931,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0932,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0938,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0947,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0950,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0954,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0969,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
+	packet(0x0202,clif->pPartyInvite2,2);
+	packet(0x0363,clif->pDropItem,2,4);
+	packet(0x0365,clif->pUseSkillToId,2,4,6);
+	packet(0x0438,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0802,clif->pDull/*,XXX*/);
+	packet(0x0819,clif->pReqClickBuyingStore,2);
+	packet(0x085d,clif->pSolveCharName,2);
+	packet(0x086f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x087c,clif->pMoveToKafra,2,4);
+	packet(0x087e,clif->pChangeDir,2,4);
+	packet(0x0883,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0885,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0891,clif->pGetCharNameRequest,2);
+	packet(0x0893,clif->pDull/*,XXX*/);
+	packet(0x0897,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0899,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08a1,clif->pActionRequest,2,6);
+	packet(0x08a7,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0919,clif->pStoragePassword,0);
+	packet(0x092c,clif->pTakeItem,2);
+	packet(0x0931,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0932,clif->pWalkToXY,2);
+	packet(0x0938,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pFriendsListAdd,2);
+	packet(0x0947,clif->pReqCloseBuyingStore,0);
+	packet(0x094a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0950,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0954,clif->pTickSend,2);
+	packet(0x0969,clif->pMoveFromKafra,2,4);
 #endif
 
 // 2015-04-01bRagexeRE
 #if PACKETVER == 20150401
-	packet(0x0362,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0367,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0437,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x083c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x085e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x086f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0875,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x087e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x088f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0895,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0898,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x089c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a5,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x091c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0922,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0924,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0938,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0939,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x093a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x093b,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x093e,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0946,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0949,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094b,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0953,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095f,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0964,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x0362,clif->pActionRequest,2,6);
+	packet(0x0367,clif->pGetCharNameRequest,2);
+	packet(0x0437,clif->pReqClickBuyingStore,2);
+	packet(0x083c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x085e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x086f,clif->pWalkToXY,2);
+	packet(0x0875,clif->pItemListWindowSelected,2,4,8);
+	packet(0x087e,clif->pDull/*,XXX*/);
+	packet(0x088c,clif->pDropItem,2,4);
+	packet(0x088f,clif->pTickSend,2);
+	packet(0x0895,clif->pMoveFromKafra,2,4);
+	packet(0x0898,clif->pHomMenu,2,4);
+	packet(0x089c,clif->pStoragePassword,0);
+	packet(0x08a5,clif->pMoveToKafra,2,4);
+	packet(0x091b,clif->pPartyInvite2,2);
+	packet(0x091c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0922,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0924,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0938,clif->pReqCloseBuyingStore,0);
+	packet(0x0939,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x093a,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x093b,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x093e,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0946,clif->pDull/*,XXX*/);
+	packet(0x0949,clif->pTakeItem,2);
+	packet(0x094b,clif->pUseSkillToId,2,4,6);
+	packet(0x0953,clif->pFriendsListAdd,2);
+	packet(0x095f,clif->pSolveCharName,2);
+	packet(0x0964,clif->pChangeDir,2,4);
 #endif
 
 // 2015-04-08aRagexeRE
 #if PACKETVER == 20150408
-	packet(0x0819,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x085a,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x085c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085e,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0865,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0868,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x086b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x086e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0878,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x087e,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x087f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0888,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0889,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0891,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0898,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a2,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a4,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x091b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x091e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0922,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x092a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0946,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0955,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0957,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0959,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0963,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
+	packet(0x0819,clif->pMoveFromKafra,2,4);
+	packet(0x085a,clif->pTickSend,2);
+	packet(0x085c,clif->pUseSkillToId,2,4,6);
+	packet(0x085e,clif->pHomMenu,2,4);
+	packet(0x0865,clif->pActionRequest,2,6);
+	packet(0x0868,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x086b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x086e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0878,clif->pPartyInvite2,2);
+	packet(0x087e,clif->pGetCharNameRequest,2);
+	packet(0x087f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0888,clif->pMoveToKafra,2,4);
+	packet(0x0889,clif->pStoragePassword,0);
+	packet(0x0891,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0898,clif->pDropItem,2,4);
+	packet(0x089c,clif->pWalkToXY,2);
+	packet(0x08a2,clif->pSolveCharName,2);
+	packet(0x08a4,clif->pFriendsListAdd,2);
+	packet(0x091b,clif->pDull/*,XXX*/);
+	packet(0x091e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0922,clif->pChangeDir,2,4);
+	packet(0x092a,clif->pDull/*,XXX*/);
+	packet(0x0946,clif->pReqCloseBuyingStore,0);
+	packet(0x094f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0955,clif->pReqClickBuyingStore,2);
+	packet(0x0957,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0959,clif->pTakeItem,2);
+	packet(0x095e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0963,clif->pSearchStoreInfoNextPage,0);
 #endif
 
 // 2015-04-15aRagexeRE
 #if PACKETVER == 20150415
-	packet(0x0361,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0364,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0366,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0368,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0802,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0817,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0835,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x085e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0863,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0867,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0868,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0869,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x086c,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0880,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0891,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0898,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a0,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0922,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092e,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x093c,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x093e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0941,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0946,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0953,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x095c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0960,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x0361,clif->pMoveToKafra,2,4);
+	packet(0x0364,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0366,clif->pWalkToXY,2);
+	packet(0x0368,clif->pReqClickBuyingStore,2);
+	packet(0x0802,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0817,clif->pTakeItem,2);
+	packet(0x0835,clif->pDropItem,2,4);
+	packet(0x085e,clif->pDull/*,XXX*/);
+	packet(0x0863,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0867,clif->pPartyInvite2,2);
+	packet(0x0868,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0869,clif->pHomMenu,2,4);
+	packet(0x086c,clif->pActionRequest,2,6);
+	packet(0x0880,clif->pDull/*,XXX*/);
+	packet(0x088e,clif->pUseSkillToId,2,4,6);
+	packet(0x0891,clif->pGetCharNameRequest,2);
+	packet(0x0898,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a0,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0922,clif->pMoveFromKafra,2,4);
+	packet(0x092e,clif->pSolveCharName,2);
+	packet(0x093c,clif->pTickSend,2);
+	packet(0x093e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0941,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0946,clif->pReqCloseBuyingStore,0);
+	packet(0x094d,clif->pChangeDir,2,4);
+	packet(0x0953,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x095c,clif->pFriendsListAdd,2);
+	packet(0x0960,clif->pStoragePassword,0);
+	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2015-04-22aRagexeRE
 #if PACKETVER == 20150422
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0955,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0955,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-04-29aRagexeRE
 #if PACKETVER == 20150429
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0363,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0867,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x086a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0886,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x088f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0894,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0899,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x089f,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a6,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a8,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08ad,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0929,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x093d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0943,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0363,clif->pChangeDir,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0867,clif->pStoragePassword,0);
+	packet(0x086a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0886,clif->pPartyInvite2,2);
+	packet(0x088f,clif->pHomMenu,2,4);
+	packet(0x0894,clif->pDropItem,2,4);
+	packet(0x0899,clif->pMoveToKafra,2,4);
+	packet(0x089f,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a6,clif->pDull/*,XXX*/);
+	packet(0x08a8,clif->pDull/*,XXX*/);
+	packet(0x08ad,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0929,clif->pMoveFromKafra,2,4);
+	packet(0x093d,clif->pFriendsListAdd,2);
+	packet(0x0943,clif->pTakeItem,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-05-07bRagexeRE
 #if PACKETVER == 20150507
-	packet(0x023b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0864,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0887,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0889,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0924,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x092e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x093b,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0941,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0942,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0953,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0955,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0958,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pHomMenu,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pReqCloseBuyingStore,0);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pTakeItem,2);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pMoveToKafra,2,4);
+	packet(0x0864,clif->pPartyInvite2,2);
+	packet(0x0887,clif->pDull/*,XXX*/);
+	packet(0x0889,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0924,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x092e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x093b,clif->pChangeDir,2,4);
+	packet(0x0941,clif->pMoveFromKafra,2,4);
+	packet(0x0942,clif->pDull/*,XXX*/);
+	packet(0x0953,clif->pStoragePassword,0);
+	packet(0x0955,clif->pDropItem,2,4);
+	packet(0x0958,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-05-13aRagexeRE
 #if PACKETVER == 20150513
-	packet(0x022d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x02c4,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0363,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0864,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0879,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0883,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0885,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a8,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0923,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0924,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0927,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x094a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0958,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0960,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pReqCloseBuyingStore,0);
+	packet(0x02c4,clif->pDull/*,XXX*/);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0363,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pHomMenu,2,4);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0864,clif->pMoveFromKafra,2,4);
+	packet(0x0879,clif->pMoveToKafra,2,4);
+	packet(0x0883,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0885,clif->pDropItem,2,4);
+	packet(0x08a8,clif->pFriendsListAdd,2);
+	packet(0x0923,clif->pStoragePassword,0);
+	packet(0x0924,clif->pChangeDir,2,4);
+	packet(0x0927,clif->pDull/*,XXX*/);
+	packet(0x094a,clif->pPartyInvite2,2);
+	packet(0x0958,clif->pTakeItem,2);
+	packet(0x0960,clif->pItemListWindowSelected,2,4,8);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-05-20aRagexeRE
 #if PACKETVER == 20150520
-	packet(0x0202,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0361,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0835,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x085e,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0865,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0868,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x087d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0880,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0882,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x089c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089e,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a2,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08ad,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091d,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0924,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0931,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0936,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x093d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0940,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0945,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x094e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x095b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0960,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0961,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x0202,clif->pTickSend,2);
+	packet(0x0361,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0835,clif->pReqCloseBuyingStore,0);
+	packet(0x085e,clif->pReqClickBuyingStore,2);
+	packet(0x0865,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0868,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x087d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0880,clif->pPartyInvite2,2);
+	packet(0x0882,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x089c,clif->pStoragePassword,0);
+	packet(0x089e,clif->pDropItem,2,4);
+	packet(0x08a2,clif->pGetCharNameRequest,2);
+	packet(0x08ad,clif->pChangeDir,2,4);
+	packet(0x091c,clif->pTakeItem,2);
+	packet(0x091d,clif->pActionRequest,2,6);
+	packet(0x0924,clif->pMoveFromKafra,2,4);
+	packet(0x092b,clif->pWalkToXY,2);
+	packet(0x0931,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0936,clif->pUseSkillToId,2,4,6);
+	packet(0x093d,clif->pFriendsListAdd,2);
+	packet(0x0940,clif->pDull/*,XXX*/);
+	packet(0x0945,clif->pSolveCharName,2);
+	packet(0x094e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x095b,clif->pHomMenu,2,4);
+	packet(0x095f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0960,clif->pDull/*,XXX*/);
+	packet(0x0961,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2015-05-27aRagexeRE
 #if PACKETVER == 20150527
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x083c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0940,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pUseSkillToId,2,4,6);
+	packet(0x083c,clif->pStoragePassword,0);
+	packet(0x0940,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-06-03bRagexeRE
 #if PACKETVER == 20150603
-	packet(0x0361,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0437,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0811,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0819,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0860,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0864,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0867,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x086a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0873,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0877,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0881,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0884,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0897,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x089a,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x089d,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x089e,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a1,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08ad,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x091b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0922,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x093b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x093f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0955,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0956,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0960,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0969,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x096a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
+	packet(0x0361,clif->pPartyInvite2,2);
+	packet(0x0437,clif->pDull/*,XXX*/);
+	packet(0x0811,clif->pChangeDir,2,4);
+	packet(0x0819,clif->pReqClickBuyingStore,2);
+	packet(0x0860,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0864,clif->pFriendsListAdd,2);
+	packet(0x0867,clif->pMoveToKafra,2,4);
+	packet(0x086a,clif->pMoveFromKafra,2,4);
+	packet(0x0873,clif->pActionRequest,2,6);
+	packet(0x0877,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0881,clif->pGetCharNameRequest,2);
+	packet(0x0884,clif->pDull/*,XXX*/);
+	packet(0x088b,clif->pDropItem,2,4);
+	packet(0x0897,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x089a,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x089d,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x089e,clif->pTickSend,2);
+	packet(0x08a1,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08ad,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x091b,clif->pSolveCharName,2);
+	packet(0x0922,clif->pStoragePassword,0);
+	packet(0x092d,clif->pTakeItem,2);
+	packet(0x093b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x093f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0955,clif->pHomMenu,2,4);
+	packet(0x0956,clif->pReqCloseBuyingStore,0);
+	packet(0x0960,clif->pUseSkillToId,2,4,6);
+	packet(0x0969,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x096a,clif->pWalkToXY,2);
 #endif
 
 // 2015-06-10aRagexeRE
 #if PACKETVER == 20150610
-	packet(0x022d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0438,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x07e4,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0835,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0870,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0872,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0877,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x087e,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0884,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0885,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0888,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x088d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x088f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0897,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a0,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08ac,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0925,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x092c,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x092e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0932,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x093e,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0940,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0946,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0949,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0957,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x095d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0964,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x022d,clif->pReqCloseBuyingStore,0);
+	packet(0x0438,clif->pItemListWindowSelected,2,4,8);
+	packet(0x07e4,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0835,clif->pDull/*,XXX*/);
+	packet(0x0870,clif->pPartyInvite2,2);
+	packet(0x0872,clif->pSolveCharName,2);
+	packet(0x0877,clif->pReqClickBuyingStore,2);
+	packet(0x087e,clif->pGetCharNameRequest,2);
+	packet(0x0884,clif->pMoveFromKafra,2,4);
+	packet(0x0885,clif->pHomMenu,2,4);
+	packet(0x0888,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088c,clif->pMoveToKafra,2,4);
+	packet(0x088d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x088f,clif->pWalkToXY,2);
+	packet(0x0897,clif->pFriendsListAdd,2);
+	packet(0x08a0,clif->pStoragePassword,0);
+	packet(0x08ac,clif->pDropItem,2,4);
+	packet(0x0925,clif->pTakeItem,2);
+	packet(0x092b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x092c,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x092e,clif->pDull/*,XXX*/);
+	packet(0x0932,clif->pSearchStoreInfoNextPage,0);
+	packet(0x093e,clif->pActionRequest,2,6);
+	packet(0x0940,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0946,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0949,clif->pUseSkillToId,2,4,6);
+	packet(0x0957,clif->pTickSend,2);
+	packet(0x095d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0964,clif->pChangeDir,2,4);
 #endif
 
 // 2015-06-17aRagexeRE, 2015-06-18aRagexeRE
 #if PACKETVER == 20150617 || \
     PACKETVER == 20150618
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0362,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0363,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0365,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07ec,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0811,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0869,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x086a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x086b,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0870,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x087a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0886,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0894,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0940,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x094e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pTakeItem,2);
+	packet(0x0362,clif->pReqClickBuyingStore,2);
+	packet(0x0363,clif->pStoragePassword,0);
+	packet(0x0365,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07ec,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0811,clif->pDull/*,XXX*/);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0869,clif->pMoveFromKafra,2,4);
+	packet(0x086a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x086b,clif->pChangeDir,2,4);
+	packet(0x0870,clif->pPartyInvite2,2);
+	packet(0x087a,clif->pMoveToKafra,2,4);
+	packet(0x0886,clif->pHomMenu,2,4);
+	packet(0x0894,clif->pDull/*,XXX*/);
+	packet(0x0940,clif->pDropItem,2,4);
+	packet(0x094e,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-06-24aRagexeRE
 #if PACKETVER == 20150624
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0365,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0870,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0940,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0941,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0966,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0365,clif->pHomMenu,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0870,clif->pStoragePassword,0);
+	packet(0x0940,clif->pMoveFromKafra,2,4);
+	packet(0x0941,clif->pFriendsListAdd,2);
+	packet(0x0966,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-07-01bRagexeRE
 #if PACKETVER == 20150701
-	packet(0x023b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0281,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x07e4,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0802,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x086d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x087d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x087e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0883,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x088e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0893,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a0,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a4,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08a5,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a6,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08ad,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0919,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0923,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0928,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x092c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x093e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x093f,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0946,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094e,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0954,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0956,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0958,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x095f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0960,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0968,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x023b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0281,clif->pSearchStoreInfoNextPage,0);
+	packet(0x07e4,clif->pMoveFromKafra,2,4);
+	packet(0x0802,clif->pGetCharNameRequest,2);
+	packet(0x086d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x087d,clif->pTickSend,2);
+	packet(0x087e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0883,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x088e,clif->pReqCloseBuyingStore,0);
+	packet(0x0893,clif->pDull/*,XXX*/);
+	packet(0x08a0,clif->pDropItem,2,4);
+	packet(0x08a4,clif->pReqClickBuyingStore,2);
+	packet(0x08a5,clif->pPartyInvite2,2);
+	packet(0x08a6,clif->pUseSkillToId,2,4,6);
+	packet(0x08ad,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0919,clif->pStoragePassword,0);
+	packet(0x0923,clif->pDull/*,XXX*/);
+	packet(0x0928,clif->pMoveToKafra,2,4);
+	packet(0x092c,clif->pWalkToXY,2);
+	packet(0x093e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x093f,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0946,clif->pTakeItem,2);
+	packet(0x094e,clif->pSolveCharName,2);
+	packet(0x0954,clif->pHomMenu,2,4);
+	packet(0x0956,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0958,clif->pActionRequest,2,6);
+	packet(0x095f,clif->pFriendsListAdd,2);
+	packet(0x0960,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0968,clif->pChangeDir,2,4);
 #endif
 
 // 2015-07-08bRagexeRE, 2015-07-08cRagexeRE, 2015-07-08dRagexeRE
 #if PACKETVER == 20150708
-	packet(0x022d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x02c4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0368,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085e,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0872,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x087f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0884,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x089d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a5,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08ad,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x092a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x093c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0962,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pSolveCharName,2);
+	packet(0x02c4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pPartyInvite2,2);
+	packet(0x0368,clif->pHomMenu,2,4);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085e,clif->pMoveToKafra,2,4);
+	packet(0x0872,clif->pTakeItem,2);
+	packet(0x087f,clif->pDull/*,XXX*/);
+	packet(0x0884,clif->pWalkToXY,2);
+	packet(0x089d,clif->pChangeDir,2,4);
+	packet(0x08a5,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08ad,clif->pStoragePassword,0);
+	packet(0x091f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x092a,clif->pMoveFromKafra,2,4);
+	packet(0x093c,clif->pFriendsListAdd,2);
+	packet(0x095b,clif->pDropItem,2,4);
+	packet(0x0962,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-07-15aRagexeRE
 #if PACKETVER == 20150715
-	packet(0x023b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0362,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0364,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0436,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0437,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0438,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0835,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x083c,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085c,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x086f,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0873,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0879,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x087c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x087f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0886,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0895,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0896,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0897,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0899,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x089a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a4,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08ac,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0917,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x093e,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0944,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0950,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0956,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0961,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0965,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x023b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0362,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0364,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0436,clif->pSolveCharName,2);
+	packet(0x0437,clif->pUseSkillToId,2,4,6);
+	packet(0x0438,clif->pWalkToXY,2);
+	packet(0x0835,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x083c,clif->pActionRequest,2,6);
+	packet(0x085c,clif->pGetCharNameRequest,2);
+	packet(0x086f,clif->pMoveFromKafra,2,4);
+	packet(0x0873,clif->pTickSend,2);
+	packet(0x0879,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x087c,clif->pDropItem,2,4);
+	packet(0x087f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0886,clif->pDull/*,XXX*/);
+	packet(0x0895,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0896,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0897,clif->pPartyInvite2,2);
+	packet(0x0899,clif->pReqCloseBuyingStore,0);
+	packet(0x089a,clif->pTakeItem,2);
+	packet(0x08a4,clif->pDull/*,XXX*/);
+	packet(0x08ac,clif->pChangeDir,2,4);
+	packet(0x0917,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x093e,clif->pHomMenu,2,4);
+	packet(0x0944,clif->pFriendsListAdd,2);
+	packet(0x0950,clif->pReqClickBuyingStore,2);
+	packet(0x0956,clif->pStoragePassword,0);
+	packet(0x0961,clif->pMoveToKafra,2,4);
+	packet(0x0965,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2015-07-22bRagexeRE
 #if PACKETVER == 20150722
-	packet(0x023b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0281,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0360,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0361,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0368,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0436,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0811,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0815,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0817,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0869,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0878,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x087b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x087d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087e,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0880,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0884,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x088d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0899,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a8,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0919,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0921,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0925,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x092e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x093c,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x093d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x094c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x094f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0951,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0958,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
+	packet(0x023b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0281,clif->pGetCharNameRequest,2);
+	packet(0x0360,clif->pActionRequest,2,6);
+	packet(0x0361,clif->pDropItem,2,4);
+	packet(0x0368,clif->pPartyInvite2,2);
+	packet(0x0436,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0811,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0815,clif->pReqCloseBuyingStore,0);
+	packet(0x0817,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0869,clif->pTakeItem,2);
+	packet(0x0878,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x087b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x087d,clif->pWalkToXY,2);
+	packet(0x087e,clif->pSolveCharName,2);
+	packet(0x0880,clif->pReqClickBuyingStore,2);
+	packet(0x0884,clif->pHomMenu,2,4);
+	packet(0x088d,clif->pTickSend,2);
+	packet(0x0899,clif->pMoveFromKafra,2,4);
+	packet(0x08a8,clif->pChangeDir,2,4);
+	packet(0x0919,clif->pDull/*,XXX*/);
+	packet(0x0921,clif->pMoveToKafra,2,4);
+	packet(0x0925,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x092e,clif->pFriendsListAdd,2);
+	packet(0x093c,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x093d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x094c,clif->pUseSkillToId,2,4,6);
+	packet(0x094f,clif->pDull/*,XXX*/);
+	packet(0x0951,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0958,clif->pStoragePassword,0);
 #endif
 
 // 2015-07-29aRagexeRE
 #if PACKETVER == 20150729
-	packet(0x0437,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0438,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x085b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0860,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x086d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x086e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x086f,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0870,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0880,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0881,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0886,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x089a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x089b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a3,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a4,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ac,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08ad,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0920,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x092b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x092f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x093a,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x093f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0940,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x094f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0955,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x095e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0961,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
+	packet(0x0437,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0438,clif->pHomMenu,2,4);
+	packet(0x085b,clif->pDull/*,XXX*/);
+	packet(0x0860,clif->pTakeItem,2);
+	packet(0x086c,clif->pMoveToKafra,2,4);
+	packet(0x086d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x086e,clif->pWalkToXY,2);
+	packet(0x086f,clif->pMoveFromKafra,2,4);
+	packet(0x0870,clif->pGetCharNameRequest,2);
+	packet(0x0880,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0881,clif->pActionRequest,2,6);
+	packet(0x0886,clif->pSolveCharName,2);
+	packet(0x089a,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x089b,clif->pFriendsListAdd,2);
+	packet(0x08a3,clif->pDull/*,XXX*/);
+	packet(0x08a4,clif->pChangeDir,2,4);
+	packet(0x08ac,clif->pPartyInvite2,2);
+	packet(0x08ad,clif->pReqClickBuyingStore,2);
+	packet(0x0920,clif->pSearchStoreInfoNextPage,0);
+	packet(0x092b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x092f,clif->pUseSkillToId,2,4,6);
+	packet(0x093a,clif->pTickSend,2);
+	packet(0x093f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0940,clif->pDropItem,2,4);
+	packet(0x094f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0955,clif->pItemListWindowSelected,2,4,8);
+	packet(0x095e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0961,clif->pStoragePassword,0);
+	packet(0x096a,clif->pReqCloseBuyingStore,0);
 #endif
 
 // 2015-08-05dRagexeRE
 #if PACKETVER == 20150805
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x088a,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-08-12aRagexeRE
 #if PACKETVER == 20150812
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087f,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-08-19aRagexeRE, 2015-08-19bRagexeRE
 #if PACKETVER == 20150819
-	packet(0x0202,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x022d,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0281,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x085d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0862,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0865,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0871,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0888,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0919,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091e,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0927,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0940,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0961,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0967,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pItemListWindowSelected,2,4,8);
+	packet(0x022d,clif->pUseSkillToId,2,4,6);
+	packet(0x0281,clif->pTakeItem,2);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x085d,clif->pMoveFromKafra,2,4);
+	packet(0x0862,clif->pDull/*,XXX*/);
+	packet(0x0865,clif->pFriendsListAdd,2);
+	packet(0x0871,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0888,clif->pHomMenu,2,4);
+	packet(0x0919,clif->pMoveToKafra,2,4);
+	packet(0x091e,clif->pStoragePassword,0);
+	packet(0x0927,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0940,clif->pDropItem,2,4);
+	packet(0x0961,clif->pPartyInvite2,2);
+	packet(0x0967,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-08-26aRagexeRE, 2015-08-26bRagexeRE
 #if PACKETVER == 20150826
-	packet(0x0362,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0368,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0436,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x07ec,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0819,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0861,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0865,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x086b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0870,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x087b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x088b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x088d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0890,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0891,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a0,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08a1,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a8,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0924,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0928,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x092e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x093b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0945,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094f,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0951,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0959,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0964,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0968,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0969,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
+	packet(0x0362,clif->pStoragePassword,0);
+	packet(0x0368,clif->pMoveFromKafra,2,4);
+	packet(0x0436,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x07ec,clif->pActionRequest,2,6);
+	packet(0x0819,clif->pReqClickBuyingStore,2);
+	packet(0x0861,clif->pDull/*,XXX*/);
+	packet(0x0865,clif->pWalkToXY,2);
+	packet(0x086b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0870,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x087b,clif->pSolveCharName,2);
+	packet(0x088b,clif->pPartyInvite2,2);
+	packet(0x088d,clif->pFriendsListAdd,2);
+	packet(0x0890,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0891,clif->pUseSkillToId,2,4,6);
+	packet(0x08a0,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08a1,clif->pMoveToKafra,2,4);
+	packet(0x08a4,clif->pTakeItem,2);
+	packet(0x08a8,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0924,clif->pDropItem,2,4);
+	packet(0x0928,clif->pReqCloseBuyingStore,0);
+	packet(0x092e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x093b,clif->pGetCharNameRequest,2);
+	packet(0x0945,clif->pHomMenu,2,4);
+	packet(0x094f,clif->pChangeDir,2,4);
+	packet(0x0951,clif->pTickSend,2);
+	packet(0x0959,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0964,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0968,clif->pDull/*,XXX*/);
+	packet(0x0969,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
 #endif
 
 // 2015-09-02aRagexeRE
 #if PACKETVER == 20150902
-	packet(0x023b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0360,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0367,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0802,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x083c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x085b,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0863,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x087b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0886,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0887,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0889,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x088d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0892,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0897,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0899,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08a9,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0923,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0928,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x092d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0941,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0947,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x094f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0953,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x095b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0960,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
+	packet(0x023b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0360,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0367,clif->pTickSend,2);
+	packet(0x0802,clif->pStoragePassword,0);
+	packet(0x083c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x085b,clif->pActionRequest,2,6);
+	packet(0x085d,clif->pSolveCharName,2);
+	packet(0x0863,clif->pUseSkillToId,2,4,6);
+	packet(0x086f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x087b,clif->pWalkToXY,2);
+	packet(0x087f,clif->pDull/*,XXX*/);
+	packet(0x0886,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0887,clif->pDull/*,XXX*/);
+	packet(0x0889,clif->pReqCloseBuyingStore,0);
+	packet(0x088d,clif->pMoveFromKafra,2,4);
+	packet(0x0892,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0897,clif->pMoveToKafra,2,4);
+	packet(0x0899,clif->pGetCharNameRequest,2);
+	packet(0x08a9,clif->pDropItem,2,4);
+	packet(0x0923,clif->pFriendsListAdd,2);
+	packet(0x0928,clif->pTakeItem,2);
+	packet(0x092a,clif->pHomMenu,2,4);
+	packet(0x092d,clif->pPartyInvite2,2);
+	packet(0x0941,clif->pChangeDir,2,4);
+	packet(0x0947,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x094f,clif->pReqClickBuyingStore,2);
+	packet(0x0953,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x095b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0960,clif->pSearchStoreInfoNextPage,0);
 #endif
 
 // 2015-09-09aRagexeRE
 #if PACKETVER == 20150909
-	packet(0x023b,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0361,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0365,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0437,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0861,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0871,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x087b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0883,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0886,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0895,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0928,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0940,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0941,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095e,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0962,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x023b,clif->pActionRequest,2,6);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqCloseBuyingStore,0);
+	packet(0x0361,clif->pGetCharNameRequest,2);
+	packet(0x0365,clif->pWalkToXY,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pStoragePassword,0);
+	packet(0x0437,clif->pMoveFromKafra,2,4);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0861,clif->pDull/*,XXX*/);
+	packet(0x0871,clif->pItemListWindowSelected,2,4,8);
+	packet(0x087b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0883,clif->pTakeItem,2);
+	packet(0x0886,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088f,clif->pPartyInvite2,2);
+	packet(0x0895,clif->pFriendsListAdd,2);
+	packet(0x0928,clif->pDull/*,XXX*/);
+	packet(0x0940,clif->pReqClickBuyingStore,2);
+	packet(0x0941,clif->pHomMenu,2,4);
+	packet(0x095e,clif->pDropItem,2,4);
+	packet(0x0962,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pChangeDir,2,4);
 #endif
 
 // 2015-09-16cRagexeRE
 #if PACKETVER == 20150916
-	packet(0x022d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0817,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0835,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x085e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0869,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0873,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0877,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x087f,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0881,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x089b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x089c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x089e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08ac,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0920,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0924,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x092e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x092f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0934,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0936,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0938,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x093e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0941,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0942,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0948,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x094f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x095a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0960,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0961,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0969,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
+	packet(0x022d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0817,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0835,clif->pReqClickBuyingStore,2);
+	packet(0x085e,clif->pMoveFromKafra,2,4);
+	packet(0x0869,clif->pActionRequest,2,6);
+	packet(0x0873,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0877,clif->pWalkToXY,2);
+	packet(0x087f,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0881,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x089b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x089c,clif->pTakeItem,2);
+	packet(0x089e,clif->pFriendsListAdd,2);
+	packet(0x08ac,clif->pTickSend,2);
+	packet(0x0920,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0924,clif->pPartyInvite2,2);
+	packet(0x092e,clif->pReqCloseBuyingStore,0);
+	packet(0x092f,clif->pDropItem,2,4);
+	packet(0x0934,clif->pMoveToKafra,2,4);
+	packet(0x0936,clif->pChangeDir,2,4);
+	packet(0x0938,clif->pDull/*,XXX*/);
+	packet(0x093e,clif->pUseSkillToId,2,4,6);
+	packet(0x0941,clif->pStoragePassword,0);
+	packet(0x0942,clif->pSolveCharName,2);
+	packet(0x0948,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x094f,clif->pDull/*,XXX*/);
+	packet(0x095a,clif->pGetCharNameRequest,2);
+	packet(0x0960,clif->pHomMenu,2,4);
+	packet(0x0961,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0969,clif->pWantToConnection,2,6,10,14,18);
 #endif
 
 // 2015-09-23bRagexeRE, 2015-09-23eRagexeRE, 2015-09-23fRagexeRE
 #if PACKETVER == 20150923
-	packet(0x0361,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x07e4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0817,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x085c,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x085d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0864,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x086e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x086f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0870,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0879,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0886,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x088e,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0892,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0895,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x089b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x089f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a0,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a2,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a5,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08a6,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x091e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x092b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0930,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0936,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x093b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0951,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0961,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
+	packet(0x0361,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x07e4,clif->pStoragePassword,0);
+	packet(0x0817,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x085c,clif->pSolveCharName,2);
+	packet(0x085d,clif->pFriendsListAdd,2);
+	packet(0x0864,clif->pHomMenu,2,4);
+	packet(0x086e,clif->pReqCloseBuyingStore,0);
+	packet(0x086f,clif->pUseSkillToId,2,4,6);
+	packet(0x0870,clif->pChangeDir,2,4);
+	packet(0x0879,clif->pMoveFromKafra,2,4);
+	packet(0x087f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0886,clif->pWalkToXY,2);
+	packet(0x088e,clif->pReqClickBuyingStore,2);
+	packet(0x0892,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0895,clif->pDull/*,XXX*/);
+	packet(0x089b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x089f,clif->pMoveToKafra,2,4);
+	packet(0x08a0,clif->pTickSend,2);
+	packet(0x08a2,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a5,clif->pGetCharNameRequest,2);
+	packet(0x08a6,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x091e,clif->pDull/*,XXX*/);
+	packet(0x092b,clif->pTakeItem,2);
+	packet(0x0930,clif->pDropItem,2,4);
+	packet(0x0936,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x093b,clif->pPartyInvite2,2);
+	packet(0x0951,clif->pActionRequest,2,6);
+	packet(0x0961,clif->pItemListWindowSelected,2,4,8);
 #endif
 
 // 2015-10-01bRagexeRE
 #if PACKETVER == 20151001
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0960,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0960,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-10-07aRagexeRE
 #if PACKETVER == 20151007
-	packet(0x0202,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0862,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x093f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095f,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0961,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0967,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pFriendsListAdd,2);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0862,clif->pDull/*,XXX*/);
+	packet(0x093f,clif->pHomMenu,2,4);
+	packet(0x095f,clif->pChangeDir,2,4);
+	packet(0x0961,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0967,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-10-14bRagexeRE
 #if PACKETVER == 20151014
-	packet(0x0202,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0817,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0838,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x085a,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085c,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0860,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0863,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0867,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0872,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0874,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0881,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0883,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0884,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0889,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x088e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x089a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x089b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x089f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08aa,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091c,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x091d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0930,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0934,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0944,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x094f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0956,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x095e,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0961,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0964,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
+	packet(0x0202,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0817,clif->pFriendsListAdd,2);
+	packet(0x0838,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x085a,clif->pUseSkillToId,2,4,6);
+	packet(0x085c,clif->pActionRequest,2,6);
+	packet(0x0860,clif->pDropItem,2,4);
+	packet(0x0863,clif->pChangeDir,2,4);
+	packet(0x0867,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0872,clif->pHomMenu,2,4);
+	packet(0x0874,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0881,clif->pMoveFromKafra,2,4);
+	packet(0x0883,clif->pTickSend,2);
+	packet(0x0884,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0889,clif->pReqClickBuyingStore,2);
+	packet(0x088e,clif->pDull/*,XXX*/);
+	packet(0x089a,clif->pDull/*,XXX*/);
+	packet(0x089b,clif->pReqCloseBuyingStore,0);
+	packet(0x089f,clif->pWalkToXY,2);
+	packet(0x08aa,clif->pTakeItem,2);
+	packet(0x091c,clif->pPartyInvite2,2);
+	packet(0x091d,clif->pStoragePassword,0);
+	packet(0x0930,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0934,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0944,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x094f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0956,clif->pSolveCharName,2);
+	packet(0x095e,clif->pMoveToKafra,2,4);
+	packet(0x0961,clif->pGetCharNameRequest,2);
+	packet(0x0964,clif->pWantToConnection,2,6,10,14,18);
 #endif
 
 // 2015-10-21aRagexeRE, 2015-10-22aRagexeRE
 #if PACKETVER == 20151021 || \
     PACKETVER == 20151022
-	packet(0x023b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x02c4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x091d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x02c4,clif->pStoragePassword,0);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pMoveToKafra,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pChangeDir,2,4);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086a,clif->pFriendsListAdd,2);
+	packet(0x091d,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pPartyInvite2,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-10-28bRagexeRE, 2015-10-28bRagexeRE_2, 2015-10-28cRagexeRE, 2015-10-28dRagexeRE, 2015-10-29aRagexeRE
 #if PACKETVER == 20151028 || \
     PACKETVER == 20151029
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0860,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0860,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-11-04aRagexeRE
 #if PACKETVER == 20151104
-	packet(0x023b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0360,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0363,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0437,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07ec,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0811,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0815,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0886,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0887,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x088b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x088d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a3,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a5,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0928,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0939,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093a,clif->pItemListWindowSelected,2,4,8,12);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0940,clif->pStoragePassword,2,4,20);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0964,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
+	packet(0x023b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0360,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0363,clif->pWalkToXY,2);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pReqClickBuyingStore,2);
+	packet(0x0437,clif->pDropItem,2,4);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07ec,clif->pFriendsListAdd,2);
+	packet(0x0811,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0815,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0886,clif->pTickSend,2);
+	packet(0x0887,clif->pGetCharNameRequest,2);
+	packet(0x088b,clif->pMoveToKafra,2,4);
+	packet(0x088d,clif->pHomMenu,2,4);
+	packet(0x08a3,clif->pDull/*,XXX*/);
+	packet(0x08a5,clif->pPartyInvite2,2);
+	packet(0x0928,clif->pChangeDir,2,4);
+	packet(0x0939,clif->pDull/*,XXX*/);
+	packet(0x093a,clif->pItemListWindowSelected,2,4,8,12);
+	packet(0x0940,clif->pStoragePassword,2,4,20);
+	packet(0x0964,clif->pTakeItem,2);
 #endif
 
 // 2015-11-11aRagexeRE
 #if PACKETVER == 20151111
-	packet(0x02c4,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085d,clif->pItemListWindowSelected,2,4,8,12);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0862,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0871,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0885,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x089c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0942,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0958,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0966,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0967,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0969,clif->pStoragePassword,2,4,20);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x02c4,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pHomMenu,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pMoveToKafra,2,4);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pDull/*,XXX*/);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pPartyInvite2,2);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085d,clif->pItemListWindowSelected,2,4,8,12);
+	packet(0x0862,clif->pDropItem,2,4);
+	packet(0x0871,clif->pFriendsListAdd,2);
+	packet(0x0885,clif->pActionRequest,2,6);
+	packet(0x089c,clif->pChangeDir,2,4);
+	packet(0x0942,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x094a,clif->pTakeItem,2);
+	packet(0x0958,clif->pDull/*,XXX*/);
+	packet(0x0966,clif->pMoveFromKafra,2,4);
+	packet(0x0967,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0969,clif->pStoragePassword,2,4,20);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-11-18aRagexeRE
 #if PACKETVER == 20151118
-	packet(0x022d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x035f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0365,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x088b,clif->pStoragePassword,2,4,20);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08ab,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0921,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0925,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x092e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x092f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0943,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0946,clif->pItemListWindowSelected,2,4,8,12);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0957,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x095c,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pTickSend,2);
+	packet(0x035f,clif->pHomMenu,2,4);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0365,clif->pPartyInvite2,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086b,clif->pMoveToKafra,2,4);
+	packet(0x088b,clif->pStoragePassword,2,4,20);
+	packet(0x08ab,clif->pMoveFromKafra,2,4);
+	packet(0x0921,clif->pFriendsListAdd,2);
+	packet(0x0925,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x092e,clif->pChangeDir,2,4);
+	packet(0x092f,clif->pDull/*,XXX*/);
+	packet(0x093c,clif->pDropItem,2,4);
+	packet(0x0943,clif->pTakeItem,2);
+	packet(0x0946,clif->pItemListWindowSelected,2,4,8,12);
+	packet(0x0957,clif->pDull/*,XXX*/);
+	packet(0x095c,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-11-25bRagexeRE, 2015-11-25cRagexeRE, 2015-11-25dRagexeRE
 #if PACKETVER == 20151125
-	packet(0x0361,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0365,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0366,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0368,clif->pItemListWindowSelected,2,4,8,12);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0438,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0802,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0838,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085e,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x085f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0863,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0883,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0884,clif->pStoragePassword,2,4,20);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0885,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088c,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x088d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0899,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089c,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x089f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x08a9,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08ad,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0920,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x092a,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x092e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0939,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x093e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0951,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0956,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0957,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0959,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
+	packet(0x0361,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0365,clif->pWalkToXY,2);
+	packet(0x0366,clif->pMoveFromKafra,2,4);
+	packet(0x0368,clif->pItemListWindowSelected,2,4,8,12);
+	packet(0x0438,clif->pTakeItem,2);
+	packet(0x0802,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0838,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x085e,clif->pGetCharNameRequest,2);
+	packet(0x085f,clif->pMoveToKafra,2,4);
+	packet(0x0863,clif->pReqCloseBuyingStore,0);
+	packet(0x0883,clif->pChangeDir,2,4);
+	packet(0x0884,clif->pStoragePassword,2,4,20);
+	packet(0x0885,clif->pDull/*,XXX*/);
+	packet(0x088c,clif->pTickSend,2);
+	packet(0x088d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0899,clif->pFriendsListAdd,2);
+	packet(0x089c,clif->pActionRequest,2,6);
+	packet(0x089f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x08a9,clif->pDropItem,2,4);
+	packet(0x08ad,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0920,clif->pSolveCharName,2);
+	packet(0x092a,clif->pUseSkillToId,2,4,6);
+	packet(0x092e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0939,clif->pReqClickBuyingStore,2);
+	packet(0x093e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0951,clif->pHomMenu,2,4);
+	packet(0x0956,clif->pPartyInvite2,2);
+	packet(0x0957,clif->pDull/*,XXX*/);
+	packet(0x0959,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
 #endif
 
 // 2015-12-02bRagexeRE
 #if PACKETVER == 20151202
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8,12);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0870,clif->pStoragePassword,2,4,20);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8,12);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0870,clif->pStoragePassword,2,4,20);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2015-12-09aRagexeRE
 #if PACKETVER == 20151209
-	packet(0x0365,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0369,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x07e4,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x07ec,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0811,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0819,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x085b,clif->pStoragePassword,2,4,20);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x085d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x085e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0861,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0866,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0875,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x087a,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x087f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x088e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0894,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08a1,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0920,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x092d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0930,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0932,clif->pItemListWindowSelected,2,4,8,12);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x093b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0948,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x094a,clif->pPartyBookingRegisterReq,2,4,6);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0956,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x095c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0961,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0964,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
+	packet(0x0365,clif->pWalkToXY,2);
+	packet(0x0369,clif->pSolveCharName,2);
+	packet(0x07e4,clif->pPartyInvite2,2);
+	packet(0x07ec,clif->pTakeItem,2);
+	packet(0x0811,clif->pTickSend,2);
+	packet(0x0819,clif->pReqCloseBuyingStore,0);
+	packet(0x085b,clif->pStoragePassword,2,4,20);
+	packet(0x085d,clif->pGetCharNameRequest,2);
+	packet(0x085e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0861,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0866,clif->pChangeDir,2,4);
+	packet(0x0875,clif->pSearchStoreInfoNextPage,0);
+	packet(0x087a,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x087f,clif->pReqClickBuyingStore,2);
+	packet(0x088e,clif->pUseSkillToId,2,4,6);
+	packet(0x088f,clif->pDull/*,XXX*/);
+	packet(0x0894,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08a1,clif->pHomMenu,2,4);
+	packet(0x0920,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x092d,clif->pMoveFromKafra,2,4);
+	packet(0x0930,clif->pDropItem,2,4);
+	packet(0x0932,clif->pItemListWindowSelected,2,4,8,12);
+	packet(0x093b,clif->pMoveToKafra,2,4);
+	packet(0x0948,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x094a,clif->pPartyBookingRegisterReq,2,4,6);
+	packet(0x0956,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x095c,clif->pDull/*,XXX*/);
+	packet(0x0961,clif->pActionRequest,2,6);
+	packet(0x0964,clif->pFriendsListAdd,2);
 #endif
 
 // 2015-12-16aRagexeRE
 #if PACKETVER == 20151216
-	packet(0x022d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0361,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0364,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0436,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x085b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0864,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0865,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x086a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x086e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0870,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0874,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0885,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089d,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x089e,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a2,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a9,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08ac,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0944,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0947,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0949,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0954,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0960,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0966,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0968,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
+	packet(0x022d,clif->pChangeDir,2,4);
+	packet(0x0361,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pHomMenu,2,4);
+	packet(0x0364,clif->pDull/*,XXX*/);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0436,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pReqCloseBuyingStore,0);
+	packet(0x085b,clif->pTickSend,2);
+	packet(0x0864,clif->pMoveFromKafra,2,4);
+	packet(0x0865,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x086a,clif->pDull/*,XXX*/);
+	packet(0x086e,clif->pPartyInvite2,2);
+	packet(0x0870,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0874,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0885,clif->pStoragePassword,0);
+	packet(0x088b,clif->pGetCharNameRequest,2);
+	packet(0x089d,clif->pActionRequest,2,6);
+	packet(0x089e,clif->pSolveCharName,2);
+	packet(0x08a2,clif->pWalkToXY,2);
+	packet(0x08a9,clif->pTakeItem,2);
+	packet(0x08ac,clif->pMoveToKafra,2,4);
+	packet(0x091d,clif->pFriendsListAdd,2);
+	packet(0x0944,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0947,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0949,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0954,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0960,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0966,clif->pDropItem,2,4);
+	packet(0x0968,clif->pUseSkillToId,2,4,6);
 #endif
 
 // 2015-12-23bRagexeRE
 #if PACKETVER == 20151223
-	packet(0x02c4,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0362,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0802,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0815,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0864,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0866,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x086e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0872,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0875,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0876,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0881,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0884,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0886,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x088d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0890,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0891,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0898,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x08aa,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0918,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x091a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x091b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0920,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0923,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0924,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x095e,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x095f,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0965,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0967,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
+	packet(0x02c4,clif->pMoveToKafra,2,4);
+	packet(0x0362,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pTakeItem,2);
+	packet(0x0802,clif->pDull/*,XXX*/);
+	packet(0x0815,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0864,clif->pGetCharNameRequest,2);
+	packet(0x0866,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x086e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0872,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0875,clif->pUseSkillToId,2,4,6);
+	packet(0x0876,clif->pDropItem,2,4);
+	packet(0x0881,clif->pActionRequest,2,6);
+	packet(0x0884,clif->pMoveFromKafra,2,4);
+	packet(0x0886,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x088d,clif->pHomMenu,2,4);
+	packet(0x0890,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0891,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0898,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x08aa,clif->pPartyInvite2,2);
+	packet(0x0918,clif->pSearchStoreInfoNextPage,0);
+	packet(0x091a,clif->pReqClickBuyingStore,2);
+	packet(0x091b,clif->pFriendsListAdd,2);
+	packet(0x0920,clif->pWalkToXY,2);
+	packet(0x0923,clif->pChangeDir,2,4);
+	packet(0x0924,clif->pTickSend,2);
+	packet(0x095e,clif->pSolveCharName,2);
+	packet(0x095f,clif->pReqCloseBuyingStore,0);
+	packet(0x0965,clif->pStoragePassword,0);
+	packet(0x0967,clif->pSearchStoreInfoListItemClick,2,6,10);
 #endif
 
 // 2015-12-30aRagexeRE
 #if PACKETVER == 20151230
-	packet(0x02c4,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x07ec,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0861,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0869,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0886,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x088e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0897,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0923,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x093a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0949,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x02c4,clif->pMoveToKafra,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pDull/*,XXX*/);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x07ec,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0861,clif->pPartyInvite2,2);
+	packet(0x0869,clif->pChangeDir,2,4);
+	packet(0x0886,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x088e,clif->pFriendsListAdd,2);
+	packet(0x0897,clif->pDropItem,2,4);
+	packet(0x091d,clif->pMoveFromKafra,2,4);
+	packet(0x0923,clif->pStoragePassword,0);
+	packet(0x093a,clif->pDull/*,XXX*/);
+	packet(0x0949,clif->pHomMenu,2,4);
+	packet(0x094e,clif->pTakeItem,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-01-06aRagexeRE
 #if PACKETVER == 20160106
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07ec,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0861,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x086c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0878,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x087a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x087f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0885,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0889,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x088a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0891,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a0,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x091d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0940,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07ec,clif->pHomMenu,2,4);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0861,clif->pTakeItem,2);
+	packet(0x086a,clif->pDropItem,2,4);
+	packet(0x086c,clif->pDull/*,XXX*/);
+	packet(0x0878,clif->pStoragePassword,0);
+	packet(0x087a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x087f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0885,clif->pMoveToKafra,2,4);
+	packet(0x0889,clif->pChangeDir,2,4);
+	packet(0x088a,clif->pPartyInvite2,2);
+	packet(0x0891,clif->pMoveFromKafra,2,4);
+	packet(0x08a0,clif->pFriendsListAdd,2);
+	packet(0x091d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0940,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-01-13aRagexeRE, 2016-01-13bRagexeRE, 2016-01-13bRagexeRE_2, 2016-01-13cRagexeRE
 #if PACKETVER == 20160113
-	packet(0x022d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x023b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x035f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0815,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x085b,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0864,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x086d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0873,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0875,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0888,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x088b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x088c,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0892,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0893,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0899,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a0,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08aa,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0919,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x091b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0924,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0930,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0932,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x093c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0941,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x094d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x094f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0967,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
+	packet(0x022d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x023b,clif->pWalkToXY,2);
+	packet(0x035f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0815,clif->pStoragePassword,0);
+	packet(0x085b,clif->pChangeDir,2,4);
+	packet(0x0864,clif->pReqClickBuyingStore,2);
+	packet(0x086d,clif->pHomMenu,2,4);
+	packet(0x0873,clif->pDull/*,XXX*/);
+	packet(0x0875,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0888,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x088b,clif->pPartyInvite2,2);
+	packet(0x088c,clif->pReqCloseBuyingStore,0);
+	packet(0x0892,clif->pUseSkillToId,2,4,6);
+	packet(0x0893,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0899,clif->pFriendsListAdd,2);
+	packet(0x089a,clif->pActionRequest,2,6);
+	packet(0x08a0,clif->pTickSend,2);
+	packet(0x08a6,clif->pTakeItem,2);
+	packet(0x08aa,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0919,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x091b,clif->pGetCharNameRequest,2);
+	packet(0x0924,clif->pDropItem,2,4);
+	packet(0x0930,clif->pSolveCharName,2);
+	packet(0x0932,clif->pMoveToKafra,2,4);
+	packet(0x093c,clif->pMoveFromKafra,2,4);
+	packet(0x0941,clif->pItemListWindowSelected,2,4,8);
+	packet(0x094d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x094f,clif->pDull/*,XXX*/);
+	packet(0x0967,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #endif
 
 // 2016-01-20aRagexeRE
 #if PACKETVER == 20160120
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0865,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0865,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-01-27aRagexeRE, 2016-01-27aRagexeRE_2, 2016-01-27bRagexeRE
 #if PACKETVER == 20160127
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0922,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0961,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085e,clif->pChangeDir,2,4);
+	packet(0x0922,clif->pHomMenu,2,4);
+	packet(0x095a,clif->pStoragePassword,0);
+	packet(0x0961,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-02-03aRagexeRE
 #if PACKETVER == 20160203
-	packet(0x0202,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0437,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0811,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0835,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0872,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0873,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0918,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0940,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0947,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0954,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x095a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pFriendsListAdd,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0437,clif->pTickSend,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0811,clif->pChangeDir,2,4);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0835,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0872,clif->pHomMenu,2,4);
+	packet(0x0873,clif->pStoragePassword,0);
+	packet(0x088c,clif->pDull/*,XXX*/);
+	packet(0x0918,clif->pDull/*,XXX*/);
+	packet(0x093e,clif->pPartyInvite2,2);
+	packet(0x0940,clif->pWalkToXY,2);
+	packet(0x0947,clif->pDropItem,2,4);
+	packet(0x0954,clif->pMoveFromKafra,2,4);
+	packet(0x095a,clif->pTakeItem,2);
+	packet(0x095d,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-02-11aRagexeRE
 #if PACKETVER == 20160211
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0870,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0886,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pStoragePassword,0);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086c,clif->pChangeDir,2,4);
+	packet(0x0870,clif->pFriendsListAdd,2);
+	packet(0x0886,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-02-17aRagexeRE, 2016-02-17bRagexeRE, 2016-02-17bRagexeRE_2, 2016-02-17cRagexeRE
 #if PACKETVER == 20160217
-	packet(0x0202,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x023b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0362,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0365,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0864,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0870,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0873,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x087a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0888,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x088d,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x088f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0899,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a0,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a9,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08ac,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08ad,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x091d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0920,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0926,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x092e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x093b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x093e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0941,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x094f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x095e,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0966,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0967,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0969,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
+	packet(0x0202,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x023b,clif->pReqCloseBuyingStore,0);
+	packet(0x0362,clif->pChangeDir,2,4);
+	packet(0x0365,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0864,clif->pMoveToKafra,2,4);
+	packet(0x0870,clif->pFriendsListAdd,2);
+	packet(0x0873,clif->pHomMenu,2,4);
+	packet(0x087a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0888,clif->pTickSend,2);
+	packet(0x088d,clif->pReqClickBuyingStore,2);
+	packet(0x088f,clif->pDropItem,2,4);
+	packet(0x0899,clif->pDull/*,XXX*/);
+	packet(0x08a0,clif->pMoveFromKafra,2,4);
+	packet(0x08a9,clif->pPartyInvite2,2);
+	packet(0x08ac,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08ad,clif->pSearchStoreInfoNextPage,0);
+	packet(0x091d,clif->pWalkToXY,2);
+	packet(0x0920,clif->pActionRequest,2,6);
+	packet(0x0926,clif->pUseSkillToId,2,4,6);
+	packet(0x092e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x093b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x093e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0941,clif->pTakeItem,2);
+	packet(0x094a,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x094f,clif->pDull/*,XXX*/);
+	packet(0x095e,clif->pStoragePassword,0);
+	packet(0x0966,clif->pGetCharNameRequest,2);
+	packet(0x0967,clif->pSolveCharName,2);
+	packet(0x0969,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #endif
 
 // 2016-02-24aRagexeRE, 2016-02-24bRagexeRE
 #if PACKETVER == 20160224
-	packet(0x022d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0364,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0436,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0861,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x086b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0884,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0885,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0888,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a9,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0920,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0929,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x092f,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0936,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0938,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0961,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pPartyInvite2,2);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0364,clif->pUseSkillToId,2,4,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pMoveFromKafra,2,4);
+	packet(0x0436,clif->pDropItem,2,4);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pMoveToKafra,2,4);
+	packet(0x0861,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x086b,clif->pDull/*,XXX*/);
+	packet(0x0884,clif->pActionRequest,2,6);
+	packet(0x0885,clif->pReqClickBuyingStore,2);
+	packet(0x0888,clif->pWalkToXY,2);
+	packet(0x08a9,clif->pFriendsListAdd,2);
+	packet(0x0920,clif->pDull/*,XXX*/);
+	packet(0x0929,clif->pChangeDir,2,4);
+	packet(0x092f,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0936,clif->pStoragePassword,0);
+	packet(0x0938,clif->pTakeItem,2);
+	packet(0x094c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0961,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-03-02bRagexeRE
 #if PACKETVER == 20160302
-	packet(0x022d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0367,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0802,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0819,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x085b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0864,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0865,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0867,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0868,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0873,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0875,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x087a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x087d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0883,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a6,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08a9,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0927,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092d,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x092f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0945,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x094e,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0950,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0957,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x095a,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0960,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0967,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0968,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
+	packet(0x022d,clif->pChangeDir,2,4);
+	packet(0x0367,clif->pReqClickBuyingStore,2);
+	packet(0x0802,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0819,clif->pWalkToXY,2);
+	packet(0x085b,clif->pFriendsListAdd,2);
+	packet(0x0864,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0865,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0867,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0868,clif->pHomMenu,2,4);
+	packet(0x0873,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0875,clif->pSearchStoreInfoNextPage,0);
+	packet(0x087a,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x087d,clif->pPartyInvite2,2);
+	packet(0x0883,clif->pUseSkillToId,2,4,6);
+	packet(0x08a6,clif->pReqCloseBuyingStore,0);
+	packet(0x08a9,clif->pMoveFromKafra,2,4);
+	packet(0x091a,clif->pDropItem,2,4);
+	packet(0x0927,clif->pTakeItem,2);
+	packet(0x092d,clif->pDull/*,XXX*/);
+	packet(0x092f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0945,clif->pGetCharNameRequest,2);
+	packet(0x094e,clif->pStoragePassword,0);
+	packet(0x0950,clif->pDull/*,XXX*/);
+	packet(0x0957,clif->pItemListWindowSelected,2,4,8);
+	packet(0x095a,clif->pTickSend,2);
+	packet(0x0960,clif->pMoveToKafra,2,4);
+	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0967,clif->pSolveCharName,2);
+	packet(0x0968,clif->pActionRequest,2,6);
 #endif
 
 // 2016-03-09aRagexeRE
 #if PACKETVER == 20160309
-	packet(0x023b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0281,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0364,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0819,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0838,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x083c,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x085a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x085f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0866,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x086a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0873,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x087e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x089b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x089d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a7,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x091d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0920,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0922,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0929,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x092a,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x092e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0932,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094f,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0956,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x095e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x096a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
+	packet(0x023b,clif->pDropItem,2,4);
+	packet(0x0281,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pFriendsListAdd,2);
+	packet(0x0364,clif->pStoragePassword,0);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0819,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0838,clif->pWalkToXY,2);
+	packet(0x083c,clif->pPartyInvite2,2);
+	packet(0x085a,clif->pMoveToKafra,2,4);
+	packet(0x085f,clif->pUseSkillToId,2,4,6);
+	packet(0x0866,clif->pSearchStoreInfoNextPage,0);
+	packet(0x086a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0873,clif->pDull/*,XXX*/);
+	packet(0x087c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x087e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x089b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x089d,clif->pChangeDir,2,4);
+	packet(0x08a7,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x091d,clif->pGetCharNameRequest,2);
+	packet(0x0920,clif->pMoveFromKafra,2,4);
+	packet(0x0922,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0929,clif->pDull/*,XXX*/);
+	packet(0x092a,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x092e,clif->pReqCloseBuyingStore,0);
+	packet(0x0932,clif->pHomMenu,2,4);
+	packet(0x094f,clif->pActionRequest,2,6);
+	packet(0x0956,clif->pTickSend,2);
+	packet(0x095e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x096a,clif->pTakeItem,2);
 #endif
 
 // 2016-03-16aRagexeRE
 #if PACKETVER == 20160316
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0922,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0922,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-03-23aRagexeRE, 2016-03-23bRagexeRE
 #if PACKETVER == 20160323
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0365,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0867,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0869,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0872,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0878,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0883,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0896,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x089a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x091b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0926,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0927,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0933,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x093c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0365,clif->pFriendsListAdd,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0867,clif->pDull/*,XXX*/);
+	packet(0x0869,clif->pTakeItem,2);
+	packet(0x086a,clif->pMoveFromKafra,2,4);
+	packet(0x0872,clif->pStoragePassword,0);
+	packet(0x0878,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0883,clif->pPartyInvite2,2);
+	packet(0x0896,clif->pItemListWindowSelected,2,4,8);
+	packet(0x089a,clif->pHomMenu,2,4);
+	packet(0x091b,clif->pDull/*,XXX*/);
+	packet(0x0926,clif->pMoveToKafra,2,4);
+	packet(0x0927,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0933,clif->pChangeDir,2,4);
+	packet(0x093c,clif->pDropItem,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-03-30aRagexeRE
 #if PACKETVER == 20160330
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0365,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0867,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x086d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0878,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087f,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0889,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x088b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x088d,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0918,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0925,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x092a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x092c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0930,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0939,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x093b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0365,clif->pStoragePassword,0);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0867,clif->pPartyInvite2,2);
+	packet(0x086d,clif->pTakeItem,2);
+	packet(0x0878,clif->pDull/*,XXX*/);
+	packet(0x087f,clif->pMoveFromKafra,2,4);
+	packet(0x0889,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x088b,clif->pHomMenu,2,4);
+	packet(0x088d,clif->pDull/*,XXX*/);
+	packet(0x0918,clif->pMoveToKafra,2,4);
+	packet(0x0925,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x092a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x092c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0930,clif->pChangeDir,2,4);
+	packet(0x0939,clif->pDropItem,2,4);
+	packet(0x093b,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-04-06aRagexeRE
 #if PACKETVER == 20160406
-	packet(0x0364,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x07e4,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0819,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x085a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0869,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0877,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0878,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0879,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0884,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0892,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0895,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0898,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a1,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a9,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08ac,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0927,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x092d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0933,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0934,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0940,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0949,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x094d,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0953,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x095d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0962,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
+	packet(0x0364,clif->pSolveCharName,2);
+	packet(0x07e4,clif->pDropItem,2,4);
+	packet(0x0819,clif->pSearchStoreInfoNextPage,0);
+	packet(0x085a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x085c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0869,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0877,clif->pTakeItem,2);
+	packet(0x0878,clif->pFriendsListAdd,2);
+	packet(0x0879,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0884,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0892,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0895,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0898,clif->pPartyInvite2,2);
+	packet(0x089b,clif->pGetCharNameRequest,2);
+	packet(0x089e,clif->pMoveFromKafra,2,4);
+	packet(0x08a1,clif->pActionRequest,2,6);
+	packet(0x08a9,clif->pReqCloseBuyingStore,0);
+	packet(0x08ac,clif->pDull/*,XXX*/);
+	packet(0x0927,clif->pMoveToKafra,2,4);
+	packet(0x092d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0933,clif->pChangeDir,2,4);
+	packet(0x0934,clif->pUseSkillToId,2,4,6);
+	packet(0x0940,clif->pTickSend,2);
+	packet(0x0949,clif->pItemListWindowSelected,2,4,8);
+	packet(0x094d,clif->pReqClickBuyingStore,2);
+	packet(0x0953,clif->pStoragePassword,0);
+	packet(0x095d,clif->pHomMenu,2,4);
+	packet(0x095f,clif->pWalkToXY,2);
+	packet(0x0962,clif->pDull/*,XXX*/);
 #endif
 
 // 2016-04-14aRagexeRE, 2016-04-14bRagexeRE
 #if PACKETVER == 20160414
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0363,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0862,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x087a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0880,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0885,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x089e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0918,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0922,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0927,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0931,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0934,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0945,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0953,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0363,clif->pTakeItem,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0862,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x087a,clif->pDull/*,XXX*/);
+	packet(0x0880,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0885,clif->pMoveFromKafra,2,4);
+	packet(0x089e,clif->pPartyInvite2,2);
+	packet(0x0918,clif->pDull/*,XXX*/);
+	packet(0x0922,clif->pChangeDir,2,4);
+	packet(0x0927,clif->pStoragePassword,0);
+	packet(0x0931,clif->pDropItem,2,4);
+	packet(0x0934,clif->pHomMenu,2,4);
+	packet(0x0945,clif->pFriendsListAdd,2);
+	packet(0x0953,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-04-20aRagexeRE
 #if PACKETVER == 20160420
-	packet(0x022d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x02c4,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x035f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0864,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0870,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0872,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0874,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0884,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0888,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a5,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0935,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x094e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x095c,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x02c4,clif->pTickSend,2);
+	packet(0x035f,clif->pPartyInvite2,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pHomMenu,2,4);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0864,clif->pTakeItem,2);
+	packet(0x0870,clif->pDull/*,XXX*/);
+	packet(0x0872,clif->pChangeDir,2,4);
+	packet(0x0874,clif->pMoveToKafra,2,4);
+	packet(0x0884,clif->pDropItem,2,4);
+	packet(0x0888,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088b,clif->pMoveFromKafra,2,4);
+	packet(0x08a5,clif->pStoragePassword,0);
+	packet(0x092f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0935,clif->pFriendsListAdd,2);
+	packet(0x094e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x095c,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-04-27aRagexeRE
 #if PACKETVER == 20160427
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0835,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0940,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0835,clif->pStoragePassword,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0940,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-05-04aRagexeRE
 #if PACKETVER == 20160504
-	packet(0x0202,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0363,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0365,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x083c,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x085f,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x086b,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x087f,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0884,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0886,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0887,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x088a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x088d,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088f,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0890,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0893,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0898,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x089d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08ad,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0918,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0921,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0922,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0924,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x093e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0940,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0941,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0948,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0952,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0969,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
+	packet(0x0202,clif->pHomMenu,2,4);
+	packet(0x0363,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0365,clif->pDull/*,XXX*/);
+	packet(0x083c,clif->pSearchStoreInfoNextPage,0);
+	packet(0x085f,clif->pActionRequest,2,6);
+	packet(0x086b,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x087f,clif->pReqCloseBuyingStore,0);
+	packet(0x0884,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0886,clif->pMoveToKafra,2,4);
+	packet(0x0887,clif->pPartyInvite2,2);
+	packet(0x088a,clif->pTakeItem,2);
+	packet(0x088d,clif->pUseSkillToId,2,4,6);
+	packet(0x088f,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0890,clif->pDropItem,2,4);
+	packet(0x0893,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0898,clif->pDull/*,XXX*/);
+	packet(0x089d,clif->pSolveCharName,2);
+	packet(0x08ad,clif->pChangeDir,2,4);
+	packet(0x0918,clif->pTickSend,2);
+	packet(0x0921,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0922,clif->pGetCharNameRequest,2);
+	packet(0x0924,clif->pWalkToXY,2);
+	packet(0x093e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0940,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0941,clif->pMoveFromKafra,2,4);
+	packet(0x0948,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0952,clif->pFriendsListAdd,2);
+	packet(0x095b,clif->pReqClickBuyingStore,2);
+	packet(0x0969,clif->pStoragePassword,0);
 #endif
 
 // 2016-05-11aRagexeRE, 2016-05-11bRagexeRE
 #if PACKETVER == 20160511
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0894,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0918,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0920,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0940,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085e,clif->pChangeDir,2,4);
+	packet(0x0894,clif->pFriendsListAdd,2);
+	packet(0x089b,clif->pDull/*,XXX*/);
+	packet(0x0918,clif->pHomMenu,2,4);
+	packet(0x0920,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0940,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-05-18aRagexeRE
 #if PACKETVER == 20160518
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0874,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x089a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a9,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0928,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086c,clif->pChangeDir,2,4);
+	packet(0x0874,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x089a,clif->pStoragePassword,0);
+	packet(0x08a9,clif->pFriendsListAdd,2);
+	packet(0x0928,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-05-25aRagexeRE
 #if PACKETVER == 20160525
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x085e,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0867,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x086a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0899,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x089c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x092c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0937,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0945,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x094a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x094e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0951,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0956,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pDull/*,XXX*/);
+	packet(0x085e,clif->pDropItem,2,4);
+	packet(0x0867,clif->pHomMenu,2,4);
+	packet(0x086a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0899,clif->pTakeItem,2);
+	packet(0x089c,clif->pChangeDir,2,4);
+	packet(0x091d,clif->pStoragePassword,0);
+	packet(0x092c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0937,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0945,clif->pPartyInvite2,2);
+	packet(0x094a,clif->pMoveToKafra,2,4);
+	packet(0x094e,clif->pDull/*,XXX*/);
+	packet(0x0951,clif->pFriendsListAdd,2);
+	packet(0x0956,clif->pMoveFromKafra,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-06-01aRagexeRE
 #if PACKETVER == 20160601
-	packet(0x0202,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x02c4,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0863,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0870,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x088f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0895,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a7,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08ac,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0924,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x095b,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x095f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pReqCloseBuyingStore,0);
+	packet(0x02c4,clif->pPartyInvite2,2);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pFriendsListAdd,2);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0863,clif->pTakeItem,2);
+	packet(0x0870,clif->pMoveFromKafra,2,4);
+	packet(0x087d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088d,clif->pDropItem,2,4);
+	packet(0x088f,clif->pMoveToKafra,2,4);
+	packet(0x0895,clif->pHomMenu,2,4);
+	packet(0x08a7,clif->pDull/*,XXX*/);
+	packet(0x08ac,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0924,clif->pDull/*,XXX*/);
+	packet(0x095b,clif->pChangeDir,2,4);
+	packet(0x095f,clif->pStoragePassword,0);
+	packet(0x0961,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-06-08aRagexeRE, 2016-06-08bRagexeRE
 #if PACKETVER == 20160608
-	packet(0x022d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x02c4,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x035f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0437,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07ec,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0802,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085c,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0885,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0889,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0899,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x089b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a6,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x093b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x094d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0958,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x095b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0969,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x02c4,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x035f,clif->pPartyInvite2,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pWalkToXY,2);
+	packet(0x0437,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07ec,clif->pChangeDir,2,4);
+	packet(0x0802,clif->pTickSend,2);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085c,clif->pDull/*,XXX*/);
+	packet(0x0885,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0889,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0899,clif->pTakeItem,2);
+	packet(0x089b,clif->pHomMenu,2,4);
+	packet(0x08a6,clif->pMoveFromKafra,2,4);
+	packet(0x093b,clif->pDull/*,XXX*/);
+	packet(0x094d,clif->pDropItem,2,4);
+	packet(0x0958,clif->pStoragePassword,0);
+	packet(0x095b,clif->pMoveToKafra,2,4);
+	packet(0x0969,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-06-15aRagexeRE
 #if PACKETVER == 20160615
-	packet(0x0281,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0363,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0364,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0369,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x083c,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0866,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0870,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x087e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x087f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0884,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0887,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0888,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088a,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x088d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0891,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0898,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x092f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x093e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0947,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0948,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x094a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x094b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0954,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0957,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0958,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x095c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x095e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0961,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
+	packet(0x0281,clif->pFriendsListAdd,2);
+	packet(0x0363,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0364,clif->pStoragePassword,0);
+	packet(0x0369,clif->pHomMenu,2,4);
+	packet(0x083c,clif->pGetCharNameRequest,2);
+	packet(0x0866,clif->pWalkToXY,2);
+	packet(0x0870,clif->pDull/*,XXX*/);
+	packet(0x087d,clif->pSolveCharName,2);
+	packet(0x087e,clif->pTakeItem,2);
+	packet(0x087f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0884,clif->pDull/*,XXX*/);
+	packet(0x0887,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0888,clif->pUseSkillToId,2,4,6);
+	packet(0x088a,clif->pTickSend,2);
+	packet(0x088d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0891,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0898,clif->pDropItem,2,4);
+	packet(0x092f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x093e,clif->pPartyInvite2,2);
+	packet(0x0947,clif->pReqCloseBuyingStore,0);
+	packet(0x0948,clif->pActionRequest,2,6);
+	packet(0x094a,clif->pReqClickBuyingStore,2);
+	packet(0x094b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0954,clif->pChangeDir,2,4);
+	packet(0x0957,clif->pMoveToKafra,2,4);
+	packet(0x0958,clif->pMoveFromKafra,2,4);
+	packet(0x095c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x095e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0961,clif->pSearchStoreInfoListItemClick,2,6,10);
 #endif
 
 // 2016-06-22aRagexeRE
 #if PACKETVER == 20160622
-	packet(0x023b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x035f,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0361,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x07e4,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0861,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0865,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0867,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0880,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0887,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0890,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0891,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0892,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x089a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x089e,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a2,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a8,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x092f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0936,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0937,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x093b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x093f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0946,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0959,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0965,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0969,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
+	packet(0x023b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x035f,clif->pMoveFromKafra,2,4);
+	packet(0x0361,clif->pPartyInvite2,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x07e4,clif->pHomMenu,2,4);
+	packet(0x0861,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0865,clif->pDull/*,XXX*/);
+	packet(0x0867,clif->pDull/*,XXX*/);
+	packet(0x0880,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0887,clif->pReqCloseBuyingStore,0);
+	packet(0x0890,clif->pFriendsListAdd,2);
+	packet(0x0891,clif->pReqClickBuyingStore,2);
+	packet(0x0892,clif->pSearchStoreInfoNextPage,0);
+	packet(0x089a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x089e,clif->pActionRequest,2,6);
+	packet(0x08a2,clif->pSolveCharName,2);
+	packet(0x08a8,clif->pStoragePassword,0);
+	packet(0x091c,clif->pTakeItem,2);
+	packet(0x092d,clif->pTickSend,2);
+	packet(0x092f,clif->pUseSkillToId,2,4,6);
+	packet(0x0936,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0937,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x093b,clif->pMoveToKafra,2,4);
+	packet(0x093f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0946,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0959,clif->pGetCharNameRequest,2);
+	packet(0x0965,clif->pChangeDir,2,4);
+	packet(0x0969,clif->pDropItem,2,4);
 #endif
 
 // 2016-06-29aRagexeRE, 2016-06-30aRagexeRE
 #if PACKETVER == 20160629 || \
     PACKETVER == 20160630
-	packet(0x0202,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x022d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x035f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0363,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0368,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x085c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x085e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0860,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0861,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0863,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0867,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x086b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0881,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0885,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x088e,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0893,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x091e,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0922,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0925,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0926,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x093e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0946,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0948,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x094a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0957,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x095a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0968,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0969,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x096a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
+	packet(0x0202,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x022d,clif->pWalkToXY,2);
+	packet(0x035f,clif->pDull/*,XXX*/);
+	packet(0x0363,clif->pReqClickBuyingStore,2);
+	packet(0x0368,clif->pItemListWindowSelected,2,4,8);
+	packet(0x085c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x085e,clif->pDull/*,XXX*/);
+	packet(0x0860,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0861,clif->pDropItem,2,4);
+	packet(0x0863,clif->pSolveCharName,2);
+	packet(0x0867,clif->pStoragePassword,0);
+	packet(0x086b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0881,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0885,clif->pHomMenu,2,4);
+	packet(0x088e,clif->pGetCharNameRequest,2);
+	packet(0x0893,clif->pTickSend,2);
+	packet(0x091e,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0922,clif->pMoveFromKafra,2,4);
+	packet(0x0925,clif->pUseSkillToId,2,4,6);
+	packet(0x0926,clif->pPartyInvite2,2);
+	packet(0x093e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0946,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0948,clif->pChangeDir,2,4);
+	packet(0x094a,clif->pFriendsListAdd,2);
+	packet(0x0957,clif->pReqCloseBuyingStore,0);
+	packet(0x095a,clif->pActionRequest,2,6);
+	packet(0x0968,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0969,clif->pTakeItem,2);
+	packet(0x096a,clif->pMoveToKafra,2,4);
 #endif
 
 // 2016-07-06cRagexeRE
 #if PACKETVER == 20160706
-	packet(0x0362,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0436,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x085f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0860,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0869,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x086b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0884,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0886,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0889,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0892,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0899,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a4,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a5,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a8,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0918,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x091b,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0924,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0926,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0927,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0929,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0939,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x093d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0944,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0945,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x094c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0952,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0957,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0958,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
+	packet(0x0362,clif->pSolveCharName,2);
+	packet(0x0436,clif->pReqClickBuyingStore,2);
+	packet(0x085f,clif->pPartyInvite2,2);
+	packet(0x0860,clif->pActionRequest,2,6);
+	packet(0x0869,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x086b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0884,clif->pFriendsListAdd,2);
+	packet(0x0886,clif->pDull/*,XXX*/);
+	packet(0x0889,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0892,clif->pHomMenu,2,4);
+	packet(0x0899,clif->pUseSkillToId,2,4,6);
+	packet(0x08a4,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08a5,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a8,clif->pTickSend,2);
+	packet(0x0918,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x091b,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0924,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0926,clif->pChangeDir,2,4);
+	packet(0x0927,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0929,clif->pMoveFromKafra,2,4);
+	packet(0x092d,clif->pWalkToXY,2);
+	packet(0x0939,clif->pMoveToKafra,2,4);
+	packet(0x093d,clif->pDropItem,2,4);
+	packet(0x0944,clif->pDull/*,XXX*/);
+	packet(0x0945,clif->pGetCharNameRequest,2);
+	packet(0x094c,clif->pStoragePassword,0);
+	packet(0x0952,clif->pReqCloseBuyingStore,0);
+	packet(0x0957,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0958,clif->pTakeItem,2);
 #endif
 
 // 2016-07-13aRagexeRE, 2016-07-13bRagexeRE
 #if PACKETVER == 20160713
-	packet(0x022d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0363,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0364,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0838,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0860,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0865,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0869,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0875,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0877,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x087b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0883,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x088d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0892,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x089a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a2,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a4,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x091c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x091d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0921,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0922,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x092c,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0931,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0939,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0944,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0945,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0947,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0957,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x095b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
+	packet(0x022d,clif->pStoragePassword,0);
+	packet(0x0363,clif->pChangeDir,2,4);
+	packet(0x0364,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0838,clif->pTakeItem,2);
+	packet(0x0860,clif->pReqClickBuyingStore,2);
+	packet(0x0865,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0869,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0875,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0877,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x087b,clif->pTickSend,2);
+	packet(0x0883,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x088d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0892,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x089a,clif->pPartyInvite2,2);
+	packet(0x089f,clif->pDull/*,XXX*/);
+	packet(0x08a2,clif->pMoveFromKafra,2,4);
+	packet(0x08a4,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x091c,clif->pWalkToXY,2);
+	packet(0x091d,clif->pSolveCharName,2);
+	packet(0x0921,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0922,clif->pHomMenu,2,4);
+	packet(0x092c,clif->pGetCharNameRequest,2);
+	packet(0x0931,clif->pUseSkillToId,2,4,6);
+	packet(0x0939,clif->pFriendsListAdd,2);
+	packet(0x0944,clif->pReqCloseBuyingStore,0);
+	packet(0x0945,clif->pActionRequest,2,6);
+	packet(0x0947,clif->pMoveToKafra,2,4);
+	packet(0x0957,clif->pDropItem,2,4);
+	packet(0x095b,clif->pDull/*,XXX*/);
 #endif
 
 // 2016-07-20aRagexeRE, 2016-07-20bRagexeRE
 #if PACKETVER == 20160720
-	packet(0x0362,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0363,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0365,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x07e4,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0838,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x085b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x086a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x086d,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x087f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0883,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0887,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0897,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x089a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x089e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a0,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08aa,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0917,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x091c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x093b,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x093e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0946,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x094d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0953,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x095b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0960,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0969,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
+	packet(0x0362,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0363,clif->pUseSkillToId,2,4,6);
+	packet(0x0365,clif->pActionRequest,2,6);
+	packet(0x07e4,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0838,clif->pWalkToXY,2);
+	packet(0x085b,clif->pReqCloseBuyingStore,0);
+	packet(0x086a,clif->pSearchStoreInfoNextPage,0);
+	packet(0x086d,clif->pReqClickBuyingStore,2);
+	packet(0x087f,clif->pDropItem,2,4);
+	packet(0x0883,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0887,clif->pGetCharNameRequest,2);
+	packet(0x0897,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x089a,clif->pStoragePassword,0);
+	packet(0x089c,clif->pHomMenu,2,4);
+	packet(0x089e,clif->pMoveFromKafra,2,4);
+	packet(0x08a0,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08aa,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0917,clif->pDull/*,XXX*/);
+	packet(0x091c,clif->pTakeItem,2);
+	packet(0x092a,clif->pFriendsListAdd,2);
+	packet(0x093b,clif->pChangeDir,2,4);
+	packet(0x093e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0946,clif->pTickSend,2);
+	packet(0x094d,clif->pSolveCharName,2);
+	packet(0x0953,clif->pDull/*,XXX*/);
+	packet(0x095b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0960,clif->pMoveToKafra,2,4);
+	packet(0x0969,clif->pPartyInvite2,2);
 #endif
 
 // 2016-07-27aRagexeRE, 2016-07-27bRagexeRE
 #if PACKETVER == 20160727
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x023b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0362,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0363,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0436,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0438,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x07ec,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0866,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0868,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0869,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0874,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0877,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0883,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0887,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0891,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x089f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08a2,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a4,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a7,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0936,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0941,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0946,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0949,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0951,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x095f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0966,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0969,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x023b,clif->pDull/*,XXX*/);
+	packet(0x0362,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0363,clif->pFriendsListAdd,2);
+	packet(0x0436,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0438,clif->pTickSend,2);
+	packet(0x07ec,clif->pDropItem,2,4);
+	packet(0x0866,clif->pDull/*,XXX*/);
+	packet(0x0868,clif->pPartyInvite2,2);
+	packet(0x0869,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0874,clif->pReqClickBuyingStore,2);
+	packet(0x0877,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0883,clif->pActionRequest,2,6);
+	packet(0x0887,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088e,clif->pUseSkillToId,2,4,6);
+	packet(0x0891,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x089f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08a2,clif->pStoragePassword,0);
+	packet(0x08a4,clif->pSolveCharName,2);
+	packet(0x08a7,clif->pTakeItem,2);
+	packet(0x092e,clif->pWalkToXY,2);
+	packet(0x0936,clif->pHomMenu,2,4);
+	packet(0x0941,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0946,clif->pGetCharNameRequest,2);
+	packet(0x0949,clif->pMoveFromKafra,2,4);
+	packet(0x0951,clif->pMoveToKafra,2,4);
+	packet(0x095f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0966,clif->pReqCloseBuyingStore,0);
+	packet(0x0969,clif->pItemListWindowSelected,2,4,8);
 #endif
 
 // 2016-08-03bRagexeRE
 #if PACKETVER == 20160803
-	packet(0x0364,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x085d,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0878,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0881,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0886,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0887,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0888,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x088b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0891,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0895,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089e,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x08a1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x091b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0929,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0930,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0932,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0934,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0937,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x093a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x093e,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x093f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0952,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0955,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0956,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0959,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x095a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x096a,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
+	packet(0x0364,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x085d,clif->pReqClickBuyingStore,2);
+	packet(0x0878,clif->pDull/*,XXX*/);
+	packet(0x087f,clif->pWalkToXY,2);
+	packet(0x0881,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0886,clif->pMoveToKafra,2,4);
+	packet(0x0887,clif->pGetCharNameRequest,2);
+	packet(0x0888,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x088b,clif->pReqCloseBuyingStore,0);
+	packet(0x0891,clif->pChangeDir,2,4);
+	packet(0x0895,clif->pFriendsListAdd,2);
+	packet(0x089c,clif->pDropItem,2,4);
+	packet(0x089e,clif->pSearchStoreInfoNextPage,0);
+	packet(0x08a1,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x091b,clif->pTakeItem,2);
+	packet(0x0929,clif->pStoragePassword,0);
+	packet(0x0930,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0932,clif->pUseSkillToId,2,4,6);
+	packet(0x0934,clif->pActionRequest,2,6);
+	packet(0x0937,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x093a,clif->pDull/*,XXX*/);
+	packet(0x093e,clif->pTickSend,2);
+	packet(0x093f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0952,clif->pHomMenu,2,4);
+	packet(0x0955,clif->pMoveFromKafra,2,4);
+	packet(0x0956,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0959,clif->pSolveCharName,2);
+	packet(0x095a,clif->pPartyInvite2,2);
+	packet(0x096a,clif->pReqTradeBuyingStore,2,4,8,12);
 #endif
 
 // 2016-08-10aRagexeRE
 #if PACKETVER == 20160810
-	packet(0x0361,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0819,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0838,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x085d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x085e,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x085f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0860,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x086f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0875,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0879,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x087a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0885,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0888,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0890,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x089d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x089f,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a9,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x091c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0926,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x092b,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x092d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0935,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0943,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x094b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0959,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x095b,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0967,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
+	packet(0x0361,clif->pStoragePassword,0);
+	packet(0x0819,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0838,clif->pPartyInvite2,2);
+	packet(0x085d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x085e,clif->pDropItem,2,4);
+	packet(0x085f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0860,clif->pSolveCharName,2);
+	packet(0x086f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0875,clif->pHomMenu,2,4);
+	packet(0x0879,clif->pReqClickBuyingStore,2);
+	packet(0x087a,clif->pWalkToXY,2);
+	packet(0x0885,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0888,clif->pFriendsListAdd,2);
+	packet(0x0890,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x089d,clif->pChangeDir,2,4);
+	packet(0x089f,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a9,clif->pMoveToKafra,2,4);
+	packet(0x091a,clif->pTakeItem,2);
+	packet(0x091b,clif->pGetCharNameRequest,2);
+	packet(0x091c,clif->pUseSkillToId,2,4,6);
+	packet(0x0926,clif->pDull/*,XXX*/);
+	packet(0x092b,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x092d,clif->pMoveFromKafra,2,4);
+	packet(0x0935,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0943,clif->pTickSend,2);
+	packet(0x094b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0959,clif->pReqCloseBuyingStore,0);
+	packet(0x095b,clif->pActionRequest,2,6);
+	packet(0x0967,clif->pDull/*,XXX*/);
 #endif
 
 // 2016-08-17aRagexeRE
 #if PACKETVER == 20160817
-	packet(0x0364,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0437,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x07e4,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0811,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0819,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x083c,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x085c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0867,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x086b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0875,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x087f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0886,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0891,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x089c,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08a5,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a6,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a9,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x08ab,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08ac,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08ad,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0929,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x092d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0930,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0939,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x093c,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0957,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0960,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0963,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x0364,clif->pReqClickBuyingStore,2);
+	packet(0x0437,clif->pFriendsListAdd,2);
+	packet(0x07e4,clif->pGetCharNameRequest,2);
+	packet(0x0811,clif->pDull/*,XXX*/);
+	packet(0x0819,clif->pTickSend,2);
+	packet(0x083c,clif->pItemListWindowSelected,2,4,8);
+	packet(0x085c,clif->pTakeItem,2);
+	packet(0x0867,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x086b,clif->pSolveCharName,2);
+	packet(0x0875,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x087f,clif->pDropItem,2,4);
+	packet(0x0886,clif->pActionRequest,2,6);
+	packet(0x0891,clif->pUseSkillToId,2,4,6);
+	packet(0x089c,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08a5,clif->pStoragePassword,0);
+	packet(0x08a6,clif->pPartyInvite2,2);
+	packet(0x08a9,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x08ab,clif->pHomMenu,2,4);
+	packet(0x08ac,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08ad,clif->pMoveToKafra,2,4);
+	packet(0x091b,clif->pReqCloseBuyingStore,0);
+	packet(0x0929,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x092d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0930,clif->pWalkToXY,2);
+	packet(0x0939,clif->pMoveFromKafra,2,4);
+	packet(0x093c,clif->pDull/*,XXX*/);
+	packet(0x0957,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0960,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0963,clif->pChangeDir,2,4);
 #endif
 
 // 2016-08-24aRagexeRE
 #if PACKETVER == 20160824
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0934,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0934,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-08-31aRagexeRE, 2016-08-31bRagexeRE
 #if PACKETVER == 20160831
-	packet(0x022d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0366,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x07ec,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0835,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0865,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x086d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0870,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0874,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0876,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0878,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x087c,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08a8,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08a9,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0917,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x092c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0938,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x093a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0946,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x094a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x094f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0950,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0954,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0957,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x095e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0960,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0964,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0967,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
+	packet(0x022d,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0366,clif->pDropItem,2,4);
+	packet(0x07ec,clif->pReqClickBuyingStore,2);
+	packet(0x0835,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0865,clif->pWalkToXY,2);
+	packet(0x086d,clif->pReqCloseBuyingStore,0);
+	packet(0x0870,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0874,clif->pPartyInvite2,2);
+	packet(0x0876,clif->pDull/*,XXX*/);
+	packet(0x0878,clif->pActionRequest,2,6);
+	packet(0x087c,clif->pGetCharNameRequest,2);
+	packet(0x08a8,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08a9,clif->pTickSend,2);
+	packet(0x0917,clif->pStoragePassword,0);
+	packet(0x091b,clif->pDull/*,XXX*/);
+	packet(0x092c,clif->pFriendsListAdd,2);
+	packet(0x092e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0938,clif->pSearchStoreInfoNextPage,0);
+	packet(0x093a,clif->pHomMenu,2,4);
+	packet(0x0946,clif->pSolveCharName,2);
+	packet(0x094a,clif->pChangeDir,2,4);
+	packet(0x094f,clif->pMoveToKafra,2,4);
+	packet(0x0950,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0954,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0957,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x095e,clif->pMoveFromKafra,2,4);
+	packet(0x0960,clif->pTakeItem,2);
+	packet(0x0964,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0967,clif->pUseSkillToId,2,4,6);
 #endif
 
 // 2016-09-07aRagexeRE
 #if PACKETVER == 20160907
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x091c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x091c,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-09-13aRagexeRE
 #if PACKETVER == 20160913
-	packet(0x0361,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0817,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x085b,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0865,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0874,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0875,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0879,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x087a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0887,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0889,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x088e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0891,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0892,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x089b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x089c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0928,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0935,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x093a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0949,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x094a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0950,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0952,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0954,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0962,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0963,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0968,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
+	packet(0x0361,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0817,clif->pMoveToKafra,2,4);
+	packet(0x085b,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0865,clif->pGetCharNameRequest,2);
+	packet(0x0874,clif->pReqClickBuyingStore,2);
+	packet(0x0875,clif->pTickSend,2);
+	packet(0x0879,clif->pDropItem,2,4);
+	packet(0x087a,clif->pDull/*,XXX*/);
+	packet(0x087b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0887,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0889,clif->pTakeItem,2);
+	packet(0x088e,clif->pUseSkillToId,2,4,6);
+	packet(0x088f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0891,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0892,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x089b,clif->pMoveFromKafra,2,4);
+	packet(0x089c,clif->pStoragePassword,0);
+	packet(0x08a5,clif->pChangeDir,2,4);
+	packet(0x0928,clif->pFriendsListAdd,2);
+	packet(0x0935,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x093a,clif->pHomMenu,2,4);
+	packet(0x0949,clif->pPartyInvite2,2);
+	packet(0x094a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0950,clif->pActionRequest,2,6);
+	packet(0x0952,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0954,clif->pWalkToXY,2);
+	packet(0x0962,clif->pDull/*,XXX*/);
+	packet(0x0963,clif->pSolveCharName,2);
+	packet(0x0968,clif->pReqCloseBuyingStore,0);
 #endif
 
 // 2016-09-21bRagexeRE
 #if PACKETVER == 20160921
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x094a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x094a,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-09-28cRagexeRE, 2016-09-28dRagexeRE
 #if PACKETVER == 20160928
-	packet(0x0202,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0366,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0436,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0811,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0838,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0864,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0866,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x086d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0872,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0878,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x087f,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0889,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x088e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0897,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x089a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a2,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a9,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0919,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x091e,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0927,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x092d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0944,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x094d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0953,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0955,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0957,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
+	packet(0x0202,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pGetCharNameRequest,2);
+	packet(0x0366,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0436,clif->pReqClickBuyingStore,2);
+	packet(0x0811,clif->pDull/*,XXX*/);
+	packet(0x0838,clif->pPartyInvite2,2);
+	packet(0x0864,clif->pMoveFromKafra,2,4);
+	packet(0x0866,clif->pSearchStoreInfoNextPage,0);
+	packet(0x086d,clif->pDropItem,2,4);
+	packet(0x0872,clif->pHomMenu,2,4);
+	packet(0x0878,clif->pSolveCharName,2);
+	packet(0x087f,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0889,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x088e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0897,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x089a,clif->pActionRequest,2,6);
+	packet(0x08a2,clif->pStoragePassword,0);
+	packet(0x08a9,clif->pMoveToKafra,2,4);
+	packet(0x0919,clif->pWalkToXY,2);
+	packet(0x091e,clif->pTickSend,2);
+	packet(0x0927,clif->pUseSkillToId,2,4,6);
+	packet(0x092d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0944,clif->pChangeDir,2,4);
+	packet(0x094d,clif->pReqCloseBuyingStore,0);
+	packet(0x094e,clif->pFriendsListAdd,2);
+	packet(0x0953,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0955,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0957,clif->pTakeItem,2);
+	packet(0x095a,clif->pDull/*,XXX*/);
 #endif
 
 // 2016-10-05aRagexeRE
 #if PACKETVER == 20161005
-	packet(0x0202,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0838,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0863,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0886,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0891,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0892,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x089b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a0,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08ac,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08ad,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0918,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0919,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x091e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x092b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0931,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0932,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x093b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0942,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0944,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0945,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x094a,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x094d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0952,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x095a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x095b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0967,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
+	packet(0x0202,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pActionRequest,2,6);
+	packet(0x0838,clif->pStoragePassword,0);
+	packet(0x0863,clif->pGetCharNameRequest,2);
+	packet(0x0886,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088e,clif->pMoveFromKafra,2,4);
+	packet(0x0891,clif->pChangeDir,2,4);
+	packet(0x0892,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x089b,clif->pPartyInvite2,2);
+	packet(0x089c,clif->pTakeItem,2);
+	packet(0x08a0,clif->pMoveToKafra,2,4);
+	packet(0x08ac,clif->pReqCloseBuyingStore,0);
+	packet(0x08ad,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0918,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0919,clif->pSolveCharName,2);
+	packet(0x091e,clif->pDull/*,XXX*/);
+	packet(0x092b,clif->pTickSend,2);
+	packet(0x0931,clif->pFriendsListAdd,2);
+	packet(0x0932,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x093b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0942,clif->pDropItem,2,4);
+	packet(0x0944,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0945,clif->pWalkToXY,2);
+	packet(0x094a,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x094d,clif->pHomMenu,2,4);
+	packet(0x0952,clif->pDull/*,XXX*/);
+	packet(0x095a,clif->pReqClickBuyingStore,2);
+	packet(0x095b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0967,clif->pUseSkillToId,2,4,6);
 #endif
 
 // 2016-10-12aRagexeRE
 #if PACKETVER == 20161012
-	packet(0x023b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0364,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0365,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0369,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x07ec,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0819,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x085b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x085e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0863,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0868,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0872,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0875,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0880,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0893,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a0,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x092d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0936,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0937,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0939,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0943,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0944,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x094f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0951,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x095c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0962,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0966,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0967,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
+	packet(0x023b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0364,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0365,clif->pTickSend,2);
+	packet(0x0369,clif->pPartyInvite2,2);
+	packet(0x07ec,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0819,clif->pFriendsListAdd,2);
+	packet(0x085b,clif->pDull/*,XXX*/);
+	packet(0x085e,clif->pReqCloseBuyingStore,0);
+	packet(0x0863,clif->pActionRequest,2,6);
+	packet(0x0868,clif->pTakeItem,2);
+	packet(0x086d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0872,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0875,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0880,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0893,clif->pMoveToKafra,2,4);
+	packet(0x08a0,clif->pChangeDir,2,4);
+	packet(0x092d,clif->pSolveCharName,2);
+	packet(0x0936,clif->pGetCharNameRequest,2);
+	packet(0x0937,clif->pReqClickBuyingStore,2);
+	packet(0x0939,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0943,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0944,clif->pMoveFromKafra,2,4);
+	packet(0x094f,clif->pDull/*,XXX*/);
+	packet(0x0951,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x095c,clif->pHomMenu,2,4);
+	packet(0x0962,clif->pUseSkillToId,2,4,6);
+	packet(0x0966,clif->pWalkToXY,2);
+	packet(0x0967,clif->pStoragePassword,0);
 #endif
 
 // 2016-10-19aRagexeRE
 #if PACKETVER == 20161019
-	packet(0x022d,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0361,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0889,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0892,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0946,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0963,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pReqClickBuyingStore,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pHomMenu,2,4);
+	packet(0x0361,clif->pWalkToXY,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pChangeDir,2,4);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0889,clif->pStoragePassword,0);
+	packet(0x0892,clif->pDull/*,XXX*/);
+	packet(0x0946,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0963,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-10-26bRagexeRE, 2016-10-26cRagexeRE
 #if PACKETVER == 20161026
-	packet(0x0363,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0438,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x085f,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0861,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0862,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x086a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x086c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x086e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x087c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0886,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0891,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0894,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0898,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x091a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x091b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0926,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x092c,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x092e,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x092f,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0930,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x094b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0953,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x095c,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x095e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0962,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x0363,clif->pStoragePassword,0);
+	packet(0x0438,clif->pWalkToXY,2);
+	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x085a,clif->pMoveToKafra,2,4);
+	packet(0x085f,clif->pActionRequest,2,6);
+	packet(0x0861,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0862,clif->pTickSend,2);
+	packet(0x086a,clif->pSearchStoreInfoNextPage,0);
+	packet(0x086c,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x086e,clif->pDull/*,XXX*/);
+	packet(0x087a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x087c,clif->pDull/*,XXX*/);
+	packet(0x087f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0886,clif->pDropItem,2,4);
+	packet(0x0891,clif->pReqClickBuyingStore,2);
+	packet(0x0894,clif->pUseSkillToId,2,4,6);
+	packet(0x0898,clif->pFriendsListAdd,2);
+	packet(0x091a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x091b,clif->pTakeItem,2);
+	packet(0x0926,clif->pSolveCharName,2);
+	packet(0x092c,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x092e,clif->pHomMenu,2,4);
+	packet(0x092f,clif->pReqCloseBuyingStore,0);
+	packet(0x0930,clif->pGetCharNameRequest,2);
+	packet(0x094b,clif->pMoveFromKafra,2,4);
+	packet(0x0953,clif->pPartyInvite2,2);
+	packet(0x095c,clif->pItemListWindowSelected,2,4,8);
+	packet(0x095e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0962,clif->pChangeDir,2,4);
 #endif
 
 // 2016-11-02aRagexeRE, 2016-11-03aRagexeRE
 #if PACKETVER == 20161102 || \
     PACKETVER == 20161103
-	packet(0x0361,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0367,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0436,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0802,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0838,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x083c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0869,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x086c,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x086f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0874,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0886,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x088f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0890,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a2,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08aa,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x091b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0922,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0925,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0928,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092f,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0936,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0946,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0949,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x095e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0964,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0965,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0966,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
+	packet(0x0361,clif->pMoveFromKafra,2,4);
+	packet(0x0367,clif->pDull/*,XXX*/);
+	packet(0x0436,clif->pActionRequest,2,6);
+	packet(0x0802,clif->pTakeItem,2);
+	packet(0x0838,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x083c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x085f,clif->pUseSkillToId,2,4,6);
+	packet(0x0869,clif->pMoveToKafra,2,4);
+	packet(0x086c,clif->pSearchStoreInfoNextPage,0);
+	packet(0x086f,clif->pDull/*,XXX*/);
+	packet(0x0874,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0886,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x088f,clif->pHomMenu,2,4);
+	packet(0x0890,clif->pDropItem,2,4);
+	packet(0x089f,clif->pPartyInvite2,2);
+	packet(0x08a2,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08aa,clif->pWalkToXY,2);
+	packet(0x091b,clif->pStoragePassword,0);
+	packet(0x0922,clif->pReqClickBuyingStore,2);
+	packet(0x0925,clif->pSolveCharName,2);
+	packet(0x0928,clif->pFriendsListAdd,2);
+	packet(0x092f,clif->pGetCharNameRequest,2);
+	packet(0x0936,clif->pReqCloseBuyingStore,0);
+	packet(0x0946,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0949,clif->pChangeDir,2,4);
+	packet(0x095e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0964,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0965,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0966,clif->pTickSend,2);
 #endif
 
 // 2016-11-09aRagexeRE, 2016-11-09bRagexeRE, 2016-11-09cRagexeRE, 2016-11-09dRagexeRE
 #if PACKETVER == 20161109
-	packet(0x02c4,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0361,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0362,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0366,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x085d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x085e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0865,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x086a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x086d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0870,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0876,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x087a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0881,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x088e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0891,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0898,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x089a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089d,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x089f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a7,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08ad,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0927,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0937,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x093c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x093f,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0954,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0956,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x02c4,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0361,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0362,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pTickSend,2);
+	packet(0x0366,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSolveCharName,2);
+	packet(0x085d,clif->pReqCloseBuyingStore,0);
+	packet(0x085e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0865,clif->pWalkToXY,2);
+	packet(0x086a,clif->pActionRequest,2,6);
+	packet(0x086d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0870,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0876,clif->pReqClickBuyingStore,2);
+	packet(0x087a,clif->pDull/*,XXX*/);
+	packet(0x0881,clif->pMoveToKafra,2,4);
+	packet(0x088e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0891,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0898,clif->pTakeItem,2);
+	packet(0x089a,clif->pDropItem,2,4);
+	packet(0x089d,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x089f,clif->pDull/*,XXX*/);
+	packet(0x08a7,clif->pHomMenu,2,4);
+	packet(0x08ad,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0927,clif->pPartyInvite2,2);
+	packet(0x0937,clif->pFriendsListAdd,2);
+	packet(0x093c,clif->pStoragePassword,0);
+	packet(0x093f,clif->pGetCharNameRequest,2);
+	packet(0x0954,clif->pUseSkillToId,2,4,6);
+	packet(0x0956,clif->pChangeDir,2,4);
 #endif
 
 // 2016-11-16bRagexeRE, 2016-11-16cRagexeRE
 #if PACKETVER == 20161116
-	packet(0x0368,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0369,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0835,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x085f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0864,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x086f,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0885,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x088b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x088d,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x088f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0890,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0892,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0893,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a1,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a2,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08aa,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08ac,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0920,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0925,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x092a,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0931,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x093c,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x094a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0952,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0957,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x095b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x095d,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x095f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0967,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
+	packet(0x0368,clif->pTickSend,2);
+	packet(0x0369,clif->pMoveToKafra,2,4);
+	packet(0x0835,clif->pFriendsListAdd,2);
+	packet(0x085f,clif->pDropItem,2,4);
+	packet(0x0864,clif->pPartyInvite2,2);
+	packet(0x086f,clif->pTakeItem,2);
+	packet(0x0885,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x088b,clif->pHomMenu,2,4);
+	packet(0x088d,clif->pReqClickBuyingStore,2);
+	packet(0x088f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0890,clif->pWalkToXY,2);
+	packet(0x0892,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0893,clif->pActionRequest,2,6);
+	packet(0x08a1,clif->pChangeDir,2,4);
+	packet(0x08a2,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08aa,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08ac,clif->pMoveFromKafra,2,4);
+	packet(0x0920,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0925,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x092a,clif->pUseSkillToId,2,4,6);
+	packet(0x0931,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x093c,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x094a,clif->pGetCharNameRequest,2);
+	packet(0x0952,clif->pReqCloseBuyingStore,0);
+	packet(0x0957,clif->pSolveCharName,2);
+	packet(0x095b,clif->pStoragePassword,0);
+	packet(0x095d,clif->pDull/*,XXX*/);
+	packet(0x095f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0967,clif->pDull/*,XXX*/);
 #endif
 
 // 2016-11-23aRagexeRE
 #if PACKETVER == 20161123
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0362,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0437,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x085c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0861,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0862,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0866,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x086f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0871,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0880,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0882,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x088b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a9,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08aa,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x091a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0926,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x092a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x092f,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0930,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0941,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x094d,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x094f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x095a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x095b,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0962,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x096a,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0362,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0437,clif->pTickSend,2);
+	packet(0x085c,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0861,clif->pWalkToXY,2);
+	packet(0x0862,clif->pReqCloseBuyingStore,0);
+	packet(0x0866,clif->pSearchStoreInfoNextPage,0);
+	packet(0x086f,clif->pDropItem,2,4);
+	packet(0x0871,clif->pDull/*,XXX*/);
+	packet(0x087f,clif->pPartyInvite2,2);
+	packet(0x0880,clif->pStoragePassword,0);
+	packet(0x0882,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x088b,clif->pGetCharNameRequest,2);
+	packet(0x089c,clif->pChangeDir,2,4);
+	packet(0x08a9,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08aa,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x091a,clif->pMoveToKafra,2,4);
+	packet(0x0926,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x092a,clif->pReqClickBuyingStore,2);
+	packet(0x092f,clif->pTakeItem,2);
+	packet(0x0930,clif->pHomMenu,2,4);
+	packet(0x0941,clif->pFriendsListAdd,2);
+	packet(0x094d,clif->pUseSkillToId,2,4,6);
+	packet(0x094f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x095a,clif->pDull/*,XXX*/);
+	packet(0x095b,clif->pActionRequest,2,6);
+	packet(0x0962,clif->pMoveFromKafra,2,4);
+	packet(0x096a,clif->pSolveCharName,2);
 #endif
 
 // 2016-11-30aRagexeRE, 2016-11-30bRagexeRE
 #if PACKETVER == 20161130
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0931,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0943,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0954,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0959,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pChangeDir,2,4);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pTickSend,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x088f,clif->pDull/*,XXX*/);
+	packet(0x0931,clif->pHomMenu,2,4);
+	packet(0x0943,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0954,clif->pStoragePassword,0);
+	packet(0x0959,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-12-07cRagexeRE, 2016-12-07dRagexeRE, 2016-12-07eRagexeRE
 #if PACKETVER == 20161207
-	packet(0x023b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0867,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0868,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0875,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0886,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a1,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a2,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08ad,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0918,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x091d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0943,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x095d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0965,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pHomMenu,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0867,clif->pFriendsListAdd,2);
+	packet(0x0868,clif->pDull/*,XXX*/);
+	packet(0x0875,clif->pMoveToKafra,2,4);
+	packet(0x087e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0886,clif->pActionRequest,2,6);
+	packet(0x08a1,clif->pChangeDir,2,4);
+	packet(0x08a2,clif->pTakeItem,2);
+	packet(0x08ad,clif->pDropItem,2,4);
+	packet(0x0918,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x091d,clif->pMoveFromKafra,2,4);
+	packet(0x0943,clif->pDull/*,XXX*/);
+	packet(0x095d,clif->pStoragePassword,0);
+	packet(0x0965,clif->pPartyInvite2,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-12-14bRagexeRE, 2016-12-14cRagexeRE
 #if PACKETVER == 20161214
-	packet(0x022d,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0281,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x02c4,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0364,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0436,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0862,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x086d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0887,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0895,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0899,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a6,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x092e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x093d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pReqClickBuyingStore,2);
+	packet(0x0281,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x02c4,clif->pMoveFromKafra,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pHomMenu,2,4);
+	packet(0x0364,clif->pMoveToKafra,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0436,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pDull/*,XXX*/);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0862,clif->pFriendsListAdd,2);
+	packet(0x086d,clif->pPartyInvite2,2);
+	packet(0x0887,clif->pDropItem,2,4);
+	packet(0x0895,clif->pDull/*,XXX*/);
+	packet(0x0899,clif->pStoragePassword,0);
+	packet(0x08a6,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x092e,clif->pTakeItem,2);
+	packet(0x093d,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2016-12-21aRagexeRE, 2016-12-21bRagexeRE, 2016-12-21cRagexeRE, 2016-12-21dRagexeRE
 #if PACKETVER == 20161221
-	packet(0x035f,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0366,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0438,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0817,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x085b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0866,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0876,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0881,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0884,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0885,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088c,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0890,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0899,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x089a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x089b,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08aa,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x091e,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0926,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0928,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092c,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x092e,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0930,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0943,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0946,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x094b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x095a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0964,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0965,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x035f,clif->pTakeItem,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0366,clif->pSolveCharName,2);
+	packet(0x0438,clif->pWalkToXY,2);
+	packet(0x0817,clif->pMoveToKafra,2,4);
+	packet(0x085b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0866,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0876,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0881,clif->pGetCharNameRequest,2);
+	packet(0x0884,clif->pDull/*,XXX*/);
+	packet(0x0885,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088c,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0890,clif->pStoragePassword,0);
+	packet(0x0899,clif->pDull/*,XXX*/);
+	packet(0x089a,clif->pMoveFromKafra,2,4);
+	packet(0x089b,clif->pActionRequest,2,6);
+	packet(0x08aa,clif->pTickSend,2);
+	packet(0x091e,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0926,clif->pPartyInvite2,2);
+	packet(0x0928,clif->pFriendsListAdd,2);
+	packet(0x092c,clif->pReqCloseBuyingStore,0);
+	packet(0x092e,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0930,clif->pHomMenu,2,4);
+	packet(0x0943,clif->pUseSkillToId,2,4,6);
+	packet(0x0946,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x094b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x095a,clif->pReqClickBuyingStore,2);
+	packet(0x0964,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0965,clif->pChangeDir,2,4);
 #endif
 
 // 2016-12-28aRagexeRE
 #if PACKETVER == 20161228
-	packet(0x0362,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x085a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x085e,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0865,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x086a,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x086c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0870,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0871,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0875,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x087f,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0886,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0889,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0893,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a2,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a3,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08a5,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08ab,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08ac,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08ad,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0929,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x092c,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0934,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0935,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0938,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x093d,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0944,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
+	packet(0x0362,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x085a,clif->pGetCharNameRequest,2);
+	packet(0x085e,clif->pHomMenu,2,4);
+	packet(0x0865,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x086a,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x086c,clif->pTakeItem,2);
+	packet(0x086d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0870,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0871,clif->pChangeDir,2,4);
+	packet(0x0875,clif->pReqCloseBuyingStore,0);
+	packet(0x087f,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0886,clif->pWalkToXY,2);
+	packet(0x0889,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0893,clif->pDropItem,2,4);
+	packet(0x089f,clif->pMoveToKafra,2,4);
+	packet(0x08a2,clif->pUseSkillToId,2,4,6);
+	packet(0x08a3,clif->pReqClickBuyingStore,2);
+	packet(0x08a5,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08ab,clif->pMoveFromKafra,2,4);
+	packet(0x08ac,clif->pSolveCharName,2);
+	packet(0x08ad,clif->pStoragePassword,0);
+	packet(0x091c,clif->pFriendsListAdd,2);
+	packet(0x0929,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x092c,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0934,clif->pPartyInvite2,2);
+	packet(0x0935,clif->pDull/*,XXX*/);
+	packet(0x0938,clif->pDull/*,XXX*/);
+	packet(0x093d,clif->pActionRequest,2,6);
+	packet(0x0944,clif->pTickSend,2);
 #endif
 
 // 2017-01-04bRagexeRE
 #if PACKETVER == 20170104
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x085a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x087f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0896,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x085a,clif->pFriendsListAdd,2);
+	packet(0x087f,clif->pStoragePassword,0);
+	packet(0x0896,clif->pChangeDir,2,4);
+	packet(0x091b,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pUseSkillToId,2,4,6);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-01-11aRagexeRE
 #if PACKETVER == 20170111
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0877,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x087f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a1,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a3,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a6,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x091a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0940,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x094c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0961,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0969,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085d,clif->pHomMenu,2,4);
+	packet(0x0877,clif->pFriendsListAdd,2);
+	packet(0x087f,clif->pDull/*,XXX*/);
+	packet(0x088a,clif->pMoveToKafra,2,4);
+	packet(0x08a1,clif->pChangeDir,2,4);
+	packet(0x08a3,clif->pTakeItem,2);
+	packet(0x08a6,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x091a,clif->pStoragePassword,0);
+	packet(0x091b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0940,clif->pDropItem,2,4);
+	packet(0x094c,clif->pMoveFromKafra,2,4);
+	packet(0x0961,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0969,clif->pPartyInvite2,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-01-18aRagexeRE
 #if PACKETVER == 20170118
-	packet(0x022d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0364,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0862,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0865,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x086f,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0873,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x089e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08ad,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x091f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0927,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0933,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0958,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0962,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
+	packet(0x022d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0364,clif->pGetCharNameRequest,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pHomMenu,2,4);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0862,clif->pMoveFromKafra,2,4);
+	packet(0x0865,clif->pChangeDir,2,4);
+	packet(0x086f,clif->pTakeItem,2);
+	packet(0x0873,clif->pDull/*,XXX*/);
+	packet(0x089e,clif->pPartyInvite2,2);
+	packet(0x08ad,clif->pItemListWindowSelected,2,4,8);
+	packet(0x091f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0927,clif->pDull/*,XXX*/);
+	packet(0x0933,clif->pDropItem,2,4);
+	packet(0x0958,clif->pStoragePassword,0);
+	packet(0x0962,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pMoveToKafra,2,4);
 #endif
 
 // 2017-01-25aRagexeRE
 #if PACKETVER == 20170125
-	packet(0x0438,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x086e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0876,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0877,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0879,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x087d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0881,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0884,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0893,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0894,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0895,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0898,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x089b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x08a5,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x091b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x091c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0920,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0929,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x092b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0930,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x093c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0943,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0944,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x095c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0965,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0968,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
+	packet(0x0438,clif->pActionRequest,2,6);
+	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x086e,clif->pPartyInvite2,2);
+	packet(0x0876,clif->pHomMenu,2,4);
+	packet(0x0877,clif->pDropItem,2,4);
+	packet(0x0879,clif->pUseSkillToId,2,4,6);
+	packet(0x087b,clif->pTakeItem,2);
+	packet(0x087d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0881,clif->pChangeDir,2,4);
+	packet(0x0884,clif->pDull/*,XXX*/);
+	packet(0x0893,clif->pStoragePassword,0);
+	packet(0x0894,clif->pDull/*,XXX*/);
+	packet(0x0895,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0898,clif->pSolveCharName,2);
+	packet(0x089b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x08a5,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x091b,clif->pReqClickBuyingStore,2);
+	packet(0x091c,clif->pMoveToKafra,2,4);
+	packet(0x091d,clif->pReqCloseBuyingStore,0);
+	packet(0x0920,clif->pFriendsListAdd,2);
+	packet(0x0929,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x092b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0930,clif->pWalkToXY,2);
+	packet(0x093c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0943,clif->pTickSend,2);
+	packet(0x0944,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x095c,clif->pMoveFromKafra,2,4);
+	packet(0x0965,clif->pGetCharNameRequest,2);
+	packet(0x0968,clif->pSearchStoreInfoNextPage,0);
 #endif
 
 // 2017-02-01aRagexeRE
 #if PACKETVER == 20170201
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0815,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0875,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0879,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0881,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0884,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0885,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0886,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a4,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0919,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0920,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0938,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0940,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x094c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0966,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0969,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0815,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x085e,clif->pChangeDir,2,4);
+	packet(0x0875,clif->pTakeItem,2);
+	packet(0x0879,clif->pDull/*,XXX*/);
+	packet(0x0881,clif->pMoveToKafra,2,4);
+	packet(0x0884,clif->pWalkToXY,2);
+	packet(0x0885,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0886,clif->pStoragePassword,0);
+	packet(0x088b,clif->pDropItem,2,4);
+	packet(0x08a4,clif->pDull/*,XXX*/);
+	packet(0x0919,clif->pFriendsListAdd,2);
+	packet(0x0920,clif->pPartyInvite2,2);
+	packet(0x0938,clif->pHomMenu,2,4);
+	packet(0x0940,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x094c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0966,clif->pMoveFromKafra,2,4);
+	packet(0x0969,clif->pItemListWindowSelected,2,4,8);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-02-08aRagexeRE, 2017-02-08bRagexeRE
 #if PACKETVER == 20170208
-	packet(0x02c4,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0367,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085c,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0860,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0892,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a1,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08ac,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0921,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0923,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0932,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0937,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x02c4,clif->pDull/*,XXX*/);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0367,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085c,clif->pPartyInvite2,2);
+	packet(0x0860,clif->pChangeDir,2,4);
+	packet(0x087a,clif->pDull/*,XXX*/);
+	packet(0x088c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0892,clif->pFriendsListAdd,2);
+	packet(0x08a1,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08ac,clif->pMoveToKafra,2,4);
+	packet(0x0921,clif->pDropItem,2,4);
+	packet(0x0923,clif->pTakeItem,2);
+	packet(0x092d,clif->pHomMenu,2,4);
+	packet(0x0932,clif->pMoveFromKafra,2,4);
+	packet(0x0937,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-02-15aRagexeRE
 #if PACKETVER == 20170215
-	packet(0x02c4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x035f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0360,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x083c,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0876,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x087c,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x087d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087e,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0883,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0884,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x088b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x088c,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0890,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0896,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x089b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a2,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08a8,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x091c,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0925,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x092d,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0942,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094e,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x095f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0962,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0969,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
+	packet(0x02c4,clif->pStoragePassword,0);
+	packet(0x035f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0360,clif->pTickSend,2);
+	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x083c,clif->pActionRequest,2,6);
+	packet(0x085c,clif->pDropItem,2,4);
+	packet(0x0876,clif->pFriendsListAdd,2);
+	packet(0x087c,clif->pItemListWindowSelected,2,4,8);
+	packet(0x087d,clif->pChangeDir,2,4);
+	packet(0x087e,clif->pUseSkillToId,2,4,6);
+	packet(0x0883,clif->pSolveCharName,2);
+	packet(0x0884,clif->pDull/*,XXX*/);
+	packet(0x088a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x088b,clif->pPartyInvite2,2);
+	packet(0x088c,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0890,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0896,clif->pDull/*,XXX*/);
+	packet(0x089b,clif->pMoveToKafra,2,4);
+	packet(0x08a2,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08a8,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x091c,clif->pReqCloseBuyingStore,0);
+	packet(0x0925,clif->pMoveFromKafra,2,4);
+	packet(0x092b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x092d,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0942,clif->pTakeItem,2);
+	packet(0x094e,clif->pGetCharNameRequest,2);
+	packet(0x095f,clif->pReqClickBuyingStore,2);
+	packet(0x0962,clif->pHomMenu,2,4);
+	packet(0x0969,clif->pWalkToXY,2);
 #endif
 
 // 2017-02-22aRagexeRE
 #if PACKETVER == 20170222
-	packet(0x0202,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0866,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0870,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0871,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0877,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0889,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0894,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a3,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a8,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0937,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0939,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0943,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x095d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0962,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pHomMenu,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085f,clif->pFriendsListAdd,2);
+	packet(0x0866,clif->pDropItem,2,4);
+	packet(0x0870,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0871,clif->pDull/*,XXX*/);
+	packet(0x0877,clif->pDull/*,XXX*/);
+	packet(0x0889,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0894,clif->pTakeItem,2);
+	packet(0x08a3,clif->pChangeDir,2,4);
+	packet(0x08a8,clif->pPartyInvite2,2);
+	packet(0x0937,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0939,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0943,clif->pStoragePassword,0);
+	packet(0x095d,clif->pMoveToKafra,2,4);
+	packet(0x0962,clif->pMoveFromKafra,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-02-28aRagexeRE
 #if PACKETVER == 20170228
-	packet(0x022d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0360,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0362,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0819,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x085e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0863,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x086b,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0873,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0874,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0876,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0883,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0884,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0889,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0893,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x089e,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a0,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a2,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a6,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a7,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x091f,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x092a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0937,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x093e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0944,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0947,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0948,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0952,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0955,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x022d,clif->pDropItem,2,4);
+	packet(0x0360,clif->pActionRequest,2,6);
+	packet(0x0362,clif->pHomMenu,2,4);
+	packet(0x0819,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x085e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0863,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x086b,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0873,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0874,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0876,clif->pReqCloseBuyingStore,0);
+	packet(0x0883,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0884,clif->pWalkToXY,2);
+	packet(0x0889,clif->pChangeDir,2,4);
+	packet(0x0893,clif->pGetCharNameRequest,2);
+	packet(0x089e,clif->pMoveToKafra,2,4);
+	packet(0x08a0,clif->pFriendsListAdd,2);
+	packet(0x08a2,clif->pStoragePassword,0);
+	packet(0x08a6,clif->pDull/*,XXX*/);
+	packet(0x08a7,clif->pReqClickBuyingStore,2);
+	packet(0x091f,clif->pUseSkillToId,2,4,6);
+	packet(0x092a,clif->pTakeItem,2);
+	packet(0x092e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0937,clif->pTickSend,2);
+	packet(0x093e,clif->pDull/*,XXX*/);
+	packet(0x0944,clif->pMoveFromKafra,2,4);
+	packet(0x0947,clif->pSolveCharName,2);
+	packet(0x0948,clif->pPartyInvite2,2);
+	packet(0x0952,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0955,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2017-03-08bRagexeRE
 #if PACKETVER == 20170308
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087d,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-03-15cRagexeRE
 #if PACKETVER == 20170315
-	packet(0x02c4,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x035f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0360,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0366,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0436,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x07ec,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x085c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0863,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x086a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0872,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x087b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0884,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x088b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x088d,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0892,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x089c,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08aa,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x091d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0920,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0922,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0944,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x094a,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x094e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0950,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0952,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
+	packet(0x02c4,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x035f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0360,clif->pChangeDir,2,4);
+	packet(0x0366,clif->pTakeItem,2);
+	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0436,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x07ec,clif->pTickSend,2);
+	packet(0x085c,clif->pDull/*,XXX*/);
+	packet(0x0863,clif->pHomMenu,2,4);
+	packet(0x086a,clif->pMoveFromKafra,2,4);
+	packet(0x0872,clif->pFriendsListAdd,2);
+	packet(0x087b,clif->pPartyInvite2,2);
+	packet(0x0884,clif->pActionRequest,2,6);
+	packet(0x088b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x088d,clif->pDull/*,XXX*/);
+	packet(0x088f,clif->pWalkToXY,2);
+	packet(0x0892,clif->pUseSkillToId,2,4,6);
+	packet(0x089c,clif->pReqCloseBuyingStore,0);
+	packet(0x08aa,clif->pMoveToKafra,2,4);
+	packet(0x091a,clif->pDropItem,2,4);
+	packet(0x091b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x091d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0920,clif->pSolveCharName,2);
+	packet(0x0922,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0944,clif->pGetCharNameRequest,2);
+	packet(0x094a,clif->pReqClickBuyingStore,2);
+	packet(0x094e,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0950,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0952,clif->pStoragePassword,0);
 #endif
 
 // 2017-03-22aRagexeRE, 2017-03-22bRagexeRE
 #if PACKETVER == 20170322
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x091a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x091a,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-03-29cRagexeRE, 2017-03-29dRagexeRE
 #if PACKETVER == 20170329
-	packet(0x0281,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0363,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x087a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0888,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x08a8,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0917,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0926,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0929,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x092e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0937,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0939,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0949,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x095f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pPartyInvite2,2);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pHomMenu,2,4);
+	packet(0x0363,clif->pMoveToKafra,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085d,clif->pStoragePassword,0);
+	packet(0x087a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0888,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x08a8,clif->pDropItem,2,4);
+	packet(0x0917,clif->pDull/*,XXX*/);
+	packet(0x0926,clif->pChangeDir,2,4);
+	packet(0x0929,clif->pTakeItem,2);
+	packet(0x092e,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0937,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0939,clif->pFriendsListAdd,2);
+	packet(0x0949,clif->pMoveFromKafra,2,4);
+	packet(0x095f,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-04-05bRagexeRE, 2017-04-05cRagexeRE
 #if PACKETVER == 20170405
-	packet(0x022d,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0281,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085f,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0860,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0864,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0865,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x086f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0893,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a5,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x094c,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0964,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0281,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pActionRequest,2,6);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pTakeItem,2);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pHomMenu,2,4);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085f,clif->pMoveToKafra,2,4);
+	packet(0x0860,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0864,clif->pPartyInvite2,2);
+	packet(0x0865,clif->pChangeDir,2,4);
+	packet(0x086f,clif->pFriendsListAdd,2);
+	packet(0x0893,clif->pMoveFromKafra,2,4);
+	packet(0x08a5,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x094c,clif->pStoragePassword,0);
+	packet(0x094f,clif->pDull/*,XXX*/);
+	packet(0x0964,clif->pDropItem,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-04-12aRagexeRE
 #if PACKETVER == 20170412
-	packet(0x023b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0365,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0863,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0869,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x086d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0878,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0879,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087b,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0890,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0893,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0898,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x089a,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x089c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08a1,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x091a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x091e,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0929,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x092e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0938,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0942,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0945,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0949,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x094f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0952,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0959,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x095c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x095d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
+	packet(0x023b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0365,clif->pReqClickBuyingStore,2);
+	packet(0x0863,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0869,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x086d,clif->pMoveFromKafra,2,4);
+	packet(0x0878,clif->pWalkToXY,2);
+	packet(0x0879,clif->pDull/*,XXX*/);
+	packet(0x087b,clif->pUseSkillToId,2,4,6);
+	packet(0x088b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0890,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0893,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0898,clif->pSolveCharName,2);
+	packet(0x089a,clif->pHomMenu,2,4);
+	packet(0x089c,clif->pDropItem,2,4);
+	packet(0x08a1,clif->pActionRequest,2,6);
+	packet(0x091a,clif->pChangeDir,2,4);
+	packet(0x091e,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0929,clif->pTickSend,2);
+	packet(0x092e,clif->pDull/*,XXX*/);
+	packet(0x0938,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0942,clif->pFriendsListAdd,2);
+	packet(0x0945,clif->pMoveToKafra,2,4);
+	packet(0x0949,clif->pSearchStoreInfoNextPage,0);
+	packet(0x094f,clif->pPartyInvite2,2);
+	packet(0x0952,clif->pReqCloseBuyingStore,0);
+	packet(0x0959,clif->pTakeItem,2);
+	packet(0x095b,clif->pGetCharNameRequest,2);
+	packet(0x095c,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x095d,clif->pStoragePassword,0);
 #endif
 
 // 2017-04-19bRagexeRE
 #if PACKETVER == 20170419
-	packet(0x0811,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0819,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0838,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x085a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0862,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0868,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x086a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0872,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0881,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0897,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0898,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x089d,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08aa,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0920,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0922,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0930,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0931,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0935,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x093a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x093f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0942,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x095c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x095d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0963,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0965,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
+	packet(0x0811,clif->pChangeDir,2,4);
+	packet(0x0819,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0838,clif->pGetCharNameRequest,2);
+	packet(0x085a,clif->pActionRequest,2,6);
+	packet(0x085e,clif->pWalkToXY,2);
+	packet(0x0862,clif->pPartyInvite2,2);
+	packet(0x0868,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x086a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0872,clif->pDull/*,XXX*/);
+	packet(0x0881,clif->pStoragePassword,0);
+	packet(0x088d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088f,clif->pHomMenu,2,4);
+	packet(0x0897,clif->pDropItem,2,4);
+	packet(0x0898,clif->pTickSend,2);
+	packet(0x089d,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08aa,clif->pMoveToKafra,2,4);
+	packet(0x091b,clif->pSolveCharName,2);
+	packet(0x0920,clif->pUseSkillToId,2,4,6);
+	packet(0x0922,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0930,clif->pMoveFromKafra,2,4);
+	packet(0x0931,clif->pReqCloseBuyingStore,0);
+	packet(0x0935,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x093a,clif->pFriendsListAdd,2);
+	packet(0x093f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0942,clif->pSearchStoreInfoNextPage,0);
+	packet(0x095c,clif->pTakeItem,2);
+	packet(0x095d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0963,clif->pDull/*,XXX*/);
+	packet(0x0965,clif->pReqClickBuyingStore,2);
 #endif
 
 // 2017-04-26dRagexeRE
 #if PACKETVER == 20170426
-	packet(0x0281,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0866,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0887,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0899,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x089c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a2,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0927,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0940,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0958,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0963,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pStoragePassword,0);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0866,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086f,clif->pDull/*,XXX*/);
+	packet(0x087a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0887,clif->pSolveCharName,2);
+	packet(0x0899,clif->pMoveFromKafra,2,4);
+	packet(0x089c,clif->pHomMenu,2,4);
+	packet(0x08a2,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a4,clif->pTakeItem,2);
+	packet(0x091f,clif->pDull/*,XXX*/);
+	packet(0x0927,clif->pChangeDir,2,4);
+	packet(0x0940,clif->pDropItem,2,4);
+	packet(0x0958,clif->pFriendsListAdd,2);
+	packet(0x0963,clif->pMoveToKafra,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-05-02dRagexeRE
 #if PACKETVER == 20170502
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0875,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0894,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x089c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x093c,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0950,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0875,clif->pStoragePassword,0);
+	packet(0x0894,clif->pChangeDir,2,4);
+	packet(0x089c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x093c,clif->pFriendsListAdd,2);
+	packet(0x0950,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-05-17aRagexeRE, 2017-05-17bRagexeRE
 #if PACKETVER == 20170517
-	packet(0x0364,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0367,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0437,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0815,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0817,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0868,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0875,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x087b,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x087d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x088c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x088d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0894,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0896,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0899,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x089f,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08a2,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a8,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08aa,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x091b,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0923,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x093b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0945,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0946,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0947,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0958,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0960,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0964,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
+	packet(0x0364,clif->pDull/*,XXX*/);
+	packet(0x0367,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0437,clif->pActionRequest,2,6);
+	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0815,clif->pUseSkillToId,2,4,6);
+	packet(0x0817,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0868,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0875,clif->pSearchStoreInfoNextPage,0);
+	packet(0x087b,clif->pSolveCharName,2);
+	packet(0x087d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x088c,clif->pMoveFromKafra,2,4);
+	packet(0x088d,clif->pChangeDir,2,4);
+	packet(0x0894,clif->pGetCharNameRequest,2);
+	packet(0x0896,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0899,clif->pPartyInvite2,2);
+	packet(0x089e,clif->pDull/*,XXX*/);
+	packet(0x089f,clif->pReqCloseBuyingStore,0);
+	packet(0x08a2,clif->pTickSend,2);
+	packet(0x08a8,clif->pWalkToXY,2);
+	packet(0x08aa,clif->pMoveToKafra,2,4);
+	packet(0x091b,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0923,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x093b,clif->pDropItem,2,4);
+	packet(0x0945,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0946,clif->pReqClickBuyingStore,2);
+	packet(0x0947,clif->pStoragePassword,0);
+	packet(0x0958,clif->pHomMenu,2,4);
+	packet(0x0960,clif->pFriendsListAdd,2);
+	packet(0x0964,clif->pTakeItem,2);
 #endif
 
 // 2017-05-24aRagexeRE
 #if PACKETVER == 20170524
-	packet(0x0364,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0368,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0802,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x085e,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0860,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0864,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0866,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0868,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x086d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0873,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0874,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x087d,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0882,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x088d,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0894,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x089c,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a1,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x091e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0923,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0925,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0934,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0946,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0958,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x095a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x095b,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0964,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0967,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0968,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
+	packet(0x0364,clif->pPartyInvite2,2);
+	packet(0x0368,clif->pStoragePassword,0);
+	packet(0x0802,clif->pDropItem,2,4);
+	packet(0x085e,clif->pActionRequest,2,6);
+	packet(0x085f,clif->pReqClickBuyingStore,2);
+	packet(0x0860,clif->pTickSend,2);
+	packet(0x0864,clif->pTakeItem,2);
+	packet(0x0866,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0868,clif->pMoveToKafra,2,4);
+	packet(0x086d,clif->pHomMenu,2,4);
+	packet(0x0873,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0874,clif->pSearchStoreInfoNextPage,0);
+	packet(0x087d,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0882,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x088d,clif->pUseSkillToId,2,4,6);
+	packet(0x0894,clif->pMoveFromKafra,2,4);
+	packet(0x089c,clif->pWalkToXY,2);
+	packet(0x08a1,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x091e,clif->pDull/*,XXX*/);
+	packet(0x0923,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0925,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0934,clif->pChangeDir,2,4);
+	packet(0x0946,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0958,clif->pDull/*,XXX*/);
+	packet(0x095a,clif->pGetCharNameRequest,2);
+	packet(0x095b,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0964,clif->pReqCloseBuyingStore,0);
+	packet(0x0967,clif->pFriendsListAdd,2);
+	packet(0x0968,clif->pSolveCharName,2);
 #endif
 
 // 2017-05-31aRagexeRE
 #if PACKETVER == 20170531
-	packet(0x0361,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0369,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x07e4,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x07ec,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0819,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x085b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x085f,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0861,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0868,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0873,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0875,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0878,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x087b,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0885,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x088d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0894,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x089a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x08ac,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x08ad,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x092d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0933,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0937,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0940,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0945,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0963,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0968,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
+	packet(0x0361,clif->pChangeDir,2,4);
+	packet(0x0369,clif->pUseSkillToId,2,4,6);
+	packet(0x07e4,clif->pWalkToXY,2);
+	packet(0x07ec,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0819,clif->pTickSend,2);
+	packet(0x085b,clif->pDull/*,XXX*/);
+	packet(0x085f,clif->pSolveCharName,2);
+	packet(0x0861,clif->pFriendsListAdd,2);
+	packet(0x0868,clif->pDull/*,XXX*/);
+	packet(0x0873,clif->pReqCloseBuyingStore,0);
+	packet(0x0875,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0878,clif->pPartyInvite2,2);
+	packet(0x087b,clif->pActionRequest,2,6);
+	packet(0x0885,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x088d,clif->pDropItem,2,4);
+	packet(0x0894,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x089a,clif->pStoragePassword,0);
+	packet(0x089c,clif->pHomMenu,2,4);
+	packet(0x08a2,clif->pSearchStoreInfoNextPage,0);
+	packet(0x08ac,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x08ad,clif->pMoveToKafra,2,4);
+	packet(0x092d,clif->pGetCharNameRequest,2);
+	packet(0x0933,clif->pMoveFromKafra,2,4);
+	packet(0x0937,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0940,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0945,clif->pReqClickBuyingStore,2);
+	packet(0x0963,clif->pTakeItem,2);
+	packet(0x0968,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
 #endif
 
 // 2017-06-07bRagexeRE, 2017-06-07cRagexeRE
 #if PACKETVER == 20170607
-	packet(0x0361,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0364,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x07e4,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x085a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x085e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0862,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0863,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0864,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0871,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0873,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0875,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0885,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x088a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0897,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x089d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a9,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08ab,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0917,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0918,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0919,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0925,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0927,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0931,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0934,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0938,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x093d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0942,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0944,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0949,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
+	packet(0x0361,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0364,clif->pStoragePassword,0);
+	packet(0x07e4,clif->pTickSend,2);
+	packet(0x085a,clif->pChangeDir,2,4);
+	packet(0x085e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0862,clif->pGetCharNameRequest,2);
+	packet(0x0863,clif->pReqClickBuyingStore,2);
+	packet(0x0864,clif->pDropItem,2,4);
+	packet(0x0871,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0873,clif->pDull/*,XXX*/);
+	packet(0x0875,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0885,clif->pFriendsListAdd,2);
+	packet(0x088a,clif->pMoveFromKafra,2,4);
+	packet(0x0897,clif->pTakeItem,2);
+	packet(0x089d,clif->pMoveToKafra,2,4);
+	packet(0x08a9,clif->pUseSkillToId,2,4,6);
+	packet(0x08ab,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0917,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0918,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0919,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0925,clif->pPartyInvite2,2);
+	packet(0x0927,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0931,clif->pDull/*,XXX*/);
+	packet(0x0934,clif->pWalkToXY,2);
+	packet(0x0938,clif->pActionRequest,2,6);
+	packet(0x093d,clif->pReqCloseBuyingStore,0);
+	packet(0x0942,clif->pHomMenu,2,4);
+	packet(0x0944,clif->pSolveCharName,2);
+	packet(0x0949,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #endif
 
 // 2017-06-14bRagexeRE
 #if PACKETVER == 20170614
-	packet(0x023b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0361,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0364,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0367,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0437,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0838,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x083c,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0860,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0865,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0866,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0867,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x086b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x086c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0877,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0879,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x087e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0889,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0899,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a2,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08ad,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091b,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0928,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x092f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0936,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0944,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0957,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0963,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
+	packet(0x023b,clif->pMoveFromKafra,2,4);
+	packet(0x0361,clif->pWalkToXY,2);
+	packet(0x0364,clif->pHomMenu,2,4);
+	packet(0x0367,clif->pDropItem,2,4);
+	packet(0x0437,clif->pStoragePassword,0);
+	packet(0x0838,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x083c,clif->pActionRequest,2,6);
+	packet(0x0860,clif->pReqClickBuyingStore,2);
+	packet(0x0865,clif->pDull/*,XXX*/);
+	packet(0x0866,clif->pTickSend,2);
+	packet(0x0867,clif->pFriendsListAdd,2);
+	packet(0x086b,clif->pReqCloseBuyingStore,0);
+	packet(0x086c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0877,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0879,clif->pMoveToKafra,2,4);
+	packet(0x087d,clif->pSolveCharName,2);
+	packet(0x087e,clif->pChangeDir,2,4);
+	packet(0x0889,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0899,clif->pPartyInvite2,2);
+	packet(0x089d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a2,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08ad,clif->pTakeItem,2);
+	packet(0x091b,clif->pUseSkillToId,2,4,6);
+	packet(0x0928,clif->pSearchStoreInfoNextPage,0);
+	packet(0x092f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0936,clif->pGetCharNameRequest,2);
+	packet(0x0944,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0957,clif->pDull/*,XXX*/);
+	packet(0x0963,clif->pSearchStoreInfoListItemClick,2,6,10);
 #endif
 
 // 2017-06-21aRagexeRE
 #if PACKETVER == 20170621
-	packet(0x0202,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0365,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0366,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0802,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0885,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0889,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a8,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0956,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0957,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x095b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x095c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0961,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pTakeItem,2);
+	packet(0x0365,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0366,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pFriendsListAdd,2);
+	packet(0x0802,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085d,clif->pChangeDir,2,4);
+	packet(0x087d,clif->pDropItem,2,4);
+	packet(0x0885,clif->pPartyInvite2,2);
+	packet(0x0889,clif->pMoveFromKafra,2,4);
+	packet(0x08a8,clif->pHomMenu,2,4);
+	packet(0x0956,clif->pDull/*,XXX*/);
+	packet(0x0957,clif->pStoragePassword,0);
+	packet(0x095b,clif->pDull/*,XXX*/);
+	packet(0x095c,clif->pMoveToKafra,2,4);
+	packet(0x0961,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-06-28bRagexeRE
 #if PACKETVER == 20170628
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0863,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0863,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-07-05aRagexeRE
 #if PACKETVER == 20170705
-	packet(0x0202,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x02c4,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0879,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0886,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x088d,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x089d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x092f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0930,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0932,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0934,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x094c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pStoragePassword,0);
+	packet(0x02c4,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0879,clif->pMoveToKafra,2,4);
+	packet(0x0886,clif->pFriendsListAdd,2);
+	packet(0x088d,clif->pDull/*,XXX*/);
+	packet(0x088e,clif->pPartyInvite2,2);
+	packet(0x089a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x089d,clif->pDropItem,2,4);
+	packet(0x091a,clif->pChangeDir,2,4);
+	packet(0x092f,clif->pDull/*,XXX*/);
+	packet(0x0930,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0932,clif->pTakeItem,2);
+	packet(0x0934,clif->pMoveFromKafra,2,4);
+	packet(0x094c,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-07-12bRagexeRE
 #if PACKETVER == 20170712
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0944,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0944,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-07-19aRagexeRE
 #if PACKETVER == 20170719
-	packet(0x022d,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0367,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0368,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0369,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x07e4,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x085a,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x085e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0863,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x086e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x087d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0881,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0882,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0885,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0891,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0898,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x089a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x08a6,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a8,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x091b,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091f,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x092c,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x092e,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x092f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x093d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x093e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0944,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0946,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0966,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
+	packet(0x022d,clif->pActionRequest,2,6);
+	packet(0x0367,clif->pReqCloseBuyingStore,0);
+	packet(0x0368,clif->pDull/*,XXX*/);
+	packet(0x0369,clif->pHomMenu,2,4);
+	packet(0x07e4,clif->pGetCharNameRequest,2);
+	packet(0x085a,clif->pTickSend,2);
+	packet(0x085e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0863,clif->pReqClickBuyingStore,2);
+	packet(0x086e,clif->pPartyInvite2,2);
+	packet(0x087d,clif->pTakeItem,2);
+	packet(0x0881,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0882,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0885,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0891,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0898,clif->pUseSkillToId,2,4,6);
+	packet(0x089a,clif->pStoragePassword,0);
+	packet(0x089d,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x08a6,clif->pMoveFromKafra,2,4);
+	packet(0x08a8,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x091b,clif->pDropItem,2,4);
+	packet(0x091f,clif->pSolveCharName,2);
+	packet(0x092c,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x092e,clif->pSearchStoreInfoNextPage,0);
+	packet(0x092f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x093d,clif->pWalkToXY,2);
+	packet(0x093e,clif->pDull/*,XXX*/);
+	packet(0x0944,clif->pChangeDir,2,4);
+	packet(0x0946,clif->pFriendsListAdd,2);
+	packet(0x0966,clif->pMoveToKafra,2,4);
 #endif
 
 // 2017-07-26cRagexeRE
 #if PACKETVER == 20170726
-	packet(0x0363,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0364,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0369,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0438,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0838,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0873,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0874,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0878,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0881,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0888,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x088e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a3,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a7,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08aa,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08ab,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08ac,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x091d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x091e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x091f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0921,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0923,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0943,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x094f,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0950,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0952,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0954,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x095a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0963,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
+	packet(0x0363,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0364,clif->pMoveToKafra,2,4);
+	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0369,clif->pUseSkillToId,2,4,6);
+	packet(0x0438,clif->pPartyInvite2,2);
+	packet(0x0838,clif->pReqCloseBuyingStore,0);
+	packet(0x0873,clif->pReqClickBuyingStore,2);
+	packet(0x0874,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0878,clif->pActionRequest,2,6);
+	packet(0x0881,clif->pDull/*,XXX*/);
+	packet(0x0888,clif->pSearchStoreInfoNextPage,0);
+	packet(0x088e,clif->pWalkToXY,2);
+	packet(0x08a3,clif->pDull/*,XXX*/);
+	packet(0x08a7,clif->pStoragePassword,0);
+	packet(0x08aa,clif->pGetCharNameRequest,2);
+	packet(0x08ab,clif->pTakeItem,2);
+	packet(0x08ac,clif->pTickSend,2);
+	packet(0x091d,clif->pFriendsListAdd,2);
+	packet(0x091e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x091f,clif->pHomMenu,2,4);
+	packet(0x0921,clif->pSolveCharName,2);
+	packet(0x0923,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0943,clif->pDropItem,2,4);
+	packet(0x094f,clif->pMoveFromKafra,2,4);
+	packet(0x0950,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0952,clif->pChangeDir,2,4);
+	packet(0x0954,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x095a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0963,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
 #endif
 
 // 2017-08-01aRagexeRE
 #if PACKETVER == 20170801
-	packet(0x022d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0281,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0362,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a6,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x094f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095a,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pDropItem,2,4);
+	packet(0x0281,clif->pChangeDir,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0362,clif->pHomMenu,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087d,clif->pStoragePassword,0);
+	packet(0x08a6,clif->pDull/*,XXX*/);
+	packet(0x094f,clif->pFriendsListAdd,2);
+	packet(0x095a,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-08-09cRagexeRE
 #if PACKETVER == 20170809
-	packet(0x022d,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0281,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0364,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0366,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0367,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x07e4,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0802,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0835,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0868,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x086e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x086f,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0876,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x087d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0880,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x088c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0890,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0892,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0895,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0899,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a3,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08a6,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0918,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0921,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x092a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x092b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0931,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0939,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x093b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0940,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x022d,clif->pDull/*,XXX*/);
+	packet(0x0281,clif->pMoveFromKafra,2,4);
+	packet(0x0364,clif->pPartyInvite2,2);
+	packet(0x0366,clif->pFriendsListAdd,2);
+	packet(0x0367,clif->pReqCloseBuyingStore,0);
+	packet(0x07e4,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0802,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0835,clif->pDropItem,2,4);
+	packet(0x0868,clif->pActionRequest,2,6);
+	packet(0x086e,clif->pChangeDir,2,4);
+	packet(0x086f,clif->pHomMenu,2,4);
+	packet(0x0876,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x087d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0880,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x088c,clif->pUseSkillToId,2,4,6);
+	packet(0x0890,clif->pStoragePassword,0);
+	packet(0x0892,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0895,clif->pWalkToXY,2);
+	packet(0x0899,clif->pDull/*,XXX*/);
+	packet(0x08a3,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08a6,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0918,clif->pTakeItem,2);
+	packet(0x0921,clif->pMoveToKafra,2,4);
+	packet(0x092a,clif->pGetCharNameRequest,2);
+	packet(0x092b,clif->pTickSend,2);
+	packet(0x0931,clif->pSolveCharName,2);
+	packet(0x0939,clif->pReqClickBuyingStore,2);
+	packet(0x093b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0940,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2017-08-16cRagexeRE, 2017-08-16dRagexeRE
 #if PACKETVER == 20170816
-	packet(0x022d,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x035f,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0361,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0362,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0438,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x085a,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0862,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0864,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x087e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0881,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0882,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0884,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0888,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0889,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x08a3,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a7,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a9,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08ac,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x091c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0921,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0925,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x092c,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x093a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x093d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0940,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0941,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0950,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0959,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0960,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
+	packet(0x022d,clif->pGetCharNameRequest,2);
+	packet(0x035f,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0361,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0362,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0438,clif->pActionRequest,2,6);
+	packet(0x085a,clif->pSolveCharName,2);
+	packet(0x0862,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0864,clif->pReqCloseBuyingStore,0);
+	packet(0x087e,clif->pTakeItem,2);
+	packet(0x0881,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0882,clif->pStoragePassword,0);
+	packet(0x0884,clif->pDull/*,XXX*/);
+	packet(0x0888,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0889,clif->pTickSend,2);
+	packet(0x08a3,clif->pFriendsListAdd,2);
+	packet(0x08a7,clif->pDull/*,XXX*/);
+	packet(0x08a9,clif->pWalkToXY,2);
+	packet(0x08ac,clif->pHomMenu,2,4);
+	packet(0x091c,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0921,clif->pReqClickBuyingStore,2);
+	packet(0x0925,clif->pMoveFromKafra,2,4);
+	packet(0x092c,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x093a,clif->pPartyInvite2,2);
+	packet(0x093d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0940,clif->pUseSkillToId,2,4,6);
+	packet(0x0941,clif->pDropItem,2,4);
+	packet(0x0950,clif->pChangeDir,2,4);
+	packet(0x0959,clif->pMoveToKafra,2,4);
+	packet(0x0960,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
 #endif
 
 // 2017-08-23aRagexeRE
 #if PACKETVER == 20170823
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x086d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08ac,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pPartyInvite2,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pChangeDir,2,4);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x086d,clif->pStoragePassword,0);
+	packet(0x08ac,clif->pFriendsListAdd,2);
+	packet(0x095b,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-08-30aRagexeRE, 2017-08-30bRagexeRE
 #if PACKETVER == 20170830
-	packet(0x0281,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x02c4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0363,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0364,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0860,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0865,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x086a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0875,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0884,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0885,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0888,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0899,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x089e,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a2,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091e,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0921,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0925,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x092e,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0939,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x093e,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0940,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0942,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0943,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0947,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0951,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0959,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
+	packet(0x0281,clif->pChangeDir,2,4);
+	packet(0x02c4,clif->pTakeItem,2);
+	packet(0x0363,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0364,clif->pDull/*,XXX*/);
+	packet(0x0860,clif->pReqCloseBuyingStore,0);
+	packet(0x0865,clif->pWalkToXY,2);
+	packet(0x086a,clif->pPartyInvite2,2);
+	packet(0x0875,clif->pDull/*,XXX*/);
+	packet(0x0884,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0885,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0888,clif->pUseSkillToId,2,4,6);
+	packet(0x0897,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0899,clif->pDropItem,2,4);
+	packet(0x089a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x089e,clif->pMoveToKafra,2,4);
+	packet(0x08a2,clif->pStoragePassword,0);
+	packet(0x08a8,clif->pMoveFromKafra,2,4);
+	packet(0x091e,clif->pTickSend,2);
+	packet(0x0921,clif->pHomMenu,2,4);
+	packet(0x0925,clif->pReqClickBuyingStore,2);
+	packet(0x092e,clif->pGetCharNameRequest,2);
+	packet(0x0939,clif->pFriendsListAdd,2);
+	packet(0x093e,clif->pActionRequest,2,6);
+	packet(0x0940,clif->pSolveCharName,2);
+	packet(0x0942,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0943,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0947,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0951,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0959,clif->pUseSkillToPos,2,4,6,8);
 #endif
 
 // 2017-09-06cRagexeRE
 #if PACKETVER == 20170906
-	packet(0x0202,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0281,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x02c4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0860,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0866,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086c,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a2,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a3,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a7,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x091a,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091e,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0953,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pDull/*,XXX*/);
+	packet(0x0281,clif->pStoragePassword,0);
+	packet(0x02c4,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pPartyInvite2,2);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pChangeDir,2,4);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0860,clif->pDropItem,2,4);
+	packet(0x0866,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086c,clif->pDull/*,XXX*/);
+	packet(0x087b,clif->pMoveToKafra,2,4);
+	packet(0x08a2,clif->pMoveFromKafra,2,4);
+	packet(0x08a3,clif->pFriendsListAdd,2);
+	packet(0x08a7,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x091a,clif->pTakeItem,2);
+	packet(0x091e,clif->pHomMenu,2,4);
+	packet(0x0953,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-09-13bRagexeRE
 #if PACKETVER == 20170913
-	packet(0x0281,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x035f,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0437,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x07e4,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0817,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0835,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x085a,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0860,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0865,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0866,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x088c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0890,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0891,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0892,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08a7,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08aa,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08ab,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08ac,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ad,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x091b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x091d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x091e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0920,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0923,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0925,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0927,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x095a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x095c,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
+	packet(0x0281,clif->pGetCharNameRequest,2);
+	packet(0x035f,clif->pFriendsListAdd,2);
+	packet(0x0437,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x07e4,clif->pMoveFromKafra,2,4);
+	packet(0x0817,clif->pActionRequest,2,6);
+	packet(0x0835,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x085a,clif->pReqCloseBuyingStore,0);
+	packet(0x0860,clif->pTakeItem,2);
+	packet(0x0865,clif->pPartyInvite2,2);
+	packet(0x0866,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x088c,clif->pHomMenu,2,4);
+	packet(0x0890,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0891,clif->pMoveToKafra,2,4);
+	packet(0x0892,clif->pStoragePassword,0);
+	packet(0x08a6,clif->pReqClickBuyingStore,2);
+	packet(0x08a7,clif->pDull/*,XXX*/);
+	packet(0x08aa,clif->pUseSkillToId,2,4,6);
+	packet(0x08ab,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08ac,clif->pChangeDir,2,4);
+	packet(0x08ad,clif->pItemListWindowSelected,2,4,8);
+	packet(0x091b,clif->pTickSend,2);
+	packet(0x091d,clif->pDropItem,2,4);
+	packet(0x091e,clif->pDull/*,XXX*/);
+	packet(0x0920,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0923,clif->pWalkToXY,2);
+	packet(0x0925,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0927,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x095a,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x095c,clif->pSolveCharName,2);
 #endif
 
 // 2017-09-20bRagexeRE
 #if PACKETVER == 20170920
-	packet(0x0369,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0436,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x07ec,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x085a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0861,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0862,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0864,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0865,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x086a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x086c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0874,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0875,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0889,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x088e,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x089b,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0919,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x091e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0921,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0923,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0926,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x092e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0937,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0939,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0945,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x094c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x095d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0961,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0966,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x096a,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
+	packet(0x0369,clif->pTakeItem,2);
+	packet(0x0436,clif->pItemListWindowSelected,2,4,8);
+	packet(0x07ec,clif->pMoveFromKafra,2,4);
+	packet(0x085a,clif->pWalkToXY,2);
+	packet(0x0861,clif->pFriendsListAdd,2);
+	packet(0x0862,clif->pUseSkillToId,2,4,6);
+	packet(0x0864,clif->pStoragePassword,0);
+	packet(0x0865,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x086a,clif->pPartyInvite2,2);
+	packet(0x086c,clif->pDropItem,2,4);
+	packet(0x0874,clif->pReqCloseBuyingStore,0);
+	packet(0x0875,clif->pDull/*,XXX*/);
+	packet(0x0889,clif->pGetCharNameRequest,2);
+	packet(0x088e,clif->pTickSend,2);
+	packet(0x089b,clif->pActionRequest,2,6);
+	packet(0x0919,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x091e,clif->pDull/*,XXX*/);
+	packet(0x0921,clif->pSolveCharName,2);
+	packet(0x0923,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0926,clif->pMoveToKafra,2,4);
+	packet(0x092e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0937,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0939,clif->pChangeDir,2,4);
+	packet(0x0945,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x094c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x095d,clif->pHomMenu,2,4);
+	packet(0x0961,clif->pReqClickBuyingStore,2);
+	packet(0x0966,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x096a,clif->pSearchStoreInfoNextPage,0);
 #endif
 
 // 2017-09-27bRagexeRE, 2017-09-27dRagexeRE
 #if PACKETVER == 20170927
-	packet(0x02c4,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x035f,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0361,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0362,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x085c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0873,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0875,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x087d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x087e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x088b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0899,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x089a,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08a3,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08a5,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a6,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08ad,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x091e,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0922,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0923,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0927,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x093b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0942,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0945,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x094b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x094d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0959,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x095a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
+	packet(0x02c4,clif->pHomMenu,2,4);
+	packet(0x035f,clif->pGetCharNameRequest,2);
+	packet(0x0361,clif->pDull/*,XXX*/);
+	packet(0x0362,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0366,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x085c,clif->pUseSkillToId,2,4,6);
+	packet(0x0873,clif->pSolveCharName,2);
+	packet(0x0875,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x087d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x087e,clif->pChangeDir,2,4);
+	packet(0x088b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0899,clif->pActionRequest,2,6);
+	packet(0x089a,clif->pStoragePassword,0);
+	packet(0x089b,clif->pMoveFromKafra,2,4);
+	packet(0x08a3,clif->pReqCloseBuyingStore,0);
+	packet(0x08a5,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a6,clif->pDull/*,XXX*/);
+	packet(0x08ad,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x091e,clif->pReqClickBuyingStore,2);
+	packet(0x0922,clif->pPartyInvite2,2);
+	packet(0x0923,clif->pDropItem,2,4);
+	packet(0x0927,clif->pWalkToXY,2);
+	packet(0x093b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0942,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0945,clif->pTickSend,2);
+	packet(0x094b,clif->pFriendsListAdd,2);
+	packet(0x094d,clif->pTakeItem,2);
+	packet(0x0959,clif->pMoveToKafra,2,4);
+	packet(0x095a,clif->pUseSkillToPos,2,4,6,8);
 #endif
 
 // 2017-10-02cRagexeRE
 #if PACKETVER == 20171002
-	packet(0x022d,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0363,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0885,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0897,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0899,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0928,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x092d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0934,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x093b,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x093d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x093e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0943,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x095f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x022d,clif->pDropItem,2,4);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0363,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pHomMenu,2,4);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0885,clif->pMoveToKafra,2,4);
+	packet(0x0897,clif->pChangeDir,2,4);
+	packet(0x0899,clif->pFriendsListAdd,2);
+	packet(0x089d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0928,clif->pItemListWindowSelected,2,4,8);
+	packet(0x092d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0934,clif->pStoragePassword,0);
+	packet(0x093b,clif->pMoveFromKafra,2,4);
+	packet(0x093d,clif->pTakeItem,2);
+	packet(0x093e,clif->pDull/*,XXX*/);
+	packet(0x0943,clif->pPartyInvite2,2);
+	packet(0x095f,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-10-11aRagexeRE, 2017-10-11bRagexeRE
 #if PACKETVER == 20171011
-	packet(0x023b,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0882,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0950,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0954,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x023b,clif->pWalkToXY,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pStoragePassword,0);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087b,clif->pFriendsListAdd,2);
+	packet(0x0882,clif->pHomMenu,2,4);
+	packet(0x0950,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0954,clif->pChangeDir,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-10-18aRagexeRE
 #if PACKETVER == 20171018
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0363,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0364,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x087a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087e,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0889,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x089a,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a6,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0938,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0944,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x094a,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x094f,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0363,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0364,clif->pMoveToKafra,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pTakeItem,2);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086a,clif->pDull/*,XXX*/);
+	packet(0x087a,clif->pDull/*,XXX*/);
+	packet(0x087e,clif->pHomMenu,2,4);
+	packet(0x0889,clif->pMoveFromKafra,2,4);
+	packet(0x089a,clif->pDropItem,2,4);
+	packet(0x089f,clif->pPartyInvite2,2);
+	packet(0x08a6,clif->pChangeDir,2,4);
+	packet(0x0938,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0944,clif->pStoragePassword,0);
+	packet(0x094a,clif->pFriendsListAdd,2);
+	packet(0x094f,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-10-25bRagexeRE, 2017-10-25cRagexeRE, 2017-10-25dRagexeRE, 2017-10-25eRagexeRE
 #if PACKETVER == 20171025
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a2,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x08a2,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-11-01bRagexeRE
 #if PACKETVER == 20171101
-	packet(0x022d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0368,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0369,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0438,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0835,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x085b,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0860,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x086c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0872,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0876,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0886,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088e,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0890,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0895,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0899,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x089b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x089c,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a0,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x08ab,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08ad,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x091b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0939,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x094a,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x094d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0957,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x095a,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0962,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0966,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
+	packet(0x022d,clif->pStoragePassword,0);
+	packet(0x0368,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0369,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0438,clif->pTickSend,2);
+	packet(0x0835,clif->pDropItem,2,4);
+	packet(0x085b,clif->pHomMenu,2,4);
+	packet(0x0860,clif->pGetCharNameRequest,2);
+	packet(0x086c,clif->pUseSkillToId,2,4,6);
+	packet(0x0872,clif->pFriendsListAdd,2);
+	packet(0x0876,clif->pChangeDir,2,4);
+	packet(0x0886,clif->pDull/*,XXX*/);
+	packet(0x088e,clif->pReqClickBuyingStore,2);
+	packet(0x0890,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0895,clif->pDull/*,XXX*/);
+	packet(0x0899,clif->pPartyInvite2,2);
+	packet(0x089b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x089c,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08a0,clif->pMoveFromKafra,2,4);
+	packet(0x08ab,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08ad,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x091b,clif->pMoveToKafra,2,4);
+	packet(0x0939,clif->pWalkToXY,2);
+	packet(0x094a,clif->pReqCloseBuyingStore,0);
+	packet(0x094d,clif->pSolveCharName,2);
+	packet(0x0952,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0957,clif->pActionRequest,2,6);
+	packet(0x095a,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0962,clif->pTakeItem,2);
+	packet(0x0966,clif->pUseSkillToPos,2,4,6,8);
 #endif
 
 // 2017-11-08bRagexeRE
 #if PACKETVER == 20171108
-	packet(0x0202,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0361,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x07e4,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0815,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0819,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0838,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x085d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0863,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0878,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x087e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0884,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0896,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0897,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x08a2,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x08a9,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08ad,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x091d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x091f,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0940,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0941,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0945,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0947,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0949,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x094e,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0958,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x095a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0963,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0965,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0967,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
+	packet(0x0202,clif->pTickSend,2);
+	packet(0x0361,clif->pSearchStoreInfoNextPage,0);
+	packet(0x07e4,clif->pSolveCharName,2);
+	packet(0x0815,clif->pStoragePassword,0);
+	packet(0x0819,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0838,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x085d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0863,clif->pWalkToXY,2);
+	packet(0x0878,clif->pFriendsListAdd,2);
+	packet(0x087e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0884,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0896,clif->pDull/*,XXX*/);
+	packet(0x0897,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x08a2,clif->pUseSkillToId,2,4,6);
+	packet(0x08a9,clif->pHomMenu,2,4);
+	packet(0x08ad,clif->pGetCharNameRequest,2);
+	packet(0x091d,clif->pReqCloseBuyingStore,0);
+	packet(0x091f,clif->pChangeDir,2,4);
+	packet(0x0940,clif->pReqClickBuyingStore,2);
+	packet(0x0941,clif->pMoveToKafra,2,4);
+	packet(0x0945,clif->pTakeItem,2);
+	packet(0x0947,clif->pDull/*,XXX*/);
+	packet(0x0949,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x094e,clif->pPartyInvite2,2);
+	packet(0x0958,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x095a,clif->pMoveFromKafra,2,4);
+	packet(0x0963,clif->pActionRequest,2,6);
+	packet(0x0965,clif->pDropItem,2,4);
+	packet(0x0967,clif->pUseSkillToPos,2,4,6,8);
 #endif
 
 // 2017-11-15aRagexeRE
 #if PACKETVER == 20171115
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0365,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x086d,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x086f,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x087e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0883,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0890,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0898,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a4,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0926,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0958,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x095a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0365,clif->pDropItem,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pReqClickBuyingStore,2);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pFriendsListAdd,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x086d,clif->pDull/*,XXX*/);
+	packet(0x086f,clif->pItemListWindowSelected,2,4,8);
+	packet(0x087e,clif->pMoveFromKafra,2,4);
+	packet(0x0883,clif->pDull/*,XXX*/);
+	packet(0x088b,clif->pMoveToKafra,2,4);
+	packet(0x0890,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0898,clif->pStoragePassword,0);
+	packet(0x08a4,clif->pChangeDir,2,4);
+	packet(0x0926,clif->pTakeItem,2);
+	packet(0x0958,clif->pHomMenu,2,4);
+	packet(0x095a,clif->pPartyInvite2,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-11-22bRagexeRE
 #if PACKETVER == 20171122
-	packet(0x0281,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x02c4,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x035f,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0838,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x083c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x085b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0862,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0867,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0877,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0885,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0890,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0891,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0893,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0897,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0898,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x089a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x089e,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x08a6,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x08a9,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x091e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0920,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0923,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0934,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x093b,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0945,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0946,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0947,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0962,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0968,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
+	packet(0x0281,clif->pSolveCharName,2);
+	packet(0x02c4,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x035f,clif->pDull/*,XXX*/);
+	packet(0x0838,clif->pMoveToKafra,2,4);
+	packet(0x083c,clif->pHomMenu,2,4);
+	packet(0x085b,clif->pGetCharNameRequest,2);
+	packet(0x0862,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0867,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0877,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0885,clif->pDull/*,XXX*/);
+	packet(0x0890,clif->pTickSend,2);
+	packet(0x0891,clif->pTakeItem,2);
+	packet(0x0893,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0897,clif->pChangeDir,2,4);
+	packet(0x0898,clif->pDropItem,2,4);
+	packet(0x089a,clif->pMoveFromKafra,2,4);
+	packet(0x089e,clif->pActionRequest,2,6);
+	packet(0x08a6,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x08a9,clif->pReqClickBuyingStore,2);
+	packet(0x091e,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0920,clif->pReqCloseBuyingStore,0);
+	packet(0x0923,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0934,clif->pStoragePassword,0);
+	packet(0x093b,clif->pUseSkillToId,2,4,6);
+	packet(0x0945,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0946,clif->pFriendsListAdd,2);
+	packet(0x0947,clif->pWalkToXY,2);
+	packet(0x0962,clif->pPartyInvite2,2);
+	packet(0x0968,clif->pReqOpenBuyingStore,2,4,8,9,89);
 #endif
 
 // 2017-11-29aRagexeRE
 #if PACKETVER == 20171129
-	packet(0x02c4,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x035f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0363,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0365,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0862,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x086d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0876,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0878,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x089c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x08a5,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0940,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x094b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0953,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0966,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x02c4,clif->pChangeDir,2,4);
+	packet(0x035f,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0363,clif->pFriendsListAdd,2);
+	packet(0x0365,clif->pDropItem,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pPartyInvite2,2);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0862,clif->pTakeItem,2);
+	packet(0x086d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0876,clif->pDull/*,XXX*/);
+	packet(0x0878,clif->pStoragePassword,0);
+	packet(0x088a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x089c,clif->pHomMenu,2,4);
+	packet(0x08a5,clif->pMoveToKafra,2,4);
+	packet(0x0940,clif->pTickSend,2);
+	packet(0x094b,clif->pDull/*,XXX*/);
+	packet(0x0953,clif->pMoveFromKafra,2,4);
+	packet(0x0966,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-12-06aRagexeRE
 #if PACKETVER == 20171206
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0867,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x086a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x086e,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0885,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0888,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0897,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x089d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08a2,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x08a4,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0923,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x092e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0936,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0942,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0958,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0961,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0867,clif->pDropItem,2,4);
+	packet(0x086a,clif->pDull/*,XXX*/);
+	packet(0x086e,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0885,clif->pTickSend,2);
+	packet(0x0888,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0897,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x089d,clif->pStoragePassword,0);
+	packet(0x08a2,clif->pPartyInvite2,2);
+	packet(0x08a4,clif->pMoveFromKafra,2,4);
+	packet(0x091d,clif->pFriendsListAdd,2);
+	packet(0x0923,clif->pMoveToKafra,2,4);
+	packet(0x092e,clif->pDull/*,XXX*/);
+	packet(0x0936,clif->pChangeDir,2,4);
+	packet(0x0942,clif->pHomMenu,2,4);
+	packet(0x0958,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0961,clif->pTakeItem,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-12-13bRagexeRE
 #if PACKETVER == 20171213
-	packet(0x0202,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0860,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0881,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0890,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0957,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pPartyInvite2,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pFriendsListAdd,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0860,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0881,clif->pDull/*,XXX*/);
+	packet(0x0890,clif->pStoragePassword,0);
+	packet(0x091a,clif->pChangeDir,2,4);
+	packet(0x0957,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-12-20aRagexeRE
 #if PACKETVER == 20171220
-	packet(0x0281,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0366,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0369,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0436,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0437,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x085e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0861,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0872,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0873,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0880,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0882,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0885,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0899,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x089e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a7,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x091b,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091e,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0924,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0929,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0933,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x093e,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0941,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0946,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x094e,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0951,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0957,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0960,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0964,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
+	packet(0x0281,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0366,clif->pMoveFromKafra,2,4);
+	packet(0x0369,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0436,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0437,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x085e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0861,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0872,clif->pUseSkillToId,2,4,6);
+	packet(0x0873,clif->pGetCharNameRequest,2);
+	packet(0x0880,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0882,clif->pTickSend,2);
+	packet(0x0885,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0899,clif->pStoragePassword,0);
+	packet(0x089e,clif->pWalkToXY,2);
+	packet(0x08a7,clif->pReqCloseBuyingStore,0);
+	packet(0x091b,clif->pTakeItem,2);
+	packet(0x091e,clif->pSolveCharName,2);
+	packet(0x0924,clif->pMoveToKafra,2,4);
+	packet(0x0929,clif->pDropItem,2,4);
+	packet(0x0933,clif->pChangeDir,2,4);
+	packet(0x093e,clif->pActionRequest,2,6);
+	packet(0x0941,clif->pReqClickBuyingStore,2);
+	packet(0x0946,clif->pDull/*,XXX*/);
+	packet(0x094e,clif->pDull/*,XXX*/);
+	packet(0x0951,clif->pHomMenu,2,4);
+	packet(0x0957,clif->pFriendsListAdd,2);
+	packet(0x0960,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0964,clif->pPartyInvite2,2);
 #endif
 
 // 2017-12-27aRagexeRE
 #if PACKETVER == 20171227
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x087d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0888,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x088a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a0,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x092c,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x092e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0938,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0945,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0946,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0969,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x096a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pActionRequest,2,6);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pChangeDir,2,4);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pGetCharNameRequest,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x087d,clif->pStoragePassword,0);
+	packet(0x0888,clif->pMoveFromKafra,2,4);
+	packet(0x088a,clif->pDull/*,XXX*/);
+	packet(0x088d,clif->pTakeItem,2);
+	packet(0x08a0,clif->pMoveToKafra,2,4);
+	packet(0x08a5,clif->pHomMenu,2,4);
+	packet(0x092c,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x092e,clif->pDull/*,XXX*/);
+	packet(0x0938,clif->pPartyInvite2,2);
+	packet(0x0945,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0946,clif->pFriendsListAdd,2);
+	packet(0x0969,clif->pDropItem,2,4);
+	packet(0x096a,clif->pPartyBookingRegisterReq,2,4);
 #endif
 
 // 2018-01-03aRagexeRE, 2018-01-03bRagexeRE
 #if PACKETVER == 20180103
-	packet(0x02c4,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0363,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0865,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x086b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x086d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0872,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0876,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0879,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x088e,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0899,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x089f,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x08a9,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ab,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x08ac,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x091d,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0922,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0926,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0927,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x092c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0935,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0938,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0941,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0946,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0948,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094e,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x095d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x095f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0960,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
+	packet(0x02c4,clif->pMoveToKafra,2,4);
+	packet(0x0363,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0865,clif->pDull/*,XXX*/);
+	packet(0x086b,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x086d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0872,clif->pReqClickBuyingStore,2);
+	packet(0x0876,clif->pTickSend,2);
+	packet(0x0879,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x088e,clif->pReqCloseBuyingStore,0);
+	packet(0x0899,clif->pFriendsListAdd,2);
+	packet(0x089f,clif->pSolveCharName,2);
+	packet(0x08a9,clif->pChangeDir,2,4);
+	packet(0x08ab,clif->pGetCharNameRequest,2);
+	packet(0x08ac,clif->pItemListWindowSelected,2,4,8);
+	packet(0x091d,clif->pActionRequest,2,6);
+	packet(0x0922,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0926,clif->pDull/*,XXX*/);
+	packet(0x0927,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x092c,clif->pMoveFromKafra,2,4);
+	packet(0x0935,clif->pTakeItem,2);
+	packet(0x0938,clif->pUseSkillToId,2,4,6);
+	packet(0x0941,clif->pWalkToXY,2);
+	packet(0x0946,clif->pStoragePassword,0);
+	packet(0x0948,clif->pHomMenu,2,4);
+	packet(0x094e,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x095d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x095f,clif->pDropItem,2,4);
+	packet(0x0960,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
 #endif
 
 // 2018-01-17aRagexeRE
 #if PACKETVER == 20180117
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0875,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0875,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2018-01-24bRagexeRE
 #if PACKETVER == 20180124
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0802,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085f,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0868,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x086a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x086f,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x087a,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0888,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0890,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0919,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0940,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0946,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x094d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0958,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0961,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pMoveToKafra,2,4);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0802,clif->pDropItem,2,4);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085f,clif->pStoragePassword,0);
+	packet(0x0868,clif->pDull/*,XXX*/);
+	packet(0x086a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x086f,clif->pDull/*,XXX*/);
+	packet(0x087a,clif->pPartyInvite2,2);
+	packet(0x0888,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0890,clif->pMoveFromKafra,2,4);
+	packet(0x0919,clif->pFriendsListAdd,2);
+	packet(0x0940,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0946,clif->pItemListWindowSelected,2,4,8);
+	packet(0x094d,clif->pTakeItem,2);
+	packet(0x0958,clif->pChangeDir,2,4);
+	packet(0x0961,clif->pHomMenu,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2018-02-07bRagexeRE
 #if PACKETVER == 20180207
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0360,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0870,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0881,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x092e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0940,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0950,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pReqClickBuyingStore,2);
+	packet(0x0360,clif->pDull/*,XXX*/);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0870,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0881,clif->pFriendsListAdd,2);
+	packet(0x092c,clif->pHomMenu,2,4);
+	packet(0x092e,clif->pChangeDir,2,4);
+	packet(0x0940,clif->pTickSend,2);
+	packet(0x0950,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2018-02-13aRagexeRE
 #if PACKETVER == 20180213
-	packet(0x0369,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0802,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0817,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x085a,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x086f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0874,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0875,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0878,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x087b,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0882,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x088c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0892,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0898,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x089c,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x08a3,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x08a5,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08a9,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08ad,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0917,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0922,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0924,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0926,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0933,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0936,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x093c,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0943,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0955,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x095a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0962,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
+	packet(0x0369,clif->pStoragePassword,0);
+	packet(0x0802,clif->pDropItem,2,4);
+	packet(0x0817,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x085a,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x086f,clif->pPartyInvite2,2);
+	packet(0x0874,clif->pTickSend,2);
+	packet(0x0875,clif->pMoveFromKafra,2,4);
+	packet(0x0878,clif->pChangeDir,2,4);
+	packet(0x087b,clif->pReqClickBuyingStore,2);
+	packet(0x0882,clif->pUseSkillToId,2,4,6);
+	packet(0x088c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0892,clif->pTakeItem,2);
+	packet(0x0898,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x089c,clif->pDull/*,XXX*/);
+	packet(0x08a3,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x08a5,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08a9,clif->pReqCloseBuyingStore,0);
+	packet(0x08ad,clif->pSolveCharName,2);
+	packet(0x0917,clif->pFriendsListAdd,2);
+	packet(0x0922,clif->pWalkToXY,2);
+	packet(0x0924,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0926,clif->pDull/*,XXX*/);
+	packet(0x0933,clif->pActionRequest,2,6);
+	packet(0x0936,clif->pSearchStoreInfoNextPage,0);
+	packet(0x093c,clif->pGetCharNameRequest,2);
+	packet(0x0943,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0955,clif->pMoveToKafra,2,4);
+	packet(0x095a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0962,clif->pHomMenu,2,4);
 #endif
 
 // 2018-02-21aRagexeRE, 2018-02-21bRagexeRE
 #if PACKETVER == 20180221
-	packet(0x0202,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0366,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0436,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0838,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0867,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x086c,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x086f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0871,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0876,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0879,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x087d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0880,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0881,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0883,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x088f,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0891,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0897,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0899,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x089d,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0917,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x091e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0929,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x093d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x094b,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x094d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x094e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0957,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0964,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x096a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
+	packet(0x0202,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0366,clif->pDull/*,XXX*/);
+	packet(0x0436,clif->pFriendsListAdd,2);
+	packet(0x0838,clif->pChangeDir,2,4);
+	packet(0x0867,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x086c,clif->pReqClickBuyingStore,2);
+	packet(0x086f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0871,clif->pDropItem,2,4);
+	packet(0x0876,clif->pHomMenu,2,4);
+	packet(0x0879,clif->pMoveToKafra,2,4);
+	packet(0x087d,clif->pWalkToXY,2);
+	packet(0x0880,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0881,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0883,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x088f,clif->pSolveCharName,2);
+	packet(0x0891,clif->pDull/*,XXX*/);
+	packet(0x0897,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0899,clif->pSearchStoreInfoNextPage,0);
+	packet(0x089d,clif->pTickSend,2);
+	packet(0x0917,clif->pStoragePassword,0);
+	packet(0x091e,clif->pMoveFromKafra,2,4);
+	packet(0x0929,clif->pReqCloseBuyingStore,0);
+	packet(0x093d,clif->pPartyInvite2,2);
+	packet(0x094b,clif->pUseSkillToId,2,4,6);
+	packet(0x094d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x094e,clif->pTakeItem,2);
+	packet(0x0957,clif->pGetCharNameRequest,2);
+	packet(0x0964,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x096a,clif->pActionRequest,2,6);
 #endif
 
 // 2018-03-07bRagexeRE
 #if PACKETVER == 20180307
-	packet(0x0281,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x035f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0437,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x07e4,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0861,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0862,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0864,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x086c,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0870,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0872,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0877,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x088d,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0893,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x089b,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08a6,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x08aa,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08ab,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0917,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0920,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0937,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0939,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x093d,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0941,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0944,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0948,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0951,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0954,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0957,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0969,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-#endif
-
-// 2018-03-21aRagexeRE, 2018-03-28bRagexeRE, 2018-04-04cRagexeRE, 2018-04-18bRagexeRE, 2018-04-25cRagexeRE, 2018-05-02bRagexeRE, 2018-05-02dRagexeRE, 2018-05-16cRagexeRE, 2018-05-23aRagexeRE, 2018-05-30bRagexeRE, 2018-05-30cRagexeRE, 2018-06-05bRagexeRE, 2018-06-12aRagexeRE, 2018-06-12bRagexeRE, 2018-06-20dRagexeRE, 2018-06-20eRagexeRE, 2018-06-21aRagexeRE
+	packet(0x0281,clif->pDull/*,XXX*/);
+	packet(0x035f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0437,clif->pDropItem,2,4);
+	packet(0x07e4,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0861,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0862,clif->pReqClickBuyingStore,2);
+	packet(0x0864,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x086c,clif->pTickSend,2);
+	packet(0x0870,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0872,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0877,clif->pWalkToXY,2);
+	packet(0x088d,clif->pMoveFromKafra,2,4);
+	packet(0x0893,clif->pUseSkillToId,2,4,6);
+	packet(0x089b,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08a6,clif->pSearchStoreInfoNextPage,0);
+	packet(0x08aa,clif->pFriendsListAdd,2);
+	packet(0x08ab,clif->pChangeDir,2,4);
+	packet(0x0917,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0920,clif->pMoveToKafra,2,4);
+	packet(0x0937,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0939,clif->pStoragePassword,0);
+	packet(0x093d,clif->pReqCloseBuyingStore,0);
+	packet(0x0941,clif->pGetCharNameRequest,2);
+	packet(0x0944,clif->pHomMenu,2,4);
+	packet(0x0948,clif->pPartyInvite2,2);
+	packet(0x0951,clif->pDull/*,XXX*/);
+	packet(0x0954,clif->pTakeItem,2);
+	packet(0x0957,clif->pSolveCharName,2);
+	packet(0x0969,clif->pActionRequest,2,6);
+#endif
+
+// 2018-03-21aRagexeRE, 2018-03-28bRagexeRE, 2018-04-04cRagexeRE, 2018-04-18bRagexeRE, 2018-04-25cRagexeRE, 2018-05-02bRagexeRE, 2018-05-02dRagexeRE, 2018-05-16cRagexeRE, 2018-05-23aRagexeRE, 2018-05-30bRagexeRE, 2018-05-30cRagexeRE, 2018-06-05bRagexeRE, 2018-06-12aRagexeRE, 2018-06-12bRagexeRE, 2018-06-20dRagexeRE, 2018-06-20eRagexeRE, 2018-06-21aRagexeRE, 2018-07-04aRagexeRE, 2018-07-11aRagexeRE, 2018-07-18bRagexeRE, 2018-07-18bRagexeRE1, 2018-07-18cRagexeRE, 2018-08-01cRagexeRE, 2018-08-08bRagexeRE, 2018-08-22cRagexeRE, 2018-08-29aRagexeRE, 2018-08-29bRagexeRE, 2018-09-12dRagexeRE, 2018-09-19aRagexeRE, 2018-10-02aRagexeRE, 2018-10-02bRagexeRE, 2018-10-17_02aRagexeRE, 2018-10-17_03aRagexeRE, 2018-10-17bRagexeRE, 2018-10-31cRagexeRE, 2018-11-07aRagexeRE, 2018-11-14cRagexeRE, 2018-11-14dRagexeRE, 2018-11-21cRagexeRE, 2018-11-28aRagexeRE, 2018-12-05bRagexeRE, 2018-12-12aRagexeRE, 2018-12-12bRagexeRE, 2018-12-19bRagexeRE, 2018-12-26aRagexeRE, 2019-01-09bRagexeRE, 2019-01-16bRagexeRE, 2019-01-16cRagexeRE, 2019-01-23dRagexeRE, 2019-02-13IRagexeRE, 2019-02-20aRagexeRE, 2019-02-27bRagexeRE, 2019-02-28aRagexeRE, 2019-03-06bRagexeRE, 2019-03-06cRagexeRE, 2019-03-20aRagexeRE, 2019-03-22aRagexeRE, 2019-03-27bRagexeRE, 2019-04-03bRagexeRE, 2019-04-03cRagexeRE, 2019-04-17cRagexeRE, 2019-04-18aRagexeRE, 2019-05-08dRagexeRE, 2019-05-08eRagexeRE, 2019-05-22bRagexeRE, 2019-05-22cRagexeRE, 2019-05-29bRagexeRE, 2019-05-29cRagexeRE, 2019-05-30aRagexeRE, 2019-06-05hRagexeRE, 2019-06-05JRagexeRE, 2019-06-05LRagexeRE, 2019-06-19cRagexeRE, 2019-06-26bRagexeRE, 2019-07-03bRagexeRE, 2019-07-17cRagexeRE, 2019-07-17dRagexeRE, 2019-07-24bRagexeRE, 2019-07-31bRagexeRE, 2019-08-02aRagexeRE, 2019-08-07dRagexeRE, 2019-08-21cRagexeRE, 2019-08-21dRagexeRE, 2019-08-28aRagexeRE, 2019-09-04bRagexeRE, 2019-09-18cRagexeRE, 2019-09-25aRagexeRE, 2019-09-25bRagexeRE, 2019-10-02bRagexeRE, 2019-10-02dRagexeRE, 2019-10-02dRagexeRE_2, 2019-10-16fRagexeRE, 2019-10-16gRagexeRE, 2019-10-23aRagexeRE, 2019-10-30bRagexeRE, 2019-11-06bRagexeRE, 2019-11-07aRagexeRE, 2019-11-13eRagexeRE, 2019-11-20cRagexeRE, 2019-11-27aRagexeRE, 2019-12-04aRagexeRE, 2019-12-04bRagexeRE, 2019-12-04cRagexeRE, 2019-12-11fRagexeRE, 2019-12-18bRagexeRE, 2019-12-24aRagexeRE, 2019-12-24bRagexeRE, 2020-01-08bRagexeRE, 2020-01-22cRagexeRE, 2020-02-05aRagexeRE, 2020-02-12aRagexeRE, 2020-02-19eRagexeRE, 2020-03-04aRagexeRE
 #if PACKETVER == 20180321 || \
     PACKETVER == 20180328 || \
     PACKETVER == 20180404 || \
@@ -9631,40 +9631,8 @@
     PACKETVER == 20180605 || \
     PACKETVER == 20180612 || \
     PACKETVER == 20180620 || \
-    PACKETVER == 20180621
-	packet(0x0202,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x022d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x023b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0281,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x02c4,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x035f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0360,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0361,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0362,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0363,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0364,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0365,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0366,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0369,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0437,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0438,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x07e4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x07ec,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0811,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0815,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0817,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0838,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-#endif
-
-// 2018-07-04aRagexeRE, 2018-07-11aRagexeRE, 2018-07-18bRagexeRE, 2018-07-18bRagexeRE1, 2018-07-18cRagexeRE, 2018-08-01cRagexeRE, 2018-08-08bRagexeRE, 2018-08-22cRagexeRE, 2018-08-29aRagexeRE, 2018-08-29bRagexeRE, 2018-09-12dRagexeRE, 2018-09-19aRagexeRE, 2018-10-02aRagexeRE, 2018-10-02bRagexeRE, 2018-10-17_02aRagexeRE, 2018-10-17_03aRagexeRE, 2018-10-17bRagexeRE, 2018-10-31cRagexeRE, 2018-11-07aRagexeRE, 2018-11-14cRagexeRE, 2018-11-14dRagexeRE, 2018-11-21cRagexeRE, 2018-11-28aRagexeRE, 2018-12-05bRagexeRE, 2018-12-12aRagexeRE, 2018-12-12bRagexeRE, 2018-12-19bRagexeRE, 2018-12-26aRagexeRE, 2019-01-09bRagexeRE, 2019-01-16bRagexeRE, 2019-01-16cRagexeRE, 2019-01-23dRagexeRE, 2019-02-13IRagexeRE, 2019-02-20aRagexeRE, 2019-02-27bRagexeRE, 2019-02-28aRagexeRE, 2019-03-06bRagexeRE, 2019-03-06cRagexeRE, 2019-03-20aRagexeRE, 2019-03-22aRagexeRE, 2019-03-27bRagexeRE, 2019-04-03bRagexeRE, 2019-04-03cRagexeRE, 2019-04-17cRagexeRE, 2019-04-18aRagexeRE, 2019-05-08dRagexeRE, 2019-05-08eRagexeRE, 2019-05-22bRagexeRE, 2019-05-22cRagexeRE, 2019-05-29bRagexeRE, 2019-05-29cRagexeRE, 2019-05-30aRagexeRE, 2019-06-05hRagexeRE, 2019-06-05JRagexeRE, 2019-06-05LRagexeRE, 2019-06-19cRagexeRE, 2019-06-26bRagexeRE, 2019-07-03bRagexeRE, 2019-07-17cRagexeRE, 2019-07-17dRagexeRE, 2019-07-24bRagexeRE, 2019-07-31bRagexeRE, 2019-08-02aRagexeRE, 2019-08-07dRagexeRE, 2019-08-21cRagexeRE, 2019-08-21dRagexeRE, 2019-08-28aRagexeRE
-#if PACKETVER == 20180704 || \
+    PACKETVER == 20180621 || \
+    PACKETVER == 20180704 || \
     PACKETVER == 20180711 || \
     PACKETVER == 20180718 || \
     PACKETVER == 20180801 || \
@@ -9712,40 +9680,8 @@
     PACKETVER == 20190802 || \
     PACKETVER == 20190807 || \
     PACKETVER == 20190821 || \
-    PACKETVER >= 20190828
-	packet(0x0202,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x022d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x023b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0281,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x02c4,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x035f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0360,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0361,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0362,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0363,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0364,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0365,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0366,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0369,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0437,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0438,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x07e4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x07ec,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0811,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0815,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0817,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0838,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 14
-#endif
-
-// 2019-09-04bRagexeRE, 2019-09-18cRagexeRE, 2019-09-25aRagexeRE, 2019-09-25bRagexeRE, 2019-10-02bRagexeRE, 2019-10-02dRagexeRE, 2019-10-02dRagexeRE_2, 2019-10-16fRagexeRE, 2019-10-16gRagexeRE, 2019-10-23aRagexeRE, 2019-10-30bRagexeRE, 2019-11-06bRagexeRE, 2019-11-07aRagexeRE, 2019-11-13eRagexeRE, 2019-11-20cRagexeRE, 2019-11-27aRagexeRE, 2019-12-04aRagexeRE, 2019-12-04bRagexeRE, 2019-12-04cRagexeRE, 2019-12-11fRagexeRE, 2019-12-18bRagexeRE, 2019-12-24aRagexeRE, 2019-12-24bRagexeRE, 2020-01-08bRagexeRE, 2020-01-22cRagexeRE, 2020-02-05aRagexeRE, 2020-02-12aRagexeRE, 2020-02-19eRagexeRE, 2020-03-04aRagexeRE
-#if PACKETVER == 20190904 || \
+    PACKETVER == 20190828 || \
+    PACKETVER == 20190904 || \
     PACKETVER == 20190918 || \
     PACKETVER == 20190925 || \
     PACKETVER == 20191002 || \
@@ -9766,36 +9702,36 @@
     PACKETVER == 20200205 || \
     PACKETVER == 20200212 || \
     PACKETVER == 20200219 || \
-    PACKETVER == 20200304
-	packet(0x0202,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x022d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x023b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0281,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x02c4,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x035f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0360,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0361,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0362,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0363,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0364,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0365,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0366,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 31
-	packet(0x0368,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0369,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0437,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0438,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x07e4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x07ec,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0811,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0815,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0817,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0838,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 14
+    PACKETVER >= 20200304
+	packet(0x0202,clif->pFriendsListAdd,2);
+	packet(0x022d,clif->pHomMenu,2,4);
+	packet(0x023b,clif->pStoragePassword,0);
+	packet(0x0281,clif->pDull/*,XXX*/);
+	packet(0x02c4,clif->pPartyInvite2,2);
+	packet(0x035f,clif->pWalkToXY,2);
+	packet(0x0360,clif->pTickSend,2);
+	packet(0x0361,clif->pChangeDir,2,4);
+	packet(0x0362,clif->pTakeItem,2);
+	packet(0x0363,clif->pDropItem,2,4);
+	packet(0x0364,clif->pMoveToKafra,2,4);
+	packet(0x0365,clif->pMoveFromKafra,2,4);
+	packet(0x0366,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pGetCharNameRequest,2);
+	packet(0x0369,clif->pSolveCharName,2);
+	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0437,clif->pActionRequest,2,6);
+	packet(0x0438,clif->pUseSkillToId,2,4,6);
+	packet(0x07e4,clif->pItemListWindowSelected,2,4,8);
+	packet(0x07ec,clif->pDull/*,XXX*/);
+	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0811,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0815,clif->pReqCloseBuyingStore,0);
+	packet(0x0817,clif->pReqClickBuyingStore,2);
+	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0838,clif->pSearchStoreInfoNextPage,0);
+	packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10);
 #endif
 
 
diff --git a/src/map/packets_shuffle_zero.h b/src/map/packets_shuffle_zero.h
index fb12688c0..42459bb87 100644
--- a/src/map/packets_shuffle_zero.h
+++ b/src/map/packets_shuffle_zero.h
@@ -37,7 +37,7 @@
 /* This file is autogenerated, please do not commit manual changes */
 
 
-// 2017-10-18aRagexe_zero, 2017-10-19aRagexe_zero, 2017-10-23aRagexe_zero, 2017-10-23bRagexe_zero, 2017-10-23cRagexe_zero, 2017-10-24aRagexe_2_zero, 2017-10-24aRagexe_zero, 2017-10-25bRagexe_zero, 2017-10-27aRagexe_zero, 2017-10-27bRagexe_zero, 2017-10-30aRagexe_zero, 2017-10-31aRagexe_zero, 2017-11-09aRagexe_zero, 2017-11-13aRagexe_zero, 2017-11-13bRagexe_zero, 2018-03-15aRagexe_zero, 2018-03-21aRagexe_zero, 2018-03-21bRagexe_zero, 2018-03-28_1aRagexe_zero, 2018-03-28cRagexe_zero, 2018-04-11aRagexe_zero, 2018-04-25_3aRagexe_zero, 2018-05-09_3aRagexe_zero, 2018-05-23aRagexe_zero, 2018-06-05bRagexe_zero, 2018-06-05cRagexe_zero, 2018-06-27aRagexe_zero, 2018-07-03aRagexe_zero, 2018-07-11_2aRagexe_zero, 2018-07-25_2aRagexe_zero, 2018-08-01aRagexe_zero, 2018-08-08_2aRagexe_zero, 2018-08-22aRagexe_zero, 2018-08-29aRagexe_zero, 2018-09-05aRagexe_zero, 2018-09-12aRagexe_zero, 2018-09-19aRagexe_zero, 2018-09-28aRagexe_zero, 2018-10-10_2aRagexe_zero, 2018-10-24_2aRagexe_zero
+// 2017-10-18aRagexe_zero, 2017-10-19aRagexe_zero, 2017-10-23aRagexe_zero, 2017-10-23bRagexe_zero, 2017-10-23cRagexe_zero, 2017-10-24aRagexe_2_zero, 2017-10-24aRagexe_zero, 2017-10-25bRagexe_zero, 2017-10-27aRagexe_zero, 2017-10-27bRagexe_zero, 2017-10-30aRagexe_zero, 2017-10-31aRagexe_zero, 2017-11-09aRagexe_zero, 2017-11-13aRagexe_zero, 2017-11-13bRagexe_zero, 2018-03-15aRagexe_zero, 2018-03-21aRagexe_zero, 2018-03-21bRagexe_zero, 2018-03-28_1aRagexe_zero, 2018-03-28cRagexe_zero, 2018-04-11aRagexe_zero, 2018-04-25_3aRagexe_zero, 2018-05-09_3aRagexe_zero, 2018-05-23aRagexe_zero, 2018-06-05bRagexe_zero, 2018-06-05cRagexe_zero, 2018-06-27aRagexe_zero, 2018-07-03aRagexe_zero, 2018-07-11_2aRagexe_zero, 2018-07-25_2aRagexe_zero, 2018-08-01aRagexe_zero, 2018-08-08_2aRagexe_zero, 2018-08-22aRagexe_zero, 2018-08-29aRagexe_zero, 2018-09-05aRagexe_zero, 2018-09-12aRagexe_zero, 2018-09-19aRagexe_zero, 2018-09-28aRagexe_zero, 2018-10-10_2aRagexe_zero, 2018-10-24_2aRagexe_zero, 2018-11-14aRagexe_zero, 2018-11-20aRagexe_zero, 2018-11-28aRagexe_zero, 2018-12-12aRagexe_zero, 2018-12-19aRagexe_zero, 2018-12-26_2aRagexe_zero, 2019-01-16_2aRagexe_zero, 2019-01-17_1aRagexe_zero, 2019-01-30_2aRagexe_zero, 2019-02-13aRagexe_zero, 2019-02-20aRagexe_zero, 2019-02-27aRagexe_zero, 2019-03-13aRagexe_zero, 2019-03-27_2aRagexe_zero, 2019-03-27_3aRagexe_zero, 2019-04-03aRagexe_zero, 2019-04-10bRagexe_zero, 2019-04-24aRagexe_zero, 2019-05-02aRagexe_zero, 2019-05-08_2aRagexe_zero, 2019-05-08aRagexe_zero, 2019-05-15aRagexe_zero, 2019-05-29aRagexe_zero, 2019-05-30aRagexe_zero, 2019-06-05_2aRagexe_zero, 2019-06-26_2aRagexe_zero, 2019-06-26_3aRagexe_zero, 2019-07-09aRagexe_zero, 2019-07-10_3aRagexe_zero, 2019-07-17aRagexe_zero, 2019-07-24aRagexe_zero, 2019-08-14_3aRagexe_zero, 2019-08-28_2aRagexe_zero, 2019-08-28_3aRagexe_zero, 2019-09-11aRagexe_zero, 2019-09-18_2aRagexe_zero, 2019-09-18aRagexe_zero, 2019-09-25_3aRagexe_zero, 2019-09-25_5aRagexe_zero, 2019-10-08_2aRagexe_zero, 2019-10-23_2aRagexe_zero, 2019-11-06aRagexe_zero, 2019-11-13aRagexe_zero, 2019-11-27_2aRagexe_zero, 2019-11-27aRagexe_zero, 2019-12-04aRagexe_zero, 2019-12-11_2aRagexe_zero, 2019-12-24_4aRagexe_zero, 2019-12-24_5aRagexe_zero, 2020-01-15_2aRagexe_zero, 2020-01-15aRagexe_zero, 2020-01-29_2aRagexe_zero, 2020-01-29aRagexe_zero, 2020-02-12aRagexe_zero, 2020-02-26aRagexe_zero, 2020-02-26bRagexe_zero, 2020-03-04aRagexe_zero, 2020-03-18_2aRagexe_zero, 2020-04-01_2aRagexe_zero, 2020-04-14bRagexe_zero, 2020-05-06aRagexe_zero, 2020-05-20_5aRagexe_zero
 #if PACKETVER == 20171018 || \
     PACKETVER == 20171019 || \
     PACKETVER == 20171023 || \
@@ -69,238 +69,289 @@
     PACKETVER == 20180919 || \
     PACKETVER == 20180928 || \
     PACKETVER == 20181010 || \
-    PACKETVER == 20181024
-	packet(0x0202,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x022d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x023b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0281,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x02c4,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x035f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0360,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0361,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0362,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0363,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0364,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0365,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0366,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0369,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0437,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0438,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x07e4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x07ec,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0811,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0815,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0817,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0838,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
+    PACKETVER == 20181024 || \
+    PACKETVER == 20181114 || \
+    PACKETVER == 20181120 || \
+    PACKETVER == 20181128 || \
+    PACKETVER == 20181212 || \
+    PACKETVER == 20181219 || \
+    PACKETVER == 20181226 || \
+    PACKETVER == 20190116 || \
+    PACKETVER == 20190117 || \
+    PACKETVER == 20190130 || \
+    PACKETVER == 20190213 || \
+    PACKETVER == 20190220 || \
+    PACKETVER == 20190227 || \
+    PACKETVER == 20190313 || \
+    PACKETVER == 20190327 || \
+    PACKETVER == 20190403 || \
+    PACKETVER == 20190410 || \
+    PACKETVER == 20190424 || \
+    PACKETVER == 20190502 || \
+    PACKETVER == 20190508 || \
+    PACKETVER == 20190515 || \
+    PACKETVER == 20190529 || \
+    PACKETVER == 20190530 || \
+    PACKETVER == 20190605 || \
+    PACKETVER == 20190626 || \
+    PACKETVER == 20190709 || \
+    PACKETVER == 20190710 || \
+    PACKETVER == 20190717 || \
+    PACKETVER == 20190724 || \
+    PACKETVER == 20190814 || \
+    PACKETVER == 20190828 || \
+    PACKETVER == 20190911 || \
+    PACKETVER == 20190918 || \
+    PACKETVER == 20190925 || \
+    PACKETVER == 20191008 || \
+    PACKETVER == 20191023 || \
+    PACKETVER == 20191106 || \
+    PACKETVER == 20191113 || \
+    PACKETVER == 20191127 || \
+    PACKETVER == 20191204 || \
+    PACKETVER == 20191211 || \
+    PACKETVER == 20191224 || \
+    PACKETVER == 20200115 || \
+    PACKETVER == 20200129 || \
+    PACKETVER == 20200212 || \
+    PACKETVER == 20200226 || \
+    PACKETVER == 20200304 || \
+    PACKETVER == 20200318 || \
+    PACKETVER == 20200401 || \
+    PACKETVER == 20200414 || \
+    PACKETVER == 20200506 || \
+    PACKETVER >= 20200520
+	packet(0x0202,clif->pFriendsListAdd,2);
+	packet(0x022d,clif->pHomMenu,2,4);
+	packet(0x023b,clif->pStoragePassword,0);
+	packet(0x0281,clif->pDull/*,XXX*/);
+	packet(0x02c4,clif->pPartyInvite2,2);
+	packet(0x035f,clif->pWalkToXY,2);
+	packet(0x0360,clif->pTickSend,2);
+	packet(0x0361,clif->pChangeDir,2,4);
+	packet(0x0362,clif->pTakeItem,2);
+	packet(0x0363,clif->pDropItem,2,4);
+	packet(0x0364,clif->pMoveToKafra,2,4);
+	packet(0x0365,clif->pMoveFromKafra,2,4);
+	packet(0x0366,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pGetCharNameRequest,2);
+	packet(0x0369,clif->pSolveCharName,2);
+	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0437,clif->pActionRequest,2,6);
+	packet(0x0438,clif->pUseSkillToId,2,4,6);
+	packet(0x07e4,clif->pItemListWindowSelected,2,4,8);
+	packet(0x07ec,clif->pDull/*,XXX*/);
+	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0811,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0815,clif->pReqCloseBuyingStore,0);
+	packet(0x0817,clif->pReqClickBuyingStore,2);
+	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0838,clif->pSearchStoreInfoNextPage,0);
+	packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10);
 #endif
 
 // 2017-11-15aRagexe_zero, 2017-11-15bRagexe_zero, 2017-11-16aRagexe_zero, 2017-11-17aRagexe_zero
 #if PACKETVER == 20171115 || \
     PACKETVER == 20171116 || \
     PACKETVER == 20171117
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0860,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0881,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x091c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0922,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0959,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0966,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0860,clif->pDull/*,XXX*/);
+	packet(0x0881,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x091c,clif->pHomMenu,2,4);
+	packet(0x0922,clif->pStoragePassword,0);
+	packet(0x0959,clif->pChangeDir,2,4);
+	packet(0x0966,clif->pFriendsListAdd,2);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-11-21aRagexe_zero, 2017-11-22aRagexe_zero
 #if PACKETVER == 20171121 || \
     PACKETVER == 20171122
-	packet(0x0202,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x022d,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0866,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0889,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0892,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x089e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08ad,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0918,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x091f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0928,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0943,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0950,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pStoragePassword,0);
+	packet(0x022d,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pHomMenu,2,4);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0866,clif->pMoveToKafra,2,4);
+	packet(0x0889,clif->pMoveFromKafra,2,4);
+	packet(0x0892,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x089e,clif->pChangeDir,2,4);
+	packet(0x08ad,clif->pPartyInvite2,2);
+	packet(0x0918,clif->pTakeItem,2);
+	packet(0x091f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0928,clif->pFriendsListAdd,2);
+	packet(0x0943,clif->pDull/*,XXX*/);
+	packet(0x0950,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-11-23dRagexe_zero
 #if PACKETVER == 20171123
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0367,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0860,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0876,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0882,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x088c,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0896,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x089e,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x08a8,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x092b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0930,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0935,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0947,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0960,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0367,clif->pHomMenu,2,4);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085f,clif->pDropItem,2,4);
+	packet(0x0860,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0876,clif->pDull/*,XXX*/);
+	packet(0x0882,clif->pItemListWindowSelected,2,4,8);
+	packet(0x088c,clif->pPartyInvite2,2);
+	packet(0x0896,clif->pChangeDir,2,4);
+	packet(0x089e,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x08a8,clif->pFriendsListAdd,2);
+	packet(0x092b,clif->pMoveToKafra,2,4);
+	packet(0x0930,clif->pTakeItem,2);
+	packet(0x0935,clif->pMoveFromKafra,2,4);
+	packet(0x0947,clif->pStoragePassword,0);
+	packet(0x0960,clif->pDull/*,XXX*/);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-11-27aRagexe_zero, 2017-11-27cRagexe_zero, 2017-11-28aRagexe_zero
 #if PACKETVER == 20171127 || \
     PACKETVER == 20171128
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0893,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0893,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-11-30bRagexe_zero
 #if PACKETVER == 20171130
-	packet(0x0361,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0864,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x086f,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0871,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0872,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0875,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0878,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0881,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0884,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0886,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0887,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x088b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0894,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0899,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x08a0,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x08a7,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0925,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0928,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0930,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0931,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0935,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x093a,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0947,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x094c,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x095b,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x095f,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0960,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0965,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
+	packet(0x0361,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0864,clif->pGetCharNameRequest,2);
+	packet(0x086f,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0871,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0872,clif->pReqClickBuyingStore,2);
+	packet(0x0875,clif->pTakeItem,2);
+	packet(0x0878,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0881,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0884,clif->pDropItem,2,4);
+	packet(0x0886,clif->pReqCloseBuyingStore,0);
+	packet(0x0887,clif->pStoragePassword,0);
+	packet(0x088b,clif->pMoveToKafra,2,4);
+	packet(0x0894,clif->pWalkToXY,2);
+	packet(0x0899,clif->pDull/*,XXX*/);
+	packet(0x08a0,clif->pChangeDir,2,4);
+	packet(0x08a7,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0925,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0928,clif->pDull/*,XXX*/);
+	packet(0x0930,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0931,clif->pFriendsListAdd,2);
+	packet(0x0935,clif->pMoveFromKafra,2,4);
+	packet(0x093a,clif->pActionRequest,2,6);
+	packet(0x0947,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x094c,clif->pHomMenu,2,4);
+	packet(0x094f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x095b,clif->pTickSend,2);
+	packet(0x095f,clif->pPartyInvite2,2);
+	packet(0x0960,clif->pSolveCharName,2);
+	packet(0x0965,clif->pUseSkillToId,2,4,6);
 #endif
 
 // 2017-12-04bRagexe_zero
 #if PACKETVER == 20171204
-	packet(0x0281,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x085b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x086f,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x087d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0885,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0887,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0892,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0896,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x08aa,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0917,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0921,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0924,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0937,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0960,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0281,clif->pTakeItem,2);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x085b,clif->pDull/*,XXX*/);
+	packet(0x086f,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x087d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0885,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0887,clif->pChangeDir,2,4);
+	packet(0x0892,clif->pDull/*,XXX*/);
+	packet(0x0896,clif->pStoragePassword,0);
+	packet(0x08aa,clif->pPartyInvite2,2);
+	packet(0x0917,clif->pMoveFromKafra,2,4);
+	packet(0x091b,clif->pFriendsListAdd,2);
+	packet(0x0921,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0924,clif->pHomMenu,2,4);
+	packet(0x0937,clif->pMoveToKafra,2,4);
+	packet(0x0960,clif->pDropItem,2,4);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2017-12-06aRagexe_zero, 2017-12-06bRagexe_zero, 2017-12-06cRagexe_zero, 2017-12-06dRagexe_zero, 2017-12-08aRagexe_zero, 2017-12-08cRagexe_zero, 2017-12-08dRagexe_zero, 2017-12-09bRagexe_zero, 2017-12-09cRagexe_zero, 2017-12-10aRagexe_zero, 2017-12-11bRagexe_zero, 2017-12-12aRagexe_zero, 2017-12-13aRagexe_zero, 2017-12-13bRagexe_zero, 2017-12-13cRagexe_zero
@@ -311,548 +362,435 @@
     PACKETVER == 20171211 || \
     PACKETVER == 20171212 || \
     PACKETVER == 20171213
-	packet(0x0281,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0366,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0436,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0835,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x083c,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0860,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0862,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0864,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0870,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0878,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x087a,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x087b,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0885,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x088d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0893,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0897,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x089e,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08a4,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x08ac,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0920,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0934,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0936,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x093a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0940,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0941,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0959,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x095b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x095c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x095f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
+	packet(0x0281,clif->pUseSkillToId,2,4,6);
+	packet(0x0366,clif->pDropItem,2,4);
+	packet(0x0436,clif->pReqClickBuyingStore,2);
+	packet(0x0835,clif->pTakeItem,2);
+	packet(0x083c,clif->pDull/*,XXX*/);
+	packet(0x0860,clif->pDull/*,XXX*/);
+	packet(0x0862,clif->pChangeDir,2,4);
+	packet(0x0864,clif->pWalkToXY,2);
+	packet(0x0870,clif->pMoveToKafra,2,4);
+	packet(0x0878,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x087a,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x087b,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0885,clif->pSolveCharName,2);
+	packet(0x088d,clif->pPartyInvite2,2);
+	packet(0x0893,clif->pFriendsListAdd,2);
+	packet(0x0897,clif->pHomMenu,2,4);
+	packet(0x089e,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08a4,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x08ac,clif->pActionRequest,2,6);
+	packet(0x0920,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0934,clif->pReqCloseBuyingStore,0);
+	packet(0x0936,clif->pMoveFromKafra,2,4);
+	packet(0x093a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0940,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0941,clif->pGetCharNameRequest,2);
+	packet(0x0959,clif->pStoragePassword,0);
+	packet(0x095b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x095c,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x095f,clif->pTickSend,2);
 #endif
 
 // 2017-12-14cRagexe_zero
 #if PACKETVER == 20171214
-	packet(0x023b,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x02c4,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0438,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x085b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x085e,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0862,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0864,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x086a,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0871,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0873,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0886,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x088b,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088c,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0892,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0894,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0897,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x08a3,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x08a5,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x08ac,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0933,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x094a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x094d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x094f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0951,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x095a,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x095b,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0960,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0969,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x096a,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
+	packet(0x023b,clif->pSearchStoreInfoNextPage,0);
+	packet(0x02c4,clif->pDropItem,2,4);
+	packet(0x0438,clif->pGetCharNameRequest,2);
+	packet(0x085b,clif->pStoragePassword,0);
+	packet(0x085e,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0862,clif->pSolveCharName,2);
+	packet(0x0864,clif->pDull/*,XXX*/);
+	packet(0x086a,clif->pWalkToXY,2);
+	packet(0x0871,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0873,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0886,clif->pReqClickBuyingStore,2);
+	packet(0x088b,clif->pDull/*,XXX*/);
+	packet(0x088c,clif->pMoveToKafra,2,4);
+	packet(0x0892,clif->pUseSkillToId,2,4,6);
+	packet(0x0894,clif->pTakeItem,2);
+	packet(0x0897,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x08a3,clif->pFriendsListAdd,2);
+	packet(0x08a5,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x08ac,clif->pReqCloseBuyingStore,0);
+	packet(0x0933,clif->pActionRequest,2,6);
+	packet(0x094a,clif->pChangeDir,2,4);
+	packet(0x094d,clif->pHomMenu,2,4);
+	packet(0x094f,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0951,clif->pPartyInvite2,2);
+	packet(0x095a,clif->pMoveFromKafra,2,4);
+	packet(0x095b,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0960,clif->pTickSend,2);
+	packet(0x0969,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x096a,clif->pUseSkillToPos,2,4,6,8);
 #endif
 
 // 2017-12-20aRagexe_zero, 2017-12-21aRagexe_zero, 2017-12-21bRagexe_zero
 #if PACKETVER == 20171220 || \
     PACKETVER == 20171221
-	packet(0x022d,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0281,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0438,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x07ec,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0819,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0838,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x085f,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0867,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x086c,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0872,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087a,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x087e,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0899,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x089b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x089c,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08a3,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a5,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x08ad,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x091f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0921,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x092d,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x092e,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0932,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0934,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0937,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x094d,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x095b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
+	packet(0x022d,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0281,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0438,clif->pGetCharNameRequest,2);
+	packet(0x07ec,clif->pReqClickBuyingStore,2);
+	packet(0x0819,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0838,clif->pTickSend,2);
+	packet(0x085f,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0867,clif->pSolveCharName,2);
+	packet(0x086c,clif->pTakeItem,2);
+	packet(0x0872,clif->pMoveFromKafra,2,4);
+	packet(0x087a,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x087e,clif->pDull/*,XXX*/);
+	packet(0x0899,clif->pWalkToXY,2);
+	packet(0x089b,clif->pDull/*,XXX*/);
+	packet(0x089c,clif->pReqCloseBuyingStore,0);
+	packet(0x08a3,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a5,clif->pDropItem,2,4);
+	packet(0x08ad,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x091f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0921,clif->pHomMenu,2,4);
+	packet(0x092d,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x092e,clif->pFriendsListAdd,2);
+	packet(0x0932,clif->pPartyInvite2,2);
+	packet(0x0934,clif->pMoveToKafra,2,4);
+	packet(0x0937,clif->pActionRequest,2,6);
+	packet(0x094d,clif->pUseSkillToId,2,4,6);
+	packet(0x095b,clif->pStoragePassword,0);
+	packet(0x096a,clif->pChangeDir,2,4);
 #endif
 
 // 2017-12-27bRagexe_zero, 2017-12-29aRagexe_zero
 #if PACKETVER == 20171227 || \
     PACKETVER == 20171229
-	packet(0x02c4,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0860,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x086c,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0871,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0872,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0874,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0876,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0877,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0878,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x087b,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0885,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0889,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x088b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0894,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x089f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x091c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0920,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0925,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x092d,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0930,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0939,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x093e,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0941,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0945,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0946,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x094b,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x095e,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0967,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0968,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
+	packet(0x02c4,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0860,clif->pChangeDir,2,4);
+	packet(0x086c,clif->pActionRequest,2,6);
+	packet(0x0871,clif->pSolveCharName,2);
+	packet(0x0872,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0874,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0876,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0877,clif->pDull/*,XXX*/);
+	packet(0x0878,clif->pTakeItem,2);
+	packet(0x087b,clif->pMoveToKafra,2,4);
+	packet(0x0885,clif->pMoveFromKafra,2,4);
+	packet(0x0889,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x088b,clif->pReqCloseBuyingStore,0);
+	packet(0x0894,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x089f,clif->pReqClickBuyingStore,2);
+	packet(0x091c,clif->pDropItem,2,4);
+	packet(0x0920,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0925,clif->pDull/*,XXX*/);
+	packet(0x092d,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0930,clif->pStoragePassword,0);
+	packet(0x0939,clif->pTickSend,2);
+	packet(0x093e,clif->pGetCharNameRequest,2);
+	packet(0x0941,clif->pFriendsListAdd,2);
+	packet(0x0945,clif->pPartyInvite2,2);
+	packet(0x0946,clif->pWalkToXY,2);
+	packet(0x094b,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x095e,clif->pHomMenu,2,4);
+	packet(0x0967,clif->pUseSkillToId,2,4,6);
+	packet(0x0968,clif->pItemListWindowSelected,2,4,8);
 #endif
 
 // 2018-01-03aRagexe_zero
 #if PACKETVER == 20180103
-	packet(0x035f,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0360,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x07e4,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x083c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0860,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0866,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x086d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0871,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0872,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0874,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x087b,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0885,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0888,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0890,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0896,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x089d,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x08a6,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x091e,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0924,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0938,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x093b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0956,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0958,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x095b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x095d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0964,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0966,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x096a,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
+	packet(0x035f,clif->pChangeDir,2,4);
+	packet(0x0360,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x07e4,clif->pWalkToXY,2);
+	packet(0x083c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0860,clif->pHomMenu,2,4);
+	packet(0x0866,clif->pItemListWindowSelected,2,4,8);
+	packet(0x086d,clif->pFriendsListAdd,2);
+	packet(0x0871,clif->pTickSend,2);
+	packet(0x0872,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0874,clif->pSearchStoreInfoNextPage,0);
+	packet(0x087b,clif->pDull/*,XXX*/);
+	packet(0x0885,clif->pReqCloseBuyingStore,0);
+	packet(0x0888,clif->pActionRequest,2,6);
+	packet(0x0890,clif->pDropItem,2,4);
+	packet(0x0896,clif->pUseSkillToId,2,4,6);
+	packet(0x089d,clif->pMoveToKafra,2,4);
+	packet(0x08a6,clif->pGetCharNameRequest,2);
+	packet(0x091e,clif->pTakeItem,2);
+	packet(0x0924,clif->pDull/*,XXX*/);
+	packet(0x0938,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x093b,clif->pPartyInvite2,2);
+	packet(0x0956,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0958,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x095b,clif->pStoragePassword,0);
+	packet(0x095d,clif->pSolveCharName,2);
+	packet(0x0964,clif->pReqClickBuyingStore,2);
+	packet(0x0966,clif->pMoveFromKafra,2,4);
+	packet(0x096a,clif->pSearchStoreInfoListItemClick,2,6,10);
 #endif
 
 // 2018-01-17aRagexe_zero
 #if PACKETVER == 20180117
-	packet(0x0361,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0364,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0438,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x07e4,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x083c,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0866,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x086e,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x086f,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x087d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0881,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0884,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0886,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0890,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0891,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0893,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0899,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x089d,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x089e,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0919,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x091c,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x091f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0921,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0928,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0929,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x092d,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0933,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0946,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x095e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0963,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
+	packet(0x0361,clif->pPartyInvite2,2);
+	packet(0x0364,clif->pSolveCharName,2);
+	packet(0x0438,clif->pDull/*,XXX*/);
+	packet(0x07e4,clif->pStoragePassword,0);
+	packet(0x083c,clif->pDropItem,2,4);
+	packet(0x0866,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x086e,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x086f,clif->pReqClickBuyingStore,2);
+	packet(0x087d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0881,clif->pUseSkillToId,2,4,6);
+	packet(0x0884,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0886,clif->pTakeItem,2);
+	packet(0x0890,clif->pMoveToKafra,2,4);
+	packet(0x0891,clif->pGetCharNameRequest,2);
+	packet(0x0893,clif->pActionRequest,2,6);
+	packet(0x0899,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x089d,clif->pItemListWindowSelected,2,4,8);
+	packet(0x089e,clif->pChangeDir,2,4);
+	packet(0x0919,clif->pTickSend,2);
+	packet(0x091c,clif->pMoveFromKafra,2,4);
+	packet(0x091f,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0921,clif->pWalkToXY,2);
+	packet(0x0928,clif->pReqCloseBuyingStore,0);
+	packet(0x0929,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x092d,clif->pDull/*,XXX*/);
+	packet(0x0933,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0946,clif->pFriendsListAdd,2);
+	packet(0x095e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0963,clif->pHomMenu,2,4);
 #endif
 
 // 2018-01-31dRagexe_zero
 #if PACKETVER == 20180131
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0367,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0940,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0367,clif->pStoragePassword,0);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0940,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2018-02-07bRagexe_zero
 #if PACKETVER == 20180207
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0967,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0967,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2018-02-13aRagexe_zero
 #if PACKETVER == 20180213
-	packet(0x022d,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x02c4,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x035f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0361,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0802,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0815,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0838,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x085a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x085d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0868,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x087b,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0882,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0887,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0888,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x088a,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x088e,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0899,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0917,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x091d,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0922,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0930,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0941,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0942,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0947,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x094d,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0958,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x095b,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x095c,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0967,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
+	packet(0x022d,clif->pChangeDir,2,4);
+	packet(0x02c4,clif->pMoveToKafra,2,4);
+	packet(0x035f,clif->pDropItem,2,4);
+	packet(0x0361,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0802,clif->pTickSend,2);
+	packet(0x0815,clif->pUseSkillToId,2,4,6);
+	packet(0x0838,clif->pSearchStoreInfoNextPage,0);
+	packet(0x085a,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x085d,clif->pHomMenu,2,4);
+	packet(0x0868,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x087b,clif->pGetCharNameRequest,2);
+	packet(0x0882,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0887,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0888,clif->pSolveCharName,2);
+	packet(0x088a,clif->pDull/*,XXX*/);
+	packet(0x088e,clif->pReqClickBuyingStore,2);
+	packet(0x0899,clif->pFriendsListAdd,2);
+	packet(0x0917,clif->pActionRequest,2,6);
+	packet(0x091d,clif->pWalkToXY,2);
+	packet(0x0922,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0930,clif->pDull/*,XXX*/);
+	packet(0x0941,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0942,clif->pMoveFromKafra,2,4);
+	packet(0x0947,clif->pTakeItem,2);
+	packet(0x094d,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0958,clif->pPartyInvite2,2);
+	packet(0x095b,clif->pReqCloseBuyingStore,0);
+	packet(0x095c,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0967,clif->pStoragePassword,0);
 #endif
 
 // 2018-02-21aRagexe_zero
 #if PACKETVER == 20180221
-	packet(0x02c4,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0362,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0364,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0438,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x0817,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x085b,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x086a,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0878,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0880,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0884,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x088d,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0892,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0895,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x08a1,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x08a3,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x091b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0921,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0923,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x092d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0932,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x093b,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x093d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x093e,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0942,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0951,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0952,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0958,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0959,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x095d,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
+	packet(0x02c4,clif->pTickSend,2);
+	packet(0x0362,clif->pGetCharNameRequest,2);
+	packet(0x0364,clif->pChangeDir,2,4);
+	packet(0x0438,clif->pItemListWindowSelected,2,4,8);
+	packet(0x0817,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x085b,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x086a,clif->pDull/*,XXX*/);
+	packet(0x0878,clif->pReqCloseBuyingStore,0);
+	packet(0x0880,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0884,clif->pSearchStoreInfoNextPage,0);
+	packet(0x088d,clif->pSolveCharName,2);
+	packet(0x0892,clif->pDropItem,2,4);
+	packet(0x0895,clif->pReqClickBuyingStore,2);
+	packet(0x08a1,clif->pWalkToXY,2);
+	packet(0x08a3,clif->pUseSkillToId,2,4,6);
+	packet(0x091b,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0921,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0923,clif->pHomMenu,2,4);
+	packet(0x092d,clif->pFriendsListAdd,2);
+	packet(0x0932,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x093b,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x093d,clif->pPartyInvite2,2);
+	packet(0x093e,clif->pMoveFromKafra,2,4);
+	packet(0x0942,clif->pStoragePassword,0);
+	packet(0x0951,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0952,clif->pDull/*,XXX*/);
+	packet(0x0958,clif->pActionRequest,2,6);
+	packet(0x0959,clif->pMoveToKafra,2,4);
+	packet(0x095d,clif->pTakeItem,2);
 #endif
 
 // 2018-02-28bRagexe_zero, 2018-03-07aRagexe_zero, 2018-03-09aRagexe_zero
 #if PACKETVER == 20180228 || \
     PACKETVER == 20180307 || \
     PACKETVER == 20180309
-	packet(0x0202,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x023b,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0281,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x035f,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0360,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0361,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0362,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0363,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0364,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0369,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0436,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0437,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x07e4,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x07ec,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0802,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0835,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x083c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x0930,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x096a,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
+	packet(0x0202,clif->pChangeDir,2,4);
+	packet(0x022d,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x023b,clif->pFriendsListAdd,2);
+	packet(0x0281,clif->pItemListWindowSelected,2,4,8);
+	packet(0x035f,clif->pTickSend,2);
+	packet(0x0360,clif->pReqClickBuyingStore,2);
+	packet(0x0361,clif->pHomMenu,2,4);
+	packet(0x0362,clif->pDropItem,2,4);
+	packet(0x0363,clif->pDull/*,XXX*/);
+	packet(0x0364,clif->pMoveFromKafra,2,4);
+	packet(0x0365,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0366,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0368,clif->pSolveCharName,2);
+	packet(0x0369,clif->pActionRequest,2,6);
+	packet(0x0436,clif->pDull/*,XXX*/);
+	packet(0x0437,clif->pWalkToXY,2);
+	packet(0x0438,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x07e4,clif->pTakeItem,2);
+	packet(0x07ec,clif->pMoveToKafra,2,4);
+	packet(0x0802,clif->pPartyInvite2,2);
+	packet(0x0811,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0815,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x0819,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0835,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0838,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x083c,clif->pUseSkillToId,2,4,6);
+	packet(0x0930,clif->pStoragePassword,0);
+	packet(0x096a,clif->pGetCharNameRequest,2);
 #endif
 
 // 2018-03-14nRagexe_zero
 #if PACKETVER == 20180314
-	packet(0x023b,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x0438,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x07ec,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0817,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x083c,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x085d,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x085f,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0866,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0878,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x088d,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0891,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0897,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0899,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x089e,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x08a1,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x0917,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0918,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x091f,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0920,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0923,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x0930,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0931,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x093f,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0946,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x094a,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x094e,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0954,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0956,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0958,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
+	packet(0x023b,clif->pPartyInvite2,2);
+	packet(0x0438,clif->pSearchStoreInfoNextPage,0);
+	packet(0x07ec,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0817,clif->pReqCloseBuyingStore,0);
+	packet(0x083c,clif->pChangeDir,2,4);
+	packet(0x085d,clif->pFriendsListAdd,2);
+	packet(0x085f,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0866,clif->pHomMenu,2,4);
+	packet(0x0878,clif->pDull/*,XXX*/);
+	packet(0x088d,clif->pStoragePassword,0);
+	packet(0x0891,clif->pMoveFromKafra,2,4);
+	packet(0x0897,clif->pTakeItem,2);
+	packet(0x0899,clif->pMoveToKafra,2,4);
+	packet(0x089e,clif->pItemListWindowSelected,2,4,8);
+	packet(0x08a1,clif->pDull/*,XXX*/);
+	packet(0x0917,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0918,clif->pActionRequest,2,6);
+	packet(0x091f,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0920,clif->pTickSend,2);
+	packet(0x0923,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x0930,clif->pDropItem,2,4);
+	packet(0x0931,clif->pReqClickBuyingStore,2);
+	packet(0x093f,clif->pSolveCharName,2);
+	packet(0x0946,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x094a,clif->pUseSkillToId,2,4,6);
+	packet(0x094e,clif->pWalkToXY,2);
+	packet(0x0954,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0956,clif->pGetCharNameRequest,2);
+	packet(0x0958,clif->pReqTradeBuyingStore,2,4,8,12);
 #endif
 
 // 2018-05-11aRagexe_zero, 2018-05-11bRagexe_zero
 #if PACKETVER == 20180511
-	packet(0x0817,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x085f,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0863,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x086c,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0877,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x087e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0880,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0889,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0893,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0896,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0899,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 12
-	packet(0x08a2,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x08a4,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x08a5,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0919,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x091a,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x091d,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0920,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x092c,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x092d,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x092e,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0941,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x0942,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x094a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0955,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x0956,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x095c,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0961,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x0968,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-#endif
-
-// 2018-11-14aRagexe_zero, 2018-11-20aRagexe_zero, 2018-11-28aRagexe_zero, 2018-12-12aRagexe_zero, 2018-12-19aRagexe_zero, 2018-12-26_2aRagexe_zero, 2019-01-16_2aRagexe_zero, 2019-01-17_1aRagexe_zero, 2019-01-30_2aRagexe_zero, 2019-02-13aRagexe_zero, 2019-02-20aRagexe_zero, 2019-02-27aRagexe_zero, 2019-03-13aRagexe_zero, 2019-03-27_2aRagexe_zero, 2019-03-27_3aRagexe_zero, 2019-04-03aRagexe_zero, 2019-04-10bRagexe_zero, 2019-04-24aRagexe_zero, 2019-05-02aRagexe_zero, 2019-05-08_2aRagexe_zero, 2019-05-08aRagexe_zero, 2019-05-15aRagexe_zero, 2019-05-29aRagexe_zero, 2019-05-30aRagexe_zero, 2019-06-05_2aRagexe_zero, 2019-06-26_2aRagexe_zero, 2019-06-26_3aRagexe_zero, 2019-07-09aRagexe_zero, 2019-07-10_3aRagexe_zero, 2019-07-17aRagexe_zero, 2019-07-24aRagexe_zero, 2019-08-14_3aRagexe_zero
-#if PACKETVER == 20181114 || \
-    PACKETVER == 20181120 || \
-    PACKETVER == 20181128 || \
-    PACKETVER == 20181212 || \
-    PACKETVER == 20181219 || \
-    PACKETVER == 20181226 || \
-    PACKETVER == 20190116 || \
-    PACKETVER == 20190117 || \
-    PACKETVER == 20190130 || \
-    PACKETVER == 20190213 || \
-    PACKETVER == 20190220 || \
-    PACKETVER == 20190227 || \
-    PACKETVER == 20190313 || \
-    PACKETVER == 20190327 || \
-    PACKETVER == 20190403 || \
-    PACKETVER == 20190410 || \
-    PACKETVER == 20190424 || \
-    PACKETVER == 20190502 || \
-    PACKETVER == 20190508 || \
-    PACKETVER == 20190515 || \
-    PACKETVER == 20190529 || \
-    PACKETVER == 20190530 || \
-    PACKETVER == 20190605 || \
-    PACKETVER == 20190626 || \
-    PACKETVER == 20190709 || \
-    PACKETVER == 20190710 || \
-    PACKETVER == 20190717 || \
-    PACKETVER == 20190724 || \
-    PACKETVER >= 20190814
-	packet(0x0202,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x022d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x023b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0281,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x02c4,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x035f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0360,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0361,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0362,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0363,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0364,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0365,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0366,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 90
-	packet(0x0368,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0369,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0437,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0438,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x07e4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x07ec,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0811,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0815,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0817,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0838,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 14
-#endif
-
-// 2019-08-28_2aRagexe_zero, 2019-08-28_3aRagexe_zero, 2019-09-11aRagexe_zero, 2019-09-18_2aRagexe_zero, 2019-09-18aRagexe_zero, 2019-09-25_3aRagexe_zero, 2019-09-25_5aRagexe_zero, 2019-10-08_2aRagexe_zero, 2019-10-23_2aRagexe_zero, 2019-11-06aRagexe_zero, 2019-11-13aRagexe_zero, 2019-11-27_2aRagexe_zero, 2019-11-27aRagexe_zero, 2019-12-04aRagexe_zero, 2019-12-11_2aRagexe_zero, 2019-12-24_4aRagexe_zero, 2019-12-24_5aRagexe_zero, 2020-01-15_2aRagexe_zero, 2020-01-15aRagexe_zero, 2020-01-29_2aRagexe_zero, 2020-01-29aRagexe_zero, 2020-02-12aRagexe_zero, 2020-02-26aRagexe_zero, 2020-02-26bRagexe_zero, 2020-03-04aRagexe_zero, 2020-03-18_2aRagexe_zero, 2020-04-01_2aRagexe_zero, 2020-04-14bRagexe_zero
-#if PACKETVER == 20190828 || \
-    PACKETVER == 20190911 || \
-    PACKETVER == 20190918 || \
-    PACKETVER == 20190925 || \
-    PACKETVER == 20191008 || \
-    PACKETVER == 20191023 || \
-    PACKETVER == 20191106 || \
-    PACKETVER == 20191113 || \
-    PACKETVER == 20191127 || \
-    PACKETVER == 20191204 || \
-    PACKETVER == 20191211 || \
-    PACKETVER == 20191224 || \
-    PACKETVER == 20200115 || \
-    PACKETVER == 20200129 || \
-    PACKETVER == 20200212 || \
-    PACKETVER == 20200226 || \
-    PACKETVER == 20200304 || \
-    PACKETVER == 20200318 || \
-    PACKETVER == 20200401 || \
-    PACKETVER == 20200414
-	packet(0x0202,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS // 26
-	packet(0x022d,clif->pHomMenu,2,4);  // CZ_COMMAND_MER // 5
-	packet(0x023b,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD // 36
-	packet(0x0281,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK // 4
-	packet(0x02c4,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ // 26
-	packet(0x035f,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE // 5
-	packet(0x0360,clif->pTickSend,2);  // CZ_REQUEST_TIME // 6
-	packet(0x0361,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION // 5
-	packet(0x0362,clif->pTakeItem,2);  // CZ_ITEM_PICKUP // 6
-	packet(0x0363,clif->pDropItem,2,4);  // CZ_ITEM_THROW // 6
-	packet(0x0364,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8
-	packet(0x0365,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8
-	packet(0x0366,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND // 10
-	packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 31
-	packet(0x0368,clif->pGetCharNameRequest,2);  // CZ_REQNAME // 6
-	packet(0x0369,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID // 6
-	packet(0x0436,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER // 19
-	packet(0x0437,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT // 7
-	packet(0x0438,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL // 10
-	packet(0x07e4,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES // -1
-	packet(0x07ec,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD // 8
-	packet(0x0802,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER // 18
-	packet(0x0811,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE // -1
-	packet(0x0815,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE // 2
-	packet(0x0817,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE // 6
-	packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE // -1
-	packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO // -1
-	packet(0x0838,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2
-	packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK // 14
+	packet(0x0817,clif->pSolveCharName,2);
+	packet(0x085f,clif->pDropItem,2,4);
+	packet(0x0863,clif->pReqClickBuyingStore,2);
+	packet(0x086c,clif->pActionRequest,2,6);
+	packet(0x0877,clif->pMoveFromKafra,2,4);
+	packet(0x087e,clif->pSearchStoreInfo,2,4,5,9,13,14,15);
+	packet(0x0880,clif->pGetCharNameRequest,2);
+	packet(0x0889,clif->pMoveToKafra,2,4);
+	packet(0x0893,clif->pPartyBookingRegisterReq,2,4);
+	packet(0x0896,clif->pWantToConnection,2,6,10,14,18);
+	packet(0x0899,clif->pSearchStoreInfoListItemClick,2,6,10);
+	packet(0x08a2,clif->pTakeItem,2);
+	packet(0x08a4,clif->pReqCloseBuyingStore,0);
+	packet(0x08a5,clif->pTickSend,2);
+	packet(0x0919,clif->pWalkToXY,2);
+	packet(0x091a,clif->pItemListWindowSelected,2,4,8);
+	packet(0x091d,clif->pReqOpenBuyingStore,2,4,8,9,89);
+	packet(0x0920,clif->pDull/*,XXX*/);
+	packet(0x092c,clif->pUseSkillToId,2,4,6);
+	packet(0x092d,clif->pPartyInvite2,2);
+	packet(0x092e,clif->pReqTradeBuyingStore,2,4,8,12);
+	packet(0x0941,clif->pSearchStoreInfoNextPage,0);
+	packet(0x0942,clif->pChangeDir,2,4);
+	packet(0x094a,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);
+	packet(0x0955,clif->pFriendsListAdd,2);
+	packet(0x0956,clif->pDull/*,XXX*/);
+	packet(0x095c,clif->pUseSkillToPos,2,4,6,8);
+	packet(0x0961,clif->pHomMenu,2,4);
+	packet(0x0968,clif->pStoragePassword,0);
 #endif
 
 
diff --git a/src/map/party.c b/src/map/party.c
index 7d7f69620..8eeae2215 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -677,17 +677,18 @@ static int party_member_withdraw(int party_id, int account_id, int char_id)
 /// Invoked (from char-server) when a party is disbanded.
 static int party_broken(int party_id)
 {
-	struct party_data* p;
-	int i, j;
+	int i;
 
-	p = party->search(party_id);
-	if( p == NULL )
+	struct party_data *p = party->search(party_id);
+	if (p == NULL)
 		return 0;
 
-	for( j = 0; j < p->instances; j++ ) {
-		if( p->instance[j] >= 0 ) {
-			instance->destroy( p->instance[j] );
-			instance->list[p->instance[j]].owner_id = 0;
+	for (int j = 0; j < p->instances; j++) {
+		const short instance_id = p->instance[j];
+		if (instance_id >= 0) {
+			instance->destroy(instance_id);
+			if (instance_id < instance->instances)
+				instance->list[instance_id].owner_id = 0;
 		}
 	}
 
diff --git a/src/map/pc.c b/src/map/pc.c
index 5faadf76a..41e182cca 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1279,6 +1279,7 @@ static bool pc_authok(struct map_session_data *sd, int login_id2, time_t expirat
 	sd->bg_queue.client_has_bg_data = 0;
 	sd->bg_queue.type = 0;
 
+	VECTOR_INIT(sd->auto_cast); // Initialize auto-cast vector.
 	VECTOR_INIT(sd->channels);
 	VECTOR_INIT(sd->script_queues);
 	VECTOR_INIT(sd->achievement); // Achievements [Smokexyz/Hercules]
@@ -5162,7 +5163,8 @@ static int pc_useitem(struct map_session_data *sd, int n)
 	nullpo_ret(sd);
 	Assert_ret(n >= 0 && n < sd->status.inventorySize);
 
-	if (sd->npc_id || sd->state.workinprogress & 1) {
+	if ((sd->npc_id != 0 && (sd->npc_item_flag & ITEMENABLEDNPC_CONSUME) == 0)
+	    || (sd->state.workinprogress & 1) != 0) {
 #if PACKETVER >= 20110308
 		clif->msgtable(sd, MSG_BUSY);
 #else
@@ -5171,7 +5173,7 @@ static int pc_useitem(struct map_session_data *sd, int n)
 		return 0;
 	}
 
-	if (battle_config.storage_use_item == 1 && sd->state.storage_flag != STORAGE_FLAG_CLOSED) {
+	if (battle_config.storage_use_item == 0 && sd->state.storage_flag != STORAGE_FLAG_CLOSED) {
 		clif->messagecolor_self(sd->fd, COLOR_RED, msg_sd(sd, 1475));
 		return 0; // You cannot use this item while storage is open.
 	}
@@ -5333,24 +5335,79 @@ static int pc_useitem(struct map_session_data *sd, int n)
 }
 
 /**
+ * Unsets a character's currently processed auto-cast skill data.
+ *
+ * @param sd The character.
+ *
+ **/
+static void pc_autocast_clear_current(struct map_session_data *sd)
+{
+	nullpo_retv(sd);
+
+	sd->auto_cast_current.type = AUTOCAST_NONE;
+	sd->auto_cast_current.skill_id = 0;
+	sd->auto_cast_current.skill_lv = 0;
+	sd->auto_cast_current.itemskill_conditions_checked = false;
+	sd->auto_cast_current.itemskill_check_conditions = true;
+	sd->auto_cast_current.itemskill_instant_cast = false;
+	sd->auto_cast_current.itemskill_cast_on_self = false;
+}
+
+/**
  * Unsets a character's auto-cast related data.
  *
- * @param sd The character's session data.
- * @return 0 if parameter sd is NULL, otherwise 1.
- */
-static int pc_autocast_clear(struct map_session_data *sd)
+ * @param sd The character.
+ *
+ **/
+static void pc_autocast_clear(struct map_session_data *sd)
 {
-	nullpo_ret(sd);
+	nullpo_retv(sd);
 
-	sd->autocast.type = AUTOCAST_NONE;
-	sd->autocast.skill_id = 0;
-	sd->autocast.skill_lv = 0;
-	sd->autocast.itemskill_conditions_checked = false;
-	sd->autocast.itemskill_check_conditions = false;
-	sd->autocast.itemskill_instant_cast = false;
-	sd->autocast.itemskill_cast_on_self = false;
+	pc->autocast_clear_current(sd);
+	VECTOR_TRUNCATE(sd->auto_cast); // Truncate auto-cast vector.
+}
 
-	return 1;
+/**
+ * Sets a character's currently processed auto-cast skill data by comparing the skill ID.
+ *
+ * @param sd The character.
+ * @param skill_id The skill ID to compare.
+ *
+ **/
+static void pc_autocast_set_current(struct map_session_data *sd, int skill_id)
+{
+	nullpo_retv(sd);
+
+	pc->autocast_clear_current(sd);
+
+	for (int i = 0; i < VECTOR_LENGTH(sd->auto_cast); i++) {
+		if (VECTOR_INDEX(sd->auto_cast, i).skill_id == skill_id) {
+			sd->auto_cast_current = VECTOR_INDEX(sd->auto_cast, i);
+			break;
+		}
+	}
+}
+
+/**
+ * Removes a specific entry from a character's auto-cast vector.
+ *
+ * @param sd The character.
+ * @param type The entry's auto-cast type.
+ * @param skill_id The entry's skill ID.
+ * @param skill_lv The entry's skill level.
+ *
+ **/
+static void pc_autocast_remove(struct map_session_data *sd, enum autocast_type type, int skill_id, int skill_lv)
+{
+	nullpo_retv(sd);
+
+	for (int i = 0; i < VECTOR_LENGTH(sd->auto_cast); i++) {
+		if (VECTOR_INDEX(sd->auto_cast, i).type == type && VECTOR_INDEX(sd->auto_cast, i).skill_id == skill_id
+		    && VECTOR_INDEX(sd->auto_cast, i).skill_lv == skill_lv) {
+			VECTOR_ERASE(sd->auto_cast, i);
+			break;
+		}
+	}
 }
 
 /*==========================================
@@ -12883,7 +12940,10 @@ void pc_defaults(void)
 	pc->unequipitem_pos = pc_unequipitem_pos;
 	pc->checkitem = pc_checkitem;
 	pc->useitem = pc_useitem;
+	pc->autocast_clear_current = pc_autocast_clear_current;
 	pc->autocast_clear = pc_autocast_clear;
+	pc->autocast_set_current = pc_autocast_set_current;
+	pc->autocast_remove = pc_autocast_remove;
 
 	pc->skillatk_bonus = pc_skillatk_bonus;
 	pc->skillheal_bonus = pc_skillheal_bonus;
diff --git a/src/map/pc.h b/src/map/pc.h
index 8d1cd0ca4..f2e911af3 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -103,6 +103,13 @@ enum pc_checkitem_types {
 	PCCHECKITEM_GSTORAGE  = 0x8
 };
 
+/** Bit flags for allowed item actions while interacting with NPC. **/
+enum item_enabled_npc_flags {
+	ITEMENABLEDNPC_NONE    = 0x0, //!< Don't allow any item actions while interacting with NPC.
+	ITEMENABLEDNPC_EQUIP   = 0x1, //!< Allow changing equipment while interacting with NPC.
+	ITEMENABLEDNPC_CONSUME = 0x2, //!< Allow consuming usable items while interacting with NPC.
+};
+
 struct weapon_data {
 	int atkmods[3];
 BEGIN_ZEROED_BLOCK; // all the variables within this block get zero'ed in each call of status_calc_pc
@@ -192,7 +199,8 @@ struct map_session_data {
 	struct status_change sc;
 	struct regen_data regen;
 	struct regen_data_sub sregen, ssregen;
-	struct autocast_data autocast;
+	struct autocast_data auto_cast_current; // Currently processed auto-cast skill.
+	VECTOR_DECL(struct autocast_data) auto_cast; // Auto-cast vector.
 	//NOTE: When deciding to add a flag to state or special_state, take into consideration that state is preserved in
 	//status_calc_pc, while special_state is recalculated in each call. [Skotlex]
 	struct {
@@ -675,6 +683,7 @@ END_ZEROED_BLOCK;
 #define pc_istrading(sd)      ( (sd)->npc_id || (sd)->state.vending || (sd)->state.buyingstore || (sd)->state.trading )
 #define pc_cant_act(sd)       ( (sd)->npc_id || (sd)->state.vending || (sd)->state.buyingstore || (sd)->chat_id != 0 || ((sd)->sc.opt1 && (sd)->sc.opt1 != OPT1_BURNING) || (sd)->state.trading || (sd)->state.storage_flag || (sd)->state.prevend || (sd)->state.refine_ui == 1 || (sd)->state.lapine_ui == 1)
 #define pc_cant_act_except_lapine(sd) ((sd)->npc_id || (sd)->state.vending || (sd)->state.buyingstore || (sd)->chat_id != 0 || ((sd)->sc.opt1 && (sd)->sc.opt1 != OPT1_BURNING) || (sd)->state.trading || (sd)->state.storage_flag || (sd)->state.prevend || (sd)->state.refine_ui == 1)
+#define pc_cant_act_except_npc(sd) ( (sd)->state.vending != 0 || (sd)->state.buyingstore != 0 || (sd)->chat_id != 0 || ((sd)->sc.opt1 != 0 && (sd)->sc.opt1 != OPT1_BURNING) || (sd)->state.trading != 0 || (sd)->state.storage_flag != 0 || (sd)->state.prevend != 0 || (sd)->state.refine_ui == 1 || (sd)->state.lapine_ui == 1)
 
 /* equals pc_cant_act except it doesn't check for chat rooms */
 #define pc_cant_act2(sd)       ( (sd)->npc_id || (sd)->state.buyingstore || ((sd)->sc.opt1 && (sd)->sc.opt1 != OPT1_BURNING) || (sd)->state.trading || (sd)->state.storage_flag || (sd)->state.prevend || (sd)->state.refine_ui == 1 || (sd)->state.lapine_ui == 1)
@@ -1028,7 +1037,10 @@ END_ZEROED_BLOCK; /* End */
 	void (*unequipitem_pos) (struct map_session_data *sd, int n, int pos);
 	int (*checkitem) (struct map_session_data *sd);
 	int (*useitem) (struct map_session_data *sd,int n);
-	int (*autocast_clear) (struct map_session_data *sd);
+	void (*autocast_clear_current) (struct map_session_data *sd);
+	void (*autocast_clear) (struct map_session_data *sd);
+	void (*autocast_set_current) (struct map_session_data *sd, int skill_id);
+	void (*autocast_remove) (struct map_session_data *sd, enum autocast_type type, int skill_id, int skill_lv);
 
 	int (*skillatk_bonus) (struct map_session_data *sd, uint16 skill_id);
 	int (*skillheal_bonus) (struct map_session_data *sd, uint16 skill_id);
diff --git a/src/map/pet.c b/src/map/pet.c
index 299de42c7..2a9831ed6 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -404,6 +404,7 @@ static int pet_return_egg(struct map_session_data *sd, struct pet_data *pd)
 	if (i != sd->status.inventorySize) {
 		sd->status.inventory[i].attribute &= ~ATTR_BROKEN;
 		sd->status.inventory[i].bound = IBT_NONE;
+		sd->status.inventory[i].card[3] = pd->pet.rename_flag;
 	} else {
 		// The pet egg wasn't found: it was probably hatched with the old system that deleted the egg.
 		struct item tmp_item = {0};
diff --git a/src/map/script.c b/src/map/script.c
index e4a57194d..763a6c51c 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -1240,6 +1240,80 @@ static const char *parse_variable(const char *p)
 	return p;
 }
 
+/**
+ * Converts a number expression literal to an actual integer.
+ * Number separators are skipped.
+ *
+ * expects these formats:
+ *     1337
+ *     0x1337
+ *     0b1001
+ *     0o1337
+ *
+ * example with separating nibbles of a binary literal:
+ *     0b1101_0111_1001_1111
+ *
+ * @param p - a pointer to the first char of the number literal
+ * @param lli - a pointer to the resulting long long integer
+ * @returns a pointer to the first char after the parsed number
+*/
+static const char *parse_number(const char *p, long long *lli) {
+	nullpo_retr(NULL, p);
+
+	const bool unary_plus = (*p == '+');
+	const bool unary_minus = (*p == '-');
+
+	if (unary_plus || unary_minus) {
+		p++;
+	}
+
+	if (ISNSEPARATOR(*p)) {
+		disp_error_message("parse_number: number literals cannot begin with a separator", p);
+	}
+
+#define PARSENUMBER(skip, func, radix) \
+	for (p += skip; func(*p) || (ISNSEPARATOR(*p) && (func(p[1]) || ISNSEPARATOR(p[1]))); ++p) { \
+		if (func(*p)) { \
+			*lli *= radix; \
+			*lli += (*p < 'A') ? (*p & 0xF) : (9 + (*p & 0x7)); \
+		} else if (ISNSEPARATOR(p[1])) { \
+			disp_error_message("parse_number: number literals cannot contain two separators in a row", p + 1); \
+		} \
+	}
+
+	if (*p == '0' && p[1] == 'x') {
+		PARSENUMBER(2, ISXDIGIT, 16);
+	} else if (*p == '0' && p[1] == 'o') {
+		PARSENUMBER(2, ISODIGIT, 8);
+	} else if (*p == '0' && p[1] == 'b') {
+		PARSENUMBER(2, ISBDIGIT, 2);
+	} else {
+		PARSENUMBER(0, ISDIGIT, 10);
+	}
+
+#undef PARSENUMBER
+
+	if (ISNSEPARATOR(*p)) {
+		disp_error_message("parse_number: number literals cannot end with a separator", p);
+	}
+
+	if (unary_minus) {
+		// reverse the sign
+		*lli = -(*lli);
+	}
+
+	// make sure we can't underflow/overflow
+	if (*lli < INT_MIN) {
+		*lli = INT_MIN;
+		script->disp_warning_message("parse_number: underflow detected, capping value to INT_MIN", p);
+	} else if (*lli > INT_MAX) {
+		*lli = INT_MAX;
+		script->disp_warning_message("parse_number: overflow detected, capping value to INT_MAX", p);
+	}
+
+	return p;
+}
+
 /*
  * Checks whether the gives string is a number literal
  *
@@ -1256,24 +1330,44 @@ static const char *parse_variable(const char *p)
 static bool is_number(const char *p)
 {
 	const char *np;
-	if (!p)
-		return false;
-	if (*p == '-' || *p == '+')
+	nullpo_retr(false, p);
+
+	if (*p == '-' || *p == '+') {
 		p++;
+	}
+
 	np = p;
+
 	if (*p == '0' && p[1] == 'x') {
-		p+=2;
-		np = p;
-		// Hexadecimal
-		while (ISXDIGIT(*np))
+		// Hexadecimal: 0xFFFF
+		np = (p += 2);
+		while (ISXDIGIT(*np) || ISNSEPARATOR(*np)) {
 			np++;
-	} else {
-		// Decimal
-		while (ISDIGIT(*np))
+		}
+	} else if (*p == '0' && p[1] == 'b') {
+		// Binary: 0b0001
+		np = (p += 2);
+		while (ISBDIGIT(*np) || ISNSEPARATOR(*np)) {
+			np++;
+		}
+	} else if (*p == '0' && p[1] == 'o') {
+		// Octal: 0o1500
+		np = (p += 2);
+		while (ISODIGIT(*np) || ISNSEPARATOR(*np)) {
 			np++;
+		}
+	} else if (ISDIGIT(*p)) {
+		// Decimal: 1234
+		while (ISDIGIT(*np) || ISNSEPARATOR(*np)) {
+			np++;
+		}
 	}
-	if (p != np && *np != '_' && !ISALPHA(*np)) // At least one digit, and next isn't a letter or _
+
+	if (p != np && *np != '_' && !ISALPHA(*np)) {
+		// At least one digit, and next isn't a letter or _
 		return true;
+	}
+
 	return false;
 }
 
@@ -1367,21 +1461,9 @@ static const char *parse_simpleexpr_paren(const char *p)
 
 static const char *parse_simpleexpr_number(const char *p)
 {
-	char *np = NULL;
-	long long lli;
-
-	nullpo_retr(NULL, p);
-	while (*p == '0' && ISDIGIT(p[1]))
-		p++; // Skip leading zeros, we don't support octal literals
+	long long lli = 0;
+	const char *np = parse_number(p, &lli);
 
-	lli = strtoll(p, &np, 0);
-	if (lli < INT_MIN) {
-		lli = INT_MIN;
-		script->disp_warning_message("parse_simpleexpr: underflow detected, capping value to INT_MIN", p);
-	} else if (lli > INT_MAX) {
-		lli = INT_MAX;
-		script->disp_warning_message("parse_simpleexpr: overflow detected, capping value to INT_MAX", p);
-	}
 	script->addi((int)lli); // Cast is safe, as it's already been checked for overflows
 
 	return np;
@@ -9053,22 +9135,71 @@ static BUILDIN(delitemidx)
 	return true;
 }
 
-/*==========================================
- * Enables/Disables use of items while in an NPC [Skotlex]
- *------------------------------------------*/
+/**
+ * Enable item actions while interacting with NPC.
+ *
+ * @code{.herc}
+ *	enableitemuse({<flag>});
+ *	enable_items({<flag>});
+ * @endcode
+ *
+ **/
 static BUILDIN(enableitemuse)
 {
+	int flag = battle_config.item_enabled_npc;
+
+	if (script_hasdata(st, 2)) {
+		if (!script_isinttype(st, 2))
+			return true;
+
+		flag = script_getnum(st, 2);
+	}
+
+	if (flag < 0)
+		return true;
+	
 	struct map_session_data *sd = script->rid2sd(st);
-	if (sd != NULL)
-		st->npc_item_flag = sd->npc_item_flag = 1;
+
+	if (sd == NULL)
+		return true;
+
+	st->npc_item_flag |= flag;
+	sd->npc_item_flag |= flag;
+
 	return true;
 }
 
+/**
+ * Disable item actions while interacting with NPC.
+ *
+ * @code{.herc}
+ *	disableitemuse({<flag>});
+ *	disable_items({<flag>});
+ * @endcode
+ *
+ **/
 static BUILDIN(disableitemuse)
 {
+	int flag = battle_config.item_enabled_npc;
+
+	if (script_hasdata(st, 2)) {
+		if (!script_isinttype(st, 2))
+			return true;
+
+		flag = script_getnum(st, 2);
+	}
+
+	if (flag < 0)
+		return true;
+	
 	struct map_session_data *sd = script->rid2sd(st);
-	if (sd != NULL)
-		st->npc_item_flag = sd->npc_item_flag = 0;
+
+	if (sd == NULL)
+		return true;
+
+	st->npc_item_flag &= ~flag;
+	sd->npc_item_flag &= ~flag;
+
 	return true;
 }
 
@@ -11287,32 +11418,33 @@ static BUILDIN(itemskill)
 {
 	struct map_session_data *sd = script->rid2sd(st);
 
-	if (sd == NULL || sd->ud.skilltimer != INVALID_TIMER)
+	if (sd == NULL)
 		return true;
 
-	pc->autocast_clear(sd);
-	sd->autocast.type = AUTOCAST_ITEM;
-	sd->autocast.skill_id = script_isstringtype(st, 2) ? skill->name2id(script_getstr(st, 2)) : script_getnum(st, 2);
-	sd->autocast.skill_lv = script_getnum(st, 3);
+	sd->auto_cast_current.type = AUTOCAST_ITEM;
+	sd->auto_cast_current.skill_id = script_isstringtype(st, 2) ? skill->name2id(script_getstr(st, 2)) : script_getnum(st, 2);
+	sd->auto_cast_current.skill_lv = script_getnum(st, 3);
 
 	int flag = script_hasdata(st, 4) ? script_getnum(st, 4) : ISF_NONE;
 
-	sd->autocast.itemskill_check_conditions = ((flag & ISF_CHECKCONDITIONS) == ISF_CHECKCONDITIONS);
+	sd->auto_cast_current.itemskill_check_conditions = ((flag & ISF_CHECKCONDITIONS) == ISF_CHECKCONDITIONS);
 
-	if (sd->autocast.itemskill_check_conditions) {
-		if (skill->check_condition_castbegin(sd, sd->autocast.skill_id, sd->autocast.skill_lv) == 0
-		    || skill->check_condition_castend(sd, sd->autocast.skill_id, sd->autocast.skill_lv) == 0) {
-			pc->autocast_clear(sd);
+	if (sd->auto_cast_current.itemskill_check_conditions) {
+		if (skill->check_condition_castbegin(sd, sd->auto_cast_current.skill_id, sd->auto_cast_current.skill_lv) == 0
+		    || skill->check_condition_castend(sd, sd->auto_cast_current.skill_id, sd->auto_cast_current.skill_lv) == 0) {
 			return true;
 		}
 
-		sd->autocast.itemskill_conditions_checked = true;
+		sd->auto_cast_current.itemskill_conditions_checked = true;
 	}
 
-	sd->autocast.itemskill_instant_cast = ((flag & ISF_INSTANTCAST) == ISF_INSTANTCAST);
-	sd->autocast.itemskill_cast_on_self = ((flag & ISF_CASTONSELF) == ISF_CASTONSELF);
+	sd->auto_cast_current.itemskill_instant_cast = ((flag & ISF_INSTANTCAST) == ISF_INSTANTCAST);
+	sd->auto_cast_current.itemskill_cast_on_self = ((flag & ISF_CASTONSELF) == ISF_CASTONSELF);
+
+	VECTOR_ENSURE(sd->auto_cast, 1, 1);
+	VECTOR_PUSH(sd->auto_cast, sd->auto_cast_current);
 
-	clif->item_skill(sd, sd->autocast.skill_id, sd->autocast.skill_lv);
+	clif->item_skill(sd, sd->auto_cast_current.skill_id, sd->auto_cast_current.skill_lv);
 
 	return true;
 }
@@ -19151,7 +19283,14 @@ static BUILDIN(npcshopdelitem)
 		size--;
 	}
 
-	RECREATE(nd->u.shop.shop_item, struct npc_item_list, size);
+	int alloc_size = size;
+	if (size < 0) {
+		size = 0;
+		alloc_size = 1;
+	} else if (size < 1) {
+		alloc_size = 1;
+	}
+	RECREATE(nd->u.shop.shop_item, struct npc_item_list, alloc_size);
 	nd->u.shop.count = size;
 
 	script_pushint(st,1);
@@ -27107,8 +27246,8 @@ static void script_parse_builtin(void)
 		BUILDIN_DEF(delitem,"vi?"),
 		BUILDIN_DEF(delitem2,"viiiiiiii?"),
 		BUILDIN_DEF(delitemidx, "i??"),
-		BUILDIN_DEF2(enableitemuse,"enable_items",""),
-		BUILDIN_DEF2(disableitemuse,"disable_items",""),
+		BUILDIN_DEF2(enableitemuse, "enable_items", "?"),
+		BUILDIN_DEF2(disableitemuse, "disable_items", "?"),
 		BUILDIN_DEF(cutin,"si"),
 		BUILDIN_DEF(viewpoint,"iiiii"),
 		BUILDIN_DEF(heal,"ii"),
@@ -28157,6 +28296,16 @@ static void script_hardcoded_constants(void)
 	script->set_constant("PCBLOCK_COMMANDS", PCBLOCK_COMMANDS, false, false);
 	script->set_constant("PCBLOCK_NPC",      PCBLOCK_NPC,      false, false);
 
+	script->constdb_comment("NPC item action constants");
+	script->set_constant("ITEMENABLEDNPC_NONE", ITEMENABLEDNPC_NONE, false, false);
+	script->set_constant("ITEMENABLEDNPC_EQUIP", ITEMENABLEDNPC_EQUIP, false, false);
+	script->set_constant("ITEMENABLEDNPC_CONSUME", ITEMENABLEDNPC_CONSUME, false, false);
+
+	script->constdb_comment("NPC allowed skill use constants");
+	script->set_constant("SKILLENABLEDNPC_NONE", SKILLENABLEDNPC_NONE, false, false);
+	script->set_constant("SKILLENABLEDNPC_SELF", SKILLENABLEDNPC_SELF, false, false);
+	script->set_constant("SKILLENABLEDNPC_ALL", SKILLENABLEDNPC_ALL, false, false);
+
 	script->constdb_comment("private airship responds");
 	script->set_constant("P_AIRSHIP_NONE", P_AIRSHIP_NONE, false, false);
 	script->set_constant("P_AIRSHIP_RETRY", P_AIRSHIP_RETRY, false, false);
diff --git a/src/map/skill.c b/src/map/skill.c
index e3fa6b0a1..765e3b6bf 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -176,14 +176,26 @@ static const char *skill_get_desc(int skill_id)
 
 // Skill DB
 
-static int skill_get_hit(int skill_id)
+/**
+ * Gets a skill's hit type by its ID and level. (See enum battle_dmg_type.)
+ *
+ * @param skill_id The skill's ID.
+ * @param skill_lv The skill's level.
+ * @return The skill's hit type corresponding to the passed level. Defaults to BDT_NORMAL (0) in case of error.
+ *
+ **/
+static int skill_get_hit(int skill_id, int skill_lv)
 {
-	int idx;
 	if (skill_id == 0)
-		return 0;
-	idx = skill->get_index(skill_id);
-	Assert_ret(idx != 0);
-	return skill->dbs->db[idx].hit;
+		return BDT_NORMAL;
+
+	Assert_retr(BDT_NORMAL, skill_lv > 0);
+
+	int idx = skill->get_index(skill_id);
+
+	Assert_retr(BDT_NORMAL, idx != 0);
+
+	return skill->dbs->db[idx].hit[skill_get_lvl_idx(skill_lv)];
 }
 
 static int skill_get_inf(int skill_id)
@@ -320,14 +332,26 @@ static int skill_get_sp_rate(int skill_id, int skill_lv)
 	return skill->dbs->db[idx].sp_rate[skill_get_lvl_idx(skill_lv)];
 }
 
-static int skill_get_state(int skill_id)
+/**
+ * Gets a skill's required state by its ID and level.
+ *
+ * @param skill_id The skill's ID.
+ * @param skill_lv The skill's level.
+ * @return The skill's required state corresponding to the passed level. Defaults to ST_NONE (0) in case of error.
+ *
+ **/
+static int skill_get_state(int skill_id, int skill_lv)
 {
-	int idx;
 	if (skill_id == 0)
 		return ST_NONE;
-	idx = skill->get_index(skill_id);
+
+	Assert_retr(ST_NONE, skill_lv > 0);
+
+	int idx = skill->get_index(skill_id);
+
 	Assert_retr(ST_NONE, idx != 0);
-	return skill->dbs->db[idx].state;
+
+	return skill->dbs->db[idx].state[skill_get_lvl_idx(skill_lv)];
 }
 
 static int skill_get_spiritball(int skill_id, int skill_lv)
@@ -345,26 +369,140 @@ static int skill_get_spiritball(int skill_id, int skill_lv)
 	return skill->dbs->db[idx].spiritball[skill_get_lvl_idx(skill_lv)];
 }
 
+/**
+ * Gets a skill's required item's ID by the skill's ID and the item's index.
+ *
+ * @param skill_id The skill's ID.
+ * @param item_idx The item's index.
+ * @return The skill's required item's ID corresponding to the passed index. Defaults to 0 in case of error.
+ *
+ **/
 static int skill_get_itemid(int skill_id, int item_idx)
 {
-	int idx;
 	if (skill_id == 0)
 		return 0;
-	idx = skill->get_index(skill_id);
+
+	Assert_ret(item_idx >= 0 && item_idx < MAX_SKILL_ITEM_REQUIRE);
+
+	int idx = skill->get_index(skill_id);
+
 	Assert_ret(idx != 0);
+
+	return skill->dbs->db[idx].req_items.item[item_idx].id;
+}
+
+/**
+ * Gets a skill's required item's amount by the skill's ID and level and the item's index.
+ *
+ * @param skill_id The skill's ID.
+ * @param item_idx The item's index.
+ * @param skill_lv The skill's level.
+ * @return The skill's required item's amount corresponding to the passed index and level. Defaults to 0 in case of error.
+ *
+ **/
+static int skill_get_itemqty(int skill_id, int item_idx, int skill_lv)
+{
+	if (skill_id == 0)
+		return 0;
+
 	Assert_ret(item_idx >= 0 && item_idx < MAX_SKILL_ITEM_REQUIRE);
-	return skill->dbs->db[idx].itemid[item_idx];
+	Assert_ret(skill_lv > 0);
+
+	int idx = skill->get_index(skill_id);
+
+	Assert_ret(idx != 0);
+
+	return skill->dbs->db[idx].req_items.item[item_idx].amount[skill_get_lvl_idx(skill_lv)];
 }
 
-static int skill_get_itemqty(int skill_id, int item_idx)
+/**
+ * Gets a skill's required items any-flag by the skill's ID and level.
+ *
+ * @param skill_id The skill's ID.
+ * @param skill_lv The skill's level.
+ * @return The skill's required items any-flag corresponding to the passed level. Defaults to false in case of error.
+ *
+ **/
+static bool skill_get_item_any_flag(int skill_id, int skill_lv)
+{
+	if (skill_id == 0)
+		return false;
+
+	Assert_retr(false, skill_lv > 0);
+
+	int idx = skill->get_index(skill_id);
+
+	Assert_retr(false, idx != 0);
+
+	return skill->dbs->db[idx].req_items.any[skill_get_lvl_idx(skill_lv)];
+}
+
+/**
+ * Gets a skill's required equipment's ID by the skill's ID and the equipment item's index.
+ *
+ * @param skill_id The skill's ID.
+ * @param item_idx The equipment item's index.
+ * @return The skill's required equipment's ID corresponding to the passed index. Defaults to 0 in case of error.
+ *
+ **/
+static int skill_get_equip_id(int skill_id, int item_idx)
 {
-	int idx;
 	if (skill_id == 0)
 		return 0;
-	idx = skill->get_index(skill_id);
+
+	Assert_ret(item_idx >= 0 && item_idx < MAX_SKILL_ITEM_REQUIRE);
+
+	int idx = skill->get_index(skill_id);
+
 	Assert_ret(idx != 0);
+
+	return skill->dbs->db[idx].req_equip.item[item_idx].id;
+}
+
+/**
+ * Gets a skill's required equipment's amount by the skill's ID and level and the equipment item's index.
+ *
+ * @param skill_id The skill's ID.
+ * @param item_idx The equipment item's index.
+ * @param skill_lv The skill's level.
+ * @return The skill's required equipment item's amount corresponding to the passed index and level. Defaults to 0 in case of error.
+ *
+ **/
+static int skill_get_equip_amount(int skill_id, int item_idx, int skill_lv)
+{
+	if (skill_id == 0)
+		return 0;
+
 	Assert_ret(item_idx >= 0 && item_idx < MAX_SKILL_ITEM_REQUIRE);
-	return skill->dbs->db[idx].amount[item_idx];
+	Assert_ret(skill_lv > 0);
+
+	int idx = skill->get_index(skill_id);
+
+	Assert_ret(idx != 0);
+
+	return skill->dbs->db[idx].req_equip.item[item_idx].amount[skill_get_lvl_idx(skill_lv)];
+}
+
+/**
+ * Gets a skill's required equipment any-flag by the skill's ID and level.
+ *
+ * @param skill_id The skill's ID.
+ * @param skill_lv The skill's level.
+ * @return The skill's required equipment's any-flag corresponding to the passed level. Defaults to false in case of error.
+ *
+ **/
+static bool skill_get_equip_any_flag(int skill_id, int skill_lv)
+{
+	if (skill_id == 0)
+		return false;
+
+	Assert_retr(false, skill_lv > 0);
+
+	int idx = skill->get_index(skill_id);
+
+	Assert_retr(false, idx != 0);
+
+	return skill->dbs->db[idx].req_equip.any[skill_get_lvl_idx(skill_lv)];
 }
 
 static int skill_get_zeny(int skill_id, int skill_lv)
@@ -472,14 +610,26 @@ static int skill_get_time2(int skill_id, int skill_lv)
 	return skill->dbs->db[idx].upkeep_time2[skill_get_lvl_idx(skill_lv)];
 }
 
-static int skill_get_castdef(int skill_id)
+/**
+ * Gets a skill's cast defence rate by its ID and level.
+ *
+ * @param skill_id The skill's ID.
+ * @param skill_lv The skill's level.
+ * @return The skill's cast defence rate corresponding to the passed level. Defaults to 0 in case of error.
+ *
+ **/
+static int skill_get_castdef(int skill_id, int skill_lv)
 {
-	int idx;
 	if (skill_id == 0)
 		return 0;
-	idx = skill->get_index(skill_id);
+
+	Assert_ret(skill_lv > 0);
+
+	int idx = skill->get_index(skill_id);
+
 	Assert_ret(idx != 0);
-	return skill->dbs->db[idx].cast_def_rate;
+
+	return skill->dbs->db[idx].cast_def_rate[skill_get_lvl_idx(skill_lv)];
 }
 
 static int skill_get_weapontype(int skill_id)
@@ -527,14 +677,26 @@ static int skill_get_inf2(int skill_id)
 	return skill->dbs->db[idx].inf2;
 }
 
-static int skill_get_castcancel(int skill_id)
+/**
+ * Gets a skill's cast interruptibility by its ID and level.
+ *
+ * @param skill_id The skill's ID.
+ * @param skill_lv The skill's level.
+ * @return The skill's cast interruptibility corresponding to the passed level. Defaults to 0 in case of error.
+ *
+ **/
+static int skill_get_castcancel(int skill_id, int skill_lv)
 {
-	int idx;
 	if (skill_id == 0)
 		return 0;
-	idx = skill->get_index(skill_id);
+
+	Assert_ret(skill_lv > 0);
+
+	int idx = skill->get_index(skill_id);
+
 	Assert_ret(idx != 0);
-	return skill->dbs->db[idx].castcancel;
+
+	return skill->dbs->db[idx].castcancel[skill_get_lvl_idx(skill_lv)];
 }
 
 static int skill_get_maxcount(int skill_id, int skill_lv)
@@ -582,6 +744,28 @@ static int skill_get_mhp(int skill_id, int skill_lv)
 	return skill->dbs->db[idx].mhp[skill_get_lvl_idx(skill_lv)];
 }
 
+/**
+ * Gets a skill's maximum SP trigger by its ID and level.
+ *
+ * @param skill_id The skill's ID.
+ * @param skill_lv The skill's level.
+ * @return The skill's maximum SP trigger corresponding to the passed level. Defaults to 0 in case of error.
+ *
+ **/
+static int skill_get_msp(int skill_id, int skill_lv)
+{
+	if (skill_id == 0)
+		return 0;
+
+	Assert_ret(skill_lv > 0);
+
+	int idx = skill->get_index(skill_id);
+
+	Assert_ret(idx != 0);
+
+	return skill->dbs->db[idx].msp[skill_get_lvl_idx(skill_lv)];
+}
+
 static int skill_get_castnodex(int skill_id, int skill_lv)
 {
 	int idx;
@@ -612,35 +796,72 @@ static int skill_get_delaynodex(int skill_id, int skill_lv)
 	return skill->dbs->db[idx].delaynodex[skill_get_lvl_idx(skill_lv)];
 }
 
-static int skill_get_type(int skill_id)
+/**
+ * Gets a skill's attack type by its ID and level.
+ *
+ * @param skill_id The skill's ID.
+ * @param skill_lv The skill's level.
+ * @return The skill's attack type corresponding to the passed level. Defaults to BF_NONE (0) in case of error.
+ *
+ **/
+static int skill_get_type(int skill_id, int skill_lv)
 {
-	int idx;
 	if (skill_id == 0)
 		return BF_NONE;
-	idx = skill->get_index(skill_id);
+
+	Assert_retr(BF_NONE, skill_lv > 0);
+
+	int idx = skill->get_index(skill_id);
+
 	Assert_retr(BF_NONE, idx != 0);
-	return skill->dbs->db[idx].skill_type;
+
+	return skill->dbs->db[idx].skill_type[skill_get_lvl_idx(skill_lv)];
 }
 
-static int skill_get_unit_id(int skill_id, int flag)
+/**
+ * Gets a skill's unit ID by its ID and level.
+ *
+ * @param skill_id The skill's ID.
+ * @param skill_lv The skill's level.
+ * @param flag 
+ * @return The skill's unit ID corresponding to the passed level. Defaults to 0 in case of error.
+ *
+ **/
+static int skill_get_unit_id(int skill_id, int skill_lv, int flag)
 {
-	int idx;
 	if (skill_id == 0)
 		return 0;
-	idx = skill->get_index(skill_id);
+
+	Assert_ret(skill_lv > 0);
+	Assert_ret(flag >= 0 && flag < ARRAYLENGTH(skill->dbs->db[0].unit_id[0]));
+
+	int idx = skill->get_index(skill_id);
+
 	Assert_ret(idx != 0);
-	Assert_ret(flag >= 0 && flag < ARRAYLENGTH(skill->dbs->db[0].unit_id));
-	return skill->dbs->db[idx].unit_id[flag];
+
+	return skill->dbs->db[idx].unit_id[skill_get_lvl_idx(skill_lv)][flag];
 }
 
-static int skill_get_unit_interval(int skill_id)
+/**
+ * Gets a skill's unit interval by its ID and level.
+ *
+ * @param skill_id The skill's ID.
+ * @param skill_lv The skill's level.
+ * @return The skill's unit interval corresponding to the passed level. Defaults to 0 in case of error.
+ *
+ **/
+static int skill_get_unit_interval(int skill_id, int skill_lv)
 {
-	int idx;
 	if (skill_id == 0)
 		return 0;
-	idx = skill->get_index(skill_id);
+
+	Assert_ret(skill_lv > 0);
+
+	int idx = skill->get_index(skill_id);
+
 	Assert_ret(idx != 0);
-	return skill->dbs->db[idx].unit_interval;
+
+	return skill->dbs->db[idx].unit_interval[skill_get_lvl_idx(skill_lv)];
 }
 
 static int skill_get_unit_range(int skill_id, int skill_lv)
@@ -658,24 +879,48 @@ static int skill_get_unit_range(int skill_id, int skill_lv)
 	return skill->dbs->db[idx].unit_range[skill_get_lvl_idx(skill_lv)];
 }
 
-static int skill_get_unit_target(int skill_id)
+/**
+ * Gets a skill's unit target by its ID and level.
+ *
+ * @param skill_id The skill's ID.
+ * @param skill_lv The skill's level.
+ * @return The skill's unit target corresponding to the passed level. Defaults to BCT_NOONE (0) in case of error.
+ *
+ **/
+static int skill_get_unit_target(int skill_id, int skill_lv)
 {
-	int idx;
 	if (skill_id == 0)
 		return BCT_NOONE;
-	idx = skill->get_index(skill_id);
+
+	Assert_retr(BCT_NOONE, skill_lv > 0);
+
+	int idx = skill->get_index(skill_id);
+
 	Assert_retr(BCT_NOONE, idx != 0);
-	return skill->dbs->db[idx].unit_target & BCT_ALL;
+
+	return (skill->dbs->db[idx].unit_target[skill_get_lvl_idx(skill_lv)] & BCT_ALL);
 }
 
-static int skill_get_unit_bl_target(int skill_id)
+/**
+ * Gets a skill's unit target as bl type by its ID and level.
+ *
+ * @param skill_id The skill's ID.
+ * @param skill_lv The skill's level.
+ * @return The skill's unit target as bl type corresponding to the passed level. Defaults to BL_NUL (0) in case of error.
+ *
+ **/
+static int skill_get_unit_bl_target(int skill_id, int skill_lv)
 {
-	int idx;
 	if (skill_id == 0)
 		return BL_NUL;
-	idx = skill->get_index(skill_id);
-	Assert_retr(BL_NUL, idx != 0);
-	return skill->dbs->db[idx].unit_target & BL_ALL;
+
+	Assert_retr(BCT_NOONE, skill_lv > 0);
+
+	int idx = skill->get_index(skill_id);
+
+	Assert_retr(BCT_NOONE, idx != 0);
+
+	return (skill->dbs->db[idx].unit_target[skill_get_lvl_idx(skill_lv)] & BL_ALL);
 }
 
 static int skill_get_unit_flag(int skill_id)
@@ -1029,14 +1274,14 @@ static int skillnotok(uint16 skill_id, struct map_session_data *sd)
 	if (map->getcell(sd->bl.m, &sd->bl, sd->bl.x, sd->bl.y, CELL_CHKNOSKILL))
 		return 1; // block usage on 'noskill' cells [Wolfie]
 
-	if (skill_id == AL_TELEPORT && sd->autocast.type == AUTOCAST_ITEM && sd->autocast.skill_lv > 2)
+	if (skill_id == AL_TELEPORT && sd->auto_cast_current.type == AUTOCAST_ITEM && sd->auto_cast_current.skill_lv > 2)
 		return 0; // Teleport level 3 and higher bypasses this check if cast by itemskill() script commands.
 
 	// Epoque:
 	// This code will compare the player's attack motion value which is influenced by ASPD before
 	// allowing a skill to be cast. This is to prevent no-delay ACT files from spamming skills such as
 	// AC_DOUBLE which do not have a skill delay and are not regarded in terms of attack motion.
-	if (sd->autocast.type == AUTOCAST_NONE && sd->canskill_tick != 0 &&
+	if (sd->auto_cast_current.type == AUTOCAST_NONE && sd->canskill_tick != 0 &&
 		DIFF_TICK(timer->gettick(), sd->canskill_tick) < (sd->battle_status.amotion * (battle_config.skill_amotion_leniency) / 100) )
 	{// attempted to cast a skill before the attack motion has finished
 		return 1;
@@ -1051,7 +1296,7 @@ static int skillnotok(uint16 skill_id, struct map_session_data *sd)
 	 * It has been confirmed on a official server (thanks to Yommy) that item-cast skills bypass all the restrictions below
 	 * Also, without this check, an exploit where an item casting + healing (or any other kind buff) isn't deleted after used on a restricted map
 	 **/
-	if (sd->autocast.type == AUTOCAST_ITEM)
+	if (sd->auto_cast_current.type == AUTOCAST_ITEM)
 		return 0;
 
 	if( sd->sc.data[SC_ALL_RIDING] )
@@ -1211,14 +1456,16 @@ static void skill_validate_autocast_data(struct map_session_data *sd, int skill_
 	// Determine if called by clif_parse_UseSkillMap().
 	bool use_skill_map = (skill_lv == 0 && (skill_id == AL_WARP || skill_id == AL_TELEPORT));
 
-	if (sd->autocast.type == AUTOCAST_NONE)
+	struct autocast_data *auto_cast = &sd->auto_cast_current;
+
+	if (auto_cast->type == AUTOCAST_NONE)
 		pc->autocast_clear(sd); // No auto-cast type set. Preventively unset all auto-cast related data.
-	else if (sd->autocast.type == AUTOCAST_TEMP)
+	else if (auto_cast->type == AUTOCAST_TEMP)
 		pc->autocast_clear(sd); // AUTOCAST_TEMP should have been unset straight after usage.
-	else if (sd->autocast.skill_id == 0 || skill_id == 0 || sd->autocast.skill_id != skill_id)
-		pc->autocast_clear(sd); // Implausible skill ID.
-	else if (sd->autocast.skill_lv == 0 || (!use_skill_map && (skill_lv == 0 || sd->autocast.skill_lv != skill_lv)))
-		pc->autocast_clear(sd); // Implausible skill level.
+	else if (auto_cast->skill_id == 0 || skill_id == 0 || auto_cast->skill_id != skill_id)
+		pc->autocast_remove(sd, auto_cast->type, auto_cast->skill_id, auto_cast->skill_lv); // Implausible skill ID.
+	else if (auto_cast->skill_lv == 0 || (!use_skill_map && (skill_lv == 0 || auto_cast->skill_lv != skill_lv)))
+		pc->autocast_remove(sd, auto_cast->type, auto_cast->skill_id, auto_cast->skill_lv); // Implausible skill level.
 }
 
 static struct s_skill_unit_layout *skill_get_unit_layout(uint16 skill_id, uint16 skill_lv, struct block_list *src, int x, int y)
@@ -2109,9 +2356,9 @@ static int skill_additional_effect(struct block_list *src, struct block_list *bl
 
 			temp = (sd->autospell[i].id > 0) ? sd->autospell[i].id : -sd->autospell[i].id;
 
-			sd->autocast.type = AUTOCAST_TEMP;
+			sd->auto_cast_current.type = AUTOCAST_TEMP;
 			notok = skill->not_ok(temp, sd);
-			sd->autocast.type = AUTOCAST_NONE;
+			sd->auto_cast_current.type = AUTOCAST_NONE;
 
 			if ( notok )
 				continue;
@@ -2162,11 +2409,11 @@ static int skill_additional_effect(struct block_list *src, struct block_list *bl
 			else if (temp == PF_SPIDERWEB) //Special case, due to its nature of coding.
 				type = CAST_GROUND;
 
-			sd->autocast.type = AUTOCAST_TEMP;
+			sd->auto_cast_current.type = AUTOCAST_TEMP;
 			skill->consume_requirement(sd,temp,auto_skill_lv,1);
-			skill->toggle_magicpower(src, temp);
+			skill->toggle_magicpower(src, temp, auto_skill_lv);
 			skill->castend_type(type, src, tbl, temp, auto_skill_lv, tick, 0);
-			sd->autocast.type = AUTOCAST_NONE;
+			sd->auto_cast_current.type = AUTOCAST_NONE;
 
 			//Set canact delay. [Skotlex]
 			ud = unit->bl2ud(src);
@@ -2237,7 +2484,7 @@ static int skill_onskillusage(struct map_session_data *sd, struct block_list *bl
 		return 0;
 
 	// Preserve auto-cast type if bAutoSpellOnSkill was triggered by a skill which was cast by Abracadabra, Improvised Song or an item.
-	enum autocast_type ac_type = sd->autocast.type;
+	enum autocast_type ac_type = sd->auto_cast_current.type;
 
 	for( i = 0; i < ARRAYLENGTH(sd->autospell3) && sd->autospell3[i].flag; i++ ) {
 		if( sd->autospell3[i].flag != skill_id )
@@ -2248,9 +2495,9 @@ static int skill_onskillusage(struct map_session_data *sd, struct block_list *bl
 
 		temp = (sd->autospell3[i].id > 0) ? sd->autospell3[i].id : -sd->autospell3[i].id;
 
-		sd->autocast.type = AUTOCAST_TEMP;
+		sd->auto_cast_current.type = AUTOCAST_TEMP;
 		notok = skill->not_ok(temp, sd);
-		sd->autocast.type = AUTOCAST_NONE;
+		sd->auto_cast_current.type = AUTOCAST_NONE;
 
 		if ( notok )
 			continue;
@@ -2297,14 +2544,14 @@ static int skill_onskillusage(struct map_session_data *sd, struct block_list *bl
 			continue;
 
 		sd->autospell3[i].lock = true;
-		sd->autocast.type = AUTOCAST_TEMP;
+		sd->auto_cast_current.type = AUTOCAST_TEMP;
 		skill->consume_requirement(sd,temp,skill_lv,1);
 		skill->castend_type(type, &sd->bl, tbl, temp, skill_lv, tick, 0);
-		sd->autocast.type = AUTOCAST_NONE;
+		sd->auto_cast_current.type = AUTOCAST_NONE;
 		sd->autospell3[i].lock = false;
 	}
 
-	sd->autocast.type = ac_type;
+	sd->auto_cast_current.type = ac_type;
 
 	if (sd->autobonus3[0].rate) {
 		for( i = 0; i < ARRAYLENGTH(sd->autobonus3); i++ ) {
@@ -2453,7 +2700,7 @@ static int skill_counter_additional_effect(struct block_list *src, struct block_
 		int i, auto_skill_id, auto_skill_lv, type, notok;
 
 		// Preserve auto-cast type if bAutoSpellWhenHit was triggered during cast of a skill which was cast by Abracadabra, Improvised Song or an item.
-		enum autocast_type ac_type = dstsd->autocast.type;
+		enum autocast_type ac_type = dstsd->auto_cast_current.type;
 
 		for (i = 0; i < ARRAYLENGTH(dstsd->autospell2) && dstsd->autospell2[i].id; i++) {
 
@@ -2470,9 +2717,9 @@ static int skill_counter_additional_effect(struct block_list *src, struct block_
 			if (attack_type&BF_LONG)
 				 rate>>=1;
 
-			dstsd->autocast.type = AUTOCAST_TEMP;
+			dstsd->auto_cast_current.type = AUTOCAST_TEMP;
 			notok = skill->not_ok(auto_skill_id, dstsd);
-			dstsd->autocast.type = AUTOCAST_NONE;
+			dstsd->auto_cast_current.type = AUTOCAST_NONE;
 
 			if ( notok )
 				continue;
@@ -2513,10 +2760,10 @@ static int skill_counter_additional_effect(struct block_list *src, struct block_
 			if( !battle->check_range(src, tbl, skill->get_range2(src, auto_skill_id,auto_skill_lv) + (auto_skill_id == RG_CLOSECONFINE?0:1)) && battle_config.autospell_check_range )
 				continue;
 
-			dstsd->autocast.type = AUTOCAST_TEMP;
+			dstsd->auto_cast_current.type = AUTOCAST_TEMP;
 			skill->consume_requirement(dstsd,auto_skill_id,auto_skill_lv,1);
 			skill->castend_type(type, bl, tbl, auto_skill_id, auto_skill_lv, tick, 0);
-			dstsd->autocast.type = AUTOCAST_NONE;
+			dstsd->auto_cast_current.type = AUTOCAST_NONE;
 
 			// Set canact delay. [Skotlex]
 			ud = unit->bl2ud(bl);
@@ -2530,7 +2777,7 @@ static int skill_counter_additional_effect(struct block_list *src, struct block_
 			}
 		}
 
-		dstsd->autocast.type = ac_type;
+		dstsd->auto_cast_current.type = ac_type;
 	}
 
 	//Autobonus when attacked
@@ -2991,7 +3238,7 @@ static int skill_attack(int attack_type, struct block_list *src, struct block_li
 	}
 
 	//Skill hit type
-	type=(skill_id==0)?BDT_SPLASH:skill->get_hit(skill_id);
+	type = (skill_id == 0) ? BDT_SPLASH : skill->get_hit(skill_id, skill_lv);
 
 	if(damage < dmg.div_
 		//Only skills that knockback even when they miss. [Skotlex]
@@ -3771,9 +4018,9 @@ static int skill_check_condition_mercenary(struct block_list *bl, int skill_id,
 {
 	struct status_data *st;
 	struct map_session_data *sd = NULL;
-	int i, hp, sp, hp_rate, sp_rate, state, mhp;
+	int hp, sp, hp_rate, sp_rate, state;
 	int idx;
-	int itemid[MAX_SKILL_ITEM_REQUIRE], amount[MAX_SKILL_ITEM_REQUIRE], index[MAX_SKILL_ITEM_REQUIRE];
+	int itemid[MAX_SKILL_ITEM_REQUIRE], amount[MAX_SKILL_ITEM_REQUIRE];
 
 	if( lv < 1 || lv > MAX_SKILL_LEVEL )
 		return 0;
@@ -3789,17 +4036,16 @@ static int skill_check_condition_mercenary(struct block_list *bl, int skill_id,
 		return 0;
 
 	// Requirements
-	for (i = 0; i < MAX_SKILL_ITEM_REQUIRE; i++) {
-		itemid[i] = skill->dbs->db[idx].itemid[i];
-		amount[i] = skill->dbs->db[idx].amount[i];
+	for (int i = 0; i < MAX_SKILL_ITEM_REQUIRE; i++) {
+		itemid[i] = skill->get_itemid(skill_id, i);
+		amount[i] = skill->get_itemqty(skill_id, i, lv);
 	}
 	hp = skill->dbs->db[idx].hp[lv-1];
 	sp = skill->dbs->db[idx].sp[lv-1];
 	hp_rate = skill->dbs->db[idx].hp_rate[lv-1];
 	sp_rate = skill->dbs->db[idx].sp_rate[lv-1];
-	state = skill->dbs->db[idx].state;
-	if( (mhp = skill->dbs->db[idx].mhp[lv-1]) > 0 )
-		hp += (st->max_hp * mhp) / 100;
+	state = skill->dbs->db[idx].state[lv - 1];
+
 	if( hp_rate > 0 )
 		hp += (st->hp * hp_rate) / 100;
 	else
@@ -3832,6 +4078,20 @@ static int skill_check_condition_mercenary(struct block_list *bl, int skill_id,
 			clif->skill_fail(sd, skill_id, USESKILL_FAIL_SP_INSUFFICIENT, 0, 0);
 			return 0;
 		}
+
+		int mhp = skill->get_mhp(skill_id, lv);
+
+		if (mhp > 0 && get_percentage(st->hp, st->max_hp) > mhp) {
+			clif->skill_fail(sd, skill_id, USESKILL_FAIL_HP_INSUFFICIENT, 0, 0);
+			return 0;
+		}
+
+		int msp = skill->get_msp(skill_id, lv);
+
+		if (msp > 0 && get_percentage(st->sp, st->max_sp) > msp) {
+			clif->skill_fail(sd, skill_id, USESKILL_FAIL_SP_INSUFFICIENT, 0, 0);
+			return 0;
+		}
 	}
 
 	if( !type )
@@ -3846,23 +4106,32 @@ static int skill_check_condition_mercenary(struct block_list *bl, int skill_id,
 	if( !(type&1) )
 		return 1;
 
-	// Check item existences
-	for (i = 0; i < ARRAYLENGTH(itemid); i++) {
-		index[i] = INDEX_NOT_FOUND;
-		if (itemid[i] < 1) continue; // No item
-		index[i] = pc->search_inventory(sd, itemid[i]);
-		if (index[i] == INDEX_NOT_FOUND || sd->status.inventory[index[i]].amount < amount[i]) {
-			clif->skill_fail(sd, skill_id, USESKILL_FAIL_NEED_ITEM, amount[i], itemid[i]);
-			return 0;
-		}
-	}
+	bool items_required = skill->items_required(sd, skill_id, lv);
+
+	if (items_required && skill->check_condition_required_items(sd, skill_id, lv) != 0)
+		return 0;
+
+	int any_item_index = INDEX_NOT_FOUND;
+
+	if (items_required)
+		any_item_index = skill->get_any_item_index(sd, skill_id, lv);
+
+	for (int i = 0; i < MAX_SKILL_ITEM_REQUIRE && items_required; i++) {
+		if (itemid[i] == 0)
+			continue;
 
-	// Consume items
-	for (i = 0; i < ARRAYLENGTH(itemid); i++) {
-		if (index[i] != INDEX_NOT_FOUND)
-			pc->delitem(sd, index[i], amount[i], 0, DELITEM_SKILLUSE, LOG_TYPE_CONSUME);
+		if (any_item_index != INDEX_NOT_FOUND && any_item_index != i)
+			continue;
+
+		int inventory_index = pc->search_inventory(sd, itemid[i]);
+
+		if (inventory_index != INDEX_NOT_FOUND)
+			pc->delitem(sd, inventory_index, amount[i], 0, DELITEM_SKILLUSE, LOG_TYPE_CONSUME);
 	}
 
+	if (skill->check_condition_required_equip(sd, skill_id, lv) != 0)
+		return 0;
+
 	if( type&2 )
 		return 1;
 
@@ -3950,7 +4219,7 @@ static int skill_timerskill(int tid, int64 tick, int id, intptr_t data)
 					clif->skill_nodamage(src,target,skl->skill_id,skl->skill_lv,1);
 					break;
 				case WZ_WATERBALL:
-					skill->toggle_magicpower(src, skl->skill_id); // only the first hit will be amplify
+					skill->toggle_magicpower(src, skl->skill_id, skl->skill_lv); // only the first hit will be amplify
 					if (!status->isdead(target))
 						skill->attack(BF_MAGIC,src,src,target,skl->skill_id,skl->skill_lv,tick,skl->flag);
 					if (skl->type>1 && !status->isdead(target) && !status->isdead(src)) {
@@ -3970,7 +4239,7 @@ static int skill_timerskill(int tid, int64 tick, int id, intptr_t data)
 				 **/
 				case WL_CHAINLIGHTNING_ATK:
 					skill->attack(BF_MAGIC, src, src, target, skl->skill_id, skl->skill_lv, tick, (9-skl->type)); // Hit a Lightning on the current Target
-					skill->toggle_magicpower(src, skl->skill_id); // only the first hit will be amplify
+					skill->toggle_magicpower(src, skl->skill_id, skl->skill_lv); // only the first hit will be amplify
 
 					if (skl->type < (4 + skl->skill_lv - 1) && skl->x < 3) {
 						// Remaining Chains Hit
@@ -3990,7 +4259,7 @@ static int skill_timerskill(int tid, int64 tick, int id, intptr_t data)
 				case WL_TETRAVORTEX_GROUND:
 					clif->skill_nodamage(src, target, skl->skill_id, skl->skill_lv, 1);
 					skill->attack(BF_MAGIC, src, src, target, skl->skill_id, skl->skill_lv, tick, skl->flag);
-					skill->toggle_magicpower(src, skl->skill_id); // only the first hit will be amplify
+					skill->toggle_magicpower(src, skl->skill_id, skl->skill_lv); // only the first hit will be amplify
 					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;
@@ -3999,7 +4268,7 @@ static int skill_timerskill(int tid, int64 tick, int id, intptr_t data)
 					break;
 				case WM_REVERBERATION_MELEE:
 				case WM_REVERBERATION_MAGIC:
-					skill->attack(skill->get_type(skl->skill_id),src, src, target, skl->skill_id, skl->skill_lv, 0, SD_LEVEL);
+					skill->attack(skill->get_type(skl->skill_id, skl->skill_lv), src, src, target, skl->skill_id, skl->skill_lv, 0, SD_LEVEL);
 					break;
 				case SC_FATALMENACE:
 					if( src == target ) // Casters Part
@@ -4104,7 +4373,7 @@ static int skill_timerskill(int tid, int64 tick, int id, intptr_t data)
 				case LG_OVERBRAND_BRANDISH:
 					skill->area_temp[1] = 0;
 					map->foreachinpath(skill->attack_area,src->m,src->x,src->y,skl->x,skl->y,4,2,BL_CHAR,
-						skill->get_type(skl->skill_id),src,src,skl->skill_id,skl->skill_lv,tick,skl->flag,BCT_ENEMY);
+						skill->get_type(skl->skill_id, skl->skill_lv), src, src, skl->skill_id, skl->skill_lv, tick, skl->flag, BCT_ENEMY);
 					break;
 				default:
 					skill->timerskill_notarget_unknown(tid, tick, src, ud, skl);
@@ -4281,12 +4550,12 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 	if (status->isdead(bl))
 		return 1;
 
-	if (skill_id && skill->get_type(skill_id) == BF_MAGIC && status->isimmune(bl) == 100) {
+	if (skill_id != 0 && skill->get_type(skill_id, skill_lv) == BF_MAGIC && status->isimmune(bl) == 100) {
 		//GTB makes all targeted magic display miss with a single bolt.
 		sc_type sct = status->skill2sc(skill_id);
 		if(sct != SC_NONE)
 			status_change_end(bl, sct, INVALID_TIMER);
-		clif->skill_damage(src, bl, tick, status_get_amotion(src), status_get_dmotion(bl), 0, 1, skill_id, skill_lv, skill->get_hit(skill_id));
+		clif->skill_damage(src, bl, tick, status_get_amotion(src), status_get_dmotion(bl), 0, 1, skill_id, skill_lv, skill->get_hit(skill_id, skill_lv));
 		return 1;
 	}
 
@@ -4494,7 +4763,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 			skill->area_temp[1] = bl->id;
 			map->foreachinpath(skill->attack_area,src->m,src->x,src->y,bl->x,bl->y,
 			                   skill->get_splash(skill_id, skill_lv),skill->get_maxcount(skill_id,skill_lv), skill->splash_target(src),
-			                   skill->get_type(skill_id),src,src,skill_id,skill_lv,tick,flag,BCT_ENEMY);
+			                   skill->get_type(skill_id, skill_lv), src, src, skill_id, skill_lv, tick, flag, BCT_ENEMY);
 			break;
 
 		case NPC_ACIDBREATH:
@@ -4505,7 +4774,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 			skill->area_temp[1] = bl->id;
 			map->foreachinpath(skill->attack_area,src->m,src->x,src->y,bl->x,bl->y,
 			                   skill->get_splash(skill_id, skill_lv),skill->get_maxcount(skill_id,skill_lv), skill->splash_target(src),
-			                   skill->get_type(skill_id),src,src,skill_id,skill_lv,tick,flag,BCT_ENEMY);
+			                   skill->get_type(skill_id, skill_lv), src, src, skill_id, skill_lv, tick, flag, BCT_ENEMY);
 			break;
 
 		case MO_INVESTIGATE:
@@ -4677,7 +4946,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 				if ( tsc && tsc->data[SC_HOVERING] && ( skill_id == SR_WINDMILL || skill_id == LG_MOONSLASHER ) )
 					break;
 
-				heal = skill->attack(skill->get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, sflag);
+				heal = skill->attack(skill->get_type(skill_id, skill_lv), src, src, bl, skill_id, skill_lv, tick, sflag);
 				if (skill_id == NPC_VAMPIRE_GIFT && heal > 0) {
 					clif->skill_nodamage(NULL, src, AL_HEAL, heal, 1);
 					status->heal(src, heal, 0, STATUS_HEAL_DEFAULT);
@@ -4752,7 +5021,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 		case MS_MAGNUM:
 			if( flag&1 ) {
 				//Damage depends on distance, so add it to flag if it is > 1
-				skill->attack(skill->get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, flag|SD_ANIMATION|distance_bl(src, bl));
+				skill->attack(skill->get_type(skill_id, skill_lv), src, src, bl, skill_id, skill_lv, tick, flag|SD_ANIMATION|distance_bl(src, bl));
 			}
 			break;
 
@@ -4760,9 +5029,9 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 		case ML_BRANDISH:
 			//Coded apart for it needs the flag passed to the damage calculation.
 			if (skill->area_temp[1] != bl->id)
-				skill->attack(skill->get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, flag|SD_ANIMATION);
+				skill->attack(skill->get_type(skill_id, skill_lv), src, src, bl, skill_id, skill_lv, tick, flag|SD_ANIMATION);
 			else
-				skill->attack(skill->get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, flag);
+				skill->attack(skill->get_type(skill_id, skill_lv), src, src, bl, skill_id, skill_lv, tick, flag);
 			break;
 
 		case KN_BOWLINGBASH:
@@ -5157,7 +5426,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 			break;
 		case WL_DRAINLIFE:
 		{
-			int heal = skill->attack(skill->get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, flag);
+			int heal = skill->attack(skill->get_type(skill_id, skill_lv), src, src, bl, skill_id, skill_lv, tick, flag);
 			int rate = 70 + 5 * skill_lv;
 
 			heal = heal * (5 + 5 * skill_lv) / 100;
@@ -5203,7 +5472,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 			if (sd) {
 				int i;
 				clif->skill_nodamage(src, bl, skill_id, skill_lv, 1);
-				skill->toggle_magicpower(src, skill_id);
+				skill->toggle_magicpower(src, skill_id, skill_lv);
 				// Priority is to release SpellBook
 				if (sc && sc->data[SC_READING_SB]) {
 					// SpellBook
@@ -5447,7 +5716,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 		{
 			struct status_change *tsc = status->get_sc(bl);
 			if( tsc && tsc->data[SC_POISON] ) {
-				skill->attack(skill->get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, flag);
+				skill->attack(skill->get_type(skill_id, skill_lv), src, src, bl, skill_id, skill_lv, tick, flag);
 				status_change_end(bl, SC_POISON, INVALID_TIMER);
 			} else if( sd )
 				clif->skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0, 0);
@@ -5469,7 +5738,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 		case EL_HURRICANE:
 		case EL_TYPOON_MIS:
 			if( flag&1 )
-				skill->attack(skill->get_type(skill_id+1),src,src,bl,skill_id+1,skill_lv,tick,flag);
+				skill->attack(skill->get_type(skill_id + 1, skill_lv), src, src, bl, skill_id + 1, skill_lv, tick, flag);
 			else {
 				int i = skill->get_splash(skill_id,skill_lv);
 				clif->skill_nodamage(src,battle->get_master(src),skill_id,skill_lv,1);
@@ -5477,7 +5746,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 				if( rnd()%100 < 30 )
 					map->foreachinrange(skill->area_sub,bl,i,BL_CHAR,src,skill_id,skill_lv,tick,flag|BCT_ENEMY|1,skill->castend_damage_id);
 				else
-					skill->attack(skill->get_type(skill_id),src,src,bl,skill_id,skill_lv,tick,flag);
+					skill->attack(skill->get_type(skill_id, skill_lv), src, src, bl, skill_id, skill_lv, tick, flag);
 			}
 			break;
 
@@ -5492,7 +5761,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 
 		case EL_STONE_RAIN:
 			if( flag&1 )
-				skill->attack(skill->get_type(skill_id),src,src,bl,skill_id,skill_lv,tick,flag);
+				skill->attack(skill->get_type(skill_id, skill_lv), src, src, bl, skill_id, skill_lv, tick, flag);
 			else {
 				int i = skill->get_splash(skill_id,skill_lv);
 				clif->skill_nodamage(src,battle->get_master(src),skill_id,skill_lv,1);
@@ -5500,7 +5769,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 				if( rnd()%100 < 30 )
 					map->foreachinrange(skill->area_sub,bl,i,BL_CHAR,src,skill_id,skill_lv,tick,flag|BCT_ENEMY|1,skill->castend_damage_id);
 				else
-					skill->attack(skill->get_type(skill_id),src,src,bl,skill_id,skill_lv,tick,flag);
+					skill->attack(skill->get_type(skill_id, skill_lv), src, src, bl, skill_id, skill_lv, tick, flag);
 			}
 			break;
 
@@ -5510,7 +5779,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 		case EL_STONE_HAMMER:
 			clif->skill_nodamage(src,battle->get_master(src),skill_id,skill_lv,1);
 			clif->skill_damage(src, bl, tick, status_get_amotion(src), 0, -30000, 1, skill_id, skill_lv, BDT_SKILL);
-			skill->attack(skill->get_type(skill_id),src,src,bl,skill_id,skill_lv,tick,flag);
+			skill->attack(skill->get_type(skill_id, skill_lv), src, src, bl, skill_id, skill_lv, tick, flag);
 			break;
 
 		case EL_TIDAL_WEAPON:
@@ -5527,7 +5796,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 					elemental->clean_single_effect(ele, skill_id);
 				}
 				if( rnd()%100 < 50 )
-					skill->attack(skill->get_type(skill_id),src,src,bl,skill_id,skill_lv,tick,flag);
+					skill->attack(skill->get_type(skill_id, skill_lv), src, src, bl, skill_id, skill_lv, tick, flag);
 				else {
 					sc_start(src, src,type2,100,skill_lv,skill->get_time(skill_id,skill_lv));
 					sc_start(src, battle->get_master(src),type,100,ele->bl.id,skill->get_time(skill_id,skill_lv));
@@ -5540,7 +5809,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 		case MH_MAGMA_FLOW:
 		case MH_HEILIGE_STANGE:
 			if(flag & 1)
-				skill->attack(skill->get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, flag);
+				skill->attack(skill->get_type(skill_id, skill_lv), src, src, bl, skill_id, skill_lv, tick, flag);
 			else {
 				map->foreachinrange(skill->area_sub, bl, skill->get_splash(skill_id, skill_lv), skill->splash_target(src), src, skill_id, skill_lv, tick, flag | BCT_ENEMY | SD_SPLASH | 1, skill->castend_damage_id);
 			}
@@ -5564,7 +5833,7 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl
 			break;
 
 		case SU_SV_STEMSPEAR:
-			skill->attack(skill->get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, flag);
+			skill->attack(skill->get_type(skill_id, skill_lv), src, src, bl, skill_id, skill_lv, tick, flag);
 			if (status->get_lv(src) >= 30 && (rnd() % 100 < (int)(status->get_lv(src) / 30) + 10)) // TODO: Need activation chance.
 				skill->addtimerskill(src, tick + skill->get_delay(skill_id, skill_lv), bl->id, 0, 0, skill_id, skill_lv, (skill_id == SU_SV_STEMSPEAR) ? BF_MAGIC : BF_WEAPON, flag);
 			break;
@@ -5624,7 +5893,7 @@ static bool skill_castend_damage_id_unknown(struct block_list *src, struct block
 	ShowWarning("skill_castend_damage_id: Unknown skill used:%d\n", *skill_id);
 	clif->skill_damage(src, bl, *tick, status_get_amotion(src), tstatus->dmotion,
 		0, abs(skill->get_num(*skill_id, *skill_lv)),
-		*skill_id, *skill_lv, skill->get_hit(*skill_id));
+		*skill_id, *skill_lv, skill->get_hit(*skill_id, *skill_lv));
 	map->freeblock_unlock();
 	return true;
 }
@@ -5843,7 +6112,7 @@ static int skill_castend_id(int tid, int64 tick, int id, intptr_t data)
 		if (ud->walktimer != INVALID_TIMER && ud->skill_id != TK_RUN && ud->skill_id != RA_WUGDASH)
 			unit->stop_walking(src, STOPWALKING_FLAG_FIXPOS);
 
-		if (sd == NULL || sd->autocast.skill_id != ud->skill_id || skill->get_delay(ud->skill_id,ud->skill_lv) != 0)
+		if (sd == NULL || sd->auto_cast_current.skill_id != ud->skill_id || skill->get_delay(ud->skill_id, ud->skill_lv) != 0)
 			ud->canact_tick = tick + skill->delay_fix(src, ud->skill_id, ud->skill_lv); // Tests show wings don't overwrite the delay but skill scrolls do. [Inkfish]
 		if (sd) { // Cooldown application
 			int i, cooldown = skill->get_cooldown(ud->skill_id, ud->skill_lv);
@@ -5876,7 +6145,7 @@ static int skill_castend_id(int tid, int64 tick, int id, intptr_t data)
 				break;
 			}
 		}
-		if (skill->get_state(ud->skill_id) != ST_MOVE_ENABLE)
+		if (skill->get_state(ud->skill_id, ud->skill_lv) != ST_MOVE_ENABLE)
 			unit->set_walkdelay(src, tick, battle_config.default_walk_delay+skill->get_walkdelay(ud->skill_id, ud->skill_lv), 1);
 
 		if(battle_config.skill_log && battle_config.skill_log&src->type)
@@ -5886,7 +6155,7 @@ static int skill_castend_id(int tid, int64 tick, int id, intptr_t data)
 		map->freeblock_lock();
 
 		// SC_MAGICPOWER needs to switch states before any damage is actually dealt
-		skill->toggle_magicpower(src, ud->skill_id);
+		skill->toggle_magicpower(src, ud->skill_id, ud->skill_lv);
 
 #if 0 // On aegis damage skills are also increase by camouflage. Need confirmation on kRO.
 		if( ud->skill_id != RA_CAMOUFLAGE ) // only normal attack and auto cast skills benefit from its bonuses
@@ -5911,8 +6180,10 @@ static int skill_castend_id(int tid, int64 tick, int id, intptr_t data)
 				skill->blockpc_start(sd,BD_ADAPTATION,3000);
 		}
 
-		if( sd && ud->skill_id != SA_ABRACADABRA && ud->skill_id != WM_RANDOMIZESPELL ) // they just set the data so leave it as it is.[Inkfish]
-			pc->autocast_clear(sd);
+		if (sd != NULL && ud->skill_id != SA_ABRACADABRA && ud->skill_id != WM_RANDOMIZESPELL
+		    && ud->skill_id == sd->auto_cast_current.skill_id) { // they just set the data so leave it as it is.[Inkfish]
+			pc->autocast_remove(sd, sd->auto_cast_current.type, ud->skill_id, ud->skill_lv);
+		}
 
 		if (ud->skilltimer == INVALID_TIMER) {
 			if(md) md->skill_idx = -1;
@@ -5961,16 +6232,20 @@ static int skill_castend_id(int tid, int64 tick, int id, intptr_t data)
 		}
 	}
 
-	if (sd == NULL || sd->autocast.skill_id != ud->skill_id || skill->get_delay(ud->skill_id,ud->skill_lv) != 0)
+	if (sd == NULL || sd->auto_cast_current.skill_id != ud->skill_id || skill->get_delay(ud->skill_id, ud->skill_lv) != 0)
 		ud->canact_tick = tick;
-	ud->skill_id = ud->skill_lv = ud->skilltarget = 0;
 	//You can't place a skill failed packet here because it would be
 	//sent in ALL cases, even cases where skill_check_condition fails
 	//which would lead to double 'skill failed' messages u.u [Skotlex]
-	if(sd)
-		pc->autocast_clear(sd);
+	if (sd != NULL && ud->skill_id == sd->auto_cast_current.skill_id)
+		pc->autocast_remove(sd, sd->auto_cast_current.type, ud->skill_id, ud->skill_lv);
 	else if(md)
 		md->skill_idx = -1;
+
+	ud->skill_id = 0;
+	ud->skill_lv = 0;
+	ud->skilltarget = 0;
+
 	return 0;
 }
 
@@ -6152,7 +6427,7 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list *
 			if (skill->castend_nodamage_id_undead_unknown(src, bl, &skill_id, &skill_lv, &tick, &flag))
 			{
 				//Skill is actually ground placed.
-				if (src == bl && skill->get_unit_id(skill_id,0))
+				if (src == bl && skill->get_unit_id(skill_id, skill_lv, 0) != 0)
 					return skill->castend_pos2(src,bl->x,bl->y,skill_id,skill_lv,tick,0);
 			}
 			break;
@@ -6350,9 +6625,12 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list *
 
 				if (sd) {
 					// player-casted
-					sd->autocast.type = AUTOCAST_ABRA;
-					sd->autocast.skill_id = abra_skill_id;
-					sd->autocast.skill_lv = abra_skill_lv;
+					pc->autocast_clear(sd);
+					sd->auto_cast_current.type = AUTOCAST_ABRA;
+					sd->auto_cast_current.skill_id = abra_skill_id;
+					sd->auto_cast_current.skill_lv = abra_skill_lv;
+					VECTOR_ENSURE(sd->auto_cast, 1, 1);
+					VECTOR_PUSH(sd->auto_cast, sd->auto_cast_current);
 					clif->item_skill(sd, abra_skill_id, abra_skill_lv);
 				} else {
 					// mob-casted
@@ -7481,7 +7759,7 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list *
 					map->freeblock_unlock();
 					return 1;
 				}
-				if (sd->autocast.type == AUTOCAST_NONE)
+				if (sd->auto_cast_current.type == AUTOCAST_NONE)
 					status_zap(src, 0, skill->get_sp(skill_id, skill_lv)); // consume sp only if succeeded
 			}
 			break;
@@ -7518,7 +7796,7 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list *
 					break;
 				}
 
-				if (sd->autocast.type == AUTOCAST_TEMP || ((sd->autocast.skill_id == AL_TELEPORT || battle_config.skip_teleport_lv1_menu) && skill_lv == 1) || skill_lv == 3)
+				if (sd->auto_cast_current.type == AUTOCAST_TEMP || ((sd->auto_cast_current.skill_id == AL_TELEPORT || battle_config.skip_teleport_lv1_menu) && skill_lv == 1) || skill_lv == 3)
 				{
 					if( skill_lv == 1 )
 						pc->randomwarp(sd,CLR_TELEPORT);
@@ -7667,7 +7945,7 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list *
 						map->freeblock_unlock();
 						return 1;
 					}
-					if (sd->inventory_data[inventory_idx] == NULL || sd->status.inventory[inventory_idx].amount < skill->get_itemqty(skill_id, item_idx)) {
+					if (sd->inventory_data[inventory_idx] == NULL || sd->status.inventory[inventory_idx].amount < skill->get_itemqty(skill_id, item_idx, skill_lv)) {
 						clif->skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0, 0);
 						map->freeblock_unlock();
 						return 1;
@@ -8295,7 +8573,7 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list *
 								if (nameid > 0) {
 									int success;
 									struct item item_tmp = { 0 };
-									int amount = skill->get_itemqty(su->group->skill_id, i);
+									int amount = skill->get_itemqty(su->group->skill_id, i, skill_lv);
 									item_tmp.nameid = nameid;
 									item_tmp.identify = 1;
 									if ((success = pc->additem(sd, &item_tmp, amount, LOG_TYPE_SKILL)) != 0) {
@@ -10092,9 +10370,12 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list *
 				clif->skill_nodamage (src, bl, skill_id, skill_lv, 1);
 
 				if (sd != NULL) {
-					sd->autocast.type = AUTOCAST_IMPROVISE;
-					sd->autocast.skill_id = improv_skill_id;
-					sd->autocast.skill_lv = improv_skill_lv;
+					pc->autocast_clear(sd);
+					sd->auto_cast_current.type = AUTOCAST_IMPROVISE;
+					sd->auto_cast_current.skill_id = improv_skill_id;
+					sd->auto_cast_current.skill_lv = improv_skill_lv;
+					VECTOR_ENSURE(sd->auto_cast, 1, 1);
+					VECTOR_PUSH(sd->auto_cast, sd->auto_cast_current);
 					clif->item_skill(sd, improv_skill_id, improv_skill_lv);
 				} else {
 					struct unit_data *ud = unit->bl2ud(src);
@@ -10863,7 +11144,7 @@ static int skill_castend_pos(int tid, int64 tick, int id, intptr_t data)
 		if (ud->walktimer != INVALID_TIMER)
 			unit->stop_walking(src, STOPWALKING_FLAG_FIXPOS);
 
-		if (sd == NULL || sd->autocast.skill_id != ud->skill_id || skill->get_delay(ud->skill_id,ud->skill_lv) != 0)
+		if (sd == NULL || sd->auto_cast_current.skill_id != ud->skill_id || skill->get_delay(ud->skill_id, ud->skill_lv) != 0)
 			ud->canact_tick = tick + skill->delay_fix(src, ud->skill_id, ud->skill_lv);
 		if (sd) { //Cooldown application
 			int i, cooldown = skill->get_cooldown(ud->skill_id, ud->skill_lv);
@@ -10892,8 +11173,8 @@ static int skill_castend_pos(int tid, int64 tick, int id, intptr_t data)
 		map->freeblock_lock();
 		skill->castend_pos2(src,ud->skillx,ud->skilly,ud->skill_id,ud->skill_lv,tick,0);
 
-		if (sd != NULL && sd->autocast.skill_id != AL_WARP) // Warp-Portal thru items will clear data in skill_castend_map. [Inkfish]
-			pc->autocast_clear(sd);
+		if (sd != NULL && ud->skill_id != AL_WARP && ud->skill_id == sd->auto_cast_current.skill_id) // Warp-Portal thru items will clear data in skill_castend_map. [Inkfish]
+			pc->autocast_remove(sd, sd->auto_cast_current.type, ud->skill_id, ud->skill_lv);
 
 		unit->set_dir(src, map->calc_dir(src, ud->skillx, ud->skilly));
 
@@ -10907,13 +11188,17 @@ static int skill_castend_pos(int tid, int64 tick, int id, intptr_t data)
 		return 1;
 	} while(0);
 
-	if (sd == NULL || sd->autocast.skill_id != ud->skill_id || skill->get_delay(ud->skill_id,ud->skill_lv) != 0)
+	if (sd == NULL || sd->auto_cast_current.skill_id != ud->skill_id || skill->get_delay(ud->skill_id, ud->skill_lv) != 0)
 		ud->canact_tick = tick;
-	ud->skill_id = ud->skill_lv = 0;
-	if(sd)
-		pc->autocast_clear(sd);
+	
+	if (sd != NULL && ud->skill_id == sd->auto_cast_current.skill_id)
+		pc->autocast_remove(sd, sd->auto_cast_current.type, ud->skill_id, ud->skill_lv);
 	else if(md)
 		md->skill_idx  = -1;
+
+	ud->skill_id = 0;
+	ud->skill_lv = 0;
+
 	return 0;
 
 }
@@ -11072,7 +11357,7 @@ static int skill_castend_map(struct map_session_data *sd, uint16 skill_id, const
 					}
 				}
 
-				lv = (sd->autocast.type > AUTOCAST_TEMP) ? sd->autocast.skill_lv : pc->checkskill(sd, skill_id);
+				lv = (sd->auto_cast_current.type > AUTOCAST_TEMP) ? sd->auto_cast_current.skill_lv : pc->checkskill(sd, skill_id);
 				wx = sd->menuskill_val>>16;
 				wy = sd->menuskill_val&0xffff;
 
@@ -11095,7 +11380,10 @@ static int skill_castend_map(struct map_session_data *sd, uint16 skill_id, const
 				}
 
 				skill->consume_requirement(sd,sd->menuskill_id,lv,2);
-				pc->autocast_clear(sd); // Clear data which was skipped in skill_castend_pos().
+
+				// Clear data which was skipped in skill_castend_pos().
+				pc->autocast_remove(sd, sd->auto_cast_current.type, sd->auto_cast_current.skill_id,
+						    sd->auto_cast_current.skill_lv);
 
 				if((group=skill->unitsetting(&sd->bl,skill_id,lv,wx,wy,0))==NULL) {
 					skill_failed(sd);
@@ -11156,7 +11444,7 @@ static int skill_castend_pos2(struct block_list *src, int x, int y, uint16 skill
 	}
 
 	// SC_MAGICPOWER needs to switch states before any damage is actually dealt
-	skill->toggle_magicpower(src, skill_id);
+	skill->toggle_magicpower(src, skill_id, skill_lv);
 
 	switch(skill_id) {
 		case PR_BENEDICTIO:
@@ -11515,7 +11803,7 @@ static int skill_castend_pos2(struct block_list *src, int x, int y, uint16 skill
 				int bonus;
 				if (inventory_idx == INDEX_NOT_FOUND || item_id <= 0
 				 || sd->inventory_data[inventory_idx] == NULL
-				 || sd->status.inventory[inventory_idx].amount < skill->get_itemqty(skill_id, item_idx)
+				 || sd->status.inventory[inventory_idx].amount < skill->get_itemqty(skill_id, item_idx, skill_lv)
 				) {
 					clif->skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0, 0);
 					return 1;
@@ -11761,7 +12049,7 @@ static int skill_castend_pos2(struct block_list *src, int x, int y, uint16 skill
 			skill->unitsetting(src, skill_id, skill_lv, x, y, 0); // Set bomb on current Position
 			clif->skill_nodamage(src, src, skill_id, skill_lv, 1);
 			if( skill->blown(src, src, 3 * skill_lv, unit->getdir(src), 0) && sc) {
-				sc_start(src, src, SC__FEINTBOMB_MASTER, 100, 0, skill->get_unit_interval(SC_FEINTBOMB));
+				sc_start(src, src, SC__FEINTBOMB_MASTER, 100, 0, skill->get_unit_interval(SC_FEINTBOMB, skill_lv));
 			}
 			break;
 
@@ -11774,7 +12062,7 @@ static int skill_castend_pos2(struct block_list *src, int x, int y, uint16 skill
 		case LG_OVERBRAND:
 			skill->area_temp[1] = 0;
 			map->foreachinpath(skill->attack_area,src->m,src->x,src->y,x,y,1,5,BL_CHAR,
-				skill->get_type(skill_id),src,src,skill_id,skill_lv,tick,flag,BCT_ENEMY);
+				skill->get_type(skill_id, skill_lv), src, src, skill_id, skill_lv, tick, flag, BCT_ENEMY);
 			skill->addtimerskill(src,timer->gettick() + status_get_amotion(src), 0, x, y, LG_OVERBRAND_BRANDISH, skill_lv, 0, flag);
 			break;
 
@@ -11811,7 +12099,7 @@ static int skill_castend_pos2(struct block_list *src, int x, int y, uint16 skill
 					int tmpx = x - area + rnd()%(area * 2 + 1);
 					int tmpy = y - area + rnd()%(area * 2 + 1);
 
-					skill->addtimerskill(src,tick+r*250,0,tmpx,tmpy,GN_CRAZYWEED_ATK,skill_lv,-1,0);
+					skill->addtimerskill(src, tick + (int64)r * 250, 0, tmpx, tmpy, GN_CRAZYWEED_ATK, skill_lv, 0, 0);
 				}
 			}
 			break;
@@ -12008,10 +12296,10 @@ static bool skill_dance_switch(struct skill_unit *su, int flag)
 		// replace
 		group->skill_id    = skill_id;
 		group->skill_lv    = 1;
-		group->unit_id     = skill->get_unit_id(skill_id,0);
-		group->target_flag = skill->get_unit_target(skill_id);
-		group->bl_flag     = skill->get_unit_bl_target(skill_id);
-		group->interval    = skill->get_unit_interval(skill_id);
+		group->unit_id     = skill->get_unit_id(skill_id, 1, 0);
+		group->target_flag = skill->get_unit_target(skill_id, 1);
+		group->bl_flag     = skill->get_unit_bl_target(skill_id, 1);
+		group->interval    = skill->get_unit_interval(skill_id, 1);
 	} else {
 		//Restore
 		group->skill_id    = backup.skill_id;
@@ -12044,8 +12332,8 @@ static struct skill_unit_group *skill_unitsetting(struct block_list *src, uint16
 
 	limit = skill->get_time(skill_id,skill_lv);
 	range = skill->get_unit_range(skill_id,skill_lv);
-	interval = skill->get_unit_interval(skill_id);
-	target = skill->get_unit_target(skill_id);
+	interval = skill->get_unit_interval(skill_id, skill_lv);
+	target = skill->get_unit_target(skill_id, skill_lv);
 	unit_flag = skill->get_unit_flag(skill_id);
 	layout = skill->get_unit_layout(skill_id,skill_lv,src,x,y);
 
@@ -12409,12 +12697,12 @@ static struct skill_unit_group *skill_unitsetting(struct block_list *src, uint16
 	}
 
 	nullpo_retr(NULL, layout);
-	nullpo_retr(NULL, group=skill->init_unitgroup(src,layout->count,skill_id,skill_lv,skill->get_unit_id(skill_id,flag&1)+subunt, limit, interval));
+	nullpo_retr(NULL, group = skill->init_unitgroup(src, layout->count, skill_id, skill_lv, skill->get_unit_id(skill_id, skill_lv, flag & 1) + subunt, limit, interval));
 	group->val1=val1;
 	group->val2=val2;
 	group->val3=val3;
 	group->target_flag=target;
-	group->bl_flag= skill->get_unit_bl_target(skill_id);
+	group->bl_flag= skill->get_unit_bl_target(skill_id, skill_lv);
 	group->state.ammo_consume = (sd && sd->state.arrow_atk && skill_id != GS_GROUNDDRIFT); //Store if this skill needs to consume ammo.
 	group->state.song_dance = ((unit_flag&(UF_DANCE|UF_SONG)) ? 1 : 0)|((unit_flag&UF_ENSEMBLE) ? 2 : 0); //Signals if this is a song/dance/duet
 	group->state.guildaura = ( skill_id >= GD_LEADERSHIP && skill_id <= GD_HAWKEYES )?1:0;
@@ -12583,7 +12871,7 @@ static int skill_unit_onplace(struct skill_unit *src, struct block_list *bl, int
 	nullpo_ret(sg=src->group);
 	nullpo_ret(ss=map->id2bl(sg->src_id));
 
-	if (skill->get_type(sg->skill_id) == BF_MAGIC && map->getcell(src->bl.m, &src->bl, src->bl.x, src->bl.y, CELL_CHKLANDPROTECTOR) && sg->skill_id != SA_LANDPROTECTOR)
+	if (skill->get_type(sg->skill_id, sg->skill_lv) == BF_MAGIC && map->getcell(src->bl.m, &src->bl, src->bl.x, src->bl.y, CELL_CHKLANDPROTECTOR) != 0 && sg->skill_id != SA_LANDPROTECTOR)
 		return 0; //AoE skills are ineffective. [Skotlex]
 	sc = status->get_sc(bl);
 
@@ -12782,7 +13070,7 @@ static int skill_unit_onplace(struct skill_unit *src, struct block_list *bl, int
 			if( status_get_mode(bl)&MD_BOSS )
 				break; // iRO Wiki says that this skill don't affect to Boss monsters.
 			if( map_flag_vs(bl->m) || bl->id == src->bl.id || battle->check_target(&src->bl,bl, BCT_ENEMY) == 1 )
-				skill->attack(skill->get_type(sg->skill_id), ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0);
+				skill->attack(skill->get_type(sg->skill_id, sg->skill_lv), ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0);
 			break;
 
 		case UNT_REVERBERATION:
@@ -13018,7 +13306,7 @@ static int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *b
 				case WZ_STORMGUST: //SG counter does not reset per stormgust. IE: One hit from a SG and two hits from another will freeze you.
 					if (tsc)
 						tsc->sg_counter++; //SG hit counter.
-					if (skill->attack(skill->get_type(sg->skill_id),ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0) <= 0 && tsc)
+					if (skill->attack(skill->get_type(sg->skill_id, sg->skill_lv), ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0) <= 0 && tsc != NULL)
 						tsc->sg_counter=0; //Attack absorbed.
 					break;
 		#endif
@@ -13027,7 +13315,7 @@ static int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *b
 						skill->attack(BF_WEAPON,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
 					break;
 				default:
-					skill->attack(skill->get_type(sg->skill_id),ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
+					skill->attack(skill->get_type(sg->skill_id, sg->skill_lv), ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0);
 			}
 			break;
 
@@ -13348,7 +13636,7 @@ static int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *b
 		case UNT_PSYCHIC_WAVE:
 		case UNT_MAGMA_ERUPTION:
 		case UNT_MAKIBISHI:
-			skill->attack(skill->get_type(sg->skill_id),ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
+			skill->attack(skill->get_type(sg->skill_id, sg->skill_lv), ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0);
 			break;
 
 		case UNT_GROUNDDRIFT_WIND:
@@ -13449,7 +13737,7 @@ static int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *b
 						sec = 3000; // Couldn't trap it?
 					sg->limit = DIFF_TICK32(tick, sg->tick) + sec;
 				} else if( tsc->data[SC_THORNS_TRAP] && bl->id == sg->val2 )
-					skill->attack(skill->get_type(GN_THORNS_TRAP), ss, ss, bl, sg->skill_id, sg->skill_lv, tick, SD_LEVEL|SD_ANIMATION);
+					skill->attack(skill->get_type(GN_THORNS_TRAP, sg->skill_lv), ss, ss, bl, sg->skill_id, sg->skill_lv, tick, SD_LEVEL|SD_ANIMATION);
 			}
 			break;
 
@@ -13461,11 +13749,11 @@ static int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *b
 					default:
 						sc_start4(ss, bl, SC_BURNING, 4 + 4 * sg->skill_lv, sg->skill_lv, 0, ss->id, 0,
 								 skill->get_time2(sg->skill_id, sg->skill_lv));
-						skill->attack(skill->get_type(sg->skill_id), ss, &src->bl, bl,
+						skill->attack(skill->get_type(sg->skill_id, sg->skill_lv), ss, &src->bl, bl,
 									 sg->skill_id, sg->skill_lv + 10 * sg->val2, tick, 0);
 						break;
 					case 3:
-						skill->attack(skill->get_type(CR_ACIDDEMONSTRATION), ss, &src->bl, bl,
+						skill->attack(skill->get_type(CR_ACIDDEMONSTRATION, sg->skill_lv), ss, &src->bl, bl,
 									 CR_ACIDDEMONSTRATION, sd ? pc->checkskill(sd, CR_ACIDDEMONSTRATION) : sg->skill_lv, tick, 0);
 						break;
 
@@ -13483,7 +13771,7 @@ static int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *b
 
 		case UNT_HELLS_PLANT:
 			if( battle->check_target(&src->bl,bl,BCT_ENEMY) > 0 )
-				skill->attack(skill->get_type(GN_HELLS_PLANT_ATK), ss, &src->bl, bl, GN_HELLS_PLANT_ATK, sg->skill_lv, tick, 0);
+				skill->attack(skill->get_type(GN_HELLS_PLANT_ATK, sg->skill_lv), ss, &src->bl, bl, GN_HELLS_PLANT_ATK, sg->skill_lv, tick, 0);
 			if( ss != bl) //The caster is the only one who can step on the Plants, without destroying them
 				sg->limit = DIFF_TICK32(tick, sg->tick) + 100;
 			break;
@@ -13491,7 +13779,7 @@ static int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *b
 		case UNT_CLOUD_KILL:
 			if(tsc && !tsc->data[type])
 				status->change_start(ss,bl,type,10000,sg->skill_lv,sg->group_id,0,0,skill->get_time2(sg->skill_id,sg->skill_lv),SCFLAG_FIXEDRATE);
-			skill->attack(skill->get_type(sg->skill_id),ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
+			skill->attack(skill->get_type(sg->skill_id, sg->skill_lv), ss, &src->bl, bl, sg->skill_id, sg->skill_lv, tick, 0);
 			break;
 
 		case UNT_WARMER:
@@ -13616,7 +13904,7 @@ static int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *b
 					}
 					sg->limit = DIFF_TICK32(tick, sg->tick) + sec;
 				} else if (tsc->data[type] && bl->id == sg->val2) {
-					skill->attack(skill->get_type(SU_SV_ROOTTWIST_ATK), ss, &src->bl, bl, SU_SV_ROOTTWIST_ATK, sg->skill_lv, tick, SD_LEVEL|SD_ANIMATION);
+					skill->attack(skill->get_type(SU_SV_ROOTTWIST_ATK, sg->skill_lv), ss, &src->bl, bl, SU_SV_ROOTTWIST_ATK, sg->skill_lv, tick, SD_LEVEL|SD_ANIMATION);
 				}
 			}
 			break;
@@ -14070,16 +14358,16 @@ static int skill_check_condition_mob_master_sub(struct block_list *bl, va_list a
  * Determines if a given skill should be made to consume ammo
  * when used by the player. [Skotlex]
  *------------------------------------------*/
-static int skill_isammotype(struct map_session_data *sd, int skill_id)
+static int skill_isammotype(struct map_session_data *sd, int skill_id, int skill_lv)
 {
 	nullpo_ret(sd);
 	return (
 		battle_config.arrow_decrement==2 &&
 		(sd->weapontype == W_BOW || (sd->weapontype >= W_REVOLVER && sd->weapontype <= W_GRENADE)) &&
 		skill_id != HT_PHANTASMIC &&
-		skill->get_type(skill_id) == BF_WEAPON &&
+		skill->get_type(skill_id, skill_lv) == BF_WEAPON &&
 		!(skill->get_nk(skill_id)&NK_NO_DAMAGE) &&
-		!skill->get_spiritball(skill_id,1) //Assume spirit spheres are used as ammo instead.
+		!skill->get_spiritball(skill_id, skill_lv) //Assume spirit spheres are used as ammo instead.
 	);
 }
 
@@ -14094,6 +14382,90 @@ static bool skill_is_combo(int skill_id)
 	return false;
 }
 
+/**
+ * Checks if a skill's equipment requirements are fulfilled.
+ *
+ * @param sd The character who casts the skill.
+ * @param skill_id The skill's ID.
+ * @param skill_lv The skill's level.
+ * @return 0 on success or 1 in case of error.
+ *
+ **/
+static int skill_check_condition_required_equip(struct map_session_data *sd, int skill_id, int skill_lv)
+{
+	nullpo_retr(1, sd);
+
+	struct skill_condition req = skill->get_requirement(sd, skill_id, skill_lv);
+	bool any_equip_flag = skill->get_equip_any_flag(skill_id, skill_lv);
+	bool any_equip_found = false;
+	int fail_id = 0;
+	int fail_amount = 0;
+
+	for (int i = 0; i < MAX_SKILL_ITEM_REQUIRE; i++) {
+		if (req.equip_id[i] == 0)
+			continue;
+
+		int req_id = req.equip_id[i];
+		int req_amount = req.equip_amount[i];
+		int found_amount = 0;
+
+		for (int j = 0; j < EQI_MAX; j++) {
+			int inv_idx = sd->equip_index[j];
+
+			if (inv_idx == INDEX_NOT_FOUND || sd->inventory_data[inv_idx] == NULL)
+				continue;
+
+			if ((j == EQI_HAND_R && sd->equip_index[EQI_HAND_L] == inv_idx)
+			    || (j == EQI_HEAD_MID && sd->equip_index[EQI_HEAD_LOW] == inv_idx)
+			    || (j == EQI_HEAD_TOP && sd->equip_index[EQI_HEAD_MID] == inv_idx)
+			    || (j == EQI_HEAD_TOP && sd->equip_index[EQI_HEAD_LOW] == inv_idx)
+			    || (j == EQI_COSTUME_MID && sd->equip_index[EQI_COSTUME_LOW] == inv_idx)
+			    || (j == EQI_COSTUME_TOP && sd->equip_index[EQI_COSTUME_MID] == inv_idx)
+			    || (j == EQI_COSTUME_TOP && sd->equip_index[EQI_COSTUME_LOW] == inv_idx)) {
+				continue; // Equipment uses more than one slot; only process it once!
+			}
+
+			if (itemdb_type(req_id) != IT_CARD) {
+				if (sd->inventory_data[inv_idx]->nameid != req_id)
+					continue;
+
+				if (itemdb_type(req_id) == IT_AMMO)
+					found_amount += sd->status.inventory[inv_idx].amount;
+				else
+					found_amount++;
+			} else {
+				if (itemdb_isspecial(sd->status.inventory[inv_idx].card[0]))
+					continue;
+
+				for (int k = 0; k < sd->inventory_data[inv_idx]->slot; k++) {
+					if (sd->status.inventory[inv_idx].card[k] == req_id)
+						found_amount++;
+				}
+			}
+		}
+
+		if (any_equip_flag) {
+			if (found_amount >= req_amount) {
+				any_equip_found = true;
+				break;
+			} else if (fail_id == 0) { // Save ID/amount of first missing equipment for skill fail message.
+				fail_id = req_id;
+				fail_amount = req_amount;
+			}
+		} else if (found_amount < req_amount) {
+			clif->skill_fail(sd, skill_id, USESKILL_FAIL_NEED_EQUIPMENT, req_amount, req_id);
+			return 1;
+		}
+	}
+
+	if (any_equip_flag && !any_equip_found) {
+		clif->skill_fail(sd, skill_id, USESKILL_FAIL_NEED_EQUIPMENT, fail_amount, fail_id);
+		return 1;
+	}
+
+	return 0;
+}
+
 static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv)
 {
 	struct status_data *st;
@@ -14108,12 +14480,12 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s
 	if (sd->chat_id != 0)
 		return 0;
 
-	if (((sd->autocast.itemskill_conditions_checked || !sd->autocast.itemskill_check_conditions)
-	    && sd->autocast.type == AUTOCAST_ITEM) || sd->autocast.type == AUTOCAST_IMPROVISE) {
+	if (((sd->auto_cast_current.itemskill_conditions_checked || !sd->auto_cast_current.itemskill_check_conditions)
+	    && sd->auto_cast_current.type == AUTOCAST_ITEM) || sd->auto_cast_current.type == AUTOCAST_IMPROVISE) {
 		return 1;
 	}
 
-	if (pc_has_permission(sd, PC_PERM_SKILL_UNCONDITIONAL) && sd->autocast.type != AUTOCAST_ITEM) {
+	if (pc_has_permission(sd, PC_PERM_SKILL_UNCONDITIONAL) && sd->auto_cast_current.type != AUTOCAST_ITEM) {
 		// GMs don't override the AUTOCAST_ITEM check, otherwise they can use items without them being consumed!
 		sd->state.arrow_atk = skill->get_ammotype(skill_id)?1:0; //Need to do arrow state check.
 		sd->spiritball_old = sd->spiritball; //Need to do Spiritball check.
@@ -14145,7 +14517,7 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s
 	if( !sc->count )
 		sc = NULL;
 
-	if (pc_is90overweight(sd) && sd->autocast.type != AUTOCAST_ITEM) { // Skill casting items ignore the overweight restriction.
+	if (pc_is90overweight(sd) && sd->auto_cast_current.type != AUTOCAST_ITEM) { // Skill casting items ignore the overweight restriction.
 		clif->skill_fail(sd, skill_id, USESKILL_FAIL_WEIGHTOVER, 0, 0);
 		return 0;
 	}
@@ -14793,22 +15165,6 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s
 					require.sp -= require.sp * 20 * count / 100; //  -20% each W/M in the party.
 			}
 			break;
-		case NC_PILEBUNKER:
-			if (sd->equip_index[EQI_HAND_R] < 0
-			 || !itemid_is_pilebunker(sd->status.inventory[sd->equip_index[EQI_HAND_R]].nameid)
-			 ) {
-				clif->skill_fail(sd, skill_id, USESKILL_FAIL_THIS_WEAPON, 0, 0);
-				return 0;
-			}
-			break;
-		case NC_HOVERING:
-			if (( sd->equip_index[EQI_ACC_L] >= 0 &&  sd->status.inventory[sd->equip_index[EQI_ACC_L]].nameid == ITEMID_HOVERING_BOOSTER ) ||
-				( sd->equip_index[EQI_ACC_R] >= 0 &&  sd->status.inventory[sd->equip_index[EQI_ACC_R]].nameid == ITEMID_HOVERING_BOOSTER ));
-			else {
-				clif->skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0, 0);
-			return 0;
-			}
-			break;
 		case SO_FIREWALK:
 		case SO_ELECTRICWALK: // Can't be casted until you've walked all cells.
 			if( sc && sc->data[SC_PROPERTYWALK] &&
@@ -15011,12 +15367,20 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s
 		return 0;
 	}
 
+	if (require.msp > 0 && get_percentage(st->sp, st->max_sp) > require.msp) {
+		clif->skill_fail(sd, skill_id, USESKILL_FAIL_SP_INSUFFICIENT, 0, 0);
+		return 0;
+	}
+
 	if( require.weapon && !pc_check_weapontype(sd,require.weapon) ) {
 		clif->skill_fail(sd, skill_id, USESKILL_FAIL_THIS_WEAPON, 0, 0);
 		return 0;
 	}
 
-	if (require.sp > 0 && st->sp < (unsigned int)require.sp && sd->autocast.type == AUTOCAST_NONE) { // Auto-cast skills don't consume SP.
+	if (skill->check_condition_required_equip(sd, skill_id, skill_lv) != 0)
+		return 0;
+
+	if (require.sp > 0 && st->sp < (unsigned int)require.sp && sd->auto_cast_current.type == AUTOCAST_NONE) { // Auto-cast skills don't consume SP.
 		clif->skill_fail(sd, skill_id, USESKILL_FAIL_SP_INSUFFICIENT, 0, 0);
 		return 0;
 	}
@@ -15062,24 +15426,139 @@ static int skill_check_condition_castbegin_unknown(struct status_change *sc, uin
 	return -1;
 }
 
+/**
+ * Checks if a skill's item requirements are fulfilled.
+ *
+ * @param sd The character who casts the skill.
+ * @param skill_id The skill's ID.
+ * @param skill_lv The skill's level.
+ * @return 0 on success or 1 in case of error.
+ *
+ **/
+static int skill_check_condition_required_items(struct map_session_data *sd, int skill_id, int skill_lv)
+{
+	nullpo_retr(1, sd);
+
+	struct skill_condition req = skill->get_requirement(sd, skill_id, skill_lv);
+
+	if (skill->get_item_any_flag(skill_id, skill_lv)) {
+		for (int i = 0; i < MAX_SKILL_ITEM_REQUIRE; i++) {
+			if (req.itemid[i] == 0)
+				continue;
+
+			int inv_idx = pc->search_inventory(sd, req.itemid[i]);
+
+			if (inv_idx == INDEX_NOT_FOUND)
+				continue;
+
+			if ((req.amount[i] > 0 && sd->status.inventory[inv_idx].amount >= req.amount[i])
+			    || (req.amount[i] == 0 && sd->status.inventory[inv_idx].amount > 0)) {
+				return 0;
+			}
+		}
+	}
+
+	/**
+	 * Find first missing item and show skill failed message if item any-flag is false
+	 * or item any-flag check didn't find an item with sufficient amount.
+	 *
+	 **/
+	for (int i = 0; i < MAX_SKILL_ITEM_REQUIRE; i++) {
+		if (req.itemid[i] == 0)
+			continue;
+
+		int inv_idx = pc->search_inventory(sd, req.itemid[i]);
+
+		if (inv_idx == INDEX_NOT_FOUND || sd->status.inventory[inv_idx].amount < req.amount[i]) {
+			useskill_fail_cause cause = USESKILL_FAIL_NEED_ITEM;
+
+			switch (skill_id) {
+			case NC_SILVERSNIPER:
+			case NC_MAGICDECOY:
+				cause = USESKILL_FAIL_STUFF_INSUFFICIENT;
+				break;
+			default:
+				switch (req.itemid[i]) {
+				case ITEMID_RED_GEMSTONE:
+					cause = USESKILL_FAIL_REDJAMSTONE;
+					break;
+				case ITEMID_BLUE_GEMSTONE:
+					cause = USESKILL_FAIL_BLUEJAMSTONE;
+					break;
+				case ITEMID_HOLY_WATER:
+					cause = USESKILL_FAIL_HOLYWATER;
+					break;
+				case ITEMID_ANSILA:
+					cause = USESKILL_FAIL_ANCILLA;
+					break;
+				case ITEMID_ACCELERATOR:
+				case ITEMID_HOVERING_BOOSTER:
+				case ITEMID_SUICIDAL_DEVICE:
+				case ITEMID_SHAPE_SHIFTER:
+				case ITEMID_COOLING_DEVICE:
+				case ITEMID_MAGNETIC_FIELD_GENERATOR:
+				case ITEMID_BARRIER_BUILDER:
+				case ITEMID_CAMOUFLAGE_GENERATOR:
+				case ITEMID_REPAIR_KIT:
+				case ITEMID_MONKEY_SPANNER:
+					cause = USESKILL_FAIL_NEED_EQUIPMENT;
+					FALLTHROUGH
+				default:
+					clif->skill_fail(sd, skill_id, cause, max(1, req.amount[i]), req.itemid[i]);
+					return 1;
+				}
+
+				break;
+			}
+
+			clif->skill_fail(sd, skill_id, cause, 0, 0);
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+/**
+ * Checks if a skill has item requirements.
+ *
+ * @param sd The character who casts the skill.
+ * @param skill_id The skill's ID.
+ * @param skill_lv The skill's level.
+ * @return True if skill has item requirements, otherwise false.
+ *
+ **/
+static bool skill_items_required(struct map_session_data *sd, int skill_id, int skill_lv)
+{
+	nullpo_retr(false, sd);
+
+	struct skill_condition req = skill->get_requirement(sd, skill_id, skill_lv);
+
+	for (int i = 0; i < MAX_SKILL_ITEM_REQUIRE; i++) {
+		if (req.itemid[i] != 0)
+			return true;
+	}
+
+	return false;
+}
+
 static int skill_check_condition_castend(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv)
 {
 	struct skill_condition require;
 	struct status_data *st;
 	int i;
-	int index[MAX_SKILL_ITEM_REQUIRE];
 
 	nullpo_ret(sd);
 
 	if (sd->chat_id != 0)
 		return 0;
 
-	if (((sd->autocast.itemskill_conditions_checked || !sd->autocast.itemskill_check_conditions)
-	    && sd->autocast.type == AUTOCAST_ITEM) || sd->autocast.type == AUTOCAST_IMPROVISE) {
+	if (((sd->auto_cast_current.itemskill_conditions_checked || !sd->auto_cast_current.itemskill_check_conditions)
+	    && sd->auto_cast_current.type == AUTOCAST_ITEM) || sd->auto_cast_current.type == AUTOCAST_IMPROVISE) {
 		return 1;
 	}
 
-	if (pc_has_permission(sd, PC_PERM_SKILL_UNCONDITIONAL) && sd->autocast.type != AUTOCAST_ITEM) {
+	if (pc_has_permission(sd, PC_PERM_SKILL_UNCONDITIONAL) && sd->auto_cast_current.type != AUTOCAST_ITEM) {
 		// GMs don't override the AUTOCAST_ITEM check, otherwise they can use items without them being consumed!
 		sd->state.arrow_atk = skill->get_ammotype(skill_id)?1:0; //Need to do arrow state check.
 		sd->spiritball_old = sd->spiritball; //Need to do Spiritball check.
@@ -15107,7 +15586,7 @@ static int skill_check_condition_castend(struct map_session_data *sd, uint16 ski
 			break;
 	}
 
-	if (pc_is90overweight(sd) && sd->autocast.type != AUTOCAST_ITEM) { // Skill casting items ignore the overweight restriction.
+	if (pc_is90overweight(sd) && sd->auto_cast_current.type != AUTOCAST_ITEM) { // Skill casting items ignore the overweight restriction.
 		clif->skill_fail(sd, skill_id, USESKILL_FAIL_WEIGHTOVER, 0, 0);
 		return 0;
 	}
@@ -15219,48 +15698,10 @@ static int skill_check_condition_castend(struct map_session_data *sd, uint16 ski
 		}
 	}
 
-	for( i = 0; i < MAX_SKILL_ITEM_REQUIRE; ++i ) {
-		if( !require.itemid[i] )
-			continue;
-		index[i] = pc->search_inventory(sd,require.itemid[i]);
-		if (index[i] == INDEX_NOT_FOUND || sd->status.inventory[index[i]].amount < require.amount[i]) {
-			useskill_fail_cause cause = USESKILL_FAIL_NEED_ITEM;
-			switch( skill_id ){
-				case NC_SILVERSNIPER:
-				case NC_MAGICDECOY:
-					cause = USESKILL_FAIL_STUFF_INSUFFICIENT;
-					break;
-				default:
-					switch(require.itemid[i]){
-						case ITEMID_RED_GEMSTONE:
-							cause = USESKILL_FAIL_REDJAMSTONE; break;
-						case ITEMID_BLUE_GEMSTONE:
-							cause = USESKILL_FAIL_BLUEJAMSTONE; break;
-						case ITEMID_HOLY_WATER:
-							cause = USESKILL_FAIL_HOLYWATER; break;
-						case ITEMID_ANSILA:
-							cause = USESKILL_FAIL_ANCILLA; break;
-						case ITEMID_ACCELERATOR:
-						case ITEMID_HOVERING_BOOSTER:
-						case ITEMID_SUICIDAL_DEVICE:
-						case ITEMID_SHAPE_SHIFTER:
-						case ITEMID_COOLING_DEVICE:
-						case ITEMID_MAGNETIC_FIELD_GENERATOR:
-						case ITEMID_BARRIER_BUILDER:
-						case ITEMID_CAMOUFLAGE_GENERATOR:
-						case ITEMID_REPAIR_KIT:
-						case ITEMID_MONKEY_SPANNER:
-							cause = USESKILL_FAIL_NEED_EQUIPMENT;
-							/* Fall through */
-						default:
-							clif->skill_fail(sd, skill_id, cause, max(1, require.amount[i]), require.itemid[i]);
-							return 0;
-					}
-			}
-			clif->skill_fail(sd, skill_id, cause, 0, 0);
-			return 0;
-		}
-	}
+	bool items_required = skill->items_required(sd, skill_id, skill_lv);
+
+	if (items_required && skill->check_condition_required_items(sd, skill_id, skill_lv) != 0)
+		return 0;
 
 	return 1;
 }
@@ -15270,6 +15711,43 @@ static bool skill_check_condition_castend_unknown(struct map_session_data *sd, u
 	return false;
 }
 
+/**
+ * Gets the array index of the first required item with sufficient amount.
+ *
+ * @param sd The character who casts the skill.
+ * @param skill_id The skill's ID.
+ * @param skill_lv The skill's level.
+ * @return A number greater than or equal to 0 on success, otherwise INDEX_NOT_FOUND (-1).
+ *
+ **/
+static int skill_get_any_item_index(struct map_session_data *sd, int skill_id, int skill_lv)
+{
+	nullpo_retr(INDEX_NOT_FOUND, sd);
+
+	int any_item_index = INDEX_NOT_FOUND;
+
+	if (skill->get_item_any_flag(skill_id, skill_lv)) {
+		struct skill_condition req = skill->get_requirement(sd, skill_id, skill_lv);
+
+		for (int i = 0; i < MAX_SKILL_ITEM_REQUIRE; i++) {
+			if (req.itemid[i] == 0)
+				continue;
+
+			int inv_idx = pc->search_inventory(sd, req.itemid[i]);
+
+			if (inv_idx == INDEX_NOT_FOUND)
+				continue;
+
+			if (req.amount[i] == 0 || sd->status.inventory[inv_idx].amount >= req.amount[i]) {
+				any_item_index = i;
+				break;
+			}
+		}
+	}
+
+	return any_item_index;
+}
+
 // type&2: consume items (after skill was used)
 // type&1: consume the others (before skill was used)
 static int skill_consume_requirement(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv, short type)
@@ -15278,8 +15756,8 @@ static int skill_consume_requirement(struct map_session_data *sd, uint16 skill_i
 
 	nullpo_ret(sd);
 
-	if ((!sd->autocast.itemskill_check_conditions && sd->autocast.type == AUTOCAST_ITEM)
-	    || sd->autocast.type == AUTOCAST_IMPROVISE) {
+	if ((!sd->auto_cast_current.itemskill_check_conditions && sd->auto_cast_current.type == AUTOCAST_ITEM)
+	    || sd->auto_cast_current.type == AUTOCAST_IMPROVISE) {
 		return 1;
 	}
 
@@ -15297,7 +15775,7 @@ static int skill_consume_requirement(struct map_session_data *sd, uint16 skill_i
 
 				break;
 			default:
-				if (sd->autocast.type != AUTOCAST_NONE) // Auto-cast skills don't consume SP.
+				if (sd->auto_cast_current.type != AUTOCAST_NONE) // Auto-cast skills don't consume SP.
 					req.sp = 0;
 
 				break;
@@ -15322,16 +15800,24 @@ static int skill_consume_requirement(struct map_session_data *sd, uint16 skill_i
 	if( type&2 )
 	{
 		struct status_change *sc = &sd->sc;
-		int n,i;
+		int n;
 
 		if( !sc->count )
 			sc = NULL;
 
-		for( i = 0; i < MAX_SKILL_ITEM_REQUIRE; ++i )
-		{
+		bool items_required = skill->items_required(sd, skill_id, skill_lv);
+		int any_item_index = INDEX_NOT_FOUND;
+
+		if (items_required)
+			any_item_index = skill->get_any_item_index(sd, skill_id, skill_lv);
+
+		for (int i = 0; i < MAX_SKILL_ITEM_REQUIRE && items_required; i++) {
 			if( !req.itemid[i] )
 				continue;
 
+			if (any_item_index != INDEX_NOT_FOUND && any_item_index != i)
+				continue;
+
 			if( itemid_isgemstone(req.itemid[i]) && skill_id != HW_GANBANTEIN && sc && sc->data[SC_SOULLINK] && sc->data[SC_SOULLINK]->val2 == SL_WIZARD )
 				continue; //Gemstones are checked, but not subtracted from inventory.
 
@@ -15469,61 +15955,36 @@ static struct skill_condition skill_get_requirement(struct map_session_data *sd,
 
 	req.spiritball = skill->dbs->db[idx].spiritball[skill_lv-1];
 
-	req.state = skill->dbs->db[idx].state;
+	req.state = skill->dbs->db[idx].state[skill_lv - 1];
 
 	req.mhp = skill->dbs->db[idx].mhp[skill_lv-1];
 
+	req.msp = skill->get_msp(skill_id, skill_lv);
+
 	req.weapon = skill->dbs->db[idx].weapon;
 
 	req.ammo_qty = skill->dbs->db[idx].ammo_qty[skill_lv-1];
 	if (req.ammo_qty)
 		req.ammo = skill->dbs->db[idx].ammo;
 
-	if (!req.ammo && skill_id && skill->isammotype(sd, skill_id)) {
+	if (req.ammo == 0 && skill_id != 0 && skill->isammotype(sd, skill_id, skill_lv)) {
 		//Assume this skill is using the weapon, therefore it requires arrows.
 		req.ammo = 0xFFFFFFFF; //Enable use on all ammo types.
 		req.ammo_qty = 1;
 	}
 
 	for( i = 0; i < MAX_SKILL_ITEM_REQUIRE; i++ ) {
-		int item_idx = (skill_lv - 1) % MAX_SKILL_ITEM_REQUIRE;
-		if ((skill_id == AM_POTIONPITCHER || skill_id == CR_SLIMPITCHER || skill_id == CR_CULTIVATION) && i != item_idx)
-			continue;
-
 		switch( skill_id ) {
 			case AM_CALLHOMUN:
 				if (sd->status.hom_id) //Don't delete items when hom is already out.
 					continue;
 				break;
-			case NC_SHAPESHIFT:
-				if( i < 4 )
-					continue;
-				break;
-			case WZ_FIREPILLAR: // celest
-				if (skill_lv <= 5) // no gems required at level 1-5
-					continue;
-				break;
 			case AB_ADORAMUS:
-				if( itemid_isgemstone(skill->dbs->db[idx].itemid[i]) && skill->check_pc_partner(sd,skill_id,&skill_lv, 1, 2) )
+				if (itemid_isgemstone(skill->get_itemid(skill_id, i)) && skill->check_pc_partner(sd, skill_id, &skill_lv, 1, 2) != 0)
 					continue;
 				break;
 			case WL_COMET:
-				if( itemid_isgemstone(skill->dbs->db[idx].itemid[i]) && skill->check_pc_partner(sd,skill_id,&skill_lv, 1, 0) )
-					continue;
-				break;
-			case GN_FIRE_EXPANSION:
-				if( i < 5 )
-					continue;
-				break;
-			case SO_SUMMON_AGNI:
-			case SO_SUMMON_AQUA:
-			case SO_SUMMON_VENTUS:
-			case SO_SUMMON_TERA:
-			case SO_WATER_INSIGNIA:
-			case SO_FIRE_INSIGNIA:
-			case SO_WIND_INSIGNIA:
-			case SO_EARTH_INSIGNIA:
-				if( i < 3 )
+				if (itemid_isgemstone(skill->get_itemid(skill_id, i)) && skill->check_pc_partner(sd, skill_id, &skill_lv, 1, 0) != 0)
 					continue;
 				break;
 			default:
@@ -15534,8 +15995,17 @@ static struct skill_condition skill_get_requirement(struct map_session_data *sd,
 			}
 		}
 
-		req.itemid[i] = skill->dbs->db[idx].itemid[i];
-		req.amount[i] = skill->dbs->db[idx].amount[i];
+		int amount;
+
+		if ((amount = skill->get_itemqty(skill_id, i, skill_lv)) >= 0) {
+			req.itemid[i] = skill->get_itemid(skill_id, i);
+			req.amount[i] = amount;
+		}
+
+		if ((amount = skill->get_equip_amount(skill_id, i, skill_lv)) > 0) {
+			req.equip_id[i] = skill->get_equip_id(skill_id, i);
+			req.equip_amount[i] = amount;
+		}
 
 		if (itemid_isgemstone(req.itemid[i]) && skill_id != HW_GANBANTEIN) {
 			if (sd->special_state.no_gemstone) {
@@ -15567,39 +16037,6 @@ static struct skill_condition skill_get_requirement(struct map_session_data *sd,
 		}
 	}
 
-	/* requirements are level-dependent */
-	switch( skill_id ) {
-		case NC_SHAPESHIFT:
-		case GN_FIRE_EXPANSION:
-		case SO_SUMMON_AGNI:
-		case SO_SUMMON_AQUA:
-		case SO_SUMMON_VENTUS:
-		case SO_SUMMON_TERA:
-		case SO_WATER_INSIGNIA:
-		case SO_FIRE_INSIGNIA:
-		case SO_WIND_INSIGNIA:
-		case SO_EARTH_INSIGNIA:
-			req.itemid[skill_lv-1] = skill->dbs->db[idx].itemid[skill_lv-1];
-			req.amount[skill_lv-1] = skill->dbs->db[idx].amount[skill_lv-1];
-			break;
-	}
-	if (skill_id == NC_REPAIR) {
-		switch(skill_lv) {
-			case 1:
-			case 2:
-				req.itemid[1] = ITEMID_REPAIRA;
-				break;
-			case 3:
-			case 4:
-				req.itemid[1] = ITEMID_REPAIRB;
-				break;
-			case 5:
-				req.itemid[1] = ITEMID_REPAIRC;
-				break;
-		}
-		req.amount[1] = 1;
-	}
-
 	// Check for cost reductions due to skills & SCs
 	switch(skill_id) {
 		case MC_MAMMONITE:
@@ -17003,7 +17440,7 @@ static int skill_trap_splash(struct block_list *bl, va_list ap)
 			}
 			/* Fall through */
 		default:
-			skill->attack(skill->get_type(sg->skill_id), ss, src, bl, sg->skill_id, sg->skill_lv, tick, enemy_count);
+			skill->attack(skill->get_type(sg->skill_id, sg->skill_lv), ss, src, bl, sg->skill_id, sg->skill_lv, tick, enemy_count);
 			break;
 	}
 	return 1;
@@ -17687,7 +18124,7 @@ static int skill_unit_timer_sub(union DBKey key, struct DBData *data, va_list ap
 
 			case UNT_WARP_ACTIVE:
 				// warp portal opens (morph to a UNT_WARP_WAITING cell)
-				group->unit_id = skill->get_unit_id(group->skill_id, 1); // UNT_WARP_WAITING
+				group->unit_id = skill->get_unit_id(group->skill_id, group->skill_lv, 1); // UNT_WARP_WAITING
 				clif->changelook(&su->bl, LOOK_BASE, group->unit_id);
 				// restart timers
 				group->limit = skill->get_time(group->skill_id,group->skill_lv);
@@ -18814,12 +19251,12 @@ static int skill_poisoningweapon(struct map_session_data *sd, int nameid)
 	return 0;
 }
 
-static void skill_toggle_magicpower(struct block_list *bl, uint16 skill_id)
+static void skill_toggle_magicpower(struct block_list *bl, uint16 skill_id, int skill_lv)
 {
 	struct status_change *sc = status->get_sc(bl);
 
 	// non-offensive and non-magic skills do not affect the status
-	if (skill->get_nk(skill_id)&NK_NO_DAMAGE || !(skill->get_type(skill_id)&BF_MAGIC))
+	if ((skill->get_nk(skill_id) & NK_NO_DAMAGE) != 0 || (skill->get_type(skill_id, skill_lv) & BF_MAGIC) == 0)
 		return;
 
 	if (sc && sc->count && sc->data[SC_MAGICPOWER]) {
@@ -18953,14 +19390,20 @@ static int skill_select_menu(struct map_session_data *sd, uint16 skill_id)
 
 	idx = skill->get_index(skill_id);
 
-	if( skill_id >= GS_GLITTERING || skill->get_type(skill_id) != BF_MAGIC ||
-		(id = sd->status.skill[idx].id) == 0 || sd->status.skill[idx].flag != SKILL_FLAG_PLAGIARIZED ) {
+	if (skill_id >= GS_GLITTERING || (id = sd->status.skill[idx].id) == 0
+	    || sd->status.skill[idx].flag != SKILL_FLAG_PLAGIARIZED) {
 		clif->skill_fail(sd, SC_AUTOSHADOWSPELL, 0, 0, 0);
 		return 0;
 	}
 
 	lv = (aslvl + 1) / 2; // The level the skill will be autocasted
-	lv = min(lv,sd->status.skill[idx].lv);
+	lv = min(lv, sd->status.skill[idx].lv);
+
+	if (skill->get_type(skill_id, lv) != BF_MAGIC) {
+		clif->skill_fail(sd, SC_AUTOSHADOWSPELL, 0, 0, 0);
+		return 0;
+	}
+
 	prob = (aslvl == 10) ? 15 : (32 - 2 * aslvl); // Probability at level 10 was increased to 15.
 	sc_start4(&sd->bl,&sd->bl,SC__AUTOSHADOWSPELL,100,id,lv,prob,0,skill->get_time(SC_AUTOSHADOWSPELL,aslvl));
 	return 0;
@@ -20101,9 +20544,6 @@ static bool skill_parse_row_changematerialdb(char *split[], int columns, int cur
 	return true;
 }
 
-#define skilldb_duplicate_warning(name, setting, skill) (ShowError("skill_read_skilldb: Duplicate entry '%s' in setting '%s' for Skill Id %d in '%s', skipping...\n", name, setting, skill, "db/"DBPATH"skill_db.conf"))
-#define skilldb_invalid_error(name, setting, skill) (ShowError("skill_read_skilldb: Invalid entry '%s' in setting '%s' for Skill Id %d in '%s', skipping...\n", name, setting, skill, "db/"DBPATH"skill_db.conf"))
-
 /**
  * Sets Level based configuration for skill groups from skill_db.conf [ Smokexyz/Hercules ]
  * @param *conf    pointer to config setting.
@@ -20148,295 +20588,549 @@ static void skill_level_set_value(int *arr, int value)
 	}
 }
 
-static void skill_validate_hittype(struct config_setting_t *conf, struct s_skill_db *sk)
+/**
+ * Validates a skill's ID when reading the skill DB.
+ * If validating fails, the ID is set to 0.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the ID should be set it.
+ * @param conf_index The 1-based index of the currently processed libconfig settings block.
+ *
+ **/
+static void skill_validate_id(struct config_setting_t *conf, struct s_skill_db *sk, int conf_index)
 {
-	const char *type = NULL;
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	sk->nameid = 0;
+
+	int id;
+
+	if (libconfig->setting_lookup_int(conf, "Id", &id) == CONFIG_FALSE)
+		ShowError("%s: No skill ID specified in entry %d in %s! Skipping skill...\n",
+			  __func__, conf_index, conf->file);
+	else if (id <= 0)
+		ShowError("%s: Invalid skill ID %d specified in entry %d in %s! Skipping skill...\n",
+			  __func__, id, conf_index, conf->file);
+	else if(skill->get_index(id) == 0)
+		ShowError("%s: Skill ID %d in entry %d in %s is out of range, or within a reserved range (for guild, homunculus, mercenary or elemental skills)! Skipping skill...\n",
+			  __func__, id, conf_index, conf->file);
+	else if (*skill->get_name(id) != '\0')
+		ShowError("%s: Duplicate skill ID %d in entry %d in %s! Skipping skill...\n",
+			  __func__, id, conf_index, conf->file);
+	else
+		sk->nameid = id;
+}
+
+/**
+ * Validates if a skill's name contains invalid characters when reading the skill DB.
+ *
+ * @param name The name to validate.
+ * @return True if the passed name is a NULL pointer or contains at least one invalid character, otherwise false.
+ *
+ **/
+static bool skill_name_contains_invalid_character(const char *name)
+{
+	nullpo_retr(true, name);
+
+	for (int i = 0; i < MAX_SKILL_NAME_LENGTH && name[i] != '\0'; i++) {
+		if (ISALNUM(name[i]) == 0 && name[i] != '_')
+			return true;
+	}
+
+	return false;
+}
 
+/**
+ * Validates a skill's name when reading the skill DB.
+ * If validating fails, the name is set to an enpty string.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the name should be set it.
+ *
+ **/
+static void skill_validate_name(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
 	nullpo_retv(sk);
-	if (libconfig->setting_lookup_string(conf, "Hit", &type)) {
-		if (strcmpi(type, "BDT_SKILL") == 0) {
-			sk->hit = BDT_SKILL;
-		} else if (strcmpi(type, "BDT_MULTIHIT") == 0) {
-			sk->hit = BDT_MULTIHIT;
-		} else if (strcmpi(type, "BDT_NORMAL") == 0) {
-			sk->hit = BDT_NORMAL;
-		} else {
-			skilldb_invalid_error(type, "Hit", sk->nameid);
+
+	*sk->name = '\0';
+
+	const char *name;
+
+	if (libconfig->setting_lookup_string(conf, "Name", &name) == CONFIG_FALSE || *name == '\0')
+		ShowError("%s: No name specified for skill ID %d in %s! Skipping skill...\n",
+			  __func__, sk->nameid, conf->file);
+	else if (strlen(name) >= sizeof(sk->name))
+		ShowError("%s: Specified name %s for skill ID %d in %s is too long: %lu! Maximum is %lu. Skipping skill...\n",
+			  __func__, name, sk->nameid, conf->file, strlen(name), sizeof(sk->name) - 1);
+	else if (skill->name_contains_invalid_character(name))
+		ShowError("%s: Specified name %s for skill ID %d in %s contains invalid characters! Allowed characters are letters, numbers and underscores. Skipping skill...\n",
+			  __func__, name, sk->nameid, conf->file);
+	else if (skill->name2id(name) != 0)
+		ShowError("%s: Duplicate name %s for skill ID %d in %s! Skipping skill...\n",
+			  __func__, name, sk->nameid, conf->file);
+	else
+		safestrncpy(sk->name, name, sizeof(sk->name));
+}
+
+/**
+ * Validates a skill's maximum level when reading the skill DB.
+ * If validating fails, the maximum level is set to 0.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the maximum level should be set it.
+ *
+ **/
+static void skill_validate_max_level(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	sk->max = 0;
+
+	int max_level;
+
+	if (libconfig->setting_lookup_int(conf, "MaxLevel", &max_level) == CONFIG_FALSE)
+		ShowError("%s: No maximum level specified for skill ID %d in %s! Skipping skill...\n",
+			  __func__, sk->nameid, conf->file);
+	else if (max_level < 1 || max_level > MAX_SKILL_LEVEL)
+		ShowError("%s: Invalid maximum level %d specified for skill ID %d in %s! Minimum is 1, maximum is %d. Skipping skill...\n",
+			  __func__, max_level, sk->nameid, conf->file, MAX_SKILL_LEVEL);
+	else
+		sk->max = max_level;
+}
+
+/**
+ * Validates a skill's description when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the description should be set it.
+ *
+ **/
+static void skill_validate_description(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	*sk->desc = '\0';
+
+	const char *description;
+
+	if (libconfig->setting_lookup_string(conf, "Description", &description) == CONFIG_TRUE && *description != '\0') {
+		if (strlen(description) >= sizeof(sk->desc))
+			ShowWarning("%s: Specified description '%s' for skill ID %d in %s is too long: %lu! Maximum is %lu. Trimming...\n",
+				    __func__, description, sk->nameid, conf->file, strlen(description), sizeof(sk->desc) - 1);
+
+		safestrncpy(sk->desc, description, sizeof(sk->desc));
+	}
+}
+
+/**
+ * Validates a skill's range when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the range should be set it.
+ *
+ **/
+static void skill_validate_range(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->range, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "Range");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int range;
+
+			if (libconfig->setting_lookup_int(t, lv, &range) == CONFIG_TRUE) {
+				if (range >= SHRT_MIN && range <= SHRT_MAX)
+					sk->range[i] = range;
+				else
+					ShowWarning("%s: Invalid range %d specified in level %d for skill ID %d in %s! Minimum is %d, maximum is %d. Defaulting to 0...\n",
+						    __func__, range, i + 1, sk->nameid, conf->file, SHRT_MIN, SHRT_MAX);
+			}
+		}
+
+		return;
+	}
+
+	int range;
+
+	if (libconfig->setting_lookup_int(conf, "Range", &range) == CONFIG_TRUE) {
+		if (range >= SHRT_MIN && range <= SHRT_MAX)
+			skill->level_set_value(sk->range, range);
+		else
+			ShowWarning("%s: Invalid range %d specified for skill ID %d in %s! Minimum is %d, maximum is %d. Defaulting to 0...\n",
+				    __func__, range, sk->nameid, conf->file, SHRT_MIN, SHRT_MAX);
+	}
+}
+
+/**
+ * Validates a skill's hit type when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the hit type should be set it.
+ *
+ **/
+static void skill_validate_hittype(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->hit, BDT_NORMAL);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "Hit");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			const char *hit_type;
+
+			if (libconfig->setting_lookup_string(t, lv, &hit_type) == CONFIG_TRUE) {
+				if (strcmpi(hit_type, "BDT_SKILL") == 0)
+					sk->hit[i] = BDT_SKILL;
+				else if (strcmpi(hit_type, "BDT_MULTIHIT") == 0)
+					sk->hit[i] = BDT_MULTIHIT;
+				else if (strcmpi(hit_type, "BDT_NORMAL") != 0)
+					ShowWarning("%s: Invalid hit type %s specified in level %d for skill ID %d in %s! Defaulting to BDT_NORMAL...\n",
+						    __func__, hit_type, i + 1, sk->nameid, conf->file);
+			}
+		}
+
+		return;
+	}
+
+	const char *hit_type;
+
+	if (libconfig->setting_lookup_string(conf, "Hit", &hit_type) == CONFIG_TRUE) {
+		int hit = BDT_NORMAL;
+
+		if (strcmpi(hit_type, "BDT_SKILL") == 0) {
+			hit = BDT_SKILL;
+		} else if (strcmpi(hit_type, "BDT_MULTIHIT") == 0) {
+			hit = BDT_MULTIHIT;
+		} else if (strcmpi(hit_type, "BDT_NORMAL") != 0) {
+			ShowWarning("%s: Invalid hit type %s specified for skill ID %d in %s! Defaulting to BDT_NORMAL...\n",
+				    __func__, hit_type, sk->nameid, conf->file);
 			return;
 		}
+
+		skill->level_set_value(sk->hit, hit);
 	}
 }
 
 /**
- * Validates "SkillType" when reading skill_db.conf
- * @param conf   struct, pointer to skill configuration
- * @param sk     struct, pointer to s_skill_db
- * @return (void)
- */
+ * Validates a skill's types when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the types should be set it.
+ *
+ **/
 static void skill_validate_skilltype(struct config_setting_t *conf, struct s_skill_db *sk)
 {
-	struct config_setting_t *t = NULL, *tt = NULL;
-
+	nullpo_retv(conf);
 	nullpo_retv(sk);
-	if((t=libconfig->setting_get_member(conf, "SkillType")) && config_setting_is_group(t)) {
-		int j=0;
-		while ((tt = libconfig->setting_get_elem(t, j++))) {
-			const char *type = config_setting_name(tt);
+
+	sk->inf = INF_NONE;
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "SkillType");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		struct config_setting_t *tt;
+		int i = 0;
+
+		while ((tt = libconfig->setting_get_elem(t, i++)) != NULL) {
+			const char *skill_type = config_setting_name(tt);
 			bool on = libconfig->setting_get_bool_real(tt);
 
-			if (strcmpi(type, "Enemy") == 0) {
-				if (on) {
+			if (strcmpi(skill_type, "Enemy") == 0) {
+				if (on)
 					sk->inf |= INF_ATTACK_SKILL;
-				} else {
+				else
 					sk->inf &= ~INF_ATTACK_SKILL;
-				}
-			} else if (strcmpi(type, "Place") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_type, "Place") == 0) {
+				if (on)
 					sk->inf |= INF_GROUND_SKILL;
-				} else {
+				else
 					sk->inf &= ~INF_GROUND_SKILL;
-				}
-			} else if (strcmpi(type, "Self") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_type, "Self") == 0) {
+				if (on)
 					sk->inf |= INF_SELF_SKILL;
-				} else {
+				else
 					sk->inf &= ~INF_SELF_SKILL;
-				}
-			} else if (strcmpi(type, "Friend") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_type, "Friend") == 0) {
+				if (on)
 					sk->inf |= INF_SUPPORT_SKILL;
-				} else {
+				else
 					sk->inf &= ~INF_SUPPORT_SKILL;
-				}
-			} else if (strcmpi(type, "Trap") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_type, "Trap") == 0) {
+				if (on)
 					sk->inf |= INF_TARGET_TRAP;
-				} else {
+				else
 					sk->inf &= ~INF_TARGET_TRAP;
-				}
-			} else if (strcmpi(type, "Passive") != 0) {
-				skilldb_invalid_error(type, config_setting_name(t), sk->nameid);
+			} else if (strcmpi(skill_type, "Passive") != 0) {
+				ShowWarning("%s: Invalid skill type %s specified for skill ID %d in %s! Skipping type...\n",
+					    __func__, skill_type, sk->nameid, conf->file);
 			}
 		}
 	}
 }
 
 /**
- * Validates "SkillInfo" when reading skill_db.conf
- * @param conf   struct, pointer to skill configuration
- * @param sk     struct, pointer to s_skill_db
- * @return (void)
- */
+ * Validates a skill's sub-types when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the sub-types should be set it.
+ *
+ **/
 static void skill_validate_skillinfo(struct config_setting_t *conf, struct s_skill_db *sk)
 {
-	struct config_setting_t *t = NULL, *tt = NULL;
-
+	nullpo_retv(conf);
 	nullpo_retv(sk);
-	if ((t=libconfig->setting_get_member(conf, "SkillInfo")) && config_setting_is_group(t)) {
-		int j=0;
-		while ((tt = libconfig->setting_get_elem(t, j++))) {
-			const char *type = config_setting_name(tt);
+
+	sk->inf2 = INF2_NONE;
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "SkillInfo");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		struct config_setting_t *tt;
+		int i = 0;
+
+		while ((tt = libconfig->setting_get_elem(t, i++)) != NULL) {
+			const char *skill_info = config_setting_name(tt);
 			bool on = libconfig->setting_get_bool_real(tt);
 
-			if (strcmpi(type, "Quest") == 0) {
-				if (on) {
+			if (strcmpi(skill_info, "Quest") == 0) {
+				if (on)
 					sk->inf2 |= INF2_QUEST_SKILL;
-				} else {
+				else
 					sk->inf2 &= ~INF2_QUEST_SKILL;
-				}
-			} else if (strcmpi(type, "NPC") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "NPC") == 0) {
+				if (on)
 					sk->inf2 |= INF2_NPC_SKILL;
-				} else {
+				else
 					sk->inf2 &= ~INF2_NPC_SKILL;
-				}
-			} else if (strcmpi(type, "Wedding") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "Wedding") == 0) {
+				if (on)
 					sk->inf2 |= INF2_WEDDING_SKILL;
-				} else {
+				else
 					sk->inf2 &= ~INF2_WEDDING_SKILL;
-				}
-			} else if (strcmpi(type, "Spirit") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "Spirit") == 0) {
+				if (on)
 					sk->inf2 |= INF2_SPIRIT_SKILL;
-				} else {
+				else
 					sk->inf2 &= ~INF2_SPIRIT_SKILL;
-				}
-			} else if (strcmpi(type, "Guild") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "Guild") == 0) {
+				if (on)
 					sk->inf2 |= INF2_GUILD_SKILL;
-				} else {
+				else
 					sk->inf2 &= ~INF2_GUILD_SKILL;
-				}
-			} else if (strcmpi(type, "Song") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "Song") == 0) {
+				if (on)
 					sk->inf2 |= INF2_SONG_DANCE;
-				} else {
+				else
 					sk->inf2 &= ~INF2_SONG_DANCE;
-				}
-			} else if (strcmpi(type, "Ensemble") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "Ensemble") == 0) {
+				if (on)
 					sk->inf2 |= INF2_ENSEMBLE_SKILL;
-				} else {
+				else
 					sk->inf2 &= ~INF2_ENSEMBLE_SKILL;
-				}
-			} else if (strcmpi(type, "Trap") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "Trap") == 0) {
+				if (on)
 					sk->inf2 |= INF2_TRAP;
-				} else {
+				else
 					sk->inf2 &= ~INF2_TRAP;
-				}
-			} else if (strcmpi(type, "TargetSelf") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "TargetSelf") == 0) {
+				if (on)
 					sk->inf2 |= INF2_TARGET_SELF;
-				} else {
+				else
 					sk->inf2 &= ~INF2_TARGET_SELF;
-				}
-			} else if (strcmpi(type, "NoCastSelf") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "NoCastSelf") == 0) {
+				if (on)
 					sk->inf2 |= INF2_NO_TARGET_SELF;
-				} else {
+				else
 					sk->inf2 &= ~INF2_NO_TARGET_SELF;
-				}
-			} else if (strcmpi(type, "PartyOnly") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "PartyOnly") == 0) {
+				if (on)
 					sk->inf2 |= INF2_PARTY_ONLY;
-				} else {
+				else
 					sk->inf2 &= ~INF2_PARTY_ONLY;
-				}
-			} else if (strcmpi(type, "GuildOnly") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "GuildOnly") == 0) {
+				if (on)
 					sk->inf2 |= INF2_GUILD_ONLY;
-				} else {
+				else
 					sk->inf2 &= ~INF2_GUILD_ONLY;
-				}
-			} else if (strcmpi(type, "NoEnemy") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "NoEnemy") == 0) {
+				if (on)
 					sk->inf2 |= INF2_NO_ENEMY;
-				} else {
+				else
 					sk->inf2 &= ~INF2_NO_ENEMY;
-				}
-			} else if (strcmpi(type, "IgnoreLandProtector") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "IgnoreLandProtector") == 0) {
+				if (on)
 					sk->inf2 |= INF2_NOLP;
-				} else {
+				else
 					sk->inf2 &= ~INF2_NOLP;
-				}
-			} else if (strcmpi(type, "Chorus") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "Chorus") == 0) {
+				if (on)
 					sk->inf2 |= INF2_CHORUS_SKILL;
-				} else {
+				else
 					sk->inf2 &= ~INF2_CHORUS_SKILL;
-				}
-			} else if (strcmpi(type, "FreeCastNormal") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "FreeCastNormal") == 0) {
+				if (on)
 					sk->inf2 |= INF2_FREE_CAST_NORMAL;
-				} else {
+				else
 					sk->inf2 &= ~INF2_FREE_CAST_NORMAL;
-				}
-			} else if (strcmpi(type, "FreeCastReduced") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "FreeCastReduced") == 0) {
+				if (on)
 					sk->inf2 |= INF2_FREE_CAST_REDUCED;
-				} else {
+				else
 					sk->inf2 &= ~INF2_FREE_CAST_REDUCED;
-				}
-			} else if (strcmpi(type, "ShowSkillScale") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "ShowSkillScale") == 0) {
+				if (on)
 					sk->inf2 |= INF2_SHOW_SKILL_SCALE;
-				} else {
+				else
 					sk->inf2 &= ~INF2_SHOW_SKILL_SCALE;
-				}
-			} else if (strcmpi(type, "AllowReproduce") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "AllowReproduce") == 0) {
+				if (on)
 					sk->inf2 |= INF2_ALLOW_REPRODUCE;
-				} else {
+				else
 					sk->inf2 &= ~INF2_ALLOW_REPRODUCE;
-				}
-			} else if (strcmpi(type, "HiddenTrap") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "HiddenTrap") == 0) {
+				if (on)
 					sk->inf2 |= INF2_HIDDEN_TRAP;
-				} else {
+				else
 					sk->inf2 &= ~INF2_HIDDEN_TRAP;
-				}
-			} else if (strcmpi(type, "IsCombo") == 0) {
-				if (on) {
+			} else if (strcmpi(skill_info, "IsCombo") == 0) {
+				if (on)
 					sk->inf2 |= INF2_IS_COMBO_SKILL;
-				} else {
+				else
 					sk->inf2 &= ~INF2_IS_COMBO_SKILL;
-				}
-			} else if (strcmpi(type, "None") != 0) {
-				skilldb_invalid_error(type, config_setting_name(t), sk->nameid);
+			} else if (strcmpi(skill_info, "None") != 0) {
+				ShowWarning("%s: Invalid sub-type %s specified for skill ID %d in %s! Skipping sub-type...\n",
+					    __func__, skill_info, sk->nameid, conf->file);
 			}
 		}
 	}
 }
 
 /**
- * Validates "AttackType" when reading skill_db.conf
- * @param conf   struct, pointer to skill configuration
- * @param sk     struct, pointer to s_skill_db
- * @return (void)
- */
+ * Validates a skill's attack type when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the attack type should be set it.
+ *
+ **/
 static void skill_validate_attacktype(struct config_setting_t *conf, struct s_skill_db *sk)
 {
-	const char *type = NULL;
-
+	nullpo_retv(conf);
 	nullpo_retv(sk);
-	if (libconfig->setting_lookup_string(conf, "AttackType", &type)) {
-		if (!strcmpi(type, "Weapon")) {
-			sk->skill_type = BF_WEAPON;
-		} else if (!strcmpi(type, "Magic")) {
-			sk->skill_type = BF_MAGIC;
-		} else if (!strcmpi(type, "Misc")) {
-			sk->skill_type = BF_MISC;
-		} else {
-			skilldb_invalid_error(type, "AttackType", sk->nameid);
+
+	skill->level_set_value(sk->skill_type, BF_NONE);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "AttackType");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			const char *attack_type;
+
+			if (libconfig->setting_lookup_string(t, lv, &attack_type) == CONFIG_TRUE) {
+				if (strcmpi(attack_type, "Weapon") == 0)
+					sk->skill_type[i] = BF_WEAPON;
+				else if (strcmpi(attack_type, "Magic") == 0)
+					sk->skill_type[i] = BF_MAGIC;
+				else if (strcmpi(attack_type, "Misc") == 0)
+					sk->skill_type[i] = BF_MISC;
+				else if (strcmpi(attack_type, "None") != 0)
+					ShowWarning("%s: Invalid attack type %s specified in level %d for skill ID %d in %s! Defaulting to None...\n",
+						    __func__, attack_type, i + 1, sk->nameid, conf->file);
+			}
+		}
+
+		return;
+	}
+
+	const char *attack_type;
+
+	if (libconfig->setting_lookup_string(conf, "AttackType", &attack_type) == CONFIG_TRUE) {
+		int attack = BF_NONE;
+
+		if (strcmpi(attack_type, "Weapon") == 0) {
+			attack = BF_WEAPON;
+		} else if (strcmpi(attack_type, "Magic") == 0) {
+			attack = BF_MAGIC;
+		} else if (strcmpi(attack_type, "Misc") == 0) {
+			attack = BF_MISC;
+		} else if (strcmpi(attack_type, "None") != 0) {
+			ShowWarning("%s: Invalid attack type %s specified for skill ID %d in %s! Defaulting to None...\n",
+				    __func__, attack_type, sk->nameid, conf->file);
 			return;
 		}
+
+		skill->level_set_value(sk->skill_type, attack);
 	}
 }
 
 /**
- * Validates "Element" when reading skill_db.conf
- * @param ele_t   struct, pointer to skill configuration
- * @param sk     struct, pointer to s_skill_db
- * @return (void)
- */
+ * Validates a skill's element when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the element should be set it.
+ *
+ **/
 static void skill_validate_element(struct config_setting_t *conf, struct s_skill_db *sk)
 {
-	const char *type = NULL;
-	struct config_setting_t *t = NULL;
-
+	nullpo_retv(conf);
 	nullpo_retv(sk);
-	if ((t=libconfig->setting_get_member(conf, "Element")) && config_setting_is_group(t)) {
-		int j = 0;
-		char lv[6]; // enough to contain "Lv100" in case of custom MAX_SKILL_LEVEL
 
-		for (j=0; j < MAX_SKILL_LEVEL; j++) {
-			sprintf(lv, "Lv%d",j+1);
-			if (libconfig->setting_lookup_string(t, lv, &type)) {
-				if (strcmpi(type,"Ele_Weapon") == 0)
-					sk->element[j] = -1;
-				else if (strcmpi(type,"Ele_Endowed") == 0)
-					sk->element[j] = -2;
-				else if (strcmpi(type,"Ele_Random") == 0)
-					sk->element[j] = -3;
-				else if (!script->get_constant(type,&sk->element[j]))
-					skilldb_invalid_error(type, config_setting_name(conf), sk->nameid);
+	skill->level_set_value(sk->element, ELE_NEUTRAL);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "Element");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			const char *element;
+
+			if (libconfig->setting_lookup_string(t, lv, &element) == CONFIG_TRUE) {
+				if (strcmpi(element, "Ele_Weapon") == 0)
+					sk->element[i] = -1;
+				else if (strcmpi(element, "Ele_Endowed") == 0)
+					sk->element[i] = -2;
+				else if (strcmpi(element, "Ele_Random") == 0)
+					sk->element[i] = -3;
+				else if (!script->get_constant(element, &sk->element[i]))
+					ShowWarning("%s: Invalid element %s specified in level %d for skill ID %d in %s! Defaulting to Ele_Neutral...\n",
+						    __func__, element, i + 1, sk->nameid, conf->file);
 			}
 		}
 
-	} else if (libconfig->setting_lookup_string(conf, "Element", &type)) {
-		int ele = 0;
+		return;
+	}
+
+	const char *element;
+
+	if (libconfig->setting_lookup_string(conf, "Element", &element) == CONFIG_TRUE) {
+		int ele = ELE_NEUTRAL;
 
-		if (strcmpi(type,"Ele_Weapon") == 0)
+		if (strcmpi(element, "Ele_Weapon") == 0) {
 			ele = -1;
-		else if (strcmpi(type,"Ele_Endowed") == 0)
+		} else if (strcmpi(element, "Ele_Endowed") == 0) {
 			ele = -2;
-		else if (strcmpi(type,"Ele_Random") == 0)
+		} else if (strcmpi(element, "Ele_Random") == 0) {
 			ele = -3;
-		else if (!script->get_constant(type, &ele)) {
-			skilldb_invalid_error(type, config_setting_name(conf), sk->nameid);
+		} else if (!script->get_constant(element, &ele)) {
+			ShowWarning("%s: Invalid element %s specified for skill ID %d in %s! Defaulting to Ele_Neutral...\n",
+				    __func__, element, sk->nameid, conf->file);
 			return;
 		}
 
@@ -20445,696 +21139,2516 @@ static void skill_validate_element(struct config_setting_t *conf, struct s_skill
 }
 
 /**
- * Validates "DamageType" when reading skill_db.conf
- * @param conf   struct, pointer to skill configuration
- * @param sk     struct, pointer to s_skill_db
- * @return (void)
- */
+ * Validates a skill's damage types when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the damage types should be set it.
+ *
+ **/
 static void skill_validate_damagetype(struct config_setting_t *conf, struct s_skill_db *sk)
 {
-	struct config_setting_t *t = NULL, *tt = NULL;
-
+	nullpo_retv(conf);
 	nullpo_retv(sk);
-	if ((t=libconfig->setting_get_member(conf, "DamageType")) && config_setting_is_group(t)) {
-		int j=0;
-		while ((tt = libconfig->setting_get_elem(t, j++))) {
-			const char *type = config_setting_name(tt);
+
+	sk->nk = NK_NONE;
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "DamageType");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		struct config_setting_t *tt;
+		int i = 0;
+
+		while ((tt = libconfig->setting_get_elem(t, i++)) != NULL) {
+			const char *damage_type = config_setting_name(tt);
 			bool on = libconfig->setting_get_bool_real(tt);
 
-			if (strcmpi(type, "NoDamage") == 0) {
-				if (on) {
+			if (strcmpi(damage_type, "NoDamage") == 0) {
+				if (on)
 					sk->nk |= NK_NO_DAMAGE;
-				} else {
+				else
 					sk->nk &= ~NK_NO_DAMAGE;
-				}
-			} else if (strcmpi(type, "SplashArea") == 0) {
-				if (on) {
+			} else if (strcmpi(damage_type, "SplashArea") == 0) {
+				if (on)
 					sk->nk |= NK_SPLASH_ONLY;
-				} else {
+				else
 					sk->nk &= ~NK_SPLASH_ONLY;
-				}
-			} else if (strcmpi(type, "SplitDamage") == 0) {
-				if (on) {
+			} else if (strcmpi(damage_type, "SplitDamage") == 0) {
+				if (on)
 					sk->nk |= NK_SPLASHSPLIT;
-				} else {
+				else
 					sk->nk &= ~NK_SPLASHSPLIT;
-				}
-			} else if (strcmpi(type, "IgnoreCards") == 0) {
-				if (on) {
+			} else if (strcmpi(damage_type, "IgnoreCards") == 0) {
+				if (on)
 					sk->nk |= NK_NO_CARDFIX_ATK;
-				} else {
+				else
 					sk->nk &= ~NK_NO_CARDFIX_ATK;
-				}
-			} else if (strcmpi(type, "IgnoreElement") == 0) {
-				if (on) {
+			} else if (strcmpi(damage_type, "IgnoreElement") == 0) {
+				if (on)
 					sk->nk |= NK_NO_ELEFIX;
-				} else {
+				else
 					sk->nk &= ~NK_NO_ELEFIX;
-				}
-			} else if (strcmpi(type, "IgnoreDefense") == 0) {
-				if (on) {
+			} else if (strcmpi(damage_type, "IgnoreDefense") == 0) {
+				if (on)
 					sk->nk |= NK_IGNORE_DEF;
-				} else {
+				else
 					sk->nk &= ~NK_IGNORE_DEF;
-				}
-			} else if (strcmpi(type, "IgnoreFlee") == 0) {
-				if (on) {
+			} else if (strcmpi(damage_type, "IgnoreFlee") == 0) {
+				if (on)
 					sk->nk |= NK_IGNORE_FLEE;
-				} else {
+				else
 					sk->nk &= ~NK_IGNORE_FLEE;
-				}
-			} else if (strcmpi(type, "IgnoreDefCards") == 0) {
-				if (on) {
+			} else if (strcmpi(damage_type, "IgnoreDefCards") == 0) {
+				if (on)
 					sk->nk |= NK_NO_CARDFIX_DEF;
-				} else {
+				else
 					sk->nk &= ~NK_NO_CARDFIX_DEF;
-				}
 			} else {
-				skilldb_invalid_error(type, config_setting_name(t), sk->nameid);
+				ShowWarning("%s: Invalid damage type %s specified for skill ID %d in %s! Skipping damage type...\n",
+					    __func__, damage_type, sk->nameid, conf->file);
 			}
 		}
 	}
+
+	if (sk->nk == NK_NONE)
+		sk->nk = NK_NO_DAMAGE;
 }
 
 /**
- * Validates "SkillCast/DelayOptions" when reading skill_db.conf
- * @param conf   struct, pointer to skill configuration
- * @param sk     struct, pointer to s_skill_db
- * @param delay  boolean, switch for cast/delay setting
- * @return (void)
- */
-static void skill_validate_castnodex(struct config_setting_t *conf, struct s_skill_db *sk, bool delay)
+ * Validates a skill's splash range when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the splash range should be set it.
+ *
+ **/
+static void skill_validate_splash_range(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->splash, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "SplashRange");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int splash_range;
+
+			if (libconfig->setting_lookup_int(t, lv, &splash_range) == CONFIG_TRUE) {
+				if (splash_range >= SHRT_MIN && splash_range <= SHRT_MAX)
+					sk->splash[i] = splash_range;
+				else
+					ShowWarning("%s: Invalid splash range %d specified in level %d for skill ID %d in %s! Minimum is %d, maximum is %d. Defaulting to 0...\n",
+						    __func__, splash_range, i + 1, sk->nameid, conf->file, SHRT_MIN, SHRT_MAX);
+			}
+		}
+
+		return;
+	}
+
+	int splash_range;
+
+	if (libconfig->setting_lookup_int(conf, "SplashRange", &splash_range) == CONFIG_TRUE) {
+		if (splash_range >= SHRT_MIN && splash_range <= SHRT_MAX)
+			skill->level_set_value(sk->splash, splash_range);
+		else
+			ShowWarning("%s: Invalid splash range %d specified for skill ID %d in %s! Minimum is %d, maximum is %d. Defaulting to 0...\n",
+				    __func__, splash_range, sk->nameid, conf->file, SHRT_MIN, SHRT_MAX);
+	}
+}
+
+/**
+ * Validates a skill's number of hits when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the number of hits should be set it.
+ *
+ **/
+static void skill_validate_number_of_hits(struct config_setting_t *conf, struct s_skill_db *sk)
 {
-	struct config_setting_t *t = NULL, *tt = NULL;
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->num, 1);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "NumberOfHits");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int number_of_hits;
+
+			if (libconfig->setting_lookup_int(t, lv, &number_of_hits) == CONFIG_TRUE) {
+				if (number_of_hits >= SHRT_MIN && number_of_hits <= SHRT_MAX)
+					sk->num[i] = number_of_hits;
+				else
+					ShowWarning("%s: Invalid number of hits %d specified in level %d for skill ID %d in %s! Minimum is %d, maximum is %d. Defaulting to 1...\n",
+						    __func__, number_of_hits, i + 1, sk->nameid, conf->file, SHRT_MIN, SHRT_MAX);
+			}
+		}
+
+		return;
+	}
+
+	int number_of_hits;
+
+	if (libconfig->setting_lookup_int(conf, "NumberOfHits", &number_of_hits) == CONFIG_TRUE) {
+		if (number_of_hits >= SHRT_MIN && number_of_hits <= SHRT_MAX)
+			skill->level_set_value(sk->num, number_of_hits);
+		else
+			ShowWarning("%s: Invalid number of hits %d specified for skill ID %d in %s! Minimum is %d, maximum is %d. Defaulting to 1...\n",
+				    __func__, number_of_hits, sk->nameid, conf->file, SHRT_MIN, SHRT_MAX);
+	}
+}
+
+/**
+ * Validates a skill's cast interruptibility when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the cast interruptibility should be set it.
+ *
+ **/
+static void skill_validate_interrupt_cast(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->castcancel, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "InterruptCast");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int interrupt_cast;
+
+			if (libconfig->setting_lookup_bool(t, lv, &interrupt_cast) == CONFIG_TRUE)
+				sk->castcancel[i] = (interrupt_cast != 0) ? 1 : 0;
+		}
+
+		return;
+	}
+
+	int interrupt_cast;
+
+	if (libconfig->setting_lookup_bool(conf, "InterruptCast", &interrupt_cast) == CONFIG_TRUE) {
+		if (interrupt_cast != 0)
+			skill->level_set_value(sk->castcancel, 1);
+	}
+}
+
+/**
+ * Validates a skill's cast defence rate when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the cast defence rate should be set it.
+ *
+ **/
+static void skill_validate_cast_def_rate(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->cast_def_rate, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "CastDefRate");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int cast_def_rate;
+
+			if (libconfig->setting_lookup_int(t, lv, &cast_def_rate) == CONFIG_TRUE) {
+				if (cast_def_rate >= SHRT_MIN && cast_def_rate <= SHRT_MAX)
+					sk->cast_def_rate[i] = cast_def_rate;
+				else
+					ShowWarning("%s: Invalid cast defence rate %d specified in level %d for skill ID %d in %s! Minimum is %d, maximum is %d. Defaulting to 0...\n",
+						    __func__, cast_def_rate, i + 1, sk->nameid, conf->file, SHRT_MIN, SHRT_MAX);
+			}
+		}
+
+		return;
+	}
+
+	int cast_def_rate;
+
+	if (libconfig->setting_lookup_int(conf, "CastDefRate", &cast_def_rate) == CONFIG_TRUE) {
+		if (cast_def_rate >= SHRT_MIN && cast_def_rate <= SHRT_MAX)
+			skill->level_set_value(sk->cast_def_rate, cast_def_rate);
+		else
+			ShowWarning("%s: Invalid cast defence rate %d specified for skill ID %d in %s! Minimum is %d, maximum is %d. Defaulting to 0...\n",
+				    __func__, cast_def_rate, sk->nameid, conf->file, SHRT_MIN, SHRT_MAX);
+	}
+}
+
+/**
+ * Validates a skill's number of instances when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the number of instances should be set it.
+ *
+ **/
+static void skill_validate_number_of_instances(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->maxcount, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "SkillInstances");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int number_of_instances;
+
+			if (libconfig->setting_lookup_int(t, lv, &number_of_instances) == CONFIG_TRUE) {
+				if (number_of_instances >= 0 && number_of_instances <= MAX_SKILLUNITGROUP)
+					sk->maxcount[i] = number_of_instances;
+				else
+					ShowWarning("%s: Invalid number of instances %d specified in level %d for skill ID %d in %s! Minimum is 0, maximum is %d. Defaulting to 0...\n",
+						    __func__, number_of_instances, i + 1, sk->nameid, conf->file, MAX_SKILLUNITGROUP);
+			}
+		}
+
+		return;
+	}
+
+	int number_of_instances;
+
+	if (libconfig->setting_lookup_int(conf, "SkillInstances", &number_of_instances) == CONFIG_TRUE) {
+		if (number_of_instances >= 0 && number_of_instances <= MAX_SKILLUNITGROUP)
+			skill->level_set_value(sk->maxcount, number_of_instances);
+		else
+			ShowWarning("%s: Invalid number of instances %d specified for skill ID %d in %s! Minimum is 0, maximum is %d. Defaulting to 0...\n",
+				    __func__, number_of_instances, sk->nameid, conf->file, MAX_SKILLUNITGROUP);
+	}
+}
+
+/**
+ * Validates a skill's number of knock back tiles when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the number of knock back tiles should be set it.
+ *
+ **/
+static void skill_validate_knock_back_tiles(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->blewcount, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "KnockBackTiles");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int knock_back_tiles;
+
+			if (libconfig->setting_lookup_int(t, lv, &knock_back_tiles) == CONFIG_TRUE) {
+				if (knock_back_tiles >= 0)
+					sk->blewcount[i] = knock_back_tiles;
+				else
+					ShowWarning("%s: Invalid number of knock back tiles %d specified in level %d for skill ID %d in %s! Must be greater than or equal to 0. Defaulting to 0...\n",
+						    __func__, knock_back_tiles, i + 1, sk->nameid, conf->file);
+			}
+		}
+
+		return;
+	}
+
+	int knock_back_tiles;
+
+	if (libconfig->setting_lookup_int(conf, "KnockBackTiles", &knock_back_tiles) == CONFIG_TRUE) {
+		if (knock_back_tiles >= 0)
+			skill->level_set_value(sk->blewcount, knock_back_tiles);
+		else
+			ShowWarning("%s: Invalid number of knock back tiles %d specified for skill ID %d in %s! Must be greater than or equal to 0. Defaulting to 0...\n",
+				    __func__, knock_back_tiles, sk->nameid, conf->file);
+	}
+}
+
+/**
+ * Validates a skill's cast time when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the cast time should be set it.
+ *
+ **/
+static void skill_validate_cast_time(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->cast, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "CastTime");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int cast_time;
+
+			if (libconfig->setting_lookup_int(t, lv, &cast_time) == CONFIG_TRUE) {
+				if (cast_time >= 0)
+					sk->cast[i] = cast_time;
+				else
+					ShowWarning("%s: Invalid cast time %d specified in level %d for skill ID %d in %s! Must be greater than or equal to 0. Defaulting to 0...\n",
+						    __func__, cast_time, i + 1, sk->nameid, conf->file);
+			}
+		}
+
+		return;
+	}
+
+	int cast_time;
+
+	if (libconfig->setting_lookup_int(conf, "CastTime", &cast_time) == CONFIG_TRUE) {
+		if (cast_time >= 0)
+			skill->level_set_value(sk->cast, cast_time);
+		else
+			ShowWarning("%s: Invalid cast time %d specified for skill ID %d in %s! Must be greater than or equal to 0. Defaulting to 0...\n",
+				    __func__, cast_time, sk->nameid, conf->file);
+	}
+}
+
+/**
+ * Validates a skill's after cast act delay when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the after cast act delay should be set it.
+ *
+ **/
+static void skill_validate_act_delay(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->delay, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "AfterCastActDelay");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int act_delay;
+
+			if (libconfig->setting_lookup_int(t, lv, &act_delay) == CONFIG_TRUE) {
+				if (act_delay >= 0)
+					sk->delay[i] = act_delay;
+				else
+					ShowWarning("%s: Invalid after cast act delay %d specified in level %d for skill ID %d in %s! Must be greater than or equal to 0. Defaulting to 0...\n",
+						    __func__, act_delay, i + 1, sk->nameid, conf->file);
+			}
+		}
+
+		return;
+	}
+
+	int act_delay;
+
+	if (libconfig->setting_lookup_int(conf, "AfterCastActDelay", &act_delay) == CONFIG_TRUE) {
+		if (act_delay >= 0)
+			skill->level_set_value(sk->delay, act_delay);
+		else
+			ShowWarning("%s: Invalid after cast act delay %d specified for skill ID %d in %s! Must be greater than or equal to 0. Defaulting to 0...\n",
+				    __func__, act_delay, sk->nameid, conf->file);
+	}
+}
+
+/**
+ * Validates a skill's after cast walk delay when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the after cast walk delay should be set it.
+ *
+ **/
+static void skill_validate_walk_delay(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->walkdelay, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "AfterCastWalkDelay");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int walk_delay;
+
+			if (libconfig->setting_lookup_int(t, lv, &walk_delay) == CONFIG_TRUE) {
+				if (walk_delay >= 0)
+					sk->walkdelay[i] = walk_delay;
+				else
+					ShowWarning("%s: Invalid after cast walk delay %d specified in level %d for skill ID %d in %s! Must be greater than or equal to 0. Defaulting to 0...\n",
+						    __func__, walk_delay, i + 1, sk->nameid, conf->file);
+			}
+		}
+
+		return;
+	}
+
+	int walk_delay;
+
+	if (libconfig->setting_lookup_int(conf, "AfterCastWalkDelay", &walk_delay) == CONFIG_TRUE) {
+		if (walk_delay >= 0)
+			skill->level_set_value(sk->walkdelay, walk_delay);
+		else
+			ShowWarning("%s: Invalid after cast walk delay %d specified for skill ID %d in %s! Must be greater than or equal to 0. Defaulting to 0...\n",
+				    __func__, walk_delay, sk->nameid, conf->file);
+	}
+}
+
+/**
+ * Validates a skill's stay duration when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the stay duration should be set it.
+ *
+ **/
+static void skill_validate_skill_data1(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->upkeep_time, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "SkillData1");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int skill_data1;
+
+			if (libconfig->setting_lookup_int(t, lv, &skill_data1) == CONFIG_TRUE) {
+				if (skill_data1 >= INFINITE_DURATION)
+					sk->upkeep_time[i] = skill_data1;
+				else
+					ShowWarning("%s: Invalid stay duration %d specified in level %d for skill ID %d in %s! Must be greater than or equal to %d. Defaulting to 0...\n",
+						    __func__, skill_data1, i + 1, sk->nameid, conf->file, INFINITE_DURATION);
+			}
+		}
+
+		return;
+	}
+
+	int skill_data1;
+
+	if (libconfig->setting_lookup_int(conf, "SkillData1", &skill_data1) == CONFIG_TRUE) {
+		if (skill_data1 >= INFINITE_DURATION)
+			skill->level_set_value(sk->upkeep_time, skill_data1);
+		else
+			ShowWarning("%s: Invalid stay duration %d specified for skill ID %d in %s! Must be greater than or equal to %d. Defaulting to 0...\n",
+				    __func__, skill_data1, sk->nameid, conf->file, INFINITE_DURATION);
+	}
+}
+
+/**
+ * Validates a skill's effect duration when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the effect duration should be set it.
+ *
+ **/
+static void skill_validate_skill_data2(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->upkeep_time2, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "SkillData2");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int skill_data2;
+
+			if (libconfig->setting_lookup_int(t, lv, &skill_data2) == CONFIG_TRUE) {
+				if (skill_data2 >= INFINITE_DURATION)
+					sk->upkeep_time2[i] = skill_data2;
+				else
+					ShowWarning("%s: Invalid effect duration %d specified in level %d for skill ID %d in %s! Must be greater than or equal to %d. Defaulting to 0...\n",
+						    __func__, skill_data2, i + 1, sk->nameid, conf->file, INFINITE_DURATION);
+			}
+		}
+
+		return;
+	}
+
+	int skill_data2;
+
+	if (libconfig->setting_lookup_int(conf, "SkillData2", &skill_data2) == CONFIG_TRUE) {
+		if (skill_data2 >= INFINITE_DURATION)
+			skill->level_set_value(sk->upkeep_time2, skill_data2);
+		else
+			ShowWarning("%s: Invalid effect duration %d specified for skill ID %d in %s! Must be greater than or equal to %d. Defaulting to 0...\n",
+				    __func__, skill_data2, sk->nameid, conf->file, INFINITE_DURATION);
+	}
+}
+
+/**
+ * Validates a skill's cooldown when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the cooldown should be set it.
+ *
+ **/
+static void skill_validate_cooldown(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->cooldown, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "CoolDown");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int cooldown;
+
+			if (libconfig->setting_lookup_int(t, lv, &cooldown) == CONFIG_TRUE) {
+				if (cooldown >= 0)
+					sk->cooldown[i] = cooldown;
+				else
+					ShowWarning("%s: Invalid cooldown %d specified in level %d for skill ID %d in %s! Must be greater than or equal to 0. Defaulting to 0...\n",
+						    __func__, cooldown, i + 1, sk->nameid, conf->file);
+			}
+		}
+
+		return;
+	}
+
+	int cooldown;
+
+	if (libconfig->setting_lookup_int(conf, "CoolDown", &cooldown) == CONFIG_TRUE) {
+		if (cooldown >= 0)
+			skill->level_set_value(sk->cooldown, cooldown);
+		else
+			ShowWarning("%s: Invalid cooldown %d specified for skill ID %d in %s! Must be greater than or equal to 0. Defaulting to 0...\n",
+				    __func__, cooldown, sk->nameid, conf->file);
+	}
+}
+
+/**
+ * Validates a skill's fixed cast time when reading the skill DB.
+ * If RENEWAL_CAST is not defined, nothing is done.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the fixed cast time should be set it.
+ *
+ **/
+static void skill_validate_fixed_cast_time(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+#ifdef RENEWAL_CAST
+	skill->level_set_value(sk->fixed_cast, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "FixedCastTime");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int fixed_cast_time;
+
+			if (libconfig->setting_lookup_int(t, lv, &fixed_cast_time) == CONFIG_TRUE) {
+				if (fixed_cast_time >= INFINITE_DURATION)
+					sk->fixed_cast[i] = fixed_cast_time;
+				else
+					ShowWarning("%s: Invalid fixed cast time %d specified in level %d for skill ID %d in %s! Must be greater than or equal to %d. Defaulting to 0...\n",
+						    __func__, fixed_cast_time, i + 1, sk->nameid, conf->file, INFINITE_DURATION);
+			}
+		}
+
+		return;
+	}
+
+	int fixed_cast_time;
+
+	if (libconfig->setting_lookup_int(conf, "FixedCastTime", &fixed_cast_time) == CONFIG_TRUE) {
+		if (fixed_cast_time >= INFINITE_DURATION)
+			skill->level_set_value(sk->fixed_cast, fixed_cast_time);
+		else
+			ShowWarning("%s: Invalid fixed cast time %d specified for skill ID %d in %s! Must be greater than or equal to %d. Defaulting to 0...\n",
+				    __func__, fixed_cast_time, sk->nameid, conf->file, INFINITE_DURATION);
+	}
+#else
+#ifndef RENEWAL /** Check pre-RE skill DB for FixedCastTime. **/
+	if (libconfig->setting_get_member(conf, "FixedCastTime") != NULL)
+		ShowWarning("%s: Fixed cast time was specified for skill ID %d in %s without RENEWAL_CAST being defined! Skipping...\n", __func__, sk->nameid, conf->file);
+#endif /** RENEWAL **/
+#endif /** RENEWAL_CAST **/
+}
 
+/**
+ * Validates a skill's cast time or delay options when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the cast time or delay options should be set it.
+ * @param delay If true, the skill's delay options are validated, otherwise its cast time options.
+ *
+ **/
+static void skill_validate_castnodex(struct config_setting_t *conf, struct s_skill_db *sk, bool delay)
+{
+	nullpo_retv(conf);
 	nullpo_retv(sk);
-	if ((t=libconfig->setting_get_member(conf, delay?"SkillDelayOptions":"CastTimeOptions")) && config_setting_is_group(t)) {
-		int j = 0, tmpopt = 0;
-		while ((tt = libconfig->setting_get_elem(t, j++)) && j < 4) {
-			const char *type = config_setting_name(tt);
+
+	skill->level_set_value(delay ? sk->delaynodex : sk->castnodex, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, delay ? "SkillDelayOptions" : "CastTimeOptions");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		struct config_setting_t *tt;
+		int i = 0;
+		int options = 0;
+
+		while ((tt = libconfig->setting_get_elem(t, i++)) != NULL) {
+			const char *value = config_setting_name(tt);
 			bool on = libconfig->setting_get_bool_real(tt);
 
-			if (strcmpi(type, "IgnoreDex") == 0) {
-				if (on) {
-					tmpopt |= 1<<0;
-				} else {
-					tmpopt &= ~(1<<0);
-				}
-			} else if (strcmpi(type, "IgnoreStatusEffect") == 0) {
-				if (on) {
-					tmpopt |= 1<<1;
-				} else {
-					tmpopt &= ~(1<<1);
-				}
-			} else if (strcmpi(type, "IgnoreItemBonus") == 0) {
-				if (on) {
-					tmpopt |= 1<<2;
-				} else {
-					tmpopt &= ~(1<<2);
-				}
+			if (strcmpi(value, "IgnoreDex") == 0) {
+				if (on)
+					options |= 1;
+				else
+					options &= ~1;
+			} else if (strcmpi(value, "IgnoreStatusEffect") == 0) {
+				if (on)
+					options |= 2;
+				else
+					options &= ~2;
+			} else if (strcmpi(value, "IgnoreItemBonus") == 0) {
+				if (on)
+					options |= 4;
+				else
+					options &= ~4;
 			} else {
-				skilldb_invalid_error(type, config_setting_name(t), sk->nameid);
-				return;
+				const char *option_string = delay ? "skill delay" : "cast time";
+				ShowWarning("%s: Invalid %s option %s specified for skill ID %d in %s! Skipping option...\n",
+					    __func__, option_string, value, sk->nameid, conf->file);
 			}
+		}
 
+		skill->level_set_value(delay ? sk->delaynodex : sk->castnodex, options);
+	}
+}
+
+/**
+ * Validates a skill's HP cost when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the HP cost should be set it.
+ *
+ **/
+static void skill_validate_hp_cost(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->hp, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "HPCost");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int hp_cost;
+
+			if (libconfig->setting_lookup_int(t, lv, &hp_cost) == CONFIG_TRUE) {
+				if (hp_cost >= 0 && hp_cost <= battle_config.max_hp)
+					sk->hp[i] = hp_cost;
+				else
+					ShowWarning("%s: Invalid HP cost %d specified in level %d for skill ID %d in %s! Minimum is 0, maximum is %d. Defaulting to 0...\n",
+						    __func__, hp_cost, i + 1, sk->nameid, conf->file, battle_config.max_hp);
+			}
 		}
-		skill->level_set_value(delay?sk->delaynodex:sk->castnodex, tmpopt);
+
+		return;
+	}
+
+	int hp_cost;
+
+	if (libconfig->setting_lookup_int(conf, "HPCost", &hp_cost) == CONFIG_TRUE) {
+		if (hp_cost >= 0 && hp_cost <= battle_config.max_hp)
+			skill->level_set_value(sk->hp, hp_cost);
+		else
+			ShowWarning("%s: Invalid HP cost %d specified for skill ID %d in %s! Minimum is 0, maximum is %d. Defaulting to 0...\n",
+				    __func__, hp_cost, sk->nameid, conf->file, battle_config.max_hp);
 	}
 }
 
 /**
- * Validates the "WeaponTypes" flag
- * when parsing skill_db.conf
- * @param   *type    const char, weapon type flag
- * @param   on       boolean, switch for the flag
- * @param   *sk      struct, pointer to s_skill_db
- * @return void
- */
+ * Validates a skill's SP cost when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the SP cost should be set it.
+ *
+ **/
+static void skill_validate_sp_cost(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->sp, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "SPCost");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int sp_cost;
+
+			if (libconfig->setting_lookup_int(t, lv, &sp_cost) == CONFIG_TRUE) {
+				if (sp_cost >= 0 && sp_cost <= battle_config.max_sp)
+					sk->sp[i] = sp_cost;
+				else
+					ShowWarning("%s: Invalid SP cost %d specified in level %d for skill ID %d in %s! Minimum is 0, maximum is %d. Defaulting to 0...\n",
+						    __func__, sp_cost, i + 1, sk->nameid, conf->file, battle_config.max_sp);
+			}
+		}
+
+		return;
+	}
+
+	int sp_cost;
+
+	if (libconfig->setting_lookup_int(conf, "SPCost", &sp_cost) == CONFIG_TRUE) {
+		if (sp_cost >= 0 && sp_cost <= battle_config.max_sp)
+			skill->level_set_value(sk->sp, sp_cost);
+		else
+			ShowWarning("%s: Invalid SP cost %d specified for skill ID %d in %s! Minimum is 0, maximum is %d. Defaulting to 0...\n",
+				    __func__, sp_cost, sk->nameid, conf->file, battle_config.max_sp);
+	}
+}
+
+/**
+ * Validates a skill's HP rate cost when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the HP rate cost should be set it.
+ *
+ **/
+static void skill_validate_hp_rate_cost(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->hp_rate, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "HPRateCost");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int hp_rate_cost;
+
+			if (libconfig->setting_lookup_int(t, lv, &hp_rate_cost) == CONFIG_TRUE) {
+				if (hp_rate_cost >= -100 && hp_rate_cost <= 100)
+					sk->hp_rate[i] = hp_rate_cost;
+				else
+					ShowWarning("%s: Invalid HP rate cost %d specified in level %d for skill ID %d in %s! Minimum is -100, maximum is 100. Defaulting to 0...\n",
+						    __func__, hp_rate_cost, i + 1, sk->nameid, conf->file);
+			}
+		}
+
+		return;
+	}
+
+	int hp_rate_cost;
+
+	if (libconfig->setting_lookup_int(conf, "HPRateCost", &hp_rate_cost) == CONFIG_TRUE) {
+		if (hp_rate_cost >= -100 && hp_rate_cost <= 100)
+			skill->level_set_value(sk->hp_rate, hp_rate_cost);
+		else
+			ShowWarning("%s: Invalid HP rate cost %d specified for skill ID %d in %s! Minimum is -100, maximum is 100. Defaulting to 0...\n",
+				    __func__, hp_rate_cost, sk->nameid, conf->file);
+	}
+}
+
+/**
+ * Validates a skill's SP rate cost when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the SP rate cost should be set it.
+ *
+ **/
+static void skill_validate_sp_rate_cost(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->sp_rate, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "SPRateCost");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int sp_rate_cost;
+
+			if (libconfig->setting_lookup_int(t, lv, &sp_rate_cost) == CONFIG_TRUE) {
+				if (sp_rate_cost >= -100 && sp_rate_cost <= 100)
+					sk->sp_rate[i] = sp_rate_cost;
+				else
+					ShowWarning("%s: Invalid SP rate cost %d specified in level %d for skill ID %d in %s! Minimum is -100, maximum is 100. Defaulting to 0...\n",
+						    __func__, sp_rate_cost, i + 1, sk->nameid, conf->file);
+			}
+		}
+
+		return;
+	}
+
+	int sp_rate_cost;
+
+	if (libconfig->setting_lookup_int(conf, "SPRateCost", &sp_rate_cost) == CONFIG_TRUE) {
+		if (sp_rate_cost >= -100 && sp_rate_cost <= 100)
+			skill->level_set_value(sk->sp_rate, sp_rate_cost);
+		else
+			ShowWarning("%s: Invalid SP rate cost %d specified for skill ID %d in %s! Minimum is -100, maximum is 100. Defaulting to 0...\n",
+				    __func__, sp_rate_cost, sk->nameid, conf->file);
+	}
+}
+
+/**
+ * Validates a skill's maximum HP trigger when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the maximum HP trigger should be set it.
+ *
+ **/
+static void skill_validate_max_hp_trigger(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->mhp, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "MaxHPTrigger");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int max_hp_trigger;
+
+			if (libconfig->setting_lookup_int(t, lv, &max_hp_trigger) == CONFIG_TRUE) {
+				if (max_hp_trigger >= 0 && max_hp_trigger <= 100)
+					sk->mhp[i] = max_hp_trigger;
+				else
+					ShowWarning("%s: Invalid maximum HP trigger %d specified in level %d for skill ID %d in %s! Minimum is 0, maximum is 100. Defaulting to 0...\n",
+						    __func__, max_hp_trigger, i + 1, sk->nameid, conf->file);
+			}
+		}
+
+		return;
+	}
+
+	int max_hp_trigger;
+
+	if (libconfig->setting_lookup_int(conf, "MaxHPTrigger", &max_hp_trigger) == CONFIG_TRUE) {
+		if (max_hp_trigger >= 0 && max_hp_trigger <= 100)
+			skill->level_set_value(sk->mhp, max_hp_trigger);
+		else
+			ShowWarning("%s: Invalid maximum HP trigger %d specified for skill ID %d in %s! Minimum is 0, maximum is 100. Defaulting to 0...\n",
+				    __func__, max_hp_trigger, sk->nameid, conf->file);
+	}
+}
+
+/**
+ * Validates a skill's maximum SP trigger when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the maximum SP trigger should be set it.
+ *
+ **/
+static void skill_validate_max_sp_trigger(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->msp, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "MaxSPTrigger");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int max_sp_trigger;
+
+			if (libconfig->setting_lookup_int(t, lv, &max_sp_trigger) == CONFIG_TRUE) {
+				if (max_sp_trigger >= 0 && max_sp_trigger <= 100)
+					sk->msp[i] = max_sp_trigger;
+				else
+					ShowWarning("%s: Invalid maximum SP trigger %d specified in level %d for skill ID %d in %s! Minimum is 0, maximum is 100. Defaulting to 0...\n",
+						    __func__, max_sp_trigger, i + 1, sk->nameid, conf->file);
+			}
+		}
+
+		return;
+	}
+
+	int max_sp_trigger;
+
+	if (libconfig->setting_lookup_int(conf, "MaxSPTrigger", &max_sp_trigger) == CONFIG_TRUE) {
+		if (max_sp_trigger >= 0 && max_sp_trigger <= 100)
+			skill->level_set_value(sk->msp, max_sp_trigger);
+		else
+			ShowWarning("%s: Invalid maximum SP trigger %d specified for skill ID %d in %s! Minimum is 0, maximum is 100. Defaulting to 0...\n",
+				    __func__, max_sp_trigger, sk->nameid, conf->file);
+	}
+}
+
+/**
+ * Validates a skill's Zeny cost when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the Zeny cost should be set it.
+ *
+ **/
+static void skill_validate_zeny_cost(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->zeny, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "ZenyCost");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int zeny_cost;
+
+			if (libconfig->setting_lookup_int(t, lv, &zeny_cost) == CONFIG_TRUE) {
+				if (zeny_cost >= 0 && zeny_cost <= MAX_ZENY)
+					sk->zeny[i] = zeny_cost;
+				else
+					ShowWarning("%s: Invalid Zeny cost %d specified in level %d for skill ID %d in %s! Minimum is 0, maximum is %d. Defaulting to 0...\n",
+						    __func__, zeny_cost, i + 1, sk->nameid, conf->file, MAX_ZENY);
+			}
+		}
+
+		return;
+	}
+
+	int zeny_cost;
+
+	if (libconfig->setting_lookup_int(conf, "ZenyCost", &zeny_cost) == CONFIG_TRUE) {
+		if (zeny_cost >= 0 && zeny_cost <= MAX_ZENY)
+			skill->level_set_value(sk->zeny, zeny_cost);
+		else
+			ShowWarning("%s: Invalid Zeny cost %d specified for skill ID %d in %s! Minimum is 0, maximum is %d. Defaulting to 0...\n",
+				    __func__, zeny_cost, sk->nameid, conf->file, MAX_ZENY);
+	}
+}
+
+/**
+ * Validates a single weapon type when reading the skill DB.
+ *
+ * @param type The weapon type to validate.
+ * @param on Whether the weapon type is required for the skill.
+ * @param sk The s_skill_db struct where the weapon type should be set it.
+ * @return 0 if the passed weapon type is valid, otherwise 1.
+ *
+ **/
 static int skill_validate_weapontype_sub(const char *type, bool on, struct s_skill_db *sk)
 {
-	nullpo_ret(sk);
+	nullpo_retr(1, type);
+	nullpo_retr(1, sk);
+
 	if (strcmpi(type, "NoWeapon") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_FIST;
-		} else {
-			sk->weapon &= ~(1<<W_FIST);
-		}
+		if (on)
+			sk->weapon |= (1 << W_FIST);
+		else
+			sk->weapon &= ~(1 << W_FIST);
 	} else if (strcmpi(type, "Daggers") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_DAGGER;
-		} else {
-			sk->weapon &= ~(1<<W_DAGGER);
-		}
+		if (on)
+			sk->weapon |= (1 << W_DAGGER);
+		else
+			sk->weapon &= ~(1 << W_DAGGER);
 	} else if (strcmpi(type, "1HSwords") == 0) {
 
-		if (on) {
-			sk->weapon |= 1<<W_1HSWORD;
-		} else {
-			sk->weapon &= ~(1<<W_1HSWORD);
-		}
+		if (on)
+			sk->weapon |= (1 << W_1HSWORD);
+		else
+			sk->weapon &= ~(1 << W_1HSWORD);
 	} else if (strcmpi(type, "2HSwords") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_2HSWORD;
-		} else {
-			sk->weapon &= ~(1<<W_2HSWORD);
-		}
+		if (on)
+			sk->weapon |= (1 << W_2HSWORD);
+		else
+			sk->weapon &= ~(1 << W_2HSWORD);
 	} else if (strcmpi(type, "1HSpears") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_1HSPEAR;
-		} else {
-			sk->weapon &= ~(1<<W_1HSPEAR);
-		}
+		if (on)
+			sk->weapon |= (1 << W_1HSPEAR);
+		else
+			sk->weapon &= ~(1 << W_1HSPEAR);
 	} else if (strcmpi(type, "2HSpears") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_2HSPEAR;
-		} else {
-			sk->weapon &= ~(1<<W_2HSPEAR);
-		}
+		if (on)
+			sk->weapon |= (1 << W_2HSPEAR);
+		else
+			sk->weapon &= ~(1 << W_2HSPEAR);
 	} else if (strcmpi(type, "1HAxes") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_1HAXE;
-		} else {
-			sk->weapon &= ~(1<<W_1HAXE);
-		}
+		if (on)
+			sk->weapon |= (1 << W_1HAXE);
+		else
+			sk->weapon &= ~(1 << W_1HAXE);
 	} else if (strcmpi(type, "2HAxes") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_2HAXE;
-		} else {
-			sk->weapon &= ~(1<<W_2HAXE);
-		}
+		if (on)
+			sk->weapon |= (1 << W_2HAXE);
+		else
+			sk->weapon &= ~(1 << W_2HAXE);
 	} else if (strcmpi(type, "Maces") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_MACE;
-		} else {
-			sk->weapon &= ~(1<<W_MACE);
-		}
+		if (on)
+			sk->weapon |= (1 << W_MACE);
+		else
+			sk->weapon &= ~(1 << W_MACE);
 	} else if (strcmpi(type, "2HMaces") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_2HMACE;
-		} else {
-			sk->weapon &= ~(1<<W_2HMACE);
-		}
+		if (on)
+			sk->weapon |= (1 << W_2HMACE);
+		else
+			sk->weapon &= ~(1 << W_2HMACE);
 	} else if (strcmpi(type, "Staves") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_STAFF;
-		} else {
-			sk->weapon &= ~(1<<W_STAFF);
-		}
+		if (on)
+			sk->weapon |= (1 << W_STAFF);
+		else
+			sk->weapon &= ~(1 << W_STAFF);
 	} else if (strcmpi(type, "Bows") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_BOW;
-		} else {
-			sk->weapon &= ~(1<<W_BOW);
-		}
+		if (on)
+			sk->weapon |= (1 << W_BOW);
+		else
+			sk->weapon &= ~(1 << W_BOW);
 	} else if (strcmpi(type, "Knuckles") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_KNUCKLE;
-		} else {
-			sk->weapon &= ~(1<<W_KNUCKLE);
-		}
+		if (on)
+			sk->weapon |= (1 << W_KNUCKLE);
+		else
+			sk->weapon &= ~(1 << W_KNUCKLE);
 	} else if (strcmpi(type, "Instruments") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_MUSICAL;
-		} else {
-			sk->weapon &= ~(1<<W_MUSICAL);
-		}
+		if (on)
+			sk->weapon |= (1 << W_MUSICAL);
+		else
+			sk->weapon &= ~(1 << W_MUSICAL);
 	} else if (strcmpi(type, "Whips") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_WHIP;
-		} else {
-			sk->weapon &= ~(1<<W_WHIP);
-		}
+		if (on)
+			sk->weapon |= (1 << W_WHIP);
+		else
+			sk->weapon &= ~(1 << W_WHIP);
 	} else if (strcmpi(type, "Books") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_BOOK;
-		} else {
-			sk->weapon &= ~(1<<W_BOOK);
-		}
+		if (on)
+			sk->weapon |= (1 << W_BOOK);
+		else
+			sk->weapon &= ~(1 << W_BOOK);
 	} else if (strcmpi(type, "Katars") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_KATAR;
-		} else {
-			sk->weapon &= ~(1<<W_KATAR);
-		}
+		if (on)
+			sk->weapon |= (1 << W_KATAR);
+		else
+			sk->weapon &= ~(1 << W_KATAR);
 	} else if (strcmpi(type, "Revolvers") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_REVOLVER;
-		} else {
-			sk->weapon &= ~(1<<W_REVOLVER);
-		}
+		if (on)
+			sk->weapon |= (1 << W_REVOLVER);
+		else
+			sk->weapon &= ~(1 << W_REVOLVER);
 	} else if (strcmpi(type, "Rifles") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_RIFLE;
-		} else {
-			sk->weapon &= ~(1<<W_RIFLE);
-		}
+		if (on)
+			sk->weapon |= (1 << W_RIFLE);
+		else
+			sk->weapon &= ~(1 << W_RIFLE);
 	} else if (strcmpi(type, "GatlingGuns") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_GATLING;
-		} else {
-			sk->weapon &= ~(1<<W_GATLING);
-		}
+		if (on)
+			sk->weapon |= (1 << W_GATLING);
+		else
+			sk->weapon &= ~(1 << W_GATLING);
 	} else if (strcmpi(type, "Shotguns") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_SHOTGUN;
-		} else {
-			sk->weapon &= ~(1<<W_SHOTGUN);
-		}
+		if (on)
+			sk->weapon |= (1 << W_SHOTGUN);
+		else
+			sk->weapon &= ~(1 << W_SHOTGUN);
 	} else if (strcmpi(type, "GrenadeLaunchers") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_GRENADE;
-		} else {
-			sk->weapon &= ~(1<<W_GRENADE);
-		}
+		if (on)
+			sk->weapon |= (1 << W_GRENADE);
+		else
+			sk->weapon &= ~(1 << W_GRENADE);
 	} else if (strcmpi(type, "FuumaShurikens") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_HUUMA;
-		} else {
-			sk->weapon &= ~(1<<W_HUUMA);
-		}
+		if (on)
+			sk->weapon |= (1 << W_HUUMA);
+		else
+			sk->weapon &= ~(1 << W_HUUMA);
 	} else if (strcmpi(type, "2HStaves") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_2HSTAFF;
-		} else {
-			sk->weapon &= ~(1<<W_2HSTAFF);
-		}
-	}
-	/*  MAX_SINGLE_WEAPON_TYPE excluded */
-	else if (strcmpi(type, "DWDaggers") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_DOUBLE_DD;
-		} else {
-			sk->weapon &= ~(1<<W_DOUBLE_DD);
-		}
+		if (on)
+			sk->weapon |= (1 << W_2HSTAFF);
+		else
+			sk->weapon &= ~(1 << W_2HSTAFF);
+	} else if (strcmpi(type, "DWDaggers") == 0) {
+		if (on)
+			sk->weapon |= (1 << W_DOUBLE_DD);
+		else
+			sk->weapon &= ~(1 << W_DOUBLE_DD);
 	} else if (strcmpi(type, "DWSwords") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_DOUBLE_SS;
-		} else {
-			sk->weapon &= ~(1<<W_DOUBLE_SS);
-		}
+		if (on)
+			sk->weapon |= (1 << W_DOUBLE_SS);
+		else
+			sk->weapon &= ~(1 << W_DOUBLE_SS);
 	} else if (strcmpi(type, "DWAxes") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_DOUBLE_AA;
-		} else {
-			sk->weapon &= ~(1<<W_DOUBLE_AA);
-		}
+		if (on)
+			sk->weapon |= (1 << W_DOUBLE_AA);
+		else
+			sk->weapon &= ~(1 << W_DOUBLE_AA);
 	} else if (strcmpi(type, "DWDaggerSword") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_DOUBLE_DS;
-		} else {
-			sk->weapon &= ~(1<<W_DOUBLE_DS);
-		}
+		if (on)
+			sk->weapon |= (1 << W_DOUBLE_DS);
+		else
+			sk->weapon &= ~(1 << W_DOUBLE_DS);
 	} else if (strcmpi(type, "DWDaggerAxe") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_DOUBLE_DA;
-		} else {
-			sk->weapon &= ~(1<<W_DOUBLE_DA);
-		}
+		if (on)
+			sk->weapon |= (1 << W_DOUBLE_DA);
+		else
+			sk->weapon &= ~(1 << W_DOUBLE_DA);
 	} else if (strcmpi(type, "DWSwordAxe") == 0) {
-		if (on) {
-			sk->weapon |= 1<<W_DOUBLE_SA;
-		} else {
-			sk->weapon &= ~(1<<W_DOUBLE_SA);
-		}
+		if (on)
+			sk->weapon |= (1 << W_DOUBLE_SA);
+		else
+			sk->weapon &= ~(1 << W_DOUBLE_SA);
 	} else if (strcmpi(type, "All") == 0) {
 		sk->weapon = 0;
 	} else {
-		ShowError("Item %d. Unknown weapon type %s\n", sk->nameid, type);
-		return 1; // invalid type
+		return 1;
 	}
 
 	return 0;
 }
 
 /**
- * Validates "WeaponTypes"
- * when parsing skill_db.conf
- * @param   conf    struct, pointer to the skill configuration
- * @param   sk      struct, struct, pointer to s_skill_db
- * @return  (void)
- */
+ * Validates a skill's required weapon types when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the required weapon types should be set it.
+ *
+ **/
 static void skill_validate_weapontype(struct config_setting_t *conf, struct s_skill_db *sk)
 {
-	struct config_setting_t *tt = NULL;
-	const char *type = NULL;
-
+	nullpo_retv(conf);
 	nullpo_retv(sk);
-	if ((tt = libconfig->setting_get_member(conf, "WeaponTypes")) && config_setting_is_group(tt)) {
-		int j = 0;
-		struct config_setting_t *wpt = NULL;
-		while ((wpt = libconfig->setting_get_elem(tt, j++)) != NULL) {
-			if (skill->validate_weapontype_sub(config_setting_name(wpt), libconfig->setting_get_bool_real(wpt), sk))
-				skilldb_invalid_error(config_setting_name(wpt), config_setting_name(tt), sk->nameid);
+
+	sk->weapon = 0;
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "WeaponTypes");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		struct config_setting_t *tt;
+		int i = 0;
+
+		while ((tt = libconfig->setting_get_elem(t, i++)) != NULL) {
+			bool on = libconfig->setting_get_bool_real(tt);
+
+			if (skill->validate_weapontype_sub(config_setting_name(tt), on, sk) != 0)
+				ShowWarning("%s: Invalid required weapon type %s specified for skill ID %d in %s! Skipping type...\n",
+					    __func__, config_setting_name(tt), sk->nameid, conf->file);
 		}
-	} else if (libconfig->setting_lookup_string(conf, "WeaponTypes", &type)) {
-		if (skill->validate_weapontype_sub(type, true, sk))
-			skilldb_invalid_error(type, "WeaponTypes", sk->nameid);
+
+		return;
+	}
+
+	const char *weapon_type;
+
+	if (libconfig->setting_lookup_string(conf, "WeaponTypes", &weapon_type) == CONFIG_TRUE) {
+		if (skill->validate_weapontype_sub(weapon_type, true, sk) != 0)
+			ShowWarning("%s: Invalid required weapon type %s specified for skill ID %d in %s! Defaulting to All...\n",
+				    __func__, weapon_type, sk->nameid, conf->file);
 	}
 }
 
 /**
- * Validates the "AmmoTypes" flag
- * when parsing skill_db.conf
- * @param   type    string, ammo type flag
- * @param   on      boolean, switch for the flag
- * @param   sk      struct, pointer to s_skill_db
- * @return void
- */
+ * Validates a single ammunition type when reading the skill DB.
+ *
+ * @param type The ammunition type to validate.
+ * @param on Whether the ammunition type is required for the skill.
+ * @param sk The s_skill_db struct where the ammunition type should be set it.
+ * @return 0 if the passed ammunition type is valid, otherwise 1.
+ *
+ **/
 static int skill_validate_ammotype_sub(const char *type, bool on, struct s_skill_db *sk)
 {
-	nullpo_ret(sk);
+	nullpo_retr(1, type);
+	nullpo_retr(1, sk);
+
 	if (strcmpi(type, "A_ARROW") == 0) {
-		if (on) {
-			sk->ammo |= 1<<A_ARROW;
-		} else {
-			sk->ammo &= ~(1<<A_ARROW);
-		}
+		if (on)
+			sk->ammo |= (1 << A_ARROW);
+		else
+			sk->ammo &= ~(1 << A_ARROW);
 	} else if (strcmpi(type, "A_DAGGER") == 0) {
-		if (on) {
-			sk->ammo |= 1<<A_DAGGER;
-		} else {
-			sk->ammo &= ~(1<<A_DAGGER);
-		}
+		if (on)
+			sk->ammo |= (1 << A_DAGGER);
+		else
+			sk->ammo &= ~(1 << A_DAGGER);
 	} else if (strcmpi(type, "A_BULLET") == 0) {
-		if (on) {
-			sk->ammo |= 1<<A_BULLET;
-		} else {
-			sk->ammo &= ~(1<<A_BULLET);
-		}
+		if (on)
+			sk->ammo |= (1 << A_BULLET);
+		else
+			sk->ammo &= ~(1 << A_BULLET);
 	} else if (strcmpi(type, "A_SHELL") == 0) {
-		if (on) {
-			sk->ammo |= 1<<A_SHELL;
-		} else {
-			sk->ammo &= ~(1<<A_SHELL);
-		}
+		if (on)
+			sk->ammo |= (1 << A_SHELL);
+		else
+			sk->ammo &= ~(1 << A_SHELL);
 	} else if (strcmpi(type, "A_GRENADE") == 0) {
-		if (on) {
-			sk->ammo |= 1<<A_GRENADE;
-		} else {
-			sk->ammo &= ~(1<<A_GRENADE);
-		}
+		if (on)
+			sk->ammo |= (1 << A_GRENADE);
+		else
+			sk->ammo &= ~(1 << A_GRENADE);
 	} else if (strcmpi(type, "A_SHURIKEN") == 0) {
-		if (on) {
-			sk->ammo |= 1<<A_SHURIKEN;
-		} else {
-			sk->ammo &= ~(1<<A_SHURIKEN);
-		}
+		if (on)
+			sk->ammo |= (1 << A_SHURIKEN);
+		else
+			sk->ammo &= ~(1 << A_SHURIKEN);
 	} else if (strcmpi(type, "A_KUNAI") == 0) {
-		if (on) {
-			sk->ammo |= 1<<A_KUNAI;
-		} else {
-			sk->ammo &= ~(1<<A_KUNAI);
-		}
+		if (on)
+			sk->ammo |= (1 << A_KUNAI);
+		else
+			sk->ammo &= ~(1 << A_KUNAI);
 	} else if (strcmpi(type, "A_CANNONBALL") == 0) {
-		if (on) {
-			sk->ammo |= 1<<A_CANNONBALL;
-		} else {
-			sk->ammo &= ~(1<<A_CANNONBALL);
-		}
+		if (on)
+			sk->ammo |= (1 << A_CANNONBALL);
+		else
+			sk->ammo &= ~(1 << A_CANNONBALL);
 	} else if (strcmpi(type, "A_THROWWEAPON") == 0) {
-		if (on) {
-			sk->ammo |= 1<<A_THROWWEAPON;
-		} else {
-			sk->ammo &= ~(1<<A_THROWWEAPON);
-		}
+		if (on)
+			sk->ammo |= (1 << A_THROWWEAPON);
+		else
+			sk->ammo &= ~(1 << A_THROWWEAPON);
 	} else if (strcmpi(type, "All") == 0) {
-		if (on) {
+		if (on)
 			sk->ammo = 0xFFFFFFFF;
-		} else {
+		else
 			sk->ammo = 0;
-		}
 	} else {
-		return 1; // Invalid Entry
+		return 1;
 	}
 
 	return 0;
 }
 
 /**
- * Validates the "AmmoTypes" flag
- * when parsing skill_db.conf
- * @param   conf    pointer to the skill configuration
- * @param   sk      struct, pointer to s_skill_db
- * @return void
- */
+ * Validates a skill's required ammunition types when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the required ammunition types should be set it.
+ *
+ **/
 static void skill_validate_ammotype(struct config_setting_t *conf, struct s_skill_db *sk)
 {
-	struct config_setting_t *tt = NULL;
-	const char *tstr = NULL;
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	sk->ammo = 0;
 
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "AmmoTypes");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		struct config_setting_t *tt;
+		int i = 0;
+
+		while ((tt = libconfig->setting_get_elem(t, i++)) != NULL) {
+			bool on = libconfig->setting_get_bool_real(tt);
+
+			if (skill->validate_ammotype_sub(config_setting_name(tt), on, sk) != 0)
+				ShowWarning("%s: Invalid required ammunition type %s specified for skill ID %d in %s! Skipping type...\n",
+					    __func__, config_setting_name(tt), sk->nameid, conf->file);
+		}
+	}
+
+	const char *ammo_type;
+
+	if (libconfig->setting_lookup_string(conf, "AmmoTypes", &ammo_type) == CONFIG_TRUE) {
+		if (skill->validate_ammotype_sub(ammo_type, true, sk) != 0)
+			ShowWarning("%s: Invalid required ammunition type %s specified for skill ID %d in %s! Defaulting to None...\n",
+				    __func__, ammo_type, sk->nameid, conf->file);
+	}
+}
+
+/**
+ * Validates a skill's required ammunition amount when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the required ammunition amount should be set it.
+ *
+ **/
+static void skill_validate_ammo_amount(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
 	nullpo_retv(sk);
-	if ((tt = libconfig->setting_get_member(conf, "AmmoTypes")) && config_setting_is_group(tt)) {
-		int j = 0;
-		struct config_setting_t *amt = { 0 };
-		while ((amt = libconfig->setting_get_elem(tt, j++))) {
-			if (skill->validate_ammotype_sub(config_setting_name(amt), libconfig->setting_get_bool_real(amt), sk))
-				skilldb_invalid_error(config_setting_name(amt), config_setting_name(tt), sk->nameid);
+
+	skill->level_set_value(sk->ammo_qty, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "AmmoAmount");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int ammo_amount;
+
+			if (libconfig->setting_lookup_int(t, lv, &ammo_amount) == CONFIG_TRUE) {
+				if (ammo_amount >= 0 && ammo_amount <= MAX_AMOUNT)
+					sk->ammo_qty[i] = ammo_amount;
+				else
+					ShowWarning("%s: Invalid required ammunition amount %d specified in level %d for skill ID %d in %s! Minimum is 0, maximum is %d. Defaulting to 0...\n",
+						    __func__, ammo_amount, i + 1, sk->nameid, conf->file, MAX_AMOUNT);
+			}
 		}
-	} else if( libconfig->setting_lookup_string(conf, "AmmoTypes", &tstr)) {
-		if (skill->validate_ammotype_sub(tstr, true, sk))
-			skilldb_invalid_error(tstr, "AmmoTypes", sk->nameid);
+
+		return;
+	}
+
+	int ammo_amount;
+
+	if (libconfig->setting_lookup_int(conf, "AmmoAmount", &ammo_amount) == CONFIG_TRUE) {
+		if (ammo_amount >= 0 && ammo_amount <= MAX_AMOUNT)
+			skill->level_set_value(sk->ammo_qty, ammo_amount);
+		else
+			ShowWarning("%s: Invalid required ammunition amount %d specified for skill ID %d in %s! Minimum is 0, maximum is %d. Defaulting to 0...\n",
+				    __func__, ammo_amount, sk->nameid, conf->file, MAX_AMOUNT);
 	}
 }
 
 /**
- * Validates the "State" flag
- * when parsing skill_db.conf
- * @param   conf    struct, pointer to the skill configuration
- * @param   sk      struct, pointer to s_skill_db
- * @return void
- */
+ * Validates a single required state when reading the skill DB.
+ *
+ * @param state The required state to validate.
+ * @return A number greater than or equal to 0 if the passed required state is valid, otherwise -1.
+ *
+ **/
+static int skill_validate_state_sub(const char *state)
+{
+	nullpo_retr(-1, state);
+
+	int ret_val = ST_NONE;
+
+	if (strcmpi(state, "Hiding") == 0)
+		ret_val = ST_HIDING;
+	else if (strcmpi(state, "Cloaking") == 0)
+		ret_val = ST_CLOAKING;
+	else if (strcmpi(state, "Hidden") == 0)
+		ret_val = ST_HIDDEN;
+	else if (strcmpi(state, "Riding") == 0)
+		ret_val = ST_RIDING;
+	else if (strcmpi(state, "Falcon") == 0)
+		ret_val = ST_FALCON;
+	else if (strcmpi(state, "Cart") == 0)
+		ret_val = ST_CART;
+	else if (strcmpi(state, "Shield") == 0)
+		ret_val = ST_SHIELD;
+	else if (strcmpi(state, "Sight") == 0)
+		ret_val = ST_SIGHT;
+	else if (strcmpi(state, "ExplosionSpirits") == 0)
+		ret_val = ST_EXPLOSIONSPIRITS;
+	else if (strcmpi(state, "CartBoost") == 0)
+		ret_val = ST_CARTBOOST;
+	else if (strcmpi(state, "NotOverWeight") == 0)
+		ret_val = ST_RECOV_WEIGHT_RATE;
+	else if (strcmpi(state, "Moveable") == 0)
+		ret_val = ST_MOVE_ENABLE;
+	else if (strcmpi(state, "InWater") == 0)
+		ret_val = ST_WATER;
+	else if (strcmpi(state, "Dragon") == 0)
+		ret_val = ST_RIDINGDRAGON;
+	else if (strcmpi(state, "Warg") == 0)
+		ret_val = ST_WUG;
+	else if (strcmpi(state, "RidingWarg") == 0)
+		ret_val = ST_RIDINGWUG;
+	else if (strcmpi(state, "MadoGear") == 0)
+		ret_val = ST_MADO;
+	else if (strcmpi(state, "ElementalSpirit") == 0)
+		ret_val = ST_ELEMENTALSPIRIT;
+	else if (strcmpi(state, "PoisonWeapon") == 0)
+		ret_val = ST_POISONINGWEAPON;
+	else if (strcmpi(state, "RollingCutter") == 0)
+		ret_val = ST_ROLLINGCUTTER;
+	else if (strcmpi(state, "MH_Fighting") == 0)
+		ret_val = ST_MH_FIGHTING;
+	else if (strcmpi(state, "MH_Grappling") == 0)
+		ret_val = ST_MH_GRAPPLING;
+	else if (strcmpi(state, "Peco") == 0)
+		ret_val = ST_PECO;
+	else if (strcmpi(state, "None") != 0)
+		ret_val = -1;
+
+	return ret_val;
+}
+
+/**
+ * Validates a skill's required states when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the required states should be set it.
+ *
+ **/
 static void skill_validate_state(struct config_setting_t *conf, struct s_skill_db *sk)
 {
-	const char *type = NULL;
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->state, ST_NONE);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "State");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			const char *state;
 
+			if (libconfig->setting_lookup_string(t, lv, &state) == CONFIG_TRUE) {
+				int sta = skill->validate_state_sub(state);
+
+				if (sta > ST_NONE)
+					sk->state[i] = sta;
+				else if (sta == -1)
+					ShowWarning("%s: Invalid required state %s specified in level %d for skill ID %d in %s! Defaulting to None...\n",
+						    __func__, state, i + 1, sk->nameid, conf->file);
+			}
+		}
+
+		return;
+	}
+
+	const char *state;
+
+	if (libconfig->setting_lookup_string(conf, "State", &state) == CONFIG_TRUE) {
+		int sta = skill->validate_state_sub(state);
+
+		if (sta > ST_NONE)
+			skill->level_set_value(sk->state, sta);
+		else if (sta == -1)
+			ShowWarning("%s: Invalid required state %s specified for skill ID %d in %s! Defaulting to None...\n",
+				    __func__, state, sk->nameid, conf->file);
+	}
+}
+
+/**
+ * Validates a skill's Spirit Sphere cost when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the Spirit Sphere cost should be set it.
+ *
+ **/
+static void skill_validate_spirit_sphere_cost(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
 	nullpo_retv(sk);
-	if (libconfig->setting_lookup_string(conf, "State", &type) && strcmpi(type,"None") != ST_NONE) {
-		if (     strcmpi(type,"Hiding")           == 0 ) sk->state = ST_HIDING;
-		else if (strcmpi(type,"Cloaking")         == 0 ) sk->state = ST_CLOAKING;
-		else if (strcmpi(type,"Hidden")           == 0 ) sk->state = ST_HIDDEN;
-		else if (strcmpi(type,"Riding")           == 0 ) sk->state = ST_RIDING;
-		else if (strcmpi(type,"Falcon")           == 0 ) sk->state = ST_FALCON;
-		else if (strcmpi(type,"Cart")             == 0 ) sk->state = ST_CART;
-		else if (strcmpi(type,"Shield")           == 0 ) sk->state = ST_SHIELD;
-		else if (strcmpi(type,"Sight")            == 0 ) sk->state = ST_SIGHT;
-		else if (strcmpi(type,"ExplosionSpirits") == 0 ) sk->state = ST_EXPLOSIONSPIRITS;
-		else if (strcmpi(type,"CartBoost")        == 0 ) sk->state = ST_CARTBOOST;
-		else if (strcmpi(type,"NotOverWeight")    == 0 ) sk->state = ST_RECOV_WEIGHT_RATE;
-		else if (strcmpi(type,"Moveable")         == 0 ) sk->state = ST_MOVE_ENABLE;
-		else if (strcmpi(type,"InWater")          == 0 ) sk->state = ST_WATER;
-		else if (strcmpi(type,"Dragon")           == 0 ) sk->state = ST_RIDINGDRAGON;
-		else if (strcmpi(type,"Warg")             == 0 ) sk->state = ST_WUG;
-		else if (strcmpi(type,"RidingWarg")       == 0 ) sk->state = ST_RIDINGWUG;
-		else if (strcmpi(type,"MadoGear")         == 0 ) sk->state = ST_MADO;
-		else if (strcmpi(type,"ElementalSpirit")  == 0 ) sk->state = ST_ELEMENTALSPIRIT;
-		else if (strcmpi(type,"PoisonWeapon")     == 0 ) sk->state = ST_POISONINGWEAPON;
-		else if (strcmpi(type,"RollingCutter")    == 0 ) sk->state = ST_ROLLINGCUTTER;
-		else if (strcmpi(type,"MH_Fighting")      == 0 ) sk->state = ST_MH_FIGHTING;
-		else if (strcmpi(type,"MH_Grappling")     == 0 ) sk->state = ST_MH_GRAPPLING;
-		else if (strcmpi(type,"Peco")             == 0 ) sk->state = ST_PECO;
+
+	skill->level_set_value(sk->spiritball, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "SpiritSphereCost");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int spirit_sphere_cost;
+
+			if (libconfig->setting_lookup_int(t, lv, &spirit_sphere_cost) == CONFIG_TRUE) {
+				if (spirit_sphere_cost >= 0 && spirit_sphere_cost <= MAX_SPIRITBALL)
+					sk->spiritball[i] = spirit_sphere_cost;
+				else
+					ShowWarning("%s: Invalid Spirit Sphere cost %d specified in level %d for skill ID %d in %s! Minimum is 0, maximum is %d. Defaulting to 0...\n",
+						    __func__, spirit_sphere_cost, i + 1, sk->nameid, conf->file, MAX_SPIRITBALL);
+			}
+		}
+
+		return;
+	}
+
+	int spirit_sphere_cost;
+
+	if (libconfig->setting_lookup_int(conf, "SpiritSphereCost", &spirit_sphere_cost) == CONFIG_TRUE) {
+		if (spirit_sphere_cost >= 0 && spirit_sphere_cost <= MAX_SPIRITBALL)
+			skill->level_set_value(sk->spiritball, spirit_sphere_cost);
 		else
-			skilldb_invalid_error(type, "State", sk->nameid);
+			ShowWarning("%s: Invalid Spirit Sphere cost %d specified for skill ID %d in %s! Minimum is 0, maximum is %d. Defaulting to 0...\n",
+				    __func__, spirit_sphere_cost, sk->nameid, conf->file, MAX_SPIRITBALL);
 	}
 }
 
 /**
- * Validates the "Items" flag
- * when parsing skill_db.conf
- * @param   conf    struct, pointer to the skill configuration
- * @param   sk      struct, pointer to s_skill_db
- * @return void
- */
+ * Validates a skill's required items amounts when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the required items amounts should be set it.
+ *
+ **/
+static void skill_validate_item_requirements_sub_item_amount(struct config_setting_t *conf, struct s_skill_db *sk, int item_index)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	for (int i = 0; i < MAX_SKILL_LEVEL; i++)
+		sk->req_items.item[item_index].amount[i] = 0;
+
+	if (config_setting_is_group(conf)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int amount;
+
+			if (libconfig->setting_lookup_int(conf, lv, &amount) == CONFIG_TRUE) {
+				if (amount >= 0 && amount <= MAX_AMOUNT)
+					sk->req_items.item[item_index].amount[i] = amount;
+				else
+					ShowWarning("%s: Invalid required item amount %d specified in level %d for skill ID %d in %s! Minimum is 0, maximum is %d. Defaulting to 0...\n",
+						    __func__, amount, i + 1, sk->nameid, conf->file, MAX_AMOUNT);
+			} else {
+				 // Items is not required for this skill level. (Not even in inventory!)
+				sk->req_items.item[item_index].amount[i] = -1;
+			}
+		}
+
+		return;
+	}
+
+	int amount = libconfig->setting_get_int(conf);
+
+	if (amount >= 0 && amount <= MAX_AMOUNT) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++)
+			sk->req_items.item[item_index].amount[i] = amount;
+	} else {
+		ShowWarning("%s: Invalid required item amount %d specified for skill ID %d in %s! Minimum is 0, maximum is %d. Defaulting to 0...\n",
+			    __func__, amount, sk->nameid, conf->file, MAX_AMOUNT);
+	}
+}
+
+/**
+ * Validates a skill's required items when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the required items should be set it.
+ *
+ **/
+static void skill_validate_item_requirements_sub_items(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	for (int i = 0; i < MAX_SKILL_ITEM_REQUIRE; i++) {
+		sk->req_items.item[i].id = 0;
+
+		for (int j = 0; j < MAX_SKILL_LEVEL; j++)
+			sk->req_items.item[i].amount[j] = 0;
+	}
+
+	int item_index = 0;
+	int count = libconfig->setting_length(conf);
+
+	for (int i = 0; i < count; i++) {
+		struct config_setting_t *t = libconfig->setting_get_elem(conf, i);
+
+		if (t != NULL && strcasecmp(config_setting_name(t), "Any") != 0) {
+			if (item_index >= MAX_SKILL_ITEM_REQUIRE) {
+				ShowWarning("%s: Too many required items specified for skill ID %d in %s! Skipping item %s...\n",
+					    __func__, sk->nameid, conf->file, config_setting_name(t));
+				continue;
+			}
+
+			int item_id = skill->validate_requirements_item_name(config_setting_name(t));
+
+			if (item_id == 0) {
+				ShowWarning("%s: Invalid required item %s specified for skill ID %d in %s! Skipping item...\n",
+					    __func__, config_setting_name(t), sk->nameid, conf->file);
+				continue;
+			}
+
+			int j;
+
+			ARR_FIND(0, MAX_SKILL_ITEM_REQUIRE, j, sk->req_items.item[j].id == item_id);
+
+			if (j < MAX_SKILL_ITEM_REQUIRE) {
+				ShowWarning("%s: Duplicate required item %s specified for skill ID %d in %s! Skipping item...\n",
+					    __func__, config_setting_name(t), sk->nameid, conf->file);
+				continue;
+			}
+
+			sk->req_items.item[item_index].id = item_id;
+			skill->validate_item_requirements_sub_item_amount(t, sk, item_index);
+			item_index++;
+		}
+	}
+}
+
+/**
+ * Validates a skill's required items any-flag when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the required items any-flag should be set it.
+ *
+ **/
+static void skill_validate_item_requirements_sub_any_flag(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	for (int i = 0; i < MAX_SKILL_LEVEL; i++)
+		sk->req_items.any[i] = false;
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "Any");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int any_flag;
+
+			if (libconfig->setting_lookup_bool(t, lv, &any_flag) == CONFIG_TRUE)
+				sk->req_items.any[i] = (any_flag != 0);
+		}
+
+		return;
+	}
+
+	int any_flag;
+
+	if (libconfig->setting_lookup_bool(conf, "Any", &any_flag) == CONFIG_TRUE && any_flag != 0) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++)
+			sk->req_items.any[i] = true;
+	}
+}
+
+/**
+ * Validates a skill's required items when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the required items should be set it.
+ *
+ **/
 static void skill_validate_item_requirements(struct config_setting_t *conf, struct s_skill_db *sk)
 {
-	struct config_setting_t *tt = NULL;
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "Items");
 
+	if (t != NULL && config_setting_is_group(t)) {
+		skill->validate_item_requirements_sub_any_flag(t, sk);
+		skill->validate_item_requirements_sub_items(t, sk);
+	}
+}
+
+/**
+ * Validates a skill's required equipment amounts when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the required equipment amounts should be set it.
+ *
+ **/
+static void skill_validate_equip_requirements_sub_item_amount(struct config_setting_t *conf, struct s_skill_db *sk, int item_index)
+{
+	nullpo_retv(conf);
 	nullpo_retv(sk);
-	if ((tt=libconfig->setting_get_member(conf, "Items")) && config_setting_is_group(conf)) {
-		int itx=-1;
-		struct config_setting_t *it;
 
-		while((it=libconfig->setting_get_elem(tt, ++itx)) && itx < MAX_SKILL_ITEM_REQUIRE) {
-			const char *type = config_setting_name(it);
+	for (int i = 0; i < MAX_SKILL_LEVEL; i++)
+		sk->req_equip.item[item_index].amount[i] = 0;
 
-			if( type[0] == 'I' && type[1] == 'D' && itemdb->exists(atoi(type+2)) )
-				sk->itemid[itx] = atoi(type+2);
-			else if(!script->get_constant(type, &sk->itemid[itx])) {
-				ShowWarning("skill_read_skilldb: Invalid required Item '%s' given for skill Id %d in '%s', skipping...\n",type, sk->nameid, DBPATH"skill_db.conf");
+	if (config_setting_is_group(conf)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int amount;
+
+			if (libconfig->setting_lookup_int(conf, lv, &amount) == CONFIG_TRUE) {
+				if (amount > 0) {
+					sk->req_equip.item[item_index].amount[i] = amount;
+				} else {
+					ShowWarning("%s: Invalid required equipment amount %d specified in level %d for skill ID %d in %s! Must be greater than 0. Defaulting to 1...\n",
+						    __func__, amount, i + 1, sk->nameid, conf->file);
+					sk->req_equip.item[item_index].amount[i] = 1;
+				}
+			}
+		}
+
+		return;
+	}
+
+	int amount = libconfig->setting_get_int(conf);
+
+	if (amount <= 0) {
+		ShowWarning("%s: Invalid required equipment amount %d specified for skill ID %d in %s! Must be greater than 0. Defaulting to 1...\n",
+			    __func__, amount, sk->nameid, conf->file);
+		amount = 1;
+	}
+
+	for (int i = 0; i < MAX_SKILL_LEVEL; i++)
+		sk->req_equip.item[item_index].amount[i] = amount;
+}
+
+/**
+ * Validates a skill's required equipment when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the required equipment should be set it.
+ *
+ **/
+static void skill_validate_equip_requirements_sub_items(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	for (int i = 0; i < MAX_SKILL_ITEM_REQUIRE; i++) {
+		sk->req_equip.item[i].id = 0;
+
+		for (int j = 0; j < MAX_SKILL_LEVEL; j++)
+			sk->req_equip.item[i].amount[j] = 0;
+	}
+
+	int item_index = 0;
+	int count = libconfig->setting_length(conf);
+
+	for (int i = 0; i < count; i++) {
+		struct config_setting_t *t = libconfig->setting_get_elem(conf, i);
+
+		if (t != NULL && strcasecmp(config_setting_name(t), "Any") != 0) {
+			if (item_index >= MAX_SKILL_ITEM_REQUIRE) {
+				ShowWarning("%s: Too many required equipment items specified for skill ID %d in %s! Skipping item %s...\n",
+					    __func__, sk->nameid, conf->file, config_setting_name(t));
 				continue;
 			}
 
-			if (config_setting_is_group(it)) {
-				// TODO: Per-level item requirements are not implemented yet!
-				// We just take the first level for the time being (old txt behavior)
-				sk->amount[itx] = libconfig->setting_get_int_elem(it, 0);
-			} else {
-				sk->amount[itx] = libconfig->setting_get_int(it);
+			int item_id = skill->validate_requirements_item_name(config_setting_name(t));
+			struct item_data *it = itemdb->exists(item_id);
+
+			if (item_id == 0 || it == NULL) {
+				ShowWarning("%s: Invalid required equipment item %s specified for skill ID %d in %s! Skipping item...\n",
+					    __func__, config_setting_name(t), sk->nameid, conf->file);
+				continue;
+			}
+
+			if (it->type != IT_WEAPON && it->type != IT_AMMO && it->type != IT_ARMOR && it->type != IT_CARD) {
+				ShowWarning("%s: Non-equipment item %s specified for skill ID %d in %s! Skipping item...\n",
+					    __func__, config_setting_name(t), sk->nameid, conf->file);
+				continue;
+			}
+
+			int j;
+
+			ARR_FIND(0, MAX_SKILL_ITEM_REQUIRE, j, sk->req_equip.item[j].id == item_id);
+
+			if (j < MAX_SKILL_ITEM_REQUIRE) {
+				ShowWarning("%s: Duplicate required equipment item %s specified for skill ID %d in %s! Skipping item...\n",
+					    __func__, config_setting_name(t), sk->nameid, conf->file);
+				continue;
 			}
+
+			sk->req_equip.item[item_index].id = item_id;
+			skill->validate_equip_requirements_sub_item_amount(t, sk, item_index);
+			item_index++;
 		}
 	}
 }
 
 /**
- * Validates the "Unit > Target" flag
- * when parsing skill_db.conf
- * @param   conf    struct, pointer to the skill configuration
- * @param   sk      struct, pointer to s_skill_db
- * @return void
- */
-static void skill_validate_unit_target(struct config_setting_t *conf, struct s_skill_db *sk)
+ * Validates a skill's required equipment any-flag when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the required equipment any-flag should be set it.
+ *
+ **/
+static void skill_validate_equip_requirements_sub_any_flag(struct config_setting_t *conf, struct s_skill_db *sk)
 {
-	const char *type = NULL;
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	for (int i = 0; i < MAX_SKILL_LEVEL; i++)
+		sk->req_equip.any[i] = false;
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "Any");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int any_flag;
+
+			if (libconfig->setting_lookup_bool(t, lv, &any_flag) == CONFIG_TRUE)
+				sk->req_equip.any[i] = (any_flag != 0);
+		}
+
+		return;
+	}
+
+	int any_flag;
+
+	if (libconfig->setting_lookup_bool(conf, "Any", &any_flag) == CONFIG_TRUE && any_flag != 0) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++)
+			sk->req_equip.any[i] = true;
+	}
+}
 
+/**
+ * Validates a skill's required equipment when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the required equipment should be set it.
+ *
+ **/
+static void skill_validate_equip_requirements(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
 	nullpo_retv(sk);
-	if(libconfig->setting_lookup_string(conf, "Target", &type)) {
 
-		if(!strcmpi(type,"NotEnemy")) sk->unit_target = BCT_NOENEMY;
-		else if(!strcmpi(type,"NotParty")) sk->unit_target = BCT_NOPARTY;
-		else if (!strcmpi(type,"NotGuild")) sk->unit_target = BCT_NOGUILD;
-		else if(!strcmpi(type,"Friend")) sk->unit_target = BCT_NOENEMY;
-		else if(!strcmpi(type,"Party")) sk->unit_target = BCT_PARTY;
-		else if(!strcmpi(type,"Ally")) sk->unit_target = BCT_PARTY|BCT_GUILD;
-		else if(!strcmpi(type,"Guild")) sk->unit_target = BCT_GUILD;
-		else if(!strcmpi(type,"All")) sk->unit_target = BCT_ALL;
-		else if(!strcmpi(type,"Enemy")) sk->unit_target = BCT_ENEMY;
-		else if(!strcmpi(type,"Self")) sk->unit_target = BCT_SELF;
-		else if(!strcmpi(type,"SameGuild")) sk->unit_target = BCT_GUILD|BCT_SAMEGUILD;
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "Equip");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		skill->validate_equip_requirements_sub_any_flag(t, sk);
+		skill->validate_equip_requirements_sub_items(t, sk);
+	}
+}
+
+/**
+ * Validates a required item's config setting name when reading the skill DB.
+ *
+ * @param name The config setting name to validate.
+ * @return The corresponding item ID if the passed config setting name is valid, otherwise 0.
+ *
+ **/
+static int skill_validate_requirements_item_name(const char *name)
+{
+	nullpo_ret(name);
+
+	int item_id = 0;
+
+	if (strlen(name) > 2 && name[0] == 'I' && name[1] == 'D') {
+		if ((item_id = atoi(name + 2)) == 0)
+			return 0;
+
+		struct item_data *it = itemdb->exists(item_id);
+
+		if (it == NULL)
+			return 0;
+
+		return it->nameid;
 	}
 
-	if (sk->unit_flag & UF_DEFNOTENEMY && battle_config.defnotenemy)
-		sk->unit_target = BCT_NOENEMY;
+	if (!script->get_constant(name, &item_id))
+		return 0;
+
+	return item_id;
+}
 
-	//By default, target just characters.
-	sk->unit_target |= BL_CHAR;
+/**
+ * Validates a skill's requirements when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the requirements should be set it.
+ *
+ **/
+static void skill_validate_requirements(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
 
-	if (sk->unit_flag & UF_NOPC)
-		sk->unit_target &= ~BL_PC;
-	if (sk->unit_flag & UF_NOMOB)
-		sk->unit_target &= ~BL_MOB;
-	if (sk->unit_flag & UF_SKILL)
-		sk->unit_target |= BL_SKILL;
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "Requirements");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		skill->validate_hp_cost(t, sk);
+		skill->validate_sp_cost(t, sk);
+		skill->validate_hp_rate_cost(t, sk);
+		skill->validate_sp_rate_cost(t, sk);
+		skill->validate_max_hp_trigger(t, sk);
+		skill->validate_max_sp_trigger(t, sk);
+		skill->validate_zeny_cost(t, sk);
+		skill->validate_weapontype(t, sk);
+		skill->validate_ammotype(t, sk);
+		skill->validate_ammo_amount(t, sk);
+		skill->validate_state(t, sk);
+		skill->validate_spirit_sphere_cost(t, sk);
+		skill->validate_item_requirements(t, sk);
+		skill->validate_equip_requirements(t, sk);
+	}
 }
 
 /**
- * Validates the "Unit > Flag" setting
- * when parsing skill_db.conf
- * @param   type     const char, name of the flag being parsed.
- * @param   on       boolean, switch for flag setting
- * @param   sk       struct, pointer to s_skill_db.
- * @return  (void)
- */
+ * Validates a single unit ID when reading the skill DB.
+ *
+ * @param unit_id The unit ID to validate.
+ * @return A number greater than or equal to 0 if the passed unit ID is valid, otherwise -1.
+ *
+ **/
+static int skill_validate_unit_id_sub(int unit_id)
+{
+	if (unit_id == 0 || (unit_id >= UNT_SAFETYWALL && unit_id <= UNT_SV_ROOTTWIST))
+		return unit_id;
+
+	return -1;
+}
+
+/**
+ * Validates a skill's unit IDs if specified as single value when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's unit ID data.
+ * @param sk The s_skill_db struct where the unit IDs should be set it.
+ * @param index The array index to use. (-1 for whole array.)
+ * @param unit_id The unit ID to validate.
+ *
+ **/
+static void skill_validate_unit_id_value(struct config_setting_t *conf, struct s_skill_db *sk, int index, int unit_id)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	if (skill->validate_unit_id_sub(unit_id) == -1) {
+		char level_string[14]; // Big enough to contain "in level 999 " in case of custom MAX_SKILL_LEVEL.
+
+		if (index == -1)
+			*level_string = '\0';
+		else
+			safesnprintf(level_string, sizeof(level_string), "in level %d ", index + 1);
+
+		ShowWarning("%s: Invalid unit ID %d specified %sfor skill ID %d in %s! Must be greater than or equal to 0. Defaulting to 0...\n",
+			    __func__, unit_id, level_string, sk->nameid, conf->file);
+
+		return;
+	}
+
+	if (index == -1) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++)
+			sk->unit_id[i][0] = unit_id;
+	} else {
+		sk->unit_id[index][0] = unit_id;
+	}
+}
+
+/**
+ * Validates a skill's unit IDs if specified as array when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's unit ID data.
+ * @param sk The s_skill_db struct where the unit IDs should be set it.
+ * @param index The array index to use. (-1 for whole array.)
+ *
+ **/
+static void skill_validate_unit_id_array(struct config_setting_t *conf, struct s_skill_db *sk, int index)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	char level_string[14]; // Big enough to contain "in level 999 " in case of custom MAX_SKILL_LEVEL.
+
+	if (index == -1)
+		*level_string = '\0';
+	else
+		safesnprintf(level_string, sizeof(level_string), "in level %d ", index + 1);
+
+	if (libconfig->setting_length(conf) == 0) {
+		ShowWarning("%s: No unit ID(s) specified %sfor skill ID %d in %s! Defaulting to 0...\n",
+			    __func__, level_string, sk->nameid, conf->file);
+		return;
+	}
+
+	if (libconfig->setting_length(conf) > 2)
+		ShowWarning("%s: Specified more than two unit IDs %sfor skill ID %d in %s! Reading only the first two...\n",
+			    __func__, level_string, sk->nameid, conf->file);
+
+	int unit_id1 = libconfig->setting_get_int_elem(conf, 0);
+
+	if (skill->validate_unit_id_sub(unit_id1) == -1) {
+		ShowWarning("%s: Invalid unit ID %d specified %sfor skill ID %d in %s! Must be greater than or equal to 0. Defaulting to 0...\n",
+			    __func__, unit_id1, level_string, sk->nameid, conf->file);
+		unit_id1 = 0;
+	}
+
+	int unit_id2 = 0;
+
+	if (libconfig->setting_length(conf) > 1) {
+		unit_id2 = libconfig->setting_get_int_elem(conf, 1);
+
+		if (skill->validate_unit_id_sub(unit_id2) == -1) {
+			ShowWarning("%s: Invalid unit ID %d specified %sfor skill ID %d in %s! Must be greater than or equal to 0. Defaulting to 0...\n",
+				    __func__, unit_id2, level_string, sk->nameid, conf->file);
+			unit_id2 = 0;
+		}
+	}
+
+	if (unit_id1 == 0 && unit_id2 == 0)
+		return;
+
+	if (index == -1) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			sk->unit_id[i][0] = unit_id1;
+			sk->unit_id[i][1] = unit_id2;
+		}
+	} else {
+		sk->unit_id[index][0] = unit_id1;
+		sk->unit_id[index][1] = unit_id2;
+	}
+}
+
+/**
+ * Validates a skill's unit IDs if specified as group when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's unit ID data.
+ * @param sk The s_skill_db struct where the unit IDs should be set it.
+ *
+ **/
+static void skill_validate_unit_id_group(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+		struct config_setting_t *t;
+		char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+		safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+
+		if ((t = libconfig->setting_get_member(conf, lv)) != NULL && config_setting_is_array(t)) {
+			skill_validate_unit_id_array(t, sk, i);
+			continue;
+		}
+
+		int unit_id;
+
+		if (libconfig->setting_lookup_int(conf, lv, &unit_id) == CONFIG_TRUE)
+			skill_validate_unit_id_value(conf, sk, i, unit_id);
+	}
+}
+
+/**
+ * Validates a skill's unit IDs when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the unit IDs should be set it.
+ *
+ **/
+static void skill_validate_unit_id(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+		sk->unit_id[i][0] = 0;
+		sk->unit_id[i][1] = 0;
+	}
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "Id");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		skill_validate_unit_id_group(t, sk);
+		return;
+	}
+
+	if (t != NULL && config_setting_is_array(t)) {
+		skill_validate_unit_id_array(t, sk, -1);
+		return;
+	}
+
+	int unit_id;
+
+	if (libconfig->setting_lookup_int(conf, "Id", &unit_id) == CONFIG_TRUE)
+		skill_validate_unit_id_value(conf, sk, -1, unit_id);
+}
+
+/**
+ * Validates a skill's unit layout when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the unit layout should be set it.
+ *
+ **/
+static void skill_validate_unit_layout(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->unit_layout_type, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "Layout");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int unit_layout;
+
+			if (libconfig->setting_lookup_int(t, lv, &unit_layout) == CONFIG_TRUE) {
+				if (unit_layout >= -1 && unit_layout <= MAX_SKILL_UNIT_LAYOUT)
+					sk->unit_layout_type[i] = unit_layout;
+				else
+					ShowWarning("%s: Invalid unit layout %d specified in level %d for skill ID %d in %s! Minimum is -1, maximum is %d. Defaulting to 0...\n",
+						    __func__, unit_layout, i + 1, sk->nameid, conf->file, MAX_SKILL_UNIT_LAYOUT);
+			}
+		}
+
+		return;
+	}
+
+	int unit_layout;
+
+	if (libconfig->setting_lookup_int(conf, "Layout", &unit_layout) == CONFIG_TRUE) {
+		if (unit_layout >= -1 && unit_layout <= MAX_SKILL_UNIT_LAYOUT)
+			skill->level_set_value(sk->unit_layout_type, unit_layout);
+		else
+			ShowWarning("%s: Invalid unit layout %d specified for skill ID %d in %s! Minimum is -1, maximum is %d. Defaulting to 0...\n",
+				    __func__, unit_layout, sk->nameid, conf->file, MAX_SKILL_UNIT_LAYOUT);
+	}
+}
+
+/**
+ * Validates a skill's unit range when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the unit range should be set it.
+ *
+ **/
+static void skill_validate_unit_range(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->unit_range, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "Range");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int unit_range;
+
+			if (libconfig->setting_lookup_int(t, lv, &unit_range) == CONFIG_TRUE) {
+				if (unit_range >= -1 && unit_range <= UCHAR_MAX)
+					sk->unit_range[i] = unit_range;
+				else
+					ShowWarning("%s: Invalid unit range %d specified in level %d for skill ID %d in %s! Minimum is -1, maximum is %d. Defaulting to 0...\n",
+						    __func__, unit_range, i + 1, sk->nameid, conf->file, UCHAR_MAX);
+			}
+		}
+
+		return;
+	}
+
+	int unit_range;
+
+	if (libconfig->setting_lookup_int(conf, "Range", &unit_range) == CONFIG_TRUE) {
+		if (unit_range >= -1 && unit_range <= UCHAR_MAX)
+			skill->level_set_value(sk->unit_range, unit_range);
+		else
+			ShowWarning("%s: Invalid unit range %d specified for skill ID %d in %s! Minimum is -1, maximum is %d. Defaulting to 0...\n",
+				    __func__, unit_range, sk->nameid, conf->file, UCHAR_MAX);
+	}
+}
+
+/**
+ * Validates a skill's unit interval when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the unit interval should be set it.
+ *
+ **/
+static void skill_validate_unit_interval(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	skill->level_set_value(sk->unit_interval, 0);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "Interval");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			int unit_interval;
+
+			if (libconfig->setting_lookup_int(t, lv, &unit_interval) == CONFIG_TRUE) {
+				if (unit_interval >= INFINITE_DURATION)
+					sk->unit_interval[i] = unit_interval;
+				else
+					ShowWarning("%s: Invalid unit interval %d specified in level %d for skill ID %d in %s! Must be greater than or equal to %d. Defaulting to 0...\n",
+						    __func__, unit_interval, i + 1, sk->nameid, conf->file, INFINITE_DURATION);
+			}
+		}
+
+		return;
+	}
+
+	int unit_interval;
+
+	if (libconfig->setting_lookup_int(conf, "Interval", &unit_interval) == CONFIG_TRUE) {
+		if (unit_interval >= INFINITE_DURATION)
+			skill->level_set_value(sk->unit_interval, unit_interval);
+		else
+			ShowWarning("%s: Invalid unit interval %d specified for skill ID %d in %s! Must be greater than or equal to %d. Defaulting to 0...\n",
+				    __func__, unit_interval, sk->nameid, conf->file, INFINITE_DURATION);
+	}
+}
+
+/**
+ * Validates a single unit flag when reading the skill DB.
+ *
+ * @param type The unit flag to validate.
+ * @param on Whether the unit flag is set for the skill.
+ * @param sk The s_skill_db struct where the unit flag should be set it.
+ * @return 0 if the passed unit flag is valid, otherwise 1.
+ *
+ **/
 static int skill_validate_unit_flag_sub(const char *type, bool on, struct s_skill_db *sk)
 {
-	nullpo_ret(type);
-	nullpo_ret(sk);
+	nullpo_retr(1, type);
+	nullpo_retr(1, sk);
+
 	if (strcmpi(type, "UF_DEFNOTENEMY") == 0) {
-		if (on) {
+		if (on)
 			sk->unit_flag |= UF_DEFNOTENEMY;
-		} else {
+		else
 			sk->unit_flag &= ~UF_DEFNOTENEMY;
-		}
 	} else if (strcmpi(type, "UF_NOREITERATION") == 0) {
-		if (on) {
+		if (on)
 			sk->unit_flag |= UF_NOREITERATION;
-		} else {
+		else
 			sk->unit_flag &= ~UF_NOREITERATION;
-		}
 	} else if (strcmpi(type, "UF_NOFOOTSET") == 0) {
-		if (on) {
+		if (on)
 			sk->unit_flag |= UF_NOFOOTSET;
-		} else {
+		else
 			sk->unit_flag &= ~UF_NOFOOTSET;
-		}
 	} else if (strcmpi(type, "UF_NOOVERLAP") == 0) {
-		if (on) {
+		if (on)
 			sk->unit_flag |= UF_NOOVERLAP;
-		} else {
+		else
 			sk->unit_flag &= ~UF_NOOVERLAP;
-		}
 	} else if (strcmpi(type, "UF_PATHCHECK") == 0) {
-		if (on) {
+		if (on)
 			sk->unit_flag |= UF_PATHCHECK;
-		} else {
+		else
 			sk->unit_flag &= ~UF_PATHCHECK;
-		}
 	} else if (strcmpi(type, "UF_NOPC") == 0) {
-		if (on) {
+		if (on)
 			sk->unit_flag |= UF_NOPC;
-		} else {
+		else
 			sk->unit_flag &= ~UF_NOPC;
-		}
 	} else if (strcmpi(type, "UF_NOMOB") == 0) {
-		if (on) {
+		if (on)
 			sk->unit_flag |= UF_NOMOB;
-		} else {
+		else
 			sk->unit_flag &= ~UF_NOMOB;
-		}
 	} else if (strcmpi(type, "UF_SKILL") == 0) {
-		if (on) {
+		if (on)
 			sk->unit_flag |= UF_SKILL;
-		} else {
+		else
 			sk->unit_flag &= ~UF_SKILL;
-		}
 	} else if (strcmpi(type, "UF_DANCE") == 0) {
-		if (on) {
+		if (on)
 			sk->unit_flag |= UF_DANCE;
-		} else {
+		else
 			sk->unit_flag &= ~UF_DANCE;
-		}
 	} else if (strcmpi(type, "UF_ENSEMBLE") == 0) {
-		if (on) {
+		if (on)
 			sk->unit_flag |= UF_ENSEMBLE;
-		} else {
+		else
 			sk->unit_flag &= ~UF_ENSEMBLE;
-		}
 	} else if (strcmpi(type, "UF_SONG") == 0) {
-		if (on) {
+		if (on)
 			sk->unit_flag |= UF_SONG;
-		} else {
+		else
 			sk->unit_flag &= ~UF_SONG;
-		}
 	} else if (strcmpi(type, "UF_DUALMODE") == 0) {
-		if (on) {
+		if (on)
 			sk->unit_flag |= UF_DUALMODE;
-		} else {
+		else
 			sk->unit_flag &= ~UF_DUALMODE;
-		}
 	} else if (strcmpi(type, "UF_RANGEDSINGLEUNIT") == 0) {
-		if (on) {
+		if (on)
 			sk->unit_flag |= UF_RANGEDSINGLEUNIT;
-		} else {
+		else
 			sk->unit_flag &= ~UF_RANGEDSINGLEUNIT;
-		}
 	} else {
-		return 1; // Invalid Type
+		return 1;
 	}
 
 	return 0;
 }
 
 /**
- * Validate "Unit > Flag" setting
- * when parsing skill_db.conf
- * @param   conf    struct, pointer to the skill configuration
- * @param   sk      struct, struct, pointer to s_skill_db
- * @return  (void)
- */
+ * Validates a skill's unit flags when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the unit flags should be set it.
+ *
+ **/
 static void skill_validate_unit_flag(struct config_setting_t *conf, struct s_skill_db *sk)
 {
-	struct config_setting_t *t = NULL;
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	sk->unit_flag = 0;
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "Flag");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		struct config_setting_t *tt;
+		int i = 0;
+
+		while ((tt = libconfig->setting_get_elem(t, i++)) != NULL) {
+			bool on = libconfig->setting_get_bool_real(tt);
+
+			if (skill->validate_unit_flag_sub(config_setting_name(tt), on, sk))
+				ShowWarning("%s: Invalid unit flag %s specified for skill ID %d in %s! Skipping flag...\n",
+					    __func__, config_setting_name(tt), sk->nameid, conf->file);
+		}
+	}
+}
+
+/**
+ * Validates a single unit target when reading the skill DB.
+ *
+ * @param target The unit target to validate.
+ * @return A number greater than or equal to 0 if the passed unit target is valid, otherwise -1.
+ *
+ **/
+static int skill_validate_unit_target_sub(const char *target)
+{
+	nullpo_retr(-1, target);
+
+	int ret_val = BCT_NOONE;
+
+	if (strcmpi(target, "NotEnemy") == 0)
+		ret_val = BCT_NOENEMY;
+	else if (strcmpi(target, "NotParty") == 0)
+		ret_val = BCT_NOPARTY;
+	else if (strcmpi(target, "NotGuild") == 0)
+		ret_val = BCT_NOGUILD;
+	else if (strcmpi(target, "Friend") == 0)
+		ret_val = BCT_NOENEMY;
+	else if (strcmpi(target, "Party") == 0)
+		ret_val = BCT_PARTY;
+	else if (strcmpi(target, "Ally") == 0)
+		ret_val = BCT_PARTY|BCT_GUILD;
+	else if (strcmpi(target, "Guild") == 0)
+		ret_val = BCT_GUILD;
+	else if (strcmpi(target, "All") == 0)
+		ret_val = BCT_ALL;
+	else if (strcmpi(target, "Enemy") == 0)
+		ret_val = BCT_ENEMY;
+	else if (strcmpi(target, "Self") == 0)
+		ret_val = BCT_SELF;
+	else if (strcmpi(target, "SameGuild") == 0)
+		ret_val = BCT_SAMEGUILD;
+	else if (strcmpi(target, "GuildAlly") == 0)
+		ret_val = BCT_GUILDALLY;
+	else if (strcmpi(target, "Neutral") == 0)
+		ret_val = BCT_NEUTRAL;
+	else if (strcmpi(target, "None") != 0)
+		ret_val = -1;
+
+	return ret_val;
+}
 
+/**
+ * Validates a skill's unit targets when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the unit targets should be set it.
+ *
+ **/
+static void skill_validate_unit_target(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
 	nullpo_retv(sk);
-	if ((t=libconfig->setting_get_member(conf, "Flag")) && config_setting_is_group(t)) {
-		int j=0;
-		struct config_setting_t *tt = NULL;
-		while ((tt = libconfig->setting_get_elem(t, j++))) {
-			const char *name = config_setting_name(tt);
 
-			if (skill->validate_unit_flag_sub(name, libconfig->setting_get_bool_real(tt), sk))
-				skilldb_invalid_error(name, config_setting_name(t), sk->nameid);
+	skill->level_set_value(sk->unit_target, BCT_NOONE);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "Target");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+			char lv[6]; // Big enough to contain "Lv999" in case of custom MAX_SKILL_LEVEL.
+			safesnprintf(lv, sizeof(lv), "Lv%d", i + 1);
+			const char *unit_target;
+
+			if (libconfig->setting_lookup_string(t, lv, &unit_target) == CONFIG_TRUE) {
+				int target = skill->validate_unit_target_sub(unit_target);
+
+				if (target > BCT_NOONE)
+					sk->unit_target[i] = target;
+				else if (target == -1)
+					ShowWarning("%s: Invalid unit target %s specified in level %d for skill ID %d in %s! Defaulting to None...\n",
+						    __func__, unit_target, i + 1, sk->nameid, conf->file);
+			}
 		}
+	} else {
+		const char *unit_target;
+
+		if (libconfig->setting_lookup_string(conf, "Target", &unit_target) == CONFIG_TRUE) {
+			int target = skill->validate_unit_target_sub(unit_target);
+
+			if (target > BCT_NOONE)
+				skill->level_set_value(sk->unit_target, target);
+			else if (target == -1)
+				ShowWarning("%s: Invalid unit target %s specified for skill ID %d in %s! Defaulting to None...\n",
+					    __func__, unit_target, sk->nameid, conf->file);
+		}
+	}
+
+	for (int i = 0; i < MAX_SKILL_LEVEL; i++) {
+		if ((sk->unit_flag & UF_DEFNOTENEMY) != 0 && battle_config.defnotenemy != 0)
+			sk->unit_target[i] = BCT_NOENEMY;
+
+		// By default target just characters.
+		sk->unit_target[i] |= BL_CHAR;
+
+		if ((sk->unit_flag & UF_NOPC) != 0)
+			sk->unit_target[i] &= ~BL_PC;
+
+		if ((sk->unit_flag & UF_NOMOB) != 0)
+			sk->unit_target[i] &= ~BL_MOB;
+
+		if ((sk->unit_flag & UF_SKILL) != 0)
+			sk->unit_target[i] |= BL_SKILL;
 	}
 }
+
+/**
+ * Validates a skill's unit data when reading the skill DB.
+ *
+ * @param conf The libconfig settings block which contains the skill's data.
+ * @param sk The s_skill_db struct where the unit data should be set it.
+ *
+ **/
+static void skill_validate_unit(struct config_setting_t *conf, struct s_skill_db *sk)
+{
+	nullpo_retv(conf);
+	nullpo_retv(sk);
+
+	struct config_setting_t *t = libconfig->setting_get_member(conf, "Unit");
+
+	if (t != NULL && config_setting_is_group(t)) {
+		skill->validate_unit_id(t, sk);
+		skill->validate_unit_layout(t, sk);
+		skill->validate_unit_range(t, sk);
+		skill->validate_unit_interval(t, sk);
+		skill->validate_unit_flag(t, sk);
+		skill->validate_unit_target(t, sk);
+	}
+}
+
 /**
  * Validate additional field settings via plugins
  * when parsing skill_db.conf
@@ -21148,293 +23662,100 @@ static void skill_validate_additional_fields(struct config_setting_t *conf, stru
 }
 
 /**
- * Validates a skill entry and adds it to the database. [ Smokexyz/Hercules ]
- * @param  sk        contains skill data to be checked.
- * @param  *source   filepath constant.
- * @return boolean   true on success.
- */
-static bool skill_validate_skilldb(struct s_skill_db *sk, const char *source)
+ * Reads a skill DB file from relative path.
+ *
+ * @param filename The skill DB's file name including the DB path.
+ * @return True on success, otherwise false.
+ *
+ **/
+static bool skill_read_skilldb(const char *filename)
 {
-	int idx;
+	nullpo_retr(false, filename);
 
-	nullpo_retr(false, sk);
-	idx = skill->get_index(sk->nameid);
-	if (idx  == 0) {
-		ShowWarning("skill_validate_skilldb: Invalid skill Id %d provided in '%s'! ... skipping\n", sk->nameid, source);
-		ShowInfo("It is possible that the skill Id is 0 or unavailable (interferes with guild/homun/mercenary skill mapping).\n");
-		return false;
-	} else if (sk->max <= 0) {
-		ShowError("skill_validate_skilldb: Invalid Max Level %d specified for skill Id %d in '%s', skipping...\n", sk->max, sk->nameid, source);
-		return false;
-	}
+	char filepath[256];
 
-	/* Direct assignment of temporary skill storage to skill db */
-	skill->dbs->db[idx] = *sk;
-	/* Put skill name in name2id DB */
-	strdb_iput(skill->name2id_db, skill->dbs->db[idx].name, skill->dbs->db[idx].nameid);
-	/* Set Name to Id script constants */
-	script->set_constant2(skill->dbs->db[idx].name, (int)skill->dbs->db[idx].nameid, false, false);
+	libconfig->format_db_path(filename, filepath, sizeof(filepath));
 
-	return true;
-}
+	if (!exists(filepath)) {
+		ShowError("%s: Can't find file %s! Abort reading skills...\n", __func__, filepath);
+		return false;
+	}
 
-/**
- * Reads skill_db.conf from relative filepath and processes [ Smokexyz/Hercules ]
- * entries into the skill database.
- * @param  filename     contains the file path and name.
- * @return boolean      true on success
- */
-static bool skill_read_skilldb(const char *filename)
-{
 	struct config_t skilldb;
-	struct config_setting_t *sk, *conf;
-	char filepath[256];
-	int count=0, index=0;
-	bool duplicate[MAX_SKILL_DB] = {0};
-
-	nullpo_retr(false, filename);
 
-	libconfig->format_db_path(filename, filepath, sizeof(filepath));
-
-	if (!libconfig->load_file(&skilldb, filepath)) {
+	if (libconfig->load_file(&skilldb, filepath) == 0)
 		return false; // Libconfig error report.
-	}
 
-	// Possible Syntax error.
-	if ((sk=libconfig->setting_get_member(skilldb.root, "skill_db")) == NULL) {
-		ShowError("skill_read_skilldb: Skill DB could not be loaded, please check '%s'.\n", filepath);
+	struct config_setting_t *sk = libconfig->setting_get_member(skilldb.root, "skill_db");
+
+	if (sk == NULL) {
+		ShowError("%s: Skill DB could not be loaded! Please check %s.\n", __func__, filepath);
 		libconfig->destroy(&skilldb);
 		return false;
 	}
 
-	while ((conf = libconfig->setting_get_elem(sk,index++))) {
-		int idx=0, skill_id=0, temp=0;
-		struct config_setting_t *t = NULL, *tt = NULL;
-		struct s_skill_db tmp_db = { 0 };
-
-		/* Skill ID */
-		if (!libconfig->setting_lookup_int(conf, "Id", &skill_id)) {
-			ShowError("skill_read_skilldb: Skill Id not specified for entry %d in '%s', skipping...\n", index, filepath );
-			continue;
-		}
-
-		tmp_db.nameid = skill_id;
+	struct config_setting_t *conf;
+	int index = 0;
+	int count = 0;
 
-		if((idx = skill->get_index(skill_id)) == 0) {
-			ShowError("skill_read_skilldb: Skill Id %d is out of range, or within a reserved range (for guild, homunculus, mercenary or elemental skills). skipping...\n", idx);
-			continue;
-		}
+	while ((conf = libconfig->setting_get_elem(sk, index++)) != NULL) {
+		struct s_skill_db tmp_db = {0};
 
-		if (duplicate[idx]) {
-			ShowWarning("skill_read_skilldb: Duplicate Skill Id %d in entry %d in '%s', skipping...\n", skill_id, index, filepath);
+		/** Validate mandatory fields. **/
+		skill->validate_id(conf, &tmp_db, index);
+		if (tmp_db.nameid == 0)
 			continue;
-		}
 
-		/* Skill Name Constant */
-		if (!libconfig->setting_lookup_mutable_string(conf, "Name", tmp_db.name, sizeof(tmp_db.name))) {
-			ShowError("skill_read_skilldb: Name not specified for skill Id %d in '%s', skipping...\n", skill_id, filepath);
+		skill->validate_name(conf, &tmp_db);
+		if (*tmp_db.name == '\0')
 			continue;
-		}
-
-		/* Skill Description */
-		libconfig->setting_lookup_mutable_string(conf, "Description", tmp_db.desc, sizeof(tmp_db.desc));
 
-		/* Max Level */
-		if (!libconfig->setting_lookup_int(conf, "MaxLevel", &temp)) {
-			ShowError("skill_read_skilldb: MaxLevel not specified for skill Id %d in '%s', skipping...\n", skill_id, filepath);
+		skill->validate_max_level(conf, &tmp_db);
+		if (tmp_db.max == 0)
 			continue;
-		} else {
-			tmp_db.max = temp;
-		}
 
-		/* Range */
-		if ((t=libconfig->setting_get_member(conf, "Range")))
-			skill->config_set_level(t, tmp_db.range);
-
-		/* Hit Type */
+		/** Validate optional fields. **/
+		skill->validate_description(conf, &tmp_db);
+		skill->validate_range(conf, &tmp_db);
 		skill->validate_hittype(conf, &tmp_db);
-
-		/* Skill Type */
 		skill->validate_skilltype(conf, &tmp_db);
-
-		/* Skill Info */
 		skill->validate_skillinfo(conf, &tmp_db);
-
-		/* Skill Attack Type */
 		skill->validate_attacktype(conf, &tmp_db);
-
-		/* Skill Element */
 		skill->validate_element(conf, &tmp_db);
-
-		/* Damage Type */
 		skill->validate_damagetype(conf, &tmp_db);
-
-		/* Splash Range */
-		if ((t = libconfig->setting_get_member(conf, "SplashRange")))
-			skill->config_set_level(t, tmp_db.splash);
-
-		/* Number of Hits */
-		if ((t = libconfig->setting_get_member(conf, "NumberOfHits")) && config_setting_is_group(t))
-			skill->config_set_level(t, tmp_db.num);
-		else if ((libconfig->setting_lookup_int(conf, "NumberOfHits", &temp)))
-			skill->level_set_value(tmp_db.num, temp);
-		else
-			skill->level_set_value(tmp_db.num, 1); // Default 1
-
-		/* Interrupt Cast */
-		if (libconfig->setting_lookup_bool(conf, "InterruptCast", &tmp_db.castcancel) == CONFIG_FALSE)
-			tmp_db.castcancel = 0;
-
-		/* Cast Defense Rate */
-		libconfig->setting_lookup_int(conf, "CastDefRate", &tmp_db.cast_def_rate);
-
-		/* Skill Instances */
-		if ((t = libconfig->setting_get_member(conf, "SkillInstances")))
-			skill->config_set_level(t, tmp_db.maxcount);
-
-		/* Knock-Back Tiles */
-		if ((t = libconfig->setting_get_member(conf, "KnockBackTiles")))
-			skill->config_set_level(t, tmp_db.blewcount);
-		/**
-		 * Skill Cast / Delay data handling
-		 */
-		/* Cast Time */
-		if ((t=libconfig->setting_get_member(conf, "CastTime")))
-			skill->config_set_level(t, tmp_db.cast);
-
-		/* After Cast Act Delay */
-		if ((t=libconfig->setting_get_member(conf, "AfterCastActDelay")))
-			skill->config_set_level(t, tmp_db.delay);
-
-		/* After Cast Walk Delay */
-		if ((t=libconfig->setting_get_member(conf, "AfterCastWalkDelay")))
-			skill->config_set_level(t, tmp_db.walkdelay);
-
-		/* Skill Data/Duration */
-		if ((t=libconfig->setting_get_member(conf, "SkillData1")))
-			skill->config_set_level(t, tmp_db.upkeep_time);
-
-		/* Skill Data/Duration 2 */
-		if ((t=libconfig->setting_get_member(conf, "SkillData2")))
-			skill->config_set_level(t, tmp_db.upkeep_time2);
-
-		/* Skill Cool Down */
-		if ((t=libconfig->setting_get_member(conf, "CoolDown")))
-			skill->config_set_level(t, tmp_db.cooldown);
-
-#ifdef RENEWAL_CAST
-		/* Fixed Casting Time */
-		if ((t=libconfig->setting_get_member(conf, "FixedCastTime")))
-			skill->config_set_level(t, tmp_db.fixed_cast);
-#endif
-		/* Cast Time Options */
+		skill->validate_splash_range(conf, &tmp_db);
+		skill->validate_number_of_hits(conf, &tmp_db);
+		skill->validate_interrupt_cast(conf, &tmp_db);
+		skill->validate_cast_def_rate(conf, &tmp_db);
+		skill->validate_number_of_instances(conf, &tmp_db);
+		skill->validate_knock_back_tiles(conf, &tmp_db);
+		skill->validate_cast_time(conf, &tmp_db);
+		skill->validate_act_delay(conf, &tmp_db);
+		skill->validate_walk_delay(conf, &tmp_db);
+		skill->validate_skill_data1(conf, &tmp_db);
+		skill->validate_skill_data2(conf, &tmp_db);
+		skill->validate_cooldown(conf, &tmp_db);
+		skill->validate_fixed_cast_time(conf, &tmp_db);
 		skill->validate_castnodex(conf, &tmp_db, false);
 		skill->validate_castnodex(conf, &tmp_db, true);
+		skill->validate_requirements(conf, &tmp_db);
+		skill->validate_unit(conf, &tmp_db);
 
-		/**
-		 * Skill Requirements data handling
-		 */
-		if ((t=libconfig->setting_get_member(conf, "Requirements")) && config_setting_is_group(t)) {
-
-			/* HP Costs */
-			if ((tt = libconfig->setting_get_member(t, "HPCost")))
-				skill->config_set_level(tt, tmp_db.hp);
-
-			/* Max HP Trigger */
-			if ((tt = libconfig->setting_get_member(t, "MaxHPTrigger")))
-				skill->config_set_level(tt, tmp_db.mhp);
-
-			/* SP Cost */
-			if ((tt = libconfig->setting_get_member(t, "SPCost")))
-				skill->config_set_level(tt, tmp_db.sp);
-
-			/* HP Rate */
-			if ((tt = libconfig->setting_get_member(t, "HPRateCost")))
-				skill->config_set_level(tt, tmp_db.hp_rate);
-
-			/* SP Rate */
-			if ((tt = libconfig->setting_get_member(t, "SPRateCost")))
-				skill->config_set_level(tt, tmp_db.sp_rate);
-
-			/* Zeny Cost */
-			if ((tt = libconfig->setting_get_member(t, "ZenyCost")))
-				skill->config_set_level(tt, tmp_db.zeny);
-
-			/* Spirit Sphere Cost */
-			if ((tt = libconfig->setting_get_member(t, "SpiritSphereCost")))
-				skill->config_set_level(tt, tmp_db.spiritball);
-
-			/* Weapon Types */
-			skill->validate_weapontype(t, &tmp_db);
-
-			/* Ammunition Types */
-			skill->validate_ammotype(t, &tmp_db);
-
-			/* Ammunition Amount */
-			if ((tt = libconfig->setting_get_member(t, "AmmoAmount")))
-				skill->config_set_level(tt, tmp_db.ammo_qty);
-
-			/* State */
-			skill->validate_state(t, &tmp_db);
-
-			/* Spirit Sphere Cost */
-			if ((tt = libconfig->setting_get_member(t, "SpiritSphereCost")))
-				skill->config_set_level(tt, tmp_db.spiritball);
-
-			/* Item Requirements and Amounts */
-			skill->validate_item_requirements(t, &tmp_db);
-		}
-
-		/**
-		 * Skill Unit data handling
-		 */
-		if ((t=libconfig->setting_get_member(conf, "Unit")) && config_setting_is_group(t)) {
-
-			/* Unit IDs [1,2] */
-			if ((tt=libconfig->setting_get_member(t, "Id")) && config_setting_is_array(tt)) {
-				tmp_db.unit_id[0] = libconfig->setting_get_int_elem(tt, 0);
-				tmp_db.unit_id[1] = libconfig->setting_get_int_elem(tt, 1);
-			} else {
-				libconfig->setting_lookup_int(t, "Id", &tmp_db.unit_id[0]);
-			}
-
-			/* Layout */
-			if((tt=libconfig->setting_get_member(t, "Layout")))
-				skill->config_set_level(tt, tmp_db.unit_layout_type);
-
-			/* Range */
-			if((tt=libconfig->setting_get_member(t, "Range")))
-				skill->config_set_level(tt, tmp_db.unit_range);
-
-			/* Interval */
-			if(libconfig->setting_lookup_int(t, "Interval", &temp))
-				tmp_db.unit_interval = temp;
-
-			/* Flag */
-			skill->validate_unit_flag(t, &tmp_db);
-
-			/* Target */
-			skill->validate_unit_target(t, &tmp_db);
-		}
-
-		/* Additional Fields for Plugins */
+		/** Validate additional fields for plugins. **/
 		skill->validate_additional_fields(conf, &tmp_db);
 
-		// Validate the skill entry, add it to the duplicate array and increment count on success.
-		if ((duplicate[idx] = skill->validate_skilldb(&tmp_db, filepath)))
-			count++;
+		/** Add the skill. **/
+		skill->dbs->db[skill->get_index(tmp_db.nameid)] = tmp_db;
+		strdb_iput(skill->name2id_db, tmp_db.name, tmp_db.nameid);
+		script->set_constant2(tmp_db.name, tmp_db.nameid, false, false);
+		count++;
 	}
 
 	libconfig->destroy(&skilldb);
-
 	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, filepath);
-
 	return true;
 }
 
-#undef skilldb_duplicate_warning
-#undef skilldb_invalid_error
-
 /*===============================
  * DB reading.
  * produce_db.txt
@@ -21613,6 +23934,7 @@ void skill_defaults(void)
 	skill->get_splash = skill_get_splash;
 	skill->get_hp = skill_get_hp;
 	skill->get_mhp = skill_get_mhp;
+	skill->get_msp = skill_get_msp;
 	skill->get_sp = skill_get_sp;
 	skill->get_hp_rate = skill_get_hp_rate;
 	skill->get_sp_rate = skill_get_sp_rate;
@@ -21620,6 +23942,10 @@ void skill_defaults(void)
 	skill->get_spiritball = skill_get_spiritball;
 	skill->get_itemid = skill_get_itemid;
 	skill->get_itemqty = skill_get_itemqty;
+	skill->get_item_any_flag = skill_get_item_any_flag;
+	skill->get_equip_id = skill_get_equip_id;
+	skill->get_equip_amount = skill_get_equip_amount;
+	skill->get_equip_any_flag = skill_get_equip_any_flag;
 	skill->get_zeny = skill_get_zeny;
 	skill->get_num = skill_get_num;
 	skill->get_cast = skill_get_cast;
@@ -21678,8 +24004,12 @@ void skill_defaults(void)
 	skill->cast_fix_sc = skill_castfix_sc;
 	skill->vf_cast_fix = skill_vfcastfix;
 	skill->delay_fix = skill_delay_fix;
+	skill->check_condition_required_equip = skill_check_condition_required_equip;
 	skill->check_condition_castbegin = skill_check_condition_castbegin;
+	skill->check_condition_required_items = skill_check_condition_required_items;
+	skill->items_required = skill_items_required;
 	skill->check_condition_castend = skill_check_condition_castend;
+	skill->get_any_item_index = skill_get_any_item_index;
 	skill->consume_requirement = skill_consume_requirement;
 	skill->get_requirement = skill_get_requirement;
 	skill->check_pc_partner = skill_check_pc_partner;
@@ -21764,24 +24094,68 @@ void skill_defaults(void)
 	skill->init_unit_layout = skill_init_unit_layout;
 	skill->init_unit_layout_unknown = skill_init_unit_layout_unknown;
 	/* Skill DB Libconfig */
+	skill->validate_id = skill_validate_id;
+	skill->name_contains_invalid_character = skill_name_contains_invalid_character;
+	skill->validate_name = skill_validate_name;
+	skill->validate_max_level = skill_validate_max_level;
+	skill->validate_description = skill_validate_description;
+	skill->validate_range = skill_validate_range;
 	skill->validate_hittype = skill_validate_hittype;
-	skill->validate_attacktype = skill_validate_attacktype;
-	skill->validate_element = skill_validate_element;
 	skill->validate_skilltype = skill_validate_skilltype;
 	skill->validate_skillinfo = skill_validate_skillinfo;
+	skill->validate_attacktype = skill_validate_attacktype;
+	skill->validate_element = skill_validate_element;
 	skill->validate_damagetype = skill_validate_damagetype;
+	skill->validate_splash_range = skill_validate_splash_range;
+	skill->validate_number_of_hits = skill_validate_number_of_hits;
+	skill->validate_interrupt_cast = skill_validate_interrupt_cast;
+	skill->validate_cast_def_rate = skill_validate_cast_def_rate;
+	skill->validate_number_of_instances = skill_validate_number_of_instances;
+	skill->validate_knock_back_tiles = skill_validate_knock_back_tiles;
+	skill->validate_cast_time = skill_validate_cast_time;
+	skill->validate_act_delay = skill_validate_act_delay;
+	skill->validate_walk_delay = skill_validate_walk_delay;
+	skill->validate_skill_data1 = skill_validate_skill_data1;
+	skill->validate_skill_data2 = skill_validate_skill_data2;
+	skill->validate_cooldown = skill_validate_cooldown;
+	skill->validate_fixed_cast_time = skill_validate_fixed_cast_time;
 	skill->validate_castnodex = skill_validate_castnodex;
+	skill->validate_hp_cost = skill_validate_hp_cost;
+	skill->validate_sp_cost = skill_validate_sp_cost;
+	skill->validate_hp_rate_cost = skill_validate_hp_rate_cost;
+	skill->validate_sp_rate_cost = skill_validate_sp_rate_cost;
+	skill->validate_max_hp_trigger = skill_validate_max_hp_trigger;
+	skill->validate_max_sp_trigger = skill_validate_max_sp_trigger;
+	skill->validate_zeny_cost = skill_validate_zeny_cost;
+	skill->validate_weapontype_sub = skill_validate_weapontype_sub;
 	skill->validate_weapontype = skill_validate_weapontype;
+	skill->validate_ammotype_sub = skill_validate_ammotype_sub;
 	skill->validate_ammotype = skill_validate_ammotype;
+	skill->validate_ammo_amount = skill_validate_ammo_amount;
+	skill->validate_state_sub = skill_validate_state_sub;
 	skill->validate_state = skill_validate_state;
+	skill->validate_spirit_sphere_cost = skill_validate_spirit_sphere_cost;
+	skill->validate_item_requirements_sub_item_amount = skill_validate_item_requirements_sub_item_amount;
+	skill->validate_item_requirements_sub_items = skill_validate_item_requirements_sub_items;
+	skill->validate_item_requirements_sub_any_flag = skill_validate_item_requirements_sub_any_flag;
 	skill->validate_item_requirements = skill_validate_item_requirements;
-	skill->validate_unit_target = skill_validate_unit_target;
+	skill->validate_equip_requirements_sub_item_amount = skill_validate_equip_requirements_sub_item_amount;
+	skill->validate_equip_requirements_sub_items = skill_validate_equip_requirements_sub_items;
+	skill->validate_equip_requirements_sub_any_flag = skill_validate_equip_requirements_sub_any_flag;
+	skill->validate_equip_requirements = skill_validate_equip_requirements;
+	skill->validate_requirements_item_name = skill_validate_requirements_item_name;
+	skill->validate_requirements = skill_validate_requirements;
+	skill->validate_unit_id_sub = skill_validate_unit_id_sub;
+	skill->validate_unit_id = skill_validate_unit_id;
+	skill->validate_unit_layout = skill_validate_unit_layout;
+	skill->validate_unit_range = skill_validate_unit_range;
+	skill->validate_unit_interval = skill_validate_unit_interval;
+	skill->validate_unit_flag_sub = skill_validate_unit_flag_sub;
 	skill->validate_unit_flag = skill_validate_unit_flag;
+	skill->validate_unit_target_sub = skill_validate_unit_target_sub;
+	skill->validate_unit_target = skill_validate_unit_target;
+	skill->validate_unit = skill_validate_unit;
 	skill->validate_additional_fields = skill_validate_additional_fields;
-	skill->validate_skilldb = skill_validate_skilldb;
-	skill->validate_weapontype_sub = skill_validate_weapontype_sub;
-	skill->validate_ammotype_sub = skill_validate_ammotype_sub;
-	skill->validate_unit_flag_sub = skill_validate_unit_flag_sub;
 	skill->read_skilldb = skill_read_skilldb;
 	skill->config_set_level = skill_config_set_level;
 	skill->level_set_value = skill_level_set_value;
diff --git a/src/map/skill.h b/src/map/skill.h
index 651a355cf..b505412b6 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -50,7 +50,7 @@ struct status_change_entry;
 #define MAX_ARROW_RESOURCE        5
 #define MAX_SKILL_ABRA_DB         210
 #define MAX_SKILL_IMPROVISE_DB    30
-#define MAX_SKILL_LEVEL           10
+#define MAX_SKILL_LEVEL           20
 #define MAX_SKILL_UNIT_LAYOUT     45
 #define MAX_SQUARE_LAYOUT         5 // 11*11 Placement of a maximum unit
 #define MAX_SKILL_UNIT_COUNT      ((MAX_SQUARE_LAYOUT*2+1)*(MAX_SQUARE_LAYOUT*2+1))
@@ -60,6 +60,10 @@ struct status_change_entry;
 #define MAX_SKILLUNITGROUPTICKSET 25
 #define MAX_SKILL_NAME_LENGTH     32
 
+#ifndef MAX_SKILL_DESC_LENGTH
+	#define MAX_SKILL_DESC_LENGTH 50
+#endif
+
 // Custom Skill Ranges is used in skill_get_index, to allocate indexes based on ID and gaps between 2 SkillID
 #ifndef CUSTOM_SKILL_RANGES
 	#define CUSTOM_SKILL_RANGES
@@ -1733,41 +1737,74 @@ enum autocast_type {
 	AUTOCAST_ITEM, // Used for itemskill() script command.
 };
 
+/** Constants for allowed skill use while interacting with NPC. **/
+enum skill_enabled_npc_flags {
+	SKILLENABLEDNPC_NONE = 0, //!< Don't allow using any skills while interacting with NPC.
+	SKILLENABLEDNPC_SELF = 1, //!< Allow using non-damaging self skills while interacting with NPC.
+	SKILLENABLEDNPC_ALL  = 2, //!< Allow using all skills while interacting with NPC.
+};
+
 /**
  * Structures
  **/
 
+/** A container holding all required items. **/
+struct skill_required_item_data {
+	struct {
+		int id;
+		int amount[MAX_SKILL_LEVEL];
+	} item[MAX_SKILL_ITEM_REQUIRE];
+	bool any[MAX_SKILL_LEVEL];
+};
+
 struct skill_condition {
 	int weapon,ammo,ammo_qty,hp,sp,zeny,spiritball,mhp,state;
+	int msp;
 	int itemid[MAX_SKILL_ITEM_REQUIRE],amount[MAX_SKILL_ITEM_REQUIRE];
+	int equip_id[MAX_SKILL_ITEM_REQUIRE];
+	int equip_amount[MAX_SKILL_ITEM_REQUIRE];
 };
 
 // Database skills
 struct s_skill_db {
 	int nameid;
-	char name[MAX_SKILL_NAME_LENGTH];
-	char desc[40];
-	int range[MAX_SKILL_LEVEL],hit,inf,element[MAX_SKILL_LEVEL],nk,splash[MAX_SKILL_LEVEL],max;
+	char name[MAX_SKILL_NAME_LENGTH + 1];
+	char desc[MAX_SKILL_DESC_LENGTH + 1];
+	int range[MAX_SKILL_LEVEL];
+	int hit[MAX_SKILL_LEVEL];
+	int inf;
+	int element[MAX_SKILL_LEVEL];
+	int nk;
+	int splash[MAX_SKILL_LEVEL];
+	int max;
 	int num[MAX_SKILL_LEVEL];
 	int cast[MAX_SKILL_LEVEL],walkdelay[MAX_SKILL_LEVEL],delay[MAX_SKILL_LEVEL];
 #ifdef RENEWAL_CAST
 	int fixed_cast[MAX_SKILL_LEVEL];
 #endif
 	int upkeep_time[MAX_SKILL_LEVEL],upkeep_time2[MAX_SKILL_LEVEL],cooldown[MAX_SKILL_LEVEL];
-	int castcancel,cast_def_rate;
-	int inf2,maxcount[MAX_SKILL_LEVEL],skill_type;
+	int castcancel[MAX_SKILL_LEVEL];
+	int cast_def_rate[MAX_SKILL_LEVEL];
+	int inf2;
+	int maxcount[MAX_SKILL_LEVEL];
+	int skill_type[MAX_SKILL_LEVEL];
 	int blewcount[MAX_SKILL_LEVEL];
 	int hp[MAX_SKILL_LEVEL],sp[MAX_SKILL_LEVEL],mhp[MAX_SKILL_LEVEL],hp_rate[MAX_SKILL_LEVEL],sp_rate[MAX_SKILL_LEVEL],zeny[MAX_SKILL_LEVEL];
-	int weapon,ammo,ammo_qty[MAX_SKILL_LEVEL],state,spiritball[MAX_SKILL_LEVEL];
-	int itemid[MAX_SKILL_ITEM_REQUIRE],amount[MAX_SKILL_ITEM_REQUIRE];
+	int msp[MAX_SKILL_LEVEL];
+	int weapon;
+	int ammo;
+	int ammo_qty[MAX_SKILL_LEVEL];
+	int state[MAX_SKILL_LEVEL];
+	int spiritball[MAX_SKILL_LEVEL];
 	int castnodex[MAX_SKILL_LEVEL], delaynodex[MAX_SKILL_LEVEL];
-	int nocast;
-	int unit_id[2];
+	int unit_id[MAX_SKILL_LEVEL][2];
 	int unit_layout_type[MAX_SKILL_LEVEL];
 	int unit_range[MAX_SKILL_LEVEL];
-	int unit_interval;
-	int unit_target;
+	int unit_interval[MAX_SKILL_LEVEL];
+	int unit_target[MAX_SKILL_LEVEL];
 	int unit_flag;
+	struct skill_required_item_data req_items;
+	struct skill_required_item_data req_equip;
 };
 
 struct s_skill_unit_layout {
@@ -1953,8 +1990,8 @@ struct skill_interface {
 	int unit_group_newid;
 	/* accesssors */
 	int (*get_index) (int skill_id);
-	int (*get_type) (int skill_id);
-	int (*get_hit) (int skill_id);
+	int (*get_type) (int skill_id, int skill_lv);
+	int (*get_hit) (int skill_id, int skill_lv);
 	int (*get_inf) (int skill_id);
 	int (*get_ele) (int skill_id, int skill_lv);
 	int (*get_nk) (int skill_id);
@@ -1964,13 +2001,18 @@ struct skill_interface {
 	int (*get_splash) (int skill_id, int skill_lv);
 	int (*get_hp) (int skill_id, int skill_lv);
 	int (*get_mhp) (int skill_id, int skill_lv);
+	int (*get_msp) (int skill_id, int skill_lv);
 	int (*get_sp) (int skill_id, int skill_lv);
 	int (*get_hp_rate) (int skill_id, int skill_lv);
 	int (*get_sp_rate) (int skill_id, int skill_lv);
-	int (*get_state) (int skill_id);
+	int (*get_state) (int skill_id, int skill_lv);
 	int (*get_spiritball) (int skill_id, int skill_lv);
 	int (*get_itemid) (int skill_id, int item_idx);
-	int (*get_itemqty) (int skill_id, int item_idx);
+	int (*get_itemqty) (int skill_id, int item_idx, int skill_lv);
+	bool (*get_item_any_flag) (int skill_id, int skill_lv);
+	int (*get_equip_id) (int skill_id, int item_idx);
+	int (*get_equip_amount) (int skill_id, int item_idx, int skill_lv);
+	bool (*get_equip_any_flag) (int skill_id, int skill_lv);
 	int (*get_zeny) (int skill_id, int skill_lv);
 	int (*get_num) (int skill_id, int skill_lv);
 	int (*get_cast) (int skill_id, int skill_lv);
@@ -1980,19 +2022,19 @@ struct skill_interface {
 	int (*get_time2) (int skill_id, int skill_lv);
 	int (*get_castnodex) (int skill_id, int skill_lv);
 	int (*get_delaynodex) (int skill_id, int skill_lv);
-	int (*get_castdef) (int skill_id);
+	int (*get_castdef) (int skill_id, int skill_lv);
 	int (*get_weapontype) (int skill_id);
 	int (*get_ammotype) (int skill_id);
 	int (*get_ammo_qty) (int skill_id, int skill_lv);
-	int (*get_unit_id) (int skill_id, int flag);
+	int (*get_unit_id) (int skill_id, int skill_lv, int flag);
 	int (*get_inf2) (int skill_id);
-	int (*get_castcancel) (int skill_id);
+	int (*get_castcancel) (int skill_id, int skill_lv);
 	int (*get_maxcount) (int skill_id, int skill_lv);
 	int (*get_blewcount) (int skill_id, int skill_lv);
 	int (*get_unit_flag) (int skill_id);
-	int (*get_unit_target) (int skill_id);
-	int (*get_unit_interval) (int skill_id);
-	int (*get_unit_bl_target) (int skill_id);
+	int (*get_unit_target) (int skill_id, int skill_lv);
+	int (*get_unit_interval) (int skill_id, int skill_lv);
+	int (*get_unit_bl_target) (int skill_id, int skill_lv);
 	int (*get_unit_layout_type) (int skill_id, int skill_lv);
 	int (*get_unit_range) (int skill_id, int skill_lv);
 	int (*get_cooldown) (int skill_id, int skill_lv);
@@ -2004,7 +2046,7 @@ struct skill_interface {
 	int (*get_casttype2) (int index);
 	bool (*is_combo) (int skill_id);
 	int (*name2id) (const char* name);
-	int (*isammotype) (struct map_session_data *sd, int skill_id);
+	int (*isammotype) (struct map_session_data *sd, int skill_id, int skill_lv);
 	int (*castend_id) (int tid, int64 tick, int id, intptr_t data);
 	int (*castend_pos) (int tid, int64 tick, int id, intptr_t data);
 	int (*castend_map) ( struct map_session_data *sd,uint16 skill_id, const char *mapname);
@@ -2029,8 +2071,12 @@ struct skill_interface {
 	int (*cast_fix_sc) ( struct block_list *bl, int time);
 	int (*vf_cast_fix) ( struct block_list *bl, double time, uint16 skill_id, uint16 skill_lv);
 	int (*delay_fix) ( struct block_list *bl, uint16 skill_id, uint16 skill_lv);
+	int (*check_condition_required_equip) (struct map_session_data *sd, int skill_id, int skill_lv);
 	int (*check_condition_castbegin) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv);
+	int (*check_condition_required_items) (struct map_session_data *sd, int skill_id, int skill_lv);
+	bool (*items_required) (struct map_session_data *sd, int skill_id, int skill_lv);
 	int (*check_condition_castend) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv);
+	int (*get_any_item_index) (struct map_session_data *sd, int skill_id, int skill_lv);
 	int (*consume_requirement) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv, short type);
 	struct skill_condition (*get_requirement) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv);
 	int (*check_pc_partner) (struct map_session_data *sd, uint16 skill_id, uint16* skill_lv, int range, int cast_flag);
@@ -2074,7 +2120,7 @@ struct skill_interface {
 	int (*check_unit_range_sub) (struct block_list *bl, va_list ap);
 	int (*check_unit_range2) (struct block_list *bl, int x, int y, uint16 skill_id, uint16 skill_lv);
 	int (*check_unit_range2_sub) (struct block_list *bl, va_list ap);
-	void (*toggle_magicpower) (struct block_list *bl, uint16 skill_id);
+	void (*toggle_magicpower) (struct block_list *bl, uint16 skill_id, int skill_lv);
 	int (*magic_reflect) (struct block_list* src, struct block_list* bl, int type);
 	int (*onskillusage) (struct map_session_data *sd, struct block_list *bl, uint16 skill_id, int64 tick);
 	int (*cell_overlap) (struct block_list *bl, va_list ap);
@@ -2115,24 +2161,68 @@ struct skill_interface {
 	int (*unit_timer_sub) (union DBKey key, struct DBData *data, va_list ap);
 	void (*init_unit_layout) (void);
 	void (*init_unit_layout_unknown) (int skill_idx, int pos);
+	void (*validate_id) (struct config_setting_t *conf, struct s_skill_db *sk, int conf_index);
+	bool (*name_contains_invalid_character) (const char *name);
+	void (*validate_name) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_max_level) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_description) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_range) (struct config_setting_t *conf, struct s_skill_db *sk);
 	void (*validate_hittype) (struct config_setting_t *conf, struct s_skill_db *sk);
 	void (*validate_skilltype) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_skillinfo) (struct config_setting_t *conf, struct s_skill_db *sk);
 	void (*validate_attacktype) (struct config_setting_t *conf, struct s_skill_db *sk);
 	void (*validate_element) (struct config_setting_t *conf, struct s_skill_db *sk);
-	void (*validate_skillinfo) (struct config_setting_t *conf, struct s_skill_db *sk);
 	void (*validate_damagetype) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_splash_range) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_number_of_hits) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_interrupt_cast) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_cast_def_rate) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_number_of_instances) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_knock_back_tiles) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_cast_time) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_act_delay) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_walk_delay) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_skill_data1) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_skill_data2) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_cooldown) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_fixed_cast_time) (struct config_setting_t *conf, struct s_skill_db *sk);
 	void (*validate_castnodex) (struct config_setting_t *conf, struct s_skill_db *sk, bool delay);
+	void (*validate_hp_cost) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_sp_cost) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_hp_rate_cost) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_sp_rate_cost) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_max_hp_trigger) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_max_sp_trigger) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_zeny_cost) (struct config_setting_t *conf, struct s_skill_db *sk);
+	int (*validate_weapontype_sub) (const char *type, bool on, struct s_skill_db *sk);
 	void (*validate_weapontype) (struct config_setting_t *conf,  struct s_skill_db *sk);
+	int (*validate_ammotype_sub) (const char *type, bool on, struct s_skill_db *sk);
 	void (*validate_ammotype) (struct config_setting_t *conf,  struct s_skill_db *sk);
+	void (*validate_ammo_amount) (struct config_setting_t *conf,  struct s_skill_db *sk);
+	int (*validate_state_sub) (const char *state);
 	void (*validate_state) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_spirit_sphere_cost) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_item_requirements_sub_item_amount) (struct config_setting_t *conf, struct s_skill_db *sk, int item_index);
+	void (*validate_item_requirements_sub_items) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_item_requirements_sub_any_flag) (struct config_setting_t *conf, struct s_skill_db *sk);
 	void (*validate_item_requirements) (struct config_setting_t *conf, struct s_skill_db *sk);
-	void (*validate_unit_target) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_equip_requirements_sub_item_amount) (struct config_setting_t *conf, struct s_skill_db *sk, int item_index);
+	void (*validate_equip_requirements_sub_items) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_equip_requirements_sub_any_flag) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_equip_requirements) (struct config_setting_t *conf, struct s_skill_db *sk);
+	int (*validate_requirements_item_name) (const char *name);
+	void (*validate_requirements) (struct config_setting_t *conf, struct s_skill_db *sk);
+	int (*validate_unit_id_sub) (int unit_id);
+	void (*validate_unit_id) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_unit_layout) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_unit_range) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_unit_interval) (struct config_setting_t *conf, struct s_skill_db *sk);
+	int (*validate_unit_flag_sub) (const char *type, bool on, struct s_skill_db *sk);
 	void (*validate_unit_flag) (struct config_setting_t *conf,  struct s_skill_db *sk);
+	int (*validate_unit_target_sub) (const char *target);
+	void (*validate_unit_target) (struct config_setting_t *conf, struct s_skill_db *sk);
+	void (*validate_unit) (struct config_setting_t *conf, struct s_skill_db *sk);
 	void (*validate_additional_fields) (struct config_setting_t *conf, struct s_skill_db *sk);
-	bool (*validate_skilldb) (struct s_skill_db *skt, const char *source);
-	int (*validate_weapontype_sub) (const char *type, bool on, struct s_skill_db *sk);
-	int (*validate_ammotype_sub) (const char *type, bool on, struct s_skill_db *sk);
-	int (*validate_unit_flag_sub) (const char *type, bool on, struct s_skill_db *sk);
 	bool (*read_skilldb) (const char *filename);
 	void (*config_set_level) (struct config_setting_t *conf, int *arr);
 	void (*level_set_value) (int *arr, int value);
diff --git a/src/map/status.c b/src/map/status.c
index b0cb07d11..589acff5c 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1596,7 +1596,7 @@ static int status_check_skilluse(struct block_list *src, struct block_list *targ
 	}
 
 	if( skill_id ) {
-		if (src != NULL && (sd == NULL || sd->autocast.type != AUTOCAST_ITEM)) {
+		if (src != NULL && (sd == NULL || sd->auto_cast_current.type != AUTOCAST_ITEM)) {
 			// Items that cast skills using 'itemskill' will not be handled by map_zone_db.
 			int i;
 
@@ -1640,7 +1640,7 @@ static int status_check_skilluse(struct block_list *src, struct block_list *targ
 				if (src != NULL
 				 && map->getcell(src->m, src, src->x, src->y, CELL_CHKLANDPROTECTOR)
 				 && !(st->mode&MD_BOSS)
-				 && (src->type != BL_PC || sd->autocast.type != AUTOCAST_ITEM))
+				 && (src->type != BL_PC || sd->auto_cast_current.type != AUTOCAST_ITEM))
 					return 0;
 				break;
 			default:
@@ -1719,7 +1719,7 @@ static int status_check_skilluse(struct block_list *src, struct block_list *targ
 				return 0; //Can't amp out of Wand of Hermode :/ [Skotlex]
 		}
 
-		if (skill_id != 0 /* Do not block item-casted skills.*/ && (src->type != BL_PC || sd->autocast.type != AUTOCAST_ITEM)) {
+		if (skill_id != 0 /* Do not block item-casted skills.*/ && (src->type != BL_PC || sd->auto_cast_current.type != AUTOCAST_ITEM)) {
 			//Skills blocked through status changes...
 			if (!flag && ( //Blocked only from using the skill (stuff like autospell may still go through
 				sc->data[SC_SILENCE] ||
@@ -1737,6 +1737,7 @@ static int status_check_skilluse(struct block_list *src, struct block_list *targ
 				(sc->data[SC_MARIONETTE] && skill_id == CG_MARIONETTE) || //Cannot use marionette if you are being buffed by another
 				(sc->data[SC_STASIS] && skill->block_check(src, SC_STASIS, skill_id)) ||
 				(sc->data[SC_KG_KAGEHUMI] && skill->block_check(src, SC_KG_KAGEHUMI, skill_id))
+				|| sc->data[SC_ALL_RIDING] != NULL // New mounts can't attack nor use skills in the client; this check makes it cheat-safe. [Ind]
 				))
 				return 0;
 
@@ -1785,8 +1786,6 @@ static int status_check_skilluse(struct block_list *src, struct block_list *targ
 			} else if ( skill_id != ST_CHASEWALK )
 				return 0;
 		}
-		if( sc->data[SC_ALL_RIDING] )
-			return 0;//New mounts can't attack nor use skills in the client; this check makes it cheat-safe [Ind]
 	}
 
 	if (target == NULL || target == src) //No further checking needed.
@@ -6408,13 +6407,24 @@ static int status_get_class(const struct block_list *bl)
 {
 	nullpo_ret(bl);
 	switch (bl->type) {
-		case BL_PC:  return BL_UCCAST(BL_PC, bl)->status.class;
-		case BL_MOB: return BL_UCCAST(BL_MOB, bl)->vd->class; //Class used on all code should be the view class of the mob.
-		case BL_PET: return BL_UCCAST(BL_PET, bl)->pet.class_;
-		case BL_HOM: return BL_UCCAST(BL_HOM, bl)->homunculus.class_;
-		case BL_MER: return BL_UCCAST(BL_MER, bl)->mercenary.class_;
-		case BL_NPC: return BL_UCCAST(BL_NPC, bl)->class_;
-		case BL_ELEM: return BL_UCCAST(BL_ELEM, bl)->elemental.class_;
+		case BL_PC:
+			return BL_UCCAST(BL_PC, bl)->status.class;
+		case BL_MOB:
+		{
+			const struct view_data *const vd = BL_UCCAST(BL_MOB, bl)->vd;
+			nullpo_ret(vd);
+			return vd->class; //Class used on all code should be the view class of the mob.
+		}
+		case BL_PET:
+			return BL_UCCAST(BL_PET, bl)->pet.class_;
+		case BL_HOM:
+			return BL_UCCAST(BL_HOM, bl)->homunculus.class_;
+		case BL_MER:
+			return BL_UCCAST(BL_MER, bl)->mercenary.class_;
+		case BL_NPC:
+			return BL_UCCAST(BL_NPC, bl)->class_;
+		case BL_ELEM:
+			return BL_UCCAST(BL_ELEM, bl)->elemental.class_;
 	}
 	return 0;
 }
@@ -6504,7 +6514,7 @@ static defType status_get_def(struct block_list *bl)
 	int def = st ? st->def : 0;
 	ud = unit->bl2ud(bl);
 	if (ud && ud->skilltimer != INVALID_TIMER)
-		def -= def * skill->get_castdef(ud->skill_id)/100;
+		def -= def * skill->get_castdef(ud->skill_id, ud->skill_lv) / 100;
 
 	return cap_value(def, DEFTYPE_MIN, DEFTYPE_MAX);
 }
diff --git a/src/map/unit.c b/src/map/unit.c
index 19f09f83c..c23e96aee 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -270,9 +270,8 @@ static int unit_steptimer(int tid, int64 tick, int id, intptr_t data)
 	} else {
 		// If a player has target_id set and target is in range, attempt attack
 		struct block_list *tbl = map->id2bl(target_id);
-		nullpo_retr(2, tbl);
-		if (status->check_visibility(bl, tbl) == 0) // Target not visible
-			return 1;
+		if (tbl == NULL || status->check_visibility(bl, tbl) == 0)
+			return 1; // Target does not exist (player offline, monster died, etc.) or target is not visible to source.
 		if (ud->stepskill_id == 0)
 			unit->attack(bl, tbl->id, ud->state.attack_continue + 2); // Execute normal attack
 		else
@@ -1152,14 +1151,13 @@ static int unit_stop_walking(struct block_list *bl, int flag)
 static int unit_skilluse_id(struct block_list *src, int target_id, uint16 skill_id, uint16 skill_lv)
 {
 	int casttime = skill->cast_fix(src, skill_id, skill_lv);
-	int castcancel = skill->get_castcancel(skill_id);
+	int castcancel = skill->get_castcancel(skill_id, skill_lv);
 	int ret = unit->skilluse_id2(src, target_id, skill_id, skill_lv, casttime, castcancel);
 	struct map_session_data *sd = BL_CAST(BL_PC, src);
 
-	if (sd != NULL && ret == 0)
-		pc->autocast_clear(sd); // Error in unit_skilluse_id2().
-	else if (sd != NULL && ret != 0 && skill_id != SA_ABRACADABRA && skill_id != WM_RANDOMIZESPELL)
-		skill->validate_autocast_data(sd, skill_id, skill_lv);
+	if (sd != NULL)
+		pc->autocast_remove(sd, sd->auto_cast_current.type, sd->auto_cast_current.skill_id,
+				    sd->auto_cast_current.skill_lv);
 
 	return ret;
 }
@@ -1568,7 +1566,7 @@ static int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill
 	//Check range when not using skill on yourself or is a combo-skill during attack
 	//(these are supposed to always have the same range as your attack)
 	if( src->id != target_id && (!temp || ud->attacktimer == INVALID_TIMER) ) {
-		if( skill->get_state(ud->skill_id) == ST_MOVE_ENABLE ) {
+		if (skill->get_state(ud->skill_id, ud->skill_lv) == ST_MOVE_ENABLE) {
 			if( !unit->can_reach_bl(src, target, range + 1, 1, NULL, NULL) )
 				return 0; // Walk-path check failed.
 		} else if( src->type == BL_MER && skill_id == MA_REMOVETRAP ) {
@@ -1718,7 +1716,7 @@ static int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill
 	if (!ud->state.running) //need TK_RUN or WUGDASH handler to be done before that, see bugreport:6026
 		unit->stop_walking(src, STOPWALKING_FLAG_FIXPOS);// even though this is not how official works but this will do the trick. bugreport:6829
 
-	if (sd != NULL && sd->autocast.itemskill_instant_cast && sd->autocast.type == AUTOCAST_ITEM)
+	if (sd != NULL && sd->auto_cast_current.itemskill_instant_cast && sd->auto_cast_current.type == AUTOCAST_ITEM)
 		casttime = 0;
 
 	// in official this is triggered even if no cast time.
@@ -1756,7 +1754,7 @@ static int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill
 	if( casttime <= 0 )
 		ud->state.skillcastcancel = 0;
 
-	if (sd == NULL || sd->autocast.type < AUTOCAST_ABRA || skill->get_cast(skill_id, skill_lv) != 0)
+	if (sd == NULL || sd->auto_cast_current.type < AUTOCAST_ABRA || skill->get_cast(skill_id, skill_lv) != 0)
 		ud->canact_tick = tick + casttime + 100;
 	if( sd )
 	{
@@ -1791,14 +1789,13 @@ static int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill
 static int unit_skilluse_pos(struct block_list *src, short skill_x, short skill_y, uint16 skill_id, uint16 skill_lv)
 {
 	int casttime = skill->cast_fix(src, skill_id, skill_lv);
-	int castcancel = skill->get_castcancel(skill_id);
+	int castcancel = skill->get_castcancel(skill_id, skill_lv);
 	int ret = unit->skilluse_pos2(src, skill_x, skill_y, skill_id, skill_lv, casttime, castcancel);
 	struct map_session_data *sd = BL_CAST(BL_PC, src);
 
-	if (sd != NULL && ret == 0)
-		pc->autocast_clear(sd); // Error in unit_skilluse_pos2().
-	else if (sd != NULL && ret != 0 && skill_id != SA_ABRACADABRA && skill_id != WM_RANDOMIZESPELL)
-		skill->validate_autocast_data(sd, skill_id, skill_lv);
+	if (sd != NULL)
+		pc->autocast_remove(sd, sd->auto_cast_current.type, sd->auto_cast_current.skill_id,
+				    sd->auto_cast_current.skill_lv);
 
 	return ret;
 }
@@ -1874,7 +1871,7 @@ static int unit_skilluse_pos2(struct block_list *src, short skill_x, short skill
 		return 0; // Attacking will be handled by unit_walk_toxy_timer in this case
 	}
 
-	if( skill->get_state(ud->skill_id) == ST_MOVE_ENABLE ) {
+	if (skill->get_state(ud->skill_id, ud->skill_lv) == ST_MOVE_ENABLE) {
 		if( !unit->can_reach_bl(src, &bl, range + 1, 1, NULL, NULL) )
 			return 0; //Walk-path check failed.
 	} else if( !battle->check_range(src, &bl, range) )
@@ -1895,7 +1892,7 @@ static int unit_skilluse_pos2(struct block_list *src, short skill_x, short skill
 	}
 
 	ud->state.skillcastcancel = castcancel&&casttime>0?1:0;
-	if (sd == NULL || sd->autocast.type < AUTOCAST_ABRA || skill->get_cast(skill_id, skill_lv) != 0)
+	if (sd == NULL || sd->auto_cast_current.type < AUTOCAST_ABRA || skill->get_cast(skill_id, skill_lv) != 0)
 		ud->canact_tick  = tick + casttime + 100;
 #if 0
 	if (sd) {
@@ -1926,7 +1923,7 @@ static int unit_skilluse_pos2(struct block_list *src, short skill_x, short skill
 
 	unit->stop_walking(src, STOPWALKING_FLAG_FIXPOS);
 
-	if (sd != NULL && sd->autocast.itemskill_instant_cast && sd->autocast.type == AUTOCAST_ITEM)
+	if (sd != NULL && sd->auto_cast_current.itemskill_instant_cast && sd->auto_cast_current.type == AUTOCAST_ITEM)
 		casttime = 0;
 
 	// in official this is triggered even if no cast time.
@@ -2889,6 +2886,8 @@ static int unit_free(struct block_list *bl, enum clr_type clrtype)
 				aFree(sd->instance);
 				sd->instance = NULL;
 			}
+
+			VECTOR_CLEAR(sd->auto_cast); // Clear auto-cast vector.
 			VECTOR_CLEAR(sd->channels);
 			VECTOR_CLEAR(sd->script_queues);
 			VECTOR_CLEAR(sd->achievement); // Achievement [Smokexyz/Hercules]