d/jak2: decompile missing function in whack (#2521)

decompiler/config/jak2/all-types.gc

@@ -43579,7 +43579,7 @@
     )
   )
 
-(define-extern birth-func-whack-score (function int sparticle-cpuinfo sparticle-launchinfo none))
+(define-extern birth-func-whack-score (function sparticle-system sparticle-cpuinfo sprite-vec-data-3d sparticle-launcher sparticle-launch-state none))
 (define-extern *mole-data* (array (array hip-mole-event)))
 (define-extern hip-mole-init (function handle int none :behavior hip-mole))
 (define-extern whack-a-metal-init (function entity-actor none :behavior whack-a-metal))

decompiler/config/jak2/ntsc_v1/hacks.jsonc

@@ -741,7 +741,6 @@
     "generic-warp-dest",
     "generic-warp-envmap-dest",
     "generic-no-light-proc"
-
   ],
 
   "mips2c_jump_table_functions": {},

decompiler/config/jak2/ntsc_v1/type_casts.jsonc

@@ -9859,7 +9859,6 @@
   ],
   "generic-vu1-init-buf": [[[24, 32], "v1", "dma-packet"]],
   "generic-vu1-init-buf-special": [[[27, 37], "v1", "dma-packet"]],
-
   "(method 11 drill-wall)": [
     [159, "v0", "(pointer actor-group)"],
     ["_stack_", 16, "res-tag"]
@@ -11269,18 +11268,15 @@
     [78, "v1", "generic-work"],
     [80, "v1", "generic-work"],
     [95, "a0", "generic-work"],
-
     [143, "v1", "generic-work"],
     [145, "v1", "generic-work"],
     [147, "v1", "generic-work"]
   ],
-
   "generic-work-init": [
     [4, "a0", "generic-work"],
     [[9, 19], "a0", "generic-work"],
     [23, "a1", "generic-work"]
   ],
-
   "generic-initialize-without-sync": [
     [8, "a0", "generic-work"],
     [21, "a0", "generic-work"]
@@ -11293,9 +11289,6 @@
     [1, "v1", "generic-work"],
     [4, "v1", "generic-work"]
   ],
-  "generic-warp-source": [
-    [2, "at", "generic-work"]
-  ]
-
-
+  "generic-warp-source": [[2, "at", "generic-work"]],
+  "birth-func-whack-score": [[[0, 29], "v1", "(array int32)"]]
 }

goal_src/jak2/levels/hiphog/whack.gc

@@ -114,6 +114,50 @@
     )
   )
 
+(defun birth-func-whack-score ((arg0 sparticle-system)
+                      (arg1 sparticle-cpuinfo)
+                      (arg2 sprite-vec-data-3d)
+                      (arg3 sparticle-launcher)
+                      (arg4 sparticle-launch-state)
+                      )
+  (let ((v1-0 (the-as (array int32) (-> arg1 user-float))))
+    (when (nonzero? v1-0)
+      (+ (-> v1-0 length) -3)
+      (let* ((a0-4 (-> v1-0 0))
+             (v1-2 (-> v1-0 (+ (mod
+                                 (the int (/ (-> *game-info* score) (cond
+                                                                      ((= a0-4 1)
+                                                                       10.0
+                                                                       )
+                                                                      ((= a0-4 2)
+                                                                       100.0
+                                                                       )
+                                                                      ((= a0-4 3)
+                                                                       1000.0
+                                                                       )
+                                                                      (else
+                                                                        1.0
+                                                                        )
+                                                                      )
+                                             )
+                                      )
+                                 10
+                                 )
+                               3
+                               )
+                       )
+                   )
+             )
+        (if (nonzero? v1-2)
+            (particle-adgif-callback (-> arg1 adgif) (the-as texture-id v1-2))
+            )
+        )
+      )
+    )
+  0
+  (none)
+  )
+
 (defpart 3337
   :init-specs ((sp-tex spt-texture (new 'static 'texture-id :index #x49 :page #x3e6))
     (sp-func spt-birth-func 'birth-func-whack-score)
@@ -1390,14 +1434,14 @@
                       )
         )
 
-(defskelgroup skel-hip-mole hip-mole 0 3
-              ((1 (meters 999999)))
+(defskelgroup skel-hip-mole hip-mole hip-mole-lod0-jg hip-mole-up-ja
+              ((hip-mole-lod0-mg (meters 999999)))
               :bounds (static-spherem 0 1 0 1.5)
               :origin-joint-index 3
               )
 
-(defskelgroup skel-big-bopper big-bopper 0 2
-              ((1 (meters 999999)))
+(defskelgroup skel-big-bopper big-bopper big-bopper-lod0-jg big-bopper-idle-ja
+              ((big-bopper-lod0-mg (meters 999999)))
               :bounds (static-spherem 0 0 0 2)
               :origin-joint-index 3
               )
@@ -2115,7 +2159,7 @@
         )
       (send-event (handle->process (-> self hud-goal)) 'hide-and-die)
       (remove-setting! 'entity-name)
-      (if (and *target* (logtest? (-> *target* focus-status) (focus-status grabbed)))
+      (if (and *target* (focus-test? *target* grabbed))
           (process-release? *target*)
           )
       (send-event *target* 'draw #t)

test/offline/config/jak2/config.jsonc

@@ -56,6 +56,7 @@
     "DGO/LPROTECT.DGO",
     "DGO/LSACK.DGO",
     "DGO/LSHUTTLE.DGO",
+    "DGO/LWHACK.DGO",
     "DGO/MCN.DGO",
     "DGO/MTN.DGO",
     "DGO/NEB.DGO",