From f0f7876ba8a36891fd562465ea3cff9102168c85 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sun, 22 Nov 2015 13:56:17 -0800
Subject: [PATCH] Sync

---
 pk3DS/Subforms/RSTE.cs        | 2 +-
 pk3DS/Subforms/TrainerRand.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pk3DS/Subforms/RSTE.cs b/pk3DS/Subforms/RSTE.cs
index e899d0f..b8678e1 100644
--- a/pk3DS/Subforms/RSTE.cs
+++ b/pk3DS/Subforms/RSTE.cs
@@ -651,7 +651,7 @@ private void Randomize()
                 // Trainer Type/Mega Evo
                 int type = GetRandomType(i);
                 bool mevo = rEnsureMEvo.Contains(i);
-                bool typerand = (rTypeTheme && !rGymE4Only) ||
+                bool typerand = rTypeTheme && !rGymE4Only ||
                                 (rTypeTheme && (rImportant[i].Contains("GYM") || rImportant[i].Contains("ELITE") || rImportant[i].Contains("CHAMPION")));
 
                 // Randomize Pokemon
diff --git a/pk3DS/Subforms/TrainerRand.cs b/pk3DS/Subforms/TrainerRand.cs
index 4b296bb..483aaed 100644
--- a/pk3DS/Subforms/TrainerRand.cs
+++ b/pk3DS/Subforms/TrainerRand.cs
@@ -63,7 +63,7 @@ private void B_Save_Click(object sender, EventArgs e)
             RSTE.rDiffAI = CHK_MaxDiffAI.Checked;
             RSTE.rTypeTheme = CHK_TypeTheme.Checked;
             RSTE.rTypeGymTrainers = CHK_GymTrainers.Checked;
-            RSTE.rTypeGymE4Only = CHK_GymE4Only.Checked;
+            RSTE.rGymE4Only = CHK_GymE4Only.Checked;
             RSTE.r6PKM = CHK_6PKM.Checked;
             RSTE.rRandomMegas = CHK_RandomMegaForm.Checked;