From e4667607f92eb9ec09e8213dfa91de5199ce0fe3 Mon Sep 17 00:00:00 2001
From: Hat Kid <6624576+Hat-Kid@users.noreply.github.com>
Date: Sat, 18 Apr 2026 23:22:41 +0200
Subject: [PATCH] regressions

---
 goal_src/jak2/engine/anim/joint.gc          | 23 +++++++++++++++++----
 goal_src/jak2/engine/debug/default-menu.gc  |  9 ++++----
 goal_src/jak2/engine/gfx/ocean/ocean-mid.gc |  3 ++-
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/goal_src/jak2/engine/anim/joint.gc b/goal_src/jak2/engine/anim/joint.gc
index 0bd22b57c7..a570830b73 100644
--- a/goal_src/jak2/engine/anim/joint.gc
+++ b/goal_src/jak2/engine/anim/joint.gc
@@ -2046,10 +2046,25 @@
 
 (def-mips2c calc-animation-from-spr (function joint-anim-frame int none))
 
-(defun create-interpolated-joint-animation-frame ((dst joint-anim-frame) (num-joints int) (jc joint-control))
-  (flatten-joint-control-to-spr jc)
-  (make-joint-jump-tables)
-  (calc-animation-from-spr dst num-joints)
+;; og:preserve-this
+(defun create-interpolated-joint-animation-frame ((output-frame joint-anim-frame) (arg1 int) (arg2 joint-control))
+  (let ((start (get-cpu-clock)))
+    (cond
+      (*use-new-decompressor*
+
+        (new-joint-decompressor output-frame arg1 arg2)
+
+        )
+      (else
+        (flatten-joint-control-to-spr arg2)
+        (make-joint-jump-tables)
+        (calc-animation-from-spr output-frame arg1)
+        )
+      )
+    (+! (-> *new-joint-decompressor-stats* total-time)
+        (the int (* 1000000. (cpu-ticks-to-seconds (- (get-cpu-clock) start))))
+        )
+    )
   0
   )
 
diff --git a/goal_src/jak2/engine/debug/default-menu.gc b/goal_src/jak2/engine/debug/default-menu.gc
index dfb0b20194..194b9f5a8e 100644
--- a/goal_src/jak2/engine/debug/default-menu.gc
+++ b/goal_src/jak2/engine/debug/default-menu.gc
@@ -2682,10 +2682,11 @@
                         (logtest? (continue-flags test) (-> (the-as continue-point v1-2) flags))
                         #t
                         )
-                    (set! s5-0 (cons
-                                 (cons 'flag (cons
+                    ;; og:preserve-this cons -> dcons
+                    (set! s5-0 (dcons
+                                 (dcons 'flag (dcons
                                                (-> (the-as continue-point v1-2) name)
-                                               (cons (-> (the-as continue-point v1-2) name) (cons 'dm-current-continue '()))
+                                               (dcons (-> (the-as continue-point v1-2) name) (dcons 'dm-current-continue '()))
                                                )
                                        )
                                  s5-0
@@ -2710,7 +2711,7 @@
           )
         )
       ;; og:preserve-this cons -> dcons
-      (dcons 'menu (cons (symbol->string arg1) a3-5))
+      (dcons 'menu (dcons (symbol->string arg1) a3-5))
       )
     )
   )
diff --git a/goal_src/jak2/engine/gfx/ocean/ocean-mid.gc b/goal_src/jak2/engine/gfx/ocean/ocean-mid.gc
index d86c0d7638..4e7f4e5763 100644
--- a/goal_src/jak2/engine/gfx/ocean/ocean-mid.gc
+++ b/goal_src/jak2/engine/gfx/ocean/ocean-mid.gc
@@ -1012,7 +1012,8 @@
           (while (>= s1-0 s2-0)
             (set! (-> sv-36 x) (+ 196608.0 (* 393216.0 (the float s2-0)) (-> this start-corner x)))
             (set! (-> sv-36 z) (+ 196608.0 (* 393216.0 (the float s4-0)) (-> this start-corner z)))
-            (when (sphere-cull sv-36)
+            ;; og:preserve-this
+            (when (sphere-cull-for-ocean sv-36)
               (cond
                 ((= s4-0 sv-34)
                  (ocean-mid-add-upload-top this arg0 s4-0 s2-0)