Skip to content

FRLG AutoStory stage 2: 00.01b and the 00.04 split as JSON - #331

Merged
dayfine merged 4 commits into
frlg/stage2-rngfrom
frlg/stage2-json
Nov 10, 2026
Merged

dayfine merged 4 commits into
frlg/stage2-rngfrom
frlg/stage2-json

Conversation

@dayfine

@dayfine dayfine commented Nov 10, 2026

Copy link
Copy Markdown
Owner

Depends on #214 and #330 (base frlg/stage2-rng, with #330 merged in; until #330 lands in frlg/stage1-core, the diff also shows #330's port).

Stage 2's own checkpoints move into StoryData/ the way #330 moved stage 1's, on #312's action/args steps.

  • 00.01 (SID Helper handoff), 00.01b (live start, GAME close_trainer_card), 00.04 (to the ball, Starter RNG handoff) and 00.04b are files; FRLG's execution object adds handoff and live_start.
  • close_trainer_card is an FRLG GAME action with no args; the executor's GAME action dispatches on step.action instead of the old per-kind game() override.
  • Review commit by commit: the merge keeps stage 2's C++ rows in a parity test; the next commit deletes them.

Testing: full build; --command-line-test-mode --profile unit-tests: the parity test passed on the merge; PokemonFRLG::AutoStory* (with the run-plan tests) and the Pokemon::Story* suites pass apart from the 6 known FileException image tests. Nothing ran on a console.

🤖 Generated with Claude Code

https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss

dayfine and others added 4 commits November 10, 2026 09:58
…ction/args steps

The FRLG stack stopped building after #312: the C++ rows set step.target,
legs, direction, fight_wild and may_lose directly, StoryChecks became
StoryCheckLevel, Pokemon_StorySteps.h moved to Pokemon_StoryStepExecutor.h
and the JSON codecs to Data/.

- Each checkpoint is StoryData/frlg-<id>.plan.json (pokesim-authored-
  checkpoint/1), read with read_authored_checkpoint() against FRLG's
  actions: the built-in ones plus ROUTE/LEGS "run". The parser fills in
  the fallbacks (fight_wild, may_lose, yes), so the files give only what
  differs. FRLG's execution object carries the START menu, the supplies,
  the lead after Brock and the notes that were C++ comments.
- The executor, the step-table, sim and route tests read typed args
  (story_arg<T>()); the sim's fake game dispatches by kind in run().
- Check levels: DEFAULT and above check the screen as THOROUGH did;
  FAST and SPEEDRUN trust counts as FAST did.
- AutoStory: StoryRunOptions with the FRLG languages, the check level and
  language into StoryEnv, record_story_counts().

The old C++ rows stay in PokemonFRLG_AutoStoryTableParity_Tests.cpp for
this commit only: each file loads to the same steps, args, poses,
supplies and START menu.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
The previous commit's parity test passed: every StoryData file loads to
its old C++ row. The rows and the test go; StoryData/ is the table.

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

Stage 1 moved 00.01-00.10 into StoryData/ on #312's action/args steps.
Stage 2's own rows follow it:

- 00.01 (handoff sid_helper, the new intro why), 00.01b (live start, the
  GAME step close_trainer_card), 00.04 (to the ball, handoff starter_rng)
  and 00.04b are files; FRLG's execution object reads "handoff" and
  "live_start".
- close_trainer_card is an FRLG GAME action with no args; StoryExecutor's
  GAME action dispatches on step.action instead of overriding the old
  per-kind game().
- AutoStory: check level and language into StoryEnv, record_story_counts();
  the run-plan tests convert the start GridPose.

The C++ rows stay in PokemonFRLG_AutoStoryTableParity_Tests.cpp for this
commit only, and every file loads to its row.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
The merge's parity test passed: every StoryData file, 00.01b and the
00.04/00.04b split included, loads to its C++ row. The rows and the test go.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
@dayfine
dayfine marked this pull request as ready for review November 10, 2026 18:05
@dayfine
dayfine merged commit b9ac130 into frlg/stage2-rng Nov 10, 2026
11 of 15 checks passed
@dayfine
dayfine deleted the frlg/stage2-json branch November 13, 2026 03:26
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