Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
9c46e1b
preliminary ev trainer
theastrogoth Mar 17, 2026
2cb48db
Merge branch 'main' into tag/ev-trainer
theastrogoth Mar 17, 2026
a05dbbd
add faint detection and work out a few bugs
theastrogoth Mar 17, 2026
15b1d4c
enforce filename case change
theastrogoth Mar 18, 2026
23f9f5a
Delete SerialPrograms/Source/PokemonFRLG/Programs/Farming/PokemonFRLG…
theastrogoth Mar 18, 2026
2329307
Delete SerialPrograms/Source/PokemonFRLG/Programs/Farming/PokemonFRLG…
theastrogoth Mar 18, 2026
20f7bf8
Merge branch 'main' into tag/ev-trainer
theastrogoth Mar 19, 2026
77302f2
oops
theastrogoth Mar 19, 2026
865175e
tweak stats display, various fixes
theastrogoth Mar 19, 2026
cab5b82
handle post-battle evolution
theastrogoth Mar 20, 2026
e2d66c3
fixed handling of evolution
theastrogoth Mar 22, 2026
d6881b6
Merge branch 'main' into tag/ev-trainer
theastrogoth Mar 22, 2026
be373dd
implement SpD stuff
theastrogoth Mar 23, 2026
b369d52
add missing black border check
theastrogoth Mar 23, 2026
9d4a1e3
fix Pickup Farmer changes
theastrogoth Mar 23, 2026
9fad1fe
remove redundant grass_spin()
theastrogoth Mar 23, 2026
e642b31
pickup farmer fixes
theastrogoth Mar 23, 2026
8d25ac7
small fix for teak_pickup_items() timing
theastrogoth Mar 23, 2026
03c0555
better recovery for exit_wild_battle()
theastrogoth Mar 29, 2026
9935e2e
Fixed review comments
theastrogoth Mar 29, 2026
f5e4318
tweaks to wild species OCR
theastrogoth Mar 30, 2026
b44ace4
oops, add missing EV info for onix
theastrogoth Mar 30, 2026
7de9e47
pickup farmer typo
theastrogoth Apr 1, 2026
498e26e
Merge branch 'main' into tag/ev-trainer
theastrogoth Apr 12, 2026
5f074de
fix spam_first_move() return type
theastrogoth Apr 12, 2026
732a6a9
oops
theastrogoth Apr 12, 2026
ebd698e
Merge branch 'main' into tag/ev-trainer
theastrogoth Apr 12, 2026
34fe86b
handle macho brace and pokerus
theastrogoth Apr 13, 2026
d0e7280
small label fixes
theastrogoth Apr 13, 2026
c094036
add Pokerus string
theastrogoth Apr 13, 2026
2c80c29
remove bad language options
theastrogoth Apr 13, 2026
9508850
reorganize
theastrogoth Apr 14, 2026
c618e96
big oops
theastrogoth Apr 14, 2026
cec2a5c
stricter red filter in BattleOutOfPpDetector
theastrogoth Apr 14, 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/Pokemon/Pokemon_Strings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const std::string STRING_POKEBALL = "Pok\u00e9ball";
const std::string STRING_POKEMON = "Pok\u00e9mon";
const std::string STRING_POKEDEX = "Pok\u00e9dex";
const std::string STRING_POKEJOB = "Pok\u00e9 Job";
const std::string STRING_POKERUS = "Pok\u00e9rus";

const std::string UNICODE_MALE = "\u2642";
const std::string UNICODE_FEMALE = "\u2640";
Expand Down
1 change: 1 addition & 0 deletions SerialPrograms/Source/Pokemon/Pokemon_Strings.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ extern const std::string STRING_POKEBALL;
extern const std::string STRING_POKEMON;
extern const std::string STRING_POKEDEX;
extern const std::string STRING_POKEJOB;
extern const std::string STRING_POKERUS;

extern const std::string UNICODE_MALE;
extern const std::string UNICODE_FEMALE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ bool BattleOutOfPpDetector::detect(const ImageViewRGB32& screen){
const bool replace_color_within_range = false;
const ImageRGB32 red_region = filter_rgb32_range(
region,
combine_rgb(150, 0, 0), combine_rgb(255, 150, 150), Color(0), replace_color_within_range
combine_rgb(180, 0, 0), combine_rgb(255, 120, 120), Color(0), replace_color_within_range
);
const size_t num_red_pixels = image_stats(red_region).count;
const double threshold = region.width() * region.height() * m_area_ratio_threshold;
Expand Down
2 changes: 2 additions & 0 deletions SerialPrograms/Source/PokemonFRLG/PokemonFRLG_Panels.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#include "Programs/Farming/PokemonFRLG_NuggetBridgeFarmer.h"
#include "Programs/Farming/PokemonFRLG_PickupFarmer.h"
#include "Programs/Farming/PokemonFRLG_EvTrainer.h"
#include "Programs/ShinyHunting/PokemonFRLG_GiftReset.h"
#include "Programs/ShinyHunting/PokemonFRLG_LegendaryReset.h"
#include "Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.h"
Expand Down Expand Up @@ -42,6 +43,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>());
if (PreloadSettings::instance().DEVELOPER_MODE){
ret.emplace_back(make_single_switch_program<EvTrainer_Descriptor, EvTrainer>());
}

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