diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Settings.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Settings.cpp
index 6a08282535..30537d3cd0 100644
--- a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Settings.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Settings.cpp
@@ -65,6 +65,7 @@ GameSettings::GameSettings()
LockMode::LOCK_WHILE_RUNNING,
"3000 ms"
)
+ , m_rng_settings("RNG Settings:")
, HANDLE_ONLINE_LICENSE_CHECK(
"Handle Online License Check:
"
"Turn this on if your console checks the game's license online when it starts the game: "
@@ -73,6 +74,12 @@ GameSettings::GameSettings()
LockMode::LOCK_WHILE_RUNNING,
false // default
)
+ , RUN_RNG_START_CHECKS(
+ "Run Start Checks:
"
+ "Run pre-program validation checks, e.g. that your party has enough free slots.",
+ LockMode::LOCK_WHILE_RUNNING,
+ true // default
+ )
, m_shiny_audio_settings("Shiny Audio Settings:")
, SHINY_SOUND_THRESHOLD(
"Shiny Sound Threshold:
Maximum error coefficient to trigger a shiny detection.",
@@ -98,7 +105,9 @@ GameSettings::GameSettings()
PA_ADD_OPTION(SELECT_BUTTON_MASH0);
PA_ADD_OPTION(ENTER_GAME_WAIT0);
PA_ADD_OPTION(ENTER_GAME_MASH0);
+ PA_ADD_STATIC(m_rng_settings);
PA_ADD_OPTION(HANDLE_ONLINE_LICENSE_CHECK);
+ PA_ADD_OPTION(RUN_RNG_START_CHECKS);
PA_ADD_STATIC(m_shiny_audio_settings);
PA_ADD_OPTION(SHINY_SOUND_THRESHOLD);
PA_ADD_OPTION(SHINY_SOUND_LOW_FREQUENCY);
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Settings.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Settings.h
index 83583b1afb..c8015bbef4 100644
--- a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Settings.h
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Settings.h
@@ -41,7 +41,10 @@ class GameSettings : public BatchOption, private ConfigOption::Listener{
MillisecondsOption SELECT_BUTTON_MASH0;
MillisecondsOption ENTER_GAME_WAIT0;
MillisecondsOption ENTER_GAME_MASH0;
+
+ SectionDividerOption m_rng_settings;
BooleanCheckBoxOption HANDLE_ONLINE_LICENSE_CHECK;
+ BooleanCheckBoxOption RUN_RNG_START_CHECKS;
SectionDividerOption m_shiny_audio_settings;
FloatingPointOption SHINY_SOUND_THRESHOLD;
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngProgram.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngProgram.cpp
index a1014876d1..d4257d7f37 100644
--- a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngProgram.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngProgram.cpp
@@ -11,6 +11,7 @@
#include "Pokemon/Pokemon_Strings.h"
#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartySlot.h"
#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
#include "PokemonFRLG_RngProgram.h"
namespace PokemonAutomation{
@@ -66,6 +67,10 @@ void RngProgramInstance::run_precheck(
ProControllerContext& context
){
home_black_border_check(env.console, context);
+ if (!GameSettings::instance().RUN_RNG_START_CHECKS){
+ env.console.log("Start checks are off in the FRLG Game Settings. Skipping them.");
+ return;
+ }
check_free_party_slots(env, context);
}