From a648b9e37f583ebd64946ad229352eb5381fb789 Mon Sep 17 00:00:00 2001
From: ManDude <7569514+ManDude@users.noreply.github.com>
Date: Sun, 19 Jun 2022 11:43:36 +0100
Subject: [PATCH] `fisher` PAL patch

---
 .../stack_structures.jsonc                    |  2 +
 decompiler/config/jak1_pal.jsonc              |  2 +-
 decompiler/config/jak1_pal/type_casts.jsonc   |  4 +-
 goal_src/levels/jungle/fisher.gc              | 44 +++++++++----------
 4 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/decompiler/config/jak1_ntsc_black_label/stack_structures.jsonc b/decompiler/config/jak1_ntsc_black_label/stack_structures.jsonc
index d77e223b28..eb6772b784 100644
--- a/decompiler/config/jak1_ntsc_black_label/stack_structures.jsonc
+++ b/decompiler/config/jak1_ntsc_black_label/stack_structures.jsonc
@@ -5496,5 +5496,7 @@
     [128, "vector"]
   ],
 
+  "(trans fisher-done)": [[16, "font-context"]],
+
   "placeholder-do-not-add-below!": []
 }
diff --git a/decompiler/config/jak1_pal.jsonc b/decompiler/config/jak1_pal.jsonc
index b367319aa9..22d3f108f7 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": ["cam-update"],
+  "allowed_objects": ["fisher"],
   "banned_objects": [],
 
   ////////////////////////////
diff --git a/decompiler/config/jak1_pal/type_casts.jsonc b/decompiler/config/jak1_pal/type_casts.jsonc
index ca732522d7..6136d3d536 100644
--- a/decompiler/config/jak1_pal/type_casts.jsonc
+++ b/decompiler/config/jak1_pal/type_casts.jsonc
@@ -3893,8 +3893,6 @@
     // [396, "v0", "final-door"]
   ],
 
-  "(trans fisher-done)": [[[41, 46], "v1", "dma-packet"]],
-
   "load-boundary-from-template": [
     [[2, 60], "s5", "(array float)"],
     [42, "a0", "pair"],
@@ -7716,5 +7714,7 @@
 
   "(method 10 gui-query)": [],
 
+  "(trans fisher-done)": [],
+
   "placeholder-do-not-add-below": []
 }
diff --git a/goal_src/levels/jungle/fisher.gc b/goal_src/levels/jungle/fisher.gc
index 543f8b1de3..da79c80233 100644
--- a/goal_src/levels/jungle/fisher.gc
+++ b/goal_src/levels/jungle/fisher.gc
@@ -1356,32 +1356,28 @@
       ((< (-> self caught) 0)
        )
       (else
-        (when (< (mod (-> *display* base-frame-counter) 300) 150)
-          (let* ((s5-0 (-> *display* frames (-> *display* on-screen) frame global-buf))
-                 (gp-0 (-> s5-0 base))
-                 )
-            (draw-string-xy
-              (lookup-text! *common-text* (game-text-id lose!) #f)
-              s5-0
-              256
-              100
-              (font-color orange-red)
-              (font-flags shadow kerning middle large)
-              )
-            (let ((a3-1 (-> s5-0 base)))
-              (let ((v1-13 (the-as dma-packet (-> s5-0 base))))
-                (set! (-> v1-13 dma) (new 'static 'dma-tag :id (dma-tag-id next)))
-                (set! (-> v1-13 vif0) (new 'static 'vif-tag))
-                (set! (-> v1-13 vif1) (new 'static 'vif-tag))
-                (set! (-> s5-0 base) (&+ (the-as pointer v1-13) 16))
-                )
-              (dma-bucket-insert-tag
-                (-> *display* frames (-> *display* on-screen) frame bucket-group)
-                (bucket-id debug)
-                gp-0
-                (the-as (pointer dma-tag) a3-1)
+        (when (< (mod (-> *display* base-frame-counter) (seconds 1)) (seconds 0.5))
+          ;; PAL patch here
+          (let ((gp-0 (new
+                        'stack
+                        'font-context
+                        *font-default-matrix*
+                        56
+                        100
+                        0.0
+                        (font-color orange-red)
+                        (font-flags shadow kerning)
+                        )
+                      )
                 )
+            (let ((v1-10 gp-0))
+              (set! (-> v1-10 width) (the float 400))
               )
+            (let ((v1-11 gp-0))
+              (set! (-> v1-11 height) (the float 50))
+              )
+            (set! (-> gp-0 flags) (font-flags shadow kerning middle large))
+            (print-game-text (lookup-text! *common-text* (game-text-id lose!) #f) gp-0 #f 128 22)
             )
           )
         (fisher-draw-display self)