From 0b021d1be1ab8139d9c4de9a1cef308d6a1defd6 Mon Sep 17 00:00:00 2001 From: water111 <48171810+water111@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:41:59 -0400 Subject: [PATCH] [jak2] fix nav typo (#2430) add -> multiply. Fixes https://github.com/open-goal/jak-project/issues/2429 --- game/mips2c/jak2_functions/nav_control.cpp | 6 +++--- goal_src/jak2/engine/target/target2.gc | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/game/mips2c/jak2_functions/nav_control.cpp b/game/mips2c/jak2_functions/nav_control.cpp index 50ac2adaa1..981e4317e8 100644 --- a/game/mips2c/jak2_functions/nav_control.cpp +++ b/game/mips2c/jak2_functions/nav_control.cpp @@ -124,13 +124,13 @@ u64 execute(void* ctxt) { acc = c->fprs[f16] * c->fprs[f16]; // nop // sll r0, r0, 0 // Unknown instr: madda.s f2, f17 - acc += c->fprs[f2] + c->fprs[f17]; + acc += c->fprs[f2] * c->fprs[f17]; // nop // sll r0, r0, 0 // Unknown instr: madda.s f4, f18 - acc += c->fprs[f4] + c->fprs[f18]; + acc += c->fprs[f4] * c->fprs[f18]; // nop // sll r0, r0, 0 // Unknown instr: madda.s f6, f19 - acc += c->fprs[f6] + c->fprs[f19]; + acc += c->fprs[f6] * c->fprs[f19]; // nop // sll r0, r0, 0 // Unknown instr: madd.s f22, f8, f20 c->fprs[f22] = acc + (c->fprs[f8] * c->fprs[f20]); diff --git a/goal_src/jak2/engine/target/target2.gc b/goal_src/jak2/engine/target/target2.gc index db0146a92a..03154b6b38 100644 --- a/goal_src/jak2/engine/target/target2.gc +++ b/goal_src/jak2/engine/target/target2.gc @@ -1691,7 +1691,8 @@ :trans (behavior () (set! (-> self control time-of-last-debug-float) (-> self clock frame-counter)) (cond - ((cpad-hold? (-> self control cpad number) r2) + ((and (cpad-hold? (-> self control cpad number) r2) + (not *pause-lock*)) ;; no debug hover when paused. (let ((a1-0 (new 'stack-no-clear 'vector))) (set! (-> a1-0 quad) (-> self control trans quad)) (let ((v1-14 (new-stack-vector0))