WIP: feat(mods): two mods' ExeFS patches that write one place differently are named, and the lower one wins every byte #961

Draft
snaildev99 wants to merge 20 commits from snaildev99/Longshot:mods/exefs-clashes into main
Contributor

Type: feat · Risk: low · Tested on: Windows 11, RTX 3090 (in the game, and the game-free checks) · Needs: Linux, any GPU: one game-free test

Why

When two code mods change the same place in the game's code, #134 uses the bytes of the one lower in the list and
says nothing: a player has no way to know that one of their mods is partly overwritten, which is the first thing to
know when a mod "does nothing" or the game crashes. Real case: two HUD mods (Rupee Counter, HUD of Time) put a small
stub into spare space that a character mod's patch also uses.

There was also a fault: where the lower mod writes the game's own byte back over the higher mod's change, that byte
was dropped (the build keeps only the bytes that differ from the game), so the place held a mix of both mods' code.
Emulators write every byte of each patch in order, so there the lower mod's code is used whole.

What changed

The build names every place two patch files write differently, in its log and in both files' notes, and the Mods tab
shows those notes. The lower file's bytes are used whole.

  • nx2/exefs_patches.py: overlaps() (called by collect()): over the files that apply, in the list's order, each
    byte one file writes differently from a file above it; the game's own bytes the lower file writes there go back into
    its writes (a file that was "empty" becomes code or data when it puts bytes back). Notes like "50 of its bytes are
    taken by Rupee Counter lower in the list (main+3C46740-3C46773)" and "... written differently by Characters higher in
    the list; this one's are used (...)", and one log line per pair. parse_file() is classify_file()'s parse, shared.
  • host/mods.c: the Mods tab showed a patch file's note only when the file cannot be applied; it now also shows the
    first note of a file built in (exefs_said, kind_note(), one line in mod_text). kind_note() also drops a
    trailing \r.
  • apply() closes the JSON it reads.

Measurements

Verdict: an offline check with real mods; nothing measured in the game (collect() took 1.3 s with three mods).

With the game's code on build e0f3ccfa, the list Character Select v0.2.1, Rupee Counter v0.9, HUD of Time v1.3 (their
.ips only; collect() only, no build):

exefs: CS/exefs/E0F3CCFAF50065AE4EA01EB5AEB13B1A45DA3348.ips and Rupee Counter/exefs/E0F3CCFAF50065AE4EA01EB5AEB13B1A45DA3348.ips write 50 bytes differently (main+3C46740-3C46773): the lower one's are used, Rupee Counter
exefs: CS/exefs/E0F3CCFAF50065AE4EA01EB5AEB13B1A45DA3348.ips and HUD of Time/exefs/E0F3CCFAF50065AE4EA01EB5AEB13B1A45DA3348.ips write 60 bytes differently (main+3C46700-3C4673F): the lower one's are used, HUD of Time

The Rupee Counter's applied bytes grow from 50 to 58 and HUD of Time's from 60 to 67: the game's own bytes they write
over Character Select's, which #134 dropped.

Flags and settings

None

Testing

Tested:

  • tests/test_exefs_overlaps.py (10 cases, among them the game's own byte written back, which fails on #134)
    and tests/run_all.py on Windows: 539 passed, 25 failed; the same 25 fail on #134's head here.
    tests/test_mods_sizes.py (a built file's note on the Mods tab) is Linux only; it was run on Windows through a copy
    that builds it over llvm-mingw's Win32 instead of the posix layer: passes.

  • In the game, Windows 11, RTX 3090 (driver 610.88), a build of #134's head with this branch (and the other follow-ups) merged in, four mods with patch files, two of them made for the test and writing main+3C46200 (unused padding) differently: the build's log says ... write 4 bytes differently (main+3C46200-3C46203): the lower one's are used, clash-test-b, and the Mods tab's note of the higher one says its 4 bytes are taken by the lower one, the lower one's that this one's are used, each with the place. The other two mods' rows read as before and the game plays.

Not tested: tests/test_mods_sizes.py on Linux; two real mods that clash, played (the pair at hand overwrite each other's code, so one of them cannot work: the note is what this adds).

Must be tested:

  • Linux: python -I -B tests/test_mods_sizes.py, expecting its three PASS lines (Test Farm: @Beanstalk linux, tests/test_mods_sizes.py).

Risks

What could break: a note longer than the Mods tab's field is cut (160 characters). A build with mods that clash
now uses the lower mod's bytes whole where it used a mix; a mod that "worked" only by that mix would change.

Turning it off: revert the commits.

Compatibility: nothing for players without clashing mods; with clashing mods the lift's key changes once (the
applied bytes change).

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). (Main session: search it.)
  • 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. (Stacked on #134.)
  • 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.
  • A game-free test added for the fix, failing on main and passing here.
  • Host code builds on both Windows (llvm-mingw) and Linux, with UTF-8 paths. (Compiled on Windows only inside the
    test copy above; no full build.)
**Type:** feat · **Risk:** low · **Tested on:** Windows 11, RTX 3090 (in the game, and the game-free checks) · **Needs:** Linux, any GPU: one game-free test ## Why When two code mods change the same place in the game's code, #134 uses the bytes of the one lower in the list and says nothing: a player has no way to know that one of their mods is partly overwritten, which is the first thing to know when a mod "does nothing" or the game crashes. Real case: two HUD mods (Rupee Counter, HUD of Time) put a small stub into spare space that a character mod's patch also uses. There was also a fault: where the lower mod writes the game's own byte back over the higher mod's change, that byte was dropped (the build keeps only the bytes that differ from the game), so the place held a mix of both mods' code. Emulators write every byte of each patch in order, so there the lower mod's code is used whole. ## What changed The build names every place two patch files write differently, in its log and in both files' notes, and the Mods tab shows those notes. The lower file's bytes are used whole. - `nx2/exefs_patches.py`: `overlaps()` (called by `collect()`): over the files that apply, in the list's order, each byte one file writes differently from a file above it; the game's own bytes the lower file writes there go back into its writes (a file that was "empty" becomes code or data when it puts bytes back). Notes like "50 of its bytes are taken by Rupee Counter lower in the list (main+3C46740-3C46773)" and "... written differently by Characters higher in the list; this one's are used (...)", and one log line per pair. `parse_file()` is `classify_file()`'s parse, shared. - `host/mods.c`: the Mods tab showed a patch file's note only when the file cannot be applied; it now also shows the first note of a file built in (`exefs_said`, `kind_note()`, one line in `mod_text`). `kind_note()` also drops a trailing `\r`. - `apply()` closes the JSON it reads. ## Measurements **Verdict:** an offline check with real mods; nothing measured in the game (collect() took 1.3 s with three mods). With the game's code on build e0f3ccfa, the list Character Select v0.2.1, Rupee Counter v0.9, HUD of Time v1.3 (their `.ips` only; collect() only, no build): ``` exefs: CS/exefs/E0F3CCFAF50065AE4EA01EB5AEB13B1A45DA3348.ips and Rupee Counter/exefs/E0F3CCFAF50065AE4EA01EB5AEB13B1A45DA3348.ips write 50 bytes differently (main+3C46740-3C46773): the lower one's are used, Rupee Counter exefs: CS/exefs/E0F3CCFAF50065AE4EA01EB5AEB13B1A45DA3348.ips and HUD of Time/exefs/E0F3CCFAF50065AE4EA01EB5AEB13B1A45DA3348.ips write 60 bytes differently (main+3C46700-3C4673F): the lower one's are used, HUD of Time ``` The Rupee Counter's applied bytes grow from 50 to 58 and HUD of Time's from 60 to 67: the game's own bytes they write over Character Select's, which #134 dropped. ### Flags and settings None ## Testing **Tested:** - `tests/test_exefs_overlaps.py` (10 cases, among them the game's own byte written back, which fails on #134) and `tests/run_all.py` on Windows: 539 passed, 25 failed; the same 25 fail on #134's head here. `tests/test_mods_sizes.py` (a built file's note on the Mods tab) is Linux only; it was run on Windows through a copy that builds it over llvm-mingw's Win32 instead of the posix layer: passes. - In the game, Windows 11, RTX 3090 (driver 610.88), a build of #134's head with this branch (and the other follow-ups) merged in, four mods with patch files, two of them made for the test and writing main+3C46200 (unused padding) differently: the build's log says `... write 4 bytes differently (main+3C46200-3C46203): the lower one's are used, clash-test-b`, and the Mods tab's note of the higher one says its 4 bytes are taken by the lower one, the lower one's that this one's are used, each with the place. The other two mods' rows read as before and the game plays. **Not tested:** `tests/test_mods_sizes.py` on Linux; two real mods that clash, played (the pair at hand overwrite each other's code, so one of them cannot work: the note is what this adds). **Must be tested:** - Linux: `python -I -B tests/test_mods_sizes.py`, expecting its three PASS lines (Test Farm: @Beanstalk linux, tests/test_mods_sizes.py). ## Risks **What could break:** a note longer than the Mods tab's field is cut (160 characters). A build with mods that clash now uses the lower mod's bytes whole where it used a mix; a mod that "worked" only by that mix would change. **Turning it off:** revert the commits. **Compatibility:** nothing for players without clashing mods; with clashing mods the lift's key changes once (the applied bytes change). ## Checklist ### Everyone - [x] One topic. - [x] 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). (Main session: search it.) - [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. - [ ] Rebased on current `main`. (Stacked on #134.) - [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. - [x] A game-free test added for the fix, failing on `main` and passing here. - [ ] Host code builds on both Windows (llvm-mingw) and Linux, with UTF-8 paths. (Compiled on Windows only inside the test copy above; no full build.)
Mods that each grow files (HD texture packs) could not be combined: only one
resource size table was used. Hookshot now merges every enabled mod's table
into the game's at start (the button prompts' entries kept) and raises the
entry of every file a mod serves to fit its size (host/mods.c, host/restbl.c,
host/zs.c). #2270's merge of the prompts' entries into the winning mod's table
stays as the fallback when no merged table can be made.

The Insert menu gets a Mods tab (shown only when there are mods): each mod on
or off and its place in the list, kept in hookshot_mods.txt and applied at the
next start (the restart question names them), and the cheats of the enabled
mods, switched at once.

ExeFS patches (IPS, IPS32, IPSwitch .pchtxt) are applied to main's image when
the game is built (nx2/exefs_patches.py, nx2/image.py), so the code is
translated from the patched instructions; a write into the padding after the
code (a code cave) makes it code. exefs_patches.txt in the game folder lists
what a build applied; the Mods tab says when a patch waits for a build.

Atmosphere cheat-code files (separate from the Debug tab's built-in cheats)
run in a cheat VM after dmnt's (host/cheats.c), every presented frame, on
guest memory the game was given; cheats that write the game's code are
listed as not supported.

The list, order and switches, the size table's merge, the patch formats and
the cheat VM follow valentderah/totk-pc-recomp (MIT), whose notice is kept in
host/restbl.h and nx2/exefs_patches.py.

Co-authored-by: Valiantsin Dzerakh <[email protected]>
Co-authored-by: conongnang <[email protected]>
Co-Authored-By: Claude Opus 5.5 <[email protected]>
The control bridge's bridge_fill names each MenuTab and checks the count: with the Mods tab
added before Debug, its table needs "mods" there.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
The compact bar (added to main after the Mods tab was written) draws the
selected row of the current tab. The Mods tab has no such rows: its lines come
from the host. With the bar asked for on the Mods tab the full page is drawn.

Co-Authored-By: Claude Fable 5.2 <[email protected]>
- hos_mods_file gives prompts.c no table when the merged one is served.
- A mod that is off: its ExeFS files are not counted as waiting for a build
  (the Mods tab's text and the log's line).
- The Mods tab's texts and longshot_mods.txt's header say Longshot.
- A Restart or Quit waiting for its second press is cleared on the Mods tab.
- The merged size table: a mod file whose path is in another case than the
  game's takes the game's entry (looked up only when the mod's own case
  misses the table).
- exefs_patches.py: bytes into a relocated word are left out and the file's
  note says so; the comment on DT_RELR words says what happens.
- The compact bar on the Mods tab dims the game behind, as the full menu.

Co-Authored-By: Claude Fable 5.2 <[email protected]>
Co-Authored-By: Claude Fable 5.2 <[email protected]>
The test cuts restart_values out of vk_menu.cpp; with the Mods tab that
function also fills the mods' slot, so the harness declares the slot (none
here), can_mods and the host's mods_changed beside its pad_raw.

Co-Authored-By: Claude Fable 5.2 <[email protected]>
docs(mods): the file contract's document and its example follow the Mods tab, the merged table and ExeFS patches
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
5192b46f4b
docs/mods.md (from #93) describes the loader as it was: ExeFS left out, one
mod's size table, no Mods tab. With this branch an exefs folder's patches
belong to the build, the size table is merged at a start, and the Mods tab's
longshot_mods.txt can change the order and the switches; without that file
the order is the documented one. The example's check for the old ExeFS log
line now looks for the line that lists the mod with its ExeFS folder.

Co-Authored-By: Claude Fable 5.2 <[email protected]>
Where two patch files write the same byte, the one lower in the list won,
and nobody was told. collect() now names every such place (overlaps): in the
build's log, and in both files' notes in exefs_patches.txt ("120 of its bytes
are taken by HUD lower in the list (main+...)" / "... written differently by
Characters higher in the list; this one's are used"), where the Mods tab can
show it.

The lower file now also wins where it writes the game's own byte back over a
higher file's change. Main.classify leaves out the bytes a file writes that
equal the game's, so such a byte was not applied and the higher file's byte
stayed: a mix of two mods' code that neither wrote. Those bytes are put back
into the lower file's writes, and a file that was "empty" (every byte the
game's) becomes code or data when it puts bytes back.

Modelled on a real case: two HUD mods put a stub inside the range a
character mod's patch writes. parse_file() is classify_file()'s parse, shared.

apply() closes the JSON it reads.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
exefs_patches.txt has a note for each patch file; the Mods tab showed it only
for a file that cannot be applied. It now also shows the first note of a file
built into the game (two mods writing one place, bytes left out of a
relocated word), as "ExeFS: <note>.". kind_note() reads the note for both and
drops a trailing \r (a list saved with Windows line ends).

tests/test_mods_sizes.py: a built file's note on the Mods tab.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
feat(mods): a place two mods write differently is not split by a byte they write alike
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
1615b98ce2
The notes named a run of differing bytes as a place, so one stub came out as
three places where a byte in it happened to be the same in both mods. A run
now goes on over up to 3 bytes written alike (within an instruction): the
Rupee Counter's stub against Character Select's patch reads main+3C46740-3C46773
where it read three places.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Author
Contributor

Tested in game: Windows 11, RTX 3090 (driver 610.88), a build of #134's head 5192b46f with this branch merged in, four mods with patch files, two of them writing main+3C46200 differently, the F1 menu's Mods tab: the build's log names the 4 bytes and the mod whose bytes are used, and each of the two mods' notes on the tab names the other and the place; the game plays with the other mods as before. This branch is stacked on #134 (it depends on it), so the diff shows #134's commits too until that merges.

Tested in game: Windows 11, RTX 3090 (driver 610.88), a build of #134's head 5192b46f with this branch merged in, four mods with patch files, two of them writing main+3C46200 differently, the F1 menu's Mods tab: the build's log names the 4 bytes and the mod whose bytes are used, and each of the two mods' notes on the tab names the other and the place; the game plays with the other mods as before. This branch is stacked on #134 (it depends on it), so the diff shows #134's commits too until that merges.
snaildev99 force-pushed mods/exefs-clashes from 1615b98ce2
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
to 6e6c5231ce
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
Website / Website on Cloudflare (pull_request) Has been cancelled
2026-11-16 02:50:45 +00:00
Compare
Author
Contributor

Moved onto #134's new head fafc7ab2 (it was rebased onto main @ 343a1dfa): head 6e6c5231. No conflict, no change in this branch's own files; its tests pass. Not built or played at this head.

Moved onto #134's new head fafc7ab2 (it was rebased onto main @ 343a1dfa): head 6e6c5231. No conflict, no change in this branch's own files; its tests pass. Not built or played at this head.
snaildev99 force-pushed mods/exefs-clashes from 6e6c5231ce
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
Website / Website on Cloudflare (pull_request) Has been cancelled
to dc5998f247
Some checks failed
PR description / Description follows the template (pull_request_target) Successful in 10s
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-16 04:27:28 +00:00
Compare
Author
Contributor

Moved onto #134's new head fb2a419c (rebased onto main @ e4d035e9; the Mods tab's functions are API version 25 there, after main's audio outputs): head dc5998f2. No conflict, no change in this branch's own files; its tests pass at this head. Not built or played at it.

Moved onto #134's new head fb2a419c (rebased onto main @ e4d035e9; the Mods tab's functions are API version 25 there, after main's audio outputs): head dc5998f2. No conflict, no change in this branch's own files; its tests pass at this head. Not built or played at it.
snaildev99 force-pushed mods/exefs-clashes from dc5998f247
Some checks failed
PR description / Description follows the template (pull_request_target) Successful in 10s
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 387174a042
Some checks failed
PR description / Description follows the template (pull_request_target) Successful in 7s
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-16 10:11:33 +00:00
Compare
Author
Contributor

Moved onto #134's new head 3fbc327a (the list of mods is mods.json there now: #134 (comment)). Head 387174a0.

Two small conflicts in nx2/exefs_patches.py (the lines above collect, and the module docstring where both changed neighbouring lines); both sides kept. One commit on top: tests/test_exefs_overlaps.py writes mods.json, and #134's tests/test_mods_list.py stubs parse_file for its run (it gives collect no game image).

tests/run_all.py on Windows: nothing fails that #134's head passes. Not built or played at this head; the Linux halves of the changed fixtures were read, not run.

Moved onto #134's new head 3fbc327a (the list of mods is `mods.json` there now: https://git.magicbean.dev/MagicBeanDev/Longshot/pulls/134#issuecomment-34804). Head **387174a0**. Two small conflicts in `nx2/exefs_patches.py` (the lines above `collect`, and the module docstring where both changed neighbouring lines); both sides kept. One commit on top: `tests/test_exefs_overlaps.py` writes `mods.json`, and #134's `tests/test_mods_list.py` stubs `parse_file` for its run (it gives `collect` no game image). `tests/run_all.py` on Windows: nothing fails that #134's head passes. Not built or played at this head; the Linux halves of the changed fixtures were read, not run.
snaildev99 force-pushed mods/exefs-clashes from 387174a042
Some checks failed
PR description / Description follows the template (pull_request_target) Successful in 7s
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 62dd499199
Some checks failed
PR description / Description follows the template (pull_request_target) Successful in 8s
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-16 11:11:24 +00:00
Compare
Author
Contributor

Moved onto #134's new head 2b52cd1b (#134 was rebased onto main @ 8a4aa282: the Mods tab's functions are API version 26, and the patches' hash is named in the lift's key after main's #22: #134 (comment)). Head 62dd4991.

No conflict; the commits are unchanged. It sets nothing of its own for the lift.

tests/run_all.py on Windows: nothing fails that #134's head passes. Not built or played at this head.

Moved onto #134's new head 2b52cd1b (#134 was rebased onto main @ 8a4aa282: the Mods tab's functions are API version 26, and the patches' hash is named in the lift's key after main's #22: https://git.magicbean.dev/MagicBeanDev/Longshot/pulls/134#issuecomment-35102). Head **62dd4991**. No conflict; the commits are unchanged. It sets nothing of its own for the lift. `tests/run_all.py` on Windows: nothing fails that #134's head passes. Not built or played at this head.
snaildev99 force-pushed mods/exefs-clashes from 62dd499199
Some checks failed
PR description / Description follows the template (pull_request_target) Successful in 8s
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 4d5f28fc5c
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 / As their notes say (pull_request) Blocked by required conditions
Third-party parts / The same as upstream (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 6s
2026-11-16 19:47:37 +00:00
Compare
Author
Contributor

Moved onto #134's new head c5cead8d (#134 was rebased onto main @ ac778751 and brings main's new players' mods guide in line with it: #134 (comment)). Head 4d5f28fc.

No conflict; the commits are unchanged.

Nothing fails in tests/run_all.py on Windows that #134's head passes. Not built or played at this head.

Moved onto #134's new head c5cead8d (#134 was rebased onto main @ ac778751 and brings main's new players' mods guide in line with it: https://git.magicbean.dev/MagicBeanDev/Longshot/pulls/134#issuecomment-37590). Head **4d5f28fc**. No conflict; the commits are unchanged. Nothing fails in `tests/run_all.py` on Windows that #134's head passes. Not built or played at this head.
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 / As their notes say (pull_request) Blocked by required conditions
Third-party parts / The same as upstream (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 6s
This pull request is marked as a work in progress.
Some workflows are waiting to be reviewed.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u 'mods/exefs-clashes:snaildev99-mods/exefs-clashes'
git switch 'snaildev99-mods/exefs-clashes'
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
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!961
No description provided.