Skip to content

FRLG AutoStory stage 3: Route 3 to Mt. Moon - #215

Draft
dayfine wants to merge 48 commits into
frlg/stage2-rngfrom
frlg/stage3-mtmoon
Draft

dayfine wants to merge 48 commits into
frlg/stage2-rngfrom
frlg/stage3-mtmoon

Conversation

@dayfine

@dayfine dayfine commented Nov 3, 2026 •

Copy link
Copy Markdown
Owner

Depends on #214

FRLG AutoStory stage 3: the Route 3 trainers, Gift RNG for the Magikarp, capture and PC steps, MART/TEACH/GRIND steps, the overworld sim with the walker regression tests, and the walk through Mt. Moon; the maps come from the pinned Packages resources. Each battle step in 00.11 and 00.13 names its trainer and party in the plan, as #213's do. GRIND grinds a party member to a level; its battle-sim mode (grind until a win chance against a trainer, the beat and chance args) is gone with the battle sim, which now lives in PokemonSimulation. It replaces #190, #191, #192, #193, #195, #202, #205, #208, #209 and #210, and will be split again for upstream. Tested with the FRLG and Pokemon:: unit tests locally (only the image tests that need CommandLineTests fail) and the code-health gate.

🤖 Generated with Claude Code

https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss

Squash of fork PRs #190, #191, #192, #193, #195, #202, #205, #208, #209 and #210 (frlg/mt-moon-story at fe519ed).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
dayfine and others added 16 commits November 5, 2026 12:19
…3-mtmoon

# Conflicts:
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldMap.h
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldMaps_Tests.cpp
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldWalk_Tests.cpp
#	SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryItems_Tests.cpp
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRngLoop_Tests.cpp
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStory_Tests.cpp
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
Drop two double blank lines in PokemonFRLG_Tests.cpp to keep it under the 1000-line code-health limit after the merge added the AutoStoryExport tests.

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

# Conflicts:
#	SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp
# Conflicts:
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryEvents.cpp
dayfine and others added 13 commits November 9, 2026 04:26
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss

# Conflicts:
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryEvents.cpp
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
… 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
dayfine and others added 16 commits November 10, 2026 10:29
FRLG AutoStory stage 3: 00.10-00.13 as JSON, GAME steps with typed args
…/stage3-mtmoon

Deletes the map JSONs this stage added or edited; the pinned pack carries them.

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

Detector files take frlg/detectors' versions. The stage's header edits go
into the split sub-headers. GRIND loses its battle-sim mode (beat/chance
args, win chance, level cap): it grinds to its level. The stage's own
code takes std::string_view for char* names, and its large headers are
split by concern (capture, PC, Mart, teach, grind, fossil, member, Gift
RNG, overworld sim, walk and recovery).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…to frlg/stage3-mtmoon

The Route 3 and Mt. Moon battles in 00.11 and 00.13 now name their
trainer and party in the plan, from the trainer table #213 removed.
GRIND's spec drops the beat and chance args it no longer reads.

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

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
PokemonFRLG_Tests.cpp: take upstream PokemonAutomation#1896's removal of the exit_wild_battle tests; keep this branch's tests.

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