Skip to content

PokemonFRLG: S15 part 1, Route 7's gate with the TEA to Saffron (15.01) - #415

Draft
dayfine wants to merge 33 commits into
frlg/stage14b-erikafrom
frlg/stage15-saffron
Draft

dayfine wants to merge 33 commits into
frlg/stage14b-erikafrom
frlg/stage15-saffron

Conversation

@dayfine

@dayfine dayfine commented Nov 12, 2026 •

Copy link
Copy Markdown
Owner

Depends on #407 (base frlg/stage14b-erika; the diff shows only this change). Story order puts it after Erika (14.04): 15.01 starts at Celadon's nurse, where 14.04 ends. The TEA from the Celadon Mansion (segment 10 or 11.01) is in the stack.

This adds the first part of stage S15: checkpoint 15.01, Celadon to Saffron, made of existing step types.

  • 15.01: from Celadon's nurse along Route 7 into its east gate. A step onto the guard's top trigger (6, 4), where he takes the TEA and lets the player through (the scene leaves the player on that tile). Then through Saffron City to its Center: heal, and Saffron becomes a Fly point. Ends at Saffron's nurse.
  • Blocked, not in this PR: the Fighting Dojo and Hitmonchan (15.02, 15.03). SaffronCity_Dojo isn't in the pinned map pack (PokemonSimulation bdca47c), so no route or sim test can run inside it. Gift RNG still knows only the Magikarp salesman, so the handoff has nothing to run. Both rows wait for the map pack to get the Dojo and for Gift RNG to be generalised.
  • The TEA has to come from segment 10 or 11.01 (Celadon Mansion 1F). Without it the guard walks the player back and the next route fails.
  • Route7_EastEntrance and SaffronCity join the loaded maps (already in the pinned pack, not edited), and Saffron gets a save card place.
  • 15.01 follows 14.04, so it needs no starts_after_unauthored_rows() entry; the function and its header are gone here (PokemonFRLG: S14a, Cinnabar Gym quiz and Blaine (14.01, 14.02) #410 keeps them for 14.01 and 14.03). Its golden lines are in PokemonFRLG_AutoStoryPlanGolden15.h.

Testing

  • Headless SerialProgramsTests --filter PokemonFRLG::AutoStory: 801 passed, 18 failed; the 18 are the same image and resource FileExceptions that fail on PokemonFRLG: S12, Fuchsia Gym, Koga and the Warden (12.01, 12.02) on the 11.03 stack #431.
  • New sim test: 15.01 on the sim stands on the guard's trigger, ends below Saffron's Center door and meets nobody. Updated tests: route golden, checkpoint count, run-plan id lists, save card places. Fault sweeps pass for the row.
  • Saffron's Rocket Grunts, who stay there until Silph Co., are on the map, and the planned route keeps out of their wander boxes.
  • Not run on a console.

🤖 Generated with Claude Code

https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss

dayfine and others added 6 commits November 11, 2026 20:56
Resolved: map/save-card/event lists keep both sides; turn_to keeps the facing read and takes the player; golden for 15.01 moves to PlanGolden15.h after segment 12; checkpoint count 53.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
@dayfine
dayfine changed the base branch from frlg/stage8-rocktunnel to frlg/stage12-fuchsia-gym November 12, 2026 22:20
…n headers (header symbol limit)

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
15.01 now follows 14.04, so starts_after_unauthored_rows() and its header go.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
@dayfine
dayfine changed the base branch from frlg/stage12-fuchsia-gym to frlg/stage14b-erika November 12, 2026 22:50
dayfine and others added 15 commits November 12, 2026 16:01
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
# 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
dayfine and others added 8 commits November 12, 2026 21:16
…saffron-415

# Conflicts:
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SaveCardReader.cpp
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldMaps.cpp
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryEvents.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_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
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