update to work with newer hyperspace map function

Author: kichithewolf

SerialPrograms/Source/PokemonLZA/Inference/Map/PokemonLZA_MapIconDetector.h

@@ -31,10 +31,10 @@ enum class MapIconType{
     WildZone,
     WildZoneFlyable,
     BattleZone,
-    HyperspaceBattleZone,
-    HyperspaceWildZone,
-    HyperspaceEntryWild,
-    HyperspaceEntryBattle,
+    HyperspaceBattleZone, //Icon in Lumiose
+    HyperspaceWildZone, //Icon in Lumiose
+    HyperspaceEntryWild, //Icon while in Hyperspace
+    HyperspaceEntryBattle, //Icon while in Hyperspace
 };
 
 const char* map_icon_type_to_string(MapIconType type);

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.cpp

@@ -113,16 +113,13 @@ bool open_map(ConsoleHandle& console, ProControllerContext& context, bool zoom_t
     MapIconDetector flayble_cafe_icon(COLOR_ORANGE, MapIconType::CafeFlyable, icon_region, &console.overlay());
     MapIconDetector flyable_hyperspace_battle_zone_icon(COLOR_ORANGE, MapIconType::HyperspaceBattleZone, icon_region, &console.overlay());
     MapIconDetector flyable_hyperspace_wild_zone_icon(COLOR_ORANGE, MapIconType::HyperspaceWildZone, icon_region, &console.overlay());
-    MapIconDetector flyable_hyperspace_entry_wild_icon(COLOR_ORANGE, MapIconType::HyperspaceEntryWild, icon_region, &console.overlay());
-    MapIconDetector flyable_hyperspace_entry_battle_icon(COLOR_ORANGE, MapIconType::HyperspaceEntryBattle, icon_region, &console.overlay());
+
     MapWatcher map_detector(COLOR_RED, &console.overlay());
     map_detector.attach_map_icon_detector(pokecenter_icon);
     map_detector.attach_map_icon_detector(flyable_building_icon);
     map_detector.attach_map_icon_detector(flayble_cafe_icon);
     map_detector.attach_map_icon_detector(flyable_hyperspace_battle_zone_icon);
     map_detector.attach_map_icon_detector(flyable_hyperspace_wild_zone_icon);
-    map_detector.attach_map_icon_detector(flyable_hyperspace_entry_wild_icon);
-    map_detector.attach_map_icon_detector(flyable_hyperspace_entry_battle_icon);
 
     do{
         map_detector.reset_state();
@@ -181,7 +178,13 @@ void open_hyperspace_map(ConsoleHandle& console, ProControllerContext& context){
 
     WallClock deadline = current_time() + 30s;
 
+    const ImageFloatBox icon_region{0.0, 0.089, 1.0, 0.911};
+    MapIconDetector flyable_hyperspace_entry_wild_icon(COLOR_ORANGE, MapIconType::HyperspaceEntryWild, icon_region, &console.overlay());
+    MapIconDetector flyable_hyperspace_entry_battle_icon(COLOR_ORANGE, MapIconType::HyperspaceEntryBattle, icon_region, &console.overlay());
+
     MapWatcher map_detector(COLOR_RED, &console.overlay());
+    map_detector.attach_map_icon_detector(flyable_hyperspace_entry_wild_icon);
+    map_detector.attach_map_icon_detector(flyable_hyperspace_entry_battle_icon);
 
     do{
         map_detector.reset_state();

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

@@ -74,9 +74,9 @@ ShinyHunt_FlySpotReset::ShinyHunt_FlySpotReset()
         Route::NO_MOVEMENT
     )
     , NUM_RESETS(
-        "<b>Resets:</b><br>Number of resets, for use when performing fly resets in Hyperspace Wild Zones. Each fly takes about 1 Cal. of time. Make sure to leave enough time to catch found shinies. Zero disables this option.",
+        "<b>Hyperspace Resets:</b><br>Number of resets when running the Hyperspace Wild Zone route. Each fly takes about 1 Cal. of time. Make sure to leave enough time to catch found shinies.",
         LockMode::UNLOCK_WHILE_RUNNING,
-        0, 0
+        100, 1
     )
     , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({
@@ -270,7 +270,7 @@ void ShinyHunt_FlySpotReset::program(SingleSwitchProgramEnvironment& env, ProCon
                 }
 
                 uint64_t num_resets_temp = NUM_RESETS;
-                if (num_resets_temp != 0 && num_resets >= num_resets_temp){
+                if (ROUTE == Route::HYPERSPACE_WILD_ZONE && num_resets >= num_resets_temp){
                     env.log("Number of resets hit. Going to home to pause the game.");
                     go_home(env.console, context);
                     break;