Skip to content

Commit 4bb9c21

Browse files
kichithewolfGin890
authored andcommitted
hyperspace battle reward list
1 parent e02d804 commit 4bb9c21

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

SerialPrograms/Source/PokemonLZA/Inference/PokemonLZA_HyperspaceRewardNameReader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ HyperspaceRewardNameReader& HyperspaceRewardNameReader::instance(){
1818

1919

2020
HyperspaceRewardNameReader::HyperspaceRewardNameReader()
21-
: SmallDictionaryMatcher("PokemonSV/AAT/TournamentPrizeNameOCR.json") //TODO: Get actual reward list
21+
: SmallDictionaryMatcher("PokemonLZA/HyperBattle/HyperspaceRewardNameOCR.json")
2222
{}
2323

2424
OCR::StringMatchResult HyperspaceRewardNameReader::read_substring(

SerialPrograms/Source/PokemonLZA/PokemonLZA_Panels.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
7878
ret.emplace_back(make_single_switch_program<JacintheInfiniteFarmer_Descriptor, JacintheInfiniteFarmer>());
7979
ret.emplace_back(make_single_switch_program<FriendshipFarmer_Descriptor, FriendshipFarmer>());
8080
ret.emplace_back(make_single_switch_program<InPlaceCatcher_Descriptor, InPlaceCatcher>());
81-
ret.emplace_back(make_single_switch_program<HyperspaceRewardReset_Descriptor, HyperspaceRewardReset>());
8281
if (IS_BETA_VERSION){
82+
ret.emplace_back(make_single_switch_program<HyperspaceRewardReset_Descriptor, HyperspaceRewardReset>());
8383
}
8484

8585
ret.emplace_back("---- Shiny Hunting ----");

SerialPrograms/Source/PokemonLZA/Resources/PokemonLZA_HyperspaceRewardNames.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ HyperspaceRewardNamesDatabase::HyperspaceRewardNamesDatabase()
3535
{
3636
// Load a list of tournament prize slugs in the desired order:
3737
// ["potion", "fresh-water", ... ]
38-
std::string path_slugs = RESOURCE_PATH() + "PokemonSV/AAT/TournamentPrizeList.json"; //TODO: Get reward list
38+
std::string path_slugs = RESOURCE_PATH() + "PokemonLZA/HyperBattle/HyperspaceRewardList.json";
3939
JsonValue json_slugs = load_json_file(path_slugs);
4040
JsonArray& slugs = json_slugs.to_array_throw(path_slugs);
4141

@@ -48,7 +48,7 @@ HyperspaceRewardNamesDatabase::HyperspaceRewardNamesDatabase()
4848
// },
4949
// ....
5050
// }
51-
std::string path_disp = RESOURCE_PATH() + "PokemonSV/AAT/TournamentPrizeNameDisplay.json"; //TODO: Get reward list
51+
std::string path_disp = RESOURCE_PATH() + "PokemonLZA/HyperBattle/HyperspaceRewardNameDisplay.json"; //TODO: Get reward list
5252
JsonValue json_disp = load_json_file(path_disp);
5353
JsonObject& item_disp = json_disp.to_object_throw(path_disp);
5454

0 commit comments

Comments
 (0)