Skip to content

LeafGreen RNG Game Corner fix #1244

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 13, 2026
Merged

LeafGreen RNG Game Corner fix #1244

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
10 changes: 5 additions & 5 deletions SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,10 +455,10 @@ void check_timings(
return;
case PokemonFRLG_RngTarget::gamecornerabra:
case PokemonFRLG_RngTarget::gamecornerclefairy:
case PokemonFRLG_RngTarget::gamecornerdratini:
case PokemonFRLG_RngTarget::gamecornerdratinifr:
case PokemonFRLG_RngTarget::gamecornerdratinilg:
case PokemonFRLG_RngTarget::gamecornerscyther:
case PokemonFRLG_RngTarget::gamecornerpinsir:
case PokemonFRLG_RngTarget::gamecornerbug:
case PokemonFRLG_RngTarget::gamecornerporygon:
if (INGAME_DELAY < 8500){
OperationFailedException::fire(
Expand Down Expand Up @@ -667,12 +667,12 @@ void perform_blind_sequence(
case PokemonFRLG_RngTarget::gamecornerclefairy:
collect_gamecorner_after_delay(context, INGAME_DELAY, 1);
return;
case PokemonFRLG_RngTarget::gamecornerdratini:
case PokemonFRLG_RngTarget::gamecornerdratinifr:
case PokemonFRLG_RngTarget::gamecornerpinsir:
collect_gamecorner_after_delay(context, INGAME_DELAY, 2);
return;
case PokemonFRLG_RngTarget::gamecornerscyther:
case PokemonFRLG_RngTarget::gamecornerpinsir:
case PokemonFRLG_RngTarget::gamecornerbug:
case PokemonFRLG_RngTarget::gamecornerdratinilg:
collect_gamecorner_after_delay(context, INGAME_DELAY, 3);
return;
case PokemonFRLG_RngTarget::gamecornerporygon:
Expand Down
4 changes: 2 additions & 2 deletions SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ namespace PokemonFRLG{
aerodactyl,
gamecornerabra,
gamecornerclefairy,
gamecornerdratini,
gamecornerbug,
gamecornerdratinifr,
gamecornerdratinilg,
gamecornerscyther,
gamecornerpinsir,
gamecornerporygon,
Expand Down
6 changes: 4 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 @@ -96,7 +96,8 @@ GiftRng::GiftRng()
{PokemonFRLG_RngTarget::aerodactyl, "aerodactyl", "Aerodactyl"},
{PokemonFRLG_RngTarget::gamecornerabra, "gamecornerabra", "Game Corner Abra"},
{PokemonFRLG_RngTarget::gamecornerclefairy, "gamecornerclefairy", "Game Corner Clefairy"},
{PokemonFRLG_RngTarget::gamecornerdratini, "gamecornerdratini", "Game Corner Dratini"},
{PokemonFRLG_RngTarget::gamecornerdratinifr, "gamecornerdratinifr", "Game Corner Dratini (FireRed)"},
{PokemonFRLG_RngTarget::gamecornerdratinilg, "gamecornerdratinilg", "Game Corner Dratini (LeafGreen)"},
{PokemonFRLG_RngTarget::gamecornerscyther, "gamecornerscyther", "Game Corner Scyther"},
{PokemonFRLG_RngTarget::gamecornerpinsir, "gamecornerpinsir", "Game Corner Pinsir"},
{PokemonFRLG_RngTarget::gamecornerporygon, "gamecornerporygon", "Game Corner Porygon"},
Expand Down Expand Up @@ -489,7 +490,8 @@ void GiftRng::program(SingleSwitchProgramEnvironment& env, ProControllerContext&
BASE_STATS = { 70, 45, 48, 60, 65, 35 };
GENDER_THRESHOLD = 190;
break;
case PokemonFRLG_RngTarget::gamecornerdratini:
case PokemonFRLG_RngTarget::gamecornerdratinifr:
case PokemonFRLG_RngTarget::gamecornerdratinilg:
BASE_STATS = { 41, 64, 45, 50, 50, 50 };
GENDER_THRESHOLD = 126;
break;
Expand Down
6 changes: 4 additions & 2 deletions SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,10 @@ RngHelper::RngHelper()
{PokemonFRLG_RngTarget::fossils, "fossils", "Omanyte / Kabuto / Aerodactyl"},
{PokemonFRLG_RngTarget::gamecornerabra, "gamecornerabra", "Game Corner Abra"},
{PokemonFRLG_RngTarget::gamecornerclefairy, "gamecornerclefairy", "Game Corner Clefairy"},
{PokemonFRLG_RngTarget::gamecornerdratini, "gamecornerdratini", "Game Corner Dratini"},
{PokemonFRLG_RngTarget::gamecornerbug, "gamecornerbug", "Game Corner Bug (Scyther / Pinsir)"},
{PokemonFRLG_RngTarget::gamecornerdratinifr, "gamecornerdratinifr", "Game Corner Dratini (FireRed)"},
{PokemonFRLG_RngTarget::gamecornerdratinifr, "gamecornerdratinifr", "Game Corner Dratini (LeafGreen)"},
{PokemonFRLG_RngTarget::gamecornerscyther, "gamecornerscyther", "Game Corner Scyther"},
{PokemonFRLG_RngTarget::gamecornerpinsir, "gamecornerpinsir", "Game Corner Pinsir"},
{PokemonFRLG_RngTarget::gamecornerporygon, "gamecornerporygon", "Game Corner Porygon"},
{PokemonFRLG_RngTarget::togepi, "togepi", "Togepi"},
{PokemonFRLG_RngTarget::staticencounter, "staticencounter", "Static Overworld Encounters"},
Expand Down
4 changes: 2 additions & 2 deletions SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,10 @@ bool check_for_shiny(ConsoleHandle& console, ProControllerContext& context, Poke
case PokemonFRLG_RngTarget::fossils:
case PokemonFRLG_RngTarget::gamecornerabra:
case PokemonFRLG_RngTarget::gamecornerclefairy:
case PokemonFRLG_RngTarget::gamecornerdratini:
case PokemonFRLG_RngTarget::gamecornerdratinifr:
case PokemonFRLG_RngTarget::gamecornerdratinilg:
case PokemonFRLG_RngTarget::gamecornerscyther:
case PokemonFRLG_RngTarget::gamecornerpinsir:
case PokemonFRLG_RngTarget::gamecornerbug:
case PokemonFRLG_RngTarget::gamecornerporygon:
return shiny_check_summary(console, context);
case PokemonFRLG_RngTarget::electrode:
Expand Down
Loading