Skip to content

FRLG AutoStory: Silph Co. to Giovanni, Lapras, Master Ball (16.02-16.06) - #444

Draft
dayfine wants to merge 34 commits into
frlg/gatesfrom
frlg/stage16b-silph
Draft

dayfine wants to merge 34 commits into
frlg/gatesfrom
frlg/stage16b-silph

Conversation

@dayfine

@dayfine dayfine commented Nov 13, 2026

Copy link
Copy Markdown
Owner

Depends on #442

FRLG AutoStory 16.02-16.06: Silph Co. from 5F to Giovanni on 11F, the Lapras gift (Gift RNG handoff 16.03 to 16.04, like the Eevee), the president's Master Ball (new "Take the Master Ball" option, skipped in SPEEDRUN) and back to the Saffron Center. Card-key doors are gates (gates_after / start_gates, Card Key via flags_after), from trimmed fixtures of PokemonSimulation 82b5b05. Giovanni's step sets silph_cleared, which hides the Saffron Rocket at (46,13) in story_maps(run_flags). Includes the Mart reader fix (b84099b) merged from #410; the branch is not pushed to frlg/gates.

Tested with the headless runner: the AutoStory suites (sim routes with gates, golden lines, chain count, RunPlan) pass; the 20 remaining failures there are missing local images/resources. Not run on a console.

🤖 Generated with Claude Code

https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss

dayfine and others added 9 commits November 12, 2026 16:36
…ack to Saffron (16.02-16.06)

Five checkpoints after 16.01: the Card Key pickup (flags_after card_key_held), the
card-key doors as gates_after on the opening steps, the rival on 7F, the Lapras gift
by the Gift RNG handoff (16.03 -> 16.04), Giovanni on 11F with the silph_cleared flag,
the president's Master Ball behind a "Take the Master Ball" option (skipped in
SPEEDRUN), and the walk back to the Saffron Center. story_maps(run_flags) hides the
Saffron Rocket at (46,13) once silph_cleared is set. Silph's doors come from trimmed
GateMaps fixtures (PokemonSimulation 82b5b05), since the pinned maps have them open.
The row sim plans on gates and picks up the Card Key.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Moved unchanged from bdsp/autostory-starter-rng (7a46b79), so that BDSP and FRLG
both build on it from the shared base.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
FRLG's loop also ends where the user takes over (target hit but not shiny,
attempts spent); that is a stop with a message, not an error. A shiny is a
continuation whose rows the game builds, so the seam carries no rows.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…andoff

A shiny is the handoff's success (the rows after it stay FRLG's, built from the
game's state); every other loop end is the user's turn. rng_handoff_mode() replaces
the STOP || RUN tests.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…its signature

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
dayfine and others added 20 commits November 12, 2026 19:13
# Conflicts:
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSim.cpp
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSim.h
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
The Card Key is picked up during a run, so the sim's own flag is the source;
a SimState copy went stale.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Folded leaf PR #445; tree equals the leaf tip.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…oors); 16.06 walks past the left Rockets

The pin (4b886bb) has Silph Co.'s card-key doors, so with_gate_maps() and its
82b5b05 fixtures go, as their TODO says. 16.06's walk is exempt from trainer
lines as 16.05's is: Giovanni's Rockets have left (silph_cleared), which the
test's maps don't carry.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…06 no longer an incidental-fights row

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
# Conflicts:
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRunPlan_Tests.cpp
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTable.cpp
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory_Tests.cpp
# Conflicts:
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRunPlan_Tests.cpp
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTable.cpp
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory_Tests.cpp
# Conflicts:
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRunPlan_Tests.cpp
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryTable.cpp
…rge counted one twice)

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
A boss battle is its own checkpoint (user, 2026-11-12). 16.03 walks up to the rival on 7F and ends where his battle leaves the player; the new 16.03b starts there, walks to the employee with the Lapras and takes over the Gift RNG handoff (the save facing the employee). Ids are not renumbered; the golden, run-plan, table, count, Silph tests and the Gift RNG option text follow.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
# Conflicts:
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory_Tests.cpp
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
dayfine and others added 4 commits November 13, 2026 00:16
…ay and notification text

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…ne starter_rng_mode()

stop_for_handoff's log, overlay and notification text come from
Pokemon::report_rng_handoff_stop, as BDSP's stop does. The Starter RNG
mode is read in one place instead of three.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
dayfine added a commit that referenced this pull request Nov 13, 2026
…2-16.06

Conflicts: STORY_ORDER and the run-plan id lists take both sides (16.02-16.06 after 16.01; 16.04 stays out of the gift-RNG-off lists as on #444); checkpoint count 85 -> 91; options keep TAKE_MASTER_BALL and FIELD_MOVE_USERS in header order; StoryEnv keeps party/saved_field_moves and take_master_ball.
dayfine added a commit that referenced this pull request Nov 13, 2026
…kpoint through 20.05

Adds 16.02-16.06 (#444), 18.01-18.02 (#443), 19.04b-d and 20.01-20.05 (#457/#458), #453 party menu once. Conflict: the unit test runner registers ConnectedMaps and MoveMechanics tests as #458 does.
dayfine added a commit that referenced this pull request Nov 13, 2026
With #444's Silph rows ahead of Sabrina in STORY_ORDER, 18.02 walks out of the gym by another way; lines from the golden test's GOLDEN| output.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
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