jak3: fix mirage shot (#3501)

open-goal · May 1, 2024 · f9e0aa8 · f9e0aa8
1 parent 39f3549
commit f9e0aa8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/decompiler/config/jak3/ntsc_v1/label_types.jsonc b/decompiler/config/jak3/ntsc_v1/label_types.jsonc
@@ -943,7 +943,7 @@
     ["L19", "vector"],
     ["L18", "vector"],
     ["L17", "vector"],
-    ["L24", "vector"],
+    ["L24", "(inline-array vector)", 2],
     ["L15", "vector"],
     ["L14", "vector"]
   ],

diff --git a/goal_src/jak3/levels/desert/wvehicle/wcar-mirage.gc b/goal_src/jak3/levels/desert/wvehicle/wcar-mirage.gc
@@ -34,12 +34,13 @@
       (set! (-> v1-9 fvec quad) a2-1)
       (set! (-> v1-9 trans quad) a3-2)
       )
-    (let ((v1-10 (new 'static 'vector :x 3686.4 :y 5324.8 :z 6144.0 :w 1.0)))
-      (vector-matrix*!
-        (-> gp-1 vec0)
-        (the-as vector (+ (the-as uint v1-10) (* (-> gp-1 barrel-idx) 16)))
-        (-> gp-1 mat0)
-        )
+    (let ((v1-10 (new 'static 'inline-array vector 2
+                   (new 'static 'vector :x 3686.4 :y 5324.8 :z 6144.0 :w 1.0)
+                   (new 'static 'vector :x -3686.4 :y 5324.8 :z 6144.0 :w 1.0)
+                   )
+                 )
+          )
+      (vector-matrix*! (-> gp-1 vec0) (-> v1-10 (-> gp-1 barrel-idx)) (-> gp-1 mat0))
       )
     0
     (vector-reset! (-> gp-1 vec4))

diff --git a/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-mirage_REF.gc b/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-mirage_REF.gc