Skip to content

FRLG AutoStory: Saffron Gym (18.01, 18.02) - #443

Draft
dayfine wants to merge 11 commits into
frlg/stage17-viridianfrom
frlg/stage17a-saffron-gym
Draft

dayfine wants to merge 11 commits into
frlg/stage17-viridianfrom
frlg/stage17a-saffron-gym

Conversation

@dayfine

@dayfine dayfine commented Nov 13, 2026

Copy link
Copy Markdown
Owner

Depends on #441

Adds the Saffron Gym rows 18.01 (door to Sabrina through the four teleport pads, trainers avoided) and 18.02 (level check, Sabrina, the pads back, heal at Saffron's Center). 18.01 stays on the unauthored-start list until Silph Co. is written. The row sim's step onto a warp now waits out the fade like the console's take_warp_step().

Testing: new Saffron Gym sim tests, golden lines for 18.01/18.02 and the chain count (69) pass in the headless runner; the rest of the AutoStory suites pass except those that need Resources/test images locally.

Known gaps: the Rocket at Saffron (46,13) blocks the gym door in story_maps(), so the Center-to-gym-door leg is not authored. Same-map pad hops fail the late-fade and slow-fade-in sweeps (listed in KNOWN_FAILING).

🤖 Generated with Claude Code

https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss

dayfine and others added 9 commits November 12, 2026 16:34
… back)

Two rows through the gym's four teleport pads (warps), a level check, Sabrina's
battle and the heal at Saffron's Center. Sim tests, golden lines and chain count
included; step_onto warps now wait out their fade in the row sim.

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
…'s merge missed them); 71 checkpoints

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
…rge counted one twice)

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
Saffron's gym rows (18.01, 18.02) now sit between 16.01 and 17.02, which starts where 18.02 ends.

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
…ina 18.01-18.02

Conflicts: STORY_ORDER and run-plan id lists put 18.01 18.02 after Silph (16.06) and before 17.02, as #443 puts them after 16.01; checkpoint count 91 -> 93; test registrations, includes and SourceFiles.cmake keep both sides.
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.
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