Skip to content

Commit 66b6459

Browse files
author
Gin
committed
Add AvailablePokemon resource
1 parent 9710e6c commit 66b6459

File tree

3 files changed

+72
-12
lines changed

3 files changed

+72
-12
lines changed

‎SerialPrograms/Source/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.cpp‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/* Available Pokemon
2+
*
3+
* From: https://github.com/PokemonAutomation/
4+
*
5+
*/
6+
7+
#include "Common/Cpp/Exceptions.h"
8+
#include "CommonFramework/Globals.h"
9+
#include "Pokemon/Resources/Pokemon_PokemonNames.h"
10+
#include "PokemonLZA_AvailablePokemon.h"
11+
12+
namespace PokemonAutomation{
13+
namespace NintendoSwitch{
14+
namespace PokemonLZA{
15+
16+
17+
18+
const std::vector<std::string>& LUMIOSE_DEX_SLUGS(){
19+
static const std::vector<std::string> database = Pokemon::load_pokemon_slug_json_list("Pokemon/Pokedex/Pokedex-Lumiose.json");
20+
return database;
21+
}
22+
23+
const std::vector<std::string>& HYPERSPACE_DEX_SLUGS(){
24+
static const std::vector<std::string> database = Pokemon::load_pokemon_slug_json_list("Pokemon/Pokedex/Pokedex-Hyperspace.json");
25+
return database;
26+
}
27+
28+
29+
30+
}
31+
}
32+
}

‎SerialPrograms/Source/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.h‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/* Available Pokemon
2+
*
3+
* From: https://github.com/PokemonAutomation/
4+
*
5+
*/
6+
7+
#ifndef PokemonAutomation_PokemonLZA_AvailablePokemon_H
8+
#define PokemonAutomation_PokemonLZA_AvailablePokemon_H
9+
10+
#include <string>
11+
#include <vector>
12+
13+
namespace PokemonAutomation{
14+
namespace NintendoSwitch{
15+
namespace PokemonLZA{
16+
17+
18+
const std::vector<std::string>& LUMIOSE_DEX_SLUGS();
19+
20+
const std::vector<std::string>& HYPERSPACE_DEX_SLUGS();
21+
22+
23+
}
24+
}
25+
}
26+
#endif

‎SerialPrograms/SourceFiles.cmake‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ file(GLOB LIBRARY_SOURCES
104104
../Common/Cpp/Options/BooleanCheckBoxOption.h
105105
../Common/Cpp/Options/BoxFloatOption.cpp
106106
../Common/Cpp/Options/BoxFloatOption.h
107-
../Common/Cpp/Options/CheckboxDropdownDatabase.h
108-
../Common/Cpp/Options/CheckboxDropdownOption.tpp
109-
../Common/Cpp/Options/CheckboxDropdownOption.h
110107
../Common/Cpp/Options/ButtonOption.cpp
111108
../Common/Cpp/Options/ButtonOption.h
109+
../Common/Cpp/Options/CheckboxDropdownDatabase.h
110+
../Common/Cpp/Options/CheckboxDropdownOption.h
111+
../Common/Cpp/Options/CheckboxDropdownOption.tpp
112112
../Common/Cpp/Options/ColorOption.cpp
113113
../Common/Cpp/Options/ColorOption.h
114114
../Common/Cpp/Options/ConfigOption.cpp
@@ -251,8 +251,8 @@ file(GLOB LIBRARY_SOURCES
251251
../Common/Qt/WidgetStackFixedAspectRatio.cpp
252252
../Common/Qt/WidgetStackFixedAspectRatio.h
253253
../Common/SerialPABotBase/SerialPABotBase_Messages_HID_Keyboard.h
254-
../Common/SerialPABotBase/SerialPABotBase_Messages_NS_WiredController.h
255254
../Common/SerialPABotBase/SerialPABotBase_Messages_NS1_OemControllers.h
255+
../Common/SerialPABotBase/SerialPABotBase_Messages_NS_WiredController.h
256256
../Common/SerialPABotBase/SerialPABotBase_Protocol.h
257257
../Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h
258258
Source/CommonFramework/AudioPipeline/AudioConstants.h
@@ -698,10 +698,10 @@ file(GLOB LIBRARY_SOURCES
698698
Source/Controllers/SerialPABotBase/SerialPABotBase_Descriptor.h
699699
Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_HID_Keyboard.cpp
700700
Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_HID_Keyboard.h
701-
Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS_WiredController.cpp
702-
Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS_WiredController.h
703701
Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_OemControllers.cpp
704702
Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_OemControllers.h
703+
Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS_WiredController.cpp
704+
Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS_WiredController.h
705705
Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_Protocol.cpp
706706
Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_Protocol.h
707707
Source/Controllers/SerialPABotBase/SerialPABotBase_SelectorWidget.h
@@ -947,12 +947,12 @@ file(GLOB LIBRARY_SOURCES
947947
Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h
948948
Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp
949949
Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h
950-
Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.cpp
951-
Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.h
952950
Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconState.cpp
953951
Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconState.h
954952
Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconTable.cpp
955953
Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconTable.h
954+
Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.cpp
955+
Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.h
956956
Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.cpp
957957
Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h
958958
Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp
@@ -965,12 +965,12 @@ file(GLOB LIBRARY_SOURCES
965965
Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h
966966
Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp
967967
Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h
968-
Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.cpp
969-
Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.h
970968
Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.cpp
971969
Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.h
972970
Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerTable.cpp
973971
Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerTable.h
972+
Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.cpp
973+
Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.h
974974
Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_Controller.cpp
975975
Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_Controller.h
976976
Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_Joycon.cpp
@@ -1676,6 +1676,8 @@ file(GLOB LIBRARY_SOURCES
16761676
Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.h
16771677
Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.cpp
16781678
Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.h
1679+
Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.cpp
1680+
Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.h
16791681
Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.cpp
16801682
Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.h
16811683
Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShuttleRun.cpp
@@ -1684,8 +1686,6 @@ file(GLOB LIBRARY_SOURCES
16841686
Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.h
16851687
Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.cpp
16861688
Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.h
1687-
Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.cpp
1688-
Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.h
16891689
Source/PokemonLZA/Programs/TestPrograms/PokemonLZA_MoveBoxArrow.cpp
16901690
Source/PokemonLZA/Programs/TestPrograms/PokemonLZA_MoveBoxArrow.h
16911691
Source/PokemonLZA/Programs/TestPrograms/PokemonLZA_OverworldWatcher.cpp
@@ -1696,6 +1696,8 @@ file(GLOB LIBRARY_SOURCES
16961696
Source/PokemonLZA/Programs/Trading/PokemonLZA_SelfBoxTrade.h
16971697
Source/PokemonLZA/Programs/Trading/PokemonLZA_TradeRoutines.cpp
16981698
Source/PokemonLZA/Programs/Trading/PokemonLZA_TradeRoutines.h
1699+
Source/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.cpp
1700+
Source/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.h
16991701
Source/PokemonLZA/Resources/PokemonLZA_HyperspaceRewardNames.cpp
17001702
Source/PokemonLZA/Resources/PokemonLZA_HyperspaceRewardNames.h
17011703
Source/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.cpp

0 commit comments

Comments
 (0)