diff --git a/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp b/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp
index 43a5a4f3d1..30849326b0 100644
--- a/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp
+++ b/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp
@@ -144,7 +144,8 @@ GiftRng::GiftRng()
, SEED_DELAY(
"Seed Delay Time (ms):
"
"The delay between starting the game and advancing past the title screen. Set this to match your target seed.
"
- "If using Ten Lines for seed info, select Nintendo Switch 1 as your console even if using a Switch 2.",
+ "If using Ten Lines for seed info, select Nintendo Switch 1 as your console even if using a Switch 2.
"
+ "Warning: values close to 30500ms can sometimes cause problems, and you may need to manually increase your initial seed calibration or pick a new target.",
LockMode::LOCK_WHILE_RUNNING,
31338, 30400 // default, min
)
diff --git a/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp b/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp
index 266573edc1..f596b43b50 100644
--- a/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp
+++ b/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp
@@ -117,9 +117,10 @@ RngHelper::RngHelper()
, SEED_DELAY(
"Seed Delay Time (ms):
"
"The delay between starting the game and advancing past the title screen. Set this to match your target seed.
"
- "If using Ten Lines for seed info, select Nintendo Switch 1 as your console even if using a Switch 2.",
+ "If using Ten Lines for seed info, select Nintendo Switch 1 as your console even if using a Switch 2.
"
+ "Warning: values close to 30500ms can sometimes cause problems, and you may need to increase your seed calibration or pick a new target.",
LockMode::LOCK_WHILE_RUNNING,
- 35000, 30400 // default, min
+ 31338, 30400 // default, min
)
, SEED_CALIBRATION(
"Seed Calibration (ms):"
@@ -133,7 +134,7 @@ RngHelper::RngHelper()
"
The number of RNG advances before loading the game.
"
"These pass at the \"normal\" rate compared to other consoles.",
LockMode::LOCK_WHILE_RUNNING,
- 1000, 192 // default, min
+ 200, 192 // default, min
)
, CONTINUE_SCREEN_CALIBRATION(
"Continue Screen Frames Calibration:"
@@ -148,7 +149,7 @@ RngHelper::RngHelper()
"These pass at double the rate compared to other consoles, where every frame results in 2 advances.
"
"Warning: this needs to be long enough to accomodate all in-game button presses prior to the gift/encounter",
LockMode::LOCK_WHILE_RUNNING,
- 12345, 320 // default, min
+ 9800, 320 // default, min
)
, INGAME_CALIBRATION(
"In-Game Advances Calibration:"
diff --git a/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp b/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp
index 16f2b98ea8..5fd4d21a7b 100644
--- a/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp
+++ b/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp
@@ -137,7 +137,8 @@ StarterRng::StarterRng()
, SEED_DELAY(
"Seed Delay Time (ms):
"
"The delay between starting the game and advancing past the title screen. Set this to match your target seed.
"
- "If using Ten Lines for seed info, select Nintendo Switch 1 as your console even if using a Switch 2.",
+ "If using Ten Lines for seed info, select Nintendo Switch 1 as your console even if using a Switch 2.
"
+ "Warning: values close to 30500ms can sometimes cause problems, and you may need to manually increase your initial seed calibration or pick a new target.",
LockMode::LOCK_WHILE_RUNNING,
31338, 30400 // default, min
)
@@ -605,7 +606,7 @@ void StarterRng::program(SingleSwitchProgramEnvironment& env, ProControllerConte
static const int16_t GENDER_THRESHOLD = 30;
- static const std::set SPECIES_LIST = { "bulbasuar", "squirtle", "charmander" };
+ static const std::set SPECIES_LIST = { "bulbasaur", "squirtle", "charmander" };
env.log("RNG Target: " + std::to_string(STARTER.current_value()));
env.log("Target Seed: " + to_hex_string(TARGET_SEED));
diff --git a/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp b/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp
index 6c294654cd..bfb7abe49d 100644
--- a/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp
+++ b/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp
@@ -136,7 +136,8 @@ StaticRng::StaticRng()
, SEED_DELAY(
"Seed Delay Time (ms):
"
"The delay between starting the game and advancing past the title screen. Set this to match your target seed.
"
- "If using Ten Lines, select Nintendo Switch 1 as your console even if using a Switch 2.",
+ "If using Ten Lines for seed info, select Nintendo Switch 1 as your console even if using a Switch 2.
"
+ "Warning: values close to 30500ms can sometimes cause problems, and you may need to manually increase your initial seed calibration or pick a new target.",
LockMode::LOCK_WHILE_RUNNING,
31338, 30400 // default, min
)
diff --git a/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp b/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp
index d277264122..f8bf06ba43 100644
--- a/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp
+++ b/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp
@@ -165,7 +165,8 @@ WildRng::WildRng()
, SEED_DELAY(
"Seed Delay Time (ms):
"
"The delay between starting the game and advancing past the title screen. Set this to match your target seed.
"
- "If using Ten Lines, select Nintendo Switch 1 as your console even if using a Switch 2.",
+ "If using Ten Lines for seed info, select Nintendo Switch 1 as your console even if using a Switch 2.
"
+ "Warning: values close to 30500ms can sometimes cause problems, and you may need to manually increase your initial seed calibration or pick a new target.",
LockMode::LOCK_WHILE_RUNNING,
31338, 30400 // default, min
)