From 07a5f0e1e2c480b8f0f9b2e4b5940b589a90acb7 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Wed, 30 Nov 2016 17:48:15 -0800
Subject: [PATCH] Rename battle tree ribbons

Closes #543
---
 PKHeX/PKHeX.csproj                            |   6 +++
 PKHeX/Properties/Resources.Designer.cs        |  40 +++++++++---------
 PKHeX/Properties/Resources.resx               |  12 +++---
 ...ribbonc0.png => ribbonbattletreegreat.png} | Bin
 ...ibbonc1.png => ribbonbattletreemaster.png} | Bin
 5 files changed, 32 insertions(+), 26 deletions(-)
 rename PKHeX/Resources/img/ribbons/{ribbonc0.png => ribbonbattletreegreat.png} (100%)
 rename PKHeX/Resources/img/ribbons/{ribbonc1.png => ribbonbattletreemaster.png} (100%)

diff --git a/PKHeX/PKHeX.csproj b/PKHeX/PKHeX.csproj
index b1b48565a..9f6058a67 100644
--- a/PKHeX/PKHeX.csproj
+++ b/PKHeX/PKHeX.csproj
@@ -3766,6 +3766,12 @@
   <ItemGroup>
     <None Include="Resources\img\ball\_ball15.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\img\ribbons\ribbonbattletreegreat.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\img\ribbons\ribbonbattletreemaster.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/PKHeX/Properties/Resources.Designer.cs b/PKHeX/Properties/Resources.Designer.cs
index 6754f8804..c70f53010 100644
--- a/PKHeX/Properties/Resources.Designer.cs
+++ b/PKHeX/Properties/Resources.Designer.cs
@@ -18105,6 +18105,26 @@ internal class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ribbonbattletreegreat {
+            get {
+                object obj = ResourceManager.GetObject("ribbonbattletreegreat", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ribbonbattletreemaster {
+            get {
+                object obj = ResourceManager.GetObject("ribbonbattletreemaster", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -18125,26 +18145,6 @@ internal class Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap ribbonc0 {
-            get {
-                object obj = ResourceManager.GetObject("ribbonc0", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap ribbonc1 {
-            get {
-                object obj = ResourceManager.GetObject("ribbonc1", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/PKHeX/Properties/Resources.resx b/PKHeX/Properties/Resources.resx
index e5078a844..6dfc10105 100644
--- a/PKHeX/Properties/Resources.resx
+++ b/PKHeX/Properties/Resources.resx
@@ -6463,12 +6463,6 @@
   <data name="ribbonbattleroyale" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\ribbons\ribbonbattleroyale.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ribbonc0" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\ribbons\ribbonc0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ribbonc1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\ribbons\ribbonc1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="ribbonchampionalola" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\ribbons\ribbonchampionalola.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -7369,4 +7363,10 @@
   <data name="_ball9" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\ball\_ball9.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ribbonbattletreegreat" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\ribbons\ribbonbattletreegreat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ribbonbattletreemaster" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img\ribbons\ribbonbattletreemaster.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/PKHeX/Resources/img/ribbons/ribbonc0.png b/PKHeX/Resources/img/ribbons/ribbonbattletreegreat.png
similarity index 100%
rename from PKHeX/Resources/img/ribbons/ribbonc0.png
rename to PKHeX/Resources/img/ribbons/ribbonbattletreegreat.png
diff --git a/PKHeX/Resources/img/ribbons/ribbonc1.png b/PKHeX/Resources/img/ribbons/ribbonbattletreemaster.png
similarity index 100%
rename from PKHeX/Resources/img/ribbons/ribbonc1.png
rename to PKHeX/Resources/img/ribbons/ribbonbattletreemaster.png