From 1f984976298155aa60169e04d30dba4eb09f73b1 Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Wed, 23 May 2012 23:14:58 +0200
Subject: Correct some problem caused by the merge.

---
 items.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'items.xml')

diff --git a/items.xml b/items.xml
index 9ac29e62..846f8a56 100644
--- a/items.xml
+++ b/items.xml
@@ -35,31 +35,31 @@ Multiple's colors dye is now setted up by itemcolors.xml.
 
     <!-- Hairsprites -->
     <item id="-1" type="hairsprite" name="Flat ponytail">
-        <sprite>hairstyles/hairstyle01.xml</sprite>
+        <sprite>hairstyles/hairstyle1.xml</sprite>
     </item>
     <item id="-2" type="hairsprite" name="Bowl cut">
-        <sprite>hairstyles/hairstyle02.xml</sprite>
+        <sprite>hairstyles/hairstyle2.xml</sprite>
     </item>
     <item id="-3" type="hairsprite" name="Combed back">
-        <sprite>hairstyles/hairstyle03.xml</sprite>
+        <sprite>hairstyles/hairstyle3.xml</sprite>
     </item>
     <item id="-4" type="hairsprite" name="Emo">
-        <sprite>hairstyles/hairstyle04.xml</sprite>
+        <sprite>hairstyles/hairstyle4.xml</sprite>
     </item>
     <item id="-5" type="hairsprite" name="Mohawk">
-        <sprite>hairstyles/hairstyle05.xml</sprite>
+        <sprite>hairstyles/hairstyle5.xml</sprite>
     </item>
     <item id="-6" type="hairsprite" name="Pompadour">
-        <sprite>hairstyles/hairstyle06.xml</sprite>
+        <sprite>hairstyles/hairstyle6.xml</sprite>
     </item>
     <item id="-7" type="hairsprite" name="Center parting">
-        <sprite>hairstyles/hairstyle07.xml</sprite>
+        <sprite>hairstyles/hairstyle7.xml</sprite>
     </item>
     <item id="-8" type="hairsprite" name="Long and slick">
-        <sprite>hairstyles/hairstyle08.xml</sprite>
+        <sprite>hairstyles/hairstyle8.xml</sprite>
     </item>
     <item id="-9" type="hairsprite" name="Short and curly">
-        <sprite>hairstyles/hairstyle09.xml</sprite>
+        <sprite>hairstyles/hairstyle9.xml</sprite>
     </item>
     <item id="-10" type="hairsprite" name="Pigtails">
         <sprite>hairstyles/hairstyle10.xml</sprite>
@@ -481,7 +481,7 @@ Multiple's colors dye is now setted up by itemcolors.xml.
 
     <!-- Head -->
     <item id="2900"
-        image="equipment/head/bandana.png"
+        image="equipment/head/bandana hat.png"
         name="Bandana"
         description="A striped bandana."
         effect="Defense +1"
@@ -489,7 +489,7 @@ Multiple's colors dye is now setted up by itemcolors.xml.
         defense="1"
         weight="13"
         max-per-slot="1">
-        <sprite>equipment/head/bandana.xml</sprite>
+        <sprite>equipment/head/bandana hat.xml</sprite>
         <replace sprite="hair">
             <item from="-3" to="-2" />
             <item from="-5" to="-4" />
-- 
cgit v1.2.3-60-g2f50