Skip to content

FRLG 00.26: the Bike Voucher, back to Cerulean, the Bicycle - #224

Draft
dayfine wants to merge 56 commits into
frlg/stage6-vermilionfrom
frlg/stage7-celadon
Draft

dayfine wants to merge 56 commits into
frlg/stage6-vermilionfrom
frlg/stage7-celadon

Conversation

@dayfine

@dayfine dayfine commented Nov 4, 2026 •

Copy link
Copy Markdown
Owner

Depends on #222

After Lt. Surge the story had no row for the Bicycle. This adds 00.26, from Vermilion's Center to the Fan Club chairman (YES, Bike Voucher), north round Route 6's trainers, through the Underground Path and Route 5, Cut through Cerulean's south tree, the Bike Shop clerk (Bicycle), Repels and Escape Ropes at the Mart and the nurse, and 00.27 on through Route 9 (Alicia, Jeremy and Conner, each named with their party in the plan) to Route 10; the Fan Club, Bike Shop, Route 9 and Route 10 maps come from the Packages map pack. After console B's 00.27 run 2, where wild battles on Route 10's open leg showed only after the hold and the walker took the player to be anywhere on the leg, story walks record an open leg's screens as a timed event log and place a late wild battle on the tile its step reached (3 tiles walking, 5 running at most). Tested with new AutoStory Celadon and OverworldLateBattle sim tests (red first) and the FRLG and Pokemon:: suites, all non-image tests passing locally at 4685868; not run on the console since the late-battle fix.

🤖 Generated with Claude Code

https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss

dayfine and others added 3 commits November 3, 2026 19:20
… Bicycle

New row 00.26 in PokemonFRLG_AutoStoryTableCeladon.cpp: from Vermilion's
Center to the Fan Club's chairman (YES, the Bike Voucher), north round
Route 6's trainers, through the Underground Path and Route 5, the tree
into Cerulean, the Bike Shop's clerk (the Bicycle), 5 Repels and 2 Escape
Ropes at the Mart, and the nurse. Two waypoints keep the planned walks off
Oak's aide on Vermilion's (25, 7). The Fan Club and Bike Shop maps are
generated from pokefirered.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
Keeps add_tests() under the function length limit with 00.26's tests.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
New row 00.27 in PokemonFRLG_AutoStoryTableCeladon.cpp: from Cerulean's
Center, the city's south tree again, out east and Route 9's tree (2, 8),
Picnicker Alicia, Hiker Jeremy (waited for to look north) and Bug Catcher
Conner, the only three of Route 9's nine the way can't walk around, legs
round Hiker Brice's row and above Picnicker Caitlin's line, down the two
ledges, and Route 10's north part to its Center's nurse. Route 9, Route 10
and Route 10's Center are generated from pokefirered; the save card reads
ROUTE 10. The row sim takes hop() and the new step_onto(), a single step
onto the tile above a ledge, which a held leg would hop.

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

* Extract common wall convergence search behind game movement adapters

* Use shared wall convergence search for FRLG re-anchoring

* Document wall recovery policy and expose span-based API before helpers

* Show expected and actual wall holds in table-driven failures

* Use static movement policies with explicit map context and document test rooms

* Select static recovery policy with explicit FRLG world context
dayfine and others added 3 commits November 6, 2026 20:01
* Navigation tests: match shared FileIO Windows compiler policy

* Build FRLG map data from verified pinned Packages resources

* Canonicalize embedded map dependencies to prevent duplicate Ninja outputs

* Retire duplicate FRLG map builder through the Simulation battle-data exporter

* Adopt published v2 FRLG resource pack and approved Simulation tools

* Allow native map parity fixtures from pinned v2 publishers
dayfine and others added 6 commits November 7, 2026 07:00
* Build FRLG map data from verified pinned Packages resources

* Retire duplicate FRLG map builder through the Simulation battle-data exporter

* Adopt published v2 FRLG resource pack and approved Simulation tools

* Run full native validation against complete pinned image fixtures

* Include native image golden sidecars in fixture pin

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…ry table (#260)

* PokemonFRLG: Load an exported checkpoint record back into a story row

read_story_checkpoint_export() is the inverse of story_checkpoint_export():
it reads a pokesim-native-checkpoint-export/1 record (the shared checkpoint
through Pokemon::read_story_checkpoint, plus FRLG's menu and supplies) into
the same StoryCheckpoint type that story_checkpoints() holds, so
build_checkpoint() and make_story_segment() take loaded rows unchanged.
The envelope constants are checked, every native field is required and
unknown fields fail, so a record is read as written or refused.

PokemonSimulation's data/story/native/frlg-parcel-00.05.json (its commit
051785fa251f37b71eb661d4b583435d70f69439, the export tool's output for
row 00.05) is built into the program from StoryData/ as
autostory_checkpoint_json(), and load_story_checkpoint() reads it.

Tests: CheckpointExport reads the capture and checks it exports back to
the same file and to the same JSON as table row 00.05, and refuses eight
altered copies; the existing export cases also round-trip every native
field. AutoStory - Simulation runs the loaded 00.05 and the table's 00.05
through FakeGame and compares describe(), the trace, the log lines and
the save pose.

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

* Document Parcel JSON equivalence checks and migration lifetime

* Order Parcel JSON for readers and distinguish snapshot from requirements

* Load Parcel story table entry from authored JSON and replay it in both repos

* Separate FRLG checkpoint JSON parsing and migration writing

* Share authored checkpoint envelopes and embedded resource loading

* Use shared authored checkpoint loading for FRLG

---------

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
dayfine and others added 9 commits November 9, 2026 00:19
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…adon

# Conflicts:
#	SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp
#	SerialPrograms/cmake/SourceFiles.cmake
# Conflicts:
#	SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStorySimulation_Tests.cpp
…s start pose

# Conflicts:
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStorySimulation_Tests.cpp
# Conflicts:
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStorySimulation_Tests.cpp
The start pose sim test runs the console's case as well as 00.09's.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Console B, 2026-11-09, row 00.27 step route10_nurse failed twice with
"no fade in and out after walking onto the warp to
Route10_PokemonCenter_1F". Run 3: the crossing onto Route 10 wasn't held
up, the open legs carried the player a tile east, the leg down column 17
met the fence post (17, 12) and the walk ended in the grass on (14, 10).
Run 2: the leg down column 16 ended a tile short, west 3 met the
Center's east wall (15, 20) and north 1 ended on (16, 19).

Copied from frlg/route10-door-red (0b00d5d). Both fail now (red) on
exactly those end tiles; the map matches pret and the screenshots.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Console B, 00.27 run 2: on the open leg "east 11" across Route 10 wild
battles showed only after the hold, and the walker took the player to be
anywhere on the leg ("stopped 0 to 11 tiles in"). The sim test runs a battle
on steps 3, 6 and 10 of an open leg through Route 10's grass and asks for
the player bounded to 3 tiles around the battle's. Red: the walker logs
"stopped 0 to 11 tiles in" for each.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
dayfine and others added 13 commits November 9, 2026 03:04
# Conflicts:
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSim.cpp
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryRowSim.h
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

# Conflicts:
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStorySimulation_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
dayfine added a commit that referenced this pull request Nov 10, 2026
A new GAME step, register_bike, REGISTERs the BICYCLE from Key Items (its
menu's second option) once a save. It sits at the start of 00.30's plan
until 00.26's plan (frlg/stage7-celadon, #224) can take it right after the
Bicycle. ride_bike now gets on with SELECT (MINUS) and checks the player
rides (get_on_bike()) instead of using the bag.

The golden story sim trace gains register_bike's three lines and its stub,
and 00.30's later events are numbered one up.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
dayfine and others added 3 commits November 10, 2026 07:00
…ows as JSON

Stage 7's checkpoints 00.26 and 00.27 as StoryData files in the #312 step
format, each marked "phase": "testing". The Celadon and TableSteps rows
go with the C++ rows. Stage 7's own JSON pilot (Data/JsonParser, the
Parcel capture and plan, its README and the Parcel sim test) is dropped
for the one reader in PokemonFRLG_AutoStoryTable; Data/JsonWriter and its
export tests stay. step_onto() is a hop: a STEP with a direction and a
declared end. A parity test checks the files load to the C++ rows they
replace.

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.27 loads to the C++ row it replaces. The row tests'
registrations move to PokemonFRLG_AutoStoryRows_Tests.h and Viridian's
SHOP step to PokemonFRLG_AutoStoryViridianMart, which keeps the story
table header and the events file within their size limits; the shop is
moved unchanged but for reading its args through story_arg.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
dayfine and others added 12 commits November 10, 2026 11:17
FRLG AutoStory: stage 7's rows as JSON (00.26, 00.27)
Takes the parent's sim removal and split headers: the stage's screen
timeline additions (SimShown, the sim clock, screen_event_log) go to
OverworldSimScreens.h and OverworldSimState.h, make_observer to
OverworldWalkOptions.h, and viridian_mart_orders leaves
AutoStoryCheckpoints.h for AutoStoryViridianMart.h. The workflow takes the
parent's version, without the authored Parcel replay whose plan file is
gone. frlg_battle_data.py stays deleted. 00.27's three Route 9 battles
name their trainer and party.

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/Data/JsonWriter.cpp
#	SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/Data/Json_Tests.cpp
Follow autostory/engine's move of the screen events to CommonTools/ScreenEvents (and SwitchHomeObserver to NintendoSwitch/Inference) in this branch's files.

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

# Conflicts:
#	.github/workflows/cpp-ci-serial-programs-base.yml
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