Skip to content

PLZA AutoStory: 03.07 and 03.09-03.11, tutorial catches to Mable's reward - #598

Draft
dayfine wants to merge 10 commits into
plza/slice4from
plza/slice5
Draft

dayfine wants to merge 10 commits into
plza/slice4from
plza/slice5

Conversation

@dayfine

@dayfine dayfine commented Nov 16, 2026 •

Copy link
Copy Markdown
Owner

Depends on #596 (base plza/slice4); merges in #590 (plza/throw-helper, the shared throw_ball()), so the diff also shows #590's five files until it lands.

Slice 5 of the lean PLZA AutoStory chain: 03.07 (Wild Zone 1's tutorial catches) and 03.09-03.11 (the marker walk into the Research Lab, the elevator to 3F, Mable's Rock Smash TM). The catches throw with #590's throw_ball() (ZL 500 ms, ZL+ZR 1.5 s, 8 s), press through the lines after each throw on the story backend, and count the catch on a tutorial card; the marker walk ports plza/autostory's objective marker reader and walk, plus a walk that stops at a given distance, toward or back from the marker (used by 03.08 in #604); Mable's reward opens the menu with upstream's overworld_to_main_menu(). 03.08 (the five-species patrol, the walk back to the road and out of the far gate with leave_zone_gate) is not here yet. Saves follow the run logs: 03.07 and 03.10 autosave; 03.09 and 03.11 unverified (no lab-lobby autosave was logged, and 03.11's autosave shows mid-checkpoint). Tested with new unit tests for the lines and menu helpers on the fake backend, the marker reader's synthetic-frame tests, and the story data and console-only run cases; no console run yet.

throw_ball() presses ZL + ZR, scrolls balls with the D-pad while both are
held, lets go to throw and waits. An optional ZL-only lead locks on first.
Both catchers call it with their old presses and timings; ball_scrolls()
and throw_buttons_hold() get unit tests.
…private, no unit tests

Review on #590: the callers build BallThrowOptions in one initializer, ball_scrolls() and throw_buttons_hold() move into the .cpp's anonymous namespace, constant arguments get parameter comments, and the tests go (they only restated the arithmetic).
…s reward

Ports from plza/autostory what these checkpoints first need:

- catch_tutorial, battle_then_catch (03.07): throws by the shared
  throw_ball() (#590, merged in): ZL 500 ms, ZL+ZR 1.5 s, 8 s; the lines
  after a throw by press_a_through_lines() on the backend, caught on a
  tutorial card (TutorialCardDetector, new TUTORIAL_CARD_READING); a
  break-out battle by TrainerBattleState's attacks. Console only. The
  target choice by name plates and the walk toward far targets are cut.
- walk_to_marker (03.09): ObjectiveMarkerReader and the marker walk
  (misread filter, sidesteps when held up), console only.
- claim_mable_research_reward (03.11): upstream overworld_to_main_menu,
  then the reward's lines and B out of the menu on the backend.
- 03.10 gets a text_to_choice before choose_1; the scenes get action a.

03.08 (catch_in_zone, the walk back to the road, the far gate) is not in
this slice.

Saves per run logs: 03.07 and 03.10 autosave; 03.09 and 03.11
unverified (no lab-lobby autosave logged; 03.11's autosave shows at
mable_talk, before its end).
…from the marker

walk_toward_marker() and walk_back_from_marker() walk until the objective
marker's distance reads a given value; moved here from #604 so this PR owns
MarkerWalk's code.
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