Fix some hairstyles

20 files changed, 36 insertions, 36 deletions

diff --git a/graphics/sprites/hairstyle2-female.png b/graphics/sprites/hairstyle1-female.png
index 0421089a..0421089a 100644
--- a/graphics/sprites/hairstyle2-female.png
+++ b/graphics/sprites/hairstyle1-female.png
diff --git a/graphics/sprites/hairstyle2-female.xml b/graphics/sprites/hairstyle1-female.xml
index 9ff93e3a..6aaa9643 100644
--- a/graphics/sprites/hairstyle2-female.xml
+++ b/graphics/sprites/hairstyle1-female.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/hairstyle2-female.png|W" width="32" height="32" />
+	<imageset name="base" src="graphics/sprites/hairstyle1-female.png|W" width="32" height="32" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/hairstyle1.png b/graphics/sprites/hairstyle1-male.png
index 5c11da78..5c11da78 100644
--- a/graphics/sprites/hairstyle1.png
+++ b/graphics/sprites/hairstyle1-male.png
diff --git a/graphics/sprites/hairstyle1.xml b/graphics/sprites/hairstyle1-male.xml
index 45b21352..ce799c93 100644
--- a/graphics/sprites/hairstyle1.xml
+++ b/graphics/sprites/hairstyle1-male.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/hairstyle1.png|M" width="40" height="40" />
+	<imageset name="base" src="graphics/sprites/hairstyle1-male.png|M" width="40" height="40" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/hairstyle10.xml b/graphics/sprites/hairstyle10.xml
index 1962872b..ea757b97 100644
--- a/graphics/sprites/hairstyle10.xml
+++ b/graphics/sprites/hairstyle10.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle10.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle11.xml b/graphics/sprites/hairstyle11.xml
index 6ddf3656..458c1c57 100644
--- a/graphics/sprites/hairstyle11.xml
+++ b/graphics/sprites/hairstyle11.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle11.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle12.xml b/graphics/sprites/hairstyle12.xml
index 6adcd27f..d79e20b9 100644
--- a/graphics/sprites/hairstyle12.xml
+++ b/graphics/sprites/hairstyle12.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle12.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle13.xml b/graphics/sprites/hairstyle13.xml
index d2ed12ec..4b6a6bfb 100644
--- a/graphics/sprites/hairstyle13.xml
+++ b/graphics/sprites/hairstyle13.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle13.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle14.xml b/graphics/sprites/hairstyle14.xml
index bb163bd4..38c01f9a 100644
--- a/graphics/sprites/hairstyle14.xml
+++ b/graphics/sprites/hairstyle14.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle14.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle15.xml b/graphics/sprites/hairstyle15.xml
index be558f6b..59df0f3b 100644
--- a/graphics/sprites/hairstyle15.xml
+++ b/graphics/sprites/hairstyle15.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle15.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle2-male.png b/graphics/sprites/hairstyle2.png
index 88647424..88647424 100644
--- a/graphics/sprites/hairstyle2-male.png
+++ b/graphics/sprites/hairstyle2.png
diff --git a/graphics/sprites/hairstyle2-male.xml b/graphics/sprites/hairstyle2.xml
index da3d7afd..fb41148b 100644
--- a/graphics/sprites/hairstyle2-male.xml
+++ b/graphics/sprites/hairstyle2.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle2-male.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle3.xml b/graphics/sprites/hairstyle3.xml
index 0903bf22..4aebe79f 100644
--- a/graphics/sprites/hairstyle3.xml
+++ b/graphics/sprites/hairstyle3.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle3.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle4.xml b/graphics/sprites/hairstyle4.xml
index d7a469bb..ca9a2a8c 100644
--- a/graphics/sprites/hairstyle4.xml
+++ b/graphics/sprites/hairstyle4.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle4.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle5.xml b/graphics/sprites/hairstyle5.xml
index b547f2c3..6011fc73 100644
--- a/graphics/sprites/hairstyle5.xml
+++ b/graphics/sprites/hairstyle5.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle5.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle6.xml b/graphics/sprites/hairstyle6.xml
index e7460738..084b55cd 100644
--- a/graphics/sprites/hairstyle6.xml
+++ b/graphics/sprites/hairstyle6.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle6.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle7.xml b/graphics/sprites/hairstyle7.xml
index 15546273..58169589 100644
--- a/graphics/sprites/hairstyle7.xml
+++ b/graphics/sprites/hairstyle7.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle7.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle8.xml b/graphics/sprites/hairstyle8.xml
index 8da64823..c96b7c77 100644
--- a/graphics/sprites/hairstyle8.xml
+++ b/graphics/sprites/hairstyle8.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle8.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle9.xml b/graphics/sprites/hairstyle9.xml
index d6c3016d..80ab609e 100644
--- a/graphics/sprites/hairstyle9.xml
+++ b/graphics/sprites/hairstyle9.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle9.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/items.xml b/items.xml
index 59c9b512..d2031f21 100644
--- a/items.xml
+++ b/items.xml
@@ -12,50 +12,50 @@
 <items>
     <version revision="$Revision$" />
 
-    <item id="-1" type="hairsprite">
-        <sprite>hairstyle1.xml</sprite>
+    <item id="-1" type="hairsprite" name="Ponytail">
+        <sprite gender="male">hairstyle1-male.xml</sprite>
+        <sprite gender="female">hairstyle1-female.xml</sprite>
     </item>
-    <item id="-2" type="hairsprite">
-        <sprite gender="male">hairstyle2-male.xml</sprite>
-        <sprite gender="female">hairstyle2-female.xml</sprite>
+    <item id="-2" type="hairsprite" name="Bowl cut">
+        <sprite>hairstyle2.xml</sprite>
     </item>
-    <item id="-3" type="hairsprite">
+    <item id="-3" type="hairsprite" name="Combed back">
         <sprite>hairstyle3.xml</sprite>
     </item>
-    <item id="-4" type="hairsprite">
+    <item id="-4" type="hairsprite" name="Emo">
         <sprite>hairstyle4.xml</sprite>
     </item>
-    <item id="-5" type="hairsprite">
+    <item id="-5" type="hairsprite" name="Mohawk">
         <sprite>hairstyle5.xml</sprite>
     </item>
-    <item id="-6" type="hairsprite">
+    <item id="-6" type="hairsprite" name="Pompadour">
         <sprite>hairstyle6.xml</sprite>
     </item>
-    <item id="-7" type="hairsprite">
+    <item id="-7" type="hairsprite" name="Center parting/Short and slick">
         <sprite>hairstyle7.xml</sprite>
     </item>
-    <item id="-8" type="hairsprite">
+    <item id="-8" type="hairsprite" name="Long and slick">
         <sprite>hairstyle8.xml</sprite>
     </item>
-    <item id="-9" type="hairsprite">
+    <item id="-9" type="hairsprite" name="Short and curly">
         <sprite>hairstyle9.xml</sprite>
     </item>
-    <item id="-10" type="hairsprite">
+    <item id="-10" type="hairsprite" name="Long and curly">
         <sprite>hairstyle10.xml</sprite>
     </item>
-    <item id="-11" type="hairsprite">
+    <item id="-11" type="hairsprite" name="Pigtails">
         <sprite>hairstyle11.xml</sprite>
     </item>
-    <item id="-12" type="hairsprite">
+    <item id="-12" type="hairsprite" name="Parted">
         <sprite>hairstyle12.xml</sprite>
     </item>
-    <item id="-13" type="hairsprite">
+    <item id="-13" type="hairsprite" name="Wave">
         <sprite>hairstyle13.xml</sprite>
     </item>
-    <item id="-14" type="hairsprite">
+    <item id="-14" type="hairsprite" name="Mane">
         <sprite>hairstyle14.xml</sprite>
     </item>
-    <item id="-15" type="hairsprite">
+    <item id="-15" type="hairsprite" name="Bun">
         <sprite>hairstyle15.xml</sprite>
     </item>
 
@@ -3520,8 +3520,8 @@
         type="equip-feet"
         defense="1"
         weight="10">
-        <sprite gender="male">chest-cotton-male.xml|#441111,aa3333,dd6666</sprite>
-        <sprite gender="female">chest-cotton-female.xml|#441111,aa3333,dd6666</sprite>
+        <sprite gender="male">feet-boots-male.xml|#441111,aa3333,dd6666</sprite>
+        <sprite gender="female">feet-boots-female.xml|#441111,aa3333,dd6666</sprite>
     </item>
     <item id="2151"
         image="armor-feet-boots.png|W:#115511,22aa22,99dd99"