diff --git a/NHSE.Core/Resources/byte/item_menuicon.bin b/NHSE.Core/Resources/byte/item_menuicon.bin index 4909077..cf57429 100644 Binary files a/NHSE.Core/Resources/byte/item_menuicon.bin and b/NHSE.Core/Resources/byte/item_menuicon.bin differ diff --git a/NHSE.Core/Structures/Item/ItemMenuIconType.cs b/NHSE.Core/Structures/Item/ItemMenuIconType.cs index 324089f..fbb6abd 100644 --- a/NHSE.Core/Structures/Item/ItemMenuIconType.cs +++ b/NHSE.Core/Structures/Item/ItemMenuIconType.cs @@ -5,18 +5,6 @@ namespace NHSE.Core /// public enum ItemMenuIconType : ushort { - _0x096F00E1, - _0x1178E84F, - _0x2B925207, - _0x3CD47393, - _0x599D99CA, - _0x5A07F70B, - _0x5E0B9075, - _0x631DD141, - _0x6C26EAB8, - _0x8CC66ACC, - _0xD4295E14, - _0xE3CF868D, Akoyagai, Amaebi, Anemone0, @@ -81,6 +69,11 @@ public enum ItemMenuIconType : ushort EggLeaf, EggRock, EggSky, + FeatherBlu, + FeatherGrn, + FeatherPpl, + FeatherRainbow, + FeatherRed, Fence, Fish54, FishAji, @@ -290,7 +283,9 @@ public enum ItemMenuIconType : ushort Lollipop, LostQuestMemo, Love, + MaracasCarnival, Medicine, + Megaphone, Mendako, MessageBottleEgg, Mizukurage, @@ -320,6 +315,10 @@ public enum ItemMenuIconType : ushort OreGold, OreIron, OreStone, + OtoshidamaOpenCh, + OtoshidamaOpenKr, + OtoshidamaSealCh, + OtoshidamaSealKr, Oumugai, Pachinko, Paipuuni, @@ -462,6 +461,7 @@ public enum ItemMenuIconType : ushort SnowCrystal, SnowCrystalLarge, Socks, + Soy, SparklingSoda, SquashGreen, SquashOrange, diff --git a/NHSE.Sprites/Properties/Resources.Designer.cs b/NHSE.Sprites/Properties/Resources.Designer.cs index 07bfec5..e16c4d6 100644 --- a/NHSE.Sprites/Properties/Resources.Designer.cs +++ b/NHSE.Sprites/Properties/Resources.Designer.cs @@ -8,7 +8,6 @@ // //------------------------------------------------------------------------------ -[assembly: System.Resources.NeutralResourcesLanguage("en")] namespace NHSE.Sprites.Properties { using System; @@ -2241,6 +2240,56 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap FeatherBlu { + get { + object obj = ResourceManager.GetObject("FeatherBlu", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap FeatherGrn { + get { + object obj = ResourceManager.GetObject("FeatherGrn", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap FeatherPpl { + get { + object obj = ResourceManager.GetObject("FeatherPpl", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap FeatherRainbow { + get { + object obj = ResourceManager.GetObject("FeatherRainbow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap FeatherRed { + get { + object obj = ResourceManager.GetObject("FeatherRed", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -5261,6 +5310,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap MaracasCarnival { + get { + object obj = ResourceManager.GetObject("MaracasCarnival", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -5271,6 +5330,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Megaphone { + get { + object obj = ResourceManager.GetObject("Megaphone", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -5921,6 +5990,46 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap OtoshidamaOpenCh { + get { + object obj = ResourceManager.GetObject("OtoshidamaOpenCh", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap OtoshidamaOpenKr { + get { + object obj = ResourceManager.GetObject("OtoshidamaOpenKr", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap OtoshidamaSealCh { + get { + object obj = ResourceManager.GetObject("OtoshidamaSealCh", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap OtoshidamaSealKr { + get { + object obj = ResourceManager.GetObject("OtoshidamaSealKr", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -8131,6 +8240,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Soy { + get { + object obj = ResourceManager.GetObject("Soy", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/NHSE.Sprites/Properties/Resources.resx b/NHSE.Sprites/Properties/Resources.resx index bfea8e6..1e5aaa2 100644 --- a/NHSE.Sprites/Properties/Resources.resx +++ b/NHSE.Sprites/Properties/Resources.resx @@ -772,6 +772,21 @@ ..\Resources\Villagers\elp12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\MenuIcon\FeatherBlu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\MenuIcon\FeatherGrn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\MenuIcon\FeatherPpl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\MenuIcon\FeatherRainbow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\MenuIcon\FeatherRed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\MenuIcon\Fence.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1678,9 +1693,15 @@ ..\Resources\MenuIcon\Love.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\MenuIcon\MaracasCarnival.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\MenuIcon\Medicine.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\MenuIcon\Megaphone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\MenuIcon\Mendako.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1876,6 +1897,18 @@ ..\Resources\Villagers\ost10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\MenuIcon\OtoshidamaOpenCh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\MenuIcon\OtoshidamaOpenKr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\MenuIcon\OtoshidamaSealCh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\MenuIcon\OtoshidamaSealKr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\MenuIcon\Oumugai.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -2539,6 +2572,9 @@ ..\Resources\MenuIcon\Socks.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\MenuIcon\Soy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\MenuIcon\SparklingSoda.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/NHSE.Sprites/Resources/MenuIcon/FeatherBlu.png b/NHSE.Sprites/Resources/MenuIcon/FeatherBlu.png new file mode 100644 index 0000000..dcfc0f6 Binary files /dev/null and b/NHSE.Sprites/Resources/MenuIcon/FeatherBlu.png differ diff --git a/NHSE.Sprites/Resources/MenuIcon/FeatherGrn.png b/NHSE.Sprites/Resources/MenuIcon/FeatherGrn.png new file mode 100644 index 0000000..ec09e8e Binary files /dev/null and b/NHSE.Sprites/Resources/MenuIcon/FeatherGrn.png differ diff --git a/NHSE.Sprites/Resources/MenuIcon/FeatherPpl.png b/NHSE.Sprites/Resources/MenuIcon/FeatherPpl.png new file mode 100644 index 0000000..9c0b576 Binary files /dev/null and b/NHSE.Sprites/Resources/MenuIcon/FeatherPpl.png differ diff --git a/NHSE.Sprites/Resources/MenuIcon/FeatherRainbow.png b/NHSE.Sprites/Resources/MenuIcon/FeatherRainbow.png new file mode 100644 index 0000000..f13b85e Binary files /dev/null and b/NHSE.Sprites/Resources/MenuIcon/FeatherRainbow.png differ diff --git a/NHSE.Sprites/Resources/MenuIcon/FeatherRed.png b/NHSE.Sprites/Resources/MenuIcon/FeatherRed.png new file mode 100644 index 0000000..44469ef Binary files /dev/null and b/NHSE.Sprites/Resources/MenuIcon/FeatherRed.png differ diff --git a/NHSE.Sprites/Resources/MenuIcon/MaracasCarnival.png b/NHSE.Sprites/Resources/MenuIcon/MaracasCarnival.png new file mode 100644 index 0000000..fc1faf8 Binary files /dev/null and b/NHSE.Sprites/Resources/MenuIcon/MaracasCarnival.png differ diff --git a/NHSE.Sprites/Resources/MenuIcon/Megaphone.png b/NHSE.Sprites/Resources/MenuIcon/Megaphone.png new file mode 100644 index 0000000..0ad21ff Binary files /dev/null and b/NHSE.Sprites/Resources/MenuIcon/Megaphone.png differ diff --git a/NHSE.Sprites/Resources/MenuIcon/OtoshidamaOpenCh.png b/NHSE.Sprites/Resources/MenuIcon/OtoshidamaOpenCh.png new file mode 100644 index 0000000..1a7e5ea Binary files /dev/null and b/NHSE.Sprites/Resources/MenuIcon/OtoshidamaOpenCh.png differ diff --git a/NHSE.Sprites/Resources/MenuIcon/OtoshidamaOpenKr.png b/NHSE.Sprites/Resources/MenuIcon/OtoshidamaOpenKr.png new file mode 100644 index 0000000..729fb1b Binary files /dev/null and b/NHSE.Sprites/Resources/MenuIcon/OtoshidamaOpenKr.png differ diff --git a/NHSE.Sprites/Resources/MenuIcon/OtoshidamaSealCh.png b/NHSE.Sprites/Resources/MenuIcon/OtoshidamaSealCh.png new file mode 100644 index 0000000..927164d Binary files /dev/null and b/NHSE.Sprites/Resources/MenuIcon/OtoshidamaSealCh.png differ diff --git a/NHSE.Sprites/Resources/MenuIcon/OtoshidamaSealKr.png b/NHSE.Sprites/Resources/MenuIcon/OtoshidamaSealKr.png new file mode 100644 index 0000000..efe7911 Binary files /dev/null and b/NHSE.Sprites/Resources/MenuIcon/OtoshidamaSealKr.png differ diff --git a/NHSE.Sprites/Resources/MenuIcon/Soy.png b/NHSE.Sprites/Resources/MenuIcon/Soy.png new file mode 100644 index 0000000..3ff9f0b Binary files /dev/null and b/NHSE.Sprites/Resources/MenuIcon/Soy.png differ