FRLG AutoStory stage 5: Route 25, Bill's S.S. Ticket and an Oddish

SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SaveCardReader.cpp

@@ -71,6 +71,8 @@ class PlaceNameMatcher : public OCR::SmallDictionaryMatcher{
             {"route-3", "Route 3"},
             {"route-4", "Route 4"},
             {"cerulean-city", "Cerulean City"},
+            {"route-24", "Route 24"},
+            {"route-25", "Route 25"},
         }){
             JsonArray names;
             names.push_back(name);

SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SaveCardReader.h

@@ -4,9 +4,10 @@
  *
  *  Reads where the game would be saved: the place name in blue at the top
  *  of the card the START menu's SAVE shows ("PALLET TOWN" over PLAYER,
- *  BADGES and TIME). It knows the places from a new game to Route 4, and
- *  Cerulean City, in English only so far: in another language nothing is
- *  read. Route 3, Route 4 and Cerulean City have no test capture yet.
+ *  BADGES and TIME). It knows the places from a new game to Route 4,
+ *  Cerulean City, Route 24 and Route 25 (Bill's Sea Cottage is on it), in
+ *  English only so far: in another language nothing is read. Route 3,
+ *  Route 4, Cerulean City, Route 24 and Route 25 have no test capture yet.
  *
  */
 
@@ -31,8 +32,9 @@ namespace PokemonFRLG{
 ImageFloatBox save_card_title_box();
 
 //  The place on the save card: "pallet-town", "viridian-city",
-//  "viridian-forest", "pewter-city", "route-1" to "route-4", "cerulean-city"; empty if it
-//  can't be read, as in a language the reader has no names for.
+//  "viridian-forest", "pewter-city", "route-1" to "route-4", "cerulean-city",
+//  "route-24", "route-25"; empty if it can't be read, as in a language the
+//  reader has no names for.
 std::string read_save_card_location(Logger& logger, Language language, const ImageViewRGB32& screen);
 
 

SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TeachScreenReader.cpp

@@ -1,4 +1,4 @@
 /*  Teach Screen Reader
  *
  *  From: https://github.com/PokemonAutomation/
  *
@@ -489,22 +489,23 @@
 
 void add_tests_TeachScreenReader(UnitTestDatabase& database){
     //  FireRed on console B, 2026-11-03: TM03 taught to the lead from the
-    //  bag, B on the move to forget, and YES to stop.
+    //  bag, B on the move to forget, and YES to stop. Listed in the order
+    //  the screens came up.
     for (const char* image : {
-        "01_BagItems_eng.png",
-        "02_BagKeyItems_eng.png",
-        "03_KeyItemsTmCase_eng.png",
-        "04_TmCaseMenu_eng.png",
-        "05_TmCaseList_eng.png",
-        "06_Tm03Menu_eng.png",
-        "07_TeachWhich_eng.png",
-        "08_WantsToLearn_eng.png",
-        "09_KnowsFour_eng.png",
-        "10_DeleteQuestion_eng.png",
-        "11_WhichMove_eng.png",
-        "12_KnownMoves_eng.png",
-        "13_StopQuestion_eng.png",
-        "14_DidNotLearn_eng.png",
+        "BagItems_eng.png",
+        "BagKeyItems_eng.png",
+        "KeyItemsTmCase_eng.png",
+        "TmCaseMenu_eng.png",
+        "TmCaseList_eng.png",
+        "Tm03Menu_eng.png",
+        "TeachWhich_eng.png",
+        "WantsToLearn_eng.png",
+        "KnowsFour_eng.png",
+        "DeleteQuestion_eng.png",
+        "WhichMove_eng.png",
+        "KnownMoves_eng.png",
+        "StopQuestion_eng.png",
+        "DidNotLearn_eng.png",
     }){
         database.add<Test_TeachScreen>(std::string("PokemonFRLG/TeachScreenReader/") + image);
     }

SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldReanchor.cpp

@@ -368,6 +368,23 @@ std::optional<Reanchor> plan_reanchor(
     return std::nullopt;
 }
 
+std::optional<std::vector<RouteStep>> holds_to_one_tile(
+    const std::vector<MapData>& maps, const std::vector<MapPosition>& tiles
+){
+    std::vector<Hypothesis> positions;
+    for (const MapPosition& tile : tiles){
+        add_unique(positions, Hypothesis{0, tile});
+    }
+    if (positions.empty()){
+        return std::nullopt;
+    }
+    const std::vector<Found> found = find_player({maps}, positions, false);
+    if (found.empty()){
+        return std::nullopt;
+    }
+    return found[0].holds;
+}
+
 
 
 } // namespace PokemonFRLG

SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldReanchor.h

@@ -106,6 +106,15 @@ std::optional<Reanchor> plan_reanchor(
     const RouteCosts& costs = default_route_costs()
 );
 
+//  Holds to walls that bring the player to one tile from every one of
+//  `tiles`, found as plan_reanchor() finds them, with no trainer about: for
+//  a player known to be on one of a few tiles without a stop (a wild
+//  battle's pacing). Empty if `tiles` are one tile; the last hold ends on
+//  it otherwise. Nothing if no holds bring them together.
+std::optional<std::vector<RouteStep>> holds_to_one_tile(
+    const std::vector<MapData>& maps, const std::vector<MapPosition>& tiles
+);
+
 
 //  Registers overworld reanchor unit tests.
 void add_tests_OverworldReanchor(UnitTestDatabase& database);

SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldRecoveryWalk.cpp

@@ -37,6 +37,7 @@ Pokemon::LegSpec leg_spec(const RouteStep& step, MoveSpeed speed){
     leg.tile_time = tile_time(step, speed);
     leg.stop_on_interrupt = !step.to_wall;
     leg.stop_if_blocked = step.to_wall;
+    leg.stalled_steps = step.connection_steps;
     return leg;
 }
 

SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldRoute.cpp

@@ -1,4 +1,4 @@
 /*  Overworld Route
  *
  *  From: https://github.com/PokemonAutomation/
  *
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <format>
 #include <functional>
+#include <ranges>
 #include <string>
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/TestRunners/UnitTest.h"
@@ -333,7 +334,7 @@
     return leg_costs;
 }
 
 RouteStep to_route_step(const std::vector<MapData>& maps, const Pokemon::Leg<Located>& leg){
     RouteStep step;
     switch (leg.kind){
     case Pokemon::LegKind::WALK:
@@ -360,6 +361,10 @@
         //  wasn't watched for battles (console B, 2026-11-01).
         step.wild = leg.wild || leg.start.state.surfing || leg.kind == Pokemon::LegKind::ACTION;
     }
+    const std::vector<MapPosition> tiles = leg_tiles(maps, MapPosition{maps[leg.start.map].name, leg.start.state.position}, step);
+    for (int c : std::views::iota(1, (int)tiles.size()) | std::views::filter([&](int n){ return tiles[n].map != tiles[n - 1].map; })){
+        step.connection_steps.push_back(c);
+    }
     return step;
 }
 

SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldRoute.h

@@ -68,6 +68,11 @@ struct RouteStep{
     Direction facing_after = Direction::NORTH;
     //  Where the player is after the step.
     MapPosition end;
+    //  WALK: the steps (from 1) onto a connected map. The game holds the
+    //  player up a tile before each while it loads the map: a hold timed
+    //  by the tiles alone ended a tile short (console B, 2026-11-03, rows
+    //  00.14, 00.16 and 00.20).
+    std::vector<int> connection_steps = {};
 };
 //  Formats a RouteStep as a string.
 std::string to_string(const RouteStep& step);

SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldSim.cpp

@@ -1,4 +1,4 @@
 /*  Overworld Sim
  *
  *  From: https://github.com/PokemonAutomation/
  *
@@ -355,7 +355,7 @@
 }
 
 //  The steps a hold of `duration` takes, `short_by` fewer.
 void OverworldSim::walk_hold(Direction direction, Milliseconds duration, int short_by){
     const Milliseconds tile = m_script.timing.tile;
     const Milliseconds end = m_now + duration;
     Milliseconds pressed = m_now;
@@ -371,6 +371,15 @@
             bump(direction, pressed);
             return;
         }
+        if (step->map != m_map && !step->warped){
+            //  The step onto a connected map waits a tile while the game
+            //  loads it: a hold timed by its tiles alone ended a tile short
+            //  (console B, 2026-11-03, rows 00.14, 00.16 and 00.20).
+            pressed += tile;
+            if (pressed >= end){
+                return;
+            }
+        }
         if (step->walked_out){
             m_state.facing = Direction::SOUTH;
         }
@@ -590,7 +599,7 @@
     fail("walk_overworld_route(): a wild battle, not the warp to " + step.end.map + ": the player is off the route.");
 }
 
 std::optional<WalkedTiles> OverworldSimWalker::walk_step(const RouteStep& step, std::optional<Direction> facing){
     if (step.action == RouteAction::FACE){
         m_sim.tap(step.direction);
         return std::nullopt;
@@ -610,6 +619,9 @@
     leg.tile_time = TILE_TIME;
     leg.stop_on_interrupt = !step.to_wall;
     leg.stop_if_blocked = step.to_wall && m_rules.stop_if_blocked;
+    if (m_rules.hold_over_connections){
+        leg.stalled_steps = step.connection_steps;
+    }
     Pokemon::LegCalls calls;
     calls.hold_watching = [&](Milliseconds hold) -> std::optional<Pokemon::HoldOutcome>{
         const std::optional<SimSeen> seen = hold_watching(step, hold, ints);