Skip to content

FRLG AutoStory: flag story routes that cross a tile twice - #583

Closed
dayfine wants to merge 4 commits into
frlg/shopping-prepfrom
frlg/route-revisit
Closed

dayfine wants to merge 4 commits into
frlg/shopping-prepfrom
frlg/route-revisit

Conversation

@dayfine

@dayfine dayfine commented Nov 15, 2026 •

Copy link
Copy Markdown
Owner

Depends on #579

The user's rule of thumb: a route that crosses the same tile twice is a red flag. Nothing checked that for the story's planned routes. revisited_tiles() lays a planned route out tile by tile (leg_tiles(), warp and spinner ends, Surf landings, gates as the route changes them) and lists the tiles it steps on again. A new AutoStory test fails on any story route that does this, except the ones in ALLOWED_REVISITS, each with a one-line reason.

All nine routes that do it today are allowlisted. Four are real counter-examples: the Mansion switch go-and-returns in 13.03 and 13.04, and the wall clips that place the player (12.03 on Route 21's water, 19.03 after 16 grass tiles). Five are cost choices that need re-weighing, marked as such: 13.01, 16.02/16.03 (the 9F teleporter step-off held to the wall), 19.04b (out of Victory Road and straight back in) and 19.04c. No plan changed, because fixing those means new route costs, which would move console-verified plans. Fixed legs steps are not checked yet. Tested with the OverworldRoute suite (new revisited_tiles cases) and the AutoStory suite on Fork Draft CI; the walked side is graded from run logs by dayfine/PokemonSimulation#107.

dayfine and others added 4 commits November 15, 2026 15:22
revisited_tiles() lays a planned route out tile by tile (leg_tiles(), warp
and spinner ends, Surf landings, gates as the route changes them) and lists
the tiles it steps on again. The story plan test collects them per route
step; a new test fails on any route that walks back over its own way,
except the nine in ALLOWED_REVISITS, each with its reason.
A step can't stop part-way, and a warp's arrival is a known tile, so a
leg of one step off a warp is no guess. The planner held such steps to a
wall and back instead (9F's teleporter in 16.02 and 16.03, 2F's ladder in
19.04c), crossing tiles twice. Now it steps one tile off and back on.
Only off a warp: a route's start or the end of another leg may be off by
a tile, and single steps from walls weave round longer holds.
The waiver applied to any one-step leg off a warp, so walks out of every
door took a free step and then an extra leg (02.02 to 19.04 changed, 28
checkpoints), and 19.04b and 19.04d left Victory Road for Route 23 and
came straight back in to use it. Only the step straight back onto the
arrival is exact enough to skip the open stop: 9F's teleporter in 16.02
and 16.03 and 2F's ladder in 19.04c still step off and back on; every
other plan is as before. Goldens updated for those three.
dayfine added a commit that referenced this pull request Nov 18, 2026
PokemonFRLG_OverworldRoute.cpp was over code health's 1000-line limit
after #583's revisit lint came in. revisited_tiles() moves unchanged to
PokemonFRLG_OverworldRouteRevisits.cpp/.h.
dayfine added a commit that referenced this pull request Nov 18, 2026
#583's lint flags 27 story routes that cross a tile twice. They are the
plans the story ran on the console to the Champion, so they are listed as
allowed with that reason instead of re-planned without a console run.
19.04b's below_ladder no longer goes out to Route 23 and back, so its
entry goes.
dayfine added a commit that referenced this pull request Nov 18, 2026
The stored golden is #614's. On this branch two walks plan differently:
19.01a's inside Lavender's Mart goes north 1 then along the walls to the
clerk instead of north 4, and 19.01's from Viridian's south exit takes
the walled street west to Route 22. Neither is #614's change; both come
from the leg planner and maps folded in with it (#583, #403, #409), and
neither has run on the console yet.
@dayfine

dayfine commented Nov 18, 2026

Copy link
Copy Markdown
Owner Author

Merged into #652 (frlg/lean); fixes continue there.

@dayfine dayfine closed this Nov 18, 2026
dayfine added a commit that referenced this pull request Nov 18, 2026
#583's two leg-planner commits (b8d6b88, b2ce287) let a one-step leg
off a warp's arrival skip the open stop when it steps straight back. The
only plans that changed were 16.02's and 16.03's teleporter bounce on
Silph Co. 9F and 19.04c's ladder bounce on Victory Road 2F, all three
console-verified on #618 with the step off held to the wall. No
unverified plan used the waiver, so it goes rather than sitting behind a
per-plan switch: the planner is #618's again, those three plan as they
ran on the console, and the revisit lint lists them as allowed again.
dayfine added a commit that referenced this pull request Nov 18, 2026
The golden test already fails when a planner change alters a story walk,
but #583's planner change regenerated it over three console-verified
walks. The golden's header and the test's failure message now say what
its lines are and that a change to one needs a planner fix or a console
re-verification, not a regeneration.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant