diff --git a/PKHeX.Core/Saves/Access/SaveBlockAccessor8SWSH.cs b/PKHeX.Core/Saves/Access/SaveBlockAccessor8SWSH.cs
index c1c7d01b3..defe824c4 100644
--- a/PKHeX.Core/Saves/Access/SaveBlockAccessor8SWSH.cs
+++ b/PKHeX.Core/Saves/Access/SaveBlockAccessor8SWSH.cs
@@ -1,4 +1,7 @@
using System.Collections.Generic;
+// ReSharper disable UnusedMember.Local
+#pragma warning disable IDE0051 // Remove unused private members
+#pragma warning disable RCS1213 // Remove unused member declaration.
namespace PKHeX.Core
{
@@ -53,7 +56,7 @@ public SaveBlockAccessor8SWSH(SAV8SWSH sav)
// Arrays (Blocks)
private const uint KTeamNames = 0x1920C1E4; // Team 1, 2...6 ((10 + terminator)*6 char16 strings)
private const uint KBoxLayout = 0x19722c89; // Box Names
- private const uint KBoxWallpapers = 0x2EB1B190; // Box Wallpapers
+ public const uint KBoxWallpapers = 0x2EB1B190; // Box Wallpapers
private const uint KMenuButtons = 0xB1DDDCA8; // X Menu Button Order
// Objects (Blocks)
@@ -145,3 +148,5 @@ public SaveBlockAccessor8SWSH(SAV8SWSH sav)
public const uint KOptionShowMoves = 0x9C781AE2; // U32 OptOut Show=0
}
}
+#pragma warning restore IDE0051 // Remove unused private members
+#pragma warning restore RCS1213 // Remove unused member declaration.
diff --git a/PKHeX.Core/Saves/SAV8SWSH.cs b/PKHeX.Core/Saves/SAV8SWSH.cs
index dc077d184..263a9d429 100644
--- a/PKHeX.Core/Saves/SAV8SWSH.cs
+++ b/PKHeX.Core/Saves/SAV8SWSH.cs
@@ -122,5 +122,24 @@ public override StorageSlotFlag GetSlotFlags(int index)
}
public override int CurrentBox { get => BoxLayout.CurrentBox; set => BoxLayout.CurrentBox = value; }
+
+ public override bool HasBoxWallpapers => true;
+ public override bool HasNamableBoxes => true;
+
+ public override int GetBoxWallpaper(int box)
+ {
+ if ((uint)box >= BoxCount)
+ return box;
+ var b = Blocks.GetBlock(SaveBlockAccessor8SWSH.KBoxWallpapers);
+ return b.Data[box];
+ }
+
+ public override void SetBoxWallpaper(int box, int value)
+ {
+ if ((uint)box >= BoxCount)
+ return;
+ var b = Blocks.GetBlock(SaveBlockAccessor8SWSH.KBoxWallpapers);
+ b.Data[box] = (byte)value;
+ }
}
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Drawing/Names/BoxWallpaper.cs b/PKHeX.Drawing/Names/BoxWallpaper.cs
index 09617b710..84f39a30d 100644
--- a/PKHeX.Drawing/Names/BoxWallpaper.cs
+++ b/PKHeX.Drawing/Names/BoxWallpaper.cs
@@ -92,8 +92,14 @@ public static bool IsWallpaperRed(GameVersion version, int wallpaperID)
20 => true, // Special5 Flare/Magma
_ => false
};
- case 8: // todo swsh
- return true;
+ case 8:
+ return wallpaperID switch
+ {
+ 3 => true,
+ 11 => true,
+ 15 => true,
+ _ => false,
+ };
default:
return false;
}
diff --git a/PKHeX.Drawing/Properties/Resources.Designer.cs b/PKHeX.Drawing/Properties/Resources.Designer.cs
index db980ca7b..80a76b477 100644
--- a/PKHeX.Drawing/Properties/Resources.Designer.cs
+++ b/PKHeX.Drawing/Properties/Resources.Designer.cs
@@ -9963,9 +9963,19 @@ public class Resources {
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
- public static System.Drawing.Bitmap _449_1s {
+ public static System.Drawing.Bitmap _449f {
get {
- object obj = ResourceManager.GetObject("_449_1s", resourceCulture);
+ object obj = ResourceManager.GetObject("_449f", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _449fs {
+ get {
+ object obj = ResourceManager.GetObject("_449fs", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -22250,16 +22260,6 @@ public class Resources {
}
}
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap b_133_1 {
- get {
- object obj = ResourceManager.GetObject("b_133_1", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -22273,9 +22273,9 @@ public class Resources {
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
- public static System.Drawing.Bitmap b_133_1s {
+ public static System.Drawing.Bitmap b_133_1ps {
get {
- object obj = ResourceManager.GetObject("b_133_1s", resourceCulture);
+ object obj = ResourceManager.GetObject("b_133_1ps", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -37380,6 +37380,26 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap b_658_2 {
+ get {
+ object obj = ResourceManager.GetObject("b_658_2", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap b_658_2s {
+ get {
+ object obj = ResourceManager.GetObject("b_658_2s", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -44090,16 +44110,6 @@ public class Resources {
}
}
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap b_854_1 {
- get {
- object obj = ResourceManager.GetObject("b_854_1", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -44120,16 +44130,6 @@ public class Resources {
}
}
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap b_855_1 {
- get {
- object obj = ResourceManager.GetObject("b_855_1", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -44460,16 +44460,6 @@ public class Resources {
}
}
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap b_869 {
- get {
- object obj = ResourceManager.GetObject("b_869", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -44610,16 +44600,6 @@ public class Resources {
}
}
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap b_869_1 {
- get {
- object obj = ResourceManager.GetObject("b_869_1", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -44760,16 +44740,6 @@ public class Resources {
}
}
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap b_869_2 {
- get {
- object obj = ResourceManager.GetObject("b_869_2", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -44910,16 +44880,6 @@ public class Resources {
}
}
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap b_869_3 {
- get {
- object obj = ResourceManager.GetObject("b_869_3", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -45060,16 +45020,6 @@ public class Resources {
}
}
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap b_869_4 {
- get {
- object obj = ResourceManager.GetObject("b_869_4", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -45210,16 +45160,6 @@ public class Resources {
}
}
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap b_869_5 {
- get {
- object obj = ResourceManager.GetObject("b_869_5", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -45360,16 +45300,6 @@ public class Resources {
}
}
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap b_869_6 {
- get {
- object obj = ResourceManager.GetObject("b_869_6", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -45510,16 +45440,6 @@ public class Resources {
}
}
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap b_869_7 {
- get {
- object obj = ResourceManager.GetObject("b_869_7", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -45660,16 +45580,6 @@ public class Resources {
}
}
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap b_869_8 {
- get {
- object obj = ResourceManager.GetObject("b_869_8", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51060,6 +50970,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp01swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp01swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51110,6 +51030,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp02swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp02swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51160,6 +51090,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp03swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp03swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51210,6 +51150,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp04swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp04swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51260,6 +51210,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp05swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp05swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51310,6 +51270,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp06swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp06swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51360,6 +51330,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp07swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp07swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51410,6 +51390,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp08swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp08swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51460,6 +51450,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp09swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp09swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51510,6 +51510,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp10swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp10swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51560,6 +51570,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp11swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp11swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51610,6 +51630,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp12swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp12swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51670,6 +51700,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp13swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp13swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51730,6 +51770,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp14swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp14swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51790,6 +51840,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp15swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp15swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51850,6 +51910,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp16swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp16swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51920,6 +51990,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp17swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp17swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -51990,6 +52070,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp18swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp18swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -52060,6 +52150,16 @@ public class Resources {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap box_wp19swsh {
+ get {
+ object obj = ResourceManager.GetObject("box_wp19swsh", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
diff --git a/PKHeX.Drawing/Properties/Resources.resx b/PKHeX.Drawing/Properties/Resources.resx
index fe1c7e851..078127537 100644
--- a/PKHeX.Drawing/Properties/Resources.resx
+++ b/PKHeX.Drawing/Properties/Resources.resx
@@ -18088,4 +18088,61 @@
..\Resources\img\Big Shiny Sprites\b_9-1s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\img\box\swsh\box_wp01swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp02swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp03swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp04swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp05swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp06swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp07swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp08swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp09swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp10swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp11swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp12swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp13swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp14swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp15swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp16swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp17swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp18swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\img\box\swsh\box_wp19swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp01swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp01swsh.png
new file mode 100644
index 000000000..95a523383
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp01swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp02swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp02swsh.png
new file mode 100644
index 000000000..0c9ddca6a
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp02swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp03swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp03swsh.png
new file mode 100644
index 000000000..329308650
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp03swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp04swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp04swsh.png
new file mode 100644
index 000000000..2ff911f67
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp04swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp05swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp05swsh.png
new file mode 100644
index 000000000..a1686c422
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp05swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp06swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp06swsh.png
new file mode 100644
index 000000000..ccd88723c
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp06swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp07swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp07swsh.png
new file mode 100644
index 000000000..0f0401823
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp07swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp08swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp08swsh.png
new file mode 100644
index 000000000..f00b6c38f
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp08swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp09swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp09swsh.png
new file mode 100644
index 000000000..3bd2c4e5a
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp09swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp10swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp10swsh.png
new file mode 100644
index 000000000..80c02537d
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp10swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp11swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp11swsh.png
new file mode 100644
index 000000000..a5dce6bcc
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp11swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp12swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp12swsh.png
new file mode 100644
index 000000000..552c5defa
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp12swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp13swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp13swsh.png
new file mode 100644
index 000000000..7203471b1
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp13swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp14swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp14swsh.png
new file mode 100644
index 000000000..f17c79c3a
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp14swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp15swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp15swsh.png
new file mode 100644
index 000000000..f95b477d4
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp15swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp16swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp16swsh.png
new file mode 100644
index 000000000..dcdc74a9f
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp16swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp17swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp17swsh.png
new file mode 100644
index 000000000..48ff68da4
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp17swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp18swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp18swsh.png
new file mode 100644
index 000000000..aa9d090d9
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp18swsh.png differ
diff --git a/PKHeX.Drawing/Resources/img/box/swsh/box_wp19swsh.png b/PKHeX.Drawing/Resources/img/box/swsh/box_wp19swsh.png
new file mode 100644
index 000000000..fa4e44c7a
Binary files /dev/null and b/PKHeX.Drawing/Resources/img/box/swsh/box_wp19swsh.png differ
diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs
index cf06fde28..442b85f54 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs
@@ -49,7 +49,7 @@ private bool LoadWallpaperNames()
CB_BG.Items.AddRange(GameInfo.Strings.wallpapernames.Take(16).ToArray());
return true;
case 8:
- CB_BG.Items.AddRange(GameInfo.Strings.wallpapernames);
+ CB_BG.Items.AddRange(Enumerable.Range(1, 19).Select(z => $"Wallpaper {z}").ToArray());
return true;
default:
return false;