diff --git a/decompiler/config/all-types.gc b/decompiler/config/all-types.gc
index 6e5487cc7a..ecc3f2dc5c 100644
--- a/decompiler/config/all-types.gc
+++ b/decompiler/config/all-types.gc
@@ -9490,6 +9490,10 @@
    (rlength-mid   float           :offset 56)
    (stiffness     float           :offset 60)
    (next-clear    uint128         :offset 64)
+   (next-clear-1  int32 :offset 64)
+   (next-clear-2  int32 :offset 68)
+   (next-clear-3  int32 :offset 72)
+   (next-clear-4  int32 :offset 76)
    (count-clear   uint64          :offset 80)
    )
   :method-count-assert 9
@@ -12663,7 +12667,7 @@
    (chainb                    qword        8       :inline :offset-assert 176)
    (colors                    rgba           1024    :offset-assert 304)
    (matrix-tmpl               qword        20      :inline :offset-assert 4400)
-   (count-tmpl                qword        20      :inline :offset-assert 4720)
+   (count-tmpl                vector4w        20      :inline :offset-assert 4720)
    (mscalf-tmpl               dma-packet     :inline :offset-assert 5040)
    (mscalf-ret-tmpl           dma-packet     :inline :offset-assert 5056)
    (adgif-tmpl                dma-gif-packet :inline :offset-assert 5072)
diff --git a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc
index 7aab6015a9..434b852f78 100644
--- a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc
+++ b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc
@@ -7413,6 +7413,22 @@
 
   "draw-prototype-inline-array-shrub": [
     [[13, 55], "v1", "prototype-bucket-shrub"],
+    [[15, 30], "a2", "vector4w"],
+    [[42, 51], "a2", "vector4w"],
+    [[87, 93], "a0", "dma-packet"],
+    [[96, 102], "a0", "gs-gif-tag"],
+    [107, "a1", "gs-test"],
+    [107, "a0", "(pointer gs-test)"],
+    [109, "a0", "(pointer gs-reg64)"],
+    [[117, 136], "v1", "matrix3"],
+    [[140, 145], "v1", "dma-packet"],
+    [[238, 247], "a0", "dma-packet"],
+    [[261, 266], "v1", "dma-packet"],
+    [[359, 368], "a0", "dma-packet"],
+    [[382, 387], "v1", "dma-packet"],
+    [[451, 457], "a1", "dma-packet"],
+    [[460, 466], "a1", "dma-packet"],
+    [[524, 530], "a0", "dma-packet"],
     [55, "v1", "(inline-array prototype-bucket-shrub)"],
     [156, "v1", "terrain-context"],
     [212, "gp", "prototype-bucket-shrub"],
@@ -7441,12 +7457,14 @@
     [24, "v1", "(pointer gs-test)"],
     [26, "v1", "(pointer gs-reg64)"]
   ],
+
   "shrub-do-init-frame": [
     [[10, 21], "a0", "dma-packet"],
     [[24, 29], "a0", "dma-packet"]
   ],
+
   "shrub-upload-view-data": [
-    [[3, 16], "a0", "dma-packet"]
+    [[3, 16], "a0", "shrub-view-data"]
   ],
 
   "placeholder-do-not-add-below": []