Skip to content

FRLG RNG fixes for French Magikarp and Lapras #1556

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
theastrogoth merged 1 commit into from
Oct 11, 2026
+32 −14
Merged

FRLG RNG fixes for French Magikarp and Lapras #1556

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
42 changes: 30 additions & 12 deletions ...ms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ namespace PokemonFRLG{
// The fixed parts (ms) of the button press sequences for each target,
// including the 4000ms spent loading the save and skipping the recap in load_game_after_delay().
static const uint64_t STARTER_FIXED_DURATION = 7200; // 4000ms + 3000ms + 200ms
static const uint64_t MAGIKARP_FIXED_DURATION = 7200; // 4000ms + 3000ms + 200ms
static const uint64_t HITMON_FIXED_DURATION = 4200; // 4000ms + 200ms
static const uint64_t EEVEE_FIXED_DURATION = 4000;
static const uint64_t LAPRAS_FIXED_DURATION = 7200; // 4000ms + 3000ms + 200ms
static const uint64_t FOSSIL_FIXED_DURATION = 5700; // 4000ms + 1500ms + 200ms
static const uint64_t GAMECORNER_FIXED_DURATION = 8200; // 4000ms + 3000ms + (400ms * 5) + 200ms
static const uint64_t TOGEPI_FIXED_DURATION = 11700; // 4000ms + 7500ms + 200ms
Expand Down Expand Up @@ -58,6 +56,22 @@ static const uint64_t MIN_PRESS_GAP = 300;
static const int64_t DEFAULT_ADVANCES_OFFSET = 160;
static const int64_t SWEET_SCENT_ADVANCES_OFFSET = -352;

static uint64_t magikarp_fixed_duration(Language language){
uint64_t duration = 7200; // 4000ms + 3000ms + 200ms
if (language == Language::French){
duration -= 1500;
}
return duration;
}

static uint64_t lapras_fixed_duration(Language language){
uint64_t duration = 7200; // 4000ms + 3000ms + 200ms
if (language == Language::French){
duration -= 1500;
}
return duration;
}

static uint64_t roamer_fixed_duration(Language language){
uint64_t duration = 26700; // 5500ms + 4*1500ms + 3500ms + 5500ms + 4*1500 + 200
if (language == Language::Japanese){
Expand Down Expand Up @@ -164,11 +178,13 @@ void collect_starter_after_delay(ProControllerContext& context, uint64_t ingame_
context.wait_for_all_requests();
}

void collect_magikarp_after_delay(ProControllerContext& context, uint64_t ingame_delay){
void collect_magikarp_after_delay(ProControllerContext& context, uint64_t ingame_delay, Language language){
// Advance through starter dialogue and wait on YES/NO
pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
pbf_press_button(context, BUTTON_A, 200ms, std::chrono::milliseconds(ingame_delay - MAGIKARP_FIXED_DURATION));
if (language != Language::French){
pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
}
pbf_press_button(context, BUTTON_A, 200ms, std::chrono::milliseconds(ingame_delay - magikarp_fixed_duration(language)));
// Finish dialogue (hits the target advance)
pbf_press_button(context, BUTTON_A, 200ms, 3800ms);
// Decline nickname
Expand Down Expand Up @@ -196,11 +212,13 @@ void collect_eevee_after_delay(ProControllerContext& context, uint64_t ingame_de
context.wait_for_all_requests();
}

void collect_lapras_after_delay(ProControllerContext& context, uint64_t ingame_delay){
void collect_lapras_after_delay(ProControllerContext& context, uint64_t ingame_delay, Language language){
// 3 dialog presses
pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
pbf_press_button(context, BUTTON_A, 200ms, std::chrono::milliseconds(ingame_delay - LAPRAS_FIXED_DURATION));
if (language != Language::French){
pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
}
pbf_press_button(context, BUTTON_A, 200ms, std::chrono::milliseconds(ingame_delay - lapras_fixed_duration(language)));
// Accept Lapras on target frame
pbf_press_button(context, BUTTON_A, 200ms, 3800ms);
// Decline nickname and exit dialog
Expand Down Expand Up @@ -504,15 +522,15 @@ IngameSequence get_ingame_sequence(PokemonFRLG_RngTarget target, Language langua
case PokemonFRLG_RngTarget::starters:
return {"Starters", STARTER_FIXED_DURATION, MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
case PokemonFRLG_RngTarget::magikarp:
return {"Magikarp", MAGIKARP_FIXED_DURATION, MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
return {"Magikarp", magikarp_fixed_duration(language), MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
case PokemonFRLG_RngTarget::hitmonchan:
case PokemonFRLG_RngTarget::hitmonlee:
case PokemonFRLG_RngTarget::hitmon:
return {"Hitmonchan/Hitmonlee", HITMON_FIXED_DURATION, MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
case PokemonFRLG_RngTarget::eevee:
return {"Eevee", EEVEE_FIXED_DURATION, 0, DEFAULT_ADVANCES_OFFSET};
case PokemonFRLG_RngTarget::lapras:
return {"Lapras", LAPRAS_FIXED_DURATION, MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
return {"Lapras", lapras_fixed_duration(language), MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
case PokemonFRLG_RngTarget::omanyte:
case PokemonFRLG_RngTarget::kabuto:
case PokemonFRLG_RngTarget::aerodactyl:
Expand Down Expand Up @@ -662,7 +680,7 @@ void perform_blind_sequence(
collect_starter_after_delay(context, timings.ingame_delay);
return;
case PokemonFRLG_RngTarget::magikarp:
collect_magikarp_after_delay(context, timings.ingame_delay);
collect_magikarp_after_delay(context, timings.ingame_delay, language);
return;
case PokemonFRLG_RngTarget::hitmonchan:
case PokemonFRLG_RngTarget::hitmonlee:
Expand All @@ -673,7 +691,7 @@ void perform_blind_sequence(
collect_eevee_after_delay(context, timings.ingame_delay);
return;
case PokemonFRLG_RngTarget::lapras:
collect_lapras_after_delay(context, timings.ingame_delay);
collect_lapras_after_delay(context, timings.ingame_delay, language);
return;
case PokemonFRLG_RngTarget::omanyte:
case PokemonFRLG_RngTarget::kabuto:
Expand Down
2 changes: 1 addition & 1 deletion ...alPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ void GiftRng::program(SingleSwitchProgramEnvironment& env, ProControllerContext&
env.console, TARGET,
SEED_DELAY, CONTINUE_SCREEN_FRAMES, ingame_advances,
USE_TEACHY_TV, calibrations,
FIXED_SEED_OFFSET
FIXED_SEED_OFFSET, LANGUAGE
);

env.log("Resetting Game...");
Expand Down
2 changes: 1 addition & 1 deletion ...Programs/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ void RngHelper::program(SingleSwitchProgramEnvironment& env, ProControllerContex
env.console, TARGET,
SEED_DELAY, CONTINUE_SCREEN_FRAMES, INGAME_ADVANCES,
USE_TEACHY_TV, CALIBRATIONS,
FIXED_SEED_OFFSET
FIXED_SEED_OFFSET, LANGUAGE
);

// handle the blind part
Expand Down
Loading