Skip to content

Home living dex #1206

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 20 commits into from
May 8, 2026
Merged

Home living dex #1206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
5ebf6d0
Added type detection for home and lza. Added sorting rules for box so…
Dalton-V Apr 5, 2026
fd13d6c
cleanup
Dalton-V Apr 6, 2026
6764b10
dedupe type detecton. moved to shared pokemon type reader
Dalton-V Apr 11, 2026
d9cf408
remove from cmake
Dalton-V Apr 11, 2026
ca5a4f1
initial working living dex sorter
Dalton-V Apr 11, 2026
5918dd7
Merge
Dalton-V Apr 23, 2026
b6140b7
cleanup
Dalton-V Apr 23, 2026
f5ffd3d
Missing include?
Dalton-V Apr 23, 2026
19c8ed3
Support Shiny Dex
Dalton-V Apr 24, 2026
5461db3
support dry run.
Dalton-V Apr 24, 2026
200752b
Move duplicate pokemon summary code to shared method.
Dalton-V Apr 25, 2026
19ae0c1
Merge branch 'main' into home-living-dex
Dalton-V Apr 25, 2026
2a6658f
Merge
Dalton-V May 2, 2026
eb8eb08
Fix merge issues
Dalton-V May 2, 2026
77cf1da
Reading OT Name
Dalton-V May 3, 2026
9bba9ac
Add name input
Dalton-V May 3, 2026
7bf8af1
Move behind dev mode
Dalton-V May 3, 2026
4d56092
Support different dex styles
Dalton-V May 3, 2026
5a11d57
typos
Dalton-V May 5, 2026
a6925de
typo
Dalton-V May 6, 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/GlobalSettingsPanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ const std::set<std::string> TOKENS{
"e8d168bc482e96553ea9f9ecaea5a817474dbccc2a6a228a6bde67f2b2aa2889", // James' token.
"7555b7c63481cad42306718c67e7f9def5bfd1da8f6cd299ccd3d7dc95f307ae", // Kuro's token.
"3d475b46d121fc24559d100de2426feaa53cd6578aac2817c4857a610ccde2dd", // kichi's token.
"9b41db8175b5f248a78e738c7bd63a36e33b57953cb4e80ccdd13c2a7e892eec", // Dalton's token.
};


Expand Down
3 changes: 3 additions & 0 deletions SerialPrograms/Source/Pokemon/Pokemon_CollectedPokemonInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ bool operator==(const CollectedPokemonInfo& lhs, const CollectedPokemonInfo& rhs
lhs.ball_slug == rhs.ball_slug &&
lhs.gender == rhs.gender &&
lhs.ot_id == rhs.ot_id &&
lhs.ot_name == rhs.ot_name &&
lhs.primary_type == rhs.primary_type &&
lhs.secondary_type == rhs.secondary_type &&
lhs.tera_type == rhs.tera_type;
Expand Down Expand Up @@ -109,6 +110,7 @@ std::ostream& operator<<(std::ostream& os, const std::optional<CollectedPokemonI
os << "ball:" << pokemon->ball_slug << " ";
os << "gender:" << gender_to_string(pokemon->gender) << " ";
os << "ot_id:" << pokemon->ot_id << " ";
os << "ot_name:" << pokemon->ot_name << " ";
os << "primaryType:" << POKEMON_TYPE_SLUGS().get_string(pokemon->primary_type) << " ";
os << "secondaryType:" << POKEMON_TYPE_SLUGS().get_string(pokemon->secondary_type) << " ";
os << "teraType:" << POKEMON_TERA_TYPE_SLUGS().get_string(pokemon->tera_type) << " ";
Expand Down Expand Up @@ -162,6 +164,7 @@ void save_boxes_data_to_json(const std::vector<std::optional<CollectedPokemonInf
pokemon["ball"] = current_pokemon->ball_slug;
pokemon["gender"] = gender_to_string(current_pokemon->gender);
pokemon["ot_id"] = current_pokemon->ot_id;
pokemon["ot_name"] = current_pokemon->ot_name;
pokemon["primary_type"] = POKEMON_TYPE_SLUGS().get_string(current_pokemon->primary_type);
pokemon["secondary_type"] = POKEMON_TYPE_SLUGS().get_string(current_pokemon->secondary_type);
pokemon["tera_type"] = POKEMON_TERA_TYPE_SLUGS().get_string(current_pokemon->tera_type);
Expand Down
1 change: 1 addition & 0 deletions SerialPrograms/Source/Pokemon/Pokemon_CollectedPokemonInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ struct CollectedPokemonInfo{
std::string ball_slug = "";
StatsHuntGenderFilter gender = StatsHuntGenderFilter::Genderless;
uint32_t ot_id = 0; // original trainer ID
std::string ot_name = ""; // original trainer name
PokemonType primary_type = PokemonType::NONE;
PokemonType secondary_type = PokemonType::NONE;
PokemonTeraType tera_type = PokemonTeraType::NONE;
Expand Down
5 changes: 4 additions & 1 deletion SerialPrograms/Source/PokemonHome/PokemonHome_Panels.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include "Programs/PokemonHome_PageSwap.h"
#include "Programs/PokemonHome_BoxSorter.h"
#include "Programs/PokemonHome_BoxSorterLivingDex.h"

#include "Programs/PokemonHome_GenerateNameOCR.h"

Expand All @@ -31,7 +32,9 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
ret.emplace_back("---- General ----");
ret.emplace_back(make_single_switch_program<PokemonHome::PageSwap_Descriptor, PokemonHome::PageSwap>());
ret.emplace_back(make_single_switch_program<PokemonHome::BoxSorter_Descriptor, PokemonHome::BoxSorter>());

if (PreloadSettings::instance().DEVELOPER_MODE){
ret.emplace_back(make_single_switch_program<PokemonHome::BoxSorterLivingDex_Descriptor, PokemonHome::BoxSorterLivingDex>());
}
// ret.emplace_back("---- Trading ----");

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