|
4 | 4 | * |
5 | 5 | */ |
6 | 6 |
|
7 | | -#include "PokemonFRLG_Panels.h" |
8 | 7 | #include "CommonFramework/GlobalSettingsPanel.h" |
9 | 8 | #include "Pokemon/Pokemon_Strings.h" |
| 9 | +#include "PokemonFRLG_Panels.h" |
10 | 10 |
|
11 | 11 | #include "PokemonFRLG_Settings.h" |
12 | 12 |
|
|
16 | 16 | #include "Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.h" |
17 | 17 | #include "Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.h" |
18 | 18 | #include "Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.h" |
19 | | -#include "Programs/TestPrograms/PokemonFRLG_ReadStats.h" |
20 | 19 | #include "Programs/TestPrograms/PokemonFRLG_SoundListener.h" |
| 20 | +#include "Programs/TestPrograms/PokemonFRLG_ReadStats.h" |
21 | 21 |
|
22 | 22 | namespace PokemonAutomation { |
23 | | -namespace NintendoSwitch { |
24 | | -namespace PokemonFRLG { |
25 | | - |
26 | | -PanelListFactory::PanelListFactory() |
27 | | - : PanelListDescriptor(Pokemon::STRING_POKEMON + " FireRed and LeafGreen") {} |
28 | | - |
29 | | -std::vector<PanelEntry> PanelListFactory::make_panels() const { |
30 | | - std::vector<PanelEntry> ret; |
31 | | - |
32 | | - ret.emplace_back("---- Settings ----"); |
33 | | - ret.emplace_back(make_settings<GameSettings_Descriptor, GameSettingsPanel>()); |
34 | | - |
35 | | - ret.emplace_back("---- Farming ----"); |
36 | | - if (PreloadSettings::instance().DEVELOPER_MODE) { |
37 | | - ret.emplace_back(make_single_switch_program<NuggetBridgeFarmer_Descriptor, NuggetBridgeFarmer>()); |
38 | | - } |
39 | | - |
40 | | - // ret.emplace_back("---- General ----"); |
41 | | - |
42 | | - ret.emplace_back("---- Shiny Hunting ----"); |
43 | | - ret.emplace_back( |
44 | | - make_single_switch_program<GiftReset_Descriptor, GiftReset>()); |
45 | | - ret.emplace_back( |
46 | | - make_single_switch_program<LegendaryReset_Descriptor, LegendaryReset>()); |
47 | | - ret.emplace_back(make_single_switch_program<ShinyHuntOverworld_Descriptor, |
48 | | - ShinyHuntOverworld>()); |
49 | | - if (PreloadSettings::instance().DEVELOPER_MODE) { |
50 | | - ret.emplace_back(make_single_switch_program<LegendaryRunAway_Descriptor, |
51 | | - LegendaryRunAway>()); |
52 | | - ret.emplace_back(make_single_switch_program<PrizeCornerReset_Descriptor, |
53 | | - PrizeCornerReset>()); |
54 | | - } |
55 | | - |
56 | | - |
57 | | - ret.emplace_back("---- Developer Tools ----"); |
58 | | - ret.emplace_back( |
59 | | - make_single_switch_program<SoundListener_Descriptor, SoundListener>()); |
60 | | - ret.emplace_back( |
61 | | - make_single_switch_program<ReadStats_Descriptor, ReadStats>()); |
62 | | - |
63 | | - |
64 | | - return ret; |
65 | | -} |
| 23 | + namespace NintendoSwitch { |
| 24 | + namespace PokemonFRLG { |
| 25 | + |
| 26 | + |
| 27 | + |
| 28 | + PanelListFactory::PanelListFactory() |
| 29 | + : PanelListDescriptor(Pokemon::STRING_POKEMON + " FireRed and LeafGreen") |
| 30 | + { |
| 31 | + } |
| 32 | + |
| 33 | + std::vector<PanelEntry> PanelListFactory::make_panels() const { |
| 34 | + std::vector<PanelEntry> ret; |
| 35 | + |
| 36 | + ret.emplace_back("---- Settings ----"); |
| 37 | + ret.emplace_back(make_settings<GameSettings_Descriptor, GameSettingsPanel>()); |
66 | 38 |
|
67 | | -} // namespace PokemonFRLG |
68 | | -} // namespace NintendoSwitch |
69 | | -} // namespace PokemonAutomation |
| 39 | + ret.emplace_back("---- Farming ----"); |
| 40 | + if (PreloadSettings::instance().DEVELOPER_MODE) { |
| 41 | + ret.emplace_back(make_single_switch_program<NuggetBridgeFarmer_Descriptor, NuggetBridgeFarmer>()); |
| 42 | + } |
| 43 | + |
| 44 | + //ret.emplace_back("---- General ----"); |
| 45 | + |
| 46 | + ret.emplace_back("---- Shiny Hunting ----"); |
| 47 | + ret.emplace_back(make_single_switch_program<GiftReset_Descriptor, GiftReset>()); |
| 48 | + ret.emplace_back(make_single_switch_program<LegendaryReset_Descriptor, LegendaryReset>()); |
| 49 | + ret.emplace_back(make_single_switch_program<ShinyHuntOverworld_Descriptor, ShinyHuntOverworld>()); |
| 50 | + if (PreloadSettings::instance().DEVELOPER_MODE) { |
| 51 | + ret.emplace_back(make_single_switch_program<LegendaryRunAway_Descriptor, LegendaryRunAway>()); |
| 52 | + ret.emplace_back(make_single_switch_program<PrizeCornerReset_Descriptor, PrizeCornerReset>()); |
| 53 | + } |
| 54 | + |
| 55 | + |
| 56 | + if (PreloadSettings::instance().DEVELOPER_MODE) { |
| 57 | + ret.emplace_back("---- Developer Tools ----"); |
| 58 | + ret.emplace_back(make_single_switch_program<SoundListener_Descriptor, SoundListener>()); |
| 59 | + ret.emplace_back(make_single_switch_program<ReadStats_Descriptor, ReadStats>()); |
| 60 | + } |
| 61 | + |
| 62 | + return ret; |
| 63 | + } |
| 64 | + |
| 65 | + |
| 66 | + |
| 67 | + |
| 68 | + } |
| 69 | + } |
| 70 | +} |
0 commit comments