diff --git a/PKHeX.Core/Saves/SAV5B2W2.cs b/PKHeX.Core/Saves/SAV5B2W2.cs
index 88300b9f3..02ac9dc87 100644
--- a/PKHeX.Core/Saves/SAV5B2W2.cs
+++ b/PKHeX.Core/Saves/SAV5B2W2.cs
@@ -32,6 +32,7 @@ private void Initialize()
             CGearDataOffset = 0x52800;
             EntreeForestOffset = 0x22A00;
             PokeDex = Blocks.Zukan.PokeDex;
+            WondercardData = Blocks.MysteryBlock.Offset;
         }
 
         public override IReadOnlyList<BlockInfo> AllBlocks => Blocks.BlockInfo;
diff --git a/PKHeX.Core/Saves/SAV5BW.cs b/PKHeX.Core/Saves/SAV5BW.cs
index 62c0ec49e..9ecb0125e 100644
--- a/PKHeX.Core/Saves/SAV5BW.cs
+++ b/PKHeX.Core/Saves/SAV5BW.cs
@@ -32,6 +32,7 @@ private void Initialize()
             CGearDataOffset = 0x52000;
             EntreeForestOffset = 0x22C00;
             PokeDex = Blocks.Zukan.PokeDex;
+            WondercardData = Blocks.MysteryBlock.Offset;
         }
 
         public override IReadOnlyList<BlockInfo> AllBlocks => Blocks.BlockInfo;
diff --git a/PKHeX.Core/Saves/SAV7SM.cs b/PKHeX.Core/Saves/SAV7SM.cs
index f93a84920..acea0d20a 100644
--- a/PKHeX.Core/Saves/SAV7SM.cs
+++ b/PKHeX.Core/Saves/SAV7SM.cs
@@ -21,13 +21,16 @@ public SAV7SM() : base(SaveUtil.SIZE_G7SM, SaveBlockAccessor7SM.boSM)
 
         private void Initialize()
         {
+            Party = Blocks.BlockInfo[04].Offset;
             EventConst = Blocks.BlockInfo[05].Offset;
+            PokeDex = Blocks.BlockInfo[06].Offset;
             EventFlag = EventConst + (EventConstMax * 2); // After Event Const (u16)*n
             HoF = EventFlag + (EventFlagMax / 8); // After Event Flags (1b)*(1u8/8b)*n
 
             Blocks.BoxLayout.LoadBattleTeams();
             TeamSlots = Blocks.BoxLayout.TeamSlots;
             Box = Blocks.BlockInfo[14].Offset;
+            WondercardData = Blocks.MysteryBlock.Offset;
         }
 
         public override PersonalTable Personal => PersonalTable.SM;
diff --git a/PKHeX.Core/Saves/SAV7USUM.cs b/PKHeX.Core/Saves/SAV7USUM.cs
index 0d16890a5..3b843ee9b 100644
--- a/PKHeX.Core/Saves/SAV7USUM.cs
+++ b/PKHeX.Core/Saves/SAV7USUM.cs
@@ -18,13 +18,16 @@ public SAV7USUM() : base(SaveUtil.SIZE_G7USUM, boUU)
 
         private void Initialize()
         {
+            Party = Blocks.BlockInfo[04].Offset;
             EventConst = Blocks.BlockInfo[05].Offset;
+            PokeDex = Blocks.BlockInfo[06].Offset;
             EventFlag = EventConst + (EventConstMax * 2); // After Event Const (u16)*n
             HoF = EventFlag + (EventFlagMax / 8); // After Event Flags (1b)*(1u8/8b)*n
 
             Blocks.BoxLayout.LoadBattleTeams();
             TeamSlots = Blocks.BoxLayout.TeamSlots;
             Box = Blocks.BlockInfo[14].Offset;
+            WondercardData = Blocks.MysteryBlock.Offset;
         }
 
         public override PersonalTable Personal => PersonalTable.USUM;
diff --git a/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs b/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs
index 2542efb80..6ad7e41d9 100644
--- a/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs	
+++ b/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs	
@@ -996,10 +996,10 @@ private void ToggleViewSubEditors(SaveFile sav)
                 B_OpenPokeblocks.Enabled = sav is SAV6AO;
                 B_OpenSecretBase.Enabled = sav is SAV6AO;
                 B_OpenPokepuffs.Enabled = sav is IPokePuff;
-                B_JPEG.Visible = B_OpenLinkInfo.Enabled = B_OpenSuperTraining.Enabled = B_OUTPasserby.Enabled = sav is SAV6XY || sav is SAV6AO;
+                B_JPEG.Visible = B_OpenLinkInfo.Enabled = B_OpenSuperTraining.Enabled = B_OUTPasserby.Enabled = sav is ISaveBlock6Main;
                 B_OpenBoxLayout.Enabled = sav.HasNamableBoxes;
                 B_OpenWondercards.Enabled = sav.HasWondercards;
-                B_OpenHallofFame.Enabled = sav is SAV6XY || sav is SAV6AO || sav is SAV7;
+                B_OpenHallofFame.Enabled = sav is ISaveBlock6Main || sav is SAV7;
                 B_OpenOPowers.Enabled = sav is IOPower;
                 B_OpenPokedex.Enabled = sav.HasPokeDex;
                 B_OpenBerryField.Enabled = sav is SAV6XY; // oras undocumented