From 08650e1e4c86e220bf5258f097fe630188e206bf Mon Sep 17 00:00:00 2001
From: Alex <7569514+ManDude@users.noreply.github.com>
Date: Fri, 17 Oct 2025 20:45:03 +0100
Subject: [PATCH] Fix strange scene-player initial blackout being bad for
 non-zero `artist-base` (#4056)

This fixes the metal head tower resolution cutscene having an awkward
amount of blackout at the start unless the framerate dipped to at least
(most?) 33FPS, since its frame num starts in the negative. There may be
other cutscenes that start at negative or higher than zero, but I don't
know of any (did not check thoroughly as that's boring as hell).

I don't really understand what the purpose of this check is in the first
place to be honest.
---
 goal_src/jak3/engine/scene/scene.gc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/goal_src/jak3/engine/scene/scene.gc b/goal_src/jak3/engine/scene/scene.gc
index ba982d4103..48b04b13de 100644
--- a/goal_src/jak3/engine/scene/scene.gc
+++ b/goal_src/jak3/engine/scene/scene.gc
@@ -1597,7 +1597,7 @@
           )
       )
     (when (and (-> self scene) (nonzero? (-> self skel active-channels)))
-      (when (and (< (ja-aframe-num 0) 2.0)
+      (when (and (< (ja-aframe-num 0) (+ (-> self skel root-channel 0 frame-group artist-base) 2.0)) ;; og:preserve-this account for scenes that have a non-zero artist-base (e.g. mh tower res)
                  (< (-> *display* base-clock frame-counter) (-> *game-info* blackout-time))
                  (logtest? (-> self skel status) (joint-control-status valid-spooled-frame))
                  )