m

Author: Gin

SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.cpp

@@ -115,7 +115,7 @@ AutoFossil::AutoFossil()
         ImageAttachmentMode::JPG,
         {"Notifs", "Showcase"}
     )
-    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATION_STATUS("Status Update", true, false, Seconds(3600))
     , NOTIFICATIONS({
         &NOTIFICATION_STATUS,
         &FOUND_SHINY_OR_ALPHA,
@@ -281,11 +281,11 @@ bool AutoFossil::check_fossils_in_one_box(
         box_detector.move_cursor(env.program_info(), env.console, context, box_row, box_col);
 
         info_watcher.reset_state();
-        const int ret = wait_until(env.console, context, std::chrono::seconds(10), {info_watcher});
+        const int ret = wait_until(env.console, context, Seconds(5), {info_watcher});
         if (ret < 0) {
             OperationFailedException::fire(
                 ErrorReport::SEND_ERROR_REPORT,
-                "Failed to detect box info at cell idx " + std::to_string(i) + " after 30 seconds",
+                "Failed to detect box info at cell idx " + std::to_string(i) + " after 5 seconds",
                 env.console
             );
         }

SerialPrograms/Source/PokemonSV/Resources/PokemonSV_NameDatabase.cpp

@@ -6,6 +6,7 @@
 
 #include "CommonFramework/Logging/Logger.h"
 #include "Pokemon/Resources/Pokemon_PokemonNames.h"
+#include "Pokemon/Resources/Pokemon_PokemonSlugs.h"
 #include "PokemonSV/Resources/PokemonSV_PokemonSprites.h"
 #include "PokemonSV_NameDatabase.h"
 
@@ -44,10 +45,10 @@ StringSelectDatabase make_ALL_POKEMON_NAMES(){
     const SpriteDatabase& sprites = ALL_POKEMON_SPRITES();
 
     std::vector<std::string> slugs;
-    for (std::string& slug : load_pokemon_slug_json_list("Pokemon/Pokedex/Pokedex-National.json")){
+    for (const std::string& slug : NATIONAL_DEX_SLUGS()){
         const SpriteDatabase::Sprite* sprite = sprites.get_nothrow(slug);
         if (sprite != nullptr){
-            slugs.emplace_back(std::move(slug));
+            slugs.emplace_back(slug);
         }
     }
 

SerialPrograms/Source/PokemonSV/Resources/PokemonSV_NameDatabase.h

@@ -11,8 +11,6 @@ namespace NintendoSwitch{
 namespace PokemonSV{
 
 
-StringSelectDatabase make_name_database(const std::vector<std::string>& slugs);
-
 const StringSelectDatabase& ALL_POKEMON_NAMES();