Skip to content

FRLG AutoStory: stage 6's checkpoints as JSON - #337

Merged
dayfine merged 16 commits into
frlg/stage6-vermilionfrom
frlg/stage6-json
Nov 10, 2026
Merged

dayfine merged 16 commits into
frlg/stage6-vermilionfrom
frlg/stage6-json

Conversation

@dayfine

@dayfine dayfine commented Nov 10, 2026

Copy link
Copy Markdown
Owner

Depends on #222 (base frlg/stage6-vermilion, with frlg/stage5-bill and #336 merged in).

Stage 6's rows were still C++ on the old variant/target steps. This moves 00.21 to 00.25 into StoryData/ in #312's step format, the way #336 did for stage 5.

  • Each file has "metadata": {"phase": "testing"}; the row comments became the files' notes.
  • PokemonFRLG_AutoStoryTableSteps.{h,cpp} and PokemonFRLG_AutoStoryTableVermilionGym.cpp only built C++ rows, so they go with them; the Vermilion Gym tests name their maps themselves.
  • New specs: STEP trainer_wait, GAME cut_tree (direction), trash_cans, and grind_check (GRIND's args without the nurse; grind_check_args() replaces the variant prefix). A GAME action with a row of its own (Trainer Card, Gift summary, Cut, trash cans) keeps that row's console action.
  • The console executor keeps stage 6's console_action_of() layout; the row sims (RowSim) and stage 6's tests read step args.
  • Review commit by commit: the merge keeps stage 6's C++ rows in a parity test; the next commit deletes it.

Testing: full build; --command-line-test-mode --profile unit-tests: the parity test passed on the merge; PokemonFRLG::AutoStory* and Pokemon::Story* pass at the tip apart from 12 FileException image tests (stage 6 adds 6 battle-screen images that need the CommandLineTests checkout). Code health against frlg/stage6-vermilion: 0 failures. Nothing ran on a console.

🤖 Generated with Claude Code

https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss

dayfine and others added 16 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
FRLG AutoStory stage 2: 00.01b and the 00.04 split as JSON
… JSON

Stage 3 ported to #312's action/args steps, its checkpoints moved into
StoryData/ the way #330 and #331 moved stages 1 and 2.

- 00.11, 00.12, 00.12b, 00.12c and 00.13 are files, and 00.10 gains its
  walk to below Pewter's Center. Each carries "metadata": {"phase":
  "testing"}, which FRLG's reader checks and strips before the shared one.
- FRLG's GAME actions declare typed args in place of the variant strings:
  pc (do, slot, box, if_present), capture, fossil, level, mart, teach and
  grind (whose nurse is now its "nurse" arg), plus leave_gift_summary.
  Their specs are in story_action_specs(); the step table binds each to
  the GAME action with its args. VariantWords became GameArgs.
- The execution object's handoff takes gift_rng.

The old C++ rows stay in PokemonFRLG_AutoStoryTableParity_Tests.cpp for
this commit only: every 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 parity test passed on the merge before this commit: every StoryData
file through 00.13 loads to the C++ row it replaces.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
FRLG AutoStory stage 3: 00.10-00.13 as JSON, GAME steps with typed args
… as JSON

Stage 4's checkpoints 00.14 to 00.16 (with 00.14b, 00.14c and 00.15b) as
StoryData files in the #312 step format, each marked "phase": "testing".
The STEP "trainer_line" action is a spec, Mart and TEACH steps load as
once per save, and stage 4's tests read steps through their args.
A parity test checks the files load to the C++ rows they replace.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
The parity test passed in the merge before this commit: every story file
loads to the C++ row it replaces. The rows went with the merge's Table.cpp;
this removes the parity test that held them.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
FRLG AutoStory: stage 4's checkpoints as JSON
…ws as JSON

Stage 5's checkpoints 00.17 to 00.20, and 00.14's Mega Kick tutor, as
StoryData files in the #312 step format, each marked "phase": "testing".
TEACH takes the tutor as its item; pacing and the walk back after a
trainer's battle read the GRIND's or capture's args. A parity test checks
the files load to the C++ rows they replace.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
The parity test passed in the merge before this commit: every story file
loads to the C++ row it replaces. This removes it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
FRLG AutoStory: stage 5's checkpoints as JSON
…s JSON

Stage 6's checkpoints 00.21 to 00.25 as StoryData files in the #312 step
format, each marked "phase": "testing". The row-building TableSteps and
TableVermilionGym files go with the C++ rows. Cut, the trash cans, the
trainer wait and the GRIND check are action specs; a GAME action with
its own row keeps that row's console action. The row sims and stage 6's
tests read step args. A parity test checks the files load to the C++
rows they replace.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
The parity test passed in the merge before this commit: every story file
loads to the C++ row it replaces. This removes it.

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 19:01
@dayfine
dayfine merged commit 7dadd34 into frlg/stage6-vermilion Nov 10, 2026
8 of 12 checks passed
@dayfine
dayfine deleted the frlg/stage6-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