diff --git a/SerialPrograms/Source/CommonFramework/Globals.cpp b/SerialPrograms/Source/CommonFramework/Globals.cpp index 0ca795e43..1762a2a5a 100644 --- a/SerialPrograms/Source/CommonFramework/Globals.cpp +++ b/SerialPrograms/Source/CommonFramework/Globals.cpp @@ -25,7 +25,7 @@ namespace PokemonAutomation{ const bool IS_BETA_VERSION = true; const int PROGRAM_VERSION_MAJOR = 0; const int PROGRAM_VERSION_MINOR = 50; -const int PROGRAM_VERSION_PATCH = 2; +const int PROGRAM_VERSION_PATCH = 3; const std::string PROGRAM_VERSION_BASE = "v" + std::to_string(PROGRAM_VERSION_MAJOR) + diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp index d14845568..d9aed5c90 100644 --- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp +++ b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp @@ -324,12 +324,12 @@ SandwichMakerOption::SandwichMakerOption( "Sandwich Recipe:
Select a recipe to make a sandwich with preset ingredients, or select Custom Sandwich to make a sandwich using the table below. " "Refer to the documentation for recipe ingredients and valid Herba Mystica combinations.", { - {BaseRecipe::non_shiny, "non-shiny", "Normal Encounter (non-shiny)"}, - {BaseRecipe::shiny, "shiny", "Sparkling + Title + Encounter"}, - {BaseRecipe::huge, "huge", "Sparkling + Title + Humungo"}, - {BaseRecipe::tiny, "tiny", "Sparkling + Title + Teensy"}, - {BaseRecipe::paradox, "paradox", "Title + Encounter + Humungo/Teensy: Paradox-specific"}, - {BaseRecipe::custom, "custom", "Custom Sandwich"}, + {BaseRecipe::non_shiny, "non-shiny", "Normal Encounter (non-shiny)"}, + {BaseRecipe::shiny, "shiny", "Sparkling + Title + Encounter"}, + {BaseRecipe::huge, "huge", "Sparkling + Title + Humungo"}, + {BaseRecipe::tiny, "tiny", "Sparkling + Title + Teensy"}, + {BaseRecipe::paradox, "paradox", "Title + Encounter + Humungo/Teensy: Paradox-specific"}, + {BaseRecipe::custom, "custom", "Custom Sandwich"}, }, LockMode::LOCK_WHILE_RUNNING, base_recipe diff --git a/SerialPrograms/Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.h b/SerialPrograms/Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.h index 43beebea9..c4741a6df 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.h +++ b/SerialPrograms/Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.h @@ -44,8 +44,8 @@ class ItemPrinterRNG : public SingleSwitchProgramInstance, public ConfigOption:: }; enum class ItemPrinterMode{ + STANDARD_MODE, AUTO_MODE, - STANDARD_MODE }; virtual void value_changed(void* object) override; diff --git a/SerialPrograms/Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNGTable.cpp b/SerialPrograms/Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNGTable.cpp index cf49b5a3e..ada4ad83d 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNGTable.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNGTable.cpp @@ -199,8 +199,8 @@ std::vector ItemPrinterDesiredItemTable::make_header() const{ } std::vector> ItemPrinterDesiredItemTable::make_defaults(){ std::vector> ret; - ret.emplace_back(std::make_unique(*this, ItemPrinter::PrebuiltOptions::ABILITY_PATCH, 999)); - ret.emplace_back(std::make_unique(*this, ItemPrinter::PrebuiltOptions::EXP_CANDY, 999)); + ret.emplace_back(std::make_unique(*this, ItemPrinter::PrebuiltOptions::ABILITY_PATCH, (uint16_t)999)); + ret.emplace_back(std::make_unique(*this, ItemPrinter::PrebuiltOptions::EXP_CANDY, (uint16_t)999)); return ret; }