mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-18 09:09:56 -04:00
Move the sprint button's stance host off the water ripples' patch page slot, and fix how presses and timings reach it.
The stance site called page +0xf50, which the 0.10.0 line gives the water ripples above 60 fps: the second registration ends every 1.1.1 start with "registered twice", the sprint button off included. It calls +0xf30 now, and the comments say which slots the other sets hold. The set's switch is NX2NAVI_SPRINT_BUTTON_PATCH, not a name another open request uses for a set of its own. The stand-still timings count 60 Hz frames (frame_step_frames), so a toggled sprint no longer ends on a short stop at high frame rates. A press is decided at its start for its whole length: kept from the game and the sprint's when it begins in gameplay (B: while Link moves), else the game's alone, so a held B is not handed to the game half way and a B that closes the pause menu starts no sprint. A sprint switched off with the button setting does not come back by itself, Link's state is read only where the memory is readable, and the row, nx2navi.ini.example and the controls page say that B is the jump under the game's Swap Jump Controls and name the button without assuming the layout. tests\sprint_check.py covers the press latch, the menu press, 240 fps and the switch-off. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -25,10 +25,14 @@ int rt_patch_enabled(int set) { return set == 3 && set_on; }
|
||||
void rt_patch_switch(int set, int on) { assert(set == 3); set_on = on != 0; }
|
||||
void rt_register_host(uint64_t addr, GuestFn fn) {
|
||||
if (addr == RT_PATCH_PAGE + 0xf40) link_fn = fn;
|
||||
else if (addr == RT_PATCH_PAGE + 0xf50) stance_fn = fn;
|
||||
else if (addr == RT_PATCH_PAGE + 0xf30) stance_fn = fn;
|
||||
else abort();
|
||||
}
|
||||
|
||||
static float step = 1.0f; // frame_step_frames: the 60 Hz frames of one update of Link
|
||||
float frame_step_frames(void) { return step; }
|
||||
int mem_readable(uint64_t a, uint64_t n) { (void)n; return a != 0; }
|
||||
|
||||
// Link: vtable, +0x18 -> owner whose +0x270 -> a with +0x188 -> b with +0x1c0 -> the state, id at +0x28
|
||||
static uint64_t link[8], owner[0x50], a[0x40], b[0x40], state_obj[0x20], other[8];
|
||||
static uint64_t manager[0x90], controlled[8];
|
||||
@@ -72,7 +76,7 @@ int main(int argc, char **argv) {
|
||||
test_main_base = (uintptr_t)img;
|
||||
assert(link_fn && stance_fn);
|
||||
if (argc > 1 && !strcmp(argv[1], "kept-off")) {
|
||||
// off at the start (NX2NAVI_SPRINT_PATCH=0, or a mod patching its sites): no rows, never switched on, and the
|
||||
// off at the start (NX2NAVI_SPRINT_BUTTON_PATCH=0, or a mod patching its sites): no rows, never switched on, and the
|
||||
// button always reaches the game
|
||||
set_on = 0, button = "l3";
|
||||
assert(!sprint_available());
|
||||
@@ -202,6 +206,45 @@ int main(int argc, char **argv) {
|
||||
assert(frame(0, WALK, link) == 0 && !dashing());
|
||||
frame(0, WAIT_ID, link);
|
||||
assert(frame(BB, WAIT_ID, link) == BB && !dashing());
|
||||
// a press begun while standing stays the game's for its whole length, also once Link moves: no sprint, no strip
|
||||
assert(frame(BB, WALK, link) == BB && !dashing());
|
||||
assert(frame(BB, WALK, link) == BB && !dashing());
|
||||
frame(0, WALK, link);
|
||||
// a press begun while moving stays the sprint's when Link stops: the game gets no B from it
|
||||
assert(frame(BB, WALK, link) == 0 && dashing());
|
||||
assert(frame(BB, WAIT_ID, link) == 0);
|
||||
frame(0, WAIT_ID, link);
|
||||
|
||||
// a press made in a menu (no update of Link for more than 8 polls) starts nothing when play goes on
|
||||
reset("l3", "toggle");
|
||||
frame(0, WALK, link);
|
||||
{
|
||||
uint64_t bt = 0;
|
||||
for (int i = 0; i < 10; i++) bt = 0, sprint_pad(&bt);
|
||||
bt = L3, sprint_pad(&bt);
|
||||
assert(bt == L3); // the menu's
|
||||
bt = 0, sprint_pad(&bt);
|
||||
}
|
||||
frame(0, WALK, link);
|
||||
assert(!dashing());
|
||||
|
||||
// the stand-still timings count 60 Hz frames: at 240 fps (a quarter frame an update) a stop of four updates goes on
|
||||
reset("l3", "toggle");
|
||||
step = 0.25f;
|
||||
frame(L3, WALK, link), frame(0, WALK, link);
|
||||
for (int i = 0; i < 4; i++) frame(0, WAIT_ID, link);
|
||||
assert(dashing());
|
||||
for (int i = 0; i < 16; i++) frame(0, WAIT_ID, link);
|
||||
assert(!dashing());
|
||||
step = 1.0f;
|
||||
|
||||
// switched off with the sprint on, and on again: it does not come back by itself
|
||||
reset("l3", "toggle");
|
||||
frame(L3, WALK, link), frame(0, WALK, link);
|
||||
assert(dashing());
|
||||
button = "off", frame(0, WALK, link);
|
||||
button = "l3", frame(0, WALK, link);
|
||||
assert(!dashing());
|
||||
|
||||
puts("sprint_check: ok");
|
||||
free(img);
|
||||
|
||||
Reference in New Issue
Block a user