From 3d23d29e1f63a526338a35a05d384b7571f12553 Mon Sep 17 00:00:00 2001
From: zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 3 Sep 2008 13:32:38 +0000
Subject: - Starting Mercenary Skill implementation. - MS_BASH Completed.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13189 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/map.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/map/map.h')

diff --git a/src/map/map.h b/src/map/map.h
index 92011827b..4a8be92ed 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -172,11 +172,11 @@ enum bl_type {
 	BL_MOB   = 0x002,
 	BL_PET   = 0x004,
 	BL_HOM   = 0x008,
-	BL_ITEM  = 0x010,
-	BL_SKILL = 0x020,
-	BL_NPC   = 0x040,
-	BL_CHAT  = 0x080,
-	BL_MER   = 0x100,
+	BL_MER   = 0x010,
+	BL_ITEM  = 0x020,
+	BL_SKILL = 0x040,
+	BL_NPC   = 0x080,
+	BL_CHAT  = 0x100,
 
 	BL_ALL   = 0xFFF,
 };
-- 
cgit v1.2.3-60-g2f50