intro diagnostic and runtime patches

runtime/include/nd_intro_ot.h

@@ -0,0 +1,24 @@
+/* nd_intro_ot.h — CTR Naughty Dog intro OT helpers (debug / accuracy shims). */
+#ifndef PSXRECOMP_ND_INTRO_OT_H
+#define PSXRECOMP_ND_INTRO_OT_H
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Last WoodEmit batch OT base (model+228). Prefer digit-rain tags. */
+void     psx_nd_note_wood_batch_ot(uint32_t base);
+void     psx_nd_note_wood_batch_ot_tagged(uint32_t base, uint32_t tag);
+uint32_t psx_nd_wood_batch_ot(void);
+
+/* Sibling-scene bump hint at s4+0xb4 (captured at NdIntroSiblingRtptEmit). */
+void     psx_nd_note_sibling_ot_hint(uint32_t base);
+uint32_t psx_nd_sibling_ot_hint(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

runtime/src/nd_intro_ot.c

@@ -0,0 +1,56 @@
+/* nd_intro_ot.c — CTR ND intro OT batch base cache for sibling flap depth. */
+#include "nd_intro_ot.h"
+
+static uint32_t s_wood_batch_ot;
+static uint32_t s_wood_batch_ot_code;
+static uint32_t s_wood_batch_ot_glow;
+static uint32_t s_wood_batch_ot_box;
+static uint32_t s_sibling_ot_hint;
+
+static int looks_like_ot_base(uint32_t base)
+{
+    /* Wood batch OTs sit in gameplay RAM below the main OT windows. */
+    return base >= 0x800F0000u && base < 0x800F8000u && (base & 3u) == 0u;
+}
+
+void psx_nd_note_wood_batch_ot(uint32_t base)
+{
+    if (looks_like_ot_base(base))
+        s_wood_batch_ot = base;
+}
+
+void psx_nd_note_wood_batch_ot_tagged(uint32_t base, uint32_t tag)
+{
+    if (!looks_like_ot_base(base))
+        return;
+    s_wood_batch_ot = base;
+    /* Prefer CODE (digit rain) > GLOW > BOX_ for sibling OT rewrite. */
+    if (tag == 0x45444F43u) /* CODE */
+        s_wood_batch_ot_code = base;
+    else if (tag == 0x574F4C47u) /* GLOW */
+        s_wood_batch_ot_glow = base;
+    else if (tag == 0x5F584F42u) /* BOX_ */
+        s_wood_batch_ot_box = base;
+}
+
+uint32_t psx_nd_wood_batch_ot(void)
+{
+    if (s_wood_batch_ot_code)
+        return s_wood_batch_ot_code;
+    if (s_wood_batch_ot_glow)
+        return s_wood_batch_ot_glow;
+    if (s_wood_batch_ot_box)
+        return s_wood_batch_ot_box;
+    return s_wood_batch_ot;
+}
+
+void psx_nd_note_sibling_ot_hint(uint32_t base)
+{
+    if (looks_like_ot_base(base))
+        s_sibling_ot_hint = base;
+}
+
+uint32_t psx_nd_sibling_ot_hint(void)
+{
+    return s_sibling_ot_hint;
+}