diff --git a/Misc/SAV6.cs b/Misc/SAV6.cs
index b91150b0b..ca946efcf 100644
--- a/Misc/SAV6.cs
+++ b/Misc/SAV6.cs
@@ -49,7 +49,7 @@ public void getSAVOffsets()
             {
                 /* 00: */   Item = 0x00000; Items = new Inventory(Item, 1);
                 /* 01: */   // = 0x00C00; // Select Bound Items
-                /* 02: */   // = 0x00E00; [00038] // ???
+                /* 02: */   AdventureInfo = 0x00E00;
                 /* 03: */   Trainer1 = 0x01000;
                 /* 04: */   // = 0x01200; [00004] // ???
                 /* 05: */   PlayTime = 0x01400;
@@ -208,7 +208,7 @@ public GameVersion Version
             }
         }
         public bool ORASDEMO => Data.Length == SIZE_ORASDEMO;
-        public bool ORAS => !ORASDEMO && (Version == GameVersion.OR || Version == GameVersion.AS);
+        public bool ORAS => Version == GameVersion.OR || Version == GameVersion.AS;
         public bool XY => Version == GameVersion.X || Version == GameVersion.Y;
 
         // Save Information
diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs
index 40dcac32a..b19aafcda 100644
--- a/PKX/f1-Main.cs
+++ b/PKX/f1-Main.cs
@@ -2681,7 +2681,7 @@ private void clickSet(object sender, EventArgs e)
             int offset = getPKXOffset(slot);
 
             byte[] pkxdata = preparepkx();
-            if (!(SAV.ORAS || SAV.ORASDEMO))
+            if (!(SAV.ORAS))
             {
                 PK6 pk = new PK6(pkxdata);
                 // User Protection
diff --git a/SAV/SAV_Trainer.cs b/SAV/SAV_Trainer.cs
index 5aa6c8b52..43ae8c84e 100644
--- a/SAV/SAV_Trainer.cs
+++ b/SAV/SAV_Trainer.cs
@@ -26,8 +26,15 @@ public SAV_Trainer()
                 TB_MCMN,TB_MCMS,TB_MBMN,TB_MBMS,
             };
 
-            L_MultiplayerSprite.Enabled = CB_MultiplayerSprite.Enabled = Main.SAV.ORAS || Main.SAV.ORASDEMO;
-            L_Style.Visible = TB_Style.Visible = Tab_Appearance.Visible = SAV.XY;
+            L_MultiplayerSprite.Enabled = CB_MultiplayerSprite.Enabled = Main.SAV.ORAS;
+            L_Style.Visible = TB_Style.Visible = SAV.XY;
+            if (!SAV.XY)
+                TC_Editor.TabPages.Remove(Tab_Appearance);
+            if (SAV.ORASDEMO)
+            {
+                TC_Editor.TabPages.Remove(Tab_Maison);
+                TC_Editor.TabPages.Remove(Tab_Multiplayer);
+            }
 
             editing = true;
             GB_Map.Enabled = Main.ramsav == null;