From 21a148f9ea916bde0e4d2e3b21a3088dbcd872f2 Mon Sep 17 00:00:00 2001
From: Hat Kid <6624576+Hat-Kid@users.noreply.github.com>
Date: Tue, 14 Apr 2026 09:34:28 +0200
Subject: [PATCH] regressions

---
 goal_src/jak1/engine/target/target2.gc | 11 +++++------
 goal_src/jak1/levels/village1/yakow.gc | 11 ++++++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/goal_src/jak1/engine/target/target2.gc b/goal_src/jak1/engine/target/target2.gc
index 9d3595ab9f..e8fef19fa7 100644
--- a/goal_src/jak1/engine/target/target2.gc
+++ b/goal_src/jak1/engine/target/target2.gc
@@ -114,7 +114,6 @@
    hud-normal
    hud-waiting))
 
-
 (define *fp-hud-stack* (malloc 'global #x3800))
 
 (defmethod deactivate ((this first-person-hud))
@@ -1656,11 +1655,11 @@
                     (cond
                       ((and sv-44 (< (- (-> (the-as target s4-0) control trans y) (-> (the-as target s4-0) control unknown-vector52 y)) arg2))
                        (vector-xz-normalize! (-> (the-as target s4-0) control transv) (the-as float 0.0))
-                       (case (-> (the-as target s4-0) current-level name)
-                         (('jungleb)
-                          (let ((v1-16 (vector-! (new-stack-vector0) (-> (the-as target s4-0) control trans) sv-40)))
-                            (set! (-> (the-as target s4-0) control trans x) (+ (-> sv-40 x) (fmax -4096.0 (fmin 4096.0 (-> v1-16 x)))))
-                            (set! (-> (the-as target s4-0) control trans z) (+ (-> sv-40 z) (fmax -4096.0 (fmin 4096.0 (-> v1-16 z)))))))))
+                       ;; og:preserve-this PAL patch here
+                       (when (< (vector-vector-xz-distance (-> (the-as target s4-0) control trans) sv-40) 20480.0)
+                         (let ((v1-16 (vector-! (new-stack-vector0) (-> (the-as target s4-0) control trans) sv-40)))
+                           (set! (-> (the-as target s4-0) control trans x) (+ (-> sv-40 x) (fmax -2867.2 (fmin 2867.2 (-> v1-16 x)))))
+                           (set! (-> (the-as target s4-0) control trans z) (+ (-> sv-40 z) (fmax -2867.2 (fmin 2867.2 (-> v1-16 z))))))))
                       (else
                        (if sv-44 (set! sv-32 (current-time)))
                        (set! sv-44 (the-as symbol #f))
diff --git a/goal_src/jak1/levels/village1/yakow.gc b/goal_src/jak1/levels/village1/yakow.gc
index 39375dd9a8..e3eb073fdc 100644
--- a/goal_src/jak1/levels/village1/yakow.gc
+++ b/goal_src/jak1/levels/village1/yakow.gc
@@ -53,7 +53,6 @@
    (min-walk-anim-speed    float)
    (speed-boost-impulse    meters)))
 
-
 (define *YAKOW-bank*
   (new 'static
        'yakow-bank
@@ -113,7 +112,6 @@
    yakow-run-away
    (yakow-walk-to vector)))
 
-
 (defskelgroup *yakow-sg*
   yakow
   yakow-lod0-jg
@@ -156,7 +154,14 @@ yakow-default-event-handler
            (close-specific-task! (-> self entity extra perm task) (task-status need-introduction))
            (close-specific-task! (-> self entity extra perm task) (task-status need-reminder))
            (if gp-0 (yakow-cam))
-           (level-hint-spawn (text-id village1-yakow-resolution) "sksp018a" (the-as entity #f) *entity-pool* (game-task none)))
+           ;; og:preserve-this PAL patch here
+           (process-spawn-function process
+             (lambda :behavior process ()
+               (while (or (-> *setting-control* current ambient) (-> *setting-control* current movie) (-> *setting-control* current hint))
+                 (suspend))
+               (level-hint-spawn (text-id village1-yakow-resolution) "sksp018a" (the-as entity #f) *entity-pool* (game-task none)))
+             :to
+             self))
           (else (open-specific-task! (-> self entity extra perm task) (task-status need-reminder))))
         sv-16))))