Skip to content

Frlg Held Item Farmer - Safari Zone #1304

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 8 commits into from
Aug 25, 2026
Merged

Frlg Held Item Farmer - Safari Zone #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
df84f91
Add option to hunt dragonair
Dalton-V Jun 16, 2026
94d6024
rename lucky egg farmer to held item farmer - safari zone
Dalton-V Jun 24, 2026
9f57948
Use resently added fishing encounter method
Dalton-V Jun 24, 2026
430c0ca
Use new party detector to know what pokemon to check for held item. A…
Dalton-V Jun 24, 2026
1802e3a
Hide new item behind beta
Dalton-V Jun 24, 2026
0cb89f1
Catch logic
Dalton-V Aug 20, 2026
9963cf5
Add logs attempt to recover from missed transitions
Dalton-V Aug 23, 2026
720e012
More recovery logic
Dalton-V Aug 23, 2026
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
1 change: 1 addition & 0 deletions SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const std::map<std::string, std::string> STATS_DATABASE_ALIASES{
{"PokemonSV:StatsResetBloodmoon", "PokemonSV:StatsResetEventBattle"},
{"PokemonLZA:ShinyHunt-Bench", "PokemonLZA:ShinyHunt-BenchSit"},
{"PokemonLZA:BerryBuyer", "PokemonLZA:StallBuyer"},
{"PokemonFRLG:LuckyEggFarmer", "PokemonFRLG:HeldItemFarmerSafariZone"},
};


Expand Down
3 changes: 3 additions & 0 deletions SerialPrograms/Source/PokemonFRLG/PokemonFRLG_Navigation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ int grass_spin(ConsoleHandle& console, ProControllerContext& context, bool leftr
// returns -1 if no encounter is triggered, 0 if a non-shiny is encounter, and 1 if a shiny is encountered
int fish_encounter(ConsoleHandle& console, ProControllerContext& context, Seconds timeout = 300s);

// tries to pull up the start menu to check if currently in the overworld
bool in_overworld(ConsoleHandle& console, ProControllerContext& context);

// Automatically catch a Pokemon.
// Returns -1 if there are detection issues, 0 if the Pokemon was not caught, and the number of balls thrown if it was caught.
int auto_catch(
Expand Down
4 changes: 2 additions & 2 deletions SerialPrograms/Source/PokemonFRLG/PokemonFRLG_Panels.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include "PokemonFRLG_Panels.h"

#include "PokemonFRLG_Settings.h"
#include "Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.h"
#include "Programs/Farming/PokemonFRLG_ItemDuplication.h"
#include "Programs/Farming/PokemonFRLG_LuckyEggFarmer.h"
#include "Programs/Farming/PokemonFRLG_NuggetBridgeFarmer.h"
#include "Programs/Farming/PokemonFRLG_PickupFarmer.h"
#include "Programs/Farming/PokemonFRLG_EvTrainer.h"
Expand Down Expand Up @@ -59,7 +59,7 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
ret.emplace_back(make_single_switch_program<NuggetBridgeFarmer_Descriptor, NuggetBridgeFarmer>());
ret.emplace_back(make_single_switch_program<PickupFarmer_Descriptor, PickupFarmer>());
ret.emplace_back(make_single_switch_program<EvTrainer_Descriptor, EvTrainer>());
ret.emplace_back(make_single_switch_program<LuckyEggFarmer_Descriptor, LuckyEggFarmer>());
ret.emplace_back(make_single_switch_program<HeldItemFarmerSafariZone_Descriptor, HeldItemFarmerSafariZone>());
ret.emplace_back(make_single_switch_program<ItemDuplication_Descriptor, ItemDuplication>());

//ret.emplace_back("---- General ----");
Expand Down
Loading
Loading