Merge pull request #2199 from 4144/updatepackets

Update packets up to 2018-09-19

26 files changed, 836 insertions, 166 deletions

diff --git a/.travis.yml b/.travis.yml
index a3374503c..fc28a5aef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ matrix:
   - compiler: false
   include:
   - compiler: gcc
-    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug CC=gcc-6 --disable-manager --enable-Werror --enable-buildbot" HPM="1"
+    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug CC=gcc-6 --disable-manager --enable-Werror --enable-packetver=20180919 --enable-packetver-re --enable-buildbot" HPM="1"
     addons:
       apt:
         sources:
@@ -50,7 +50,7 @@ matrix:
         - libxml-sax-perl
         - libxml-parser-perl
   - compiler: clang
-    env: CONFIGURE_FLAGS="--enable-debug CC=clang-5.0 --enable-Werror --enable-buildbot"
+    env: CONFIGURE_FLAGS="--enable-debug CC=clang-5.0 --enable-Werror --enable-packetver=20180919 --enable-packetver-re --enable-buildbot"
     addons:
       apt:
         sources:
@@ -68,7 +68,7 @@ matrix:
         packages:
         - clang-5.0
   - compiler: clang
-    env: CONFIGURE_FLAGS="--enable-debug CC=clang-4.0 --enable-Werror --enable-buildbot"
+    env: CONFIGURE_FLAGS="--enable-debug CC=clang-4.0 --enable-Werror --enable-packetver=20180919 --enable-packetver-re --enable-buildbot"
     addons:
       apt:
         sources:
@@ -90,11 +90,11 @@ matrix:
   - compiler: clang
     env: CONFIGURE_FLAGS="--enable-debug --disable-renewal --enable-Werror --enable-buildbot"
   - compiler: gcc
-    env: CONFIGURE_FLAGS="--enable-debug --enable-Werror --enable-buildbot"
+    env: CONFIGURE_FLAGS="--enable-debug --enable-Werror --enable-packetver=20180919 --enable-packetver-re --enable-buildbot"
   - compiler: gcc
     env: CONFIGURE_FLAGS="--enable-debug --disable-renewal --enable-Werror --enable-buildbot"
   - compiler: gcc
-    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-5 --disable-manager --enable-Werror --enable-buildbot"
+    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-5 --disable-manager --enable-Werror --enable-packetver=20180919 --enable-packetver-re --enable-buildbot"
     addons:
       apt:
         sources:
@@ -110,7 +110,7 @@ matrix:
         packages:
         - gcc-5
   - compiler: gcc
-    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-6 --disable-manager --enable-Werror --enable-buildbot"
+    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-6 --disable-manager --enable-Werror --enable-packetver=20180919 --enable-packetver-re --enable-buildbot"
     addons:
       apt:
         sources:
diff --git a/configure b/configure
index 180fe971d..7296be978 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac 234189f34.
+# From configure.ac 150dff284.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -7585,6 +7585,55 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wvla" >&5
+$as_echo_n "checking whether $CC supports -Wvla... " >&6; }
+		OLD_CFLAGS="$CFLAGS"
+		CFLAGS="$CFLAGS -Werror -Wvla"
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+				CFLAGS="$OLD_CFLAGS -Wvla"
+				# Optionally, run a test
+				if test "x" != "x"; then
+					{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC can actually use -Wvla" >&5
+$as_echo_n "checking whether $CC can actually use -Wvla... " >&6; }
+					CFLAGS="$OLD_CFLAGS -Werror -Wvla"
+					cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+							{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+							CFLAGS="$OLD_CFLAGS"
+
+
+							{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+							CFLAGS="$OLD_CFLAGS -Wvla"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+				fi
+
+else
+
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+				CFLAGS="$OLD_CFLAGS"
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wno-format-nonliteral" >&5
 $as_echo_n "checking whether $CC supports -Wno-format-nonliteral... " >&6; }
 		OLD_CFLAGS="$CFLAGS"
diff --git a/configure.ac b/configure.ac
index 4d5f4bcfd..2aad9d7e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1085,6 +1085,7 @@ AC_CHECK_COMPILER_WFLAG(redundant-decls)
 AC_CHECK_COMPILER_WFLAG(cast-qual)
 AC_CHECK_COMPILER_WFLAG(misleading-indentation)
 AC_CHECK_COMPILER_WFLAG(null-dereference)
+AC_CHECK_COMPILER_WFLAG(vla)
 AC_CHECK_COMPILER_WNOFLAG(format-nonliteral)
 AC_CHECK_COMPILER_WNOFLAG(switch)
 AC_CHECK_COMPILER_WNOFLAG(missing-field-initializers)
diff --git a/src/common/HPMDataCheck.h b/src/common/HPMDataCheck.h
index 31bce72b2..a7d594b0f 100644
--- a/src/common/HPMDataCheck.h
+++ b/src/common/HPMDataCheck.h
@@ -718,7 +718,11 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 		{ "PACKET_ZC_WARPLIST", sizeof(struct PACKET_ZC_WARPLIST), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_WARPLIST_sub", sizeof(struct PACKET_ZC_WARPLIST_sub), SERVER_TYPE_MAP },
 		{ "PACKET_ZC_WRITE_MAIL_RESULT", sizeof(struct PACKET_ZC_WRITE_MAIL_RESULT), SERVER_TYPE_MAP },
+		{ "ZC_INVENTORY_END", sizeof(struct ZC_INVENTORY_END), SERVER_TYPE_MAP },
+		{ "ZC_INVENTORY_START", sizeof(struct ZC_INVENTORY_START), SERVER_TYPE_MAP },
 		{ "ZC_PROGRESS_ACTOR", sizeof(struct ZC_PROGRESS_ACTOR), SERVER_TYPE_MAP },
+		{ "ZC_STORE_ITEMLIST_EQUIP", sizeof(struct ZC_STORE_ITEMLIST_EQUIP), SERVER_TYPE_MAP },
+		{ "ZC_STORE_ITEMLIST_NORMAL", sizeof(struct ZC_STORE_ITEMLIST_NORMAL), SERVER_TYPE_MAP },
 		{ "ach_list_info", sizeof(struct ach_list_info), SERVER_TYPE_MAP },
 		{ "mail_item", sizeof(struct mail_item), SERVER_TYPE_MAP },
 		{ "maillistinfo", sizeof(struct maillistinfo), SERVER_TYPE_MAP },
@@ -789,8 +793,6 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 		{ "packet_status_change", sizeof(struct packet_status_change), SERVER_TYPE_MAP },
 		{ "packet_status_change2", sizeof(struct packet_status_change2), SERVER_TYPE_MAP },
 		{ "packet_status_change_end", sizeof(struct packet_status_change_end), SERVER_TYPE_MAP },
-		{ "packet_storelist_equip", sizeof(struct packet_storelist_equip), SERVER_TYPE_MAP },
-		{ "packet_storelist_normal", sizeof(struct packet_storelist_normal), SERVER_TYPE_MAP },
 		{ "packet_unequipitem_ack", sizeof(struct packet_unequipitem_ack), SERVER_TYPE_MAP },
 		{ "packet_unit_walking", sizeof(struct packet_unit_walking), SERVER_TYPE_MAP },
 		{ "packet_viewequip_ack", sizeof(struct packet_viewequip_ack), SERVER_TYPE_MAP },
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 6522f3013..2538f797c 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -4297,7 +4297,7 @@ ACMD(repairall)
 
 	if (count > 0) {
 		clif->misceffect(&sd->bl, 3);
-		clif->equiplist(sd);
+		clif->equipList(sd);
 		clif->message(fd, msg_fd(fd,107)); // All items have been repaired.
 	} else {
 		clif->message(fd, msg_fd(fd,108)); // No item need to be repaired.
diff --git a/src/map/clif.c b/src/map/clif.c
index 4e48d7886..5cb362c7f 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -86,8 +86,8 @@ static struct s_packet_db packet_db[MAX_PACKET_DB + 1];
 /* re-usable */
 static struct packet_itemlist_normal itemlist_normal;
 static struct packet_itemlist_equip itemlist_equip;
-static struct packet_storelist_normal storelist_normal;
-static struct packet_storelist_equip storelist_equip;
+static struct ZC_STORE_ITEMLIST_NORMAL storelist_normal;
+static struct ZC_STORE_ITEMLIST_EQUIP storelist_equip;
 static struct packet_viewequip_ack viewequip_list;
 #if PACKETVER >= 20131223
 static struct packet_npc_market_result_ack npcmarket_result;
@@ -2641,7 +2641,7 @@ static void clif_item_movefailed(struct map_session_data *sd, int n)
 	WFIFOHEAD(fd, len);
 	struct PACKET_ZC_INVENTORY_MOVE_FAILED *p = WFIFOP(fd, 0);
 	p->packetType = 0xaa7;
-	p->index = n;
+	p->index = n + 2;
 	p->unknown = 1;
 	WFIFOSET(fd, len);
 #else
@@ -2787,7 +2787,18 @@ static void clif_item_normal(short idx, struct NORMALITEM_INFO *p, struct item *
 #endif
 }
 
-static void clif_inventorylist(struct map_session_data *sd)
+static void clif_inventoryList(struct map_session_data *sd)
+{
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+	clif->inventoryStart(sd, INVTYPE_INVENTORY, "");
+#endif
+	clif->inventoryItems(sd, INVTYPE_INVENTORY);
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+	clif->inventoryEnd(sd, INVTYPE_INVENTORY);
+#endif
+}
+
+static void clif_inventoryItems(struct map_session_data *sd, enum inventory_type type)
 {
 	int i, normal = 0, equip = 0;
 
@@ -2802,9 +2813,12 @@ static void clif_inventorylist(struct map_session_data *sd)
 			clif->item_normal(i+2,&itemlist_normal.list[normal++],&sd->status.inventory[i],sd->inventory_data[i]);
 	}
 
-	if( normal ) {
-		itemlist_normal.PacketType   = inventorylistnormalType;
-		itemlist_normal.PacketLength = 4 + (sizeof(struct NORMALITEM_INFO) * normal);
+	if (normal) {
+		itemlist_normal.PacketType = inventorylistnormalType;
+		itemlist_normal.PacketLength = (sizeof(itemlist_normal) - sizeof(itemlist_normal.list)) + (sizeof(struct NORMALITEM_INFO) * normal);
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+		itemlist_normal.invType = type;
+#endif
 
 		clif->send(&itemlist_normal, itemlist_normal.PacketLength, &sd->bl, SELF);
 	}
@@ -2814,7 +2828,10 @@ static void clif_inventorylist(struct map_session_data *sd)
 
 	if( equip ) {
 		itemlist_equip.PacketType  = inventorylistequipType;
-		itemlist_equip.PacketLength = 4 + (sizeof(struct EQUIPITEM_INFO) * equip);
+		itemlist_equip.PacketLength = (sizeof(itemlist_equip) - sizeof(itemlist_equip.list)) + (sizeof(struct EQUIPITEM_INFO) * equip);
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+		itemlist_equip.invType = type;
+#endif
 
 		clif->send(&itemlist_equip, itemlist_equip.PacketLength, &sd->bl, SELF);
 	}
@@ -2830,8 +2847,20 @@ static void clif_inventorylist(struct map_session_data *sd)
 #endif
 }
 
+static void clif_equipList(struct map_session_data *sd)
+{
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+	clif->inventoryStart(sd, INVTYPE_INVENTORY, "");
+	clif->inventoryItems(sd, INVTYPE_INVENTORY);
+	clif->inventoryEnd(sd, INVTYPE_INVENTORY);
+#else
+	// [4144] for old packet version it send only equipment. this is bug?
+	clif->equipItems(sd, INVTYPE_INVENTORY);
+#endif
+}
+
 //Required when items break/get-repaired. Only sends equippable item list.
-static void clif_equiplist(struct map_session_data *sd)
+static void clif_equipItems(struct map_session_data *sd, enum inventory_type type)
 {
 	int i, equip = 0;
 
@@ -2844,9 +2873,12 @@ static void clif_equiplist(struct map_session_data *sd)
 			clif->item_equip(i+2,&itemlist_equip.list[equip++],&sd->status.inventory[i],sd->inventory_data[i],pc->equippoint(sd,i));
 	}
 
-	if( equip ) {
-		itemlist_equip.PacketType  = inventorylistequipType;
-		itemlist_equip.PacketLength = 4 + (sizeof(struct EQUIPITEM_INFO) * equip);
+	if (equip) {
+		itemlist_equip.PacketType = inventorylistequipType;
+		itemlist_equip.PacketLength = (sizeof(itemlist_equip) - sizeof(itemlist_equip.list)) + (sizeof(struct EQUIPITEM_INFO) * equip);
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+		itemlist_equip.invType = type;
+#endif
 
 		clif->send(&itemlist_equip, itemlist_equip.PacketLength, &sd->bl, SELF);
 	}
@@ -2863,13 +2895,74 @@ static void clif_equiplist(struct map_session_data *sd)
 #endif
 }
 
-static void clif_storagelist(struct map_session_data *sd, struct item *items, int items_length)
+static void clif_storageList(struct map_session_data *sd, struct item *items, int items_length)
 {
-	int i = 0;
-	struct item_data *id;
+	nullpo_retv(sd);
+
+	clif->inventoryStart(sd, INVTYPE_STORAGE, "Storage");
+	if (sd->storage.aggregate > 0)
+		clif->storageItems(sd, INVTYPE_STORAGE, items, items_length);
+	clif->inventoryEnd(sd, INVTYPE_STORAGE);
+}
 
+static void clif_guildStorageList(struct map_session_data *sd, struct item *items, int items_length)
+{
+	clif->inventoryStart(sd, INVTYPE_GUILD_STORAGE, "Guild storage");
+	clif->storageItems(sd, INVTYPE_GUILD_STORAGE, items, items_length);
+	clif->inventoryEnd(sd, INVTYPE_GUILD_STORAGE);
+}
+
+static void clif_inventoryStart(struct map_session_data *sd, enum inventory_type type, const char *name)
+{
+#if PACKETVER_RE_NUM >= 20180829 || PACKETVER_ZERO_NUM >= 20180919
+	nullpo_retv(sd);
+	nullpo_retv(name);
+
+	char buf[sizeof(struct ZC_INVENTORY_START) + 24];
+	memset(buf, 0, sizeof(buf));
+	struct ZC_INVENTORY_START *p = (struct ZC_INVENTORY_START *)buf;
+	p->packetType = 0xb08;
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+	p->invType = type;
+#endif
+#if PACKETVER_RE_NUM >= 20180919 || PACKETVER_ZERO_NUM >= 20180919
+	int strLen = (int)safestrnlen(name, 24);
+	if (strLen > 24)
+		strLen = 24;
+	const int len = sizeof(struct ZC_INVENTORY_START) + strLen;
+	p->packetLength = len;
+	safestrncpy(p->name, name, strLen);
+#else
+	const int len = sizeof(struct ZC_INVENTORY_START);
+	safestrncpy(p->name, name, NAME_LENGTH);
+#endif
+	clif->send(p, len, &sd->bl, SELF);
+#endif
+}
+
+static void clif_inventoryEnd(struct map_session_data *sd, enum inventory_type type)
+{
+#if PACKETVER_RE_NUM >= 20180829 || PACKETVER_ZERO_NUM >= 20180919
+	nullpo_retv(sd);
+
+	struct ZC_INVENTORY_END p;
+	p.packetType = 0xb0b;
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+	p.invType = type;
+#endif
+	p.flag = 0;
+	clif->send(&p, sizeof(p), &sd->bl, SELF);
+#endif
+}
+
+static void clif_storageItems(struct map_session_data *sd, enum inventory_type type, struct item *items, int items_length)
+{
 	nullpo_retv(sd);
 	nullpo_retv(items);
+
+	int i = 0;
+	struct item_data *id;
+
 	do {
 		int normal = 0, equip = 0, k = 0;
 
@@ -2887,10 +2980,13 @@ static void clif_storagelist(struct map_session_data *sd, struct item *items, in
 		}
 
 		if( normal ) {
-			storelist_normal.PacketType   = storagelistnormalType;
+			storelist_normal.PacketType   = storageListNormalType;
 			storelist_normal.PacketLength =  ( sizeof( storelist_normal ) - sizeof( storelist_normal.list ) ) + (sizeof(struct NORMALITEM_INFO) * normal);
 
-#if PACKETVER >= 20120925
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+			storelist_normal.invType = type;
+#endif
+#if PACKETVER >= 20120925 && PACKETVER_RE_NUM < 20180829 && PACKETVER_ZERO_NUM < 20180919
 			safestrncpy(storelist_normal.name, "Storage", NAME_LENGTH);
 #endif
 
@@ -2898,10 +2994,13 @@ static void clif_storagelist(struct map_session_data *sd, struct item *items, in
 		}
 
 		if( equip ) {
-			storelist_equip.PacketType   = storagelistequipType;
+			storelist_equip.PacketType   = storageListEquipType;
 			storelist_equip.PacketLength = ( sizeof( storelist_equip ) - sizeof( storelist_equip.list ) ) + (sizeof(struct EQUIPITEM_INFO) * equip);
 
-#if PACKETVER >= 20120925
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+			storelist_equip.invType = type;
+#endif
+#if PACKETVER >= 20120925 && PACKETVER_RE_NUM < 20180829 && PACKETVER_ZERO_NUM < 20180919
 			safestrncpy(storelist_equip.name, "Storage", NAME_LENGTH);
 #endif
 
@@ -2912,7 +3011,18 @@ static void clif_storagelist(struct map_session_data *sd, struct item *items, in
 
 }
 
-static void clif_cartlist(struct map_session_data *sd)
+static void clif_cartList(struct map_session_data *sd)
+{
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+	clif->inventoryStart(sd, INVTYPE_CART, "");
+#endif
+	clif->cartItems(sd, INVTYPE_CART);
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+	clif->inventoryEnd(sd, INVTYPE_CART);
+#endif
+}
+
+static void clif_cartItems(struct map_session_data *sd, enum inventory_type type)
 {
 	int i, normal = 0, equip = 0;
 	struct item_data *id;
@@ -2930,16 +3040,22 @@ static void clif_cartlist(struct map_session_data *sd)
 			clif->item_normal(i+2,&itemlist_normal.list[normal++],&sd->status.cart[i],id);
 	}
 
-	if( normal ) {
-		itemlist_normal.PacketType   = cartlistnormalType;
-		itemlist_normal.PacketLength = 4 + (sizeof(struct NORMALITEM_INFO) * normal);
+	if (normal) {
+		itemlist_normal.PacketType = cartlistnormalType;
+		itemlist_normal.PacketLength = (sizeof(itemlist_normal) - sizeof(itemlist_normal.list)) + (sizeof(struct NORMALITEM_INFO) * normal);
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+		itemlist_normal.invType = type;
+#endif
 
 		clif->send(&itemlist_normal, itemlist_normal.PacketLength, &sd->bl, SELF);
 	}
 
-	if( equip ) {
-		itemlist_equip.PacketType  = cartlistequipType;
-		itemlist_equip.PacketLength = 4 + (sizeof(struct EQUIPITEM_INFO) * equip);
+	if (equip) {
+		itemlist_equip.PacketType = cartlistequipType;
+		itemlist_equip.PacketLength = (sizeof(itemlist_equip) - sizeof(itemlist_equip.list)) + (sizeof(struct EQUIPITEM_INFO) * equip);
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+		itemlist_equip.invType = type;
+#endif
 
 		clif->send(&itemlist_equip, itemlist_equip.PacketLength, &sd->bl, SELF);
 	}
@@ -7571,22 +7687,16 @@ static void clif_mvp_item(struct map_session_data *sd, int nameid)
 /// 010b <exp>.L
 static void clif_mvp_exp(struct map_session_data *sd, unsigned int exp)
 {
-#if PACKETVER >= 20131223 // Kro removed this packet [Napster]
-	if (battle_config.mvp_exp_reward_message) {
-		char e_msg[CHAT_SIZE_MAX];
-		sprintf(e_msg, msg_txt(855), exp);
-		clif->messagecolor_self(sd->fd, COLOR_CYAN, e_msg); // Congratulations! You are the MVP! Your reward EXP Points are %u !!
-	}
-#else
+#if PACKETVER_RE_NUM >= 20080827 || PACKETVER_MAIN_NUM >= 20090401 || defined(PACKETVER_ZERO)
 	int fd;
 
 	nullpo_retv(sd);
 
-	fd=sd->fd;
-	WFIFOHEAD(fd,packet_len(0x10b));
-	WFIFOW(fd,0)=0x10b;
-	WFIFOL(fd,2)=cap_value(exp,0,INT32_MAX);
-	WFIFOSET(fd,packet_len(0x10b));
+	fd = sd->fd;
+	WFIFOHEAD(fd, packet_len(0x10b));
+	WFIFOW(fd, 0) = 0x10b;
+	WFIFOL(fd, 2) = cap_value(exp, 0, INT32_MAX);
+	WFIFOSET(fd, packet_len(0x10b));
 #endif
 }
 
@@ -8825,8 +8935,8 @@ static void clif_refresh_storagewindow(struct map_session_data *sd)
 	if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) {
 		if (sd->storage.aggregate > 0) {
 			storage->sortitem(VECTOR_DATA(sd->storage.item), VECTOR_LENGTH(sd->storage.item));
-			clif->storagelist(sd, VECTOR_DATA(sd->storage.item), VECTOR_LENGTH(sd->storage.item));
 		}
+		clif->storageList(sd, VECTOR_DATA(sd->storage.item), VECTOR_LENGTH(sd->storage.item));
 		clif->updatestorageamount(sd, sd->storage.aggregate, MAX_STORAGE);
 	}
 	// Notify the client that the gstorage is open otherwise it will
@@ -8838,7 +8948,7 @@ static void clif_refresh_storagewindow(struct map_session_data *sd)
 			intif->request_guild_storage(sd->status.account_id,sd->status.guild_id);
 		} else {
 			storage->sortitem(gstor->items, ARRAYLENGTH(gstor->items));
-			clif->storagelist(sd, gstor->items, ARRAYLENGTH(gstor->items));
+			clif->guildStorageList(sd, gstor->items, ARRAYLENGTH(gstor->items));
 			clif->updatestorageamount(sd, gstor->storage_amount, MAX_GUILD_STORAGE);
 		}
 	}
@@ -8850,9 +8960,9 @@ static void clif_refresh(struct map_session_data *sd)
 	nullpo_retv(sd);
 
 	clif->changemap(sd,sd->bl.m,sd->bl.x,sd->bl.y);
-	clif->inventorylist(sd);
+	clif->inventoryList(sd);
 	if(pc_iscarton(sd)) {
-		clif->cartlist(sd);
+		clif->cartList(sd);
 		clif->updatestatus(sd,SP_CARTINFO);
 	}
 	clif->updatestatus(sd,SP_WEIGHT);
@@ -9884,11 +9994,11 @@ static void clif_parse_LoadEndAck(int fd, struct map_session_data *sd)
 
 	// Send character inventory to the client.
 	// call this before pc->checkitem() so that the client isn't called to delete a non-existent item.
-	clif->inventorylist(sd);
+	clif->inventoryList(sd);
 
 	// Send the cart inventory, counts & weight to the client.
 	if(pc_iscarton(sd)) {
-		clif->cartlist(sd);
+		clif->cartList(sd);
 		clif->updatestatus(sd, SP_CARTINFO);
 	}
 
@@ -11088,7 +11198,7 @@ static void clif_parse_DropItem(int fd, struct map_session_data *sd)
 	}
 
 	//Because the client does not like being ignored.
-	clif->item_movefailed(sd, item_index);
+	clif->dropitem(sd, item_index, 0);
 }
 
 static void clif_parse_UseItem(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
@@ -22197,9 +22307,12 @@ void clif_defaults(void)
 	clif->combo_delay = clif_combo_delay;
 	clif->status_change = clif_status_change;
 	clif->insert_card = clif_insert_card;
-	clif->inventorylist = clif_inventorylist;
-	clif->equiplist = clif_equiplist;
-	clif->cartlist = clif_cartlist;
+	clif->inventoryList = clif_inventoryList;
+	clif->inventoryItems = clif_inventoryItems;
+	clif->equipList = clif_equipList;
+	clif->equipItems = clif_equipItems;
+	clif->cartList = clif_cartList;
+	clif->cartItems = clif_cartItems;
 	clif->favorite_item = clif_favorite_item;
 	clif->clearcart = clif_clearcart;
 	clif->item_identify_list = clif_item_identify_list;
@@ -22355,7 +22468,11 @@ void clif_defaults(void)
 	clif->openvendingAck = clif_openvendingAck;
 	clif->vendingreport = clif_vendingreport;
 	/* storage handling */
-	clif->storagelist = clif_storagelist;
+	clif->storageList = clif_storageList;
+	clif->guildStorageList = clif_guildStorageList;
+	clif->storageItems = clif_storageItems;
+	clif->inventoryStart = clif_inventoryStart;
+	clif->inventoryEnd = clif_inventoryEnd;
 	clif->updatestorageamount = clif_updatestorageamount;
 	clif->storageitemadded = clif_storageitemadded;
 	clif->storageitemremoved = clif_storageitemremoved;
diff --git a/src/map/clif.h b/src/map/clif.h
index e3b2a90d3..13435e82e 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -612,6 +612,16 @@ enum pet_evolution_result {
 };
 
 /**
+ * Inventory type for clients 2018-09-12 RE +
+ **/
+enum inventory_type {
+	INVTYPE_INVENTORY = 0,
+	INVTYPE_CART = 1,
+	INVTYPE_STORAGE = 2,
+	INVTYPE_GUILD_STORAGE = 3,
+};
+
+/**
  * Structures
  **/
 typedef void (*pFunc)(int, struct map_session_data *); //cant help but put it first
@@ -827,9 +837,12 @@ struct clif_interface {
 	void (*combo_delay) (struct block_list *bl,int wait);
 	void (*status_change) (struct block_list *bl,int type,int flag,int tick,int val1, int val2, int val3);
 	void (*insert_card) (struct map_session_data *sd,int idx_equip,int idx_card,int flag);
-	void (*inventorylist) (struct map_session_data *sd);
-	void (*equiplist) (struct map_session_data *sd);
-	void (*cartlist) (struct map_session_data *sd);
+	void (*inventoryList) (struct map_session_data *sd);
+	void (*inventoryItems) (struct map_session_data *sd, enum inventory_type type);
+	void (*equipList) (struct map_session_data *sd);
+	void (*equipItems) (struct map_session_data *sd, enum inventory_type type);
+	void (*cartList) (struct map_session_data *sd);
+	void (*cartItems) (struct map_session_data *sd, enum inventory_type type);
 	void (*favorite_item) (struct map_session_data* sd, unsigned short index);
 	void (*clearcart) (int fd);
 	void (*item_identify_list) (struct map_session_data *sd);
@@ -986,7 +999,11 @@ struct clif_interface {
 	void (*openvendingAck) (int fd, int result);
 	void (*vendingreport) (struct map_session_data* sd, int index, int amount, uint32 char_id, int zeny);
 	/* storage handling */
-	void (*storagelist) (struct map_session_data* sd, struct item* items, int items_length);
+	void (*storageList) (struct map_session_data* sd, struct item* items, int items_length);
+	void (*guildStorageList) (struct map_session_data* sd, struct item* items, int items_length);
+	void (*storageItems) (struct map_session_data* sd, enum inventory_type type, struct item* items, int items_length);
+	void (*inventoryStart) (struct map_session_data* sd, enum inventory_type type, const char* name);
+	void (*inventoryEnd) (struct map_session_data* sd, enum inventory_type type);
 	void (*updatestorageamount) (struct map_session_data* sd, int amount, int max_amount);
 	void (*storageitemadded) (struct map_session_data* sd, struct item* i, int index, int amount);
 	void (*storageitemremoved) (struct map_session_data* sd, int index, int amount);
diff --git a/src/map/messages_main.h b/src/map/messages_main.h
index dd000d2f1..f26fdb50b 100644
--- a/src/map/messages_main.h
+++ b/src/map/messages_main.h
@@ -23,7 +23,7 @@
 
 /* This file is autogenerated, please do not commit manual changes
 
-Latest version: 20180808
+Latest version: 20180829
 */
 
 enum clif_messages {
@@ -21267,6 +21267,24 @@ DEATH : %.1f%% ( basic 100.0%% %s %.1f%%)
 */
 	MSG_ID_DD1 = 0xdd1,
 #endif
+#if PACKETVER >= 20180829
+/*20180829 to latest
+영문이나 러시아어 단독으로만 사용이 가능합니다.
+*/
+	MSG_ID_DD2 = 0xdd2,
+/*20180829 to latest
+you must have an AccessTicket to login
+*/
+	MSG_ID_DD3 = 0xdd3,
+/*20180829 to latest
+창고를 불러오는 중입니다.
+*/
+	MSG_ID_DD4 = 0xdd4,
+/*20180829 to latest
+NOW LOADING..
+*/
+	MSG_ID_DD5 = 0xdd5,
+#endif
 
 };
 #endif /* MAP_MESSAGES_MAIN_H */
diff --git a/src/map/messages_re.h b/src/map/messages_re.h
index bf2927d6b..c263150e3 100644
--- a/src/map/messages_re.h
+++ b/src/map/messages_re.h
@@ -23,7 +23,7 @@
 
 /* This file is autogenerated, please do not commit manual changes
 
-Latest version: 20180808
+Latest version: 20180919
 */
 
 enum clif_messages {
@@ -20746,6 +20746,62 @@ DEATH : %.1f%% ( basic 100.0%% %s %.1f%%)
 */
 	MSG_ID_DD1 = 0xdd1,
 #endif
+#if PACKETVER >= 20180829
+/*20180829 to latest
+영문이나 러시아어 단독으로만 사용이 가능합니다.
+*/
+	MSG_ID_DD2 = 0xdd2,
+/*20180829 to latest
+you must have an AccessTicket to login
+*/
+	MSG_ID_DD3 = 0xdd3,
+/*20180829 to latest
+창고를 불러오는 중입니다.
+*/
+	MSG_ID_DD4 = 0xdd4,
+/*20180829 to latest
+NOW LOADING..
+*/
+	MSG_ID_DD5 = 0xdd5,
+#endif
+#if PACKETVER >= 20180919
+/*20180919 to latest
+삭제
+*/
+	MSG_ID_DD6 = 0xdd6,
+/*20180919 to latest
+답장
+*/
+	MSG_ID_DD7 = 0xdd7,
+/*20180919 to latest
+전송
+*/
+	MSG_ID_DD8 = 0xdd8,
+/*20180919 to latest
+이름확인
+*/
+	MSG_ID_DD9 = 0xdd9,
+/*20180919 to latest
+공지
+Notice
+*/
+	MSG_ID_DDA = 0xdda,
+/*20180919 to latest
+일반
+General
+*/
+	MSG_ID_DDB = 0xddb,
+/*20180919 to latest
+반송
+Clear
+*/
+	MSG_ID_DDC = 0xddc,
+/*20180919 to latest
+검색
+Search
+*/
+	MSG_ID_DDD = 0xddd,
+#endif
 
 };
 #endif /* MAP_MESSAGES_RE_H */
diff --git a/src/map/messages_zero.h b/src/map/messages_zero.h
index 05e3f1479..c562bb07c 100644
--- a/src/map/messages_zero.h
+++ b/src/map/messages_zero.h
@@ -23,7 +23,7 @@
 
 /* This file is autogenerated, please do not commit manual changes
 
-Latest version: 20180822
+Latest version: 20180919
 */
 
 enum clif_messages {
@@ -17371,9 +17371,55 @@ you must have an AccessTicket to login
 	MSG_ID_DD3 = 0xdd3,
 /*20180725 to 20180801
 --
+20180905 to latest
+창고를 불러오는 중입니다.
 */
 	MSG_ID_DD4 = 0xdd4,
 #endif
+#if PACKETVER >= 20180905
+/*20180905 to latest
+NOW LOADING..
+*/
+	MSG_ID_DD5 = 0xdd5,
+#endif
+#if PACKETVER >= 20180919
+/*20180919 to latest
+삭제
+*/
+	MSG_ID_DD6 = 0xdd6,
+/*20180919 to latest
+답장
+*/
+	MSG_ID_DD7 = 0xdd7,
+/*20180919 to latest
+전송
+*/
+	MSG_ID_DD8 = 0xdd8,
+/*20180919 to latest
+이름확인
+*/
+	MSG_ID_DD9 = 0xdd9,
+/*20180919 to latest
+공지
+Notice
+*/
+	MSG_ID_DDA = 0xdda,
+/*20180919 to latest
+일반
+General
+*/
+	MSG_ID_DDB = 0xddb,
+/*20180919 to latest
+반송
+Clear
+*/
+	MSG_ID_DDC = 0xddc,
+/*20180919 to latest
+검색
+Search
+*/
+	MSG_ID_DDD = 0xddd,
+#endif
 
 };
 #endif /* MAP_MESSAGES_ZERO_H */
diff --git a/src/map/packets.h b/src/map/packets.h
index 1d1046e8a..16ad4d00a 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -4270,4 +4270,71 @@ packet(0x96e,-1,clif->ackmergeitems);
 // changed packet sizes
 #endif
 
+// 2018-08-29aRagexe
+#if PACKETVER_MAIN_NUM >= 20180829
+// new packets
+	packet(0x0b05,59);
+	packet(0x0b06,53,clif->pDull/*,XXX*/);
+	packet(0x0b07,-1);
+	packet(0x0b08,26); // ZC_INVENTORY_START
+	packet(0x0b09,-1); // ZC_STORE_ITEMLIST_NORMAL_V6
+	packet(0x0b0a,-1); // ZC_STORE_ITEMLIST_EQUIP_V6
+	packet(0x0b0b,3); // ZC_INVENTORY_END
+	packet(0x0b0c,155,clif->pDull/*,XXX*/);
+// changed packet sizes
+#endif
+
+// 2018-08-29aRagexeRE
+#if PACKETVER_RE_NUM >= 20180829
+// new packets
+	packet(0x0b05,63);
+	packet(0x0b06,53,clif->pDull/*,XXX*/);
+	packet(0x0b07,-1);
+	packet(0x0b08,26); // ZC_INVENTORY_START
+	packet(0x0b09,-1); // ZC_STORE_ITEMLIST_NORMAL_V6
+	packet(0x0b0a,-1); // ZC_STORE_ITEMLIST_EQUIP_V6
+	packet(0x0b0b,3); // ZC_INVENTORY_END
+	packet(0x0b0c,155,clif->pDull/*,XXX*/);
+// changed packet sizes
+#endif
+
+// 2018-09-05aRagexe_zero
+#if PACKETVER_ZERO_NUM >= 20180905
+// new packets
+	packet(0x0b0d,6,clif->pDull/*,XXX*/);
+// changed packet sizes
+	packet(0x0b08,27); // ZC_INVENTORY_START
+	packet(0x0b0b,4); // ZC_INVENTORY_END
+#endif
+
+#ifndef PACKETVER_ZERO
+// 2018-09-12dRagexe, 2018-09-12dRagexeRE
+#if PACKETVER >= 20180912
+// new packets
+	packet(0x0b0d,10,clif->pDull/*,XXX*/);
+	packet(0x0b0e,-1,clif->pDull/*,XXX*/);
+	packet(0x0b0f,-1,clif->pDull/*,XXX*/);
+// changed packet sizes
+	packet(0x0b08,27,clif->pDull/*,XXX*/); // ZC_INVENTORY_START
+	packet(0x0b0b,4,clif->pDull/*,XXX*/); // ZC_INVENTORY_END
+#endif
+#endif
+
+// 2018-09-19aRagexeRE
+#if PACKETVER_RE_NUM >= 20180919
+// new packets
+// changed packet sizes
+	packet(0x0b08,-1); // ZC_INVENTORY_START
+#endif
+
+// 2018-09-19aRagexe_zero
+#if PACKETVER_ZERO_NUM >= 20180919
+// new packets
+	packet(0x0b0e,-1,clif->pDull/*,XXX*/);
+	packet(0x0b0f,-1,clif->pDull/*,XXX*/);
+// changed packet sizes
+	packet(0x0b08,-1); // ZC_INVENTORY_START
+	packet(0x0b0d,10,clif->pDull/*,XXX*/);
+#endif
+
 #endif /* MAP_PACKETS_H */
diff --git a/src/map/packets_keys_main.h b/src/map/packets_keys_main.h
index 6e7f27166..a9d9a7020 100644
--- a/src/map/packets_keys_main.h
+++ b/src/map/packets_keys_main.h
@@ -874,7 +874,7 @@
 	packetKeys(0x6A596301,0x76866D0E,0x32294A45);
 #endif
 
-// 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
+// 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
 #if PACKETVER == 20131223 || \
     PACKETVER == 20140508 || \
     PACKETVER == 20140611 || \
@@ -899,7 +899,11 @@
     PACKETVER == 20180718 || \
     PACKETVER == 20180801 || \
     PACKETVER == 20180808 || \
-    PACKETVER >= 20180822
+    PACKETVER == 20180822 || \
+    PACKETVER == 20180829 || \
+    PACKETVER == 20180831 || \
+    PACKETVER == 20180912 || \
+    PACKETVER >= 20180919
 	packetKeys(0x00000000,0x00000000,0x00000000);
 #endif
 
diff --git a/src/map/packets_keys_zero.h b/src/map/packets_keys_zero.h
index 42a6aaf37..bbc1f7332 100644
--- a/src/map/packets_keys_zero.h
+++ b/src/map/packets_keys_zero.h
@@ -29,7 +29,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
+// 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
 #if PACKETVER == 20171018 || \
     PACKETVER == 20171019 || \
     PACKETVER == 20171023 || \
@@ -54,7 +54,11 @@
     PACKETVER == 20180725 || \
     PACKETVER == 20180801 || \
     PACKETVER == 20180808 || \
-    PACKETVER >= 20180822
+    PACKETVER == 20180822 || \
+    PACKETVER == 20180829 || \
+    PACKETVER == 20180905 || \
+    PACKETVER == 20180912 || \
+    PACKETVER >= 20180919
 	packetKeys(0x00000000,0x00000000,0x00000000);
 #endif
 
diff --git a/src/map/packets_shuffle_main.h b/src/map/packets_shuffle_main.h
index 441415df2..8bc395da1 100644
--- a/src/map/packets_shuffle_main.h
+++ b/src/map/packets_shuffle_main.h
@@ -3344,7 +3344,7 @@
 	packet(0x0969,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
 #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
+// 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
 #if PACKETVER == 20140611 || \
     PACKETVER == 20150225 || \
     PACKETVER == 20180315 || \
@@ -3365,7 +3365,11 @@
     PACKETVER == 20180718 || \
     PACKETVER == 20180801 || \
     PACKETVER == 20180808 || \
-    PACKETVER >= 20180822
+    PACKETVER == 20180822 || \
+    PACKETVER == 20180829 || \
+    PACKETVER == 20180831 || \
+    PACKETVER == 20180912 || \
+    PACKETVER >= 20180919
 	packet(0x0202,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
 	packet(0x022d,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
 	packet(0x023b,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
diff --git a/src/map/packets_shuffle_re.h b/src/map/packets_shuffle_re.h
index ee268a8f5..157a8a431 100644
--- a/src/map/packets_shuffle_re.h
+++ b/src/map/packets_shuffle_re.h
@@ -9662,13 +9662,16 @@
 	packet(0x083c,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
 #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-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
 #if PACKETVER == 20180704 || \
     PACKETVER == 20180711 || \
     PACKETVER == 20180718 || \
     PACKETVER == 20180801 || \
     PACKETVER == 20180808 || \
-    PACKETVER >= 20180822
+    PACKETVER == 20180822 || \
+    PACKETVER == 20180829 || \
+    PACKETVER == 20180912 || \
+    PACKETVER >= 20180919
 	packet(0x0202,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
 	packet(0x022d,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
 	packet(0x023b,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
diff --git a/src/map/packets_shuffle_zero.h b/src/map/packets_shuffle_zero.h
index 479cf634a..b7253fdda 100644
--- a/src/map/packets_shuffle_zero.h
+++ b/src/map/packets_shuffle_zero.h
@@ -36,7 +36,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
+// 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
 #if PACKETVER == 20171018 || \
     PACKETVER == 20171019 || \
     PACKETVER == 20171023 || \
@@ -61,7 +61,11 @@
     PACKETVER == 20180725 || \
     PACKETVER == 20180801 || \
     PACKETVER == 20180808 || \
-    PACKETVER >= 20180822
+    PACKETVER == 20180822 || \
+    PACKETVER == 20180829 || \
+    PACKETVER == 20180905 || \
+    PACKETVER == 20180912 || \
+    PACKETVER >= 20180919
 	packet(0x0202,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
 	packet(0x022d,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
 	packet(0x023b,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 852a44cb8..549923b99 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -198,7 +198,9 @@ enum packet_headers {
 #else
 	dropflooritemType = 0x9e,
 #endif
-#if PACKETVER >= 20120925
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+	inventorylistnormalType = 0xb09,
+#elif PACKETVER >= 20120925
 	inventorylistnormalType = 0x991,
 #elif PACKETVER >= 20080102
 	inventorylistnormalType = 0x2e8,
@@ -207,7 +209,9 @@ enum packet_headers {
 #else
 	inventorylistnormalType = 0xa3,
 #endif
-#if PACKETVER >= 20150226
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+	inventorylistequipType = 0xb0a,
+#elif PACKETVER >= 20150226
 	inventorylistequipType = 0xa0d,
 #elif PACKETVER >= 20120925
 	inventorylistequipType = 0x992,
@@ -218,27 +222,33 @@ enum packet_headers {
 #else
 	inventorylistequipType = 0xa4,
 #endif
-#if PACKETVER >= 20120925
-	storagelistnormalType = 0x995,
+#if PACKETVER_RE_NUM >= 20180829 || PACKETVER_ZERO_NUM >= 20180919
+	storageListNormalType = 0xb09,
+#elif PACKETVER >= 20120925
+	storageListNormalType = 0x995,
 #elif PACKETVER >= 20080102
-	storagelistnormalType = 0x2ea,
+	storageListNormalType = 0x2ea,
 #elif PACKETVER >= 20071002
-	storagelistnormalType = 0x295,
+	storageListNormalType = 0x295,
 #else
-	storagelistnormalType = 0xa5,
+	storageListNormalType = 0xa5,
 #endif
-#if PACKETVER >= 20150226
-	storagelistequipType = 0xa10,
+#if PACKETVER_RE_NUM >= 20180829 || PACKETVER_ZERO_NUM >= 20180919
+	storageListEquipType = 0xb0a,
+#elif PACKETVER >= 20150226
+	storageListEquipType = 0xa10,
 #elif PACKETVER >= 20120925
-	storagelistequipType = 0x996,
+	storageListEquipType = 0x996,
 #elif PACKETVER >= 20080102
-	storagelistequipType = 0x2d1,
+	storageListEquipType = 0x2d1,
 #elif PACKETVER >= 20071002
-	storagelistequipType = 0x296,
+	storageListEquipType = 0x296,
 #else
-	storagelistequipType = 0xa6,
+	storageListEquipType = 0xa6,
 #endif
-#if PACKETVER >= 20120925
+#if PACKETVER_RE_NUM >= 20180829 || PACKETVER_ZERO_NUM >= 20180919
+	cartlistnormalType = 0xb09,
+#elif PACKETVER >= 20120925
 	cartlistnormalType = 0x993,
 #elif PACKETVER >= 20080102
 	cartlistnormalType = 0x2e9,
@@ -247,7 +257,9 @@ enum packet_headers {
 #else
 	cartlistnormalType = 0x123,
 #endif
-#if PACKETVER >= 20150226
+#if PACKETVER_RE_NUM >= 20180829 || PACKETVER_ZERO_NUM >= 20180919
+	cartlistequipType = 0xb0a,
+#elif PACKETVER >= 20150226
 	cartlistequipType = 0xa0f,
 #elif PACKETVER >= 20120925
 	cartlistequipType = 0x994,
@@ -1162,28 +1174,63 @@ struct packet_roulette_itemrecv_ack {
 struct packet_itemlist_normal {
 	int16 PacketType;
 	int16 PacketLength;
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+	uint8 invType;
+#endif
 	struct NORMALITEM_INFO list[MAX_ITEMLIST];
 } __attribute__((packed));
 
 struct packet_itemlist_equip {
 	int16 PacketType;
 	int16 PacketLength;
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+	uint8 invType;
+#endif
 	struct EQUIPITEM_INFO list[MAX_ITEMLIST];
 } __attribute__((packed));
 
-struct packet_storelist_normal {
+struct ZC_STORE_ITEMLIST_NORMAL {
 	int16 PacketType;
 	int16 PacketLength;
-#if PACKETVER >= 20120925
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+	uint8 invType;
+#endif
+#if PACKETVER >= 20120925 && PACKETVER_RE_NUM < 20180829 && PACKETVER_ZERO_NUM < 20180919
 	char name[NAME_LENGTH];
 #endif
 	struct NORMALITEM_INFO list[MAX_ITEMLIST];
 } __attribute__((packed));
 
-struct packet_storelist_equip {
+struct ZC_INVENTORY_START {
+	int16 packetType;
+#if PACKETVER_RE_NUM >= 20180919 || PACKETVER_ZERO_NUM >= 20180919
+	int16 packetLength;
+#endif
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+	uint8 invType;
+#endif
+#if PACKETVER_RE_NUM >= 20180919 || PACKETVER_ZERO_NUM >= 20180919
+	char name[];
+#else
+	char name[NAME_LENGTH];
+#endif
+} __attribute__((packed));
+
+struct ZC_INVENTORY_END {
+	int16 packetType;
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+	uint8 invType;
+#endif
+	char flag;
+} __attribute__((packed));
+
+struct ZC_STORE_ITEMLIST_EQUIP {
 	int16 PacketType;
 	int16 PacketLength;
-#if PACKETVER >= 20120925
+#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919
+	uint8 invType;
+#endif
+#if PACKETVER >= 20120925 && PACKETVER_RE_NUM < 20180829 && PACKETVER_ZERO_NUM < 20180919
 	char name[NAME_LENGTH];
 #endif
 	struct EQUIPITEM_INFO list[MAX_ITEMLIST];
diff --git a/src/map/pc.c b/src/map/pc.c
index be28f8dad..961dda9f5 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -2075,7 +2075,7 @@ static int pc_disguise(struct map_session_data *sd, int class)
 		clif->spawn(&sd->bl);
 		if (class == sd->status.class && pc_iscarton(sd)) {
 			//It seems the cart info is lost on undisguise.
-			clif->cartlist(sd);
+			clif->cartList(sd);
 			clif->updatestatus(sd,SP_CARTINFO);
 		}
 		if (sd->chat_id != 0) {
@@ -9198,7 +9198,7 @@ static int pc_setoption(struct map_session_data *sd, int type)
 
 #ifndef NEW_CARTS
 	if( type&OPTION_CART && !( p_type&OPTION_CART ) ) { //Cart On
-		clif->cartlist(sd);
+		clif->cartList(sd);
 		clif->updatestatus(sd, SP_CARTINFO);
 		if(pc->checkskill(sd, MC_PUSHCART) < 10)
 			status_calc_pc(sd,SCO_NONE); //Apply speed penalty.
@@ -9305,7 +9305,7 @@ static int pc_setcart(struct map_session_data *sd, int type)
 			break;
 		default:/* everything else is an allowed ID so we can move on */
 			if( !sd->sc.data[SC_PUSH_CART] ) /* first time, so fill cart data */
-				clif->cartlist(sd);
+				clif->cartList(sd);
 			clif->updatestatus(sd, SP_CARTINFO);
 			sc_start(NULL,&sd->bl, SC_PUSH_CART, 100, type, 0);
 			clif->sc_load(&sd->bl, sd->bl.id, AREA, SI_ON_PUSH_CART, type, 0, 0);
diff --git a/src/map/pet.c b/src/map/pet.c
index cfb3e8253..c32a92b78 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -350,7 +350,7 @@ static int pet_return_egg(struct map_session_data *sd, struct pet_data *pd)
 		sd->status.inventory[i].bound = IBT_NONE;
 	}
 #if PACKETVER >= 20180704
-	clif->inventorylist(sd);
+	clif->inventoryList(sd);
 	clif->send_petdata(sd, pd, 6, 0);
 #endif
 	pd->pet.incubate = 1;
diff --git a/src/map/script.c b/src/map/script.c
index 65ffc1a6d..2182b942c 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -9361,7 +9361,7 @@ static BUILDIN(repair)
 			if(num==repaircounter) {
 				sd->status.inventory[i].attribute |= ATTR_BROKEN;
 				sd->status.inventory[i].attribute ^= ATTR_BROKEN;
-				clif->equiplist(sd);
+				clif->equipList(sd);
 				clif->produce_effect(sd, 0, sd->status.inventory[i].nameid);
 				clif->misceffect(&sd->bl, 3);
 				break;
@@ -9398,7 +9398,7 @@ static BUILDIN(repairall)
 	if(repaircounter)
 	{
 		clif->misceffect(&sd->bl, 3);
-		clif->equiplist(sd);
+		clif->equipList(sd);
 	}
 
 	return true;
diff --git a/src/map/skill.c b/src/map/skill.c
index c5579c2f6..4eaab5457 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2588,7 +2588,7 @@ static int skill_break_equip(struct block_list *bl, unsigned short where, int ra
 				pc->unequipitem(sd, j, PCUNEQUIPITEM_RECALC|PCUNEQUIPITEM_FORCE);
 			}
 		}
-		clif->equiplist(sd);
+		clif->equipList(sd);
 	}
 
 	return where; //Return list of pieces broken.
@@ -16139,7 +16139,7 @@ static void skill_repairweapon(struct map_session_data *sd, int idx)
 	item->attribute |= ATTR_BROKEN;
 	item->attribute ^= ATTR_BROKEN; /* clear broken state */
 
-	clif->equiplist(target_sd);
+	clif->equipList(target_sd);
 
 	pc->delitem(sd, pc->search_inventory(sd, material), 1, 0, DELITEM_NORMAL, LOG_TYPE_CONSUME); // FIXME: is this the correct reason flag?
 
@@ -16222,7 +16222,7 @@ static void skill_weaponrefine(struct map_session_data *sd, int idx)
 				}
 				clif->delitem(sd, idx, 1, DELITEM_NORMAL);
 				clif->upgrademessage(sd->fd, 0,item->nameid);
-				clif->inventorylist(sd);
+				clif->inventoryList(sd);
 				clif->refine(sd->fd,0,idx,item->refine);
 				if (ep)
 					pc->equipitem(sd,idx,ep);
diff --git a/src/map/storage.c b/src/map/storage.c
index ba8dcee3a..a6f0715e7 100644
--- a/src/map/storage.c
+++ b/src/map/storage.c
@@ -122,8 +122,8 @@ static int storage_storageopen(struct map_session_data *sd)
 
 	if (sd->storage.aggregate > 0) {
 		storage->sortitem(VECTOR_DATA(sd->storage.item), VECTOR_LENGTH(sd->storage.item));
-		clif->storagelist(sd, VECTOR_DATA(sd->storage.item), VECTOR_LENGTH(sd->storage.item));
 	}
+	clif->storageList(sd, VECTOR_DATA(sd->storage.item), VECTOR_LENGTH(sd->storage.item));
 
 	clif->updatestorageamount(sd, sd->storage.aggregate, MAX_STORAGE);
 	return 0;
@@ -512,7 +512,7 @@ static int storage_guild_storageopen(struct map_session_data *sd)
 	gstor->storage_status = 1;
 	sd->state.storage_flag = STORAGE_FLAG_GUILD;
 	storage->sortitem(gstor->items, ARRAYLENGTH(gstor->items));
-	clif->storagelist(sd, gstor->items, ARRAYLENGTH(gstor->items));
+	clif->guildStorageList(sd, gstor->items, ARRAYLENGTH(gstor->items));
 	clif->updatestorageamount(sd, gstor->storage_amount, MAX_GUILD_STORAGE);
 	return 0;
 }
diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 52c7bb0f6..93fe41952 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -1320,12 +1320,18 @@ typedef void (*HPMHOOK_pre_clif_status_change) (struct block_list **bl, int *typ
 typedef void (*HPMHOOK_post_clif_status_change) (struct block_list *bl, int type, int flag, int tick, int val1, int val2, int val3);
 typedef void (*HPMHOOK_pre_clif_insert_card) (struct map_session_data **sd, int *idx_equip, int *idx_card, int *flag);
 typedef void (*HPMHOOK_post_clif_insert_card) (struct map_session_data *sd, int idx_equip, int idx_card, int flag);
-typedef void (*HPMHOOK_pre_clif_inventorylist) (struct map_session_data **sd);
-typedef void (*HPMHOOK_post_clif_inventorylist) (struct map_session_data *sd);
-typedef void (*HPMHOOK_pre_clif_equiplist) (struct map_session_data **sd);
-typedef void (*HPMHOOK_post_clif_equiplist) (struct map_session_data *sd);
-typedef void (*HPMHOOK_pre_clif_cartlist) (struct map_session_data **sd);
-typedef void (*HPMHOOK_post_clif_cartlist) (struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_inventoryList) (struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_inventoryList) (struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_inventoryItems) (struct map_session_data **sd, enum inventory_type *type);
+typedef void (*HPMHOOK_post_clif_inventoryItems) (struct map_session_data *sd, enum inventory_type type);
+typedef void (*HPMHOOK_pre_clif_equipList) (struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_equipList) (struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_equipItems) (struct map_session_data **sd, enum inventory_type *type);
+typedef void (*HPMHOOK_post_clif_equipItems) (struct map_session_data *sd, enum inventory_type type);
+typedef void (*HPMHOOK_pre_clif_cartList) (struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_cartList) (struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_cartItems) (struct map_session_data **sd, enum inventory_type *type);
+typedef void (*HPMHOOK_post_clif_cartItems) (struct map_session_data *sd, enum inventory_type type);
 typedef void (*HPMHOOK_pre_clif_favorite_item) (struct map_session_data **sd, unsigned short *index);
 typedef void (*HPMHOOK_post_clif_favorite_item) (struct map_session_data *sd, unsigned short index);
 typedef void (*HPMHOOK_pre_clif_clearcart) (int *fd);
@@ -1620,8 +1626,16 @@ typedef void (*HPMHOOK_pre_clif_openvendingAck) (int *fd, int *result);
 typedef void (*HPMHOOK_post_clif_openvendingAck) (int fd, int result);
 typedef void (*HPMHOOK_pre_clif_vendingreport) (struct map_session_data **sd, int *index, int *amount, uint32 *char_id, int *zeny);
 typedef void (*HPMHOOK_post_clif_vendingreport) (struct map_session_data *sd, int index, int amount, uint32 char_id, int zeny);
-typedef void (*HPMHOOK_pre_clif_storagelist) (struct map_session_data **sd, struct item **items, int *items_length);
-typedef void (*HPMHOOK_post_clif_storagelist) (struct map_session_data *sd, struct item *items, int items_length);
+typedef void (*HPMHOOK_pre_clif_storageList) (struct map_session_data **sd, struct item **items, int *items_length);
+typedef void (*HPMHOOK_post_clif_storageList) (struct map_session_data *sd, struct item *items, int items_length);
+typedef void (*HPMHOOK_pre_clif_guildStorageList) (struct map_session_data **sd, struct item **items, int *items_length);
+typedef void (*HPMHOOK_post_clif_guildStorageList) (struct map_session_data *sd, struct item *items, int items_length);
+typedef void (*HPMHOOK_pre_clif_storageItems) (struct map_session_data **sd, enum inventory_type *type, struct item **items, int *items_length);
+typedef void (*HPMHOOK_post_clif_storageItems) (struct map_session_data *sd, enum inventory_type type, struct item *items, int items_length);
+typedef void (*HPMHOOK_pre_clif_inventoryStart) (struct map_session_data **sd, enum inventory_type *type, const char **name);
+typedef void (*HPMHOOK_post_clif_inventoryStart) (struct map_session_data *sd, enum inventory_type type, const char *name);
+typedef void (*HPMHOOK_pre_clif_inventoryEnd) (struct map_session_data **sd, enum inventory_type *type);
+typedef void (*HPMHOOK_post_clif_inventoryEnd) (struct map_session_data *sd, enum inventory_type type);
 typedef void (*HPMHOOK_pre_clif_updatestorageamount) (struct map_session_data **sd, int *amount, int *max_amount);
 typedef void (*HPMHOOK_post_clif_updatestorageamount) (struct map_session_data *sd, int amount, int max_amount);
 typedef void (*HPMHOOK_pre_clif_storageitemadded) (struct map_session_data **sd, struct item **i, int *index, int *amount);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index 457bf90fe..a0c2603a6 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -912,12 +912,18 @@ struct {
 	struct HPMHookPoint *HP_clif_status_change_post;
 	struct HPMHookPoint *HP_clif_insert_card_pre;
 	struct HPMHookPoint *HP_clif_insert_card_post;
-	struct HPMHookPoint *HP_clif_inventorylist_pre;
-	struct HPMHookPoint *HP_clif_inventorylist_post;
-	struct HPMHookPoint *HP_clif_equiplist_pre;
-	struct HPMHookPoint *HP_clif_equiplist_post;
-	struct HPMHookPoint *HP_clif_cartlist_pre;
-	struct HPMHookPoint *HP_clif_cartlist_post;
+	struct HPMHookPoint *HP_clif_inventoryList_pre;
+	struct HPMHookPoint *HP_clif_inventoryList_post;
+	struct HPMHookPoint *HP_clif_inventoryItems_pre;
+	struct HPMHookPoint *HP_clif_inventoryItems_post;
+	struct HPMHookPoint *HP_clif_equipList_pre;
+	struct HPMHookPoint *HP_clif_equipList_post;
+	struct HPMHookPoint *HP_clif_equipItems_pre;
+	struct HPMHookPoint *HP_clif_equipItems_post;
+	struct HPMHookPoint *HP_clif_cartList_pre;
+	struct HPMHookPoint *HP_clif_cartList_post;
+	struct HPMHookPoint *HP_clif_cartItems_pre;
+	struct HPMHookPoint *HP_clif_cartItems_post;
 	struct HPMHookPoint *HP_clif_favorite_item_pre;
 	struct HPMHookPoint *HP_clif_favorite_item_post;
 	struct HPMHookPoint *HP_clif_clearcart_pre;
@@ -1212,8 +1218,16 @@ struct {
 	struct HPMHookPoint *HP_clif_openvendingAck_post;
 	struct HPMHookPoint *HP_clif_vendingreport_pre;
 	struct HPMHookPoint *HP_clif_vendingreport_post;
-	struct HPMHookPoint *HP_clif_storagelist_pre;
-	struct HPMHookPoint *HP_clif_storagelist_post;
+	struct HPMHookPoint *HP_clif_storageList_pre;
+	struct HPMHookPoint *HP_clif_storageList_post;
+	struct HPMHookPoint *HP_clif_guildStorageList_pre;
+	struct HPMHookPoint *HP_clif_guildStorageList_post;
+	struct HPMHookPoint *HP_clif_storageItems_pre;
+	struct HPMHookPoint *HP_clif_storageItems_post;
+	struct HPMHookPoint *HP_clif_inventoryStart_pre;
+	struct HPMHookPoint *HP_clif_inventoryStart_post;
+	struct HPMHookPoint *HP_clif_inventoryEnd_pre;
+	struct HPMHookPoint *HP_clif_inventoryEnd_post;
 	struct HPMHookPoint *HP_clif_updatestorageamount_pre;
 	struct HPMHookPoint *HP_clif_updatestorageamount_post;
 	struct HPMHookPoint *HP_clif_storageitemadded_pre;
@@ -7477,12 +7491,18 @@ struct {
 	int HP_clif_status_change_post;
 	int HP_clif_insert_card_pre;
 	int HP_clif_insert_card_post;
-	int HP_clif_inventorylist_pre;
-	int HP_clif_inventorylist_post;
-	int HP_clif_equiplist_pre;
-	int HP_clif_equiplist_post;
-	int HP_clif_cartlist_pre;
-	int HP_clif_cartlist_post;
+	int HP_clif_inventoryList_pre;
+	int HP_clif_inventoryList_post;
+	int HP_clif_inventoryItems_pre;
+	int HP_clif_inventoryItems_post;
+	int HP_clif_equipList_pre;
+	int HP_clif_equipList_post;
+	int HP_clif_equipItems_pre;
+	int HP_clif_equipItems_post;
+	int HP_clif_cartList_pre;
+	int HP_clif_cartList_post;
+	int HP_clif_cartItems_pre;
+	int HP_clif_cartItems_post;
 	int HP_clif_favorite_item_pre;
 	int HP_clif_favorite_item_post;
 	int HP_clif_clearcart_pre;
@@ -7777,8 +7797,16 @@ struct {
 	int HP_clif_openvendingAck_post;
 	int HP_clif_vendingreport_pre;
 	int HP_clif_vendingreport_post;
-	int HP_clif_storagelist_pre;
-	int HP_clif_storagelist_post;
+	int HP_clif_storageList_pre;
+	int HP_clif_storageList_post;
+	int HP_clif_guildStorageList_pre;
+	int HP_clif_guildStorageList_post;
+	int HP_clif_storageItems_pre;
+	int HP_clif_storageItems_post;
+	int HP_clif_inventoryStart_pre;
+	int HP_clif_inventoryStart_post;
+	int HP_clif_inventoryEnd_pre;
+	int HP_clif_inventoryEnd_post;
 	int HP_clif_updatestorageamount_pre;
 	int HP_clif_updatestorageamount_post;
 	int HP_clif_storageitemadded_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index 41e6f9208..5eecc1a6f 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -480,9 +480,12 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->combo_delay, HP_clif_combo_delay) },
 	{ HP_POP(clif->status_change, HP_clif_status_change) },
 	{ HP_POP(clif->insert_card, HP_clif_insert_card) },
-	{ HP_POP(clif->inventorylist, HP_clif_inventorylist) },
-	{ HP_POP(clif->equiplist, HP_clif_equiplist) },
-	{ HP_POP(clif->cartlist, HP_clif_cartlist) },
+	{ HP_POP(clif->inventoryList, HP_clif_inventoryList) },
+	{ HP_POP(clif->inventoryItems, HP_clif_inventoryItems) },
+	{ HP_POP(clif->equipList, HP_clif_equipList) },
+	{ HP_POP(clif->equipItems, HP_clif_equipItems) },
+	{ HP_POP(clif->cartList, HP_clif_cartList) },
+	{ HP_POP(clif->cartItems, HP_clif_cartItems) },
 	{ HP_POP(clif->favorite_item, HP_clif_favorite_item) },
 	{ HP_POP(clif->clearcart, HP_clif_clearcart) },
 	{ HP_POP(clif->item_identify_list, HP_clif_item_identify_list) },
@@ -630,7 +633,11 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->openvending, HP_clif_openvending) },
 	{ HP_POP(clif->openvendingAck, HP_clif_openvendingAck) },
 	{ HP_POP(clif->vendingreport, HP_clif_vendingreport) },
-	{ HP_POP(clif->storagelist, HP_clif_storagelist) },
+	{ HP_POP(clif->storageList, HP_clif_storageList) },
+	{ HP_POP(clif->guildStorageList, HP_clif_guildStorageList) },
+	{ HP_POP(clif->storageItems, HP_clif_storageItems) },
+	{ HP_POP(clif->inventoryStart, HP_clif_inventoryStart) },
+	{ HP_POP(clif->inventoryEnd, HP_clif_inventoryEnd) },
 	{ HP_POP(clif->updatestorageamount, HP_clif_updatestorageamount) },
 	{ HP_POP(clif->storageitemadded, HP_clif_storageitemadded) },
 	{ HP_POP(clif->storageitemremoved, HP_clif_storageitemremoved) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index 5690e0735..001863c0e 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -11890,13 +11890,13 @@ void HP_clif_insert_card(struct map_session_data *sd, int idx_equip, int idx_car
 	}
 	return;
 }
-void HP_clif_inventorylist(struct map_session_data *sd) {
+void HP_clif_inventoryList(struct map_session_data *sd) {
 	int hIndex = 0;
-	if (HPMHooks.count.HP_clif_inventorylist_pre > 0) {
+	if (HPMHooks.count.HP_clif_inventoryList_pre > 0) {
 		void (*preHookFunc) (struct map_session_data **sd);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_inventorylist_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_inventorylist_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_inventoryList_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_inventoryList_pre[hIndex].func;
 			preHookFunc(&sd);
 		}
 		if (*HPMforce_return) {
@@ -11905,24 +11905,50 @@ void HP_clif_inventorylist(struct map_session_data *sd) {
 		}
 	}
 	{
-		HPMHooks.source.clif.inventorylist(sd);
+		HPMHooks.source.clif.inventoryList(sd);
 	}
-	if (HPMHooks.count.HP_clif_inventorylist_post > 0) {
+	if (HPMHooks.count.HP_clif_inventoryList_post > 0) {
 		void (*postHookFunc) (struct map_session_data *sd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_inventorylist_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_inventorylist_post[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_inventoryList_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_inventoryList_post[hIndex].func;
 			postHookFunc(sd);
 		}
 	}
 	return;
 }
-void HP_clif_equiplist(struct map_session_data *sd) {
+void HP_clif_inventoryItems(struct map_session_data *sd, enum inventory_type type) {
 	int hIndex = 0;
-	if (HPMHooks.count.HP_clif_equiplist_pre > 0) {
+	if (HPMHooks.count.HP_clif_inventoryItems_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, enum inventory_type *type);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_inventoryItems_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_inventoryItems_pre[hIndex].func;
+			preHookFunc(&sd, &type);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.inventoryItems(sd, type);
+	}
+	if (HPMHooks.count.HP_clif_inventoryItems_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, enum inventory_type type);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_inventoryItems_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_inventoryItems_post[hIndex].func;
+			postHookFunc(sd, type);
+		}
+	}
+	return;
+}
+void HP_clif_equipList(struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_equipList_pre > 0) {
 		void (*preHookFunc) (struct map_session_data **sd);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_equiplist_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_equiplist_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_equipList_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_equipList_pre[hIndex].func;
 			preHookFunc(&sd);
 		}
 		if (*HPMforce_return) {
@@ -11931,24 +11957,50 @@ void HP_clif_equiplist(struct map_session_data *sd) {
 		}
 	}
 	{
-		HPMHooks.source.clif.equiplist(sd);
+		HPMHooks.source.clif.equipList(sd);
 	}
-	if (HPMHooks.count.HP_clif_equiplist_post > 0) {
+	if (HPMHooks.count.HP_clif_equipList_post > 0) {
 		void (*postHookFunc) (struct map_session_data *sd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_equiplist_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_equiplist_post[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_equipList_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_equipList_post[hIndex].func;
 			postHookFunc(sd);
 		}
 	}
 	return;
 }
-void HP_clif_cartlist(struct map_session_data *sd) {
+void HP_clif_equipItems(struct map_session_data *sd, enum inventory_type type) {
 	int hIndex = 0;
-	if (HPMHooks.count.HP_clif_cartlist_pre > 0) {
+	if (HPMHooks.count.HP_clif_equipItems_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, enum inventory_type *type);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_equipItems_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_equipItems_pre[hIndex].func;
+			preHookFunc(&sd, &type);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.equipItems(sd, type);
+	}
+	if (HPMHooks.count.HP_clif_equipItems_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, enum inventory_type type);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_equipItems_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_equipItems_post[hIndex].func;
+			postHookFunc(sd, type);
+		}
+	}
+	return;
+}
+void HP_clif_cartList(struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_cartList_pre > 0) {
 		void (*preHookFunc) (struct map_session_data **sd);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_cartlist_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_cartlist_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_cartList_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_cartList_pre[hIndex].func;
 			preHookFunc(&sd);
 		}
 		if (*HPMforce_return) {
@@ -11957,17 +12009,43 @@ void HP_clif_cartlist(struct map_session_data *sd) {
 		}
 	}
 	{
-		HPMHooks.source.clif.cartlist(sd);
+		HPMHooks.source.clif.cartList(sd);
 	}
-	if (HPMHooks.count.HP_clif_cartlist_post > 0) {
+	if (HPMHooks.count.HP_clif_cartList_post > 0) {
 		void (*postHookFunc) (struct map_session_data *sd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_cartlist_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_cartlist_post[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_cartList_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_cartList_post[hIndex].func;
 			postHookFunc(sd);
 		}
 	}
 	return;
 }
+void HP_clif_cartItems(struct map_session_data *sd, enum inventory_type type) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_cartItems_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, enum inventory_type *type);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_cartItems_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_cartItems_pre[hIndex].func;
+			preHookFunc(&sd, &type);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.cartItems(sd, type);
+	}
+	if (HPMHooks.count.HP_clif_cartItems_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, enum inventory_type type);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_cartItems_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_cartItems_post[hIndex].func;
+			postHookFunc(sd, type);
+		}
+	}
+	return;
+}
 void HP_clif_favorite_item(struct map_session_data *sd, unsigned short index) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_favorite_item_pre > 0) {
@@ -15809,13 +15887,39 @@ void HP_clif_vendingreport(struct map_session_data *sd, int index, int amount, u
 	}
 	return;
 }
-void HP_clif_storagelist(struct map_session_data *sd, struct item *items, int items_length) {
+void HP_clif_storageList(struct map_session_data *sd, struct item *items, int items_length) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_storageList_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, struct item **items, int *items_length);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_storageList_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_storageList_pre[hIndex].func;
+			preHookFunc(&sd, &items, &items_length);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.storageList(sd, items, items_length);
+	}
+	if (HPMHooks.count.HP_clif_storageList_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, struct item *items, int items_length);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_storageList_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_storageList_post[hIndex].func;
+			postHookFunc(sd, items, items_length);
+		}
+	}
+	return;
+}
+void HP_clif_guildStorageList(struct map_session_data *sd, struct item *items, int items_length) {
 	int hIndex = 0;
-	if (HPMHooks.count.HP_clif_storagelist_pre > 0) {
+	if (HPMHooks.count.HP_clif_guildStorageList_pre > 0) {
 		void (*preHookFunc) (struct map_session_data **sd, struct item **items, int *items_length);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_storagelist_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_storagelist_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_guildStorageList_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_guildStorageList_pre[hIndex].func;
 			preHookFunc(&sd, &items, &items_length);
 		}
 		if (*HPMforce_return) {
@@ -15824,17 +15928,95 @@ void HP_clif_storagelist(struct map_session_data *sd, struct item *items, int it
 		}
 	}
 	{
-		HPMHooks.source.clif.storagelist(sd, items, items_length);
+		HPMHooks.source.clif.guildStorageList(sd, items, items_length);
 	}
-	if (HPMHooks.count.HP_clif_storagelist_post > 0) {
+	if (HPMHooks.count.HP_clif_guildStorageList_post > 0) {
 		void (*postHookFunc) (struct map_session_data *sd, struct item *items, int items_length);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_storagelist_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_storagelist_post[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_guildStorageList_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_guildStorageList_post[hIndex].func;
 			postHookFunc(sd, items, items_length);
 		}
 	}
 	return;
 }
+void HP_clif_storageItems(struct map_session_data *sd, enum inventory_type type, struct item *items, int items_length) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_storageItems_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, enum inventory_type *type, struct item **items, int *items_length);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_storageItems_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_storageItems_pre[hIndex].func;
+			preHookFunc(&sd, &type, &items, &items_length);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.storageItems(sd, type, items, items_length);
+	}
+	if (HPMHooks.count.HP_clif_storageItems_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, enum inventory_type type, struct item *items, int items_length);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_storageItems_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_storageItems_post[hIndex].func;
+			postHookFunc(sd, type, items, items_length);
+		}
+	}
+	return;
+}
+void HP_clif_inventoryStart(struct map_session_data *sd, enum inventory_type type, const char *name) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_inventoryStart_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, enum inventory_type *type, const char **name);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_inventoryStart_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_inventoryStart_pre[hIndex].func;
+			preHookFunc(&sd, &type, &name);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.inventoryStart(sd, type, name);
+	}
+	if (HPMHooks.count.HP_clif_inventoryStart_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, enum inventory_type type, const char *name);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_inventoryStart_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_inventoryStart_post[hIndex].func;
+			postHookFunc(sd, type, name);
+		}
+	}
+	return;
+}
+void HP_clif_inventoryEnd(struct map_session_data *sd, enum inventory_type type) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_inventoryEnd_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, enum inventory_type *type);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_inventoryEnd_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_inventoryEnd_pre[hIndex].func;
+			preHookFunc(&sd, &type);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.inventoryEnd(sd, type);
+	}
+	if (HPMHooks.count.HP_clif_inventoryEnd_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, enum inventory_type type);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_inventoryEnd_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_inventoryEnd_post[hIndex].func;
+			postHookFunc(sd, type);
+		}
+	}
+	return;
+}
 void HP_clif_updatestorageamount(struct map_session_data *sd, int amount, int max_amount) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_updatestorageamount_pre > 0) {