feat(wheel): an item wheel for the R/L item row, Twilight Princess style, with Cycle items (Gameplay, off by default) #822

Open
samaBR wants to merge 4 commits from samaBR/Longshot:feat/item-wheel into main
First-time contributor

Type: feat · Risk: low · Tested on: Windows 11, RTX 4070 SUPER · Needs: Linux, AMD (the wheel's backdrop), Steam Deck

Why

The game picks the item for ZR from a long row that R and L scroll one item at a time, so getting to one item means tapping
through all the others. This adds an optional item wheel, as in Twilight Princess: hold R or L, point at the item, let go.
Off by default, so nothing changes for a player who doesn't turn it on. It was reviewed and tested by players on Hookshot
(the item wheel PR there, originally #2261); this is the same feature on Longshot.

What changed

A Gameplay row, Item wheel, shows the item row as a wheel while R or L is held: pages of 8 fixed slots per age, items
named as the game names them in its language, with the game's own icons and row sounds, and letting go equips at once. A
second row, Cycle items, changes the ZR item within its group with a tap of R or L (a 250 ms hold then opens the wheel).
Its Last item choice (Off, Last item, Basic, + Bombs, + Tools) makes a tap put back the item ZR had before, any item, so
two items can be swapped with one button. Bottles: two of the same content are two items, in the inventory's order, and Y
moves a bottle to another slot.

  • host: host/oot_wheel.c (new): the wheel's state, the pages and wheel_layout.txt (beside longshot_options.ini, so
    an update keeps them), instant equip through PouchMgr::setAssignableItem / getAssignableItem, Cycle items, the
    input; host/nn_hid.c hands it the pad; host/nn_audio.c plays the wheel's sounds; host/display.c and
    host/posix/display_sdl.c the mouse.
  • renderer: gpu/vk/vk_menu.cpp draw_wheel and the two Gameplay rows; gpu/vk/vk_framegen.cpp the blurred, dimmed
    backdrop (the scene before the HUD, so the game's own row doesn't show behind the wheel); vk_draw.cpp, vk_replay.cpp.
  • vk ABI: MkwVkHost.wheel (MKWVK_API_VERSION 25, after main's 24 for the playback devices) and its pages (26).
  • build: nx2/wheel_names.py (names from the game's messages), nx2/wheel_sounds.py, the icons in
    nx2/prompt_assets.py --wheel-icons, run by nx2/make_game.py; without Pillow or the decoders the wheel shows names.
  • menu text in the 13 languages (gpu/vk/menu_i18n.h); README and docs/development.md.

Measurements

Verdict: works in the game (wheel, pages, moving items, names in pt-BR, Cycle items, instant equip) and costs nothing
seen: the game holds its 60 fps cap with the wheel on, closed and open (the frames behind the open wheel are the game's
paused ones), as with main. Not measured uncapped. Measured at d03e2028, before the rebase; the later Last item and bottles commits only change what a tap of R or L
puts on ZR.

Hardware: Windows 11, RTX 4070 SUPER (driver 32.0.16.2114), 2560x1440
Scene: in play, the game's 60 fps cap, defaults otherwise
Method: the vk: ... fps and vi: ... frames presented lines of longshot_log.txt across the play session, wheel off,
then on (closed, opened in the field)
How to reproduce: a save in the field, Gameplay > Item wheel on, the FPS counter on; hold R to open the wheel, compare with it off

Before: main @ aa95d35f After: this PR @ d03e2028
fps in play, Item wheel on n/a 60.0 (cap)
fps in play, the wheel open n/a 60.0 (cap)
fps in play, Item wheel off 60.0 (cap) 60.0 (cap)
[hos Presentation Thread] vi: 9699 frames presented (59.6 fps over the last 5.0 s, interval 1)
[hos host] vk: item wheel: the backdrop is the scene before the HUD, blurred and dimmed (2560x1440 at 0,0)
[hos host] vk: 9840 presents, 60.0 fps; a frame: 254 draws (0 skipped), 0 dispatches, 10 passes, 19 barriers, 6 submits
[hos Presentation Thread] vi: 9999 frames presented (60.0 fps over the last 5.0 s, interval 1)
[hos host] vk: 10200 presents, 60.0 fps; a frame: 254 draws (0 skipped), 0 dispatches, 10 passes, 18 barriers, 6 submits

Flags and settings

Two menu rows and switches for testing, all documented (README's options, docs/development.md).

Flag What it is Before this PR After this PR Effect Helps / doesn't help / untested Recommendation
Item wheel (item_wheel, option id 60) Gameplay row none Off holding R or L shows the wheel helps controller players off by default
Cycle items (cycle_items, option id 62) Gameplay row none Basic Off, Last item (a tap of R/L puts back the item ZR had before), Basic, + Bombs, + Tools (a tap changes the ZR item within its group) helps with the wheel on Basic
HOS_ITEM_WHEEL, HOS_CYCLE_ITEMS over the rows for one run none unset as the rows testing unset
HOS_WHEEL_TRACE, HOS_WHEEL_HOLD_MS, HOS_WHEEL_TAP_FRAMES logging and timing none unset log / hold 250 ms / tap 1 frame testing unset
HOS_WHEEL_SOUND_GAIN the wheel's tick volume none unset (0.7, as the game plays its row's tick) louder or softer tick testing unset
RX_VK_WHEEL_BACKDROP=0 the wheel without its blurred backdrop none unset (on) the game's picture shows behind the wheel a control if the backdrop misbehaves on a GPU unset

Testing

Tested: python -I -B tests/run_all.py on Windows, rebased on main @ bbe421f5: the 17 that fail fail on main @
bbe421f5 too (test_auto_handheld, test_bug_report, test_bug_report_defaults, test_crash_dialog, test_crt_options, test_guest_imported, test_hardware_report, test_linux_preflight, test_longshot_ctl, test_make_game_cache, test_missing_nup, test_pads_after_menu, test_pending_guest_import, test_run_all_changed, test_tested_configurations, test_vk_occlusion_queries, test_walk_key; the others that failed under the parallel run (20 at once) pass alone). A
build of the renderer of the rebased branch compiles. The Guide screenshots check (scripts/check_guide_screenshots.py --review-sources) fails on main @ bbe421f5 too,
with the same review list (settings-graphics.png and others); this PR's changes don't show on the Graphics tab that image shows. In the game (Windows, RTX 4070 SUPER, a build of this branch over main
aa95d35f): the wheel as child and adult, turning pages, moving an item with Y, the names in Portuguese, instant equip,
Cycle items with R and L, the mouse. Cycle items' Last item (fafa6222) was tested in the game on Hookshot, the same code.
The bottles' fix (2589cf36), tested in the game: two Red Potions in their own slots, the bottles in the inventory's
order, two bottles swapped with Y and kept on reopening, each bottle put on ZR.

Not tested: Linux, AMD and Intel GPUs, Steam Deck (I'm on Windows with NVIDIA).

Must be tested:

  • linux, steamdeck: turn on Gameplay > Item wheel, hold R in the field, expecting the wheel over a blurred scene and the
    item equipped on letting go (Test Farm: @Beanstalk linux steamdeck, the item wheel opened with R in the field)
  • amd: the same, expecting the game's own item row not to show behind the wheel (Test Farm: @Beanstalk amd, the item wheel's backdrop)

Risks

What could break: with the row off, nothing runs (no backdrop copy, no input change). With it on: R and L's own row
is replaced by the wheel; the equip goes through the game's own setter.

Turning it off: the Item wheel row (off by default), or HOS_ITEM_WHEEL=0.

Compatibility: saves untouched; longshot_options.ini gains item_wheel and cycle_items; wheel_layout.txt beside
it; MKWVK_API_VERSION 24 to 26 (the game and renderer are built together); the wheel's icons, names and sounds are made
at build time from the player's own game.

Checklist

Everyone

  • One topic.
  • The title is a Conventional Commit (type(scope): description) of the status line's type.
  • Why gives the reason plainly and links the issues that fit (the tracker searched).
  • Measurements has a verdict, or one line saying why there is nothing to measure.
  • Testing names what was tested, what wasn't, and what must still be tested, where and how.
  • Rebased on current main.
  • python -I -B tests/run_all.py passes (any failure that also fails on main is named).
  • No game files, dumps, build output or generated files.
  • third_party/ untouched (a new folder with a PROVENANCE.md instead).
  • The license is OK: GPL-3.0-or-later, nothing incompatible and nothing decompiled.

When it applies

  • AI assistance recorded with Assisted-by: / Co-Authored-By: trailers. (made with Claude Code: each commit says so)
  • Switches documented (docs/development.md; the README for a menu row) and shipped at their recommended value.
  • MKWVK_API_VERSION bumped (gpu/vk/vk_api.h's MkwVkHost or MkwVkRenderer changed).
  • A check under tests/ that reads changed source updated in this PR, not weakened.
  • Docs updated.
**Type:** feat · **Risk:** low · **Tested on:** Windows 11, RTX 4070 SUPER · **Needs:** Linux, AMD (the wheel's backdrop), Steam Deck ## Why The game picks the item for ZR from a long row that R and L scroll one item at a time, so getting to one item means tapping through all the others. This adds an optional item wheel, as in Twilight Princess: hold R or L, point at the item, let go. Off by default, so nothing changes for a player who doesn't turn it on. It was reviewed and tested by players on Hookshot (the item wheel PR there, originally #2261); this is the same feature on Longshot. ## What changed A Gameplay row, Item wheel, shows the item row as a wheel while R or L is held: pages of 8 fixed slots per age, items named as the game names them in its language, with the game's own icons and row sounds, and letting go equips at once. A second row, Cycle items, changes the ZR item within its group with a tap of R or L (a 250 ms hold then opens the wheel). Its Last item choice (Off, Last item, Basic, + Bombs, + Tools) makes a tap put back the item ZR had before, any item, so two items can be swapped with one button. Bottles: two of the same content are two items, in the inventory's order, and Y moves a bottle to another slot. - host: `host/oot_wheel.c` (new): the wheel's state, the pages and `wheel_layout.txt` (beside `longshot_options.ini`, so an update keeps them), instant equip through `PouchMgr::setAssignableItem` / `getAssignableItem`, Cycle items, the input; `host/nn_hid.c` hands it the pad; `host/nn_audio.c` plays the wheel's sounds; `host/display.c` and `host/posix/display_sdl.c` the mouse. - renderer: `gpu/vk/vk_menu.cpp` `draw_wheel` and the two Gameplay rows; `gpu/vk/vk_framegen.cpp` the blurred, dimmed backdrop (the scene before the HUD, so the game's own row doesn't show behind the wheel); `vk_draw.cpp`, `vk_replay.cpp`. - vk ABI: `MkwVkHost.wheel` (`MKWVK_API_VERSION` 25, after main's 24 for the playback devices) and its pages (26). - build: `nx2/wheel_names.py` (names from the game's messages), `nx2/wheel_sounds.py`, the icons in `nx2/prompt_assets.py --wheel-icons`, run by `nx2/make_game.py`; without Pillow or the decoders the wheel shows names. - menu text in the 13 languages (`gpu/vk/menu_i18n.h`); README and docs/development.md. ## Measurements **Verdict:** works in the game (wheel, pages, moving items, names in pt-BR, Cycle items, instant equip) and costs nothing seen: the game holds its 60 fps cap with the wheel on, closed and open (the frames behind the open wheel are the game's paused ones), as with main. Not measured uncapped. Measured at d03e2028, before the rebase; the later Last item and bottles commits only change what a tap of R or L puts on ZR. Hardware: Windows 11, RTX 4070 SUPER (driver 32.0.16.2114), 2560x1440 Scene: in play, the game's 60 fps cap, defaults otherwise Method: the `vk: ... fps` and `vi: ... frames presented` lines of `longshot_log.txt` across the play session, wheel off, then on (closed, opened in the field) How to reproduce: a save in the field, Gameplay > Item wheel on, the FPS counter on; hold R to open the wheel, compare with it off | | Before: main @ aa95d35f | After: this PR @ d03e2028 | |---|---|---| | fps in play, Item wheel on | n/a | 60.0 (cap) | | fps in play, the wheel open | n/a | 60.0 (cap) | | fps in play, Item wheel off | 60.0 (cap) | 60.0 (cap) | ``` [hos Presentation Thread] vi: 9699 frames presented (59.6 fps over the last 5.0 s, interval 1) [hos host] vk: item wheel: the backdrop is the scene before the HUD, blurred and dimmed (2560x1440 at 0,0) [hos host] vk: 9840 presents, 60.0 fps; a frame: 254 draws (0 skipped), 0 dispatches, 10 passes, 19 barriers, 6 submits [hos Presentation Thread] vi: 9999 frames presented (60.0 fps over the last 5.0 s, interval 1) [hos host] vk: 10200 presents, 60.0 fps; a frame: 254 draws (0 skipped), 0 dispatches, 10 passes, 18 barriers, 6 submits ``` ### Flags and settings Two menu rows and switches for testing, all documented (README's options, docs/development.md). | Flag | What it is | Before this PR | After this PR | Effect | Helps / doesn't help / untested | Recommendation | |---|---|---|---|---|---|---| | Item wheel (`item_wheel`, option id 60) | Gameplay row | none | Off | holding R or L shows the wheel | helps controller players | off by default | | Cycle items (`cycle_items`, option id 62) | Gameplay row | none | Basic | Off, Last item (a tap of R/L puts back the item ZR had before), Basic, + Bombs, + Tools (a tap changes the ZR item within its group) | helps with the wheel on | Basic | | `HOS_ITEM_WHEEL`, `HOS_CYCLE_ITEMS` | over the rows for one run | none | unset | as the rows | testing | unset | | `HOS_WHEEL_TRACE`, `HOS_WHEEL_HOLD_MS`, `HOS_WHEEL_TAP_FRAMES` | logging and timing | none | unset | log / hold 250 ms / tap 1 frame | testing | unset | | `HOS_WHEEL_SOUND_GAIN` | the wheel's tick volume | none | unset (0.7, as the game plays its row's tick) | louder or softer tick | testing | unset | | `RX_VK_WHEEL_BACKDROP=0` | the wheel without its blurred backdrop | none | unset (on) | the game's picture shows behind the wheel | a control if the backdrop misbehaves on a GPU | unset | ## Testing **Tested:** `python -I -B tests/run_all.py` on Windows, rebased on `main` @ bbe421f5: the 17 that fail fail on `main` @ bbe421f5 too (test_auto_handheld, test_bug_report, test_bug_report_defaults, test_crash_dialog, test_crt_options, test_guest_imported, test_hardware_report, test_linux_preflight, test_longshot_ctl, test_make_game_cache, test_missing_nup, test_pads_after_menu, test_pending_guest_import, test_run_all_changed, test_tested_configurations, test_vk_occlusion_queries, test_walk_key; the others that failed under the parallel run (20 at once) pass alone). A build of the renderer of the rebased branch compiles. The Guide screenshots check (`scripts/check_guide_screenshots.py --review-sources`) fails on `main` @ bbe421f5 too, with the same review list (settings-graphics.png and others); this PR's changes don't show on the Graphics tab that image shows. In the game (Windows, RTX 4070 SUPER, a build of this branch over main aa95d35f): the wheel as child and adult, turning pages, moving an item with Y, the names in Portuguese, instant equip, Cycle items with R and L, the mouse. Cycle items' Last item (fafa6222) was tested in the game on Hookshot, the same code. The bottles' fix (2589cf36), tested in the game: two Red Potions in their own slots, the bottles in the inventory's order, two bottles swapped with Y and kept on reopening, each bottle put on ZR. **Not tested:** Linux, AMD and Intel GPUs, Steam Deck (I'm on Windows with NVIDIA). **Must be tested:** - linux, steamdeck: turn on Gameplay > Item wheel, hold R in the field, expecting the wheel over a blurred scene and the item equipped on letting go (Test Farm: @Beanstalk linux steamdeck, the item wheel opened with R in the field) - amd: the same, expecting the game's own item row not to show behind the wheel (Test Farm: @Beanstalk amd, the item wheel's backdrop) ## Risks **What could break:** with the row off, nothing runs (no backdrop copy, no input change). With it on: R and L's own row is replaced by the wheel; the equip goes through the game's own setter. **Turning it off:** the Item wheel row (off by default), or `HOS_ITEM_WHEEL=0`. **Compatibility:** saves untouched; `longshot_options.ini` gains `item_wheel` and `cycle_items`; `wheel_layout.txt` beside it; `MKWVK_API_VERSION` 24 to 26 (the game and renderer are built together); the wheel's icons, names and sounds are made at build time from the player's own game. ## Checklist ### Everyone - [x] One topic. - [x] The title is a Conventional Commit (`type(scope): description`) of the status line's type. - [x] Why gives the reason plainly and links the issues that fit (the tracker searched). - [x] Measurements has a verdict, or one line saying why there is nothing to measure. - [x] Testing names what was tested, what wasn't, and what must still be tested, where and how. - [x] Rebased on current `main`. - [x] `python -I -B tests/run_all.py` passes (any failure that also fails on `main` is named). - [x] No game files, dumps, build output or generated files. - [x] `third_party/` untouched (a new folder with a `PROVENANCE.md` instead). - [x] The license is OK: GPL-3.0-or-later, nothing incompatible and nothing decompiled. ### When it applies - [x] AI assistance recorded with `Assisted-by:` / `Co-Authored-By:` trailers. (made with Claude Code: each commit says so) - [x] Switches documented (docs/development.md; the README for a menu row) and shipped at their recommended value. - [x] `MKWVK_API_VERSION` bumped (`gpu/vk/vk_api.h`'s `MkwVkHost` or `MkwVkRenderer` changed). - [x] A check under `tests/` that reads changed source updated in this PR, not weakened. - [x] Docs updated.
Holding R or L shows the item row as a wheel: pages of 8 fixed slots per age (D-pad, ZL/ZR or the mouse wheel turn them;
Y moves an item, B cancels), either stick or the mouse points, letting go equips at once (PouchMgr::setAssignableItem). The
items are named as the game names them, in its language (nx2/wheel_names.py), with the game's own icons and row sounds.
Cycle items (Off, Basic, + Bombs, + Tools; default Basic): a tap of R or L changes the ZR item within its group, a 250 ms
hold opens the wheel. Option ids 60 (Item wheel, reserved for it) and 62 (Cycle items); API version 24 (the host's wheel)
and 25 (its pages). The pages are kept in wheel_layout.txt beside longshot_options.ini.

Ported from Hookshot (the item wheel PR, originally #2261).

Co-authored-by: tapxgamestudio <[email protected]>
Co-authored-by: getzabelz <[email protected]>

Feito com Claude Code
fix(wheel): nn_audio.c includes hos_paths.h for the wheel's sounds (Longshot's hos_game_path_a is inline)
Some checks failed
PR description / Description follows the template (pull_request_target) Successful in 5s
CI / Conventional Commit title (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Has been cancelled
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Has been cancelled
CI / Workflow lint (actionlint) (pull_request) Has been cancelled
Guide screenshots / Guide images and local UI source review (pull_request) Has been cancelled
Third-party parts / As their notes say (pull_request) Has been cancelled
Third-party parts / The same as upstream (pull_request) Has been cancelled
d03e20287e
Feito com Claude Code
feat(wheel): Cycle items' Last item, a tap of R or L puts back the item ZR had before
All checks were successful
PR description / Description follows the template (pull_request_target) Successful in 19s
8504a870f5
The Cycle items row gets Last item right after Off (Off, Last item, Basic, + Bombs, + Tools; Basic stays the default).
With it, a tap of R or L puts the item ZR had before back on ZR, any item, and another tap swaps them again. The HUD's
update keeps each age's item on ZR and the one before it, whatever changed it (the wheel, the game's row, a tap); an item
the game would not list now (the other age's, used up) is left alone. Translated in the menu's 13 languages.

Feito com Claude Code
Author
First-time contributor

New commit 8504a870: Cycle items gets a Last item choice, right after Off (Off, Last item, Basic, + Bombs, + Tools; Basic stays the default). With it, a tap of R or L puts back the item ZR had before, any item, and another tap swaps them again. Translated in the menu's 13 languages; README and docs/development.md updated. The game-free checks pass as before (the same failures as on main), and a full build of this branch builds.

New commit 8504a870: Cycle items gets a **Last item** choice, right after Off (Off, Last item, Basic, + Bombs, + Tools; Basic stays the default). With it, a tap of R or L puts back the item ZR had before, any item, and another tap swaps them again. Translated in the menu's 13 languages; README and docs/development.md updated. The game-free checks pass as before (the same failures as on main), and a full build of this branch builds.
HumanBean force-pushed feat/item-wheel from 8504a870f5
All checks were successful
PR description / Description follows the template (pull_request_target) Successful in 19s
to b9b9ff1c64
Some checks failed
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Has been skipped
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Has been skipped
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Has been skipped
Third-party parts / The same as upstream (pull_request) Has been skipped
Website / Website on Cloudflare (pull_request) Has been skipped
PR description / Description follows the template (pull_request_target) Successful in 3s
CI / Conventional Commit title (pull_request) Successful in 3s
CI / Workflow lint (actionlint) (pull_request) Successful in 6s
Guide screenshots / Guide images and local UI source review (pull_request) Failing after 3s
Third-party parts / As their notes say (pull_request) Successful in 8s
2026-11-15 18:45:07 +00:00
Compare
Owner

Rebased onto main @ bbe6fdf2: docs/development.md conflicted, resolved by keeping this PR's four HOS_WHEEL_*/HOS_CYCLE_ITEMS rows and dropping the RX_BACKEND row that main removed. No tests were run here; the test boxes stay yours.

Rebased onto `main` @ bbe6fdf2: `docs/development.md` conflicted, resolved by keeping this PR's four HOS_WHEEL_*/HOS_CYCLE_ITEMS rows and dropping the RX_BACKEND row that `main` removed. No tests were run here; the test boxes stay yours.
samaBR force-pushed feat/item-wheel from b9b9ff1c64
Some checks failed
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Has been skipped
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Has been skipped
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Has been skipped
Third-party parts / The same as upstream (pull_request) Has been skipped
Website / Website on Cloudflare (pull_request) Has been skipped
PR description / Description follows the template (pull_request_target) Successful in 3s
CI / Conventional Commit title (pull_request) Successful in 3s
CI / Workflow lint (actionlint) (pull_request) Successful in 6s
Guide screenshots / Guide images and local UI source review (pull_request) Failing after 3s
Third-party parts / As their notes say (pull_request) Successful in 8s
to b6835786c2
Some checks failed
PR description / Description follows the template (pull_request_target) Successful in 4s
Website / Website on Cloudflare (pull_request_target) Has been skipped
CI / Conventional Commit title (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Has been cancelled
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Has been cancelled
CI / Workflow lint (actionlint) (pull_request) Has been cancelled
Guide screenshots / Guide images and local UI source review (pull_request) Has been cancelled
Third-party parts / As their notes say (pull_request) Has been cancelled
Third-party parts / The same as upstream (pull_request) Has been cancelled
Website / Website on Cloudflare (pull_request) Has been cancelled
2026-11-15 19:48:00 +00:00
Compare
Author
First-time contributor

Rebased onto main @ 16d87c83 (from the rebase onto bbe6fdf2 above), conflicts resolved in docs/development.md (both rows), vk_draw.cpp (the wheel's scene notes with main's cpipe()), vk_framegen.cpp (main's CRT filter and the wheel's backdrop side by side), vk_replay.cpp (the backdrop before main's condition with opts.crt_filter) and make_game.py. New commit b6835786 fixes three bottle defects (as fixed on Hookshot): two bottles of the same content are two items (the survey no longer sticks between them), the bottles follow the inventory's order, and Y moves a bottle. Tested in the game with two Red Potions. The game-free checks fail in the same 19 as main @ 16d87c83, the renderer of the rebased branch builds, and the Guide screenshots check fails on main too (the same settings-graphics.png review list).

Rebased onto `main` @ 16d87c83 (from the rebase onto bbe6fdf2 above), conflicts resolved in docs/development.md (both rows), vk_draw.cpp (the wheel's scene notes with main's `cpipe()`), vk_framegen.cpp (main's CRT filter and the wheel's backdrop side by side), vk_replay.cpp (the backdrop before main's condition with `opts.crt_filter`) and make_game.py. New commit b6835786 fixes three bottle defects (as fixed on Hookshot): two bottles of the same content are two items (the survey no longer sticks between them), the bottles follow the inventory's order, and Y moves a bottle. Tested in the game with two Red Potions. The game-free checks fail in the same 19 as `main` @ 16d87c83, the renderer of the rebased branch builds, and the Guide screenshots check fails on `main` too (the same settings-graphics.png review list).
samaBR force-pushed feat/item-wheel from b6835786c2
Some checks failed
PR description / Description follows the template (pull_request_target) Successful in 4s
Website / Website on Cloudflare (pull_request_target) Has been skipped
CI / Conventional Commit title (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Has been cancelled
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Has been cancelled
CI / Workflow lint (actionlint) (pull_request) Has been cancelled
Guide screenshots / Guide images and local UI source review (pull_request) Has been cancelled
Third-party parts / As their notes say (pull_request) Has been cancelled
Third-party parts / The same as upstream (pull_request) Has been cancelled
Website / Website on Cloudflare (pull_request) Has been cancelled
to 2589cf36bc
Some checks failed
PR description / Description follows the template (pull_request_target) Successful in 4s
CI / Conventional Commit title (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Has been cancelled
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Has been cancelled
CI / Workflow lint (actionlint) (pull_request) Has been cancelled
Guide screenshots / Guide images and local UI source review (pull_request) Has been cancelled
Third-party parts / As their notes say (pull_request) Has been cancelled
Third-party parts / The same as upstream (pull_request) Has been cancelled
Website / Website on Cloudflare (pull_request) Has been cancelled
2026-11-15 22:21:10 +00:00
Compare
Author
First-time contributor

Rebased onto main @ 79b1fd8f: only gpu/vk/menu_i18n.h conflicted (the per-language counts, recounted). The game-free checks fail in the same 21 as main @ 79b1fd8f, the renderer of the rebased branch builds, and the Guide screenshots check fails on main too.

Rebased onto `main` @ 79b1fd8f: only gpu/vk/menu_i18n.h conflicted (the per-language counts, recounted). The game-free checks fail in the same 21 as `main` @ 79b1fd8f, the renderer of the rebased branch builds, and the Guide screenshots check fails on `main` too.
samaBR force-pushed feat/item-wheel from 2589cf36bc
Some checks failed
PR description / Description follows the template (pull_request_target) Successful in 4s
CI / Conventional Commit title (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Has been cancelled
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Has been cancelled
CI / Workflow lint (actionlint) (pull_request) Has been cancelled
Guide screenshots / Guide images and local UI source review (pull_request) Has been cancelled
Third-party parts / As their notes say (pull_request) Has been cancelled
Third-party parts / The same as upstream (pull_request) Has been cancelled
Website / Website on Cloudflare (pull_request) Has been cancelled
to 039583166a
Some checks are pending
CI / Conventional Commit title (pull_request) Blocked by required conditions
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Blocked by required conditions
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Blocked by required conditions
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Blocked by required conditions
CI / Workflow lint (actionlint) (pull_request) Blocked by required conditions
Guide screenshots / Guide images and local UI source review (pull_request) Blocked by required conditions
Third-party parts / The same as upstream (pull_request) Blocked by required conditions
Third-party parts / As their notes say (pull_request) Blocked by required conditions
Website / Website on Cloudflare (pull_request) Blocked by required conditions
PR description / Description follows the template (pull_request_target) Successful in 4s
2026-11-16 05:33:44 +00:00
Compare
Author
First-time contributor

Rebased onto main @ bbe421f5. #1001 took MKWVK_API_VERSION 24 for the playback devices, so the wheel's MkwVkHost.wheel is 25 and its pages 26, after the audio callbacks (host/rx_backend.c fills them in that order); test_audio_output_devices now checks that the playback callbacks follow options_path and that the version is at least 24, instead of their being last and the version exactly 24. Microphone moved to the Audio tab on main, so the Gameplay rows and the README keep only Item wheel and Cycle items. The other conflicts (README, docs/development.md, menu_i18n.h with its counts recounted, nx2/make_game.py) keep both sides. The game-free checks fail in the same 17 as main @ bbe421f5, the renderer of the rebased branch builds, and the Guide screenshots check fails on main too.

Rebased onto `main` @ bbe421f5. #1001 took `MKWVK_API_VERSION` 24 for the playback devices, so the wheel's `MkwVkHost.wheel` is 25 and its pages 26, after the audio callbacks (host/rx_backend.c fills them in that order); test_audio_output_devices now checks that the playback callbacks follow `options_path` and that the version is at least 24, instead of their being last and the version exactly 24. Microphone moved to the Audio tab on `main`, so the Gameplay rows and the README keep only Item wheel and Cycle items. The other conflicts (README, docs/development.md, menu_i18n.h with its counts recounted, nx2/make_game.py) keep both sides. The game-free checks fail in the same 17 as `main` @ bbe421f5, the renderer of the rebased branch builds, and the Guide screenshots check fails on `main` too.
Some checks are pending
CI / Conventional Commit title (pull_request) Blocked by required conditions
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Blocked by required conditions
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Blocked by required conditions
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Blocked by required conditions
CI / Workflow lint (actionlint) (pull_request) Blocked by required conditions
Guide screenshots / Guide images and local UI source review (pull_request) Blocked by required conditions
Third-party parts / The same as upstream (pull_request) Blocked by required conditions
Third-party parts / As their notes say (pull_request) Blocked by required conditions
Website / Website on Cloudflare (pull_request) Blocked by required conditions
PR description / Description follows the template (pull_request_target) Successful in 4s
This pull request has changes conflicting with the target branch.
  • gpu/vk/menu_i18n.h
  • gpu/vk/vk_api.h
  • host/rx_backend.c
  • tests/test_audio_output_devices.py
Some workflows are waiting to be reviewed.
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u 'feat/item-wheel:samaBR-feat/item-wheel'
git switch 'samaBR-feat/item-wheel'
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
MagicBeanDev/Longshot!822
No description provided.