From 354e96122c03bfd75e1181907b5fd440e8fb515c Mon Sep 17 00:00:00 2001
From: ManDude <7569514+ManDude@users.noreply.github.com>
Date: Sat, 18 Jun 2022 18:51:09 +0100
Subject: [PATCH] `yakow` PAL patch

---
 .../anonymous_function_types.jsonc            |  2 +
 decompiler/config/jak1_pal.jsonc              |  2 +-
 decompiler/config/jak1_pal/label_types.jsonc  | 65 +++----------------
 goal_src/levels/village1/yakow.gc             | 27 ++++++--
 4 files changed, 34 insertions(+), 62 deletions(-)

diff --git a/decompiler/config/jak1_ntsc_black_label/anonymous_function_types.jsonc b/decompiler/config/jak1_ntsc_black_label/anonymous_function_types.jsonc
index ce9fd6224c..286c51ef15 100644
--- a/decompiler/config/jak1_ntsc_black_label/anonymous_function_types.jsonc
+++ b/decompiler/config/jak1_ntsc_black_label/anonymous_function_types.jsonc
@@ -890,5 +890,7 @@
 
   "seagull": [[30, "(function process symbol)"]],
 
+  "yakow": [[29, "(function none :behavior process)"]],
+
   "placeholder-do-not-add-below": []
 }
diff --git a/decompiler/config/jak1_pal.jsonc b/decompiler/config/jak1_pal.jsonc
index 4e165a73b8..29e05429d8 100644
--- a/decompiler/config/jak1_pal.jsonc
+++ b/decompiler/config/jak1_pal.jsonc
@@ -6,7 +6,7 @@
 
   // if you want to filter to only some object names.
   // it will make the decompiler much faster.
-  "allowed_objects": ["process-taskable"],
+  "allowed_objects": ["yakow", "village1cam-ag", "yakow-ag"],
   "banned_objects": [],
 
   ////////////////////////////
diff --git a/decompiler/config/jak1_pal/label_types.jsonc b/decompiler/config/jak1_pal/label_types.jsonc
index ddcf1d986e..64195d0190 100644
--- a/decompiler/config/jak1_pal/label_types.jsonc
+++ b/decompiler/config/jak1_pal/label_types.jsonc
@@ -365,11 +365,6 @@
     ["L121", "vu-function"]
   ],
 
-  "load-boundary": [
-    ["L327", "(inline-array lbvtx)", 12],
-    ["L324", "vector"]
-  ],
-
   "default-menu": [
     ["L6251", "float", true],
     ["L6252", "float", true],
@@ -760,56 +755,6 @@
     ["L910", "uint64", true]
   ],
 
-  "cam-debug": [
-    ["L174", "vector4w"],
-    ["L175", "vector4w"],
-    ["L176", "vector4w"],
-    ["L177", "vector4w"],
-    ["L178", "vector4w"],
-    ["L209", "vector4w"],
-    ["L210", "vector4w"],
-    ["L211", "vector4w"],
-    ["L212", "vector4w"],
-    ["L213", "vector4w"],
-    ["L214", "vector4w"],
-    ["L215", "vector4w"],
-    ["L216", "vector4w"],
-    ["L217", "vector4w"],
-    ["L218", "vector4w"],
-    ["L219", "vector4w"],
-    ["L220", "vector4w"],
-    ["L221", "vector4w"],
-    ["L222", "vector4w"],
-    ["L223", "vector4w"],
-    ["L224", "vector4w"],
-    ["L225", "vector4w"],
-    ["L226", "vector4w"],
-    ["L227", "vector4w"],
-    ["L228", "vector4w"],
-    ["L229", "vector4w"],
-    ["L230", "vector4w"],
-    ["L231", "vector4w"],
-    ["L232", "vector4w"],
-    ["L233", "vector4w"],
-    ["L234", "vector4w"],
-    ["L239", "vector4w"],
-    ["L240", "vector4w"],
-    ["L241", "vector4w"],
-    ["L242", "vector4w"],
-    ["L243", "vector"],
-    ["L244", "vector"],
-    ["L245", "vector4w"],
-    ["L246", "vector"],
-    ["L247", "vector"],
-    ["L254", "vector"],
-    ["L255", "vector"],
-    ["L256", "vector"],
-    ["L257", "vector"],
-    ["L263", "vector4w"]
-  ],
-
-  "sparticle-launcher": [["L192", "adgif-shader"]],
-
   "process-taskable": [["L251", "attack-info"]],
 
   "babak-with-cannon": [["L92", "vector"]],
@@ -2145,6 +2090,16 @@
     ["L328", "vector2h"]
   ],
 
+  //"sparticle-launcher": [["L192", "adgif-shader"]],
+
+  "load-boundary": [
+    //["L327", "(inline-array lbvtx)", 12],
+    //["L324", "vector"]
+  ],
+
+  "cam-debug": [
+  ],
+
   // please do not add things after this entry! git is dumb.
   "object-file-that-doesnt-actually-exist-and-i-just-put-this-here-to-prevent-merge-conflicts-with-this-file": []
 }
diff --git a/goal_src/levels/village1/yakow.gc b/goal_src/levels/village1/yakow.gc
index 7005f335e9..79c329f8d7 100644
--- a/goal_src/levels/village1/yakow.gc
+++ b/goal_src/levels/village1/yakow.gc
@@ -204,12 +204,27 @@ yakow-default-event-handler
           (if gp-0
               (yakow-cam)
               )
-          (level-hint-spawn
-            (game-text-id yakow-owed-powercell)
-            "sksp018a"
-            (the-as entity #f)
-            *entity-pool*
-            (game-task none)
+          ;; 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
+                (game-text-id yakow-owed-powercell)
+                "sksp018a"
+                (the-as entity #f)
+                *entity-pool*
+                (game-task none)
+                )
+              (none)
+              )
+            :to self
             )
           )
         (else