From f6b918e20c6d0f1bbfc8f1cba86dc8240dd312f2 Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Sat, 9 Jun 2012 03:06:45 +0200
Subject: Merge hairstyle #28 with hairstyle #25.

---
 graphics/sprites/hairstyles/hairstyle25.png | Bin 4622 -> 1725 bytes
 graphics/sprites/hairstyles/hairstyle25.xml |   2 +-
 graphics/sprites/hairstyles/hairstyle28.png | Bin 1684 -> 0 bytes
 graphics/sprites/hairstyles/hairstyle28.xml |   8 --------
 items.xml                                   |   5 +----
 5 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 graphics/sprites/hairstyles/hairstyle28.png
 delete mode 100644 graphics/sprites/hairstyles/hairstyle28.xml

diff --git a/graphics/sprites/hairstyles/hairstyle25.png b/graphics/sprites/hairstyles/hairstyle25.png
index 1e8bc518..09ed1281 100644
Binary files a/graphics/sprites/hairstyles/hairstyle25.png and b/graphics/sprites/hairstyles/hairstyle25.png differ
diff --git a/graphics/sprites/hairstyles/hairstyle25.xml b/graphics/sprites/hairstyles/hairstyle25.xml
index 3cf98780..a83320b0 100644
--- a/graphics/sprites/hairstyles/hairstyle25.xml
+++ b/graphics/sprites/hairstyles/hairstyle25.xml
@@ -2,7 +2,7 @@
 <!-- Author from The Mana World
 Copyright (C) 2010-2012 Evol Online -->
 <sprite>
-    <imageset name="base" src="graphics/sprites/hairstyles/hairstyle25.png|W" width="40" height="40"/>
+    <imageset name="base" src="graphics/sprites/hairstyles/hairstyle25.png|S" width="40" height="40"/>
 
     <include file="hairstyles/hairstyle01.xml"/>
 </sprite>
diff --git a/graphics/sprites/hairstyles/hairstyle28.png b/graphics/sprites/hairstyles/hairstyle28.png
deleted file mode 100644
index 837683f5..00000000
Binary files a/graphics/sprites/hairstyles/hairstyle28.png and /dev/null differ
diff --git a/graphics/sprites/hairstyles/hairstyle28.xml b/graphics/sprites/hairstyles/hairstyle28.xml
deleted file mode 100644
index 04dafa34..00000000
--- a/graphics/sprites/hairstyles/hairstyle28.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!-- Author from The Mana World
-Copyright (C) 2010-2012 Evol Online -->
-<sprite>
-    <imageset name="base" src="graphics/sprites/hairstyles/hairstyle28.png|S" width="40" height="40"/>
-
-    <include file="hairstyles/hairstyle01.xml"/>
-</sprite>
diff --git a/items.xml b/items.xml
index 609522da..26cab82c 100644
--- a/items.xml
+++ b/items.xml
@@ -108,7 +108,7 @@ Colors for dyable equipments or items are now set up by itemcolors.xml.
     <item id="-24" type="hairsprite" name="Imperial" colors="hairS">
         <sprite>hairstyles/hairstyle24.xml</sprite>
     </item>
-    <item id="-25" type="hairsprite" name="Tousled Layers" colors="hair">
+    <item id="-25" type="hairsprite" name="Side Strand" colors="hairS">
         <sprite>hairstyles/hairstyle25.xml</sprite>
     </item>
     <item id="-26" type="hairsprite" name="Messy" colors="hairS">
@@ -117,9 +117,6 @@ Colors for dyable equipments or items are now set up by itemcolors.xml.
     <item id="-27" type="hairsprite" name="Flat Ponytail" colors="hairS">
         <sprite>hairstyles/hairstyle27.xml</sprite>
     </item>
-    <item id="-28" type="hairsprite" name="Side Strand" colors="hairS">
-        <sprite>hairstyles/hairstyle28.xml</sprite>
-    </item>
 
     <!-- Races -->
     <item id="-100" type="racesprite" name="Human">
-- 
cgit v1.2.3-70-g09d2