Add Voltorb and Raomers to Gen 3 static encounters #388

Real96 · 2024-05-06T23:30:48Z

Add what asked in #366

Admiral-Fish · 2024-05-07T00:48:30Z

Source/Core/Gen3/Generators/StaticGenerator3.hpp

     *
     * @return Vector of computed states
     */
-    std::vector<GeneratorState> generate(u32 seed) const;
+    std::vector<GeneratorState> generate(u32 seed, const StaticTemplate &staticTemplate) const;


This is unnecessary, it gets passed in with the constructor

Admiral-Fish · 2024-05-07T00:50:55Z

Source/Core/Gen3/Searchers/StaticSearcher3.cpp

@@ -66,11 +66,24 @@ void StaticSearcher3::startSearch(const std::array<u8, 6> &min, const std::array
    }
 }

+void buggedRoamerIVsMatcher(std::array<u8, 6> &ivs, const bool buggedRoamer)


I don't like this approach. It limits how many origin seeds we can search through. See how I handled similar situation for the e-readers in colo https://github.com/Admiral-Fish/PokeFinder/blob/master/Source/Core/Gen3/Searchers/GameCubeSearcher.cpp#L300-L307

Unless I'm misunderstanding, this essentially does what colo does. The IVs set but the function aren't passed to the LCRNG reverse function. These are only used for the results.

Oh right I might to leave this comment in the other spot.

I still prefer the way I had it where it is a simple if statement instead of a function call

std::array<u8, 6> ivs; if (staticTemplate->getRoamer()) { ivs = { hp, atk & 7, 0, 0, 0, 0 }; } else { ivs = { hp, atk, def, spa, spd, spe }; }

Done. Had to do atk &= 7 outside the array, it was giving me error when it was put directly inside as you wrote above

Admiral-Fish · 2024-05-07T00:52:16Z

Source/Core/Gen3/Generators/StaticGenerator3.cpp

@@ -44,12 +44,15 @@ std::vector<GeneratorState> StaticGenerator3::generate(u32 seed) const
        u32 pid = go.nextUShort();
        pid |= go.nextUShort() << 16;

-        u16 iv1 = go.nextUShort();
+        // Raikou/Entei/Suicune/Latias/Latios
+        bool buggedRoamer = ((staticTemplate.getSpecie() == 380 || staticTemplate.getSpecie() == 381) && (profile.getVersion() & Game::RS) != Game::None) ||


This should be moved to a field in a new class for StaticTemplate3 instead of checking the specie each time.

See StaticTemplate4, we would add a roamer field and initialize that in the constructor of the class

Admiral-Fish · 2024-05-07T00:52:43Z

Source/Core/Gen3/Searchers/StaticSearcher3.hpp

     */
-    void startSearch(const std::array<u8, 6> &min, const std::array<u8, 6> &max, const StaticTemplate *staticTemplate);
+    void startSearch(const std::array<u8, 6> &min, const std::array<u8, 6> &max, const StaticTemplate *staticTemplate, const bool buggedRoamer);


Won't need to be passed in with the change I suggested

Admiral-Fish · 2024-05-07T02:30:59Z

Source/Core/Gen3/Searchers/StaticSearcher3.hpp

     *
     * @return Vector of computed states
     */
-    std::vector<SearcherState> search(u8 hp, u8 atk, u8 def, u8 spa, u8 spd, u8 spe, const StaticTemplate *staticTemplate) const;
+    std::vector<SearcherState> search(u8 hp, u8 atk, u8 def, u8 spa, u8 spd, u8 spe, const StaticTemplate *staticTemplate, const bool buggedRoamer) const;


Won't need to be passed in with the change I suggested

Admiral-Fish · 2024-05-07T05:07:42Z

Source/Core/Gen3/Searchers/StaticSearcher3.cpp

@@ -66,11 +66,24 @@ void StaticSearcher3::startSearch(const std::array<u8, 6> &min, const std::array
    }
 }

+void buggedRoamerIVsMatcher(std::array<u8, 6> &ivs, const bool buggedRoamer)


Oh right I might to leave this comment in the other spot.

I still prefer the way I had it where it is a simple if statement instead of a function call

std::array<u8, 6> ivs; if (staticTemplate->getRoamer()) { ivs = { hp, atk & 7, 0, 0, 0, 0 }; } else { ivs = { hp, atk, def, spa, spd, spe }; }

Admiral-Fish · 2024-05-07T05:07:58Z

Source/Core/Gen3/Searchers/StaticSearcher3.cpp

-        for (u8 atk = min[1]; atk <= max[1]; atk++)
+        for (u8 atk = buggedRoamer ? min[1] & 7 : min[1]; atk <= (buggedRoamer ? max[1] & 7 : max[1]); atk++)
        {
-            for (u8 def = min[2]; def <= max[2]; def++)
+            for (u8 def = buggedRoamer ? 0 : min[2]; def <= (buggedRoamer ? 31 : max[2]); def++)
            {
-                for (u8 spa = min[3]; spa <= max[3]; spa++)
+                for (u8 spa = buggedRoamer ? 0 : min[3]; spa <= (buggedRoamer ? 31 : max[3]); spa++)
                {
-                    for (u8 spd = min[4]; spd <= max[4]; spd++)
+                    for (u8 spd = buggedRoamer ? 0 : min[4]; spd <= (buggedRoamer ? 31 : max[4]); spd++)
                    {
-                        for (u8 spe = min[5]; spe <= max[5]; spe++)
+                        for (u8 spe = buggedRoamer ? 0 : min[5]; spe <= (buggedRoamer ? 31 : max[5]); spe++)


I don't like this approach. It limits how many origin seeds we can search through. See how I handled similar situation for the e-readers in colo https://github.com/Admiral-Fish/PokeFinder/blob/master/Source/Core/Gen3/Searchers/GameCubeSearcher.cpp#L300-L307

Admiral-Fish · 2024-05-11T00:51:03Z

Source/Core/Gen3/Searchers/StaticSearcher3.cpp

+        atk &= 7;
+        ivs = { hp, atk, 0, 0, 0, 0 };


ivs = { hp, atk & 7, 0, 0, 0, 0 };

I get this error:

StaticSearcher3.cpp:76:21: Non-constant-expression cannot be narrowed from type 'int' to 'unsigned char' in initializer list (fix available)

static_cast<u8>(atk & 7)

Source/Core/Gen3/StaticTemplate3.hpp

Admiral-Fish · 2024-05-11T00:53:14Z

Source/Core/Resources/Embed/embed_gen3.py

@@ -28,8 +28,8 @@ def embed_encounters3():

                    string += f"ShadowTemplate({encounter['version']}, {encounter['specie']}, {encounter.get('shiny', 'Shiny::Random')}, {encounter['level']}, {locks}, {len(encounter['locks'])}, {encounter['type']})"
                else:
-                    string += f"StaticTemplate({encounter['version']}, {encounter['specie']}, {encounter.get('form', 0)}, {encounter.get('shiny', 'Shiny::Random')}, 255, 255, 0, {encounter['level']})"
-
+                    string += f"StaticTemplate3({encounter['version']}, {encounter['specie']}, {encounter.get('form', 0)}, {encounter.get('shiny', 'Shiny::Random')}, 255, 255, 0, {encounter['level']}, {str(encounter['buggedRoamer']).lower()})"


Don't need this here, just have it handled in the constructor of StaticTemplate3

Admiral-Fish · 2024-05-11T00:53:36Z

Source/Core/Gen3/StaticTemplate3.hpp

+     * @param buggedRoamer FRLG/RS roamer
+     */
+    constexpr StaticTemplate3(Game version, u16 specie, u8 form, Shiny shiny, u8 ability, u8 gender, u8 ivCount, u8 level, bool buggedRoamer) :
+        StaticTemplate(version, specie, form, shiny, ability, gender, ivCount, level), buggedRoamer(buggedRoamer)


roamer(specie == X || specie == X)

I don't know the specie numbers off hand

Wait, i don't think you can handle it this way. Emerald roamers are not bugged, only FRLG/RS roamers. Emerald has both Latios and Latias, Ruby has Latios, Sapphire has latias.

Would you like something like this?

roamer(((specie == 380 || specie == 381) && (version & Game::RS) != Game::None) || (specie >= 243 && specie <= 245))

Yeah that works

Admiral-Fish · 2024-05-11T00:55:13Z

Source/Form/Gen3/Static3.cpp

@@ -153,14 +153,15 @@ void Static3::generatorCategoryIndexChanged(int index)
                    QVariant::fromValue(i));
            }
        }
+        ui->comboBoxGeneratorMethod->setItemHidden(1, templates[ui->comboBoxGeneratorPokemon->getCurrentInt()].getBuggedRoamer());


What is this for?

It removes Method 4 from Method selection when a bugged roamer is selected. Method 4 never happens, cause the rng call for ivs2 is not considered at all

Admiral-Fish

Last change then I will merge it

Source/Core/Gen3/StaticTemplate3.hpp

Source/Core/Resources/Embed/embed_gen3.py

Real96 added 5 commits May 6, 2024 16:15

Add Voltorb and Raomers to Gen 3 static generator encounters

281a31f

Fix Gen 3 static generator/searcher tests

ccccb2f

Fix gamecube generator/searcher tests

6c97ebb

Add Raomers to Gen 3 static searcher encounters

a986247

Add param comments

aeb6164

Admiral-Fish requested changes May 7, 2024

View reviewed changes

Admiral-Fish reviewed May 7, 2024

View reviewed changes

Real96 added 2 commits May 7, 2024 22:42

Requested changes

cf52a1d

Hide method 4 when a bugged roamer is selected

8b4568f

Admiral-Fish requested changes May 11, 2024

View reviewed changes

Requested changes

0beb607

Admiral-Fish requested changes May 14, 2024

View reviewed changes

Real96 and others added 2 commits May 15, 2024 01:22

Requested changes

1e122a7

Merge branch 'master' into gen3_static_update

f7cd220

Admiral-Fish merged commit 3ddfb23 into master May 17, 2024
0 of 2 checks passed

Admiral-Fish deleted the gen3_static_update branch May 17, 2024 00:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Voltorb and Raomers to Gen 3 static encounters #388

Add Voltorb and Raomers to Gen 3 static encounters #388

Real96 commented May 6, 2024

Admiral-Fish May 7, 2024

Real96 May 7, 2024

Admiral-Fish May 7, 2024

SteveCookTU May 7, 2024

Admiral-Fish May 7, 2024

Real96 May 7, 2024 •

edited

Admiral-Fish May 7, 2024

Real96 May 7, 2024

Admiral-Fish May 7, 2024

Real96 May 7, 2024

Admiral-Fish May 7, 2024

Real96 May 7, 2024

Admiral-Fish May 7, 2024

Admiral-Fish May 7, 2024

Real96 May 7, 2024

Admiral-Fish May 11, 2024

Real96 May 11, 2024 •

edited

Admiral-Fish May 11, 2024 •

edited

Real96 May 12, 2024

Admiral-Fish May 11, 2024

Real96 May 12, 2024

Admiral-Fish May 11, 2024

Real96 May 11, 2024 •

edited

Real96 May 11, 2024 •

edited

Admiral-Fish May 11, 2024

Real96 May 12, 2024

Admiral-Fish May 11, 2024

Real96 May 11, 2024 •

edited

Admiral-Fish left a comment

Add Voltorb and Raomers to Gen 3 static encounters #388

Add Voltorb and Raomers to Gen 3 static encounters #388

Conversation

Real96 commented May 6, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Real96 May 7, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Real96 May 11, 2024 • edited

Choose a reason for hiding this comment

Admiral-Fish May 11, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Real96 May 11, 2024 • edited

Choose a reason for hiding this comment

Real96 May 11, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Real96 May 11, 2024 • edited

Choose a reason for hiding this comment

Admiral-Fish left a comment

Choose a reason for hiding this comment

Real96 May 7, 2024 •

edited

Real96 May 11, 2024 •

edited

Admiral-Fish May 11, 2024 •

edited

Real96 May 11, 2024 •

edited

Real96 May 11, 2024 •

edited

Real96 May 11, 2024 •

edited