From bfcf081e5b83d82e6e74be28f9b4b41308a413e2 Mon Sep 17 00:00:00 2001
From: sora10pls <17801814+sora10pls@users.noreply.github.com>
Date: Thu, 5 Aug 2021 16:22:06 -0400
Subject: [PATCH] Fix XY multiplayer sprite display Reorder enums; Serena
 before Calem

---
 PKHeX.Core/Saves/SAV6XY.cs                            | 6 ++++++
 PKHeX.Core/Saves/Substructures/Gen6/TrainerSprite6.cs | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/PKHeX.Core/Saves/SAV6XY.cs b/PKHeX.Core/Saves/SAV6XY.cs
index 052dab3a8..0d96354bb 100644
--- a/PKHeX.Core/Saves/SAV6XY.cs
+++ b/PKHeX.Core/Saves/SAV6XY.cs
@@ -165,5 +165,11 @@ public bool BattleBoxLocked
         public override int Vivillon { get => Blocks.Misc.Vivillon; set => Blocks.Misc.Vivillon = value; }
         public override int Badges { get => Blocks.Misc.Badges; set => Blocks.Misc.Badges = value; }
         public override int BP { get => Blocks.Misc.BP; set => Blocks.Misc.BP = value; }
+
+        public override int MultiplayerSpriteID
+        {
+            get => Blocks.Status.MultiplayerSpriteID_1;
+            set => Blocks.Status.MultiplayerSpriteID_1 = Blocks.Status.MultiplayerSpriteID_2 = value;
+        }
     }
 }
diff --git a/PKHeX.Core/Saves/Substructures/Gen6/TrainerSprite6.cs b/PKHeX.Core/Saves/Substructures/Gen6/TrainerSprite6.cs
index 253d84f55..347b814e1 100644
--- a/PKHeX.Core/Saves/Substructures/Gen6/TrainerSprite6.cs
+++ b/PKHeX.Core/Saves/Substructures/Gen6/TrainerSprite6.cs
@@ -3,8 +3,8 @@
 #pragma warning disable CA1027 // Mark enums with FlagsAttribute
     public enum TrainerSprite6
     {
-        Calem = 00,
-        Serena = 01,
+        Serena = 00,
+        Calem = 01,
         Sycamore = 02,
         Diantha = 03,
         Wikstrom = 04,