Skip to content

Return of the Revenge of the FRLG RNG Bugfix #1249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mysticial merged 1 commit into from
May 17, 2026
Merged

Return of the Revenge of the FRLG RNG Bugfix #1249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,8 @@ void GiftRng::program(SingleSwitchProgramEnvironment& env, ProControllerContext&

RngCalibrations calibrations = {
RNG_CALIBRATION.seed_calibration / FRLG_FRAME_DURATION,
RNG_CALIBRATION.advances_calibration,
RNG_CALIBRATION.csf_calibration
RNG_CALIBRATION.csf_calibration,
RNG_CALIBRATION.advances_calibration
};

AdvRngSearcher searcher(TARGET_SEED, ADVANCES, AdvRngMethod::Method1);
Expand Down
44 changes: 39 additions & 5 deletions SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,45 @@ RngTimings prepare_timings(
TEACHY_ADVANCES = uint64_t((int)std::floor((modified_ingame_advances - TEACHY_TV_BUFFER + 7500) / 313) * 313);
}

double seed_delay = SEED_DELAY + calibrations.seed_offset + FIXED_SEED_OFFSET;
double csf_delay = (CONTINUE_SCREEN_FRAMES + calibrations.csf_offset) * FRLG_FRAME_DURATION;
double teachy_delay = TEACHY_ADVANCES * FRLG_FRAME_DURATION / 313;
double ingame_delay = (modified_ingame_advances - TEACHY_ADVANCES) * FRLG_FRAME_DURATION / 2 - (should_use_teachy_tv ? 14067 : 0);

if (seed_delay < 0){
OperationFailedException::fire(
ErrorReport::NO_ERROR_REPORT,
"prepare_timings(): seed delay cannot be negative. Check your calibration values.",
console
);
}
if (csf_delay < 0){
OperationFailedException::fire(
ErrorReport::NO_ERROR_REPORT,
"prepare_timings(): CSF duration cannot be negative. Check your calibration values.",
console
);
}
if (teachy_delay < 0){
OperationFailedException::fire(
ErrorReport::NO_ERROR_REPORT,
"prepare_timings(): Teachy TV duration cannot be negative. Check your calibration values.",
console
);
}
if (ingame_delay < 0){
OperationFailedException::fire(
ErrorReport::NO_ERROR_REPORT,
"prepare_timings(): in-game duration cannot be negative. Check your calibration values.",
console
);
}

RngTimings timings;
timings.seed_delay = uint64_t(SEED_DELAY + calibrations.seed_offset + FIXED_SEED_OFFSET);
timings.csf_delay = uint64_t((CONTINUE_SCREEN_FRAMES + calibrations.csf_offset) * FRLG_FRAME_DURATION);
timings.teachy_delay = uint64_t(TEACHY_ADVANCES * FRLG_FRAME_DURATION / 313);
timings.ingame_delay = uint64_t((modified_ingame_advances - TEACHY_ADVANCES) * FRLG_FRAME_DURATION / 2) - (should_use_teachy_tv ? 14067 : 0);
timings.seed_delay = uint64_t(seed_delay);
timings.csf_delay = uint64_t(csf_delay);
timings.teachy_delay = uint64_t(teachy_delay);
timings.ingame_delay = uint64_t(ingame_delay);

console.log("Seed delay: " + std::to_string(timings.seed_delay) + "ms");
console.log("Continue Screen delay: " + std::to_string(timings.csf_delay) + "ms");
Expand Down Expand Up @@ -209,7 +243,7 @@ std::vector<std::pair<AdvRngState,AdvRngState>> get_egg_search_results(
uint16_t tid_xor_sid
){
std::vector<std::pair<AdvRngState,AdvRngState>> search_hits;
for (int i=0; i<4; i++){
for (int i=0; i<1; i++){
uint64_t held_adv_radius = held_advances_radius * (uint64_t(1) << i);
uint64_t held_min_adv = HELD_ADVANCES - std::min(uint64_t(HELD_ADVANCES), held_adv_radius);
uint64_t held_max_adv = HELD_ADVANCES + held_adv_radius;
Expand Down
4 changes: 2 additions & 2 deletions SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,8 +600,8 @@ void StarterRng::program(SingleSwitchProgramEnvironment& env, ProControllerConte

RngCalibrations calibrations = {
RNG_CALIBRATION.seed_calibration / FRLG_FRAME_DURATION,
RNG_CALIBRATION.advances_calibration,
RNG_CALIBRATION.csf_calibration
RNG_CALIBRATION.csf_calibration,
RNG_CALIBRATION.advances_calibration
};


Expand Down
4 changes: 2 additions & 2 deletions SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,8 @@ void StaticRng::program(SingleSwitchProgramEnvironment& env, ProControllerContex

RngCalibrations calibrations = {
RNG_CALIBRATION.seed_calibration / FRLG_FRAME_DURATION,
RNG_CALIBRATION.advances_calibration,
RNG_CALIBRATION.csf_calibration
RNG_CALIBRATION.csf_calibration,
RNG_CALIBRATION.advances_calibration
};

AdvRngSearcher searcher(TARGET_SEED, ADVANCES, AdvRngMethod::Method1);
Expand Down
4 changes: 2 additions & 2 deletions SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,8 @@ void WildRng::program(SingleSwitchProgramEnvironment& env, ProControllerContext&

RngCalibrations calibrations = {
RNG_CALIBRATION.seed_calibration / FRLG_FRAME_DURATION,
RNG_CALIBRATION.advances_calibration,
RNG_CALIBRATION.csf_calibration
RNG_CALIBRATION.csf_calibration,
RNG_CALIBRATION.advances_calibration
};

AdvRngWildSearcher searcher(TARGET_SEED, ADVANCES, ENCOUNTER_SLOTS, AdvRngMethod::Any);
Expand Down
Loading