Skip to content

FRLG 15.01: no turn tap on a warp leg off an exit mat (Route 7's gate door) - #514

Merged
dayfine merged 5 commits into
frlg/stage20-leaguefrom
frlg/fix-1501-warp
Nov 15, 2026
Merged

dayfine merged 5 commits into
frlg/stage20-leaguefrom
frlg/fix-1501-warp

Conversation

@dayfine

@dayfine dayfine commented Nov 15, 2026

Copy link
Copy Markdown
Owner

Base: frlg/stage20-league (after #510); the diff shows only this change.

15.01 west_of_tea_guard failed on console B (2026-11-14 22:27) with "no fade in and out after walking onto the warp", with the player standing inside Route 7's gate. The door tile (15, 10) is a walk_east exit mat, so the walker's turn tap east took the warp. The fade passed while the turn was being read, and the leg's "before" screen was then the gate itself, so the fade watcher, arrived_without_fade() and the two retry steps never matched it. The warp leg now skips the turn tap when it starts on an exit mat and goes the mat's way (RouteStep::off_exit_mat, checked in turns_first()). The hold takes the warp, and its fade is watched along the hold, as take_warp_step() already does for 14.02b's mat. #510's still-wall check is unchanged.

Testing: the overworld sim now takes the warp on a tap or hold off an exit mat from any facing. A new Saffron sim case runs west_of_tea_guard from the gate's wall facing north; it fails with the console's error before the walker fix. Touched files compile locally; Fork Draft CI runs the suites.

Console B, 2026-11-14 22:27, 15.01 west_of_tea_guard: the turn tap east on
Route 7's gate door (15, 10), a walk_east warp, took the warp; its fade passed
while the turn was read, and the hold and the two steps more walked on inside
the gate. The sim's turn tap only turned. Now a tap or hold off an exit mat its
way takes the warp with no turn first. New Saffron sim case from the gate's
wall facing north is red: no fade in and out after walking onto the warp.
RouteStep::off_exit_mat marks a warp leg that starts on an exit mat and goes
its way; turns_first() skips the turn tap there, so the hold takes the warp
and its fade is watched along the hold. The fade watcher and
arrived_without_fade() were fine: the warp was taken before the leg's
'before' screen, which then showed the gate itself.
B3F's (15, 18) is MB_DOWN_LEFT_STAIR_WARP: the stair exit leaves the
player facing east, and pokefirered's TryArrowWarp takes a stair warp
from a held press its way, the same as an arrow warp. The plan's turn
west there took the stairs back down to B4F on the sim since the exit
mat change; the target now keeps the arrival facing.
…awn tile

Console B run 4 (2026-11-14 23:24): 16.03's "west 11" along SilphCo_5F
row 21 stopped two tiles short of the pad, with the Rocket 16.02 had just
beaten standing on (11, 21). He saw the player waiting on (12, 21) and
walked up from his map tile (9, 21); the game leaves a beaten trainer
where he stopped. The planner and the row sim kept him on (9, 21), so
the route ran through the tile he actually blocks.

A run flag, TRAINER_AT_FLAG ("trainer_at:<trainer_id>=<x>,<y>"), records
where a trainer stands after his fight; 16.02's battle sets it and 16.03
starts with it. run_story_maps() applies the moved trainers to the maps
the run plans on (PokemonFRLG_AutoStoryMovedTrainers), and the row sim's
walk plans on run_story_maps(flags) as the program does, instead of
story_maps(). The Silph rows' sim stands the beaten Rocket on (11, 21),
where the sim's trainer_sees leaves him (red: 16.03 blocked on (12, 21);
green with the flag), and a new case checks the flag data and maps. The
golden plan for 16.03 goes west 9, north 1, west 2 onto the pad.
…' reference

GCC's -Wdangling-reference flagged binding the result to a call with a
temporary set.
@dayfine
dayfine marked this pull request as ready for review November 15, 2026 08:27
@dayfine
dayfine merged commit c84718c into frlg/stage20-league Nov 15, 2026
16 of 23 checks passed
dayfine added a commit that referenced this pull request Nov 15, 2026
SilphCo_5F (12, 19) is a wall, so the planner since #514 marks the leg
onto (12, 20) "(to wall)", as 16.02's leg onto the same tile already is.
The golden failed on frlg/endpoint-sims as well.
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