Skip to content

PokemonFRLG: S14a, Cinnabar Gym quiz and Blaine (14.01, 14.02) - #410

Draft
dayfine wants to merge 40 commits into
frlg/stage13-mansionfrom
frlg/stage14a-blaine
Draft

dayfine wants to merge 40 commits into
frlg/stage13-mansionfrom
frlg/stage14a-blaine

Conversation

@dayfine

@dayfine dayfine commented Nov 12, 2026 •

Copy link
Copy Markdown
Owner

Depends on #415 (base frlg/stage15-saffron; the diff shows only this change). Stack: #431 <- #407 <- #415 <- #410. Its ids 14.01 and 14.02 keep their numbers and sort before 14.03; 14.01 starts from its own declared pose (outside the Mansion door) until segment 13 is in, and 14.03 from Celadon's heal spot until 14.02 Flies there.

This adds stage S14a, Cinnabar Gym, as two checkpoints made of existing step types.

  • 14.01: starts outside the Pokemon Mansion's door, (8, 4) facing south, where 13.04's Escape Rope will leave the player. Heal at Cinnabar's Center (PokeGuy skips it), then into the gym and through its six quiz machines with PokeGuy's answers (YES, NO, NO, NO, YES, NO, checked against pokefirered's scripts), so none of the eight trainers is fought. Ends below Blaine (5, 5), his own pre-battle save.
  • 14.02: Blaine (Growlithe, Ponyta, Rapidash, Arcanine; Surf on each), back out through the open doors, NO to Bill's Sevii invitation outside, heal. Ends at Cinnabar's nurse. PokeGuy flies to Celadon from here; that Fly goes at 14.03's start once PokemonFRLG: Fly and field Surf steps, with sim support #406 is in.
  • The quiz doors are metatiles the scripts swap, so the map has each one shut. Each door is crossed by two plain steps with declared ends, not a planned route. The map is not edited.
  • CinnabarIsland and CinnabarIsland_Gym join the loaded maps (both already in the pinned pack), and Cinnabar Island gets a save card place.
  • The chain test and the whole-story sim skip 14.01's and 14.03's starts (starts_after_unauthored_rows()); its golden lines, with 14.03's and 14.04's, are in PokemonFRLG_AutoStoryPlanGolden14.h.

Testing

  • Headless SerialProgramsTests --filter PokemonFRLG::AutoStory: 823 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 tests: each door step crosses exactly one barrier tile; 14.01 and 14.02 run on the sim with the player moved over the doors, fighting nobody, ending at the nurse; the lead picks Surf against all four of Blaine's Pokemon.
  • Updated tests: route golden, checkpoint count, run-plan id lists, save card places.
  • The fault sweep can't run these rows: on the sim the doors stay shut, so both rows fail clean and the sweep skips them. It needs the doors modelled in the sim.
  • Not run on a console.

🤖 Generated with Claude Code

https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss

dayfine and others added 6 commits November 11, 2026 21:06
…Blaine

A LEVEL step on the lead before the fight. pokeguy's Blastoise is Lv40
here, and PokemonSimulation's docs/battles/pokeguy-conditions.md sims
that entry (B recovery, 24/126 HP: 100/100 wins); at his level or above those sims
stand for this fight, below it the run stops before the fight. A sim
test runs the step with a Lv40 and a Lv39 lead.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Resolved: lists keep both sides; 14.01/14.02 golden moves to PlanGolden14.h (before 15, after 12); both rows start from declared poses; checkpoint count 55.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…sted as not yet tapped

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…4_Tests.h (header symbol limit)

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/stage15-saffron November 12, 2026 22:27
dayfine and others added 3 commits November 12, 2026 14:28
Takes the header split: the unauthored-starts list (14.01, 15.01) lives in PokemonFRLG_AutoStoryUnauthoredStarts_Tests.h.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
14.03 follows 14.02, which ends at Cinnabar's nurse, so it goes on the
unauthored-starts list beside 14.01; 15.01 follows 14.04 and leaves it.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
… 14.03 and 14.04 golden lines follow 14.02's

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

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/stage15-saffron to frlg/stage16-silph November 12, 2026 23:15
@dayfine
dayfine changed the base branch from frlg/stage16-silph to frlg/stage13-mansion November 12, 2026 23:49
dayfine and others added 2 commits November 12, 2026 15:50
13.01-13.04 go before 14.01 in the story order; 13.01 and 14.01 both start
from their own declared pose in the tests.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
dayfine and others added 18 commits November 12, 2026 18:26
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
A boss battle is its own checkpoint (user, 2026-11-12). 14.02 starts in front of Blaine and ends there after the VOLCANOBADGE and TM38 text; the new 14.02b starts at the same tile and goes out through the quiz doors, says NO to Bill and heals at Cinnabar's Center. Ids are not renumbered; the golden, run-plan, table, count and gym tests follow.

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_AutoStory_Tests.cpp
Story order: 12.03, Mansion 13.x, Blaine 14.01-14.02b, then 14.03 on.

Co-Authored-By: Claude Sonnet 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_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