small jak1 decomp cleanup (#1843)

small cleanup

decompiler/config/all-types.gc

@@ -20963,10 +20963,10 @@
 
 (define-extern target-bonk-event-handler (function process int symbol event-message-block object :behavior target))
 (define-extern target-standard-event-handler (function process int symbol event-message-block object :behavior target))
-(define-extern target-send-attack (function process uint uint int int symbol :behavior target)) ;; i suspect the uints are actually structures/basics
-(define-extern target-attacked (function symbol attack-info process process (state symbol attack-info target) object :behavior target))
+(define-extern target-send-attack (function process uint touching-shapes-entry int int symbol :behavior target)) ;; i suspect the uints are actually structures/basics
+(define-extern target-attacked (function symbol attack-info process touching-shapes-entry (state symbol attack-info target) object :behavior target))
 (define-extern target-apply-tongue (function vector symbol :behavior target))
-(define-extern get-intersect-point (function vector touching-prims-entry control-info process vector))
+(define-extern get-intersect-point (function vector touching-prims-entry control-info touching-shapes-entry vector))
 (define-extern target-powerup-effect (function symbol none :behavior target))
 (define-extern target-shoved (function meters meters process (state object object target) object :behavior target))
 (define-extern target-dangerous-event-handler (function process int symbol event-message-block object :behavior target))

goal_src/jak1/engine/target/target-handler.gc

@@ -328,8 +328,8 @@
     )
   )
 
-(defun get-intersect-point ((arg0 vector) (arg1 touching-prims-entry) (arg2 control-info) (arg3 process))
-  (let ((a0-2 (get-touched-tri arg1 arg2 (the-as touching-shapes-entry arg3))))
+(defun get-intersect-point ((arg0 vector) (arg1 touching-prims-entry) (arg2 control-info) (arg3 touching-shapes-entry))
+  (let ((a0-2 (get-touched-tri arg1 arg2 arg3)))
     (if a0-2
         (set! (-> arg0 quad) (-> a0-2 intersect quad))
         (get-middle-of-bsphere-overlap arg1 arg0)
@@ -338,7 +338,7 @@
   arg0
   )
 
-(defbehavior target-attacked target ((arg0 symbol) (arg1 attack-info) (arg2 process) (arg3 process) (arg4 (state symbol attack-info target)))
+(defbehavior target-attacked target ((arg0 symbol) (arg1 attack-info) (arg2 process) (arg3 touching-shapes-entry) (arg4 (state symbol attack-info target)))
   (when (zero? (logand (-> self state-flags) (state-flags being-attacked)))
     (cond
       ((or (logtest? (-> self state-flags) (state-flags invulnerable timed-invulnerable invuln-powerup))
@@ -372,13 +372,7 @@
       )
     (mem-copy! (the-as pointer (-> self attack-info-rec)) (the-as pointer arg1) 104)
     (when arg3
-      (let ((a1-2 ((method-of-type touching-shapes-entry prims-touching?)
-                   (the-as touching-shapes-entry arg3)
-                   (-> self control)
-                   (the-as uint -1)
-                   )
-                  )
-            )
+      (let ((a1-2 (prims-touching? arg3 (-> self control) (the-as uint -1))))
         (when a1-2
           (get-intersect-point (-> self attack-info-rec intersection) a1-2 (-> self control) arg3)
           (logior! (-> self attack-info-rec mask) (attack-mask intersection))
@@ -439,7 +433,7 @@
     )
   )
 
-(defbehavior target-send-attack target ((arg0 process) (arg1 uint) (arg2 uint) (arg3 int) (arg4 int))
+(defbehavior target-send-attack target ((arg0 process) (arg1 uint) (arg2 touching-shapes-entry) (arg3 int) (arg4 int))
   (local-vars
     (sv-96 touching-prims-entry)
     (sv-128 touching-prims-entry)
@@ -469,7 +463,7 @@
     (set! (-> v1-0 from) self)
     (set! (-> v1-0 num-params) 4)
     (set! (-> v1-0 message) 'attack)
-    (set! (-> v1-0 param 0) arg2)
+    (set! (-> v1-0 param 0) (the-as uint arg2))
     (set! (-> v1-0 param 1) arg1)
     (set! (-> v1-0 param 2) (the-as uint arg3))
     (set! (-> v1-0 param 3) (the-as uint arg4))
@@ -478,13 +472,7 @@
         (let ((v1-5 (-> self control unknown-symbol30)))
           (cond
             ((or (= v1-5 'spin) (= v1-5 'spin-air))
-             (set! sv-96
-                   ((method-of-type touching-shapes-entry prims-touching?)
-                    (the-as touching-shapes-entry arg2)
-                    (-> self control)
-                    (the-as uint 64)
-                    )
-                   )
+             (set! sv-96 (prims-touching? arg2 (-> self control) (the-as uint 64)))
              (cond
                (sv-96
                  (let ((s4-0 (get-process *default-dead-pool* part-tracker #x4000)))
@@ -501,7 +489,7 @@
                        (set! sv-240 (the-as symbol #f))
                        (set! sv-256 (the-as symbol #f))
                        (set! sv-272 (the-as symbol #f))
-                       (let ((t3-0 (get-intersect-point (new 'stack-no-clear 'vector) sv-96 (-> self control) (the-as process arg2))))
+                       (let ((t3-0 (get-intersect-point (new 'stack-no-clear 'vector) sv-96 (-> self control) arg2)))
                          ((the-as (function object object object object object object object object none) s3-0)
                           s2-0
                           s1-0
@@ -533,13 +521,7 @@
              (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 127 (seconds 0.2))
              )
             ((= v1-5 'punch)
-             (set! sv-128
-                   ((method-of-type touching-shapes-entry prims-touching?)
-                    (the-as touching-shapes-entry arg2)
-                    (-> self control)
-                    (the-as uint 64)
-                    )
-                   )
+             (set! sv-128 (prims-touching? arg2 (-> self control) (the-as uint 64)))
              (cond
                (sv-128
                  (let ((s4-1 (get-process *default-dead-pool* part-tracker #x4000)))
@@ -556,7 +538,7 @@
                        (set! sv-304 (the-as symbol #f))
                        (set! sv-320 (the-as symbol #f))
                        (set! sv-336 (the-as symbol #f))
-                       (let ((t3-1 (get-intersect-point (new 'stack-no-clear 'vector) sv-128 (-> self control) (the-as process arg2))))
+                       (let ((t3-1 (get-intersect-point (new 'stack-no-clear 'vector) sv-128 (-> self control) arg2)))
                          ((the-as (function object object object object object object object object none) s3-1)
                           s2-1
                           s1-1
@@ -573,14 +555,7 @@
                      )
                    )
                  )
-               ((let ((v0-14
-                        ((method-of-type touching-shapes-entry prims-touching?)
-                         (the-as touching-shapes-entry arg2)
-                         (-> self control)
-                         (the-as uint 32)
-                         )
-                        )
-                      )
+               ((let ((v0-14 (prims-touching? arg2 (-> self control) (the-as uint 32))))
                   (set! sv-128 v0-14)
                   v0-14
                   )
@@ -598,7 +573,7 @@
                       (set! sv-368 (the-as symbol #f))
                       (set! sv-384 (the-as symbol #f))
                       (set! sv-400 (the-as symbol #f))
-                      (let ((t3-2 (get-intersect-point (new 'stack-no-clear 'vector) sv-128 (-> self control) (the-as process arg2))))
+                      (let ((t3-2 (get-intersect-point (new 'stack-no-clear 'vector) sv-128 (-> self control) arg2)))
                         ((the-as (function object object object object object object object object none) s3-2)
                          s2-2
                          s1-2
@@ -638,13 +613,7 @@
              (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 127 (seconds 0.1))
              )
             ((= v1-5 'uppercut)
-             (set! sv-176
-                   ((method-of-type touching-shapes-entry prims-touching?)
-                    (the-as touching-shapes-entry arg2)
-                    (-> self control)
-                    (the-as uint 64)
-                    )
-                   )
+             (set! sv-176 (prims-touching? arg2 (-> self control) (the-as uint 64)))
              (cond
                (sv-176
                  (let ((s4-3 (get-process *default-dead-pool* part-tracker #x4000)))
@@ -661,7 +630,7 @@
                        (set! sv-432 (the-as symbol #f))
                        (set! sv-448 (the-as symbol #f))
                        (set! sv-464 (the-as symbol #f))
-                       (let ((t3-3 (get-intersect-point (new 'stack-no-clear 'vector) sv-176 (-> self control) (the-as process arg2))))
+                       (let ((t3-3 (get-intersect-point (new 'stack-no-clear 'vector) sv-176 (-> self control) arg2)))
                          ((the-as (function object object object object object object object object none) s3-3)
                           s2-3
                           s1-3
@@ -678,14 +647,7 @@
                      )
                    )
                  )
-               ((let ((v0-26
-                        ((method-of-type touching-shapes-entry prims-touching?)
-                         (the-as touching-shapes-entry arg2)
-                         (-> self control)
-                         (the-as uint 32)
-                         )
-                        )
-                      )
+               ((let ((v0-26 (prims-touching? arg2 (-> self control) (the-as uint 32))))
                   (set! sv-176 v0-26)
                   v0-26
                   )
@@ -703,7 +665,7 @@
                       (set! sv-496 (the-as symbol #f))
                       (set! sv-512 (the-as symbol #f))
                       (set! sv-528 (the-as symbol #f))
-                      (let ((t3-4 (get-intersect-point (new 'stack-no-clear 'vector) sv-176 (-> self control) (the-as process arg2))))
+                      (let ((t3-4 (get-intersect-point (new 'stack-no-clear 'vector) sv-176 (-> self control) arg2)))
                         ((the-as (function object object object object object object object object none) s3-4)
                          s2-4
                          s1-4
@@ -796,7 +758,7 @@
        arg2
        (the-as attack-info (-> arg3 param 1))
        arg0
-       (the-as process (-> arg3 param 0))
+       (the-as touching-shapes-entry (-> arg3 param 0))
        target-hit
        )
      )
@@ -937,7 +899,7 @@
          (target-send-attack
            arg0
            (the-as uint (-> self control unknown-symbol30))
-           (-> arg3 param 0)
+           (the-as touching-shapes-entry (-> arg3 param 0))
            (-> self control unknown-dword50)
            (-> self control unknown-dword51)
            )
@@ -949,7 +911,7 @@
        arg2
        (the-as attack-info (-> arg3 param 1))
        arg0
-       (the-as process (-> arg3 param 0))
+       (the-as touching-shapes-entry (-> arg3 param 0))
        target-hit
        )
      )
@@ -1007,7 +969,7 @@
            (when (and (target-send-attack
                         arg0
                         (the-as uint 'bonk)
-                        (-> arg3 param 0)
+                        (the-as touching-shapes-entry (-> arg3 param 0))
                         (-> self control unknown-dword50)
                         (-> self control unknown-dword51)
                         )

goal_src/jak1/engine/target/target.gc

@@ -17,7 +17,7 @@
 (define-extern target-standard-event-handler (function process int symbol event-message-block object :behavior target))
 (define-extern target-jump-event-handler (function process int symbol event-message-block object :behavior target))
 (define-extern target-shoved (function meters meters process (state object object target) object :behavior target))
-(define-extern target-send-attack (function process uint uint int int symbol :behavior target)) ;; i suspect the uints are actually structures/basics
+(define-extern target-send-attack (function process uint touching-shapes-entry int int symbol :behavior target))
 (define-extern target-bonk-event-handler (function process int symbol event-message-block object :behavior target))
 
 ;; DECOMP BEGINS
@@ -2078,7 +2078,7 @@
           (let ((gp-1 (target-send-attack
                         arg0
                         (the-as uint (-> self control unknown-symbol30))
-                        (-> arg3 param 0)
+                        (the-as touching-shapes-entry (-> arg3 param 0))
                         (-> self control unknown-dword50)
                         (-> self control unknown-dword51)
                         )

goal_src/jak1/levels/flut_common/target-flut.gc

@@ -290,7 +290,7 @@
            arg2
            (the-as attack-info (-> arg3 param 1))
            arg0
-           (the-as process (-> arg3 param 0))
+           (the-as touching-shapes-entry (-> arg3 param 0))
            target-flut-hit
            )
          )
@@ -361,7 +361,7 @@
          (target-send-attack
            arg0
            (the-as uint (-> self control unknown-symbol30))
-           (-> arg3 param 0)
+           (the-as touching-shapes-entry (-> arg3 param 0))
            (-> self control unknown-dword50)
            (-> self control unknown-dword51)
            )
@@ -373,7 +373,7 @@
        arg2
        (the-as attack-info (-> arg3 param 1))
        arg0
-       (the-as process (-> arg3 param 0))
+       (the-as touching-shapes-entry (-> arg3 param 0))
        target-flut-hit
        )
      )
@@ -774,7 +774,7 @@
       (when (target-send-attack
               arg0
               (the-as uint 'flut-bonk)
-              (-> arg3 param 0)
+              (the-as touching-shapes-entry (-> arg3 param 0))
               (-> self control unknown-dword50)
               (-> self control unknown-dword51)
               )
@@ -1163,7 +1163,7 @@
           (let ((gp-1 (target-send-attack
                         arg0
                         (the-as uint (-> self control unknown-symbol30))
-                        (-> arg3 param 0)
+                        (the-as touching-shapes-entry (-> arg3 param 0))
                         (-> self control unknown-dword50)
                         (-> self control unknown-dword51)
                         )

goal_src/jak1/levels/racer_common/racer-states.gc

@@ -41,7 +41,7 @@
                    arg2
                    (the-as attack-info (-> arg3 param 1))
                    arg0
-                   (the-as process (-> arg3 param 0))
+                   (the-as touching-shapes-entry (-> arg3 param 0))
                    (the-as (state symbol attack-info target) target-racing-hit)
                    )
                  )

goal_src/jak1/levels/sunken/target-tube.gc

@@ -449,7 +449,7 @@
              'attack-or-shove
              (the-as attack-info (-> arg3 param 1))
              arg0
-             (the-as process (-> arg3 param 0))
+             (the-as touching-shapes-entry (-> arg3 param 0))
              target-tube-hit
              )
            )

test/decompiler/reference/jak1/engine/target/target-handler_REF.gc

@@ -326,8 +326,8 @@
 
 ;; definition for function get-intersect-point
 ;; INFO: Used lq/sq
-(defun get-intersect-point ((arg0 vector) (arg1 touching-prims-entry) (arg2 control-info) (arg3 process))
-  (let ((a0-2 (get-touched-tri arg1 arg2 (the-as touching-shapes-entry arg3))))
+(defun get-intersect-point ((arg0 vector) (arg1 touching-prims-entry) (arg2 control-info) (arg3 touching-shapes-entry))
+  (let ((a0-2 (get-touched-tri arg1 arg2 arg3)))
     (if a0-2
         (set! (-> arg0 quad) (-> a0-2 intersect quad))
         (get-middle-of-bsphere-overlap arg1 arg0)
@@ -337,7 +337,12 @@
   )
 
 ;; definition for function target-attacked
-(defbehavior target-attacked target ((arg0 symbol) (arg1 attack-info) (arg2 process) (arg3 process) (arg4 (state symbol attack-info target)))
+(defbehavior target-attacked target ((arg0 symbol)
+                           (arg1 attack-info)
+                           (arg2 process)
+                           (arg3 touching-shapes-entry)
+                           (arg4 (state symbol attack-info target))
+                           )
   (when (zero? (logand (-> self state-flags) (state-flags being-attacked)))
     (cond
       ((or (logtest? (-> self state-flags) (state-flags invulnerable timed-invulnerable invuln-powerup))
@@ -371,13 +376,7 @@
       )
     (mem-copy! (the-as pointer (-> self attack-info-rec)) (the-as pointer arg1) 104)
     (when arg3
-      (let ((a1-2 ((method-of-type touching-shapes-entry prims-touching?)
-                   (the-as touching-shapes-entry arg3)
-                   (-> self control)
-                   (the-as uint -1)
-                   )
-                  )
-            )
+      (let ((a1-2 (prims-touching? arg3 (-> self control) (the-as uint -1))))
         (when a1-2
           (get-intersect-point (-> self attack-info-rec intersection) a1-2 (-> self control) arg3)
           (logior! (-> self attack-info-rec mask) (attack-mask intersection))
@@ -441,7 +440,7 @@
 ;; definition for function target-send-attack
 ;; INFO: Used lq/sq
 ;; INFO: Return type mismatch object vs symbol.
-(defbehavior target-send-attack target ((arg0 process) (arg1 uint) (arg2 uint) (arg3 int) (arg4 int))
+(defbehavior target-send-attack target ((arg0 process) (arg1 uint) (arg2 touching-shapes-entry) (arg3 int) (arg4 int))
   (local-vars
     (sv-96 touching-prims-entry)
     (sv-128 touching-prims-entry)
@@ -471,7 +470,7 @@
     (set! (-> v1-0 from) self)
     (set! (-> v1-0 num-params) 4)
     (set! (-> v1-0 message) 'attack)
-    (set! (-> v1-0 param 0) arg2)
+    (set! (-> v1-0 param 0) (the-as uint arg2))
     (set! (-> v1-0 param 1) arg1)
     (set! (-> v1-0 param 2) (the-as uint arg3))
     (set! (-> v1-0 param 3) (the-as uint arg4))
@@ -480,13 +479,7 @@
         (let ((v1-5 (-> self control unknown-symbol30)))
           (cond
             ((or (= v1-5 'spin) (= v1-5 'spin-air))
-             (set! sv-96
-                   ((method-of-type touching-shapes-entry prims-touching?)
-                    (the-as touching-shapes-entry arg2)
-                    (-> self control)
-                    (the-as uint 64)
-                    )
-                   )
+             (set! sv-96 (prims-touching? arg2 (-> self control) (the-as uint 64)))
              (cond
                (sv-96
                  (let ((s4-0 (get-process *default-dead-pool* part-tracker #x4000)))
@@ -503,7 +496,7 @@
                        (set! sv-240 (the-as symbol #f))
                        (set! sv-256 (the-as symbol #f))
                        (set! sv-272 (the-as symbol #f))
-                       (let ((t3-0 (get-intersect-point (new 'stack-no-clear 'vector) sv-96 (-> self control) (the-as process arg2))))
+                       (let ((t3-0 (get-intersect-point (new 'stack-no-clear 'vector) sv-96 (-> self control) arg2)))
                          ((the-as (function object object object object object object object object none) s3-0)
                           s2-0
                           s1-0
@@ -535,13 +528,7 @@
              (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 127 (seconds 0.2))
              )
             ((= v1-5 'punch)
-             (set! sv-128
-                   ((method-of-type touching-shapes-entry prims-touching?)
-                    (the-as touching-shapes-entry arg2)
-                    (-> self control)
-                    (the-as uint 64)
-                    )
-                   )
+             (set! sv-128 (prims-touching? arg2 (-> self control) (the-as uint 64)))
              (cond
                (sv-128
                  (let ((s4-1 (get-process *default-dead-pool* part-tracker #x4000)))
@@ -558,7 +545,7 @@
                        (set! sv-304 (the-as symbol #f))
                        (set! sv-320 (the-as symbol #f))
                        (set! sv-336 (the-as symbol #f))
-                       (let ((t3-1 (get-intersect-point (new 'stack-no-clear 'vector) sv-128 (-> self control) (the-as process arg2))))
+                       (let ((t3-1 (get-intersect-point (new 'stack-no-clear 'vector) sv-128 (-> self control) arg2)))
                          ((the-as (function object object object object object object object object none) s3-1)
                           s2-1
                           s1-1
@@ -575,14 +562,7 @@
                      )
                    )
                  )
-               ((let ((v0-14
-                        ((method-of-type touching-shapes-entry prims-touching?)
-                         (the-as touching-shapes-entry arg2)
-                         (-> self control)
-                         (the-as uint 32)
-                         )
-                        )
-                      )
+               ((let ((v0-14 (prims-touching? arg2 (-> self control) (the-as uint 32))))
                   (set! sv-128 v0-14)
                   v0-14
                   )
@@ -600,7 +580,7 @@
                       (set! sv-368 (the-as symbol #f))
                       (set! sv-384 (the-as symbol #f))
                       (set! sv-400 (the-as symbol #f))
-                      (let ((t3-2 (get-intersect-point (new 'stack-no-clear 'vector) sv-128 (-> self control) (the-as process arg2))))
+                      (let ((t3-2 (get-intersect-point (new 'stack-no-clear 'vector) sv-128 (-> self control) arg2)))
                         ((the-as (function object object object object object object object object none) s3-2)
                          s2-2
                          s1-2
@@ -640,13 +620,7 @@
              (cpad-set-buzz! (-> *cpad-list* cpads 0) 1 127 (seconds 0.1))
              )
             ((= v1-5 'uppercut)
-             (set! sv-176
-                   ((method-of-type touching-shapes-entry prims-touching?)
-                    (the-as touching-shapes-entry arg2)
-                    (-> self control)
-                    (the-as uint 64)
-                    )
-                   )
+             (set! sv-176 (prims-touching? arg2 (-> self control) (the-as uint 64)))
              (cond
                (sv-176
                  (let ((s4-3 (get-process *default-dead-pool* part-tracker #x4000)))
@@ -663,7 +637,7 @@
                        (set! sv-432 (the-as symbol #f))
                        (set! sv-448 (the-as symbol #f))
                        (set! sv-464 (the-as symbol #f))
-                       (let ((t3-3 (get-intersect-point (new 'stack-no-clear 'vector) sv-176 (-> self control) (the-as process arg2))))
+                       (let ((t3-3 (get-intersect-point (new 'stack-no-clear 'vector) sv-176 (-> self control) arg2)))
                          ((the-as (function object object object object object object object object none) s3-3)
                           s2-3
                           s1-3
@@ -680,14 +654,7 @@
                      )
                    )
                  )
-               ((let ((v0-26
-                        ((method-of-type touching-shapes-entry prims-touching?)
-                         (the-as touching-shapes-entry arg2)
-                         (-> self control)
-                         (the-as uint 32)
-                         )
-                        )
-                      )
+               ((let ((v0-26 (prims-touching? arg2 (-> self control) (the-as uint 32))))
                   (set! sv-176 v0-26)
                   v0-26
                   )
@@ -705,7 +672,7 @@
                       (set! sv-496 (the-as symbol #f))
                       (set! sv-512 (the-as symbol #f))
                       (set! sv-528 (the-as symbol #f))
-                      (let ((t3-4 (get-intersect-point (new 'stack-no-clear 'vector) sv-176 (-> self control) (the-as process arg2))))
+                      (let ((t3-4 (get-intersect-point (new 'stack-no-clear 'vector) sv-176 (-> self control) arg2)))
                         ((the-as (function object object object object object object object object none) s3-4)
                          s2-4
                          s1-4
@@ -800,7 +767,7 @@
        arg2
        (the-as attack-info (-> arg3 param 1))
        arg0
-       (the-as process (-> arg3 param 0))
+       (the-as touching-shapes-entry (-> arg3 param 0))
        target-hit
        )
      )
@@ -942,7 +909,7 @@
          (target-send-attack
            arg0
            (the-as uint (-> self control unknown-symbol30))
-           (-> arg3 param 0)
+           (the-as touching-shapes-entry (-> arg3 param 0))
            (-> self control unknown-dword50)
            (-> self control unknown-dword51)
            )
@@ -954,7 +921,7 @@
        arg2
        (the-as attack-info (-> arg3 param 1))
        arg0
-       (the-as process (-> arg3 param 0))
+       (the-as touching-shapes-entry (-> arg3 param 0))
        target-hit
        )
      )
@@ -1014,7 +981,7 @@
            (when (and (target-send-attack
                         arg0
                         (the-as uint 'bonk)
-                        (-> arg3 param 0)
+                        (the-as touching-shapes-entry (-> arg3 param 0))
                         (-> self control unknown-dword50)
                         (-> self control unknown-dword51)
                         )

test/decompiler/reference/jak1/engine/target/target_REF.gc

@@ -2037,7 +2037,7 @@
           (let ((gp-1 (target-send-attack
                         arg0
                         (the-as uint (-> self control unknown-symbol30))
-                        (-> arg3 param 0)
+                        (the-as touching-shapes-entry (-> arg3 param 0))
                         (-> self control unknown-dword50)
                         (-> self control unknown-dword51)
                         )

test/decompiler/reference/jak1/levels/flut_common/target-flut_REF.gc

@@ -324,7 +324,7 @@
            arg2
            (the-as attack-info (-> arg3 param 1))
            arg0
-           (the-as process (-> arg3 param 0))
+           (the-as touching-shapes-entry (-> arg3 param 0))
            target-flut-hit
            )
          )
@@ -396,7 +396,7 @@
          (target-send-attack
            arg0
            (the-as uint (-> self control unknown-symbol30))
-           (-> arg3 param 0)
+           (the-as touching-shapes-entry (-> arg3 param 0))
            (-> self control unknown-dword50)
            (-> self control unknown-dword51)
            )
@@ -408,7 +408,7 @@
        arg2
        (the-as attack-info (-> arg3 param 1))
        arg0
-       (the-as process (-> arg3 param 0))
+       (the-as touching-shapes-entry (-> arg3 param 0))
        target-flut-hit
        )
      )
@@ -813,7 +813,7 @@
       (when (target-send-attack
               arg0
               (the-as uint 'flut-bonk)
-              (-> arg3 param 0)
+              (the-as touching-shapes-entry (-> arg3 param 0))
               (-> self control unknown-dword50)
               (-> self control unknown-dword51)
               )
@@ -1206,7 +1206,7 @@
           (let ((gp-1 (target-send-attack
                         arg0
                         (the-as uint (-> self control unknown-symbol30))
-                        (-> arg3 param 0)
+                        (the-as touching-shapes-entry (-> arg3 param 0))
                         (-> self control unknown-dword50)
                         (-> self control unknown-dword51)
                         )

test/decompiler/reference/jak1/levels/racer_common/racer-states_REF.gc

@@ -34,7 +34,7 @@
                    arg2
                    (the-as attack-info (-> arg3 param 1))
                    arg0
-                   (the-as process (-> arg3 param 0))
+                   (the-as touching-shapes-entry (-> arg3 param 0))
                    (the-as (state symbol attack-info target) target-racing-hit)
                    )
                  )

test/decompiler/reference/jak1/levels/sunken/target-tube_REF.gc

@@ -480,7 +480,7 @@
              'attack-or-shove
              (the-as attack-info (-> arg3 param 1))
              arg0
-             (the-as process (-> arg3 param 0))
+             (the-as touching-shapes-entry (-> arg3 param 0))
              target-tube-hit
              )
            )