Skip to content

Commit aa349d9

Browse files
committed
Misc. for beta.
1 parent 7272ca2 commit aa349d9

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

SerialPrograms/Source/CommonFramework/Globals.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace PokemonAutomation{
2525
const bool IS_BETA_VERSION = true;
2626
const int PROGRAM_VERSION_MAJOR = 0;
2727
const int PROGRAM_VERSION_MINOR = 50;
28-
const int PROGRAM_VERSION_PATCH = 2;
28+
const int PROGRAM_VERSION_PATCH = 3;
2929

3030
const std::string PROGRAM_VERSION_BASE =
3131
"v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -324,12 +324,12 @@ SandwichMakerOption::SandwichMakerOption(
324324
"<b>Sandwich Recipe:</b><br>Select a recipe to make a sandwich with preset ingredients, or select Custom Sandwich to make a sandwich using the table below. "
325325
"Refer to the documentation for recipe ingredients and valid Herba Mystica combinations.",
326326
{
327-
{BaseRecipe::non_shiny, "non-shiny", "Normal Encounter (non-shiny)"},
328-
{BaseRecipe::shiny, "shiny", "Sparkling + Title + Encounter"},
329-
{BaseRecipe::huge, "huge", "Sparkling + Title + Humungo"},
330-
{BaseRecipe::tiny, "tiny", "Sparkling + Title + Teensy"},
331-
{BaseRecipe::paradox, "paradox", "Title + Encounter + Humungo/Teensy: Paradox-specific"},
332-
{BaseRecipe::custom, "custom", "Custom Sandwich"},
327+
{BaseRecipe::non_shiny, "non-shiny", "Normal Encounter (non-shiny)"},
328+
{BaseRecipe::shiny, "shiny", "Sparkling + Title + Encounter"},
329+
{BaseRecipe::huge, "huge", "Sparkling + Title + Humungo"},
330+
{BaseRecipe::tiny, "tiny", "Sparkling + Title + Teensy"},
331+
{BaseRecipe::paradox, "paradox", "Title + Encounter + Humungo/Teensy: Paradox-specific"},
332+
{BaseRecipe::custom, "custom", "Custom Sandwich"},
333333
},
334334
LockMode::LOCK_WHILE_RUNNING,
335335
base_recipe

SerialPrograms/Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ class ItemPrinterRNG : public SingleSwitchProgramInstance, public ConfigOption::
4444
};
4545

4646
enum class ItemPrinterMode{
47+
STANDARD_MODE,
4748
AUTO_MODE,
48-
STANDARD_MODE
4949
};
5050

5151
virtual void value_changed(void* object) override;

SerialPrograms/Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNGTable.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ std::vector<std::string> ItemPrinterDesiredItemTable::make_header() const{
199199
}
200200
std::vector<std::unique_ptr<EditableTableRow>> ItemPrinterDesiredItemTable::make_defaults(){
201201
std::vector<std::unique_ptr<EditableTableRow>> ret;
202-
ret.emplace_back(std::make_unique<ItemPrinterDesiredItemRow>(*this, ItemPrinter::PrebuiltOptions::ABILITY_PATCH, 999));
203-
ret.emplace_back(std::make_unique<ItemPrinterDesiredItemRow>(*this, ItemPrinter::PrebuiltOptions::EXP_CANDY, 999));
202+
ret.emplace_back(std::make_unique<ItemPrinterDesiredItemRow>(*this, ItemPrinter::PrebuiltOptions::ABILITY_PATCH, (uint16_t)999));
203+
ret.emplace_back(std::make_unique<ItemPrinterDesiredItemRow>(*this, ItemPrinter::PrebuiltOptions::EXP_CANDY, (uint16_t)999));
204204
return ret;
205205
}
206206

0 commit comments

Comments
 (0)