From a211c4cb3e4adb45834b7d50eedb376ac9d80eac Mon Sep 17 00:00:00 2001 From: ProSep <9l0mhe7e@prosep.anonaddy.me> Date: Sun, 1 Nov 2026 04:14:56 +0100 Subject: [PATCH] Keep the game's level for one-level models in the lod patch set The level picker returns 0 for a model with one level, and the emulator mod returned the floor at its parameters' +0x28 for those too, without checking it against the level count; a floor above 0 would index past the one-level list. The site now masks the floor to 0 when the count is 1, without flags (a site may use them once), and every other model still takes the early return with the floor. Co-Authored-By: Claude Opus 5.5 --- recomp/patches-v121.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/recomp/patches-v121.txt b/recomp/patches-v121.txt index 1080026f..3f64f7a3 100644 --- a/recomp/patches-v121.txt +++ b/recomp/patches-v121.txt @@ -83,13 +83,15 @@ site aspect main 1ecdf68 1e211800 f81f0fea @page:x10 bd403940 f84107ea # fdiv s # Distant detail, after the emulator mods "LOD Improvement v2" (theboy181, sweetmini) and "Disable LOD Quality # Reduction" (main-1.2.1.pchtxt). Those turn a conditional branch into an unconditional one; the generator patches -# only plain instructions (recomp/gen.py, the emitter's patch), so these sites feed the branch instead, with the same effect. +# only plain instructions (recomp/gen.py, the emitter's patch), so these sites feed the branch instead. # Model level of detail: the level picker main+0x27d225c (a virtual method, vtable slot at data 0x43723f0) returns the # floor at its parameters' +0x28 when the distance term is past the threshold, and otherwise interpolates towards the -# coarsest level; a one-level model returns count - 1 at once. Here every model takes that early return with the floor -# in w0, so distant models keep the detail they have up close. +# coarsest level; a one-level model returns count - 1 (0) at once. Here every model takes that early return, with the +# floor in w0, so distant models keep the detail they have up close. Unlike the mod, a one-level model still returns 0: +# the floor is not checked against the level count, and an index past a one-level list would read past its end. set lod TOTK_LOD_DETAIL 0 -site lod main 27d2264 71000520 b9402840 6b00001f # subs w0, w9, #1 -> ldr w0, [x2, #0x28]; cmp w0, w0 (b.eq taken) +# A site may use the flags only once, so the one-level case is a mask (all ones unless count - 1 is 0) on the floor. +site lod main 27d2264 71000520 5100052b 4b0b03ec 2a0b018c 131f7d8c b9402840 0a0c0000 6b00001f # subs w0, w9, #1 -> sub w11, w9, #1; neg w12, w11; orr w12, w12, w11; asr w12, w12, #31; ldr w0, [x2, #0x28]; and w0, w0, w12; cmp w0, w0 (b.eq taken) # Load-dependent quality: the graphics settings setup (main+0xc7e9xx, it also reads the FSR and FXAA switches) walks a # list at its +0x120 and passes three floats of each entry to virtual setters, which the mod describes as the drop of # model and texture detail when the frame rate falls; it skips all of it, to the epilogue, when the value it reads at