From f9e0aa82bcaaac127a199c03e0c6033d33ddc10e Mon Sep 17 00:00:00 2001
From: Hat Kid <6624576+Hat-Kid@users.noreply.github.com>
Date: Wed, 1 May 2024 21:57:13 +0200
Subject: [PATCH] jak3: fix mirage shot (#3501)

---
 decompiler/config/jak3/ntsc_v1/label_types.jsonc    |  2 +-
 goal_src/jak3/levels/desert/wvehicle/wcar-mirage.gc | 13 +++++++------
 .../jak3/levels/desert/wvehicle/wcar-mirage_REF.gc  | 13 +++++++------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/decompiler/config/jak3/ntsc_v1/label_types.jsonc b/decompiler/config/jak3/ntsc_v1/label_types.jsonc
index 8709b9fb09..f64b25bb19 100644
--- 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
index 45900b27d7..e33848485d 100644
--- 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
index 115573fffd..6b882f8e83 100644
--- a/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-mirage_REF.gc
+++ b/test/decompiler/reference/jak3/levels/desert/wvehicle/wcar-mirage_REF.gc
@@ -43,12 +43,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))