Fix SV auto-host date correction.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp

@@ -247,99 +247,6 @@ bool DateReader::detect(const ImageViewRGB32& screen){
 }
 
 
-void DateReader::set_hours(
-    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
-    uint8_t hour
-){
-    context.wait_for_all_requests();
-    {
-        auto snapshot = stream.video().snapshot();
-        if (!detect(snapshot)){
-            throw_and_log<FatalProgramException>(
-                stream.logger(), ErrorReport::SEND_ERROR_REPORT,
-                "Expected date change menu.",
-                stream
-            );
-        }
-    }
-
-    for (size_t attempts = 0; attempts < 10; attempts++){
-        //  Move cursor out of the way.
-        for (size_t c = 0; c < 7; c++){
-            ssf_issue_scroll_ptv(context, DPAD_LEFT);
-        }
-        context.wait_for_all_requests();
-        context.wait_for(std::chrono::milliseconds(250));
-
-        //  Read the hour.
-        VideoSnapshot snapshot = stream.video().snapshot();
-//        int8_t current_hour = read_hours(stream, snapshot);
-        int8_t current_hour = read_date(stream.logger(), snapshot).second.hour;
-
-        if (current_hour < 0){
-            throw_and_log<FatalProgramException>(
-                stream.logger(), ErrorReport::SEND_ERROR_REPORT,
-                "Unable to read the hour.",
-                stream
-            );
-        }
-
-        //  We're done.
-        if (current_hour == hour){
-            for (size_t c = 0; c < 7; c++){
-                ssf_issue_scroll_ptv(context, DPAD_RIGHT);
-            }
-            return;
-        }
-
-        //  Move the cursor to the hour.
-        ssf_issue_scroll_ptv(context, DPAD_RIGHT);
-        ssf_issue_scroll_ptv(context, DPAD_RIGHT);
-        ssf_issue_scroll_ptv(context, DPAD_RIGHT);
-
-        ImageViewRGB32 us_hours = extract_box_reference(snapshot, m_us_hour);
-        ImageStats stats_us_hours = image_stats(us_hours);
-        double stddev = stats_us_hours.stddev.sum();
-        bool format_us = stddev > 30;
-        if (format_us){
-            uint8_t diff = (24 + (uint8_t)hour - (uint8_t)current_hour) % 12;
-            if (diff < 6){
-                for (size_t c = 0; c < diff; c++){
-                    ssf_issue_scroll_ptv(context, DPAD_UP);
-                }
-            }else{
-                for (size_t c = diff; c < 12; c++){
-                    ssf_issue_scroll_ptv(context, DPAD_DOWN);
-                }
-            }
-            if ((hour < 12) != (current_hour < 12)){
-                ssf_issue_scroll_ptv(context, DPAD_RIGHT);
-                ssf_issue_scroll_ptv(context, DPAD_RIGHT);
-                ssf_issue_scroll_ptv(context, DPAD_DOWN);
-            }
-        }else{
-            uint8_t diff = (24 + (uint8_t)hour - (uint8_t)current_hour) % 24;
-            if (diff < 12){
-                for (size_t c = 0; c < diff; c++){
-                    ssf_issue_scroll_ptv(context, DPAD_UP);
-                }
-            }else{
-                for (size_t c = diff; c < 24; c++){
-                    ssf_issue_scroll_ptv(context, DPAD_DOWN);
-                }
-            }
-        }
-    }
-
-//    auto snapshot = console.video().snapshot();
-    throw_and_log<FatalProgramException>(
-        stream.logger(), ErrorReport::SEND_ERROR_REPORT,
-        "Failed to set the hour after 10 attempts.",
-        stream
-    );
-}
-
-
 std::pair<DateFormat, DateTime> DateReader::read_date(Logger& logger, std::shared_ptr<const ImageRGB32> screen){
     if (!detect(*screen)){
         throw_and_log<OperationFailedException>(

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.h

@@ -72,15 +72,6 @@ class DateReader : public StaticScreenDetector{
     //  Returns true if we are on the date change window.
     virtual bool detect(const ImageViewRGB32& screen) override;
 
-    //  Read the hours (0 - 23) while on the date change window.
-    //  Returns -1 if unable to read.
-//    int8_t read_hours(Logger& logger, std::shared_ptr<const ImageRGB32> screen) const;
-
-    void set_hours(
-        const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
-        uint8_t hour    //  0 - 23
-    );
-
 
     std::pair<DateFormat, DateTime> read_date(Logger& logger, std::shared_ptr<const ImageRGB32> screen);
     void set_date(

SerialPrograms/Source/PokemonSV/Programs/PokemonSV_MenuNavigation.cpp

@@ -36,7 +36,14 @@ void set_time_to_12am_from_home(const ProgramInfo& info, ConsoleHandle& console,
 //    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
     home_to_date_time(console, context, true);
     pbf_press_button(context, BUTTON_A, 20, 50);
-    reader.set_hours(info, console, context, 0);
+
+    context.wait_for_all_requests();
+
+    DateTime time = reader.read_date(console, console.video().snapshot()).second;
+    time.hour = 0;
+    reader.set_date(info, console, context, time);
+//    reader.set_hours(info, console, context, 0);
+
     pbf_press_button(context, BUTTON_A, 20, 30);
     pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
 //    resume_game_from_home(console, context);