diff --git a/PKHeX.csproj b/PKHeX.csproj index ed4c30501..9c03d086f 100644 --- a/PKHeX.csproj +++ b/PKHeX.csproj @@ -469,6 +469,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PKM/PK4.cs b/PKM/PK4.cs index 568e97160..b2711febb 100644 --- a/PKM/PK4.cs +++ b/PKM/PK4.cs @@ -60,7 +60,7 @@ namespace PKHeX private byte RIB1 { get { return Data[0x25]; } set { Data[0x25] = value; } } // Sinnoh 2 private byte RIB2 { get { return Data[0x26]; } set { Data[0x26] = value; } } // Unova 1 private byte RIB3 { get { return Data[0x27]; } set { Data[0x27] = value; } } // Unova 2 - public bool RibbonSinnohChampion { get { return (RIB0 & (1 << 0)) == 1 << 0; } set { RIB0 = (byte)(RIB0 & ~(1 << 0) | (value ? 1 << 0 : 0)); } } + public bool RibbonChampionSinnoh { get { return (RIB0 & (1 << 0)) == 1 << 0; } set { RIB0 = (byte)(RIB0 & ~(1 << 0) | (value ? 1 << 0 : 0)); } } public bool RibbonAbility { get { return (RIB0 & (1 << 1)) == 1 << 1; } set { RIB0 = (byte)(RIB0 & ~(1 << 1) | (value ? 1 << 1 : 0)); } } public bool RibbonAbilityGreat { get { return (RIB0 & (1 << 2)) == 1 << 2; } set { RIB0 = (byte)(RIB0 & ~(1 << 2) | (value ? 1 << 2 : 0)); } } public bool RibbonAbilityDouble { get { return (RIB0 & (1 << 3)) == 1 << 3; } set { RIB0 = (byte)(RIB0 & ~(1 << 3) | (value ? 1 << 3 : 0)); } } diff --git a/PKM/PK5.cs b/PKM/PK5.cs index 2be3fc1bf..267bce372 100644 --- a/PKM/PK5.cs +++ b/PKM/PK5.cs @@ -60,7 +60,7 @@ namespace PKHeX private byte RIB1 { get { return Data[0x25]; } set { Data[0x25] = value; } } // Sinnoh 2 private byte RIB2 { get { return Data[0x26]; } set { Data[0x26] = value; } } // Unova 1 private byte RIB3 { get { return Data[0x27]; } set { Data[0x27] = value; } } // Unova 2 - public bool RibbonSinnohChampion { get { return (RIB0 & (1 << 0)) == 1 << 0; } set { RIB0 = (byte)(RIB0 & ~(1 << 0) | (value ? 1 << 0 : 0)); } } + public bool RibbonChampionSinnoh { get { return (RIB0 & (1 << 0)) == 1 << 0; } set { RIB0 = (byte)(RIB0 & ~(1 << 0) | (value ? 1 << 0 : 0)); } } public bool RibbonAbility { get { return (RIB0 & (1 << 1)) == 1 << 1; } set { RIB0 = (byte)(RIB0 & ~(1 << 1) | (value ? 1 << 1 : 0)); } } public bool RibbonAbilityGreat { get { return (RIB0 & (1 << 2)) == 1 << 2; } set { RIB0 = (byte)(RIB0 & ~(1 << 2) | (value ? 1 << 2 : 0)); } } public bool RibbonAbilityDouble { get { return (RIB0 & (1 << 3)) == 1 << 3; } set { RIB0 = (byte)(RIB0 & ~(1 << 3) | (value ? 1 << 3 : 0)); } } diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 5466b1204..bd42f3332 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -9060,16 +9060,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap _event { - get { - object obj = ResourceManager.GetObject("_event", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -9080,16 +9070,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap alert { - get { - object obj = ResourceManager.GetObject("alert", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -9100,16 +9080,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap artist { - get { - object obj = ResourceManager.GetObject("artist", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -9280,56 +9250,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap battlechamp { - get { - object obj = ResourceManager.GetObject("battlechamp", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap battlememory { - get { - object obj = ResourceManager.GetObject("battlememory", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap battlememory2 { - get { - object obj = ResourceManager.GetObject("battlememory2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap bestfriends { - get { - object obj = ResourceManager.GetObject("bestfriends", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap birthday { - get { - object obj = ResourceManager.GetObject("birthday", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -9710,16 +9630,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap careless { - get { - object obj = ResourceManager.GetObject("careless", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized string similar to PKHeX - By Kaphotics ///http://projectpokemon.org/ @@ -9749,16 +9659,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap classic { - get { - object obj = ResourceManager.GetObject("classic", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized string similar to 60 Ash ///21 Test1 @@ -9771,26 +9671,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap contestmemory { - get { - object obj = ResourceManager.GetObject("contestmemory", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap contestmemory2 { - get { - object obj = ResourceManager.GetObject("contestmemory2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized string similar to Country ID,JP,EN,FR,DE,IT,ES,ZH,KO ///1,日本,Japan,Japon,Japan,Giappone,Japón,日本,일본 @@ -9808,16 +9688,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap country { - get { - object obj = ResourceManager.GetObject("country", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -9838,16 +9708,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap downcast { - get { - object obj = ResourceManager.GetObject("downcast", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -9858,26 +9718,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap earth { - get { - object obj = ResourceManager.GetObject("earth", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap effort { - get { - object obj = ResourceManager.GetObject("effort", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -9978,16 +9818,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap expertbattler { - get { - object obj = ResourceManager.GetObject("expertbattler", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -10062,36 +9892,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap footprint { - get { - object obj = ResourceManager.GetObject("footprint", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap gorgeous { - get { - object obj = ResourceManager.GetObject("gorgeous", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap gorgeousroyal { - get { - object obj = ResourceManager.GetObject("gorgeousroyal", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -10102,16 +9902,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap hoennchamp { - get { - object obj = ResourceManager.GetObject("hoennchamp", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -14262,16 +14052,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap kaloschamp { - get { - object obj = ResourceManager.GetObject("kaloschamp", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized string similar to ! PKHeX Interface Customization File ///! Languages: Save this file accordingly and put it in the same folder as PKHeX's executable. @@ -14505,16 +14285,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap legend { - get { - object obj = ResourceManager.GetObject("legend", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -14565,26 +14335,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap national { - get { - object obj = ResourceManager.GetObject("national", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap nationalchamp { - get { - object obj = ResourceManager.GetObject("nationalchamp", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -14745,16 +14495,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap premier { - get { - object obj = ResourceManager.GetObject("premier", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -14765,26 +14505,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap record { - get { - object obj = ResourceManager.GetObject("record", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap regionalchamp { - get { - object obj = ResourceManager.GetObject("regionalchamp", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized string similar to ID,3DS Region ///0,Japan (日本) @@ -14800,16 +14520,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap relax { - get { - object obj = ResourceManager.GetObject("relax", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -14823,9 +14533,9 @@ namespace PKHeX.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap ribbon_40 { + internal static System.Drawing.Bitmap ribbonability { get { - object obj = ResourceManager.GetObject("ribbon_40", resourceCulture); + object obj = ResourceManager.GetObject("ribbonability", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -14833,9 +14543,9 @@ namespace PKHeX.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap ribbon_41 { + internal static System.Drawing.Bitmap ribbonabilitydouble { get { - object obj = ResourceManager.GetObject("ribbon_41", resourceCulture); + object obj = ResourceManager.GetObject("ribbonabilitydouble", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -14843,9 +14553,9 @@ namespace PKHeX.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap ribbon_42 { + internal static System.Drawing.Bitmap ribbonabilitygreat { get { - object obj = ResourceManager.GetObject("ribbon_42", resourceCulture); + object obj = ResourceManager.GetObject("ribbonabilitygreat", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -14853,9 +14563,9 @@ namespace PKHeX.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap ribbon_43 { + internal static System.Drawing.Bitmap ribbonabilitymulti { get { - object obj = ResourceManager.GetObject("ribbon_43", resourceCulture); + object obj = ResourceManager.GetObject("ribbonabilitymulti", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -14863,9 +14573,9 @@ namespace PKHeX.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap ribbon_44 { + internal static System.Drawing.Bitmap ribbonabilitypair { get { - object obj = ResourceManager.GetObject("ribbon_44", resourceCulture); + object obj = ResourceManager.GetObject("ribbonabilitypair", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -14873,9 +14583,9 @@ namespace PKHeX.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap ribbon_45 { + internal static System.Drawing.Bitmap ribbonabilityworld { get { - object obj = ResourceManager.GetObject("ribbon_45", resourceCulture); + object obj = ResourceManager.GetObject("ribbonabilityworld", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -14883,9 +14593,9 @@ namespace PKHeX.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap ribbon_46 { + internal static System.Drawing.Bitmap ribbonalert { get { - object obj = ResourceManager.GetObject("ribbon_46", resourceCulture); + object obj = ResourceManager.GetObject("ribbonalert", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -14893,9 +14603,889 @@ namespace PKHeX.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap royal { + internal static System.Drawing.Bitmap ribbonartist { get { - object obj = ResourceManager.GetObject("royal", resourceCulture); + object obj = ResourceManager.GetObject("ribbonartist", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonbattlerexpert { + get { + object obj = ResourceManager.GetObject("ribbonbattlerexpert", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonbattlerskillful { + get { + object obj = ResourceManager.GetObject("ribbonbattlerskillful", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonbestfriends { + get { + object obj = ResourceManager.GetObject("ribbonbestfriends", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonbirthday { + get { + object obj = ResourceManager.GetObject("ribbonbirthday", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribboncareless { + get { + object obj = ResourceManager.GetObject("ribboncareless", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonchampionbattle { + get { + object obj = ResourceManager.GetObject("ribbonchampionbattle", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonchampiong3hoenn { + get { + object obj = ResourceManager.GetObject("ribbonchampiong3hoenn", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonchampiong6hoenn { + get { + object obj = ResourceManager.GetObject("ribbonchampiong6hoenn", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonchampionkalos { + get { + object obj = ResourceManager.GetObject("ribbonchampionkalos", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonchampionnational { + get { + object obj = ResourceManager.GetObject("ribbonchampionnational", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonchampionregional { + get { + object obj = ResourceManager.GetObject("ribbonchampionregional", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonchampionsinnoh { + get { + object obj = ResourceManager.GetObject("ribbonchampionsinnoh", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonchampionworld { + get { + object obj = ResourceManager.GetObject("ribbonchampionworld", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonclassic { + get { + object obj = ResourceManager.GetObject("ribbonclassic", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonconteststar { + get { + object obj = ResourceManager.GetObject("ribbonconteststar", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribboncountmemorybattle { + get { + object obj = ResourceManager.GetObject("ribboncountmemorybattle", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribboncountmemorybattle2 { + get { + object obj = ResourceManager.GetObject("ribboncountmemorybattle2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribboncountmemorycontest { + get { + object obj = ResourceManager.GetObject("ribboncountmemorycontest", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribboncountmemorycontest2 { + get { + object obj = ResourceManager.GetObject("ribboncountmemorycontest2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribboncountry { + get { + object obj = ResourceManager.GetObject("ribboncountry", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbondowncast { + get { + object obj = ResourceManager.GetObject("ribbondowncast", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonearth { + get { + object obj = ResourceManager.GetObject("ribbonearth", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribboneffort { + get { + object obj = ResourceManager.GetObject("ribboneffort", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonevent { + get { + object obj = ResourceManager.GetObject("ribbonevent", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonfootprint { + get { + object obj = ResourceManager.GetObject("ribbonfootprint", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3beauty { + get { + object obj = ResourceManager.GetObject("ribbong3beauty", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3beautyhyper { + get { + object obj = ResourceManager.GetObject("ribbong3beautyhyper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3beautymaster { + get { + object obj = ResourceManager.GetObject("ribbong3beautymaster", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3beautysuper { + get { + object obj = ResourceManager.GetObject("ribbong3beautysuper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3cool { + get { + object obj = ResourceManager.GetObject("ribbong3cool", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3coolhyper { + get { + object obj = ResourceManager.GetObject("ribbong3coolhyper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3coolmaster { + get { + object obj = ResourceManager.GetObject("ribbong3coolmaster", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3coolsuper { + get { + object obj = ResourceManager.GetObject("ribbong3coolsuper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3cute { + get { + object obj = ResourceManager.GetObject("ribbong3cute", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3cutehyper { + get { + object obj = ResourceManager.GetObject("ribbong3cutehyper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3cutemaster { + get { + object obj = ResourceManager.GetObject("ribbong3cutemaster", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3cutesuper { + get { + object obj = ResourceManager.GetObject("ribbong3cutesuper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3smart { + get { + object obj = ResourceManager.GetObject("ribbong3smart", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3smarthyper { + get { + object obj = ResourceManager.GetObject("ribbong3smarthyper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3smartmaster { + get { + object obj = ResourceManager.GetObject("ribbong3smartmaster", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3smartsuper { + get { + object obj = ResourceManager.GetObject("ribbong3smartsuper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3tough { + get { + object obj = ResourceManager.GetObject("ribbong3tough", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3toughhyper { + get { + object obj = ResourceManager.GetObject("ribbong3toughhyper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3toughmaster { + get { + object obj = ResourceManager.GetObject("ribbong3toughmaster", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong3toughsuper { + get { + object obj = ResourceManager.GetObject("ribbong3toughsuper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4beauty { + get { + object obj = ResourceManager.GetObject("ribbong4beauty", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4beautygreat { + get { + object obj = ResourceManager.GetObject("ribbong4beautygreat", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4beautymaster { + get { + object obj = ResourceManager.GetObject("ribbong4beautymaster", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4beautyultra { + get { + object obj = ResourceManager.GetObject("ribbong4beautyultra", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4cool { + get { + object obj = ResourceManager.GetObject("ribbong4cool", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4coolgreat { + get { + object obj = ResourceManager.GetObject("ribbong4coolgreat", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4coolmaster { + get { + object obj = ResourceManager.GetObject("ribbong4coolmaster", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4coolultra { + get { + object obj = ResourceManager.GetObject("ribbong4coolultra", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4cute { + get { + object obj = ResourceManager.GetObject("ribbong4cute", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4cutegreat { + get { + object obj = ResourceManager.GetObject("ribbong4cutegreat", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4cutemaster { + get { + object obj = ResourceManager.GetObject("ribbong4cutemaster", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4cuteultra { + get { + object obj = ResourceManager.GetObject("ribbong4cuteultra", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4smart { + get { + object obj = ResourceManager.GetObject("ribbong4smart", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4smartgreat { + get { + object obj = ResourceManager.GetObject("ribbong4smartgreat", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4smartmaster { + get { + object obj = ResourceManager.GetObject("ribbong4smartmaster", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4smartultra { + get { + object obj = ResourceManager.GetObject("ribbong4smartultra", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4tough { + get { + object obj = ResourceManager.GetObject("ribbong4tough", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4toughgreat { + get { + object obj = ResourceManager.GetObject("ribbong4toughgreat", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4toughmaster { + get { + object obj = ResourceManager.GetObject("ribbong4toughmaster", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbong4toughultra { + get { + object obj = ResourceManager.GetObject("ribbong4toughultra", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbongorgeous { + get { + object obj = ResourceManager.GetObject("ribbongorgeous", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbongorgeousroyal { + get { + object obj = ResourceManager.GetObject("ribbongorgeousroyal", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonlegend { + get { + object obj = ResourceManager.GetObject("ribbonlegend", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonmasterbeauty { + get { + object obj = ResourceManager.GetObject("ribbonmasterbeauty", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonmastercleverness { + get { + object obj = ResourceManager.GetObject("ribbonmastercleverness", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonmastercoolness { + get { + object obj = ResourceManager.GetObject("ribbonmastercoolness", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonmastercuteness { + get { + object obj = ResourceManager.GetObject("ribbonmastercuteness", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonmastertoughness { + get { + object obj = ResourceManager.GetObject("ribbonmastertoughness", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonnational { + get { + object obj = ResourceManager.GetObject("ribbonnational", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonpremier { + get { + object obj = ResourceManager.GetObject("ribbonpremier", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonrecord { + get { + object obj = ResourceManager.GetObject("ribbonrecord", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonrelax { + get { + object obj = ResourceManager.GetObject("ribbonrelax", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonroyal { + get { + object obj = ResourceManager.GetObject("ribbonroyal", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonshock { + get { + object obj = ResourceManager.GetObject("ribbonshock", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonsmile { + get { + object obj = ResourceManager.GetObject("ribbonsmile", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonsnooze { + get { + object obj = ResourceManager.GetObject("ribbonsnooze", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonsouvenir { + get { + object obj = ResourceManager.GetObject("ribbonsouvenir", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonspecial { + get { + object obj = ResourceManager.GetObject("ribbonspecial", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbontraining { + get { + object obj = ResourceManager.GetObject("ribbontraining", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonvictory { + get { + object obj = ResourceManager.GetObject("ribbonvictory", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonwinning { + get { + object obj = ResourceManager.GetObject("ribbonwinning", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonwishing { + get { + object obj = ResourceManager.GetObject("ribbonwishing", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ribbonworld { + get { + object obj = ResourceManager.GetObject("ribbonworld", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -14930,16 +15520,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap shock { - get { - object obj = ResourceManager.GetObject("shock", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized string similar to If you are having issues viewing certain symbols/text: Options -> Toggle Font. /// @@ -14980,26 +15560,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap sinnohchamp { - get { - object obj = ResourceManager.GetObject("sinnohchamp", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap skillfullbattler { - get { - object obj = ResourceManager.GetObject("skillfullbattler", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -15040,46 +15600,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap smile { - get { - object obj = ResourceManager.GetObject("smile", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap snooze { - get { - object obj = ResourceManager.GetObject("snooze", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap souvenir { - get { - object obj = ResourceManager.GetObject("souvenir", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap special { - get { - object obj = ResourceManager.GetObject("special", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized string similar to Subregion ID,JP,EN,FR,DE,IT,ES,ZH,KO ///000,—,—,—,—,—,—,—,— @@ -23429,6 +23949,62 @@ namespace PKHeX.Properties { } } + /// + /// Looks up a localized string similar to (None) + ///Master Ball + ///Ultra Ball + ///Great Ball + ///Poké Ball + ///Safari Ball + ///Net Ball + ///Dive Ball + ///Nest Ball + ///Repeat Ball + ///Timer Ball + ///Luxury Ball + ///Premier Ball + ///Potion + ///Antidote + ///Burn Heal + ///Ice Heal + ///Awakening + ///Parlyz Heal + ///Full Restore + ///Max Potion + ///Hyper Potion + ///Super Potion + ///Full Heal + ///Revive + ///Max Revive + ///Fresh Water + ///Soda Pop + ///Lemonade + ///Moomoo Milk + ///EnergyPowder + ///Energy Root + ///Heal Powder + ///Revival Herb + ///Ether + ///Max Ether + ///Elixir + ///Max Elixir + ///Lava Cookie + ///Blue Flute + ///Yellow Flute + ///Red Flute + ///Black Flute + ///White Flute + ///Berry Juice + ///Sacred Ash + ///Shoal Salt + ///Shoal S [rest of string was truncated]";. + /// + internal static string text_ItemsG3_en { + get { + return ResourceManager.GetString("text_ItemsG3_en", resourceCulture); + } + } + /// /// Looks up a localized string similar to /// @@ -29007,16 +29583,6 @@ namespace PKHeX.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap training { - get { - object obj = ResourceManager.GetObject("training", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -29066,35 +29632,5 @@ namespace PKHeX.Properties { return ((byte[])(obj)); } } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap wishing { - get { - object obj = ResourceManager.GetObject("wishing", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap world { - get { - object obj = ResourceManager.GetObject("world", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap worldchamp { - get { - object obj = ResourceManager.GetObject("worldchamp", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } } } diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 7e2cd0ed2..d23f57e67 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -118,123 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\img\ribbons\alert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\artist.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\battlechamp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\battlememory.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\bestfriends.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\birthday.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\careless.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\classic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\contestmemory.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\country.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\downcast.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\earth.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\effort.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\expertbattler.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\footprint.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\gorgeous.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\gorgeousroyal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\hoennchamp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\kaloschamp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\legend.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\national.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\nationalchamp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\premier.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\record.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\regionalchamp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\relax.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\royal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\shock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\sinnohchamp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\skillfullbattler.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\smile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\snooze.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\souvenir.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\special.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\training.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\wishing.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\world.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\worldchamp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\event.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\img\badges\badge_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -2884,12 +2767,6 @@ ..\Resources\img\Pokemon Sprites\666-15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\ribbons\battlememory2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\contestmemory2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\img\misc\locked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -4219,27 +4096,6 @@ ..\Resources\img\Pokemon Sprites\unknown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\ribbons\ribbon_40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\ribbon_41.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\ribbon_42.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\ribbon_43.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\ribbon_44.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\ribbon_45.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\ribbons\ribbon_46.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\img\item\item_534.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -5899,4 +5755,292 @@ ..\Resources\text\gen3\text_ItemsG3_en.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16 + + ..\Resources\img\ribbons\ribbonalert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonartist.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonbattlerexpert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonbattlerskillful.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonbestfriends.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonbirthday.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribboncareless.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonchampionbattle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonchampiong3hoenn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonchampiong6hoenn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonchampionkalos.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonchampionnational.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonchampionregional.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonchampionsinnoh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonchampionworld.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonclassic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonconteststar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribboncountmemorybattle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribboncountmemorybattle2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribboncountmemorycontest.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribboncountmemorycontest2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribboncountry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbondowncast.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonearth.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribboneffort.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonevent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonfootprint.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbongorgeous.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbongorgeousroyal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonlegend.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmasterbeauty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmastercleverness.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmastercoolness.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmastercuteness.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmastertoughness.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonnational.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonpremier.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonrecord.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonrelax.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonroyal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonshock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonsmile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonsnooze.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonsouvenir.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonspecial.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbontraining.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonwishing.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonworld.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonability.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonabilitydouble.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonabilitygreat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonabilitymulti.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonabilitypair.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonabilityworld.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3beauty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3beautyhyper.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3beautymaster.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3beautysuper.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3cool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3coolhyper.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3coolmaster.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3coolsuper.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3cute.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3cutehyper.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3cutemaster.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3cutesuper.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3smart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3smarthyper.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3smartmaster.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3smartsuper.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3tough.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3toughhyper.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3toughmaster.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong3toughsuper.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4beauty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4beautygreat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4beautymaster.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4beautyultra.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4cool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4coolgreat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4coolmaster.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4coolultra.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4cute.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4cutegreat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4cutemaster.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4cuteultra.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4smart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4smartgreat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4smartmaster.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4smartultra.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4tough.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4toughgreat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4toughmaster.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbong4toughultra.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonvictory.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonwinning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Resources/img/ribbons/own_no.png b/Resources/img/ribbons/own_no.png deleted file mode 100644 index 10e8a2d79..000000000 Binary files a/Resources/img/ribbons/own_no.png and /dev/null differ diff --git a/Resources/img/ribbons/own_yes.png b/Resources/img/ribbons/own_yes.png deleted file mode 100644 index 8d62c337d..000000000 Binary files a/Resources/img/ribbons/own_yes.png and /dev/null differ diff --git a/Resources/img/ribbons/ribbonability.png b/Resources/img/ribbons/ribbonability.png new file mode 100644 index 000000000..5d610e7ea Binary files /dev/null and b/Resources/img/ribbons/ribbonability.png differ diff --git a/Resources/img/ribbons/ribbonabilitydouble.png b/Resources/img/ribbons/ribbonabilitydouble.png new file mode 100644 index 000000000..5b27db198 Binary files /dev/null and b/Resources/img/ribbons/ribbonabilitydouble.png differ diff --git a/Resources/img/ribbons/ribbonabilitygreat.png b/Resources/img/ribbons/ribbonabilitygreat.png new file mode 100644 index 000000000..bfa0cf965 Binary files /dev/null and b/Resources/img/ribbons/ribbonabilitygreat.png differ diff --git a/Resources/img/ribbons/ribbonabilitymulti.png b/Resources/img/ribbons/ribbonabilitymulti.png new file mode 100644 index 000000000..0ebe4e14c Binary files /dev/null and b/Resources/img/ribbons/ribbonabilitymulti.png differ diff --git a/Resources/img/ribbons/ribbonabilitypair.png b/Resources/img/ribbons/ribbonabilitypair.png new file mode 100644 index 000000000..94a9cbeb2 Binary files /dev/null and b/Resources/img/ribbons/ribbonabilitypair.png differ diff --git a/Resources/img/ribbons/ribbonabilityworld.png b/Resources/img/ribbons/ribbonabilityworld.png new file mode 100644 index 000000000..30e959da2 Binary files /dev/null and b/Resources/img/ribbons/ribbonabilityworld.png differ diff --git a/Resources/img/ribbons/alert.png b/Resources/img/ribbons/ribbonalert.png similarity index 100% rename from Resources/img/ribbons/alert.png rename to Resources/img/ribbons/ribbonalert.png diff --git a/Resources/img/ribbons/artist.png b/Resources/img/ribbons/ribbonartist.png similarity index 100% rename from Resources/img/ribbons/artist.png rename to Resources/img/ribbons/ribbonartist.png diff --git a/Resources/img/ribbons/expertbattler.png b/Resources/img/ribbons/ribbonbattlerexpert.png similarity index 100% rename from Resources/img/ribbons/expertbattler.png rename to Resources/img/ribbons/ribbonbattlerexpert.png diff --git a/Resources/img/ribbons/skillfullbattler.png b/Resources/img/ribbons/ribbonbattlerskillful.png similarity index 100% rename from Resources/img/ribbons/skillfullbattler.png rename to Resources/img/ribbons/ribbonbattlerskillful.png diff --git a/Resources/img/ribbons/bestfriends.png b/Resources/img/ribbons/ribbonbestfriends.png similarity index 100% rename from Resources/img/ribbons/bestfriends.png rename to Resources/img/ribbons/ribbonbestfriends.png diff --git a/Resources/img/ribbons/birthday.png b/Resources/img/ribbons/ribbonbirthday.png similarity index 100% rename from Resources/img/ribbons/birthday.png rename to Resources/img/ribbons/ribbonbirthday.png diff --git a/Resources/img/ribbons/careless.png b/Resources/img/ribbons/ribboncareless.png similarity index 100% rename from Resources/img/ribbons/careless.png rename to Resources/img/ribbons/ribboncareless.png diff --git a/Resources/img/ribbons/battlechamp.png b/Resources/img/ribbons/ribbonchampionbattle.png similarity index 100% rename from Resources/img/ribbons/battlechamp.png rename to Resources/img/ribbons/ribbonchampionbattle.png diff --git a/Resources/img/ribbons/hoennchamp.png b/Resources/img/ribbons/ribbonchampiong3hoenn.png similarity index 100% rename from Resources/img/ribbons/hoennchamp.png rename to Resources/img/ribbons/ribbonchampiong3hoenn.png diff --git a/Resources/img/ribbons/ribbon_40.png b/Resources/img/ribbons/ribbonchampiong6hoenn.png similarity index 100% rename from Resources/img/ribbons/ribbon_40.png rename to Resources/img/ribbons/ribbonchampiong6hoenn.png diff --git a/Resources/img/ribbons/kaloschamp.png b/Resources/img/ribbons/ribbonchampionkalos.png similarity index 100% rename from Resources/img/ribbons/kaloschamp.png rename to Resources/img/ribbons/ribbonchampionkalos.png diff --git a/Resources/img/ribbons/nationalchamp.png b/Resources/img/ribbons/ribbonchampionnational.png similarity index 100% rename from Resources/img/ribbons/nationalchamp.png rename to Resources/img/ribbons/ribbonchampionnational.png diff --git a/Resources/img/ribbons/regionalchamp.png b/Resources/img/ribbons/ribbonchampionregional.png similarity index 100% rename from Resources/img/ribbons/regionalchamp.png rename to Resources/img/ribbons/ribbonchampionregional.png diff --git a/Resources/img/ribbons/sinnohchamp.png b/Resources/img/ribbons/ribbonchampionsinnoh.png similarity index 100% rename from Resources/img/ribbons/sinnohchamp.png rename to Resources/img/ribbons/ribbonchampionsinnoh.png diff --git a/Resources/img/ribbons/worldchamp.png b/Resources/img/ribbons/ribbonchampionworld.png similarity index 100% rename from Resources/img/ribbons/worldchamp.png rename to Resources/img/ribbons/ribbonchampionworld.png diff --git a/Resources/img/ribbons/classic.png b/Resources/img/ribbons/ribbonclassic.png similarity index 100% rename from Resources/img/ribbons/classic.png rename to Resources/img/ribbons/ribbonclassic.png diff --git a/Resources/img/ribbons/ribbon_41.png b/Resources/img/ribbons/ribbonconteststar.png similarity index 100% rename from Resources/img/ribbons/ribbon_41.png rename to Resources/img/ribbons/ribbonconteststar.png diff --git a/Resources/img/ribbons/battlememory.png b/Resources/img/ribbons/ribboncountmemorybattle.png similarity index 100% rename from Resources/img/ribbons/battlememory.png rename to Resources/img/ribbons/ribboncountmemorybattle.png diff --git a/Resources/img/ribbons/battlememory2.png b/Resources/img/ribbons/ribboncountmemorybattle2.png similarity index 100% rename from Resources/img/ribbons/battlememory2.png rename to Resources/img/ribbons/ribboncountmemorybattle2.png diff --git a/Resources/img/ribbons/contestmemory.png b/Resources/img/ribbons/ribboncountmemorycontest.png similarity index 100% rename from Resources/img/ribbons/contestmemory.png rename to Resources/img/ribbons/ribboncountmemorycontest.png diff --git a/Resources/img/ribbons/contestmemory2.png b/Resources/img/ribbons/ribboncountmemorycontest2.png similarity index 100% rename from Resources/img/ribbons/contestmemory2.png rename to Resources/img/ribbons/ribboncountmemorycontest2.png diff --git a/Resources/img/ribbons/country.png b/Resources/img/ribbons/ribboncountry.png similarity index 100% rename from Resources/img/ribbons/country.png rename to Resources/img/ribbons/ribboncountry.png diff --git a/Resources/img/ribbons/downcast.png b/Resources/img/ribbons/ribbondowncast.png similarity index 100% rename from Resources/img/ribbons/downcast.png rename to Resources/img/ribbons/ribbondowncast.png diff --git a/Resources/img/ribbons/earth.png b/Resources/img/ribbons/ribbonearth.png similarity index 100% rename from Resources/img/ribbons/earth.png rename to Resources/img/ribbons/ribbonearth.png diff --git a/Resources/img/ribbons/effort.png b/Resources/img/ribbons/ribboneffort.png similarity index 100% rename from Resources/img/ribbons/effort.png rename to Resources/img/ribbons/ribboneffort.png diff --git a/Resources/img/ribbons/event.png b/Resources/img/ribbons/ribbonevent.png similarity index 100% rename from Resources/img/ribbons/event.png rename to Resources/img/ribbons/ribbonevent.png diff --git a/Resources/img/ribbons/footprint.png b/Resources/img/ribbons/ribbonfootprint.png similarity index 100% rename from Resources/img/ribbons/footprint.png rename to Resources/img/ribbons/ribbonfootprint.png diff --git a/Resources/img/ribbons/ribbong3beauty.png b/Resources/img/ribbons/ribbong3beauty.png new file mode 100644 index 000000000..550468fe0 Binary files /dev/null and b/Resources/img/ribbons/ribbong3beauty.png differ diff --git a/Resources/img/ribbons/ribbong3beautyhyper.png b/Resources/img/ribbons/ribbong3beautyhyper.png new file mode 100644 index 000000000..342b8a9e0 Binary files /dev/null and b/Resources/img/ribbons/ribbong3beautyhyper.png differ diff --git a/Resources/img/ribbons/ribbong3beautymaster.png b/Resources/img/ribbons/ribbong3beautymaster.png new file mode 100644 index 000000000..ca2d56bf5 Binary files /dev/null and b/Resources/img/ribbons/ribbong3beautymaster.png differ diff --git a/Resources/img/ribbons/ribbong3beautysuper.png b/Resources/img/ribbons/ribbong3beautysuper.png new file mode 100644 index 000000000..13ec2950f Binary files /dev/null and b/Resources/img/ribbons/ribbong3beautysuper.png differ diff --git a/Resources/img/ribbons/ribbong3cool.png b/Resources/img/ribbons/ribbong3cool.png new file mode 100644 index 000000000..34d3c1e1f Binary files /dev/null and b/Resources/img/ribbons/ribbong3cool.png differ diff --git a/Resources/img/ribbons/ribbong3coolhyper.png b/Resources/img/ribbons/ribbong3coolhyper.png new file mode 100644 index 000000000..d020ef905 Binary files /dev/null and b/Resources/img/ribbons/ribbong3coolhyper.png differ diff --git a/Resources/img/ribbons/ribbong3coolmaster.png b/Resources/img/ribbons/ribbong3coolmaster.png new file mode 100644 index 000000000..f119bbbb9 Binary files /dev/null and b/Resources/img/ribbons/ribbong3coolmaster.png differ diff --git a/Resources/img/ribbons/ribbong3coolsuper.png b/Resources/img/ribbons/ribbong3coolsuper.png new file mode 100644 index 000000000..5f2beae09 Binary files /dev/null and b/Resources/img/ribbons/ribbong3coolsuper.png differ diff --git a/Resources/img/ribbons/ribbong3cute.png b/Resources/img/ribbons/ribbong3cute.png new file mode 100644 index 000000000..99a7ab433 Binary files /dev/null and b/Resources/img/ribbons/ribbong3cute.png differ diff --git a/Resources/img/ribbons/ribbong3cutehyper.png b/Resources/img/ribbons/ribbong3cutehyper.png new file mode 100644 index 000000000..57348fe27 Binary files /dev/null and b/Resources/img/ribbons/ribbong3cutehyper.png differ diff --git a/Resources/img/ribbons/ribbong3cutemaster.png b/Resources/img/ribbons/ribbong3cutemaster.png new file mode 100644 index 000000000..b4d5360d7 Binary files /dev/null and b/Resources/img/ribbons/ribbong3cutemaster.png differ diff --git a/Resources/img/ribbons/ribbong3cutesuper.png b/Resources/img/ribbons/ribbong3cutesuper.png new file mode 100644 index 000000000..dd436a767 Binary files /dev/null and b/Resources/img/ribbons/ribbong3cutesuper.png differ diff --git a/Resources/img/ribbons/ribbong3smart.png b/Resources/img/ribbons/ribbong3smart.png new file mode 100644 index 000000000..5315269e3 Binary files /dev/null and b/Resources/img/ribbons/ribbong3smart.png differ diff --git a/Resources/img/ribbons/ribbong3smarthyper.png b/Resources/img/ribbons/ribbong3smarthyper.png new file mode 100644 index 000000000..862144767 Binary files /dev/null and b/Resources/img/ribbons/ribbong3smarthyper.png differ diff --git a/Resources/img/ribbons/ribbong3smartmaster.png b/Resources/img/ribbons/ribbong3smartmaster.png new file mode 100644 index 000000000..44de95765 Binary files /dev/null and b/Resources/img/ribbons/ribbong3smartmaster.png differ diff --git a/Resources/img/ribbons/ribbong3smartsuper.png b/Resources/img/ribbons/ribbong3smartsuper.png new file mode 100644 index 000000000..076aa7271 Binary files /dev/null and b/Resources/img/ribbons/ribbong3smartsuper.png differ diff --git a/Resources/img/ribbons/ribbong3tough.png b/Resources/img/ribbons/ribbong3tough.png new file mode 100644 index 000000000..370b9d150 Binary files /dev/null and b/Resources/img/ribbons/ribbong3tough.png differ diff --git a/Resources/img/ribbons/ribbong3toughhyper.png b/Resources/img/ribbons/ribbong3toughhyper.png new file mode 100644 index 000000000..197b64a97 Binary files /dev/null and b/Resources/img/ribbons/ribbong3toughhyper.png differ diff --git a/Resources/img/ribbons/ribbong3toughmaster.png b/Resources/img/ribbons/ribbong3toughmaster.png new file mode 100644 index 000000000..a613205ce Binary files /dev/null and b/Resources/img/ribbons/ribbong3toughmaster.png differ diff --git a/Resources/img/ribbons/ribbong3toughsuper.png b/Resources/img/ribbons/ribbong3toughsuper.png new file mode 100644 index 000000000..eaa280829 Binary files /dev/null and b/Resources/img/ribbons/ribbong3toughsuper.png differ diff --git a/Resources/img/ribbons/ribbong4beauty.png b/Resources/img/ribbons/ribbong4beauty.png new file mode 100644 index 000000000..4ecf4343a Binary files /dev/null and b/Resources/img/ribbons/ribbong4beauty.png differ diff --git a/Resources/img/ribbons/ribbong4beautygreat.png b/Resources/img/ribbons/ribbong4beautygreat.png new file mode 100644 index 000000000..49ce262e6 Binary files /dev/null and b/Resources/img/ribbons/ribbong4beautygreat.png differ diff --git a/Resources/img/ribbons/ribbong4beautymaster.png b/Resources/img/ribbons/ribbong4beautymaster.png new file mode 100644 index 000000000..0a2a4f120 Binary files /dev/null and b/Resources/img/ribbons/ribbong4beautymaster.png differ diff --git a/Resources/img/ribbons/ribbong4beautyultra.png b/Resources/img/ribbons/ribbong4beautyultra.png new file mode 100644 index 000000000..9986f63c3 Binary files /dev/null and b/Resources/img/ribbons/ribbong4beautyultra.png differ diff --git a/Resources/img/ribbons/ribbong4cool.png b/Resources/img/ribbons/ribbong4cool.png new file mode 100644 index 000000000..8821c7d59 Binary files /dev/null and b/Resources/img/ribbons/ribbong4cool.png differ diff --git a/Resources/img/ribbons/ribbong4coolgreat.png b/Resources/img/ribbons/ribbong4coolgreat.png new file mode 100644 index 000000000..a1d8ce065 Binary files /dev/null and b/Resources/img/ribbons/ribbong4coolgreat.png differ diff --git a/Resources/img/ribbons/ribbong4coolmaster.png b/Resources/img/ribbons/ribbong4coolmaster.png new file mode 100644 index 000000000..4ebf34aa1 Binary files /dev/null and b/Resources/img/ribbons/ribbong4coolmaster.png differ diff --git a/Resources/img/ribbons/ribbong4coolultra.png b/Resources/img/ribbons/ribbong4coolultra.png new file mode 100644 index 000000000..3a58b487a Binary files /dev/null and b/Resources/img/ribbons/ribbong4coolultra.png differ diff --git a/Resources/img/ribbons/ribbong4cute.png b/Resources/img/ribbons/ribbong4cute.png new file mode 100644 index 000000000..c8532a00d Binary files /dev/null and b/Resources/img/ribbons/ribbong4cute.png differ diff --git a/Resources/img/ribbons/ribbong4cutegreat.png b/Resources/img/ribbons/ribbong4cutegreat.png new file mode 100644 index 000000000..b208d7266 Binary files /dev/null and b/Resources/img/ribbons/ribbong4cutegreat.png differ diff --git a/Resources/img/ribbons/ribbong4cutemaster.png b/Resources/img/ribbons/ribbong4cutemaster.png new file mode 100644 index 000000000..5d2bf6dee Binary files /dev/null and b/Resources/img/ribbons/ribbong4cutemaster.png differ diff --git a/Resources/img/ribbons/ribbong4cuteultra.png b/Resources/img/ribbons/ribbong4cuteultra.png new file mode 100644 index 000000000..f3a6d1402 Binary files /dev/null and b/Resources/img/ribbons/ribbong4cuteultra.png differ diff --git a/Resources/img/ribbons/ribbong4smart.png b/Resources/img/ribbons/ribbong4smart.png new file mode 100644 index 000000000..8c96f94ec Binary files /dev/null and b/Resources/img/ribbons/ribbong4smart.png differ diff --git a/Resources/img/ribbons/ribbong4smartgreat.png b/Resources/img/ribbons/ribbong4smartgreat.png new file mode 100644 index 000000000..0bf15a4e0 Binary files /dev/null and b/Resources/img/ribbons/ribbong4smartgreat.png differ diff --git a/Resources/img/ribbons/ribbong4smartmaster.png b/Resources/img/ribbons/ribbong4smartmaster.png new file mode 100644 index 000000000..fa8be5cec Binary files /dev/null and b/Resources/img/ribbons/ribbong4smartmaster.png differ diff --git a/Resources/img/ribbons/ribbong4smartultra.png b/Resources/img/ribbons/ribbong4smartultra.png new file mode 100644 index 000000000..ab4e9e3a1 Binary files /dev/null and b/Resources/img/ribbons/ribbong4smartultra.png differ diff --git a/Resources/img/ribbons/ribbong4tough.png b/Resources/img/ribbons/ribbong4tough.png new file mode 100644 index 000000000..72b9043e8 Binary files /dev/null and b/Resources/img/ribbons/ribbong4tough.png differ diff --git a/Resources/img/ribbons/ribbong4toughgreat.png b/Resources/img/ribbons/ribbong4toughgreat.png new file mode 100644 index 000000000..f57b8ab46 Binary files /dev/null and b/Resources/img/ribbons/ribbong4toughgreat.png differ diff --git a/Resources/img/ribbons/ribbong4toughmaster.png b/Resources/img/ribbons/ribbong4toughmaster.png new file mode 100644 index 000000000..b401bc175 Binary files /dev/null and b/Resources/img/ribbons/ribbong4toughmaster.png differ diff --git a/Resources/img/ribbons/ribbong4toughultra.png b/Resources/img/ribbons/ribbong4toughultra.png new file mode 100644 index 000000000..1b31a0be9 Binary files /dev/null and b/Resources/img/ribbons/ribbong4toughultra.png differ diff --git a/Resources/img/ribbons/gorgeous.png b/Resources/img/ribbons/ribbongorgeous.png similarity index 100% rename from Resources/img/ribbons/gorgeous.png rename to Resources/img/ribbons/ribbongorgeous.png diff --git a/Resources/img/ribbons/gorgeousroyal.png b/Resources/img/ribbons/ribbongorgeousroyal.png similarity index 100% rename from Resources/img/ribbons/gorgeousroyal.png rename to Resources/img/ribbons/ribbongorgeousroyal.png diff --git a/Resources/img/ribbons/legend.png b/Resources/img/ribbons/ribbonlegend.png similarity index 100% rename from Resources/img/ribbons/legend.png rename to Resources/img/ribbons/ribbonlegend.png diff --git a/Resources/img/ribbons/ribbon_43.png b/Resources/img/ribbons/ribbonmasterbeauty.png similarity index 100% rename from Resources/img/ribbons/ribbon_43.png rename to Resources/img/ribbons/ribbonmasterbeauty.png diff --git a/Resources/img/ribbons/ribbon_45.png b/Resources/img/ribbons/ribbonmastercleverness.png similarity index 100% rename from Resources/img/ribbons/ribbon_45.png rename to Resources/img/ribbons/ribbonmastercleverness.png diff --git a/Resources/img/ribbons/ribbon_42.png b/Resources/img/ribbons/ribbonmastercoolness.png similarity index 100% rename from Resources/img/ribbons/ribbon_42.png rename to Resources/img/ribbons/ribbonmastercoolness.png diff --git a/Resources/img/ribbons/ribbon_44.png b/Resources/img/ribbons/ribbonmastercuteness.png similarity index 100% rename from Resources/img/ribbons/ribbon_44.png rename to Resources/img/ribbons/ribbonmastercuteness.png diff --git a/Resources/img/ribbons/ribbon_46.png b/Resources/img/ribbons/ribbonmastertoughness.png similarity index 100% rename from Resources/img/ribbons/ribbon_46.png rename to Resources/img/ribbons/ribbonmastertoughness.png diff --git a/Resources/img/ribbons/national.png b/Resources/img/ribbons/ribbonnational.png similarity index 100% rename from Resources/img/ribbons/national.png rename to Resources/img/ribbons/ribbonnational.png diff --git a/Resources/img/ribbons/premier.png b/Resources/img/ribbons/ribbonpremier.png similarity index 100% rename from Resources/img/ribbons/premier.png rename to Resources/img/ribbons/ribbonpremier.png diff --git a/Resources/img/ribbons/record.png b/Resources/img/ribbons/ribbonrecord.png similarity index 100% rename from Resources/img/ribbons/record.png rename to Resources/img/ribbons/ribbonrecord.png diff --git a/Resources/img/ribbons/relax.png b/Resources/img/ribbons/ribbonrelax.png similarity index 100% rename from Resources/img/ribbons/relax.png rename to Resources/img/ribbons/ribbonrelax.png diff --git a/Resources/img/ribbons/royal.png b/Resources/img/ribbons/ribbonroyal.png similarity index 100% rename from Resources/img/ribbons/royal.png rename to Resources/img/ribbons/ribbonroyal.png diff --git a/Resources/img/ribbons/shock.png b/Resources/img/ribbons/ribbonshock.png similarity index 100% rename from Resources/img/ribbons/shock.png rename to Resources/img/ribbons/ribbonshock.png diff --git a/Resources/img/ribbons/smile.png b/Resources/img/ribbons/ribbonsmile.png similarity index 100% rename from Resources/img/ribbons/smile.png rename to Resources/img/ribbons/ribbonsmile.png diff --git a/Resources/img/ribbons/snooze.png b/Resources/img/ribbons/ribbonsnooze.png similarity index 100% rename from Resources/img/ribbons/snooze.png rename to Resources/img/ribbons/ribbonsnooze.png diff --git a/Resources/img/ribbons/souvenir.png b/Resources/img/ribbons/ribbonsouvenir.png similarity index 100% rename from Resources/img/ribbons/souvenir.png rename to Resources/img/ribbons/ribbonsouvenir.png diff --git a/Resources/img/ribbons/special.png b/Resources/img/ribbons/ribbonspecial.png similarity index 100% rename from Resources/img/ribbons/special.png rename to Resources/img/ribbons/ribbonspecial.png diff --git a/Resources/img/ribbons/training.png b/Resources/img/ribbons/ribbontraining.png similarity index 100% rename from Resources/img/ribbons/training.png rename to Resources/img/ribbons/ribbontraining.png diff --git a/Resources/img/ribbons/ribbonvictory.png b/Resources/img/ribbons/ribbonvictory.png new file mode 100644 index 000000000..41ed31cb0 Binary files /dev/null and b/Resources/img/ribbons/ribbonvictory.png differ diff --git a/Resources/img/ribbons/ribbonwinning.png b/Resources/img/ribbons/ribbonwinning.png new file mode 100644 index 000000000..0083cec25 Binary files /dev/null and b/Resources/img/ribbons/ribbonwinning.png differ diff --git a/Resources/img/ribbons/wishing.png b/Resources/img/ribbons/ribbonwishing.png similarity index 100% rename from Resources/img/ribbons/wishing.png rename to Resources/img/ribbons/ribbonwishing.png diff --git a/Resources/img/ribbons/world.png b/Resources/img/ribbons/ribbonworld.png similarity index 100% rename from Resources/img/ribbons/world.png rename to Resources/img/ribbons/ribbonworld.png diff --git a/Subforms/PKM Editors/RibbMedal.Designer.cs b/Subforms/PKM Editors/RibbMedal.Designer.cs index 451d54d9d..69be36b35 100644 --- a/Subforms/PKM Editors/RibbMedal.Designer.cs +++ b/Subforms/PKM Editors/RibbMedal.Designer.cs @@ -1026,7 +1026,7 @@ // // PB_57 // - this.PB_57.Image = global::PKHeX.Properties.Resources.ribbon_40; + this.PB_57.Image = global::PKHeX.Properties.Resources.ribbonchampiong6hoenn; this.PB_57.Location = new System.Drawing.Point(13, 134); this.PB_57.Name = "PB_57"; this.PB_57.Size = new System.Drawing.Size(24, 24); @@ -1037,7 +1037,7 @@ // // PB_O5 // - this.PB_O5.Image = global::PKHeX.Properties.Resources.ribbon_46; + this.PB_O5.Image = global::PKHeX.Properties.Resources.ribbonmastertoughness; this.PB_O5.Location = new System.Drawing.Point(193, 134); this.PB_O5.Name = "PB_O5"; this.PB_O5.Size = new System.Drawing.Size(24, 24); @@ -1059,7 +1059,7 @@ // // PB_O4 // - this.PB_O4.Image = global::PKHeX.Properties.Resources.ribbon_45; + this.PB_O4.Image = global::PKHeX.Properties.Resources.ribbonmastercleverness; this.PB_O4.Location = new System.Drawing.Point(163, 134); this.PB_O4.Name = "PB_O4"; this.PB_O4.Size = new System.Drawing.Size(24, 24); @@ -1070,7 +1070,7 @@ // // PB_O0 // - this.PB_O0.Image = global::PKHeX.Properties.Resources.ribbon_41; + this.PB_O0.Image = global::PKHeX.Properties.Resources.ribbonconteststar; this.PB_O0.Location = new System.Drawing.Point(43, 134); this.PB_O0.Name = "PB_O0"; this.PB_O0.Size = new System.Drawing.Size(24, 24); @@ -1081,7 +1081,7 @@ // // PB_O3 // - this.PB_O3.Image = global::PKHeX.Properties.Resources.ribbon_44; + this.PB_O3.Image = global::PKHeX.Properties.Resources.ribbonmastercuteness; this.PB_O3.Location = new System.Drawing.Point(133, 134); this.PB_O3.Name = "PB_O3"; this.PB_O3.Size = new System.Drawing.Size(24, 24); @@ -1092,7 +1092,7 @@ // // PB_O2 // - this.PB_O2.Image = global::PKHeX.Properties.Resources.ribbon_43; + this.PB_O2.Image = global::PKHeX.Properties.Resources.ribbonmasterbeauty; this.PB_O2.Location = new System.Drawing.Point(103, 134); this.PB_O2.Name = "PB_O2"; this.PB_O2.Size = new System.Drawing.Size(24, 24); @@ -1103,7 +1103,7 @@ // // PB_O1 // - this.PB_O1.Image = global::PKHeX.Properties.Resources.ribbon_42; + this.PB_O1.Image = global::PKHeX.Properties.Resources.ribbonmastercoolness; this.PB_O1.Location = new System.Drawing.Point(73, 134); this.PB_O1.Name = "PB_O1"; this.PB_O1.Size = new System.Drawing.Size(24, 24); @@ -1183,7 +1183,7 @@ // // PastBattle // - this.PastBattle.Image = global::PKHeX.Properties.Resources.battlememory; + this.PastBattle.Image = global::PKHeX.Properties.Resources.ribboncountmemorybattle; this.PastBattle.Location = new System.Drawing.Point(164, 167); this.PastBattle.Name = "PastBattle"; this.PastBattle.Size = new System.Drawing.Size(40, 40); @@ -1193,7 +1193,7 @@ // // PastContest // - this.PastContest.Image = global::PKHeX.Properties.Resources.contestmemory; + this.PastContest.Image = global::PKHeX.Properties.Resources.ribboncountmemorycontest; this.PastContest.Location = new System.Drawing.Point(164, 127); this.PastContest.Name = "PastContest"; this.PastContest.Size = new System.Drawing.Size(40, 40); @@ -1203,7 +1203,7 @@ // // PB_54 // - this.PB_54.Image = global::PKHeX.Properties.Resources.worldchamp; + this.PB_54.Image = global::PKHeX.Properties.Resources.ribbonchampionworld; this.PB_54.Location = new System.Drawing.Point(163, 101); this.PB_54.Name = "PB_54"; this.PB_54.Size = new System.Drawing.Size(24, 24); @@ -1214,7 +1214,7 @@ // // PB_50 // - this.PB_50.Image = global::PKHeX.Properties.Resources.wishing; + this.PB_50.Image = global::PKHeX.Properties.Resources.ribbonwishing; this.PB_50.Location = new System.Drawing.Point(43, 101); this.PB_50.Name = "PB_50"; this.PB_50.Size = new System.Drawing.Size(24, 24); @@ -1225,7 +1225,7 @@ // // PB_53 // - this.PB_53.Image = global::PKHeX.Properties.Resources.nationalchamp; + this.PB_53.Image = global::PKHeX.Properties.Resources.ribbonchampionnational; this.PB_53.Location = new System.Drawing.Point(133, 101); this.PB_53.Name = "PB_53"; this.PB_53.Size = new System.Drawing.Size(24, 24); @@ -1236,7 +1236,7 @@ // // PB_52 // - this.PB_52.Image = global::PKHeX.Properties.Resources.regionalchamp; + this.PB_52.Image = global::PKHeX.Properties.Resources.ribbonchampionregional; this.PB_52.Location = new System.Drawing.Point(103, 101); this.PB_52.Name = "PB_52"; this.PB_52.Size = new System.Drawing.Size(24, 24); @@ -1247,7 +1247,7 @@ // // PB_51 // - this.PB_51.Image = global::PKHeX.Properties.Resources.battlechamp; + this.PB_51.Image = global::PKHeX.Properties.Resources.ribbonchampionbattle; this.PB_51.Location = new System.Drawing.Point(73, 101); this.PB_51.Name = "PB_51"; this.PB_51.Size = new System.Drawing.Size(24, 24); @@ -1404,7 +1404,7 @@ // // PB_47 // - this.PB_47.Image = global::PKHeX.Properties.Resources.souvenir; + this.PB_47.Image = global::PKHeX.Properties.Resources.ribbonsouvenir; this.PB_47.Location = new System.Drawing.Point(198, 177); this.PB_47.Name = "PB_47"; this.PB_47.Size = new System.Drawing.Size(24, 24); @@ -1415,7 +1415,7 @@ // // PB_46 // - this.PB_46.Image = global::PKHeX.Properties.Resources.special; + this.PB_46.Image = global::PKHeX.Properties.Resources.ribbonspecial; this.PB_46.Location = new System.Drawing.Point(171, 177); this.PB_46.Name = "PB_46"; this.PB_46.Size = new System.Drawing.Size(24, 24); @@ -1426,7 +1426,7 @@ // // PB_45 // - this.PB_45.Image = global::PKHeX.Properties.Resources.birthday; + this.PB_45.Image = global::PKHeX.Properties.Resources.ribbonbirthday; this.PB_45.Location = new System.Drawing.Point(144, 177); this.PB_45.Name = "PB_45"; this.PB_45.Size = new System.Drawing.Size(24, 24); @@ -1437,7 +1437,7 @@ // // PB_44 // - this.PB_44.Image = global::PKHeX.Properties.Resources._event; + this.PB_44.Image = global::PKHeX.Properties.Resources.ribbonevent; this.PB_44.Location = new System.Drawing.Point(117, 177); this.PB_44.Name = "PB_44"; this.PB_44.Size = new System.Drawing.Size(24, 24); @@ -1448,7 +1448,7 @@ // // PB_43 // - this.PB_43.Image = global::PKHeX.Properties.Resources.premier; + this.PB_43.Image = global::PKHeX.Properties.Resources.ribbonpremier; this.PB_43.Location = new System.Drawing.Point(89, 177); this.PB_43.Name = "PB_43"; this.PB_43.Size = new System.Drawing.Size(24, 24); @@ -1459,7 +1459,7 @@ // // PB_42 // - this.PB_42.Image = global::PKHeX.Properties.Resources.classic; + this.PB_42.Image = global::PKHeX.Properties.Resources.ribbonclassic; this.PB_42.Location = new System.Drawing.Point(62, 177); this.PB_42.Name = "PB_42"; this.PB_42.Size = new System.Drawing.Size(24, 24); @@ -1470,7 +1470,7 @@ // // PB_41 // - this.PB_41.Image = global::PKHeX.Properties.Resources.world; + this.PB_41.Image = global::PKHeX.Properties.Resources.ribbonworld; this.PB_41.Location = new System.Drawing.Point(35, 177); this.PB_41.Name = "PB_41"; this.PB_41.Size = new System.Drawing.Size(24, 24); @@ -1481,7 +1481,7 @@ // // PB_40 // - this.PB_40.Image = global::PKHeX.Properties.Resources.earth; + this.PB_40.Image = global::PKHeX.Properties.Resources.ribbonearth; this.PB_40.Location = new System.Drawing.Point(8, 177); this.PB_40.Name = "PB_40"; this.PB_40.Size = new System.Drawing.Size(24, 24); @@ -1492,7 +1492,7 @@ // // PB_37 // - this.PB_37.Image = global::PKHeX.Properties.Resources.national; + this.PB_37.Image = global::PKHeX.Properties.Resources.ribbonnational; this.PB_37.Location = new System.Drawing.Point(198, 147); this.PB_37.Name = "PB_37"; this.PB_37.Size = new System.Drawing.Size(24, 24); @@ -1503,7 +1503,7 @@ // // PB_36 // - this.PB_36.Image = global::PKHeX.Properties.Resources.country; + this.PB_36.Image = global::PKHeX.Properties.Resources.ribboncountry; this.PB_36.Location = new System.Drawing.Point(171, 147); this.PB_36.Name = "PB_36"; this.PB_36.Size = new System.Drawing.Size(24, 24); @@ -1514,7 +1514,7 @@ // // PB_35 // - this.PB_35.Image = global::PKHeX.Properties.Resources.legend; + this.PB_35.Image = global::PKHeX.Properties.Resources.ribbonlegend; this.PB_35.Location = new System.Drawing.Point(144, 147); this.PB_35.Name = "PB_35"; this.PB_35.Size = new System.Drawing.Size(24, 24); @@ -1525,7 +1525,7 @@ // // PB_34 // - this.PB_34.Image = global::PKHeX.Properties.Resources.record; + this.PB_34.Image = global::PKHeX.Properties.Resources.ribbonrecord; this.PB_34.Location = new System.Drawing.Point(117, 147); this.PB_34.Name = "PB_34"; this.PB_34.Size = new System.Drawing.Size(24, 24); @@ -1536,7 +1536,7 @@ // // PB_33 // - this.PB_33.Image = global::PKHeX.Properties.Resources.footprint; + this.PB_33.Image = global::PKHeX.Properties.Resources.ribbonfootprint; this.PB_33.Location = new System.Drawing.Point(89, 147); this.PB_33.Name = "PB_33"; this.PB_33.Size = new System.Drawing.Size(24, 24); @@ -1547,7 +1547,7 @@ // // PB_32 // - this.PB_32.Image = global::PKHeX.Properties.Resources.artist; + this.PB_32.Image = global::PKHeX.Properties.Resources.ribbonartist; this.PB_32.Location = new System.Drawing.Point(62, 147); this.PB_32.Name = "PB_32"; this.PB_32.Size = new System.Drawing.Size(24, 24); @@ -1558,7 +1558,7 @@ // // PB_31 // - this.PB_31.Image = global::PKHeX.Properties.Resources.gorgeousroyal; + this.PB_31.Image = global::PKHeX.Properties.Resources.ribbongorgeousroyal; this.PB_31.Location = new System.Drawing.Point(35, 147); this.PB_31.Name = "PB_31"; this.PB_31.Size = new System.Drawing.Size(24, 24); @@ -1569,7 +1569,7 @@ // // PB_30 // - this.PB_30.Image = global::PKHeX.Properties.Resources.royal; + this.PB_30.Image = global::PKHeX.Properties.Resources.ribbonroyal; this.PB_30.Location = new System.Drawing.Point(8, 147); this.PB_30.Name = "PB_30"; this.PB_30.Size = new System.Drawing.Size(24, 24); @@ -1797,7 +1797,7 @@ // // PB_27 // - this.PB_27.Image = global::PKHeX.Properties.Resources.gorgeous; + this.PB_27.Image = global::PKHeX.Properties.Resources.ribbongorgeous; this.PB_27.Location = new System.Drawing.Point(198, 177); this.PB_27.Name = "PB_27"; this.PB_27.Size = new System.Drawing.Size(24, 24); @@ -1808,7 +1808,7 @@ // // PB_26 // - this.PB_26.Image = global::PKHeX.Properties.Resources.smile; + this.PB_26.Image = global::PKHeX.Properties.Resources.ribbonsmile; this.PB_26.Location = new System.Drawing.Point(171, 177); this.PB_26.Name = "PB_26"; this.PB_26.Size = new System.Drawing.Size(24, 24); @@ -1819,7 +1819,7 @@ // // PB_25 // - this.PB_25.Image = global::PKHeX.Properties.Resources.snooze; + this.PB_25.Image = global::PKHeX.Properties.Resources.ribbonsnooze; this.PB_25.Location = new System.Drawing.Point(144, 177); this.PB_25.Name = "PB_25"; this.PB_25.Size = new System.Drawing.Size(24, 24); @@ -1830,7 +1830,7 @@ // // PB_24 // - this.PB_24.Image = global::PKHeX.Properties.Resources.relax; + this.PB_24.Image = global::PKHeX.Properties.Resources.ribbonrelax; this.PB_24.Location = new System.Drawing.Point(117, 177); this.PB_24.Name = "PB_24"; this.PB_24.Size = new System.Drawing.Size(24, 24); @@ -1841,7 +1841,7 @@ // // PB_23 // - this.PB_23.Image = global::PKHeX.Properties.Resources.careless; + this.PB_23.Image = global::PKHeX.Properties.Resources.ribboncareless; this.PB_23.Location = new System.Drawing.Point(89, 177); this.PB_23.Name = "PB_23"; this.PB_23.Size = new System.Drawing.Size(24, 24); @@ -1852,7 +1852,7 @@ // // PB_22 // - this.PB_22.Image = global::PKHeX.Properties.Resources.downcast; + this.PB_22.Image = global::PKHeX.Properties.Resources.ribbondowncast; this.PB_22.Location = new System.Drawing.Point(62, 177); this.PB_22.Name = "PB_22"; this.PB_22.Size = new System.Drawing.Size(24, 24); @@ -1863,7 +1863,7 @@ // // PB_21 // - this.PB_21.Image = global::PKHeX.Properties.Resources.shock; + this.PB_21.Image = global::PKHeX.Properties.Resources.ribbonshock; this.PB_21.Location = new System.Drawing.Point(35, 177); this.PB_21.Name = "PB_21"; this.PB_21.Size = new System.Drawing.Size(24, 24); @@ -1874,7 +1874,7 @@ // // PB_20 // - this.PB_20.Image = global::PKHeX.Properties.Resources.alert; + this.PB_20.Image = global::PKHeX.Properties.Resources.ribbonalert; this.PB_20.Location = new System.Drawing.Point(8, 177); this.PB_20.Name = "PB_20"; this.PB_20.Size = new System.Drawing.Size(24, 24); @@ -1885,7 +1885,7 @@ // // PB_17 // - this.PB_17.Image = global::PKHeX.Properties.Resources.effort; + this.PB_17.Image = global::PKHeX.Properties.Resources.ribboneffort; this.PB_17.Location = new System.Drawing.Point(198, 147); this.PB_17.Name = "PB_17"; this.PB_17.Size = new System.Drawing.Size(24, 24); @@ -1896,7 +1896,7 @@ // // PB_16 // - this.PB_16.Image = global::PKHeX.Properties.Resources.expertbattler; + this.PB_16.Image = global::PKHeX.Properties.Resources.ribbonbattlerexpert; this.PB_16.Location = new System.Drawing.Point(171, 147); this.PB_16.Name = "PB_16"; this.PB_16.Size = new System.Drawing.Size(24, 24); @@ -1907,7 +1907,7 @@ // // PB_15 // - this.PB_15.Image = global::PKHeX.Properties.Resources.skillfullbattler; + this.PB_15.Image = global::PKHeX.Properties.Resources.ribbonbattlerskillful; this.PB_15.Location = new System.Drawing.Point(144, 147); this.PB_15.Name = "PB_15"; this.PB_15.Size = new System.Drawing.Size(24, 24); @@ -1918,7 +1918,7 @@ // // PB_14 // - this.PB_14.Image = global::PKHeX.Properties.Resources.training; + this.PB_14.Image = global::PKHeX.Properties.Resources.ribbontraining; this.PB_14.Location = new System.Drawing.Point(117, 147); this.PB_14.Name = "PB_14"; this.PB_14.Size = new System.Drawing.Size(24, 24); @@ -1929,7 +1929,7 @@ // // PB_13 // - this.PB_13.Image = global::PKHeX.Properties.Resources.bestfriends; + this.PB_13.Image = global::PKHeX.Properties.Resources.ribbonbestfriends; this.PB_13.Location = new System.Drawing.Point(89, 147); this.PB_13.Name = "PB_13"; this.PB_13.Size = new System.Drawing.Size(24, 24); @@ -1940,7 +1940,7 @@ // // PB_12 // - this.PB_12.Image = global::PKHeX.Properties.Resources.sinnohchamp; + this.PB_12.Image = global::PKHeX.Properties.Resources.ribbonchampionsinnoh; this.PB_12.Location = new System.Drawing.Point(62, 147); this.PB_12.Name = "PB_12"; this.PB_12.Size = new System.Drawing.Size(24, 24); @@ -1951,7 +1951,7 @@ // // PB_11 // - this.PB_11.Image = global::PKHeX.Properties.Resources.hoennchamp; + this.PB_11.Image = global::PKHeX.Properties.Resources.ribbonchampiong3hoenn; this.PB_11.Location = new System.Drawing.Point(35, 147); this.PB_11.Name = "PB_11"; this.PB_11.Size = new System.Drawing.Size(24, 24); @@ -1962,7 +1962,7 @@ // // PB_10 // - this.PB_10.Image = global::PKHeX.Properties.Resources.kaloschamp; + this.PB_10.Image = global::PKHeX.Properties.Resources.ribbonchampionkalos; this.PB_10.Location = new System.Drawing.Point(8, 147); this.PB_10.Name = "PB_10"; this.PB_10.Size = new System.Drawing.Size(24, 24); diff --git a/Subforms/PKM Editors/RibbMedal.cs b/Subforms/PKM Editors/RibbMedal.cs index c33c5ddb3..668d05d7e 100644 --- a/Subforms/PKM Editors/RibbMedal.cs +++ b/Subforms/PKM Editors/RibbMedal.cs @@ -363,14 +363,14 @@ namespace PKHeX { var val = Util.ToInt32(TB_PastContest.Text); if (val > 40) { TB_PastContest.Text = 40.ToString(); return; } - PastContest.Image = Util.ChangeOpacity(val < 40 ? Properties.Resources.contestmemory : Properties.Resources.contestmemory2, + PastContest.Image = Util.ChangeOpacity(val < 40 ? Properties.Resources.ribboncountmemorycontest : Properties.Resources.ribboncountmemorycontest2, (val != 0 ? 1 : 0) * 0.9 + 0.1); } else { var val = Util.ToInt32(TB_PastBattle.Text); if (val > 8) { TB_PastBattle.Text = 8.ToString(); return; } - PastBattle.Image = Util.ChangeOpacity(Util.ToUInt32(TB_PastBattle.Text) < 40 ? Properties.Resources.battlememory : Properties.Resources.battlememory2, + PastBattle.Image = Util.ChangeOpacity(Util.ToUInt32(TB_PastBattle.Text) < 40 ? Properties.Resources.ribboncountmemorybattle : Properties.Resources.ribboncountmemorybattle2, (val != 0 ? 1 : 0) * 0.9 + 0.1); } } diff --git a/Subforms/PKM Editors/RibbonEditor.Designer.cs b/Subforms/PKM Editors/RibbonEditor.Designer.cs index e44f67fdd..a09a92cb6 100644 --- a/Subforms/PKM Editors/RibbonEditor.Designer.cs +++ b/Subforms/PKM Editors/RibbonEditor.Designer.cs @@ -122,7 +122,7 @@ this.SPLIT_Ribbons.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.SPLIT_Ribbons.Panel2MinSize = 1; this.SPLIT_Ribbons.Size = new System.Drawing.Size(394, 229); - this.SPLIT_Ribbons.SplitterDistance = 150; + this.SPLIT_Ribbons.SplitterDistance = 180; this.SPLIT_Ribbons.SplitterWidth = 1; this.SPLIT_Ribbons.TabIndex = 7; // @@ -132,7 +132,7 @@ this.FLP_Ribbons.Dock = System.Windows.Forms.DockStyle.Fill; this.FLP_Ribbons.Location = new System.Drawing.Point(0, 0); this.FLP_Ribbons.Name = "FLP_Ribbons"; - this.FLP_Ribbons.Size = new System.Drawing.Size(148, 227); + this.FLP_Ribbons.Size = new System.Drawing.Size(178, 227); this.FLP_Ribbons.TabIndex = 5; // // TLP_Ribbons @@ -147,10 +147,10 @@ this.TLP_Ribbons.Name = "TLP_Ribbons"; this.TLP_Ribbons.RowCount = 1; this.TLP_Ribbons.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.TLP_Ribbons.Size = new System.Drawing.Size(241, 227); + this.TLP_Ribbons.Size = new System.Drawing.Size(211, 227); this.TLP_Ribbons.TabIndex = 3; // - // RibbMedal2 + // RibbonEditor // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; diff --git a/Subforms/PKM Editors/RibbonEditor.cs b/Subforms/PKM Editors/RibbonEditor.cs index 3c3f11a76..fd3b9bbdb 100644 --- a/Subforms/PKM Editors/RibbonEditor.cs +++ b/Subforms/PKM Editors/RibbonEditor.cs @@ -14,7 +14,10 @@ namespace PKHeX int vertScrollWidth = SystemInformation.VerticalScrollBarWidth; TLP_Ribbons.Padding = FLP_Ribbons.Padding = new Padding(0, 0, vertScrollWidth, 0); + // Updating a Control display with autosized elements on every row addition is cpu intensive. Disable layout updates while populating. + TLP_Ribbons.SuspendLayout(); populateRibbons(); + TLP_Ribbons.ResumeLayout(); } private readonly List riblist = new List(); @@ -64,10 +67,12 @@ namespace PKHeX } private void addRibbonSprite(RibbonInfo rib) { - PictureBox pb = new PictureBox { AutoSize = true, Visible = false, Name = PrefixPB + rib.Name }; + PictureBox pb = new PictureBox { AutoSize = false, Size = new Size(40,40), BackgroundImageLayout = ImageLayout.Center, Visible = false, Name = PrefixPB + rib.Name }; var img = Properties.Resources.ResourceManager.GetObject(rib.Name.ToLower()); if (img != null) - pb.Image = (Image)img; + pb.BackgroundImage = (Image)img; + if (img == null) + return; FLP_Ribbons.Controls.Add(pb); } @@ -104,7 +109,15 @@ namespace PKHeX nud.Maximum = 8; else nud.Maximum = 4; // g3 contest ribbons - nud.ValueChanged += (sender, e) => { rib.RibbonCount = (int)nud.Value; FLP_Ribbons.Controls[PrefixPB + rib.Name].Visible = rib.RibbonCount > 0; }; + nud.ValueChanged += (sender, e) => + { + rib.RibbonCount = (int)nud.Value; + FLP_Ribbons.Controls[PrefixPB + rib.Name].Visible = rib.RibbonCount > 0; + if (nud.Maximum == nud.Value && nud.Maximum > 4) + FLP_Ribbons.Controls[PrefixPB + rib.Name].BackgroundImage = (Image)Properties.Resources.ResourceManager.GetObject(rib.Name.ToLower() +"2"); + else + FLP_Ribbons.Controls[PrefixPB + rib.Name].BackgroundImage = (Image)Properties.Resources.ResourceManager.GetObject(rib.Name.ToLower()); + }; nud.Value = rib.RibbonCount > nud.Maximum ? nud.Maximum : rib.RibbonCount; TLP_Ribbons.Controls.Add(nud, 0, row); } diff --git a/Subforms/PKM Editors/SuperTrainingEditor.cs b/Subforms/PKM Editors/SuperTrainingEditor.cs index 203e07be6..bb00c8d91 100644 --- a/Subforms/PKM Editors/SuperTrainingEditor.cs +++ b/Subforms/PKM Editors/SuperTrainingEditor.cs @@ -12,9 +12,14 @@ namespace PKHeX InitializeComponent(); int vertScrollWidth = SystemInformation.VerticalScrollBarWidth; TLP_SuperTrain.Padding = TLP_DistSuperTrain.Padding = new Padding(0, 0, vertScrollWidth, 0); - + + // Updating a Control display with autosized elements on every row addition is cpu intensive. Disable layout updates while populating. + TLP_SuperTrain.SuspendLayout(); + TLP_DistSuperTrain.SuspendLayout(); populateRegimens("SuperTrain", TLP_SuperTrain, reglist); populateRegimens("DistSuperTrain", TLP_DistSuperTrain, distlist); + TLP_SuperTrain.ResumeLayout(); + TLP_DistSuperTrain.ResumeLayout(); CB_Bag.Items.Clear(); CB_Bag.Items.Add("---"); @@ -24,6 +29,9 @@ namespace PKHeX if (pkm is PK6) { PK6 pk6 = (PK6)pkm; + CHK_Secret.Checked = pk6.SecretSuperTraining; + if (!CHK_Secret.Checked) // force update to disable checkboxes + CHK_Secret_CheckedChanged(null, null); CB_Bag.SelectedIndex = pk6.TrainingBag; NUD_BagHits.Value = pk6.TrainingBagHits; } @@ -97,10 +105,12 @@ namespace PKHeX foreach (var reg in distlist) ReflectUtil.SetValue(pkm, reg.Name, reg.CompletedRegimen); - if (CB_Bag.Visible) + if (pkm is PK6) { - (pkm as PK6).TrainingBag = CB_Bag.SelectedIndex; - (pkm as PK6).TrainingBagHits = (int)NUD_BagHits.Value; + PK6 pk6 = (PK6)pkm; + pk6.SecretSuperTraining = CHK_Secret.Checked; + pk6.TrainingBag = CB_Bag.SelectedIndex; + pk6.TrainingBagHits = (int)NUD_BagHits.Value; } Main.pkm = pkm;