Skip to content

FRLG AutoStory: Victory Road's boulder switches, 19.04b to 19.04d - #457

Draft
dayfine wants to merge 35 commits into
frlg/stage19-victory-roadfrom
frlg/stage19b-victory-cave
Draft

dayfine wants to merge 35 commits into
frlg/stage19-victory-roadfrom
frlg/stage19b-victory-cave

Conversation

@dayfine

@dayfine dayfine commented Nov 13, 2026

Copy link
Copy Markdown
Owner

Depends on #446 (base frlg/stage19-victory-road). Also merges frlg/gates (#442) for the Victory Road gates in the map pin (PokemonSimulation 1cacf81), so the diff also shows #442's commits.

This adds the Victory Road cave rows that were missing between 19.04 (cave mouth) and 19.05 (Indigo Plateau).

  • 19.04b: push 1F's boulder onto the floor switch (20, 16), then climb to 2F.
  • 19.04c: push 2F's west boulder onto (2, 19), climb to 3F, push 3F's north boulder onto (7, 7).
  • 19.04d: push 3F's boulder down the hole (34, 18), drop after it, push it west onto 2F's (14, 19), then leave by the 2F exit to Route 23.
  • Gates: a switch that belongs to one floor is keyed map/id (each floor has its own floor_switch_1). MapSwitch reads the boulder buttons. A boulder that lands on a button turns its switch on, in the sim, in the console step and in the map-level row sim.
  • Sim: a boulder pushed into a hole falls through, and the boulder the game hid on the floor below appears.
  • The boulder solver chose the pushes. Corner waypoints keep routes off pushed boulders (the maps still show them at their start tiles) and out of the trainers' lines.
  • 19.05 now starts at Route 23 (18, 29). In the sim, the exit walks the player one tile off the cave mouth. This changes FRLG AutoStory: segment 19, Route 22 rival (19.01) #446's file and needs a console check.
  • Fixes frlg/gates' unit test runner, which still included the deleted Pokemon_Gates_Tests.h. PokemonFRLG_OverworldSim.h is back to LF line endings.

Testing

  • Headless SerialProgramsTests: the FRLG AutoStory suites (Simulation 19.x, Boulders, golden, chain, fault sweeps, trainer lines, RNG handoff) and the OverworldGate suites pass.
  • The only failures are the image/resource tests that need CommandLineTests, plus the OverworldSpin lift test, which also fails on FRLG AutoStory: segment 19, Route 22 rival (19.01) #446's CI.
  • Not run on the console.

🤖 Generated with Claude Code

https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss

dayfine and others added 26 commits November 12, 2026 19:03
StoryMapsSim, OverworldStepSim and the replay executor now plan and walk
over the run's gates (a closed door blocks; OPEN_GATE/PRESS_SWITCH change
them). The gated planner keeps the step model's open-stop risk costs. A
skipped step applies its gates_after (Event::when_skipped). New tests:
AutoStoryGates (Silph door, Mansion statue on both row sims), OverworldGates
stop-risk, executor skipped-step gates.

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

OverworldSim::has_gates() clashed with the free has_gates(maps); renamed
gated(). StoryMapsSim's wall-overrun and facing checks look in the maps the
step is walked on, not the story maps.

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

Code health: OverworldSim public_methods back to 8 (gate maps and the Card
Key are SimState fields, not accessors); walked_route's maps, gates and rules
are default arguments, not an overload.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…on statue switches)

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

The synthetic gate maps are gone; the gate tests read the real Silph and
Mansion maps (pinned in the previous commit). 13.01-13.04 are planned
routes: the statue presses and the holes come from the planner, and 13.02
is split so the walk crosses 1F's row 24 out of Ted's line. The row sim
plans on the story's maps again (the sim's own maps lacked the Rocket
Hideout stairs a switch opens, 09.01). Goldens regenerated.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…, test registration)

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
… a Mansion statue on the real maps

The replay scenario takes start_flags (the Card Key); the new tests record the native route across each gate and replay it on the pinned maps.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…rge counted one twice)

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
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…itches, Victory Road gates); map-pack action at the same revision

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
Victory Road's boulder switches and barriers come from frlg/gates' map pin
(PokemonSimulation 1cacf81). PokemonFRLG_OverworldSim.h keeps LF endings
(e6ceb4e had turned it to CRLF).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
frlg/gates (fb8795f) moved these tests to PokemonFRLG_OverworldGateMaps_Tests
but left the include and the call, so the runner did not compile.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…or's switch is its own

Victory Road's maps give each floor a floor_switch_1 with its own flag, so a
switch with one floor is known in GateState as gate_key(map, id) (switch_key());
the Mansion's shared switch keeps its id. MapSwitch reads the boulder buttons;
the sim's PUSH_BOULDER, the console's push_boulder step and the map-level row
sim (boulder_pushed()) turn the switch on when the boulder ends on a button.

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

19.04b pushes 1F's boulder onto its switch and climbs to 2F; 19.04c does 2F's
west switch and 3F's (7, 7); 19.04d pushes 3F's boulder down the hole, follows
it to 2F, pushes it onto 2F's second switch and leaves by the exit. Pushes are
the boulder solver's; corner waypoints keep routes off pushed boulders (the
maps still show them where they started) and out of trainers' lines. The sim
drops a boulder through a hole and shows the one the game hid below; the
fault sweep counts a push as a step the sim plays. 19.05 starts at Route 23
(18, 29): the exit walks the player a tile off the cave mouth in the sim.

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

Code health: PokemonFRLG_AutoStoryEvents.cpp back to its 1030 lines, and the
sim's landing no longer nests six deep.

Co-Authored-By: Claude Opus 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
…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.
dayfine and others added 7 commits November 13, 2026 15:00
fb8795f replaced the shared gate tests (Pokemon_Gates_Tests, the
synthetic GateTestMaps and their embedded map list) with tests on FRLG's
real maps. The shared ones come back exactly as they are on nav/gates;
the FRLG-map tests stay as extra FRLG tests. Both suites register.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Takes the parent's PokemonFRLG_Navigation and EggRng (PokemonAutomation#1896's), replacing
the old copies kept through d11b360. OverworldSim.h: the parent's file
with this branch's land_fallen_boulder(), in LF endings.

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