Correct non fast search IVs

Admiral-Fish · Jan 26, 2025 · e4b7af8 · e4b7af8
1 parent 16aa315
commit e4b7af8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/Source/Core/Gen5/Generators/StaticGenerator5.cpp b/Source/Core/Gen5/Generators/StaticGenerator5.cpp
@@ -44,7 +44,7 @@ std::vector<State5> StaticGenerator5::generate(u64 seed, u32 initialAdvances, u3
     std::vector<std::pair<u32, std::array<u8, 6>>> ivs;
 
     RNGList<u8, MT, 8, gen> rngList(seed >> 32, initialAdvances + (bw ? 0 : 2) + (staticTemplate.getRoamer() ? 1 : 0));
-    for (u32 cnt = 0; cnt <= maxAdvances; cnt++)
+    for (u32 cnt = 0; cnt <= maxAdvances; cnt++, rngList.advanceState())
     {
         std::array<u8, 6> iv;
 

diff --git a/Source/Core/Gen5/Generators/WildGenerator5.cpp b/Source/Core/Gen5/Generators/WildGenerator5.cpp
@@ -100,7 +100,7 @@ std::vector<WildState5> WildGenerator5::generate(u64 seed, u32 initialAdvances,
     std::vector<std::pair<u32, std::array<u8, 6>>> ivs;
 
     RNGList<u8, MT, 8, gen> rngList(seed >> 32, initialAdvances + (bw ? 0 : 2));
-    for (u32 cnt = 0; cnt <= maxAdvances; cnt++)
+    for (u32 cnt = 0; cnt <= maxAdvances; cnt++, rngList.advanceState())
     {
         std::array<u8, 6> iv;
         std::generate(iv.begin(), iv.end(), [&rngList] { return rngList.next(); });

diff --git a/Source/Form/Gen5/Static5.cpp b/Source/Form/Gen5/Static5.cpp
@@ -60,7 +60,8 @@ Static5::Static5(QWidget *parent) : QWidget(parent), ui(new Ui::Static5)
     ui->textBoxSearcherInitialAdvances->setValues(InputType::Advance32Bit);
     ui->textBoxSearcherMaxAdvances->setValues(InputType::Advance32Bit);
 
-    ui->filterSearcher->disableControls(Controls::DisableFilter);
+    ui->filterGenerator->disableControls(Controls::EncounterSlots);
+    ui->filterSearcher->disableControls(Controls::DisableFilter | Controls::EncounterSlots);
 
     ui->comboMenuGeneratorLead->addAction(tr("None"), toInt(Lead::None));
     ui->comboMenuGeneratorLead->addMenu(tr("Cute Charm"), { tr("♂ Lead"), tr("♀ Lead") },

diff --git a/Source/Form/Gen5/Static5.ui b/Source/Form/Gen5/Static5.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>Gen 5 Static</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_8">
    <item row="0" column="0">