fix(prompts): the d-pad icons show what the d-pad is bound to, on every face #1921
No reviewers
Labels
No labels
area/accessibility
area/audio
area/input
area/install
area/menu
area/renderer
area/saves
area/tooling
area/upscaling
beanstalk: approved
beanstalk: failed
beanstalk: needs approval
beanstalk: running
beanstalk: tested
ci: approved
good first issue
gpu/amd
gpu/igpu
gpu/intel
gpu/nvidia
help wanted
kind
bug
kind
chore
kind
docs
kind
feature
kind
performance
kind
question
needs measurements
platform/linux
platform/macos
platform/steam-deck
platform/windows
preview
priority
critical
priority
high
priority
low
regression
risk
high
risk
low
risk
medium
status
blocked
status
confirmed
status
duplicate
status
invalid
status
needs-info
status
wontfix
ci: approved
No milestone
No project
No assignees
4 participants
Notifications
Due date
No due date set.
Dependencies
No dependencies set
Reference
MagicBeanDev/Longshot!1921
Loading…
Reference in a new issue
No description provided.
Delete branch "gab9281/Longshot:fix/prompts-dpad-bound"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Summary
The d-pad icons in texts showed the face's own d-pad whatever the controls. The HUD's icon between the ocarina and Navi is the one players see all the time, and the up-down and left-right icons were affected too. On the Keyboard prompts, that meant a pad's d-pad where the keys are 1 2 3 4: a player's report, "There are still sections that don't have the PC buttons!!!". And on any pad face, a d-pad bound elsewhere on the Controls page still showed the d-pad.
To see it on main: set Button prompts to Keyboard and restart the game. Load a save in play: the HUD's d-pad (between the ocarina and Navi) is a pad's d-pad, not keys. Or keep a pad face, bind d-pad Left to Y on the Controls page, and restart: the icon is still the d-pad.
Now: each way of the icon shows what it is bound to, at the d-pad's four places:
How:
nx2/prompt_assets.pydpad_glyphsadds, for each d-pad icon, glyphs made of four pieces placed in the game's d-pad's round buttons.prompts/dpad.bin(dpad_table) records which subr each piece is and where each glyph's calls sit in the font.host/prompts.cwrites those calls for the controls now:dpad_bind);dpad_slot), kept when the font is served again (slots_point).dpad_piecesdecides what each way shows.Read first:
host/prompts.cdpad_pieces,dpad_bind,dpad_slot;nx2/prompt_assets.pydpad_glyphs,dpad_piece.Testing
Tested:
9027e737base throughdev.py queue. A save in play (Kokiri Forest); the DualSense hidden from the game; the controls from an options file.tests/test_prompt_font_bind.pycovers the start's glyph on each face, with the d-pad left alone and rebound: its calls, and that no other icon moves. It also covers a text's codes through d-pad changes in one run: the face's own icon, or one glyph per set of pieces, reused for the same set.host/prompts.c's owndpad_slotandslots_pointon a made-up font where the game keeps it. A glyph is given out per set of pieces, with its calls written; none past the 69th, and nothing written then. Once the font is served again, every glyph given out still has its calls. Breakingslots_pointmakes this check fail.tests/test_prompt*.pypass.run_all.py --changed upstream/main) pass excepttest_host_guest_writes,test_mods_size_tableandtest_lift_cache, which fail the same way on maina106df16.Still to test:
@Beanstalkon Windows).Measurements
Verdict: no frame-time path changes. The prompts build takes ~0.5 s more (+2.7 %), and its output grows by ~53 KB: the font goes from 55 to 104 KB.
Setup: CachyOS, AMD Ryzen 7 6800H,
dev.py queue --mode timing. A cleannx2/prompt_assets.pyrun (every face, textures included) into an empty folder: main, then this PR, three times interleaved, wall time. The only build step this changes; the game's own compile doesn't change.9027e737(its prompts files as a106df16's)37966a8bExternal.bfotfdpad.bin, 4 KB)At run time: when the font is served, writing the start's calls is twelve 2-byte writes. A text rewritten after a change gives out a glyph by four 2-byte writes into the game's copy.
Risks
dpad.binwould draw wrong or broken pieces in those three icons only. The host checks each place it writes still holds a 2-byte number (otf[a] == 28) and refuses adpad.binof the wrong size. Withoutdpad.bin, the icons stay the face's own, as on main.nx2/prompt_assets.py). Nothing changes in saves orlongshot_options.ini.Checklist
Ready for review
main; the title is a Conventional Commit.mise run testpasses (any failure that also fails onmainis named). On this PC,run_all.py --strict: 736 pass, 136 fail. 82 of the failures are the Vulkan and SPIR-V headers this PC lacks ("not found: vulkan_headers / spirv_headers (--strict)"; CI has them). The other 54 fail the same on maina106df16(54 of 54 run there), among themtest_host_guest_writes,test_mods_size_table,test_lift_cache,test_walk_keyandtest_dev_packs. None is a prompts test; everytest_prompt*passes.main, or Measurements says why there is nothing to measure.third_party/untouched; nothing GPL-incompatible.When it applies
mainand passes here.tests/that reads changed source is updated, not weakened.host/prompts.ccompiled with llvm-mingw clang (-std=c11 -Wall -Wextra), no warnings; CI doesn't build Windows for pull requests. No paths changed.mainand here, for a change that shows on screen.Assisted-by:/Co-Authored-By:trailers.Ready to merge
main, measured again or a comment says why the numbers still hold.🤖 Generated with Claude Code
https://claude.ai/code/session_015KgSKntdRabGivCmhJ63NW
Tested in game: CachyOS (Linux 7.3.4), NVIDIA RTX 3060 Laptop, driver 620.70.06: the HUD in play (Kokiri Forest save) at a game start on each of the six faces, with the default controls and with the d-pad rebound (Left on the top face button, Up on the left shoulder, keys on the arrows). Pad faces keep their own d-pad with the defaults and show their icons of the new bindings when rebound; Keyboard shows 1 2 3 4, then the arrows. main shows the Switch's d-pad on Keyboard either way. Live face changes keyboard/xbox/keyboard ran clean in the log.
Screenshots, the HUD's d-pad icon zoomed (4x) from in-game shots, NVIDIA RTX 3060 Laptop on CachyOS.
main (base
9027e737): the Keyboard face shows the Switch's d-pad, whatever the keys:This PR, each face at a game start: the default controls (top), and the d-pad rebound (bottom: Left on the top face button, Up on LB/L1/L, keys on the arrows):
Possibly related, for context:
Recommendation: Request changes. The startup fix is supported by the reported Linux run, but live changes can exhaust the available glyphs and fall back to incorrect prompts. The live implementation is also not exercised by the new test, and the build-time cost required by the project standards is unmeasured.
The change makes d-pad text icons reflect keyboard and controller bindings by adding composite glyphs to the prompt font. The reported cost is about 37 KB of font data; build time and the live-rebinding path still need validation.
Does it help: Yes for the reported startup cases on Linux: the author observed default and rebound icons on all six faces, compared with main. Live rebinding is unproven in game; the reported font grows from about 55 KB to 92 KB.
Other systems: Windows, AMD, Steam Deck and live rebinding remain untested in the supplied evidence. The font is shared by dialogue, menus and HUD text; the author tested the HUD at startup but did not demonstrate a newly drawn dialogue or menu after rebinding. The generator also runs during builds, whose time was not measured.
Switches: None.
Reviewed:
71ab01f49fagainsta106df16b2: Read the repository rules, PR template, change diff and changed portions of all three files, plus surrounding font serving, live update, glyph generation and build integration. Skimmed unrelated portions of the large changed files and the screenshot maintenance guide. The review checklist and adjacent Tooling checkout were absent; the supplied comments and reviews were empty. No external runs or overlapping PRs were available offline.; nothing run (a code review).Checked and fine:
Blocking (to change before merge)
Testing: No code or tests were run in this review. The author reports Linux in-game startup checks and passing prompt tests; Windows build and runtime, live rebinding in game, the full test run and required Tier 1 coverage remain outstanding.
Overlaps and merge order: Unknown; the network was closed.
Automated code review by BeanBot (gpt-6.1-terra), on the pull request's opening. Nothing was run; a maintainer decides.
@ -1042,0 +1142,4 @@int g = 1;while (g < dpad_ngiven[k] && memcmp(dpad_given[k][g], piece, sizeof dpad_given[k][g])) g++;if (g == dpad_ngiven[k]) {uint8_t *q = g < DPAD_GLYPHS && font.at ? (uint8_t *)hos_guest_range(font.at, font.n - 8) : NULL;After nine distinct composite glyphs for an icon, the next binding falls back to the face's d-pad even if that is not the active binding. Please support further changes without displaying an incorrect control.
@ -268,6 +471,7 @@ def faces_font(otf, faces, label_otf=None):for i in range(len(PADS)):placed[BIND_BASE + (n * len(SWITCH) + b) * len(PADS) + i] = placed[base + i]dpad = dpad_glyphs(game, faces, cmap, chars, hmtx, placed, add)This adds work to prompt generation during builds. Please measure clean build time and size against the base on the same setup, as required for build changes.
@ -308,0 +398,4 @@# (dpad_slot as host/prompts.c's, without the font: each icon's glyphs given out per set of pieces, from 1)"static int16_t given[3][DPAD_GLYPHS][4];","static int ngiven[3] = {1, 1, 1};","static int dpad_slot(int k, const int16_t piece[4]) {",This stand-in bypasses the production slot write and restoration, so the live test can pass even if the actual glyph is never written or is lost on a font reload. Please exercise those functions with a synthetic font and check the resulting calls.
Review answered in
37966a8b(a new commit on top; the description is updated):Nine live glyphs per icon (
host/prompts.cdpad_slot): now 69 per icon, besides the start's. The glyphs moved to U+FA2E..U+FAFF, which no game font uses; the private use area had too few free codes left. A glyph is given out per distinct set of pieces (a face with its d-pad bindings) and reused for the same set, so 69 is that many different faces and bindings in one run. Past it, the fallback stays the face's own icon, logged once, as with the keyboard's key codes (key_slot, 320). There is no picture that stays right without a new code: the game keeps a code's glyph drawn, so reusing a code would show its old pieces. The new code points' one side effect (CJK line breaking, texts rewritten after a change only) is under Risks.The live test bypassed the real code (
tests/test_prompt_font_bind.py):check_dpad_livecompileshost/prompts.c's owndpad_write,dpad_slot,slots_pointandfont_pointagainst a made-up font where the game keeps it. It checks:slots_point), every glyph given out has the same calls.Making
slots_pointskip the d-pad makes it fail ("the font served again (slots_point) does not have the glyphs given out as they were").Build cost: a clean prompts build (the only build step this changes), main then this PR, three times interleaved, in the queue's timing mode on a Ryzen 7 6800H. Medians are 19.9 s on main and 20.4 s here (+0.5 s). The font goes from 55 to 104 KB, and the whole output grows by ~53 KB. The table is under Measurements.
Rebuilt and run again in game after these changes (Keyboard and Xbox, the d-pad rebound): the same icons as before.
WIP: fix(prompts): the d-pad icons show what the d-pad is bound to, on every faceto fix(prompts): the d-pad icons show what the d-pad is bound to, on every face@Beanstalk on Windows (any GPU): set Button prompts to Keyboard and restart the game, then load a save in play and take a screenshot of the HUD. The d-pad icon between the ocarina and Navi should show the keys 1 2 3 4 (2 on top, 1 left, 3 right, 4 down), not a pad's d-pad. Then set Button prompts to Xbox, restart, and take the same screenshot: Xbox's own d-pad icon. Compare with main, which shows a pad's d-pad on Keyboard.
Beanstalk test farm · an earlier run: commit
37966a8(the newer results are in a comment below)Commit
37966a8· approved by gab9281 (reviewed) · dashboard⚠️ Note: The Keyboard screenshot cannot automatically verify the expected 2 above, 1 left, 3 right and 4 below; comparison with main would flag the intended change.
⚠️ Note: Rebinding and live-updated text are outside this startup HUD plan.
Done (started 23:06 UTC, last report 23:59 UTC). Comment
@Beanstalkto run it again.windowsWhy it failed
windows:xbox-hudscreenshot.max_diff:limit 0.0What was tested
What will be tested · AI plan (
gpt-6.1-terra)On Windows, the plan loads the Kokiri save with Keyboard and Xbox prompts in separate game starts and captures the HUD for comparison with main. It takes about 20 minutes per tester. Crashes or an Xbox screenshot difference fail the plan; the Keyboard capture is recorded without an automatic image verdict because its expected fix differs from main.
kokiri-start(settings button_prompts=6), then take the picture keyboard-hud; 1 run on each side.kokiri-start(settings button_prompts=2), then take the picture xbox-hud to compare with main; 1 run on each side.Measurements on `windows`, for the PR description
Verdict: fail on windows (2 reports):
xbox-hud screenshot.max_difffailed.Hardware: 1: windows+nvidia+nvidia-proprietary+dgpu
NVIDIA GeForce RTX 5090, 621.24.0AMD Ryzen 9 9950X3D2 16-Core Processor, 96 GB RAM; 2: windows+amd+amd-proprietary+dgpuAMD Radeon RX 9060 XT, 2.0.416AMD Ryzen 5 5600 6-Core Processor, 32 GB RAMScene: keyboard-hud, from the repository's save kokiri-start (button_prompts=6); xbox-hud, from the repository's save kokiri-start (button_prompts=2); each cell's settings and switches as the table names them
Method: the Beanstalk test farm: main and this PR built and run on the same PC in one session, game starts alternating (ABBA); keyboard-hud: 1 game start a side; xbox-hud: 1 game start a side; each number the median of the runs, then of 2 reports
How to reproduce: the farm's plan above (
@Beanstalkon this PR runs it again)Nothing was measured: no metric came back.
Flags and settings
None: the plan varied no setting, switch or build option.
As Markdown for the PR description:
The testers' hardware
windowsNVIDIA GeForce RTX 5090, 621.24.0AMD Ryzen 9 9950X3D2 16-Core Processor, 96 GB RAMwindowsAMD Radeon RX 9060 XT, 2.0.416AMD Ryzen 5 5600 6-Core Processor, 32 GB RAM@fix
I changed this pull request by bringing it up to date: the new head is
f51f9b2415. I rebased it ontomain(9bda94ba81).Conflicts resolved
Left for the author
Nothing was built or run: check the change. It will be reviewed again.
Automated fix by BeanBot (gpt-6.1-terra), asked for by HumanBean. Nothing was run; a maintainer decides.
37966a8b04f51f9b2415Beanstalk test farm
Commit
dfa6277· approved by nobody yet · dashboardA member of
BigBeanscan review this commit and comment@Beanstalkto test it.Recommendation: Request changes. The reported Linux runs show that startup prompts can display the correct bindings. The live rewrite can replace ordinary CJK text with d-pad icons, some supported controller bindings still show the wrong input, and the Windows AMD screenshot failure remains unexplained.
The change builds a composite glyph for each of the three d-pad prompts and patches its four pieces to match the controls. That fixes the reported Keyboard HUD prompt at startup and helps players with rebound controls. It adds a sidecar that must match the font, a bounded live glyph cache, and about 53 KB of generated output.
Does it help: Yes for the reported Linux startup cases. On the RTX 3060 Laptop, the author reported correct default and rebound HUD icons across all six faces, compared with the Switch d-pad on main's Keyboard face. Keyboard and Xbox rebound startup were repeated at
37966a8b. Live rendering and the full rebased head remain unproven. Three interleaved clean prompts builds on the Ryzen 7 6800H measured 19.9 s versus 20.4 s median at9027e737and37966a8b. The runs overlap, so the 0.5 s difference is within the observed spread. The font grew from 55,088 to 104,284 bytes and total output grew by 53,293 bytes.Other systems: The shared font and rewrite hooks affect HUD, menu and dialogue text on Windows, Linux and Steam Deck, including localized and modded text. The size table uses the generated font size and the existing mod-table merge, while a mod's replacement font keeps precedence. Beanstalk reported no crashes on Windows NVIDIA or AMD at
37966a8b, with no frame-time or memory metrics. The Steam Deck prompt face ran on desktop Linux. Steam Deck hardware and Linux AMD coverage are outstanding. The diff leaves renderer interfaces, shaders, saves, audio and input handling untouched.Switches: None.
Reviewed:
f51f9b2415against9bda94ba81: Read the HEAD diff for all three changed files and the commit log. Read all changed sections and their supporting paths in host/prompts.c, nx2/prompt_assets.py and tests/test_prompt_font_bind.py, including binding readers, font serving and live hooks, resource sizing, build staging and the test harnesses. Skimmed unrelated portions of the large files and the guide screenshot maintenance plan. Read AGENTS.md, CONTRIBUTING.md, the Forgejo template, standards and the supplied comments and stale review. The review checklist and adjacent Tooling checkout were absent. Screenshot attachments, farm logs and CI results were unavailable offline.; nothing run (a code review).Checked and fine:
Blocking (to change before merge)
Waiting on the author (a run, a measurement or a decision; no edit does it)
Testing: Read-only review. The author reports passing prompt checks and a warning-free llvm-mingw compile before the rebase. The strict run reported 736 passes and 136 failures, including 82 missing-header failures and 54 reproduced on main. No head CI or lint result was supplied. The reported Beanstalk run predates the rebase and its supplied threshold descriptions disagree, though the stated AMD result exceeds either threshold.
Overlaps and merge order: BeanBot identified #1184 as the relevant overlap in host/prompts.c because it also changes live prompts. Verify status and merge order on Forgejo, then review the combined text rewrite path if both are pending. #1700 concerns a separate guide layout, #529 is merged, and issue #297 concerns separate ocarina controls.
Automated code review by BeanBot (gpt-6.2-sol), asked for by BeanBot, after its fix. Nothing was run; a maintainer decides.
@ -220,0 +272,4 @@} else if (face == HOS_PROMPT_KEYBOARD) {piece[w] = dpad.key[bind[HOS_SW_N + b] & 0xFF];} else {const int pad = bind[b] >= 0 && bind[b] < HOS_PAD_ART_N ? bind[b] : switch_pad[b]; /* (a paddle: the default's) */With Input 1 cleared and Y in Input 2, Left still shows d-pad Left. A paddle assignment also shows the default. Resolve the active slot and use a neutral piece when artwork is unavailable.
@ -220,0 +285,4 @@for (int w = 0; w < 4; w++) {const uint32_t a = dpad.at[k][g][w];if (a < n && n - a >= 3 && otf[a] == 28) wr16(otf + a + 1, (uint16_t)piece[w]); /* (28: a 2-byte number follows) */}Skipping a rejected write still publishes the composite. Validate that the sidecar matches the font before writing any pieces and fall back if validation fails.
@ -1066,0 +1173,4 @@} else {static int full_said;if (g == DPAD_GLYPHS && !full_said++)hos_log("prompts: the d-pad's icons for these controls are all given out: d-pads bound anew show the face's own "The 70th distinct live combination can put a controller d-pad back into Keyboard text. Use a truthful fallback or defer live composites.
@ -1085,3 +1204,3 @@(c - PAD_BASE) % FACE_CODES < STATIC_AT + 3)k = (int)((c - PAD_BASE) % FACE_CODES - STATIC_AT);if (k >= 0) return PAD_BASE + FACE_CODES * face + STATIC_AT + k;if (c >= DPAD_BASE && c < DPAD_BASE + 3 * DPAD_GLYPHS) k = (int)((c - DPAD_BASE) / DPAD_GLYPHS);This classifies real CJK text as prompts, even for unissued slots or a missing sidecar. Keep live tokens in private-use space or track their provenance outside the text.
@ -397,0 +525,4 @@"""host/prompts.c dpad_slot and slots_point themselves, on a made-up font where the game keeps it: a glyph given out perset of pieces (the same set its glyph again), its calls written there; none past the last, the font untouched then; andthe font served again (live_font: from the file, slots_point) has each glyph given out with its calls as before"""n = 3 * 3 * prompt_assets.DPAD_GLYPHS * 4 # (each glyph's four calls: 28, then the number)The synthetic bytes verify host writes but bypass the generated sidecar and its loader. Round-trip a synthetic CFF font to catch bad offsets and a rejected or mismatched sidecar.
@fix
I changed this pull request as the review asked: the new head is
dfa62777b9.Changed
Still for the author (from the review)
Nothing was built or run: check the change. It will be reviewed again.
Automated fix by BeanBot (gpt-6.1-terra), asked for by HumanBean. Nothing was run; a maintainer decides.
Recommendation: Request changes. HEAD cannot compile on Windows or Linux because the font builder declares
tabletwice. The new round-trip test also requires a package missing from both CI test setups, and the Windows AMD HUD difference remains unexplained.The PR makes d-pad text icons reflect their bindings. The latest fix moves live glyphs into private-use code points, uses Input 2 when Input 1 is empty, validates the font and sidecar together, and shows neutral rings after eight distinct live composites per icon. The gain is clearer prompts for keyboard players and players who rebind a controller. The cost is a larger generated font, a sidecar, and extra work when the font is served or refreshed.
Since the last review (on
f51f9b2415)Resolved:
Still open:
New:
build()already declareschar table[MAX_PATH]for the resource size table. The newstruct dpad_table tableconflicts in the same scope, stopping compilation on either platform. Give the d-pad table a distinct name.RUN_ALL_MODULES, and provision the pinned package in both jobs.cmap4_bindstill reads only Input 1 for ordinary button glyphs. With A on a supported non-default input in Input 2 alone, startup text shows the default, while textures and rewritten text can show Input 2. Keep the new fallback scoped to d-pad composites or make the ordinary prompt paths agree and test the wider behavior.slots_pointskips them and the copy overwrites their calls with placeholder rings. Preserve the active font and table when a reload cannot restore issued glyphs, and cover this case in the reload test.Does it help: Yes for startup on the earlier Linux builds. The author reported correct default and rebound HUD icons across all six faces on an RTX 3060 Laptop, compared with main showing a Switch d-pad on Keyboard. Live rendering and the current head are unproven. Three interleaved clean prompts builds on a Ryzen 7 6800H measured 19.9 s versus 20.4 s median at
9027e737and37966a8b, within the observed spread. The font grew from 55,088 to 104,284 bytes and total output grew by 53,293 bytes on that revision. HEAD generates fewer glyphs and uses a different sidecar format, so those sizes do not describe HEAD.Other systems: The shared font affects HUD, dialogue, menus and localized or modded text on Windows, Linux and Steam Deck. The private-use range avoids the reported CJK collision. The wider Input 2 change also reaches ordinary button text, texture selection and layout placement, while startup still reads only Input 1 for ordinary button glyphs. The size-table path accounts for the generated font and preserves a mod's replacement font. The diff leaves renderer interfaces, shaders, saves, audio and input handling untouched.
Switches: None. DPAD and DPAD_SECOND are inputs to the synthetic test harness.
Reviewed:
dfa62777b9against9bda94ba81: Read the repository rules, Forgejo template and developer standards, the commit log, and the base and re-review diffs for all three files. Read the changed sections and relevant surrounding code in host/prompts.c, nx2/prompt_assets.py and tests/test_prompt_font_bind.py, plus the controller binding reader, font wrapping, test runner and CI dependency setup. Unrelated sections of the large files were skimmed. Read the supplied comments and reviews. The review checklist, adjacent Tooling checkout, screenshot attachments and current CI results were unavailable.; nothing run (a code review).Checked and fine:
Blocking (to change before merge)
build()already declareschar table[MAX_PATH]for the resource size table. The newstruct dpad_table tableconflicts in the same scope, stopping compilation on either platform. Give the d-pad table a distinct name.RUN_ALL_MODULES, and provision the pinned package in both jobs.cmap4_bindstill reads only Input 1 for ordinary button glyphs. With A on a supported non-default input in Input 2 alone, startup text shows the default, while textures and rewritten text can show Input 2. Keep the new fallback scoped to d-pad composites or make the ordinary prompt paths agree and test the wider behavior.slots_pointskips them and the copy overwrites their calls with placeholder rings. Preserve the active font and table when a reload cannot restore issued glyphs, and cover this case in the reload test.Waiting on the author (a run, a measurement or a decision; no edit does it)
37966a8bthe Windows AMD Xbox HUD comparison reported 0.8839 against a stated 0.01 limit, while NVIDIA reported 0.0. Inspect the paired captures and repeat on the merge candidate with the same save, controls and capture point to establish whether the Xbox prompt or surrounding HUD regressed. Manually verify the Keyboard capture as well.Suggestions (the author may take or leave)
Testing: No builds or tests were run during this review. The author reported passing prompt tests, a Windows host compile and Linux startup rendering on earlier revisions. Beanstalk reported no crashes on Windows AMD or NVIDIA at
37966a8band returned no frame-time or VRAM measurements. There are no supplied runs ondfa62777b9.Overlaps and merge order: The supplied comments identify #1184 as touching live prompt updates in host/prompts.c. #1700 concerns the System guide, and #529 is already merged. No merge order is established from the available evidence.
Automated code review by BeanBot (gpt-6.2-sol), asked for by BeanBot, after its fix. Nothing was run; a maintainer decides.
@ -161,1 +163,3 @@for (int b = 0; b < HOS_SW_N; b++) bind[b] = hos_binding(HOS_BIND_PAD, b, 0), bind[HOS_SW_N + b] = first_key(b);for (int b = 0; b < HOS_SW_N; b++) {bind[b] = hos_binding(HOS_BIND_PAD, b, 0);if (bind[b] < 0) bind[b] = hos_binding(HOS_BIND_PAD, b, 1);This changes all buttons in the shared snapshot. With A bound only in Input 2, textures and live text can show that binding while startup text still shows the default. Scope the change to d-pad composites or make both paths agree.
@ -1181,3 +1327,4 @@const int ok = q && !memcmp(q, b + 8, 64); /* (still the font: its tables' directory, which a binding leaves as is) */if (ok) {AcquireSRWLockExclusive(&slot_lock); /* (the keys' codes given out stay on their keys) */dpad = table;A rejected sidecar here replaces the active table and skips restoring live slots, so the font copy can turn already-issued icons into placeholder rings. Keep the active pair if the reload cannot restore those slots.
@ -1437,3 +1584,3 @@uint32_t key;int bound;uint8_t *b = font_bound(dir, face, &n, &key, &bound);struct dpad_table table;build()already haschar table[MAX_PATH]in this scope. Rename the new d-pad table so the host compiles.@ -397,0 +621,4 @@"""Generate a small CFF, serialize its actual offsets, and load and patch it with the host code."""import ioimport structfrom fontTools.fontBuilder import FontBuilderNeither clean CI test setup installs fontTools. Keep this test dependency-free or declare and provision the pinned dependency in both jobs.
View command line instructions
Checkout
From your project repository, check out a new branch and test the changes.