From 752ddc1a88cdae903c3bc2c9ddbf8f6397d2eb90 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Fri, 4 Feb 2022 17:22:33 -0800
Subject: [PATCH] Move SWSH save abstractions to subfolder

---
 PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/Box8.cs        | 0
 PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/BoxLayout8.cs  | 0
 PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/Daycare8.cs    | 0
 .../Saves/Substructures/Gen8/{ => SWSH}/FashionUnlock8.cs     | 0
 .../Substructures/Gen8/{ => SWSH}/FieldMoveModelSave8.cs      | 0
 PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/Fused8.cs      | 0
 .../Saves/Substructures/Gen8/{ => SWSH}/HallOfFameTime8.cs    | 0
 PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/Misc8.cs       | 0
 PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/MyItem8.cs     | 0
 PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/MyStatus8.cs   | 2 +-
 PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/Party8.cs      | 4 ++--
 PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/PlayTime8.cs   | 0
 PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/PouchSize8.cs  | 0
 .../Saves/Substructures/Gen8/{ => SWSH}/RaidSpawnList8.cs     | 0
 PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/Record8.cs     | 0
 PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/RentalTeam8.cs | 0
 .../Saves/Substructures/Gen8/{ => SWSH}/TeamIndexes8.cs       | 0
 .../Saves/Substructures/Gen8/{ => SWSH}/TitleScreen8.cs       | 0
 .../Saves/Substructures/Gen8/{ => SWSH}/TrainerCard8.cs       | 0
 19 files changed, 3 insertions(+), 3 deletions(-)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/Box8.cs (100%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/BoxLayout8.cs (100%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/Daycare8.cs (100%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/FashionUnlock8.cs (100%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/FieldMoveModelSave8.cs (100%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/Fused8.cs (100%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/HallOfFameTime8.cs (100%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/Misc8.cs (100%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/MyItem8.cs (100%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/MyStatus8.cs (98%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/Party8.cs (75%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/PlayTime8.cs (100%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/PouchSize8.cs (100%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/RaidSpawnList8.cs (100%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/Record8.cs (100%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/RentalTeam8.cs (100%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/TeamIndexes8.cs (100%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/TitleScreen8.cs (100%)
 rename PKHeX.Core/Saves/Substructures/Gen8/{ => SWSH}/TrainerCard8.cs (100%)

diff --git a/PKHeX.Core/Saves/Substructures/Gen8/Box8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/Box8.cs
similarity index 100%
rename from PKHeX.Core/Saves/Substructures/Gen8/Box8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/Box8.cs
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/BoxLayout8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/BoxLayout8.cs
similarity index 100%
rename from PKHeX.Core/Saves/Substructures/Gen8/BoxLayout8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/BoxLayout8.cs
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/Daycare8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/Daycare8.cs
similarity index 100%
rename from PKHeX.Core/Saves/Substructures/Gen8/Daycare8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/Daycare8.cs
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/FashionUnlock8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/FashionUnlock8.cs
similarity index 100%
rename from PKHeX.Core/Saves/Substructures/Gen8/FashionUnlock8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/FashionUnlock8.cs
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/FieldMoveModelSave8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/FieldMoveModelSave8.cs
similarity index 100%
rename from PKHeX.Core/Saves/Substructures/Gen8/FieldMoveModelSave8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/FieldMoveModelSave8.cs
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/Fused8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/Fused8.cs
similarity index 100%
rename from PKHeX.Core/Saves/Substructures/Gen8/Fused8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/Fused8.cs
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/HallOfFameTime8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/HallOfFameTime8.cs
similarity index 100%
rename from PKHeX.Core/Saves/Substructures/Gen8/HallOfFameTime8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/HallOfFameTime8.cs
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/Misc8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/Misc8.cs
similarity index 100%
rename from PKHeX.Core/Saves/Substructures/Gen8/Misc8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/Misc8.cs
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/MyItem8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/MyItem8.cs
similarity index 100%
rename from PKHeX.Core/Saves/Substructures/Gen8/MyItem8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/MyItem8.cs
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/MyStatus8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/MyStatus8.cs
similarity index 98%
rename from PKHeX.Core/Saves/Substructures/Gen8/MyStatus8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/MyStatus8.cs
index 53de75541..876e65087 100644
--- a/PKHeX.Core/Saves/Substructures/Gen8/MyStatus8.cs
+++ b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/MyStatus8.cs
@@ -162,7 +162,7 @@ public int Language
             }
         }
 
-        private Span<byte> OT_Trash =>Data.AsSpan(0xB0, 0x1A);
+        private Span<byte> OT_Trash => Data.AsSpan(0xB0, 0x1A);
 
         public string OT
         {
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/Party8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/Party8.cs
similarity index 75%
rename from PKHeX.Core/Saves/Substructures/Gen8/Party8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/Party8.cs
index d15250ca1..1072edb1f 100644
--- a/PKHeX.Core/Saves/Substructures/Gen8/Party8.cs
+++ b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/Party8.cs
@@ -2,7 +2,7 @@
 {
     public sealed class Party8 : SaveBlock
     {
-        public Party8(SaveFile sav, SCBlock block) : base(sav, block.Data) { }
+        public Party8(SAV8 sav, SCBlock block) : base(sav, block.Data) { }
 
         public int PartyCount
         {
@@ -10,4 +10,4 @@ public int PartyCount
             set => Data[6 * PokeCrypto.SIZE_8PARTY] = (byte)value;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/PlayTime8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/PlayTime8.cs
similarity index 100%
rename from PKHeX.Core/Saves/Substructures/Gen8/PlayTime8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/PlayTime8.cs
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/PouchSize8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/PouchSize8.cs
similarity index 100%
rename from PKHeX.Core/Saves/Substructures/Gen8/PouchSize8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/PouchSize8.cs
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/RaidSpawnList8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/RaidSpawnList8.cs
similarity index 100%
rename from PKHeX.Core/Saves/Substructures/Gen8/RaidSpawnList8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/RaidSpawnList8.cs
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/Record8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/Record8.cs
similarity index 100%
rename from PKHeX.Core/Saves/Substructures/Gen8/Record8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/Record8.cs
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/RentalTeam8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/RentalTeam8.cs
similarity index 100%
rename from PKHeX.Core/Saves/Substructures/Gen8/RentalTeam8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/RentalTeam8.cs
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/TeamIndexes8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/TeamIndexes8.cs
similarity index 100%
rename from PKHeX.Core/Saves/Substructures/Gen8/TeamIndexes8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/TeamIndexes8.cs
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/TitleScreen8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/TitleScreen8.cs
similarity index 100%
rename from PKHeX.Core/Saves/Substructures/Gen8/TitleScreen8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/TitleScreen8.cs
diff --git a/PKHeX.Core/Saves/Substructures/Gen8/TrainerCard8.cs b/PKHeX.Core/Saves/Substructures/Gen8/SWSH/TrainerCard8.cs
similarity index 100%
rename from PKHeX.Core/Saves/Substructures/Gen8/TrainerCard8.cs
rename to PKHeX.Core/Saves/Substructures/Gen8/SWSH/TrainerCard8.cs