diff --git a/decompiler/config/all-types.gc b/decompiler/config/all-types.gc index 221c44874e..6e5487cc7a 100644 --- a/decompiler/config/all-types.gc +++ b/decompiler/config/all-types.gc @@ -9499,7 +9499,7 @@ (deftype prototype-bucket-shrub (prototype-bucket) ((mod-count uint16 4 :offset-assert 88) - (last uint32 4 :offset-assert 96) + (last dma-packet 4 :offset-assert 96) (something uint128 :offset 80) (last-clear uint128 :offset 96) ) @@ -16745,7 +16745,7 @@ (define-extern shrub-make-perspective-matrix (function matrix matrix)) (define-extern shrub-time (function int int int int int int)) ;; unused (define-extern draw-inline-array-instance-shrub (function dma-buffer drawable int (inline-array prototype-bucket-shrub) none)) -(define-extern draw-prototype-inline-array-shrub (function int (inline-array prototype-bucket-shrub) none)) +(define-extern draw-prototype-inline-array-shrub (function int (inline-array prototype-bucket-shrub) pointer)) (define-extern shrub-upload-test (function generic-shrub-fragment none)) (define-extern test-func (function none)) diff --git a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc index dc2a169413..7aab6015a9 100644 --- a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc +++ b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc @@ -7412,7 +7412,13 @@ ], "draw-prototype-inline-array-shrub": [ + [[13, 55], "v1", "prototype-bucket-shrub"], + [55, "v1", "(inline-array prototype-bucket-shrub)"], [156, "v1", "terrain-context"], + [212, "gp", "prototype-bucket-shrub"], + [333, "gp", "prototype-bucket-shrub"], + [[479, 518], "gp", "prototype-bucket-shrub"], + [518, "gp", "(inline-array prototype-bucket-shrub)"], [223, "v1", "drawable-group"], [277, "v1", "terrain-context"], [344, "v1", "drawable-group"],