Repository navigation
Conversation
… own walked_route() and row_step_on_sim() move unchanged out of the simulation tests, which are near the length limit, so the next stage's row tests can use them from a file of their own. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
00.21 goes from Cerulean's Pokemon Center through the burgled house, fights the Rocket in its yard (TM28), then down Route 5, through the Underground Path and Route 6 to Vermilion's Pokemon Center. On Route 6 it walks down column 15 through the grass, on legs to walls, out of Keigo's and Elijah's lines, and fights Jeff, who stands across the only way south. 00.22 shows the S.S. Ticket at the harbor, goes aboard, fights the rival below the Captain's door, gets HM01 from the Captain and walks off the ship as it sails, back to the Center. The maps: the burgled house, Route 5, the Underground Path, Route 6, Vermilion City and its Center, and the S.S. Anne's exterior, 1F and 2F corridors and Captain's office. The generator now reads a tileset's attributes path from metatiles.h (gTileset_SSAnne's folder is ss_anne), and a "new_game" flag set hides the S.S. Anne's rival, who stands on the Captain's door until his scene. Story routes no longer plan Surf: the harbor's water was the shorter way to the pier. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
The 1F corridor frame, with no dialog on screen, reads as a white dialog today. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
The detector looked only at three white strips inside the dialog box, so a large white area with no box, like the S.S. Anne's hull below the 1F corridor, read as a dialog and stopped the walker's leg. It now also requires the strip on the box's top frame not to be bright white. All real dialog images have a light blue frame there (sum of RGB 600-690); the hull is 765. Group the naming screen's test suites so add_tests() stays under 50 lines. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
…osses The S.S. Anne rival came out at 40% for a Lv27 Wartortle with 15 Potions. The sim's math matches the decomp; the battles are lost to the Ivysaur, seeded and poisoned, where Bite (15-18 of its 56 HP) can't outpace Leech Seed's 9 HP a turn back. The sim left out the in-battle Antidote the battle loop uses (once, after two poisoned turns): it now plays it, and the refusal log names the foe and the lead's state in the battles lost. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
…Potions Console B, m68 (the S.S. Anne rival): the send-out flash on the ship's white floor read as the move prompt's YES/NO, and the decisions took the first for "Delete a move to make room for PROTECT?" (Lv31): NO, and the second for "Stop learning?": YES. The lead was then figured at Lv31 (78 -> 88 max HP). A battle YES/NO now needs the box's slate frame, and a YES/NO with no move the lead can have reached is NO, changing nothing; "Stop learning?" is due only within the turn. "no PP left" read 37 s after the last move zeroed that move's PP: it now counts only soon after the choice, and the first read is taken as a Disable (Kadabra's), the second as no PP. At BattleRisk::HIGH the loop's Potion is the win-chance sim's own_turn(), with the lead's poison, the chance a foe's Leech Seed hit it, and the foe's HP from its bar. own_turn() also tops up before a knockout when the foe's turn is small and leaves nothing lasting, and a stronger foe is to come (task PokemonAutomation#77 step 1); neutral on the S.S. Anne rival (31.4% -> 31.7%). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
00.23 teaches HM01 Cut to the Oddish and TM28 Dig in place of Withdraw, cuts Vermilion's gym tree (a new CUT_TREE GAME step), fights Dwayne, Baily and Tucker, and searches the trash cans: two pages to a can's message mean the first switch (or a reset after it), one page the second (or trash), so the search counts pages, guesses one can beside the first and starts over from where it stands after a reset. Dwayne and Baily look around, so each is met by a step onto the second tile of his line and a wait (TRAINER_WAIT_VARIANT). 00.24 grinds on Route 6 until the sim beats Surge 50% of the time, heals, and saves in front of him; 00.25 fights him and heals. The gym map writes the beams off, as the story finds them after the switches; the sim learns to cut trees, which grow back on a warp. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
…duino-Source into frlg/stage6-surge-local
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
The KNOWN MOVES reader had no names for the Oddish line's moves, so ABSORB matched nothing, the reader stopped at the top row and 00.23's Cut teach found no moves. Add the Oddish line's level-up moves, and end the moves at the first slot with no type badge instead of the first name not read: an unnamed move now keeps its row with an empty name. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
Console B, 00.23: HM01 to the Oddish (two free slots) stopped on the TM's scene, "Machine set!", which the reader didn't place, and gave up mashing B, which cancels the teach (pokefirered Task_MachineSet). The fake game now runs that scene for TMs and HMs, free slot or forget, and errs on B there; the capture's image test expects tm_scene/machine_set. Only the names are added; the reader and step don't use them yet. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
The reader places the TM's scene (pale blue diamonds on both sides) and reads "Machine set!" and "learned" in its message box. After A on the member, and after the pick on KNOWN MOVES, the step presses A through the scene until "learned" shows, then waits for the TM CASE; B there would cancel the teach. A scene the reader misses (two looks of "other") gets the same A presses. leave() finishes a scene before backing out. The moves read after the teach still decide. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
Console B, TM28 Dig over Withdraw: the forget's "1, 2, and... Poof!" read as "learned", the step stopped pressing and waited 5 minutes, leave() starting the scene's wait again on each look. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
pokefirered: after a forget, "1, 2, and... Poof!", "<MON> forgot <OLD>." and "And..." end in \p and wait for A; "<MON> learned <MOVE>!" runs on its own. Console B read "Poof!" as "learned", so the step stopped pressing; and leave() restarted the scene's wait on each of its looks. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
…tion
On console B (row 00.24) the open leg south 14 from Route 6 into Vermilion
City, held a tile longer for the stall on a connection, ended a tile further
south: the game didn't hold the player up there. West 8 then ran along
row 8 and north 1 onto the Pokemon Center's door stopped below it ("no fade
in and out"). Until a leg to a wall or a warp places the player again, a
warp walked back that way is now held a tile further (RouteStep::warp_slack,
with_warp_slack() in run_route()), stopping at the fade. The overworld sim
can now leave out the stall (SimScript::connections_stall); the new sim test
walks the exact plan both ways.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
On console B row 00.24's grind found the chance against Lt. Surge already 79% at Lv29 and fought nothing, but the row had walked out to Route 6's grass and still walked back. A GAME step in the Center now reads the lead first (grind_check_step(), grind_reached_already()); when it passes it sets a run flag that the walk out, the grind and the way back skip_if. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
Console B lost to Lt. Surge's Raichu at a 79% sim chance: the Raichu used Double Team at full HP while each Dig spent a turn under ground. The sim now scores Double Team as pret AI_CV_EvasionUp does, and plays two-turn moves (charge turn, no choice the next, semi-invulnerable for Dig/Fly/ Dive/Bounce); the planner counts a two-turn move at half its damage a turn. m73's lead now wins 58%; 82% at Lv31. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
…overworld for 60 s Lt. Surge's win puts Oak's aide on Vermilion City's (25, 7) until talked to; the story's maps don't have him, and the walk to the Center went west along row 7 into him (console B, 2026-11-03). It now goes along row 10 to the water and up column 14. After losing to Surge the battle loop pressed + and B for 8 minutes with no battle screen and no START menu. BattleEndWatch::overworld_lost() stops it 60 s after the last battle screen once START has looked. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
The merge added add_tests_AutoStoryExport, which put add_tests() at 51 lines, over the code-health limit. Group the two Vermilion suites under add_tests_AutoStoryRows, the shape stage7 already uses. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
The full-run simulation (the test's FakeGame) and row_step_on_sim() dispatched by kind themselves, beside the table the console and the replay run. StoryMapsSim (the whole story on the story maps) and OverworldStepSim (a row's steps on the OverworldSim) now bind make_story_action_table() and run through TableExecutor, stubbing the actions that need the console; row_step_on_sim() runs its step through OverworldStepSim. SimStubs lists each row's stubbed steps (stub_report()), and a test checks that the whole story stubs exactly the steps whose action needs the console. 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_AutoStoryEvents.cpp
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Binds the FRLG between-step interrupts (step_interrupts()) to the story maps simulation. StorySimKnobs::dialog_before pops a dialog up before a step; until it is pressed through it stops a step that walks or talks, as on the console. With clear_interrupts (the default) the executor's look finds it and closes it; off, it stays up as before the binding. Tests: a dialog before every step (red before the binding: the walk after the first one failed), and dialogs before one step in five over 5 seeds, 0 of 5 runs through before and 5 of 5 after. 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_AutoStoryEvents.cpp
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…s opening before any step)
…ts fade; screen before each step)
…ch HOME menu fails at once
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
…s JSON Stage 6's checkpoints 00.21 to 00.25 as StoryData files in the #312 step format, each marked "phase": "testing". The row-building TableSteps and TableVermilionGym files go with the C++ rows. Cut, the trash cans, the trainer wait and the GRIND check are action specs; a GAME action with its own row keeps that row's console action. The row sims and stage 6's tests read step args. 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 in the merge before this commit: every story file loads to the C++ row it replaces. This removes it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
FRLG AutoStory: stage 6's checkpoints as JSON
Takes the parent's removal of the battle sim, the stage map JSONs and the split headers. The stage's sim parts go with it: the win-chance refusal, the Leech Seed tracking, foe HP tracking and the Lt. Surge sim tests. 00.24 grinds to Lv31 instead of a 50% sim chance, and its pre-check skips Route 6 when the lead is Lv31 already. Battle steps in 00.21-00.25 name their trainer and party. TrashCans.h and RowSim.h are split to stay within header_symbols. 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_AutoStoryEvents.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_01AKYzhrMnPK61XHWEch4a6E
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
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Depends on #219
Adds FRLG AutoStory rows 00.21-00.25, from Cerulean's Pokemon Center through Route 5, the Underground Path and Route 6 to Vermilion, the S.S. Anne for HM01, then Cut onto the Oddish, TM28 Dig, Vermilion Gym's trainers and trash cans (searched by counting each can's message pages), a Route 6 GRIND to Lv31 that is skipped when the lead is already there, and Lt. Surge. Each battle step names its trainer and party in the plan; the Route 5/6, Underground Path, Vermilion and S.S. Anne maps come from the Packages map pack. Along the way: WhiteDialogDetector needs the dialog's blue top frame (the S.S. Anne's hull read as a message), the battle loop no longer takes a send-out flash for a move prompt and treats a lone "no PP left" as a Disable, the summary's move reader knows the Oddish line's moves, the TEACH step plays through the TM's scene with A, story routes don't plan Surf, and the GAME steps and the story sims run on the shared story action table. Tested with new OverworldMaps, AutoStoryTrashCans, AutoStoryGrind, AutoStory Simulation and image tests (frames in dayfine/CommandLineTests#10 and #11); 00.23-00.25 have not passed on the console yet (console B lost to Lt. Surge at Lv29, which is why 00.24 now grinds to Lv31).
🤖 Generated with Claude Code
https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss