3 files changed, 20 insertions, 0 deletions
diff --git a/src/com/dabomstew/pkrandom/newgui/Bundle.properties b/src/com/dabomstew/pkrandom/newgui/Bundle.properties
index 35d870f..27ebccf 100644
--- a/src/com/dabomstew/pkrandom/newgui/Bundle.properties
+++ b/src/com/dabomstew/pkrandom/newgui/Bundle.properties
@@ -80,6 +80,8 @@ GUI.peChangeImpossibleEvosCheckBox.toolTipText=<html>If this is checked, every e
 GUI.peChangeImpossibleEvosCheckBox.text=Change Impossible Evolutions
 GUI.peMakeEvolutionsEasierCheckBox.toolTipText=<html>If this is checked, Pokemon that evolve at a very high level will evolve at lower levels to make them more viable for shorter playthroughs.<br />Specifically, every Pokemon will evolve to its final stage by level 40, and three-stage evolutions will reach their middle stage by no later than level 30.<br />Additionally, Pokemon that normally evolve by having another specific Pokemon in the party will instead evolve at level 35.<br /><b>Takes effect regardless of whether evolutions are randomized or not.</b>
 GUI.peMakeEvolutionsEasierCheckBox.text=Make Evolutions Easier
+GUI.peRemoveTimeBasedEvolutions.toolTipText=<html>If this is checked, evolutions that require a certain time of day will now be possible regardless of the in-game time.<br />Split time-based evolutions (like Eevee => Espeon/Umbreon and Rockruff => Lycanroc) will be changed to stone evolutions instead.
+GUI.peRemoveTimeBasedEvolutions.text=Remove Time-Based Evolutions
 GUI.startersStaticsTradesPanel=Starters, Statics & Trades
 GUI.spPanel.title=Starter Pokemon
 GUI.spUnchangedRadioButton.toolTipText=Don't change the starter Pokemon.
diff --git a/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.form b/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.form
index 4f0b93c..e35434d 100644
--- a/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.form
+++ b/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.form
@@ -678,6 +678,17 @@
                       <toolTipText resource-bundle="com/dabomstew/pkrandom/newgui/Bundle" key="GUI.peAllowAltFormesCheckBox.toolTipText"/>
                     </properties>
                   </component>
+                  <component id="b091c" class="javax.swing.JCheckBox" binding="peRemoveTimeBasedEvolutionsCheckBox">
+                    <constraints>
+                      <grid row="3" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                      <gridbag weightx="0.0" weighty="0.0"/>
+                    </constraints>
+                    <properties>
+                      <enabled value="false"/>
+                      <text resource-bundle="com/dabomstew/pkrandom/newgui/Bundle" key="GUI.peRemoveTimeBasedEvolutions.text"/>
+                      <toolTipText resource-bundle="com/dabomstew/pkrandom/newgui/Bundle" key="GUI.peRemoveTimeBasedEvolutions.toolTipText"/>
+                    </properties>
+                  </component>
                 </children>
               </grid>
               <vspacer id="44843">
diff --git a/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java b/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java
index ed85910..6a7960e 100644
--- a/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java
+++ b/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java
@@ -279,6 +279,7 @@ public class NewRandomizerGUI {
     private JCheckBox miscRetainAltFormesCheckBox;
     private JComboBox pbsEXPCurveComboBox;
     private JCheckBox miscRunWithoutRunningShoesCheckBox;
+    private JCheckBox peRemoveTimeBasedEvolutionsCheckBox;
 
     private static JFrame frame;
 
@@ -1276,6 +1277,7 @@ public class NewRandomizerGUI {
         pmsNoGameBreakingMovesCheckBox.setSelected(settings.doBlockBrokenMoves());
 
         peMakeEvolutionsEasierCheckBox.setSelected(settings.isMakeEvolutionsEasier());
+        peRemoveTimeBasedEvolutionsCheckBox.setSelected(settings.isRemoveTimeBasedEvolutions());
 
         spCustomRadioButton.setSelected(settings.getStartersMod() == Settings.StartersMod.CUSTOM);
         spRandomCompletelyRadioButton.setSelected(settings.getStartersMod() == Settings.StartersMod.COMPLETELY_RANDOM);
@@ -1500,6 +1502,7 @@ public class NewRandomizerGUI {
         settings.setBlockBrokenMovesetMoves(pmsNoGameBreakingMovesCheckBox.isSelected());
 
         settings.setMakeEvolutionsEasier(peMakeEvolutionsEasierCheckBox.isSelected());
+        settings.setRemoveTimeBasedEvolutions(peRemoveTimeBasedEvolutionsCheckBox.isSelected());
 
         settings.setStartersMod(spUnchangedRadioButton.isSelected(), spCustomRadioButton.isSelected(), spRandomCompletelyRadioButton.isSelected(),
                 spRandomTwoEvosRadioButton.isSelected());
@@ -1858,6 +1861,9 @@ public class NewRandomizerGUI {
         peMakeEvolutionsEasierCheckBox.setVisible(true);
         peMakeEvolutionsEasierCheckBox.setEnabled(false);
         peMakeEvolutionsEasierCheckBox.setSelected(false);
+        peRemoveTimeBasedEvolutionsCheckBox.setVisible(true);
+        peRemoveTimeBasedEvolutionsCheckBox.setEnabled(false);
+        peRemoveTimeBasedEvolutionsCheckBox.setSelected(false);
         peAllowAltFormesCheckBox.setVisible(true);
         peAllowAltFormesCheckBox.setEnabled(false);
         peAllowAltFormesCheckBox.setSelected(false);
@@ -2410,6 +2416,7 @@ public class NewRandomizerGUI {
 //        peForceChangeCheckBox.setEnabled(true);
             peChangeImpossibleEvosCheckBox.setEnabled(true);
             peMakeEvolutionsEasierCheckBox.setEnabled(true);
+            peRemoveTimeBasedEvolutionsCheckBox.setEnabled(true);
             peAllowAltFormesCheckBox.setVisible(pokemonGeneration >= 7);
 
             // Starters, Statics & Trades