Move actual packet name to id mapping to packets.inc.

4 files changed, 1029 insertions, 991 deletions

diff --git a/src/net/eathena/packets.inc b/src/net/eathena/packets.inc
new file mode 100644
index 000000000..6371807a5
--- /dev/null
+++ b/src/net/eathena/packets.inc
@@ -0,0 +1,731 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+packet(SMSG_SERVER_VERSION_RESPONSE, 0x7531);
+
+packet(SMSG_SERVER_PING,             0x007f); /**< Contains server tick */
+packet(SMSG_CONNECTION_PROBLEM,      0x0081);
+packet(SMSG_MAP_NOT_FOUND,           0x0840);
+
+packet(SMSG_LOGIN_DATA,              0x0069);
+packet(SMSG_LOGIN_ERROR,             0x006a);
+packet(SMSG_LOGIN_ERROR2,            0x083e);
+packet(SMSG_LOGIN_CODING_KEY,        0x01dc);
+
+// unused
+packet(SMSG_CHAR_LOGIN,              0x006b);
+packet(SMSG_CHAR_LOGIN2,             0x082d);
+packet(SMSG_CHAR_LOGIN_ERROR,        0x006c);
+packet(SMSG_CHAR_CREATE_SUCCEEDED,   0x006d);
+packet(SMSG_CHAR_PINCODE_STATUS,     0x08b9);
+packet(SMSG_CHAR_CHECK_RENAME,       0x028e);
+packet(SMSG_CHAR_RENAME,             0x0290);
+packet(SMSG_CHAR_CHANGE_SLOT,        0x08d5);
+packet(SMSG_CHAR_CAPTCHA_NOT_SUPPORTED, 0x07e9);
+packet(SMSG_CHAR_PASSWORD_RESPONSE,  0x0062);
+
+packet(SMSG_CHAR_CREATE_FAILED,      0x006e);
+packet(SMSG_CHAR_DELETE_SUCCEEDED,   0x006f);
+packet(SMSG_CHAR_DELETE_FAILED,      0x0070);
+packet(SMSG_CHAR_DELETE2_ACK,        0x0828);
+packet(SMSG_CHAR_DELETE2_ACCEPT_ACTUAL_ACK, 0x082a);
+packet(SMSG_CHAR_DELETE2_CANCEL_ACK, 0x082c);
+packet(SMSG_CHAR_MAP_INFO,           0x0071);
+packet(SMSG_CHAR_CHARACTERS,         0x099d);
+packet(SMSG_CHAR_BAN_CHAR_LIST,      0x020d);
+
+packet(SMSG_CHAR_SWITCH_RESPONSE,    0x00b3);
+packet(SMSG_CHANGE_MAP_SERVER,       0x0092);
+
+packet(SMSG_MAP_LOGIN_SUCCESS,       0x0a18); /**< Contains starting location */
+packet(SMSG_MAP_AUTH_REFUSE,         0x0074);
+packet(SMSG_MAP_QUIT_RESPONSE,       0x018b);
+packet(SMSG_PLAYER_STOP,             0x0088); /**< Stop walking, set position */
+packet(SMSG_PLAYER_MOVE_TO_ATTACK,   0x0139);
+packet(SMSG_PLAYER_STAT_UPDATE_1,    0x00b0);
+packet(SMSG_PLAYER_STAT_UPDATE_2,    0x00b1);
+packet(SMSG_PLAYER_STAT_UPDATE_3,    0x0141);
+packet(SMSG_PLAYER_STAT_UPDATE_4,    0x00bc);
+packet(SMSG_PLAYER_STAT_UPDATE_5,    0x00bd);
+packet(SMSG_PLAYER_STAT_UPDATE_6,    0x00be);
+packet(SMSG_PLAYER_GET_EXP,          0x07f6);
+packet(SMSG_WHO_ANSWER,              0x00c2);
+packet(SMSG_PLAYER_WARP,             0x0091);
+packet(SMSG_PLAYER_INVENTORY,        0x0991);
+packet(SMSG_PLAYER_INVENTORY_ADD,    0x0990);
+packet(SMSG_PLAYER_INVENTORY_REMOVE, 0x00af);
+packet(SMSG_PLAYER_INVENTORY_REMOVE2, 0x07fa);
+packet(SMSG_PLAYER_INVENTORY_USE,    0x01c8);
+packet(SMSG_PLAYER_IDENTIFY_LIST,    0x0177);
+packet(SMSG_PLAYER_IDENTIFIED,       0x0179);
+packet(SMSG_PLAYER_CART_ADD_OUTDATED, 0x0124);
+packet(SMSG_PLAYER_CART_ADD,         0x01c5);
+packet(SMSG_PLAYER_CART_ADD_ERROR,   0x012c);
+packet(SMSG_PLAYER_CART_ITEMS,       0x0993);
+packet(SMSG_PLAYER_CART_EQUIP,       0x0994);
+packet(SMSG_PLAYER_CART_REMOVE,      0x0125);
+packet(SMSG_PLAYER_ITEM_RENTAL_TIME, 0x0298);
+packet(SMSG_PLAYER_ITEM_RENTAL_EXPIRED, 0x0299);
+packet(SMSG_PLAYER_REFINE,           0x0188);
+packet(SMSG_PLAYER_EQUIPMENT,        0x0992);
+packet(SMSG_PLAYER_EQUIP,            0x0999);
+packet(SMSG_PLAYER_UNEQUIP,          0x099a);
+packet(SMSG_PLAYER_USE_CARD,         0x017b);
+packet(SMSG_PLAYER_INSERT_CARD,      0x017d);
+packet(SMSG_PLAYER_ATTACK_RANGE,     0x013a);
+packet(SMSG_PLAYER_ARROW_EQUIP,      0x013c);
+packet(SMSG_PLAYER_ARROW_MESSAGE,    0x013b);
+packet(SMSG_PLAYER_SKILLS,           0x010f);
+packet(SMSG_PLAYER_ADD_SKILL,        0x0111);
+packet(SMSG_PLAYER_DELETE_SKILL,     0x0441);
+packet(SMSG_PLAYER_UPDATE_SKILL,     0x07e1);
+packet(SMSG_PLAYER_SKILL_UP,         0x010e);
+packet(SMSG_PLAYER_HEAL,             0x013d);
+packet(SMSG_PLAYER_SKILL_COOLDOWN,   0x043d);
+packet(SMSG_PLAYER_SKILL_COOLDOWN_LIST_OUTDATED, 0x043e);
+packet(SMSG_PLAYER_SKILL_COOLDOWN_LIST, 0x0985);
+packet(SMSG_PLAYER_SKILL_MESSAGE,    0x0215);
+packet(SMSG_PLAYER_NOTIFY_MAPINFO,   0x0189);
+packet(SMSG_PLAYER_SKILL_PRODUCE_MIX_LIST, 0x018d);
+packet(SMSG_PLAYER_SKILL_PRODUCE_EFFECT, 0x018f);
+packet(SMSG_PLAYER_SKILL_AUTO_SPELLS, 0x01cd);
+packet(SMSG_PLAYER_REPAIR_LIST,      0x01fc);
+packet(SMSG_PLAYER_REPAIR_EFFECT,    0x01fe);
+packet(SMSG_PLAYER_FAME_BLACKSMITH,  0x021b);
+packet(SMSG_PLAYER_FAME_ALCHEMIST,   0x021c);
+packet(SMSG_PLAYER_FAME_TAEKWON,     0x0224);
+packet(SMSG_PLAYER_RANK_POINTS,      0x097e);
+packet(SMSG_PLAYER_REFINE_LIST,      0x0221);
+packet(SMSG_PLAYER_UPGRADE_MESSAGE,  0x0223);
+packet(SMSG_PLAYER_COOKING_LIST,     0x025a);
+packet(SMSG_PLAYER_READ_BOOK,        0x0294);
+packet(SMSG_PLAYER_EQUIP_TICK_ACK,   0x02d9);
+packet(SMSG_PLAYER_FAVORITE_ITEM,    0x0908);
+packet(SMSG_SKILL_FAILED,            0x0110);
+packet(SMSG_SKILL_DAMAGE_OUTDATED,   0x0114);
+packet(SMSG_SKILL_DAMAGE,            0x01de);
+packet(SMSG_SKILL_AUTO_CAST,         0x0147);
+packet(SMSG_SKILL_SNAP,              0x08d2);
+packet(SMSG_SKILL_WARP_POINT,        0x011c);
+packet(SMSG_SKILL_MEMO_MESSAGE,      0x011e);
+packet(SMSG_SKILL_UNIT_UPDATE,       0x01ac);
+packet(SMSG_SKILL_ARROW_CREATE_LIST, 0x01ad);
+packet(SMSG_SKILL_DEVOTION_EFFECT,   0x01cf);
+packet(SMSG_ITEM_USE_RESPONSE,       0x00a8);
+packet(SMSG_ITEM_VISIBLE,            0x009d); /**< An item is on the floor */
+packet(SMSG_ITEM_VISIBLE2,           0x0b18);
+packet(SMSG_GRAFFITI_VISIBLE,        0x01c9);
+packet(SMSG_ITEM_DROPPED,            0x084b); /**< An item is dropped */
+packet(SMSG_ITEM_DROPPED2,           0x0b19);
+packet(SMSG_ITEM_MVP_DROPPED,        0x07fd);
+packet(SMSG_ITEM_REMOVE,             0x00a1); /**< An item disappers */
+packet(SMSG_BEING_VISIBLE,           0x0915);
+packet(SMSG_BEING_FAKE_NAME,         0x0078);
+packet(SMSG_BEING_MOVE,              0x0914); /**< A nearby monster moves */
+packet(SMSG_BEING_SPAWN,             0x090f); /**< A being spawns nearby */
+packet(SMSG_BEING_MOVE2,             0x0086); /**< New eAthena being moves */
+packet(SMSG_BEING_MOVE3,             0x0b04);
+packet(SMSG_BEING_REMOVE,            0x0080);
+packet(SMSG_BEING_REMOVE_SKILL,      0x0120);
+packet(SMSG_BEING_CHANGE_LOOKS_OUTDATED, 0x00c3);
+packet(SMSG_BEING_CHANGE_LOOKS2,     0x01d7);
+packet(SMSG_BEING_CHANGE_LOOKS_CARDS, 0x0b17);
+packet(SMSG_BEING_SELFEFFECT,        0x019b);
+packet(SMSG_BEING_SPECIAL_EFFECT,    0x01f3);
+packet(SMSG_BEING_SPECIAL_EFFECT_NUM, 0x0284);
+packet(SMSG_BEING_SOUND_EFFECT,      0x01d3);
+packet(SMSG_BEING_EMOTION,           0x00c0);
+packet(SMSG_BEING_ACTION,            0x008a); /**< Attack, sit, stand up, ...*/
+packet(SMSG_BEING_ACTION2,           0x02e1);
+packet(SMSG_BEING_CHAT,              0x008d); /**< A being talks */
+packet(SMSG_BEING_SLIDE,             0x01ff);
+packet(SMSG_BEING_CHARM,             0x08cf);
+packet(SMSG_COLOR_MESSAGE,           0x02c1);
+packet(SMSG_FORMAT_MESSAGE,          0x0291);
+packet(SMSG_FORMAT_MESSAGE_NUMBER,   0x07e2);
+packet(SMSG_FORMAT_MESSAGE_SKILL,    0x07e6);
+packet(SMSG_BEING_NAME_RESPONSE,     0x0095); /**< Has to be requested */
+packet(SMSG_BEING_NAME_RESPONSE2,    0x0b01); /**< Has to be requested */
+packet(SMSG_BEING_CHANGE_DIRECTION,  0x009c);
+packet(SMSG_BEING_RESURRECT,         0x0148);
+packet(SMSG_BEING_STAT_UPDATE_1,     0x01ab);
+packet(SMSG_BEING_ATTRS,             0x0b0a);
+packet(SMSG_BEING_FONT,              0x02ef);
+packet(SMSG_BEING_MILLENIUM_SHIELD,  0x0440);
+packet(SMSG_BEING_VIEW_EQUIPMENT,    0x0997);
+packet(SMSG_IGNORE_NICK_ACK,         0x00d1);
+packet(SMSG_STARS_KILL,              0x020e);
+packet(SMSG_GLADIATOR_FEEL_REQUEST,  0x0253);
+packet(SMSG_BOSS_MAP_INFO,           0x0293);
+packet(SMSG_ITEM_DAMAGED,            0x02bb);
+packet(SMSG_AUTOSHADOW_SPELL_LIST,   0x0442);
+packet(SMSG_BIND_ITEM,               0x02d3);
+
+packet(SMSG_PLAYER_STATUS_CHANGE_OUTDATED, 0x0119);
+packet(SMSG_PLAYER_STATUS_CHANGE,    0x0229);
+packet(SMSG_PLAYER_STATUS_CHANGE2,   0x028a);
+packet(SMSG_PLAYER_STATUS_CHANGE_NO_TICK, 0x0196);
+packet(SMSG_PLAYER_GUILD_PARTY_INFO, 0x0195);
+packet(SMSG_BEING_STATUS_CHANGE,     0x0983);
+packet(SMSG_BEING_STATUS_CHANGE2,    0x043f);
+
+packet(SMSG_NPC_MESSAGE,             0x00b4);
+packet(SMSG_NPC_NEXT,                0x00b5);
+packet(SMSG_NPC_CLOSE,               0x00b6);
+packet(SMSG_NPC_CLOSE_TIMEOUT,       0x08d6);
+packet(SMSG_NPC_CHOICE,              0x00b7); /**< Display a choice */
+packet(SMSG_NPC_BUY_SELL_CHOICE,     0x00c4);
+packet(SMSG_NPC_BUY,                 0x00c6);
+packet(SMSG_NPC_SELL,                0x00c7);
+packet(SMSG_NPC_BUY_RESPONSE,        0x00ca);
+packet(SMSG_NPC_SELL_RESPONSE,       0x00cb);
+packet(SMSG_NPC_INT_INPUT,           0x0142); /**< Integer input */
+packet(SMSG_NPC_STR_INPUT,           0x01d4); /**< String input */
+packet(SMSG_NPC_SHOW_PROGRESS_BAR,   0x02f0);
+packet(SMSG_NPC_PROGRESS_BAR_ABORT,  0x02f2);
+packet(SMSG_NPC_CHANGETITLE,         0x0b06);
+packet(SMSG_NPC_MARKET_OPEN,         0x09d5);
+packet(SMSG_NPC_MARKET_BUY_ACK,      0x09d7);
+packet(SMSG_NPC_CASH_SHOP_OPEN,      0x0287);
+packet(SMSG_NPC_CASH_BUY_ACK,        0x0289);
+packet(SMSG_NPC_CASH_POINTS,         0x0845);
+packet(SMSG_NPC_CASH_BUY,            0x0849);
+packet(SMSG_NPC_CASH_TAB_PRICE_LIST, 0x08c0);
+packet(SMSG_NPC_CASH_SCHEDULE,       0x08ca);
+packet(SMSG_NPC_AREA,                0x0b0b);
+packet(SMSG_NPC_SHOW_DIGIT,          0x01b1);
+
+packet(SMSG_PLAYER_CHAT,             0x008e); /**< Player talks */
+packet(SMSG_WHISPER,                 0x0097); /**< Whisper Recieved */
+packet(SMSG_WHISPER_RESPONSE,        0x09df);
+packet(SMSG_GM_CHAT,                 0x009a); /**< GM announce */
+packet(SMSG_GM_CHAT2,                0x01c3);
+packet(SMSG_WALK_RESPONSE,           0x0087);
+
+packet(SMSG_BUYINGSTORE_OPEN,        0x0810);
+packet(SMSG_BUYINGSTORE_CREATE_FAILED, 0x0812);
+packet(SMSG_BUYINGSTORE_OWN_ITEMS,   0x0813);
+packet(SMSG_BUYINGSTORE_SHOW_BOARD,  0x0814);
+packet(SMSG_BUYINGSTORE_HIDE_BOARD,  0x0816);
+packet(SMSG_BUYINGSTORE_ITEMS_LIST,  0x0818);
+packet(SMSG_BUYINGSTORE_SELL_FAILED, 0x081a);
+packet(SMSG_BUYINGSTORE_REPORT,      0x081b);
+packet(SMSG_BUYINGSTORE_DELETE_ITEM, 0x081c);
+packet(SMSG_BUYINGSTORE_SELLER_SELL_FAILED, 0x0824);
+
+// Receiving a request to trade
+packet(SMSG_TRADE_REQUEST_OUTDATED,  0x00e5);
+packet(SMSG_TRADE_REQUEST,           0x01f4);
+packet(SMSG_TRADE_RESPONSE_OUTDATED, 0x00e7);
+packet(SMSG_TRADE_RESPONSE,          0x01f5);
+packet(SMSG_TRADE_ITEM_ADD,          0x080f);
+packet(SMSG_TRADE_ITEM_ADD_RESPONSE, 0x00ea);
+packet(SMSG_TRADE_OK,                0x00ec);
+packet(SMSG_TRADE_CANCEL,            0x00ee);
+packet(SMSG_TRADE_COMPLETE,          0x00f0);
+packet(SMSG_TRADE_UNDO,              0x00f1);
+
+packet(SMSG_PARTY_CREATE,            0x00fa);
+packet(SMSG_PARTY_INFO,              0x00fb);
+packet(SMSG_PARTY_INVITE_RESPONSE_OUTDATED, 0x00fd);
+packet(SMSG_PARTY_INVITE_RESPONSE,   0x02c5);
+packet(SMSG_PARTY_INVITED,           0x02c6);
+packet(SMSG_PARTY_SETTINGS,          0x07d8);
+packet(SMSG_PARTY_LEAVE,             0x0105);
+packet(SMSG_PARTY_UPDATE_COORDS,     0x0107);
+packet(SMSG_PARTY_MESSAGE,           0x0109);
+packet(SMSG_PARTY_INVITATION_STATS,  0x02c9);
+packet(SMSG_PARTY_MEMBER_INFO,       0x01e9);
+packet(SMSG_PARTY_ITEM_PICKUP,       0x02b8);
+packet(SMSG_PARTY_LEADER,            0x07fc);
+
+packet(SMSG_PLAYER_STORAGE_ITEMS,    0x0995); /* Item list for storage */
+packet(SMSG_PLAYER_STORAGE_EQUIP,    0x0996); /* Equipment list for storage */
+packet(SMSG_PLAYER_STORAGE_STATUS,   0x00f2); /* Slots used and total slots */
+packet(SMSG_PLAYER_STORAGE_ADD_OUTDATED, 0x00f4);
+packet(SMSG_PLAYER_STORAGE_ADD,      0x01c4); /* Add item/equip to storage */
+// Remove item/equip from storage
+packet(SMSG_PLAYER_STORAGE_REMOVE,   0x00f6);
+packet(SMSG_PLAYER_STORAGE_CLOSE,    0x00f8); /* Storage access closed */
+packet(SMSG_PLAYER_STORAGE_PASSWORD, 0x023a);
+packet(SMSG_PLAYER_STORAGE_PASSWORD_RESULT, 0x023c);
+
+packet(SMSG_ADMIN_KICK_ACK,          0x00cd);
+packet(SMSG_ADMIN_GET_LOGIN_ACK,     0x01e0);
+packet(SMSG_ADMIN_SET_TILE_TYPE,     0x0192);
+packet(SMSG_ADMIN_ACCOUNT_STATS,     0x0214);
+
+packet(SMSG_GUILD_CREATE_RESPONSE,   0x0167);
+packet(SMSG_GUILD_POSITION_INFO,     0x016c);
+packet(SMSG_GUILD_MEMBER_LOGIN,      0x01f2);
+packet(SMSG_GUILD_MASTER_OR_MEMBER,  0x014e);
+packet(SMSG_GUILD_BASIC_INFO,        0x01b6);
+packet(SMSG_GUILD_ALIANCE_INFO,      0x014c);
+packet(SMSG_GUILD_MEMBER_LIST,       0x0154);
+packet(SMSG_GUILD_POS_NAME_LIST,     0x0166);
+packet(SMSG_GUILD_POS_INFO_LIST,     0x0160);
+packet(SMSG_GUILD_POSITION_CHANGED,  0x0174);
+packet(SMSG_GUILD_MEMBER_POS_CHANGE, 0x0156);
+packet(SMSG_GUILD_EMBLEM_DATA,       0x0152);
+packet(SMSG_GUILD_EMBLEM,            0x01b4);
+packet(SMSG_GUILD_SKILL_INFO,        0x0162);
+packet(SMSG_GUILD_NOTICE,            0x016f);
+packet(SMSG_GUILD_INVITE,            0x016a);
+packet(SMSG_GUILD_INVITE_ACK,        0x0169);
+packet(SMSG_GUILD_LEAVE,             0x015a);
+packet(SMSG_GUILD_EXPULSION,         0x0839);
+packet(SMSG_GUILD_EXPULSION_LIST,    0x0163);
+packet(SMSG_GUILD_MESSAGE,           0x017f);
+packet(SMSG_GUILD_SKILL_UP,          0x010e);
+packet(SMSG_GUILD_REQ_ALLIANCE,      0x0171);
+packet(SMSG_GUILD_REQ_ALLIANCE_ACK,  0x0173);
+packet(SMSG_GUILD_DEL_ALLIANCE,      0x0184);
+packet(SMSG_GUILD_OPPOSITION_ACK,    0x0181);
+packet(SMSG_GUILD_BROKEN,            0x015e);
+packet(SMSG_GUILD_UPDATE_COORDS,     0x01eb);
+packet(SMSG_GUILD_ALLIANCE_ADDED_DISABLED, 0x0185);
+
+packet(SMSG_QUEST_ADD,               0x02b3);
+packet(SMSG_QUEST_LIST_OUTDATED,     0x02b1);
+packet(SMSG_QUEST_LIST,              0x097a);
+packet(SMSG_QUEST_LIST_OBJECTIVES,   0x02b2);
+packet(SMSG_QUEST_UPDATE_OBJECTIVES, 0x02b5);
+packet(SMSG_QUEST_REMOVE,            0x02b4);
+packet(SMSG_QUEST_ACTIVATE,          0x02b7);
+packet(SMSG_QUEST_NPC_EFFECT,        0x0446);
+
+packet(SMSG_MVP_ITEM,                0x010a);
+packet(SMSG_MVP_EXP,                 0x010b);
+packet(SMSG_MVP_EFFECT,              0x010c);
+packet(SMSG_MVP_NO_ITEM,             0x010d);
+
+packet(SMSG_RANKS_LIST,              0x097d);
+packet(SMSG_BLACKSMITH_RANKS_LIST,   0x0219);
+packet(SMSG_ALCHEMIST_RANKS_LIST,    0x021a);
+packet(SMSG_TAEKWON_RANKS_LIST,      0x0226);
+packet(SMSG_PK_RANKS_LIST,           0x0238);
+packet(SMSG_MONSTER_HP,              0x0977);
+packet(SMSG_MONSTER_INFO,            0x018c);
+packet(SMSG_PLAYER_HP,               0x080e);
+packet(SMSG_PVP_INFO,                0x0210);
+packet(SMSG_SCRIPT_MESSAGE,          0x08b3);
+
+packet(SMSG_CHAT_IGNORE_LIST,        0x00d4);
+packet(SMSG_CHAT_ROOM_CREATE_ACK,    0x00d6);
+packet(SMSG_CHAT_DISPLAY,            0x00d7);
+packet(SMSG_CHAT_ROOM_DESTROY,       0x00d8);
+packet(SMSG_CHAT_ROOM_JOIN_FAILED,   0x00da);
+packet(SMSG_CHAT_ROOM_JOIN_ACK,      0x00db);
+packet(SMSG_CHAT_ROOM_ADD_MEMBER,    0x00dc);
+packet(SMSG_CHAT_ROOM_LEAVE,         0x00dd);
+packet(SMSG_CHAT_ROOM_SETTINGS,      0x00df);
+packet(SMSG_CHAT_ROOM_ROLE_CHANGE,   0x00e1);
+packet(SMSG_CHAT_JOIN_CHANNEL,       0x0b08);
+packet(SMSG_CHAT_TALKIE_BOX,         0x0191);
+
+packet(SMSG_MAIL_MAILS_LIST,         0x0240);
+packet(SMSG_MAIL_READ_MAIL,          0x0242);
+packet(SMSG_MAIL_GET_ATTACHMENT,     0x0245);
+packet(SMSG_MAIL_SEND_MAIL_ACK,      0x0249);
+packet(SMSG_MAIL_NEW_MAIL,           0x024a);
+packet(SMSG_MAIL_SET_ATTACHMENT_ACK, 0x0255);
+packet(SMSG_MAIL_DELETE_MAIL_ACK,    0x0257);
+packet(SMSG_MAIL_OPEN_WINDOW,        0x0260);
+packet(SMSG_MAIL_RETURN,             0x0274);
+
+packet(SMSG_FAMILY_ASK_FOR_CHILD,    0x01f6);
+packet(SMSG_FAMILY_CALL_PARTNER,     0x01e6);
+packet(SMSG_FAMILY_DIVORCED,         0x0205);
+packet(SMSG_FAMILY_ASK_FOR_CHILD_REPLY, 0x0216);
+
+packet(SMSG_PET_MESSAGE,             0x01aa);
+packet(SMSG_PET_ROULETTE,            0x01a0);
+packet(SMSG_PET_EGGS_LIST,           0x01a6);
+packet(SMSG_PET_DATA,                0x01a4);
+packet(SMSG_PET_STATUS,              0x01a2);
+packet(SMSG_PET_FOOD,                0x01a3);
+packet(SMSG_PET_CATCH_PROCESS,       0x019e);
+
+packet(SMSG_BANK_STATUS,             0x09a6);
+packet(SMSG_BANK_DEPOSIT,            0x09a8);
+packet(SMSG_BANK_WITHDRAW,           0x09aa);
+
+packet(SMSG_SOLVE_CHAR_NAME,         0x0194);
+packet(SMSG_SKILL_CASTING,           0x07fb);
+packet(SMSG_SKILL_CAST_CANCEL,       0x01b9);
+packet(SMSG_SKILL_NO_DAMAGE,         0x011a);
+packet(SMSG_SKILL_GROUND_NO_DAMAGE,  0x0117);
+packet(SMSG_SKILL_GROUND_DAMAGE_UNUSED, 0x0115);
+packet(SMSG_SKILL_ENTRY,             0x09ca);
+packet(SMSG_SKILL_ITEM_LIST_WINDOW,  0x07e3);
+
+packet(SMSG_PVP_MAP_MODE,            0x0199);
+packet(SMSG_PVP_SET,                 0x019a);
+packet(SMSG_MAP_TYPE_PROPERTY2,      0x099b);
+packet(SMSG_MAP_TYPE,                0x01d6);
+packet(SMSG_IGNORE_ALL_RESPONSE,     0x00d2);
+
+packet(SMSG_NPC_COMMAND,             0x0B00);
+
+packet(SMSG_MAP_ACCOUNT_ID,          0x0283);
+packet(SMSG_PLAYER_SHORTCUTS,        0x0a00);
+packet(SMSG_PLAYER_SHOW_EQUIP,       0x02da);
+packet(SMSG_NPC_CUTIN,               0x01b3);
+packet(SMSG_NPC_VIEWPOINT,           0x0144);
+
+packet(SMSG_MERCENARY_UPDATE,        0x02a2);
+packet(SMSG_MERCENARY_INFO,          0x029b);
+packet(SMSG_MERCENARY_SKILLS,        0x029d);
+
+packet(SMSG_HOMUNCULUS_SKILLS,       0x0235);
+packet(SMSG_HOMUNCULUS_DATA,         0x0230);
+packet(SMSG_HOMUNCULUS_INFO,         0x022e);
+packet(SMSG_HOMUNCULUS_SKILL_UP,     0x0239);
+packet(SMSG_HOMUNCULUS_FOOD,         0x022f);
+
+packet(SMSG_FRIENDS_PLAYER_ONLINE,   0x0206);
+packet(SMSG_FRIENDS_LIST,            0x0201);
+packet(SMSG_FRIENDS_REQUEST,         0x0207);
+packet(SMSG_FRIENDS_REQUEST_ACK,     0x0209);
+packet(SMSG_FRIENDS_DELETE_PLAYER,   0x020a);
+
+packet(SMSG_AUCTION_OPEN_WINDOW,     0x025f);
+packet(SMSG_AUCTION_RESULTS,         0x0252);
+packet(SMSG_AUCTION_SET_ITEM,        0x0256);
+packet(SMSG_AUCTION_MESSAGE,         0x0250);
+packet(SMSG_AUCTION_CLOSE,           0x025d);
+
+packet(SMSG_VENDING_OPEN_REQ,        0x012d);
+packet(SMSG_VENDING_SHOW_BOARD,      0x0131);
+packet(SMSG_VENDING_HIDE_BOARD,      0x0132);
+packet(SMSG_VENDING_ITEMS_LIST,      0x0800);
+packet(SMSG_VENDING_BUY_ACK,         0x0135);
+packet(SMSG_VENDING_OPEN,            0x0136);
+packet(SMSG_VENDING_OPEN_STATUS,     0x0a28);
+packet(SMSG_VENDING_REPORT,          0x0137);
+
+packet(SMSG_ELEMENTAL_UPDATE_STATUS, 0x081e);
+packet(SMSG_ELEMENTAL_INFO,          0x081d);
+
+packet(SMSG_UPDATE_HOST,             0x0063);
+
+packet(SMSG_MAP_MASK,                0x0b02);
+
+packet(SMSG_MOB_INFO,                0x0b03);
+
+packet(SMSG_MAP_MUSIC,               0x0b05);
+
+packet(SMSG_PLAYER_CLIENT_COMMAND,   0x0b16);
+
+packet(SMSG_CART_INFO,               0x0121);
+packet(SMSG_CART_REMOVE,             0x012b);
+
+packet(SMSG_SEARCHSTORE_SEARCH_ACK,  0x0836);
+packet(SMSG_SEARCHSTORE_SEARCH_FAILED, 0x0837);
+packet(SMSG_SEARCHSTORE_OPEN,        0x083a);
+packet(SMSG_SEARCHSTORE_CLICK_ACK,   0x083d);
+
+packet(SMSG_ONLINE_LIST,             0x0b10);
+
+packet(SMSG_MANNER_MESSAGE,          0x014a);
+packet(SMSG_CHAT_SILENCE,            0x014b);
+
+packet(SMSG_CLASS_CHANGE,            0x01b0);
+
+packet(SMSG_INSTANCE_START,          0x02cb);
+packet(SMSG_INSTANCE_CREATE,         0x02cc);
+packet(SMSG_INSTANCE_INFO,           0x02cd);
+packet(SMSG_INSTANCE_DELETE,         0x02ce);
+
+packet(SMSG_BATTLE_CHAT_MESSAGE,     0x02dc);
+packet(SMSG_BATTLE_EMBLEM,           0x02dd);
+packet(SMSG_BATTLE_UPDATE_SCORE,     0x02de);
+packet(SMSG_BATTLE_UPDATE_COORDS,    0x02df);
+packet(SMSG_BATTLE_PLAY,             0x07fe);
+packet(SMSG_BATTLE_QUEUE_ACK,        0x08d8);
+packet(SMSG_BATTLE_BEGINS,           0x08df);
+packet(SMSG_BATTLE_NOTICE_DELETE,    0x08db);
+packet(SMSG_BATTLE_JOINED,           0x08d9);
+
+packet(SMSG_ROULETTE_OPEN_ACK,       0x0a1a);
+packet(SMSG_ROULETTE_INFO_ACK_TYPE,  0x0a1c);
+packet(SMSG_ROULETTE_RECV_ITEM_ACK,  0x0a22);
+packet(SMSG_ROULETTE_GENERATE_ACK_TYPE, 0x0a20);
+
+packet(SMSG_MARRIAGE_PROPOSAL_OUTDATED, 0x01e2);
+packet(SMSG_MARRIAGE_PROCESS_OUTDATED, 0x01e4);
+
+/**********************************
+ *  Packets from client to server *
+ **********************************/
+
+packet(CMSG_SERVER_VERSION_REQUEST,  0x7530);
+
+packet(CMSG_LOGIN_REGISTER,          0x0064);
+packet(CMSG_LOGIN_REGISTER2,         0x027c);
+packet(CMSG_NAME_REQUEST,            0x088a);
+
+packet(CMSG_CHAR_PASSWORD_CHANGE,    0x0061);
+packet(CMSG_CHAR_SERVER_CONNECT,     0x0065);
+packet(CMSG_CHAR_SELECT,             0x0066);
+packet(CMSG_CHAR_CREATE,             0x0970);
+packet(CMSG_CHAR_DELETE,             0x0068);
+packet(CMSG_CHAR_CREATE_PIN,         0x08ba);
+packet(CMSG_CHAR_CHECK_RENAME,       0x08fc);
+packet(CMSG_CHAR_RENAME,             0x028f);
+packet(CMSG_CHAR_CHANGE_SLOT,        0x08d4);
+
+packet(CMSG_MAP_SERVER_CONNECT,      0x089c);
+packet(CMSG_MAP_PING,                0x035f); /**< Send to server with tick */
+packet(CMSG_LOGIN_PING,              0x0200);
+packet(CMSG_CHAR_PING,               0x0187);
+packet(CMSG_MAP_LOADED,              0x007d);
+packet(CMSG_CLIENT_QUIT,             0x018A);
+
+packet(CMSG_CHAT_MESSAGE,            0x00f3);
+packet(CMSG_CHAT_WHISPER,            0x0096);
+packet(CMSG_CHAT_WHO,                0x00c1);
+packet(CMSG_CHAT_ROOM_JOIN,          0x00d9);
+packet(CMSG_CHAT_JOIN_CHANNEL,       0x0b07);
+packet(CMSG_CHAT_PART_CHANNEL,       0x0b09);
+packet(CMSG_BATTLE_CHAT_MESSAGE,     0x02db);
+
+packet(CMSG_BATTLE_REGISTER,         0x08d7);
+packet(CMSG_BATTLE_REVOKE,           0x08da);
+packet(CMSG_BATTLE_BEGIN_ACK,        0x08e0);
+packet(CMSG_BATTLE_CHECK_STATE,      0x090a);
+
+packet(CMSG_CREAYE_CHAT_ROOM,        0x00d5);
+packet(CMSG_LEAVE_CHAT_ROOM,         0x00e3);
+packet(CMSG_SET_CHAT_ROOM_OPTIONS,   0x00de);
+packet(CMSG_SET_CHAT_ROOM_OWNER,     0x00e0);
+packet(CMSG_KICK_FROM_CHAT_ROOM,     0x00e2);
+
+packet(CMSG_SKILL_LEVELUP_REQUEST,   0x0112);
+packet(CMSG_STAT_UPDATE_REQUEST,     0x00bb);
+packet(CMSG_SKILL_USE_BEING,         0x083c);
+packet(CMSG_SKILL_USE_POSITION,      0x0436);
+// Variant of 0x116 with 80 char string at end (unsure of use)
+packet(CMSG_SKILL_USE_POSITION_MORE, 0x0366);
+packet(CMSG_SKILL_USE_MAP,           0x011b);
+
+packet(CMSG_PLAYER_INVENTORY_USE,    0x0439);
+packet(CMSG_PLAYER_INVENTORY_DROP,   0x0362);
+packet(CMSG_PLAYER_EQUIP,            0x0998);
+packet(CMSG_PLAYER_UNEQUIP,          0x00ab);
+packet(CMSG_PLAYER_USE_CARD,         0x017a);
+packet(CMSG_PLAYER_INSERT_CARD,      0x017c);
+packet(CMSG_PLAYER_VIEW_EQUIPMENT,   0x02d6);
+packet(CMSG_PLAYER_SET_EQUIPMENT_VISIBLE, 0x02d8);
+packet(CMSG_PLAYER_FAVORITE_ITEM,    0x0907);
+
+packet(CMSG_ITEM_PICKUP,             0x07e4);
+packet(CMSG_PLAYER_CHANGE_DIR,       0x0202);
+packet(CMSG_PLAYER_CHANGE_DEST,      0x0437);
+packet(CMSG_PLAYER_CHANGE_ACT,       0x0871);
+packet(CMSG_PLAYER_RESTART,          0x00b2);
+packet(CMSG_PLAYER_EMOTE,            0x00bf);
+packet(CMSG_PLAYER_STOP_ATTACK,      0x0118);
+packet(CMSG_WHO_REQUEST,             0x00c1);
+
+packet(CMSG_NPC_TALK,                0x0090);
+packet(CMSG_NPC_NEXT_REQUEST,        0x00b9);
+packet(CMSG_NPC_CLOSE,               0x0146);
+packet(CMSG_NPC_LIST_CHOICE,         0x00b8);
+packet(CMSG_NPC_INT_RESPONSE,        0x0143);
+packet(CMSG_NPC_STR_RESPONSE,        0x01d5);
+packet(CMSG_NPC_BUY_SELL_REQUEST,    0x00c5);
+packet(CMSG_NPC_BUY_REQUEST,         0x00c8);
+packet(CMSG_NPC_SELL_REQUEST,        0x00c9);
+packet(CMSG_NPC_MARKET_CLOSE,        0x09d8);
+packet(CMSG_NPC_MARKET_BUY,          0x09d6);
+packet(CMSG_NPC_CASH_SHOP_BUY,       0x0288);
+packet(CMSG_NPC_CASH_SHOP_CLOSE,     0x084a);
+packet(CMSG_NPC_CASH_SHOP_OPEN,      0x0844);
+packet(CMSG_NPC_CASH_SHOP_REQUEST_TAB, 0x0846);
+packet(CMSG_NPC_CASH_SHOP_SCHEDULE,  0x08c9);
+
+packet(CMSG_TRADE_REQUEST,           0x00e4);
+packet(CMSG_TRADE_RESPONSE,          0x00e6);
+packet(CMSG_TRADE_ITEM_ADD_REQUEST,  0x00e8);
+packet(CMSG_TRADE_CANCEL_REQUEST,    0x00ed);
+packet(CMSG_TRADE_ADD_COMPLETE,      0x00eb);
+packet(CMSG_TRADE_OK,                0x00ef);
+
+packet(CMSG_PARTY_CREATE,            0x00f9);
+packet(CMSG_PARTY_CREATE2,           0x01e8);
+packet(CMSG_PARTY_INVITE,            0x00fc);
+packet(CMSG_PARTY_INVITE2,           0x095d);
+packet(CMSG_PARTY_INVITED,           0x00ff);
+packet(CMSG_PARTY_INVITED2,          0x02c7);
+packet(CMSG_PARTY_LEAVE,             0x0100);
+packet(CMSG_PARTY_SETTINGS,          0x0102);
+packet(CMSG_PARTY_KICK,              0x0103);
+packet(CMSG_PARTY_MESSAGE,           0x0108);
+packet(CMSG_PARTY_CHANGE_LEADER,     0x07da);
+packet(CMSG_PARTY_ALLOW_INVITES,     0x02c8);
+
+packet(CMSG_MOVE_TO_STORAGE,         0x07ec); /** Move item to storage */
+packet(CMSG_MOVE_FROM_STORAGE,       0x085b); /** Remove item from storage */
+packet(CMSG_CLOSE_STORAGE,           0x0193); /** Request storage close */
+
+packet(CMSG_MOVE_TO_CART,            0x0126);
+packet(CMSG_MOVE_FROM_CART,          0x0127);
+packet(CMSG_CHANGE_CART,             0x01af);
+packet(CMSG_MOVE_FROM_STORAGE_TO_CART, 0x0128);
+packet(CMSG_MOVE_FROM_CART_TO_STORAGE, 0x0129);
+
+packet(CMSG_ADMIN_ANNOUNCE,          0x0099);
+packet(CMSG_ADMIN_LOCAL_ANNOUNCE,    0x019C);
+packet(CMSG_ADMIN_HIDE,              0x019D);
+packet(CMSG_ADMIN_KICK,              0x00CC);
+packet(CMSG_ADMIN_KICK_ALL,          0x00ce);
+packet(CMSG_ADMIN_RESET_PLAYER,      0x0197);
+packet(CMSG_ADMIN_GOTO,              0x01bb);
+packet(CMSG_ADMIN_RECALL,            0x01bd);
+packet(CMSG_ADMIN_MUTE,              0x0149);
+packet(CMSG_ADMIN_MUTE_NAME,         0x0212);
+packet(CMSG_ADMIN_ID_TO_LOGIN,       0x01df);
+packet(CMSG_ADMIN_SET_TILE_TYPE,     0x0198);
+packet(CMSG_ADMIN_UNEQUIP_ALL,       0x07f5);
+packet(CMSG_ADMIN_REQUEST_STATS,     0x0213);
+
+packet(CMSG_GUILD_CHECK_MASTER,      0x014d);
+packet(CMSG_GUILD_REQUEST_INFO,      0x014f);
+packet(CMSG_GUILD_REQUEST_EMBLEM,    0x0151);
+packet(CMSG_GUILD_CHANGE_EMBLEM,     0x0153);
+packet(CMSG_GUILD_CHANGE_MEMBER_POS, 0x0155);
+packet(CMSG_GUILD_LEAVE,             0x0159);
+packet(CMSG_GUILD_EXPULSION,         0x015b);
+packet(CMSG_GUILD_BREAK,             0x015d);
+packet(CMSG_GUILD_CHANGE_POS_INFO,   0x0161);
+packet(CMSG_GUILD_CREATE,            0x0165);
+packet(CMSG_GUILD_INVITE,            0x0168);
+packet(CMSG_GUILD_INVITE_REPLY,      0x016b);
+packet(CMSG_GUILD_CHANGE_NOTICE,     0x016e);
+packet(CMSG_GUILD_ALLIANCE_REQUEST,  0x0170);
+packet(CMSG_GUILD_ALLIANCE_REPLY,    0x0172);
+packet(CMSG_GUILD_MESSAGE,           0x017e);
+packet(CMSG_GUILD_OPPOSITION,        0x0180);
+packet(CMSG_GUILD_ALLIANCE_DELETE,   0x0183);
+
+packet(CMSG_SOLVE_CHAR_NAME,         0x0368);
+packet(CMSG_IGNORE_ALL,              0x00d0);
+packet(CMSG_IGNORE_NICK,             0x00cf);
+packet(CMSG_REQUEST_IGNORE_LIST,     0x00d3);
+packet(CMSG_REQUEST_RANKS,           0x097c);
+packet(CMSG_SET_SHORTCUTS,           0x02ba);
+packet(CMSG_NPC_COMPLETE_PROGRESS_BAR, 0x02f1);
+packet(CMSG_NPC_PRODUCE_MIX,         0x018e);
+packet(CMSG_NPC_COOKING,             0x025b);
+packet(CMSG_NPC_REPAIR,              0x01fd);
+packet(CMSG_NPC_REFINE,              0x0222);
+packet(CMSG_NPC_IDENTIFY,            0x0178);
+packet(CMSG_NPC_SELECT_ARROW,        0x01ae);
+packet(CMSG_NPC_SELECT_AUTO_SPELL,   0x01ce);
+packet(CMSG_NPC_SHOP_CLOSE,          0x09d4);
+
+packet(CMSG_PLAYER_MAPMOVE,          0x0140);
+packet(CMSG_REMOVE_OPTION,           0x012a);
+packet(CMSG_PLAYER_SET_MEMO,         0x011d);
+
+packet(CMSG_PET_CATCH,               0x019f);
+packet(CMSG_PET_SEND_MESSAGE,        0x01a9);
+packet(CMSG_PET_SET_NAME,            0x01a5);
+packet(CMSG_PET_SELECT_EGG,          0x01a7);
+packet(CMSG_PET_MENU_ACTION,         0x01a1);
+packet(CMSG_PET_TALK,                0x0b0c);
+packet(CMSG_PET_EMOTE,               0x0b0d);
+packet(CMSG_PET_MOVE_TO,             0x0b11);
+packet(CMSG_PET_DIRECTION,           0x0b12);
+
+packet(CMSG_MERCENARY_ACTION,        0x029f);
+packet(CMSG_HOMUNCULUS_SET_NAME,     0x0231);
+packet(CMSG_HOMUNCULUS_MENU,         0x0361);
+packet(CMSG_HOMMERC_MOVE_TO_MASTER,  0x0234);
+packet(CMSG_HOMMERC_MOVE_TO,         0x0232);
+packet(CMSG_HOMMERC_ATTACK,          0x0233);
+packet(CMSG_HOMMERC_TALK,            0x0b13);
+packet(CMSG_HOMMERC_EMOTE,           0x0b14);
+packet(CMSG_HOMMERC_DIRECTION,       0x0b15);
+
+packet(CMSG_DORI_DORI,               0x01e7);
+packet(CMSG_EXPLOSION_SPIRITS,       0x01ed);
+packet(SMSG_SPIRIT_BALLS,            0x01d0);
+packet(SMSG_SPIRIT_BALL_SINGLE,      0x01e1);
+packet(SMSG_BLADE_STOP,              0x01d1);
+packet(SMSG_COMBO_DELAY,             0x01d2);
+packet(SMSG_WEDDING_EFFECT,          0x01ea);
+packet(CMSG_PVP_INFO,                0x020f);
+packet(CMSG_PLAYER_AUTO_REVIVE,      0x0292);
+packet(CMSG_QUEST_ACTIVATE,          0x02b6);
+
+packet(CMSG_MAIL_REFRESH_INBOX,      0x023f);
+packet(CMSG_MAIL_READ_MESSAGE,       0x0241);
+packet(CMSG_MAIL_GET_ATTACH,         0x0244);
+packet(CMSG_MAIL_DELETE_MESSAGE,     0x0243);
+packet(CMSG_MAIL_RETURN_MESSAGE,     0x0273);
+packet(CMSG_MAIL_SET_ATTACH,         0x0247);
+packet(CMSG_MAIL_RESET_ATTACH,       0x0246);
+packet(CMSG_MAIL_SEND,               0x0248);
+
+packet(CMSG_FAMILY_ASK_FOR_CHILD,    0x01f9);
+packet(CMSG_FAMILY_ASK_FOR_CHILD_REPLY, 0x01f7);
+
+packet(CMSG_BANK_DEPOSIT,            0x09a7);
+packet(CMSG_BANK_WITHDRAW,           0x09a9);
+packet(CMSG_BANK_CHECK,              0x09ab);
+packet(CMSG_BANK_OPEN,               0x09b6);
+packet(CMSG_BANK_CLOSE,              0x09b8);
+
+packet(CMSG_FRIENDS_ADD_PLAYER,      0x091a);
+packet(CMSG_FRIENDS_REQUEST_ACK,     0x0208);
+packet(CMSG_FRIENDS_DELETE_PLAYER,   0x0203);
+
+packet(CMSG_AUCTION_CANCEL_REG,      0x024b);
+packet(CMSG_AUCTION_SET_ITEM,        0x024c);
+packet(CMSG_AUCTION_REGISTER,        0x024d);
+packet(CMSG_AUCTION_CANCEL,          0x024e);
+packet(CMSG_AUCTION_CLOSE,           0x025d);
+packet(CMSG_AUCTION_BID,             0x024f);
+packet(CMSG_AUCTION_SEARCH,          0x0251);
+packet(CMSG_AUCTION_BUY_SELL,        0x025c);
+
+packet(CMSG_VENDING_CLOSE,           0x012e);
+packet(CMSG_VENDING_LIST_REQ,        0x0130);
+packet(CMSG_VENDING_BUY,             0x0134);
+packet(CMSG_VENDING_BUY2,            0x0801);
+packet(CMSG_VENDING_CREATE_SHOP,     0x01b2);
+
+packet(CMSG_BUYINGSTORE_CREATE,      0x0815);
+packet(CMSG_BUYINGSTORE_CLOSE,       0x0817);
+packet(CMSG_BUYINGSTORE_OPEN,        0x0360);
+packet(CMSG_BUYINGSTORE_SELL,        0x0811);
+
+packet(CMSG_SEARCHSTORE_SEARCH,      0x0819);
+packet(CMSG_SEARCHSTORE_NEXT_PAGE,   0x0940);
+packet(CMSG_SEARCHSTORE_CLOSE,       0x083b);
+packet(CMSG_SEARCHSTORE_CLICK,       0x0835);
+
+packet(CMSG_SET_STATUS,              0x0b0e);
+
+packet(CMSG_ONLINE_LIST,             0x0b0f);
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index 1f3be9ef0..221066df5 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -24,719 +24,7 @@
 #define NET_EATHENA_PROTOCOL_H
 
 #include "net/packetdefine.h"
-
-/*********************************
- * Packets from server to client *
- *********************************/
-packet(SMSG_SERVER_VERSION_RESPONSE, 0x7531);
-
-packet(SMSG_SERVER_PING,             0x007f); /**< Contains server tick */
-packet(SMSG_CONNECTION_PROBLEM,      0x0081);
-packet(SMSG_MAP_NOT_FOUND,           0x0840);
-
-packet(SMSG_LOGIN_DATA,              0x0069);
-packet(SMSG_LOGIN_ERROR,             0x006a);
-packet(SMSG_LOGIN_ERROR2,            0x083e);
-packet(SMSG_LOGIN_CODING_KEY,        0x01dc);
-
-// unused
-packet(SMSG_CHAR_LOGIN,              0x006b);
-packet(SMSG_CHAR_LOGIN2,             0x082d);
-packet(SMSG_CHAR_LOGIN_ERROR,        0x006c);
-packet(SMSG_CHAR_CREATE_SUCCEEDED,   0x006d);
-packet(SMSG_CHAR_PINCODE_STATUS,     0x08b9);
-packet(SMSG_CHAR_CHECK_RENAME,       0x028e);
-packet(SMSG_CHAR_RENAME,             0x0290);
-packet(SMSG_CHAR_CHANGE_SLOT,        0x08d5);
-packet(SMSG_CHAR_CAPTCHA_NOT_SUPPORTED, 0x07e9);
-packet(SMSG_CHAR_PASSWORD_RESPONSE,  0x0062);
-
-packet(SMSG_CHAR_CREATE_FAILED,      0x006e);
-packet(SMSG_CHAR_DELETE_SUCCEEDED,   0x006f);
-packet(SMSG_CHAR_DELETE_FAILED,      0x0070);
-packet(SMSG_CHAR_DELETE2_ACK,        0x0828);
-packet(SMSG_CHAR_DELETE2_ACCEPT_ACTUAL_ACK, 0x082a);
-packet(SMSG_CHAR_DELETE2_CANCEL_ACK, 0x082c);
-packet(SMSG_CHAR_MAP_INFO,           0x0071);
-packet(SMSG_CHAR_CHARACTERS,         0x099d);
-packet(SMSG_CHAR_BAN_CHAR_LIST,      0x020d);
-
-packet(SMSG_CHAR_SWITCH_RESPONSE,    0x00b3);
-packet(SMSG_CHANGE_MAP_SERVER,       0x0092);
-
-packet(SMSG_MAP_LOGIN_SUCCESS,       0x0a18); /**< Contains starting location */
-packet(SMSG_MAP_AUTH_REFUSE,         0x0074);
-packet(SMSG_MAP_QUIT_RESPONSE,       0x018b);
-packet(SMSG_PLAYER_STOP,             0x0088); /**< Stop walking, set position */
-packet(SMSG_PLAYER_MOVE_TO_ATTACK,   0x0139);
-packet(SMSG_PLAYER_STAT_UPDATE_1,    0x00b0);
-packet(SMSG_PLAYER_STAT_UPDATE_2,    0x00b1);
-packet(SMSG_PLAYER_STAT_UPDATE_3,    0x0141);
-packet(SMSG_PLAYER_STAT_UPDATE_4,    0x00bc);
-packet(SMSG_PLAYER_STAT_UPDATE_5,    0x00bd);
-packet(SMSG_PLAYER_STAT_UPDATE_6,    0x00be);
-packet(SMSG_PLAYER_GET_EXP,          0x07f6);
-packet(SMSG_WHO_ANSWER,              0x00c2);
-packet(SMSG_PLAYER_WARP,             0x0091);
-packet(SMSG_PLAYER_INVENTORY,        0x0991);
-packet(SMSG_PLAYER_INVENTORY_ADD,    0x0990);
-packet(SMSG_PLAYER_INVENTORY_REMOVE, 0x00af);
-packet(SMSG_PLAYER_INVENTORY_REMOVE2, 0x07fa);
-packet(SMSG_PLAYER_INVENTORY_USE,    0x01c8);
-packet(SMSG_PLAYER_IDENTIFY_LIST,    0x0177);
-packet(SMSG_PLAYER_IDENTIFIED,       0x0179);
-packet(SMSG_PLAYER_CART_ADD_OUTDATED, 0x0124);
-packet(SMSG_PLAYER_CART_ADD,         0x01c5);
-packet(SMSG_PLAYER_CART_ADD_ERROR,   0x012c);
-packet(SMSG_PLAYER_CART_ITEMS,       0x0993);
-packet(SMSG_PLAYER_CART_EQUIP,       0x0994);
-packet(SMSG_PLAYER_CART_REMOVE,      0x0125);
-packet(SMSG_PLAYER_ITEM_RENTAL_TIME, 0x0298);
-packet(SMSG_PLAYER_ITEM_RENTAL_EXPIRED, 0x0299);
-packet(SMSG_PLAYER_REFINE,           0x0188);
-packet(SMSG_PLAYER_EQUIPMENT,        0x0992);
-packet(SMSG_PLAYER_EQUIP,            0x0999);
-packet(SMSG_PLAYER_UNEQUIP,          0x099a);
-packet(SMSG_PLAYER_USE_CARD,         0x017b);
-packet(SMSG_PLAYER_INSERT_CARD,      0x017d);
-packet(SMSG_PLAYER_ATTACK_RANGE,     0x013a);
-packet(SMSG_PLAYER_ARROW_EQUIP,      0x013c);
-packet(SMSG_PLAYER_ARROW_MESSAGE,    0x013b);
-packet(SMSG_PLAYER_SKILLS,           0x010f);
-packet(SMSG_PLAYER_ADD_SKILL,        0x0111);
-packet(SMSG_PLAYER_DELETE_SKILL,     0x0441);
-packet(SMSG_PLAYER_UPDATE_SKILL,     0x07e1);
-packet(SMSG_PLAYER_SKILL_UP,         0x010e);
-packet(SMSG_PLAYER_HEAL,             0x013d);
-packet(SMSG_PLAYER_SKILL_COOLDOWN,   0x043d);
-packet(SMSG_PLAYER_SKILL_COOLDOWN_LIST_OUTDATED, 0x043e);
-packet(SMSG_PLAYER_SKILL_COOLDOWN_LIST, 0x0985);
-packet(SMSG_PLAYER_SKILL_MESSAGE,    0x0215);
-packet(SMSG_PLAYER_NOTIFY_MAPINFO,   0x0189);
-packet(SMSG_PLAYER_SKILL_PRODUCE_MIX_LIST, 0x018d);
-packet(SMSG_PLAYER_SKILL_PRODUCE_EFFECT, 0x018f);
-packet(SMSG_PLAYER_SKILL_AUTO_SPELLS, 0x01cd);
-packet(SMSG_PLAYER_REPAIR_LIST,      0x01fc);
-packet(SMSG_PLAYER_REPAIR_EFFECT,    0x01fe);
-packet(SMSG_PLAYER_FAME_BLACKSMITH,  0x021b);
-packet(SMSG_PLAYER_FAME_ALCHEMIST,   0x021c);
-packet(SMSG_PLAYER_FAME_TAEKWON,     0x0224);
-packet(SMSG_PLAYER_RANK_POINTS,      0x097e);
-packet(SMSG_PLAYER_REFINE_LIST,      0x0221);
-packet(SMSG_PLAYER_UPGRADE_MESSAGE,  0x0223);
-packet(SMSG_PLAYER_COOKING_LIST,     0x025a);
-packet(SMSG_PLAYER_READ_BOOK,        0x0294);
-packet(SMSG_PLAYER_EQUIP_TICK_ACK,   0x02d9);
-packet(SMSG_PLAYER_FAVORITE_ITEM,    0x0908);
-packet(SMSG_SKILL_FAILED,            0x0110);
-packet(SMSG_SKILL_DAMAGE_OUTDATED,   0x0114);
-packet(SMSG_SKILL_DAMAGE,            0x01de);
-packet(SMSG_SKILL_AUTO_CAST,         0x0147);
-packet(SMSG_SKILL_SNAP,              0x08d2);
-packet(SMSG_SKILL_WARP_POINT,        0x011c);
-packet(SMSG_SKILL_MEMO_MESSAGE,      0x011e);
-packet(SMSG_SKILL_UNIT_UPDATE,       0x01ac);
-packet(SMSG_SKILL_ARROW_CREATE_LIST, 0x01ad);
-packet(SMSG_SKILL_DEVOTION_EFFECT,   0x01cf);
-packet(SMSG_ITEM_USE_RESPONSE,       0x00a8);
-packet(SMSG_ITEM_VISIBLE,            0x009d); /**< An item is on the floor */
-packet(SMSG_ITEM_VISIBLE2,           0x0b18);
-packet(SMSG_GRAFFITI_VISIBLE,        0x01c9);
-packet(SMSG_ITEM_DROPPED,            0x084b); /**< An item is dropped */
-packet(SMSG_ITEM_DROPPED2,           0x0b19);
-packet(SMSG_ITEM_MVP_DROPPED,        0x07fd);
-packet(SMSG_ITEM_REMOVE,             0x00a1); /**< An item disappers */
-packet(SMSG_BEING_VISIBLE,           0x0915);
-packet(SMSG_BEING_FAKE_NAME,         0x0078);
-packet(SMSG_BEING_MOVE,              0x0914); /**< A nearby monster moves */
-packet(SMSG_BEING_SPAWN,             0x090f); /**< A being spawns nearby */
-packet(SMSG_BEING_MOVE2,             0x0086); /**< New eAthena being moves */
-packet(SMSG_BEING_MOVE3,             0x0b04);
-packet(SMSG_BEING_REMOVE,            0x0080);
-packet(SMSG_BEING_REMOVE_SKILL,      0x0120);
-packet(SMSG_BEING_CHANGE_LOOKS_OUTDATED, 0x00c3);
-packet(SMSG_BEING_CHANGE_LOOKS2,     0x01d7);
-packet(SMSG_BEING_CHANGE_LOOKS_CARDS, 0x0b17);
-packet(SMSG_BEING_SELFEFFECT,        0x019b);
-packet(SMSG_BEING_SPECIAL_EFFECT,    0x01f3);
-packet(SMSG_BEING_SPECIAL_EFFECT_NUM, 0x0284);
-packet(SMSG_BEING_SOUND_EFFECT,      0x01d3);
-packet(SMSG_BEING_EMOTION,           0x00c0);
-packet(SMSG_BEING_ACTION,            0x008a); /**< Attack, sit, stand up, ...*/
-packet(SMSG_BEING_ACTION2,           0x02e1);
-packet(SMSG_BEING_CHAT,              0x008d); /**< A being talks */
-packet(SMSG_BEING_SLIDE,             0x01ff);
-packet(SMSG_BEING_CHARM,             0x08cf);
-packet(SMSG_COLOR_MESSAGE,           0x02c1);
-packet(SMSG_FORMAT_MESSAGE,          0x0291);
-packet(SMSG_FORMAT_MESSAGE_NUMBER,   0x07e2);
-packet(SMSG_FORMAT_MESSAGE_SKILL,    0x07e6);
-packet(SMSG_BEING_NAME_RESPONSE,     0x0095); /**< Has to be requested */
-packet(SMSG_BEING_NAME_RESPONSE2,    0x0b01); /**< Has to be requested */
-packet(SMSG_BEING_CHANGE_DIRECTION,  0x009c);
-packet(SMSG_BEING_RESURRECT,         0x0148);
-packet(SMSG_BEING_STAT_UPDATE_1,     0x01ab);
-packet(SMSG_BEING_ATTRS,             0x0b0a);
-packet(SMSG_BEING_FONT,              0x02ef);
-packet(SMSG_BEING_MILLENIUM_SHIELD,  0x0440);
-packet(SMSG_BEING_VIEW_EQUIPMENT,    0x0997);
-packet(SMSG_IGNORE_NICK_ACK,         0x00d1);
-packet(SMSG_STARS_KILL,              0x020e);
-packet(SMSG_GLADIATOR_FEEL_REQUEST,  0x0253);
-packet(SMSG_BOSS_MAP_INFO,           0x0293);
-packet(SMSG_ITEM_DAMAGED,            0x02bb);
-packet(SMSG_AUTOSHADOW_SPELL_LIST,   0x0442);
-packet(SMSG_BIND_ITEM,               0x02d3);
-
-packet(SMSG_PLAYER_STATUS_CHANGE_OUTDATED, 0x0119);
-packet(SMSG_PLAYER_STATUS_CHANGE,    0x0229);
-packet(SMSG_PLAYER_STATUS_CHANGE2,   0x028a);
-packet(SMSG_PLAYER_STATUS_CHANGE_NO_TICK, 0x0196);
-packet(SMSG_PLAYER_GUILD_PARTY_INFO, 0x0195);
-packet(SMSG_BEING_STATUS_CHANGE,     0x0983);
-packet(SMSG_BEING_STATUS_CHANGE2,    0x043f);
-
-packet(SMSG_NPC_MESSAGE,             0x00b4);
-packet(SMSG_NPC_NEXT,                0x00b5);
-packet(SMSG_NPC_CLOSE,               0x00b6);
-packet(SMSG_NPC_CLOSE_TIMEOUT,       0x08d6);
-packet(SMSG_NPC_CHOICE,              0x00b7); /**< Display a choice */
-packet(SMSG_NPC_BUY_SELL_CHOICE,     0x00c4);
-packet(SMSG_NPC_BUY,                 0x00c6);
-packet(SMSG_NPC_SELL,                0x00c7);
-packet(SMSG_NPC_BUY_RESPONSE,        0x00ca);
-packet(SMSG_NPC_SELL_RESPONSE,       0x00cb);
-packet(SMSG_NPC_INT_INPUT,           0x0142); /**< Integer input */
-packet(SMSG_NPC_STR_INPUT,           0x01d4); /**< String input */
-packet(SMSG_NPC_SHOW_PROGRESS_BAR,   0x02f0);
-packet(SMSG_NPC_PROGRESS_BAR_ABORT,  0x02f2);
-packet(SMSG_NPC_CHANGETITLE,         0x0b06);
-packet(SMSG_NPC_MARKET_OPEN,         0x09d5);
-packet(SMSG_NPC_MARKET_BUY_ACK,      0x09d7);
-packet(SMSG_NPC_CASH_SHOP_OPEN,      0x0287);
-packet(SMSG_NPC_CASH_BUY_ACK,        0x0289);
-packet(SMSG_NPC_CASH_POINTS,         0x0845);
-packet(SMSG_NPC_CASH_BUY,            0x0849);
-packet(SMSG_NPC_CASH_TAB_PRICE_LIST, 0x08c0);
-packet(SMSG_NPC_CASH_SCHEDULE,       0x08ca);
-packet(SMSG_NPC_AREA,                0x0b0b);
-packet(SMSG_NPC_SHOW_DIGIT,          0x01b1);
-
-packet(SMSG_PLAYER_CHAT,             0x008e); /**< Player talks */
-packet(SMSG_WHISPER,                 0x0097); /**< Whisper Recieved */
-packet(SMSG_WHISPER_RESPONSE,        0x09df);
-packet(SMSG_GM_CHAT,                 0x009a); /**< GM announce */
-packet(SMSG_GM_CHAT2,                0x01c3);
-packet(SMSG_WALK_RESPONSE,           0x0087);
-
-packet(SMSG_BUYINGSTORE_OPEN,        0x0810);
-packet(SMSG_BUYINGSTORE_CREATE_FAILED, 0x0812);
-packet(SMSG_BUYINGSTORE_OWN_ITEMS,   0x0813);
-packet(SMSG_BUYINGSTORE_SHOW_BOARD,  0x0814);
-packet(SMSG_BUYINGSTORE_HIDE_BOARD,  0x0816);
-packet(SMSG_BUYINGSTORE_ITEMS_LIST,  0x0818);
-packet(SMSG_BUYINGSTORE_SELL_FAILED, 0x081a);
-packet(SMSG_BUYINGSTORE_REPORT,      0x081b);
-packet(SMSG_BUYINGSTORE_DELETE_ITEM, 0x081c);
-packet(SMSG_BUYINGSTORE_SELLER_SELL_FAILED, 0x0824);
-
-// Receiving a request to trade
-packet(SMSG_TRADE_REQUEST_OUTDATED,  0x00e5);
-packet(SMSG_TRADE_REQUEST,           0x01f4);
-packet(SMSG_TRADE_RESPONSE_OUTDATED, 0x00e7);
-packet(SMSG_TRADE_RESPONSE,          0x01f5);
-packet(SMSG_TRADE_ITEM_ADD,          0x080f);
-packet(SMSG_TRADE_ITEM_ADD_RESPONSE, 0x00ea);
-packet(SMSG_TRADE_OK,                0x00ec);
-packet(SMSG_TRADE_CANCEL,            0x00ee);
-packet(SMSG_TRADE_COMPLETE,          0x00f0);
-packet(SMSG_TRADE_UNDO,              0x00f1);
-
-packet(SMSG_PARTY_CREATE,            0x00fa);
-packet(SMSG_PARTY_INFO,              0x00fb);
-packet(SMSG_PARTY_INVITE_RESPONSE_OUTDATED, 0x00fd);
-packet(SMSG_PARTY_INVITE_RESPONSE,   0x02c5);
-packet(SMSG_PARTY_INVITED,           0x02c6);
-packet(SMSG_PARTY_SETTINGS,          0x07d8);
-packet(SMSG_PARTY_LEAVE,             0x0105);
-packet(SMSG_PARTY_UPDATE_COORDS,     0x0107);
-packet(SMSG_PARTY_MESSAGE,           0x0109);
-packet(SMSG_PARTY_INVITATION_STATS,  0x02c9);
-packet(SMSG_PARTY_MEMBER_INFO,       0x01e9);
-packet(SMSG_PARTY_ITEM_PICKUP,       0x02b8);
-packet(SMSG_PARTY_LEADER,            0x07fc);
-
-packet(SMSG_PLAYER_STORAGE_ITEMS,    0x0995); /* Item list for storage */
-packet(SMSG_PLAYER_STORAGE_EQUIP,    0x0996); /* Equipment list for storage */
-packet(SMSG_PLAYER_STORAGE_STATUS,   0x00f2); /* Slots used and total slots */
-packet(SMSG_PLAYER_STORAGE_ADD_OUTDATED, 0x00f4);
-packet(SMSG_PLAYER_STORAGE_ADD,      0x01c4); /* Add item/equip to storage */
-// Remove item/equip from storage
-packet(SMSG_PLAYER_STORAGE_REMOVE,   0x00f6);
-packet(SMSG_PLAYER_STORAGE_CLOSE,    0x00f8); /* Storage access closed */
-packet(SMSG_PLAYER_STORAGE_PASSWORD, 0x023a);
-packet(SMSG_PLAYER_STORAGE_PASSWORD_RESULT, 0x023c);
-
-packet(SMSG_ADMIN_KICK_ACK,          0x00cd);
-packet(SMSG_ADMIN_GET_LOGIN_ACK,     0x01e0);
-packet(SMSG_ADMIN_SET_TILE_TYPE,     0x0192);
-packet(SMSG_ADMIN_ACCOUNT_STATS,     0x0214);
-
-packet(SMSG_GUILD_CREATE_RESPONSE,   0x0167);
-packet(SMSG_GUILD_POSITION_INFO,     0x016c);
-packet(SMSG_GUILD_MEMBER_LOGIN,      0x01f2);
-packet(SMSG_GUILD_MASTER_OR_MEMBER,  0x014e);
-packet(SMSG_GUILD_BASIC_INFO,        0x01b6);
-packet(SMSG_GUILD_ALIANCE_INFO,      0x014c);
-packet(SMSG_GUILD_MEMBER_LIST,       0x0154);
-packet(SMSG_GUILD_POS_NAME_LIST,     0x0166);
-packet(SMSG_GUILD_POS_INFO_LIST,     0x0160);
-packet(SMSG_GUILD_POSITION_CHANGED,  0x0174);
-packet(SMSG_GUILD_MEMBER_POS_CHANGE, 0x0156);
-packet(SMSG_GUILD_EMBLEM_DATA,       0x0152);
-packet(SMSG_GUILD_EMBLEM,            0x01b4);
-packet(SMSG_GUILD_SKILL_INFO,        0x0162);
-packet(SMSG_GUILD_NOTICE,            0x016f);
-packet(SMSG_GUILD_INVITE,            0x016a);
-packet(SMSG_GUILD_INVITE_ACK,        0x0169);
-packet(SMSG_GUILD_LEAVE,             0x015a);
-packet(SMSG_GUILD_EXPULSION,         0x0839);
-packet(SMSG_GUILD_EXPULSION_LIST,    0x0163);
-packet(SMSG_GUILD_MESSAGE,           0x017f);
-packet(SMSG_GUILD_SKILL_UP,          0x010e);
-packet(SMSG_GUILD_REQ_ALLIANCE,      0x0171);
-packet(SMSG_GUILD_REQ_ALLIANCE_ACK,  0x0173);
-packet(SMSG_GUILD_DEL_ALLIANCE,      0x0184);
-packet(SMSG_GUILD_OPPOSITION_ACK,    0x0181);
-packet(SMSG_GUILD_BROKEN,            0x015e);
-packet(SMSG_GUILD_UPDATE_COORDS,     0x01eb);
-packet(SMSG_GUILD_ALLIANCE_ADDED_DISABLED, 0x0185);
-
-packet(SMSG_QUEST_ADD,               0x02b3);
-packet(SMSG_QUEST_LIST_OUTDATED,     0x02b1);
-packet(SMSG_QUEST_LIST,              0x097a);
-packet(SMSG_QUEST_LIST_OBJECTIVES,   0x02b2);
-packet(SMSG_QUEST_UPDATE_OBJECTIVES, 0x02b5);
-packet(SMSG_QUEST_REMOVE,            0x02b4);
-packet(SMSG_QUEST_ACTIVATE,          0x02b7);
-packet(SMSG_QUEST_NPC_EFFECT,        0x0446);
-
-packet(SMSG_MVP_ITEM,                0x010a);
-packet(SMSG_MVP_EXP,                 0x010b);
-packet(SMSG_MVP_EFFECT,              0x010c);
-packet(SMSG_MVP_NO_ITEM,             0x010d);
-
-packet(SMSG_RANKS_LIST,              0x097d);
-packet(SMSG_BLACKSMITH_RANKS_LIST,   0x0219);
-packet(SMSG_ALCHEMIST_RANKS_LIST,    0x021a);
-packet(SMSG_TAEKWON_RANKS_LIST,      0x0226);
-packet(SMSG_PK_RANKS_LIST,           0x0238);
-packet(SMSG_MONSTER_HP,              0x0977);
-packet(SMSG_MONSTER_INFO,            0x018c);
-packet(SMSG_PLAYER_HP,               0x080e);
-packet(SMSG_PVP_INFO,                0x0210);
-packet(SMSG_SCRIPT_MESSAGE,          0x08b3);
-
-packet(SMSG_CHAT_IGNORE_LIST,        0x00d4);
-packet(SMSG_CHAT_ROOM_CREATE_ACK,    0x00d6);
-packet(SMSG_CHAT_DISPLAY,            0x00d7);
-packet(SMSG_CHAT_ROOM_DESTROY,       0x00d8);
-packet(SMSG_CHAT_ROOM_JOIN_FAILED,   0x00da);
-packet(SMSG_CHAT_ROOM_JOIN_ACK,      0x00db);
-packet(SMSG_CHAT_ROOM_ADD_MEMBER,    0x00dc);
-packet(SMSG_CHAT_ROOM_LEAVE,         0x00dd);
-packet(SMSG_CHAT_ROOM_SETTINGS,      0x00df);
-packet(SMSG_CHAT_ROOM_ROLE_CHANGE,   0x00e1);
-packet(SMSG_CHAT_JOIN_CHANNEL,       0x0b08);
-packet(SMSG_CHAT_TALKIE_BOX,         0x0191);
-
-packet(SMSG_MAIL_MAILS_LIST,         0x0240);
-packet(SMSG_MAIL_READ_MAIL,          0x0242);
-packet(SMSG_MAIL_GET_ATTACHMENT,     0x0245);
-packet(SMSG_MAIL_SEND_MAIL_ACK,      0x0249);
-packet(SMSG_MAIL_NEW_MAIL,           0x024a);
-packet(SMSG_MAIL_SET_ATTACHMENT_ACK, 0x0255);
-packet(SMSG_MAIL_DELETE_MAIL_ACK,    0x0257);
-packet(SMSG_MAIL_OPEN_WINDOW,        0x0260);
-packet(SMSG_MAIL_RETURN,             0x0274);
-
-packet(SMSG_FAMILY_ASK_FOR_CHILD,    0x01f6);
-packet(SMSG_FAMILY_CALL_PARTNER,     0x01e6);
-packet(SMSG_FAMILY_DIVORCED,         0x0205);
-packet(SMSG_FAMILY_ASK_FOR_CHILD_REPLY, 0x0216);
-
-packet(SMSG_PET_MESSAGE,             0x01aa);
-packet(SMSG_PET_ROULETTE,            0x01a0);
-packet(SMSG_PET_EGGS_LIST,           0x01a6);
-packet(SMSG_PET_DATA,                0x01a4);
-packet(SMSG_PET_STATUS,              0x01a2);
-packet(SMSG_PET_FOOD,                0x01a3);
-packet(SMSG_PET_CATCH_PROCESS,       0x019e);
-
-packet(SMSG_BANK_STATUS,             0x09a6);
-packet(SMSG_BANK_DEPOSIT,            0x09a8);
-packet(SMSG_BANK_WITHDRAW,           0x09aa);
-
-packet(SMSG_SOLVE_CHAR_NAME,         0x0194);
-packet(SMSG_SKILL_CASTING,           0x07fb);
-packet(SMSG_SKILL_CAST_CANCEL,       0x01b9);
-packet(SMSG_SKILL_NO_DAMAGE,         0x011a);
-packet(SMSG_SKILL_GROUND_NO_DAMAGE,  0x0117);
-packet(SMSG_SKILL_GROUND_DAMAGE_UNUSED, 0x0115);
-packet(SMSG_SKILL_ENTRY,             0x09ca);
-packet(SMSG_SKILL_ITEM_LIST_WINDOW,  0x07e3);
-
-packet(SMSG_PVP_MAP_MODE,            0x0199);
-packet(SMSG_PVP_SET,                 0x019a);
-packet(SMSG_MAP_TYPE_PROPERTY2,      0x099b);
-packet(SMSG_MAP_TYPE,                0x01d6);
-packet(SMSG_IGNORE_ALL_RESPONSE,     0x00d2);
-
-packet(SMSG_NPC_COMMAND,             0x0B00);
-
-packet(SMSG_MAP_ACCOUNT_ID,          0x0283);
-packet(SMSG_PLAYER_SHORTCUTS,        0x0a00);
-packet(SMSG_PLAYER_SHOW_EQUIP,       0x02da);
-packet(SMSG_NPC_CUTIN,               0x01b3);
-packet(SMSG_NPC_VIEWPOINT,           0x0144);
-
-packet(SMSG_MERCENARY_UPDATE,        0x02a2);
-packet(SMSG_MERCENARY_INFO,          0x029b);
-packet(SMSG_MERCENARY_SKILLS,        0x029d);
-
-packet(SMSG_HOMUNCULUS_SKILLS,       0x0235);
-packet(SMSG_HOMUNCULUS_DATA,         0x0230);
-packet(SMSG_HOMUNCULUS_INFO,         0x022e);
-packet(SMSG_HOMUNCULUS_SKILL_UP,     0x0239);
-packet(SMSG_HOMUNCULUS_FOOD,         0x022f);
-
-packet(SMSG_FRIENDS_PLAYER_ONLINE,   0x0206);
-packet(SMSG_FRIENDS_LIST,            0x0201);
-packet(SMSG_FRIENDS_REQUEST,         0x0207);
-packet(SMSG_FRIENDS_REQUEST_ACK,     0x0209);
-packet(SMSG_FRIENDS_DELETE_PLAYER,   0x020a);
-
-packet(SMSG_AUCTION_OPEN_WINDOW,     0x025f);
-packet(SMSG_AUCTION_RESULTS,         0x0252);
-packet(SMSG_AUCTION_SET_ITEM,        0x0256);
-packet(SMSG_AUCTION_MESSAGE,         0x0250);
-packet(SMSG_AUCTION_CLOSE,           0x025d);
-
-packet(SMSG_VENDING_OPEN_REQ,        0x012d);
-packet(SMSG_VENDING_SHOW_BOARD,      0x0131);
-packet(SMSG_VENDING_HIDE_BOARD,      0x0132);
-packet(SMSG_VENDING_ITEMS_LIST,      0x0800);
-packet(SMSG_VENDING_BUY_ACK,         0x0135);
-packet(SMSG_VENDING_OPEN,            0x0136);
-packet(SMSG_VENDING_OPEN_STATUS,     0x0a28);
-packet(SMSG_VENDING_REPORT,          0x0137);
-
-packet(SMSG_ELEMENTAL_UPDATE_STATUS, 0x081e);
-packet(SMSG_ELEMENTAL_INFO,          0x081d);
-
-packet(SMSG_UPDATE_HOST,             0x0063);
-
-packet(SMSG_MAP_MASK,                0x0b02);
-
-packet(SMSG_MOB_INFO,                0x0b03);
-
-packet(SMSG_MAP_MUSIC,               0x0b05);
-
-packet(SMSG_PLAYER_CLIENT_COMMAND,   0x0b16);
-
-packet(SMSG_CART_INFO,               0x0121);
-packet(SMSG_CART_REMOVE,             0x012b);
-
-packet(SMSG_SEARCHSTORE_SEARCH_ACK,  0x0836);
-packet(SMSG_SEARCHSTORE_SEARCH_FAILED, 0x0837);
-packet(SMSG_SEARCHSTORE_OPEN,        0x083a);
-packet(SMSG_SEARCHSTORE_CLICK_ACK,   0x083d);
-
-packet(SMSG_ONLINE_LIST,             0x0b10);
-
-packet(SMSG_MANNER_MESSAGE,          0x014a);
-packet(SMSG_CHAT_SILENCE,            0x014b);
-
-packet(SMSG_CLASS_CHANGE,            0x01b0);
-
-packet(SMSG_INSTANCE_START,          0x02cb);
-packet(SMSG_INSTANCE_CREATE,         0x02cc);
-packet(SMSG_INSTANCE_INFO,           0x02cd);
-packet(SMSG_INSTANCE_DELETE,         0x02ce);
-
-packet(SMSG_BATTLE_CHAT_MESSAGE,     0x02dc);
-packet(SMSG_BATTLE_EMBLEM,           0x02dd);
-packet(SMSG_BATTLE_UPDATE_SCORE,     0x02de);
-packet(SMSG_BATTLE_UPDATE_COORDS,    0x02df);
-packet(SMSG_BATTLE_PLAY,             0x07fe);
-packet(SMSG_BATTLE_QUEUE_ACK,        0x08d8);
-packet(SMSG_BATTLE_BEGINS,           0x08df);
-packet(SMSG_BATTLE_NOTICE_DELETE,    0x08db);
-packet(SMSG_BATTLE_JOINED,           0x08d9);
-
-packet(SMSG_ROULETTE_OPEN_ACK,       0x0a1a);
-packet(SMSG_ROULETTE_INFO_ACK_TYPE,  0x0a1c);
-packet(SMSG_ROULETTE_RECV_ITEM_ACK,  0x0a22);
-packet(SMSG_ROULETTE_GENERATE_ACK_TYPE, 0x0a20);
-
-packet(SMSG_MARRIAGE_PROPOSAL_OUTDATED, 0x01e2);
-packet(SMSG_MARRIAGE_PROCESS_OUTDATED, 0x01e4);
-
-/**********************************
- *  Packets from client to server *
- **********************************/
-
-packet(CMSG_SERVER_VERSION_REQUEST,  0x7530);
-
-packet(CMSG_LOGIN_REGISTER,          0x0064);
-packet(CMSG_LOGIN_REGISTER2,         0x027c);
-packet(CMSG_NAME_REQUEST,            0x088a);
-
-packet(CMSG_CHAR_PASSWORD_CHANGE,    0x0061);
-packet(CMSG_CHAR_SERVER_CONNECT,     0x0065);
-packet(CMSG_CHAR_SELECT,             0x0066);
-packet(CMSG_CHAR_CREATE,             0x0970);
-packet(CMSG_CHAR_DELETE,             0x0068);
-packet(CMSG_CHAR_CREATE_PIN,         0x08ba);
-packet(CMSG_CHAR_CHECK_RENAME,       0x08fc);
-packet(CMSG_CHAR_RENAME,             0x028f);
-packet(CMSG_CHAR_CHANGE_SLOT,        0x08d4);
-
-packet(CMSG_MAP_SERVER_CONNECT,      0x089c);
-packet(CMSG_MAP_PING,                0x035f); /**< Send to server with tick */
-packet(CMSG_LOGIN_PING,              0x0200);
-packet(CMSG_CHAR_PING,               0x0187);
-packet(CMSG_MAP_LOADED,              0x007d);
-packet(CMSG_CLIENT_QUIT,             0x018A);
-
-packet(CMSG_CHAT_MESSAGE,            0x00f3);
-packet(CMSG_CHAT_WHISPER,            0x0096);
-packet(CMSG_CHAT_WHO,                0x00c1);
-packet(CMSG_CHAT_ROOM_JOIN,          0x00d9);
-packet(CMSG_CHAT_JOIN_CHANNEL,       0x0b07);
-packet(CMSG_CHAT_PART_CHANNEL,       0x0b09);
-packet(CMSG_BATTLE_CHAT_MESSAGE,     0x02db);
-
-packet(CMSG_BATTLE_REGISTER,         0x08d7);
-packet(CMSG_BATTLE_REVOKE,           0x08da);
-packet(CMSG_BATTLE_BEGIN_ACK,        0x08e0);
-packet(CMSG_BATTLE_CHECK_STATE,      0x090a);
-
-packet(CMSG_CREAYE_CHAT_ROOM,        0x00d5);
-packet(CMSG_LEAVE_CHAT_ROOM,         0x00e3);
-packet(CMSG_SET_CHAT_ROOM_OPTIONS,   0x00de);
-packet(CMSG_SET_CHAT_ROOM_OWNER,     0x00e0);
-packet(CMSG_KICK_FROM_CHAT_ROOM,     0x00e2);
-
-packet(CMSG_SKILL_LEVELUP_REQUEST,   0x0112);
-packet(CMSG_STAT_UPDATE_REQUEST,     0x00bb);
-packet(CMSG_SKILL_USE_BEING,         0x083c);
-packet(CMSG_SKILL_USE_POSITION,      0x0436);
-// Variant of 0x116 with 80 char string at end (unsure of use)
-packet(CMSG_SKILL_USE_POSITION_MORE, 0x0366);
-packet(CMSG_SKILL_USE_MAP,           0x011b);
-
-packet(CMSG_PLAYER_INVENTORY_USE,    0x0439);
-packet(CMSG_PLAYER_INVENTORY_DROP,   0x0362);
-packet(CMSG_PLAYER_EQUIP,            0x0998);
-packet(CMSG_PLAYER_UNEQUIP,          0x00ab);
-packet(CMSG_PLAYER_USE_CARD,         0x017a);
-packet(CMSG_PLAYER_INSERT_CARD,      0x017c);
-packet(CMSG_PLAYER_VIEW_EQUIPMENT,   0x02d6);
-packet(CMSG_PLAYER_SET_EQUIPMENT_VISIBLE, 0x02d8);
-packet(CMSG_PLAYER_FAVORITE_ITEM,    0x0907);
-
-packet(CMSG_ITEM_PICKUP,             0x07e4);
-packet(CMSG_PLAYER_CHANGE_DIR,       0x0202);
-packet(CMSG_PLAYER_CHANGE_DEST,      0x0437);
-packet(CMSG_PLAYER_CHANGE_ACT,       0x0871);
-packet(CMSG_PLAYER_RESTART,          0x00b2);
-packet(CMSG_PLAYER_EMOTE,            0x00bf);
-packet(CMSG_PLAYER_STOP_ATTACK,      0x0118);
-packet(CMSG_WHO_REQUEST,             0x00c1);
-
-packet(CMSG_NPC_TALK,                0x0090);
-packet(CMSG_NPC_NEXT_REQUEST,        0x00b9);
-packet(CMSG_NPC_CLOSE,               0x0146);
-packet(CMSG_NPC_LIST_CHOICE,         0x00b8);
-packet(CMSG_NPC_INT_RESPONSE,        0x0143);
-packet(CMSG_NPC_STR_RESPONSE,        0x01d5);
-packet(CMSG_NPC_BUY_SELL_REQUEST,    0x00c5);
-packet(CMSG_NPC_BUY_REQUEST,         0x00c8);
-packet(CMSG_NPC_SELL_REQUEST,        0x00c9);
-packet(CMSG_NPC_MARKET_CLOSE,        0x09d8);
-packet(CMSG_NPC_MARKET_BUY,          0x09d6);
-packet(CMSG_NPC_CASH_SHOP_BUY,       0x0288);
-packet(CMSG_NPC_CASH_SHOP_CLOSE,     0x084a);
-packet(CMSG_NPC_CASH_SHOP_OPEN,      0x0844);
-packet(CMSG_NPC_CASH_SHOP_REQUEST_TAB, 0x0846);
-packet(CMSG_NPC_CASH_SHOP_SCHEDULE,  0x08c9);
-
-packet(CMSG_TRADE_REQUEST,           0x00e4);
-packet(CMSG_TRADE_RESPONSE,          0x00e6);
-packet(CMSG_TRADE_ITEM_ADD_REQUEST,  0x00e8);
-packet(CMSG_TRADE_CANCEL_REQUEST,    0x00ed);
-packet(CMSG_TRADE_ADD_COMPLETE,      0x00eb);
-packet(CMSG_TRADE_OK,                0x00ef);
-
-packet(CMSG_PARTY_CREATE,            0x00f9);
-packet(CMSG_PARTY_CREATE2,           0x01e8);
-packet(CMSG_PARTY_INVITE,            0x00fc);
-packet(CMSG_PARTY_INVITE2,           0x095d);
-packet(CMSG_PARTY_INVITED,           0x00ff);
-packet(CMSG_PARTY_INVITED2,          0x02c7);
-packet(CMSG_PARTY_LEAVE,             0x0100);
-packet(CMSG_PARTY_SETTINGS,          0x0102);
-packet(CMSG_PARTY_KICK,              0x0103);
-packet(CMSG_PARTY_MESSAGE,           0x0108);
-packet(CMSG_PARTY_CHANGE_LEADER,     0x07da);
-packet(CMSG_PARTY_ALLOW_INVITES,     0x02c8);
-
-packet(CMSG_MOVE_TO_STORAGE,         0x07ec); /** Move item to storage */
-packet(CMSG_MOVE_FROM_STORAGE,       0x085b); /** Remove item from storage */
-packet(CMSG_CLOSE_STORAGE,           0x0193); /** Request storage close */
-
-packet(CMSG_MOVE_TO_CART,            0x0126);
-packet(CMSG_MOVE_FROM_CART,          0x0127);
-packet(CMSG_CHANGE_CART,             0x01af);
-packet(CMSG_MOVE_FROM_STORAGE_TO_CART, 0x0128);
-packet(CMSG_MOVE_FROM_CART_TO_STORAGE, 0x0129);
-
-packet(CMSG_ADMIN_ANNOUNCE,          0x0099);
-packet(CMSG_ADMIN_LOCAL_ANNOUNCE,    0x019C);
-packet(CMSG_ADMIN_HIDE,              0x019D);
-packet(CMSG_ADMIN_KICK,              0x00CC);
-packet(CMSG_ADMIN_KICK_ALL,          0x00ce);
-packet(CMSG_ADMIN_RESET_PLAYER,      0x0197);
-packet(CMSG_ADMIN_GOTO,              0x01bb);
-packet(CMSG_ADMIN_RECALL,            0x01bd);
-packet(CMSG_ADMIN_MUTE,              0x0149);
-packet(CMSG_ADMIN_MUTE_NAME,         0x0212);
-packet(CMSG_ADMIN_ID_TO_LOGIN,       0x01df);
-packet(CMSG_ADMIN_SET_TILE_TYPE,     0x0198);
-packet(CMSG_ADMIN_UNEQUIP_ALL,       0x07f5);
-packet(CMSG_ADMIN_REQUEST_STATS,     0x0213);
-
-packet(CMSG_GUILD_CHECK_MASTER,      0x014d);
-packet(CMSG_GUILD_REQUEST_INFO,      0x014f);
-packet(CMSG_GUILD_REQUEST_EMBLEM,    0x0151);
-packet(CMSG_GUILD_CHANGE_EMBLEM,     0x0153);
-packet(CMSG_GUILD_CHANGE_MEMBER_POS, 0x0155);
-packet(CMSG_GUILD_LEAVE,             0x0159);
-packet(CMSG_GUILD_EXPULSION,         0x015b);
-packet(CMSG_GUILD_BREAK,             0x015d);
-packet(CMSG_GUILD_CHANGE_POS_INFO,   0x0161);
-packet(CMSG_GUILD_CREATE,            0x0165);
-packet(CMSG_GUILD_INVITE,            0x0168);
-packet(CMSG_GUILD_INVITE_REPLY,      0x016b);
-packet(CMSG_GUILD_CHANGE_NOTICE,     0x016e);
-packet(CMSG_GUILD_ALLIANCE_REQUEST,  0x0170);
-packet(CMSG_GUILD_ALLIANCE_REPLY,    0x0172);
-packet(CMSG_GUILD_MESSAGE,           0x017e);
-packet(CMSG_GUILD_OPPOSITION,        0x0180);
-packet(CMSG_GUILD_ALLIANCE_DELETE,   0x0183);
-
-packet(CMSG_SOLVE_CHAR_NAME,         0x0368);
-packet(CMSG_IGNORE_ALL,              0x00d0);
-packet(CMSG_IGNORE_NICK,             0x00cf);
-packet(CMSG_REQUEST_IGNORE_LIST,     0x00d3);
-packet(CMSG_REQUEST_RANKS,           0x097c);
-packet(CMSG_SET_SHORTCUTS,           0x02ba);
-packet(CMSG_NPC_COMPLETE_PROGRESS_BAR, 0x02f1);
-packet(CMSG_NPC_PRODUCE_MIX,         0x018e);
-packet(CMSG_NPC_COOKING,             0x025b);
-packet(CMSG_NPC_REPAIR,              0x01fd);
-packet(CMSG_NPC_REFINE,              0x0222);
-packet(CMSG_NPC_IDENTIFY,            0x0178);
-packet(CMSG_NPC_SELECT_ARROW,        0x01ae);
-packet(CMSG_NPC_SELECT_AUTO_SPELL,   0x01ce);
-packet(CMSG_NPC_SHOP_CLOSE,          0x09d4);
-
-packet(CMSG_PLAYER_MAPMOVE,          0x0140);
-packet(CMSG_REMOVE_OPTION,           0x012a);
-packet(CMSG_PLAYER_SET_MEMO,         0x011d);
-
-packet(CMSG_PET_CATCH,               0x019f);
-packet(CMSG_PET_SEND_MESSAGE,        0x01a9);
-packet(CMSG_PET_SET_NAME,            0x01a5);
-packet(CMSG_PET_SELECT_EGG,          0x01a7);
-packet(CMSG_PET_MENU_ACTION,         0x01a1);
-packet(CMSG_PET_TALK,                0x0b0c);
-packet(CMSG_PET_EMOTE,               0x0b0d);
-packet(CMSG_PET_MOVE_TO,             0x0b11);
-packet(CMSG_PET_DIRECTION,           0x0b12);
-
-packet(CMSG_MERCENARY_ACTION,        0x029f);
-packet(CMSG_HOMUNCULUS_SET_NAME,     0x0231);
-packet(CMSG_HOMUNCULUS_MENU,         0x0361);
-packet(CMSG_HOMMERC_MOVE_TO_MASTER,  0x0234);
-packet(CMSG_HOMMERC_MOVE_TO,         0x0232);
-packet(CMSG_HOMMERC_ATTACK,          0x0233);
-packet(CMSG_HOMMERC_TALK,            0x0b13);
-packet(CMSG_HOMMERC_EMOTE,           0x0b14);
-packet(CMSG_HOMMERC_DIRECTION,       0x0b15);
-
-packet(CMSG_DORI_DORI,               0x01e7);
-packet(CMSG_EXPLOSION_SPIRITS,       0x01ed);
-packet(SMSG_SPIRIT_BALLS,            0x01d0);
-packet(SMSG_SPIRIT_BALL_SINGLE,      0x01e1);
-packet(SMSG_BLADE_STOP,              0x01d1);
-packet(SMSG_COMBO_DELAY,             0x01d2);
-packet(SMSG_WEDDING_EFFECT,          0x01ea);
-packet(CMSG_PVP_INFO,                0x020f);
-packet(CMSG_PLAYER_AUTO_REVIVE,      0x0292);
-packet(CMSG_QUEST_ACTIVATE,          0x02b6);
-
-packet(CMSG_MAIL_REFRESH_INBOX,      0x023f);
-packet(CMSG_MAIL_READ_MESSAGE,       0x0241);
-packet(CMSG_MAIL_GET_ATTACH,         0x0244);
-packet(CMSG_MAIL_DELETE_MESSAGE,     0x0243);
-packet(CMSG_MAIL_RETURN_MESSAGE,     0x0273);
-packet(CMSG_MAIL_SET_ATTACH,         0x0247);
-packet(CMSG_MAIL_RESET_ATTACH,       0x0246);
-packet(CMSG_MAIL_SEND,               0x0248);
-
-packet(CMSG_FAMILY_ASK_FOR_CHILD,    0x01f9);
-packet(CMSG_FAMILY_ASK_FOR_CHILD_REPLY, 0x01f7);
-
-packet(CMSG_BANK_DEPOSIT,            0x09a7);
-packet(CMSG_BANK_WITHDRAW,           0x09a9);
-packet(CMSG_BANK_CHECK,              0x09ab);
-packet(CMSG_BANK_OPEN,               0x09b6);
-packet(CMSG_BANK_CLOSE,              0x09b8);
-
-packet(CMSG_FRIENDS_ADD_PLAYER,      0x091a);
-packet(CMSG_FRIENDS_REQUEST_ACK,     0x0208);
-packet(CMSG_FRIENDS_DELETE_PLAYER,   0x0203);
-
-packet(CMSG_AUCTION_CANCEL_REG,      0x024b);
-packet(CMSG_AUCTION_SET_ITEM,        0x024c);
-packet(CMSG_AUCTION_REGISTER,        0x024d);
-packet(CMSG_AUCTION_CANCEL,          0x024e);
-packet(CMSG_AUCTION_CLOSE,           0x025d);
-packet(CMSG_AUCTION_BID,             0x024f);
-packet(CMSG_AUCTION_SEARCH,          0x0251);
-packet(CMSG_AUCTION_BUY_SELL,        0x025c);
-
-packet(CMSG_VENDING_CLOSE,           0x012e);
-packet(CMSG_VENDING_LIST_REQ,        0x0130);
-packet(CMSG_VENDING_BUY,             0x0134);
-packet(CMSG_VENDING_BUY2,            0x0801);
-packet(CMSG_VENDING_CREATE_SHOP,     0x01b2);
-
-packet(CMSG_BUYINGSTORE_CREATE,      0x0815);
-packet(CMSG_BUYINGSTORE_CLOSE,       0x0817);
-packet(CMSG_BUYINGSTORE_OPEN,        0x0360);
-packet(CMSG_BUYINGSTORE_SELL,        0x0811);
-
-packet(CMSG_SEARCHSTORE_SEARCH,      0x0819);
-packet(CMSG_SEARCHSTORE_NEXT_PAGE,   0x0940);
-packet(CMSG_SEARCHSTORE_CLOSE,       0x083b);
-packet(CMSG_SEARCHSTORE_CLICK,       0x0835);
-
-packet(CMSG_SET_STATUS,              0x0b0e);
-
-packet(CMSG_ONLINE_LIST,             0x0b0f);
+#include "net/eathena/packets.inc"
 
 #undef packet
 
diff --git a/src/net/tmwa/packets.inc b/src/net/tmwa/packets.inc
new file mode 100644
index 000000000..b6402ed2b
--- /dev/null
+++ b/src/net/tmwa/packets.inc
@@ -0,0 +1,296 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+packet(SMSG_SERVER_VERSION_RESPONSE, 0x7531);
+
+packet(CMSG_LOGIN_REGISTER,          0x0064);
+
+packet(SMSG_SERVER_PING,             0x007f); /**< Contains server tick */
+packet(SMSG_CONNECTION_PROBLEM,      0x0081);
+
+packet(SMSG_UPDATE_HOST,             0x0063); /**< Custom update host packet */
+packet(SMSG_LOGIN_DATA,              0x0069);
+packet(SMSG_LOGIN_ERROR,             0x006a);
+
+packet(SMSG_CHAR_LOGIN,              0x006b);
+packet(SMSG_CHAR_LOGIN_ERROR,        0x006c);
+packet(SMSG_CHAR_CREATE_SUCCEEDED,   0x006d);
+
+packet(SMSG_CHAR_CREATE_FAILED,      0x006e);
+packet(SMSG_CHAR_DELETE_SUCCEEDED,   0x006f);
+packet(SMSG_CHAR_DELETE_FAILED,      0x0070);
+packet(SMSG_CHAR_MAP_INFO,           0x0071);
+
+// Custom packet reply to password change request
+packet(SMSG_CHAR_PASSWORD_RESPONSE,  0x0062);
+
+packet(SMSG_CHAR_SWITCH_RESPONSE,    0x00b3);
+packet(SMSG_CHANGE_MAP_SERVER,       0x0092);
+
+packet(SMSG_MAP_LOGIN_SUCCESS,       0x0073); /**< Contains starting location */
+packet(SMSG_MAP_QUIT_RESPONSE,       0x018b);
+packet(SMSG_PLAYER_UPDATE_1,         0x01d8);
+packet(SMSG_PLAYER_UPDATE_2,         0x01d9);
+packet(SMSG_PLAYER_MOVE,             0x01da); /**< A nearby player moves */
+packet(SMSG_PLAYER_STOP,             0x0088); /**< Stop walking, set position */
+packet(SMSG_PLAYER_MOVE_TO_ATTACK,   0x0139);
+packet(SMSG_PLAYER_STAT_UPDATE_1,    0x00b0);
+packet(SMSG_PLAYER_STAT_UPDATE_2,    0x00b1);
+packet(SMSG_PLAYER_STAT_UPDATE_3,    0x0141);
+packet(SMSG_PLAYER_STAT_UPDATE_4,    0x00bc);
+packet(SMSG_PLAYER_STAT_UPDATE_5,    0x00bd);
+packet(SMSG_PLAYER_STAT_UPDATE_6,    0x00be);
+packet(SMSG_WHO_ANSWER,              0x00c2);
+packet(SMSG_PLAYER_WARP,             0x0091);
+packet(SMSG_PLAYER_INVENTORY,        0x01ee);
+packet(SMSG_PLAYER_INVENTORY_ADD,    0x00a0);
+packet(SMSG_PLAYER_INVENTORY_REMOVE, 0x00af);
+packet(SMSG_PLAYER_INVENTORY_USE,    0x01c8);
+packet(SMSG_PLAYER_EQUIPMENT,        0x00a4);
+packet(SMSG_PLAYER_EQUIP,            0x00aa);
+packet(SMSG_PLAYER_UNEQUIP,          0x00ac);
+packet(SMSG_PLAYER_ATTACK_RANGE,     0x013a);
+packet(SMSG_PLAYER_ARROW_EQUIP,      0x013c);
+packet(SMSG_PLAYER_ARROW_MESSAGE,    0x013b);
+packet(SMSG_PLAYER_SKILLS,           0x010f);
+packet(SMSG_PLAYER_SKILL_UP,         0x010e);
+packet(SMSG_SKILL_FAILED,            0x0110);
+packet(SMSG_SKILL_DAMAGE,            0x01de);
+packet(SMSG_ITEM_USE_RESPONSE,       0x00a8);
+packet(SMSG_ITEM_VISIBLE,            0x009d); /**< An item is on the floor */
+packet(SMSG_ITEM_DROPPED,            0x009e); /**< An item is dropped */
+packet(SMSG_ITEM_REMOVE,             0x00a1); /**< An item disappers */
+packet(SMSG_BEING_VISIBLE,           0x0078);
+packet(SMSG_BEING_MOVE,              0x007b); /**< A nearby monster moves */
+packet(SMSG_BEING_SPAWN,             0x007c); /**< A being spawns nearby */
+packet(SMSG_BEING_MOVE2,             0x0086); /**< New eAthena being moves */
+packet(SMSG_BEING_REMOVE,            0x0080);
+packet(SMSG_BEING_CHANGE_LOOKS,      0x00c3);
+// Same as 0x00c3, but 16 bit ID
+packet(SMSG_BEING_CHANGE_LOOKS2,     0x01d7);
+packet(SMSG_BEING_SELFEFFECT,        0x019b);
+packet(SMSG_BEING_EMOTION,           0x00c0);
+packet(SMSG_BEING_ACTION,            0x008a); /**< Attack, sit, stand up, ... */
+packet(SMSG_BEING_CHAT,              0x008d); /**< A being talks */
+packet(CMSG_NAME_REQUEST,            0x0094);
+packet(SMSG_BEING_NAME_RESPONSE,     0x0095); /**< Has to be requested */
+packet(SMSG_BEING_CHANGE_DIRECTION,  0x009c);
+packet(SMSG_BEING_RESURRECT,         0x0148);
+
+packet(SMSG_PLAYER_STATUS_CHANGE,    0x0119);
+packet(SMSG_PLAYER_GUILD_PARTY_INFO, 0x0195);
+packet(SMSG_BEING_STATUS_CHANGE,     0x0196);
+
+packet(SMSG_NPC_MESSAGE,             0x00b4);
+packet(SMSG_NPC_NEXT,                0x00b5);
+packet(SMSG_NPC_CLOSE,               0x00b6);
+packet(SMSG_NPC_CHOICE,              0x00b7); /**< Display a choice */
+packet(SMSG_NPC_BUY_SELL_CHOICE,     0x00c4);
+packet(SMSG_NPC_BUY,                 0x00c6);
+packet(SMSG_NPC_SELL,                0x00c7);
+packet(SMSG_NPC_BUY_RESPONSE,        0x00ca);
+packet(SMSG_NPC_SELL_RESPONSE,       0x00cb);
+packet(SMSG_NPC_INT_INPUT,           0x0142); /**< Integer input */
+packet(SMSG_NPC_STR_INPUT,           0x01d4); /**< String input */
+packet(SMSG_PLAYER_CHAT,             0x008e); /**< Player talks */
+packet(SMSG_WHISPER,                 0x0097); /**< Whisper Recieved */
+packet(SMSG_WHISPER_RESPONSE,        0x0098);
+packet(SMSG_GM_CHAT,                 0x009a); /**< GM announce */
+packet(SMSG_WALK_RESPONSE,           0x0087);
+
+// Receiving a request to trade
+packet(SMSG_TRADE_REQUEST,           0x00e5);
+packet(SMSG_TRADE_RESPONSE,          0x00e7);
+packet(SMSG_TRADE_ITEM_ADD,          0x00e9);
+packet(SMSG_TRADE_ITEM_ADD_RESPONSE, 0x01b1); /**< Not standard eAthena! */
+packet(SMSG_TRADE_OK,                0x00ec);
+packet(SMSG_TRADE_CANCEL,            0x00ee);
+packet(SMSG_TRADE_COMPLETE,          0x00f0);
+
+packet(SMSG_PARTY_CREATE,            0x00fa);
+packet(SMSG_PARTY_INFO,              0x00fb);
+packet(SMSG_PARTY_INVITE_RESPONSE,   0x00fd);
+packet(SMSG_PARTY_INVITED,           0x00fe);
+packet(SMSG_PARTY_SETTINGS,          0x0101);
+packet(SMSG_PARTY_MOVE,              0x0104);
+packet(SMSG_PARTY_LEAVE,             0x0105);
+packet(SMSG_PARTY_UPDATE_HP,         0x0106);
+packet(SMSG_PARTY_UPDATE_COORDS,     0x0107);
+packet(SMSG_PARTY_MESSAGE,           0x0109);
+
+packet(SMSG_PLAYER_STORAGE_ITEMS,    0x01f0); /**< Item list for storage */
+packet(SMSG_PLAYER_STORAGE_EQUIP,    0x00a6); /**< Equipment list for storage */
+packet(SMSG_PLAYER_STORAGE_STATUS,   0x00f2); /**< Slots used and total slots */
+packet(SMSG_PLAYER_STORAGE_ADD,      0x00f4); /**< Add item/equip to storage */
+// Remove item/equip from storage
+packet(SMSG_PLAYER_STORAGE_REMOVE,   0x00f6);
+packet(SMSG_PLAYER_STORAGE_CLOSE,    0x00f8); /**< Storage access closed */
+
+packet(SMSG_ADMIN_KICK_ACK,          0x00cd);
+
+packet(SMSG_GUILD_CREATE_RESPONSE,   0x0167);
+packet(SMSG_GUILD_POSITION_INFO,     0x016c);
+packet(SMSG_GUILD_MEMBER_LOGIN,      0x016d);
+packet(SMSG_GUILD_MASTER_OR_MEMBER,  0x014e);
+packet(SMSG_GUILD_BASIC_INFO,        0x01b6);
+packet(SMSG_GUILD_ALIANCE_INFO,      0x014c);
+packet(SMSG_GUILD_MEMBER_LIST,       0x0154);
+packet(SMSG_GUILD_POS_NAME_LIST,     0x0166);
+packet(SMSG_GUILD_POS_INFO_LIST,     0x0160);
+packet(SMSG_GUILD_POSITION_CHANGED,  0x0174);
+packet(SMSG_GUILD_MEMBER_POS_CHANGE, 0x0156);
+packet(SMSG_GUILD_EMBLEM_DATA,       0x0152);
+packet(SMSG_GUILD_SKILL_INFO,        0x0162);
+packet(SMSG_GUILD_NOTICE,            0x016f);
+packet(SMSG_GUILD_INVITE,            0x016a);
+packet(SMSG_GUILD_INVITE_ACK,        0x0169);
+packet(SMSG_GUILD_LEAVE,             0x015a);
+packet(SMSG_GUILD_EXPULSION,         0x015c);
+packet(SMSG_GUILD_EXPULSION_LIST,    0x0163);
+packet(SMSG_GUILD_MESSAGE,           0x017f);
+packet(SMSG_GUILD_SKILL_UP,          0x010e);
+packet(SMSG_GUILD_REQ_ALLIANCE,      0x0171);
+packet(SMSG_GUILD_REQ_ALLIANCE_ACK,  0x0173);
+packet(SMSG_GUILD_DEL_ALLIANCE,      0x0184);
+packet(SMSG_GUILD_OPPOSITION_ACK,    0x0181);
+packet(SMSG_GUILD_BROKEN,            0x015e);
+
+packet(SMSG_MVP_EFFECT,              0x010c);
+
+/**********************************
+ *  Packets from client to server *
+ **********************************/
+packet(CMSG_SERVER_VERSION_REQUEST,  0x7530);
+
+// Custom change password packet
+packet(CMSG_CHAR_PASSWORD_CHANGE,    0x0061);
+packet(CMSG_CHAR_SERVER_CONNECT,     0x0065);
+packet(CMSG_CHAR_SELECT,             0x0066);
+packet(CMSG_CHAR_CREATE,             0x0067);
+packet(CMSG_CHAR_DELETE,             0x0068);
+
+packet(CMSG_MAP_SERVER_CONNECT,      0x0072);
+packet(CMSG_MAP_PING,                0x007e); /**< Send to server with tick */
+packet(CMSG_MAP_LOADED,              0x007d);
+packet(CMSG_CLIENT_QUIT,             0x018A);
+
+packet(CMSG_CHAT_MESSAGE,            0x008c);
+packet(CMSG_CHAT_WHISPER,            0x0096);
+packet(CMSG_CHAT_WHO,                0x00c1);
+
+packet(CMSG_SKILL_LEVELUP_REQUEST,   0x0112);
+packet(CMSG_STAT_UPDATE_REQUEST,     0x00bb);
+packet(CMSG_SKILL_USE_BEING,         0x0113);
+packet(CMSG_SKILL_USE_POSITION,      0x0116);
+// Variant of 0x116 with 80 char string at end (unsure of use)
+packet(CMSG_SKILL_USE_POSITION_MORE, 0x0190);
+packet(CMSG_SKILL_USE_MAP,           0x011b);
+
+packet(CMSG_PLAYER_INVENTORY_USE,    0x00a7);
+packet(CMSG_PLAYER_INVENTORY_DROP,   0x00a2);
+packet(CMSG_PLAYER_EQUIP,            0x00a9);
+packet(CMSG_PLAYER_UNEQUIP,          0x00ab);
+
+packet(CMSG_ITEM_PICKUP,             0x009f);
+packet(CMSG_PLAYER_CHANGE_DIR,       0x009b);
+packet(CMSG_PLAYER_CHANGE_DEST,      0x0085);
+packet(CMSG_PLAYER_CHANGE_ACT,       0x0089);
+packet(CMSG_PLAYER_RESTART,          0x00b2);
+packet(CMSG_PLAYER_EMOTE,            0x00bf);
+packet(CMSG_PLAYER_STOP_ATTACK,      0x0118);
+packet(CMSG_WHO_REQUEST,             0x00c1);
+
+packet(CMSG_NPC_TALK,                0x0090);
+packet(CMSG_NPC_NEXT_REQUEST,        0x00b9);
+packet(CMSG_NPC_CLOSE,               0x0146);
+packet(CMSG_NPC_LIST_CHOICE,         0x00b8);
+packet(CMSG_NPC_INT_RESPONSE,        0x0143);
+packet(CMSG_NPC_STR_RESPONSE,        0x01d5);
+packet(CMSG_NPC_BUY_SELL_REQUEST,    0x00c5);
+packet(CMSG_NPC_BUY_REQUEST,         0x00c8);
+packet(CMSG_NPC_SELL_REQUEST,        0x00c9);
+
+packet(CMSG_TRADE_REQUEST,           0x00e4);
+packet(CMSG_TRADE_RESPONSE,          0x00e6);
+packet(CMSG_TRADE_ITEM_ADD_REQUEST,  0x00e8);
+packet(CMSG_TRADE_CANCEL_REQUEST,    0x00ed);
+packet(CMSG_TRADE_ADD_COMPLETE,      0x00eb);
+packet(CMSG_TRADE_OK,                0x00ef);
+
+packet(CMSG_PARTY_CREATE,            0x00f9);
+packet(CMSG_PARTY_INVITE,            0x00fc);
+packet(CMSG_PARTY_INVITED,           0x00ff);
+packet(CMSG_PARTY_LEAVE,             0x0100);
+packet(CMSG_PARTY_SETTINGS,          0x0102);
+packet(CMSG_PARTY_KICK,              0x0103);
+packet(CMSG_PARTY_MESSAGE,           0x0108);
+
+packet(CMSG_MOVE_TO_STORAGE,         0x00f3); /** Move item to storage */
+packet(CMSG_MOVE_FROM_STORAGE,       0x00f5); /** Remove item from storage */
+packet(CMSG_CLOSE_STORAGE,           0x00f7); /** Request storage close */
+
+packet(CMSG_ADMIN_ANNOUNCE,          0x0099);
+packet(CMSG_ADMIN_LOCAL_ANNOUNCE,    0x019C);
+packet(CMSG_ADMIN_HIDE,              0x019D);
+packet(CMSG_ADMIN_KICK,              0x00CC);
+packet(CMSG_ADMIN_MUTE,              0x0149);
+
+packet(CMSG_GUILD_CHECK_MASTER,      0x014d);
+packet(CMSG_GUILD_REQUEST_INFO,      0x014f);
+packet(CMSG_GUILD_REQUEST_EMBLEM,    0x0151);
+packet(CMSG_GUILD_CHANGE_EMBLEM,     0x0153);
+packet(CMSG_GUILD_CHANGE_MEMBER_POS, 0x0155);
+packet(CMSG_GUILD_LEAVE,             0x0159);
+packet(CMSG_GUILD_EXPULSION,         0x015b);
+packet(CMSG_GUILD_BREAK,             0x015d);
+packet(CMSG_GUILD_CHANGE_POS_INFO,   0x0161);
+packet(CMSG_GUILD_CREATE,            0x0165);
+packet(CMSG_GUILD_INVITE,            0x0168);
+packet(CMSG_GUILD_INVITE_REPLY,      0x016b);
+packet(CMSG_GUILD_CHANGE_NOTICE,     0x016e);
+packet(CMSG_GUILD_ALLIANCE_REQUEST,  0x0170);
+packet(CMSG_GUILD_ALLIANCE_REPLY,    0x0172);
+packet(CMSG_GUILD_MESSAGE,           0x017e);
+packet(CMSG_GUILD_OPPOSITION,        0x0180);
+packet(CMSG_GUILD_ALLIANCE_DELETE,   0x0183);
+
+packet(CMSG_SOLVE_CHAR_NAME,         0x0193);
+packet(CMSG_IGNORE_NICK,             0x00cf);
+packet(SMSG_SOLVE_CHAR_NAME,         0x0194);
+
+packet(CMSG_CLIENT_DISCONNECT,       0x7532);
+packet(SMSG_SKILL_CASTING,           0x013e);
+packet(SMSG_SKILL_CAST_CANCEL,       0x01b9);
+packet(SMSG_SKILL_NO_DAMAGE,         0x011a);
+
+packet(SMSG_BEING_IP_RESPONSE,       0x020c);
+packet(SMSG_PVP_MAP_MODE,            0x0199);
+packet(SMSG_PVP_SET,                 0x019a);
+packet(CMSG_IGNORE_ALL,              0x00d0);
+packet(SMSG_IGNORE_ALL_RESPONSE,     0x00d2);
+packet(SMSG_NPC_COMMAND,             0x0212);
+packet(SMSG_QUEST_SET_VAR,           0x0214);
+packet(SMSG_QUEST_PLAYER_VARS,       0x0215);
+packet(SMSG_BEING_MOVE3,             0x0225);
+packet(SMSG_MAP_MUSIC,               0x0227);
+packet(SMSG_NPC_CHANGETITLE,         0x0228);
+packet(SMSG_SCRIPT_MESSAGE,          0x0229);
diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h
index d48e3ba5e..fc53778b1 100644
--- a/src/net/tmwa/protocol.h
+++ b/src/net/tmwa/protocol.h
@@ -25,284 +25,7 @@
 
 #include "net/packetdefine.h"
 
-/*********************************
- * Packets from server to client *
- *********************************/
-
-packet(SMSG_SERVER_VERSION_RESPONSE, 0x7531);
-
-packet(CMSG_LOGIN_REGISTER,          0x0064);
-
-packet(SMSG_SERVER_PING,             0x007f); /**< Contains server tick */
-packet(SMSG_CONNECTION_PROBLEM,      0x0081);
-
-packet(SMSG_UPDATE_HOST,             0x0063); /**< Custom update host packet */
-packet(SMSG_LOGIN_DATA,              0x0069);
-packet(SMSG_LOGIN_ERROR,             0x006a);
-
-packet(SMSG_CHAR_LOGIN,              0x006b);
-packet(SMSG_CHAR_LOGIN_ERROR,        0x006c);
-packet(SMSG_CHAR_CREATE_SUCCEEDED,   0x006d);
-
-packet(SMSG_CHAR_CREATE_FAILED,      0x006e);
-packet(SMSG_CHAR_DELETE_SUCCEEDED,   0x006f);
-packet(SMSG_CHAR_DELETE_FAILED,      0x0070);
-packet(SMSG_CHAR_MAP_INFO,           0x0071);
-
-// Custom packet reply to password change request
-packet(SMSG_CHAR_PASSWORD_RESPONSE,  0x0062);
-
-packet(SMSG_CHAR_SWITCH_RESPONSE,    0x00b3);
-packet(SMSG_CHANGE_MAP_SERVER,       0x0092);
-
-packet(SMSG_MAP_LOGIN_SUCCESS,       0x0073); /**< Contains starting location */
-packet(SMSG_MAP_QUIT_RESPONSE,       0x018b);
-packet(SMSG_PLAYER_UPDATE_1,         0x01d8);
-packet(SMSG_PLAYER_UPDATE_2,         0x01d9);
-packet(SMSG_PLAYER_MOVE,             0x01da); /**< A nearby player moves */
-packet(SMSG_PLAYER_STOP,             0x0088); /**< Stop walking, set position */
-packet(SMSG_PLAYER_MOVE_TO_ATTACK,   0x0139);
-packet(SMSG_PLAYER_STAT_UPDATE_1,    0x00b0);
-packet(SMSG_PLAYER_STAT_UPDATE_2,    0x00b1);
-packet(SMSG_PLAYER_STAT_UPDATE_3,    0x0141);
-packet(SMSG_PLAYER_STAT_UPDATE_4,    0x00bc);
-packet(SMSG_PLAYER_STAT_UPDATE_5,    0x00bd);
-packet(SMSG_PLAYER_STAT_UPDATE_6,    0x00be);
-packet(SMSG_WHO_ANSWER,              0x00c2);
-packet(SMSG_PLAYER_WARP,             0x0091);
-packet(SMSG_PLAYER_INVENTORY,        0x01ee);
-packet(SMSG_PLAYER_INVENTORY_ADD,    0x00a0);
-packet(SMSG_PLAYER_INVENTORY_REMOVE, 0x00af);
-packet(SMSG_PLAYER_INVENTORY_USE,    0x01c8);
-packet(SMSG_PLAYER_EQUIPMENT,        0x00a4);
-packet(SMSG_PLAYER_EQUIP,            0x00aa);
-packet(SMSG_PLAYER_UNEQUIP,          0x00ac);
-packet(SMSG_PLAYER_ATTACK_RANGE,     0x013a);
-packet(SMSG_PLAYER_ARROW_EQUIP,      0x013c);
-packet(SMSG_PLAYER_ARROW_MESSAGE,    0x013b);
-packet(SMSG_PLAYER_SKILLS,           0x010f);
-packet(SMSG_PLAYER_SKILL_UP,         0x010e);
-packet(SMSG_SKILL_FAILED,            0x0110);
-packet(SMSG_SKILL_DAMAGE,            0x01de);
-packet(SMSG_ITEM_USE_RESPONSE,       0x00a8);
-packet(SMSG_ITEM_VISIBLE,            0x009d); /**< An item is on the floor */
-packet(SMSG_ITEM_DROPPED,            0x009e); /**< An item is dropped */
-packet(SMSG_ITEM_REMOVE,             0x00a1); /**< An item disappers */
-packet(SMSG_BEING_VISIBLE,           0x0078);
-packet(SMSG_BEING_MOVE,              0x007b); /**< A nearby monster moves */
-packet(SMSG_BEING_SPAWN,             0x007c); /**< A being spawns nearby */
-packet(SMSG_BEING_MOVE2,             0x0086); /**< New eAthena being moves */
-packet(SMSG_BEING_REMOVE,            0x0080);
-packet(SMSG_BEING_CHANGE_LOOKS,      0x00c3);
-// Same as 0x00c3, but 16 bit ID
-packet(SMSG_BEING_CHANGE_LOOKS2,     0x01d7);
-packet(SMSG_BEING_SELFEFFECT,        0x019b);
-packet(SMSG_BEING_EMOTION,           0x00c0);
-packet(SMSG_BEING_ACTION,            0x008a); /**< Attack, sit, stand up, ... */
-packet(SMSG_BEING_CHAT,              0x008d); /**< A being talks */
-packet(CMSG_NAME_REQUEST,            0x0094);
-packet(SMSG_BEING_NAME_RESPONSE,     0x0095); /**< Has to be requested */
-packet(SMSG_BEING_CHANGE_DIRECTION,  0x009c);
-packet(SMSG_BEING_RESURRECT,         0x0148);
-
-packet(SMSG_PLAYER_STATUS_CHANGE,    0x0119);
-packet(SMSG_PLAYER_GUILD_PARTY_INFO, 0x0195);
-packet(SMSG_BEING_STATUS_CHANGE,     0x0196);
-
-packet(SMSG_NPC_MESSAGE,             0x00b4);
-packet(SMSG_NPC_NEXT,                0x00b5);
-packet(SMSG_NPC_CLOSE,               0x00b6);
-packet(SMSG_NPC_CHOICE,              0x00b7); /**< Display a choice */
-packet(SMSG_NPC_BUY_SELL_CHOICE,     0x00c4);
-packet(SMSG_NPC_BUY,                 0x00c6);
-packet(SMSG_NPC_SELL,                0x00c7);
-packet(SMSG_NPC_BUY_RESPONSE,        0x00ca);
-packet(SMSG_NPC_SELL_RESPONSE,       0x00cb);
-packet(SMSG_NPC_INT_INPUT,           0x0142); /**< Integer input */
-packet(SMSG_NPC_STR_INPUT,           0x01d4); /**< String input */
-packet(SMSG_PLAYER_CHAT,             0x008e); /**< Player talks */
-packet(SMSG_WHISPER,                 0x0097); /**< Whisper Recieved */
-packet(SMSG_WHISPER_RESPONSE,        0x0098);
-packet(SMSG_GM_CHAT,                 0x009a); /**< GM announce */
-packet(SMSG_WALK_RESPONSE,           0x0087);
-
-// Receiving a request to trade
-packet(SMSG_TRADE_REQUEST,           0x00e5);
-packet(SMSG_TRADE_RESPONSE,          0x00e7);
-packet(SMSG_TRADE_ITEM_ADD,          0x00e9);
-packet(SMSG_TRADE_ITEM_ADD_RESPONSE, 0x01b1); /**< Not standard eAthena! */
-packet(SMSG_TRADE_OK,                0x00ec);
-packet(SMSG_TRADE_CANCEL,            0x00ee);
-packet(SMSG_TRADE_COMPLETE,          0x00f0);
-
-packet(SMSG_PARTY_CREATE,            0x00fa);
-packet(SMSG_PARTY_INFO,              0x00fb);
-packet(SMSG_PARTY_INVITE_RESPONSE,   0x00fd);
-packet(SMSG_PARTY_INVITED,           0x00fe);
-packet(SMSG_PARTY_SETTINGS,          0x0101);
-packet(SMSG_PARTY_MOVE,              0x0104);
-packet(SMSG_PARTY_LEAVE,             0x0105);
-packet(SMSG_PARTY_UPDATE_HP,         0x0106);
-packet(SMSG_PARTY_UPDATE_COORDS,     0x0107);
-packet(SMSG_PARTY_MESSAGE,           0x0109);
-
-packet(SMSG_PLAYER_STORAGE_ITEMS,    0x01f0); /**< Item list for storage */
-packet(SMSG_PLAYER_STORAGE_EQUIP,    0x00a6); /**< Equipment list for storage */
-packet(SMSG_PLAYER_STORAGE_STATUS,   0x00f2); /**< Slots used and total slots */
-packet(SMSG_PLAYER_STORAGE_ADD,      0x00f4); /**< Add item/equip to storage */
-// Remove item/equip from storage
-packet(SMSG_PLAYER_STORAGE_REMOVE,   0x00f6);
-packet(SMSG_PLAYER_STORAGE_CLOSE,    0x00f8); /**< Storage access closed */
-
-packet(SMSG_ADMIN_KICK_ACK,          0x00cd);
-
-packet(SMSG_GUILD_CREATE_RESPONSE,   0x0167);
-packet(SMSG_GUILD_POSITION_INFO,     0x016c);
-packet(SMSG_GUILD_MEMBER_LOGIN,      0x016d);
-packet(SMSG_GUILD_MASTER_OR_MEMBER,  0x014e);
-packet(SMSG_GUILD_BASIC_INFO,        0x01b6);
-packet(SMSG_GUILD_ALIANCE_INFO,      0x014c);
-packet(SMSG_GUILD_MEMBER_LIST,       0x0154);
-packet(SMSG_GUILD_POS_NAME_LIST,     0x0166);
-packet(SMSG_GUILD_POS_INFO_LIST,     0x0160);
-packet(SMSG_GUILD_POSITION_CHANGED,  0x0174);
-packet(SMSG_GUILD_MEMBER_POS_CHANGE, 0x0156);
-packet(SMSG_GUILD_EMBLEM_DATA,       0x0152);
-packet(SMSG_GUILD_SKILL_INFO,        0x0162);
-packet(SMSG_GUILD_NOTICE,            0x016f);
-packet(SMSG_GUILD_INVITE,            0x016a);
-packet(SMSG_GUILD_INVITE_ACK,        0x0169);
-packet(SMSG_GUILD_LEAVE,             0x015a);
-packet(SMSG_GUILD_EXPULSION,         0x015c);
-packet(SMSG_GUILD_EXPULSION_LIST,    0x0163);
-packet(SMSG_GUILD_MESSAGE,           0x017f);
-packet(SMSG_GUILD_SKILL_UP,          0x010e);
-packet(SMSG_GUILD_REQ_ALLIANCE,      0x0171);
-packet(SMSG_GUILD_REQ_ALLIANCE_ACK,  0x0173);
-packet(SMSG_GUILD_DEL_ALLIANCE,      0x0184);
-packet(SMSG_GUILD_OPPOSITION_ACK,    0x0181);
-packet(SMSG_GUILD_BROKEN,            0x015e);
-
-packet(SMSG_MVP_EFFECT,              0x010c);
-
-/**********************************
- *  Packets from client to server *
- **********************************/
-packet(CMSG_SERVER_VERSION_REQUEST,  0x7530);
-
-// Custom change password packet
-packet(CMSG_CHAR_PASSWORD_CHANGE,    0x0061);
-packet(CMSG_CHAR_SERVER_CONNECT,     0x0065);
-packet(CMSG_CHAR_SELECT,             0x0066);
-packet(CMSG_CHAR_CREATE,             0x0067);
-packet(CMSG_CHAR_DELETE,             0x0068);
-
-packet(CMSG_MAP_SERVER_CONNECT,      0x0072);
-packet(CMSG_MAP_PING,                0x007e); /**< Send to server with tick */
-packet(CMSG_MAP_LOADED,              0x007d);
-packet(CMSG_CLIENT_QUIT,             0x018A);
-
-packet(CMSG_CHAT_MESSAGE,            0x008c);
-packet(CMSG_CHAT_WHISPER,            0x0096);
-packet(CMSG_CHAT_WHO,                0x00c1);
-
-packet(CMSG_SKILL_LEVELUP_REQUEST,   0x0112);
-packet(CMSG_STAT_UPDATE_REQUEST,     0x00bb);
-packet(CMSG_SKILL_USE_BEING,         0x0113);
-packet(CMSG_SKILL_USE_POSITION,      0x0116);
-// Variant of 0x116 with 80 char string at end (unsure of use)
-packet(CMSG_SKILL_USE_POSITION_MORE, 0x0190);
-packet(CMSG_SKILL_USE_MAP,           0x011b);
-
-packet(CMSG_PLAYER_INVENTORY_USE,    0x00a7);
-packet(CMSG_PLAYER_INVENTORY_DROP,   0x00a2);
-packet(CMSG_PLAYER_EQUIP,            0x00a9);
-packet(CMSG_PLAYER_UNEQUIP,          0x00ab);
-
-packet(CMSG_ITEM_PICKUP,             0x009f);
-packet(CMSG_PLAYER_CHANGE_DIR,       0x009b);
-packet(CMSG_PLAYER_CHANGE_DEST,      0x0085);
-packet(CMSG_PLAYER_CHANGE_ACT,       0x0089);
-packet(CMSG_PLAYER_RESTART,          0x00b2);
-packet(CMSG_PLAYER_EMOTE,            0x00bf);
-packet(CMSG_PLAYER_STOP_ATTACK,      0x0118);
-packet(CMSG_WHO_REQUEST,             0x00c1);
-
-packet(CMSG_NPC_TALK,                0x0090);
-packet(CMSG_NPC_NEXT_REQUEST,        0x00b9);
-packet(CMSG_NPC_CLOSE,               0x0146);
-packet(CMSG_NPC_LIST_CHOICE,         0x00b8);
-packet(CMSG_NPC_INT_RESPONSE,        0x0143);
-packet(CMSG_NPC_STR_RESPONSE,        0x01d5);
-packet(CMSG_NPC_BUY_SELL_REQUEST,    0x00c5);
-packet(CMSG_NPC_BUY_REQUEST,         0x00c8);
-packet(CMSG_NPC_SELL_REQUEST,        0x00c9);
-
-packet(CMSG_TRADE_REQUEST,           0x00e4);
-packet(CMSG_TRADE_RESPONSE,          0x00e6);
-packet(CMSG_TRADE_ITEM_ADD_REQUEST,  0x00e8);
-packet(CMSG_TRADE_CANCEL_REQUEST,    0x00ed);
-packet(CMSG_TRADE_ADD_COMPLETE,      0x00eb);
-packet(CMSG_TRADE_OK,                0x00ef);
-
-packet(CMSG_PARTY_CREATE,            0x00f9);
-packet(CMSG_PARTY_INVITE,            0x00fc);
-packet(CMSG_PARTY_INVITED,           0x00ff);
-packet(CMSG_PARTY_LEAVE,             0x0100);
-packet(CMSG_PARTY_SETTINGS,          0x0102);
-packet(CMSG_PARTY_KICK,              0x0103);
-packet(CMSG_PARTY_MESSAGE,           0x0108);
-
-packet(CMSG_MOVE_TO_STORAGE,         0x00f3); /** Move item to storage */
-packet(CMSG_MOVE_FROM_STORAGE,       0x00f5); /** Remove item from storage */
-packet(CMSG_CLOSE_STORAGE,           0x00f7); /** Request storage close */
-
-packet(CMSG_ADMIN_ANNOUNCE,          0x0099);
-packet(CMSG_ADMIN_LOCAL_ANNOUNCE,    0x019C);
-packet(CMSG_ADMIN_HIDE,              0x019D);
-packet(CMSG_ADMIN_KICK,              0x00CC);
-packet(CMSG_ADMIN_MUTE,              0x0149);
-
-packet(CMSG_GUILD_CHECK_MASTER,      0x014d);
-packet(CMSG_GUILD_REQUEST_INFO,      0x014f);
-packet(CMSG_GUILD_REQUEST_EMBLEM,    0x0151);
-packet(CMSG_GUILD_CHANGE_EMBLEM,     0x0153);
-packet(CMSG_GUILD_CHANGE_MEMBER_POS, 0x0155);
-packet(CMSG_GUILD_LEAVE,             0x0159);
-packet(CMSG_GUILD_EXPULSION,         0x015b);
-packet(CMSG_GUILD_BREAK,             0x015d);
-packet(CMSG_GUILD_CHANGE_POS_INFO,   0x0161);
-packet(CMSG_GUILD_CREATE,            0x0165);
-packet(CMSG_GUILD_INVITE,            0x0168);
-packet(CMSG_GUILD_INVITE_REPLY,      0x016b);
-packet(CMSG_GUILD_CHANGE_NOTICE,     0x016e);
-packet(CMSG_GUILD_ALLIANCE_REQUEST,  0x0170);
-packet(CMSG_GUILD_ALLIANCE_REPLY,    0x0172);
-packet(CMSG_GUILD_MESSAGE,           0x017e);
-packet(CMSG_GUILD_OPPOSITION,        0x0180);
-packet(CMSG_GUILD_ALLIANCE_DELETE,   0x0183);
-
-packet(CMSG_SOLVE_CHAR_NAME,         0x0193);
-packet(CMSG_IGNORE_NICK,             0x00cf);
-packet(SMSG_SOLVE_CHAR_NAME,         0x0194);
-
-packet(CMSG_CLIENT_DISCONNECT,       0x7532);
-packet(SMSG_SKILL_CASTING,           0x013e);
-packet(SMSG_SKILL_CAST_CANCEL,       0x01b9);
-packet(SMSG_SKILL_NO_DAMAGE,         0x011a);
-
-packet(SMSG_BEING_IP_RESPONSE,       0x020c);
-packet(SMSG_PVP_MAP_MODE,            0x0199);
-packet(SMSG_PVP_SET,                 0x019a);
-packet(CMSG_IGNORE_ALL,              0x00d0);
-packet(SMSG_IGNORE_ALL_RESPONSE,     0x00d2);
-packet(SMSG_NPC_COMMAND,             0x0212);
-packet(SMSG_QUEST_SET_VAR,           0x0214);
-packet(SMSG_QUEST_PLAYER_VARS,       0x0215);
-packet(SMSG_BEING_MOVE3,             0x0225);
-packet(SMSG_MAP_MUSIC,               0x0227);
-packet(SMSG_NPC_CHANGETITLE,         0x0228);
-packet(SMSG_SCRIPT_MESSAGE,          0x0229);
+#include "net/tmwa/packets.inc"
 
 #undef packet