From b1e1b4cab19d3b99075f766f5b0d09cd5f824019 Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Mon, 3 Jan 2022 18:33:51 -0500 Subject: [PATCH] some more --- decompiler/config/all-types.gc | 5 +++-- decompiler/config/jak1_ntsc_black_label/type_casts.jsonc | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/decompiler/config/all-types.gc b/decompiler/config/all-types.gc index d3737a2033..221c44874e 100644 --- a/decompiler/config/all-types.gc +++ b/decompiler/config/all-types.gc @@ -9472,7 +9472,7 @@ ;; - Types (deftype prototype-bucket (basic) - ((name basic :offset-assert 4) + ((name string :offset-assert 4) (flags uint32 :offset-assert 8) (in-level uint16 :offset-assert 12) (utextures uint16 :offset-assert 14) @@ -9500,6 +9500,7 @@ (deftype prototype-bucket-shrub (prototype-bucket) ((mod-count uint16 4 :offset-assert 88) (last uint32 4 :offset-assert 96) + (something uint128 :offset 80) (last-clear uint128 :offset 96) ) :method-count-assert 9 @@ -16744,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 shrub-near-packet none)) +(define-extern draw-prototype-inline-array-shrub (function int (inline-array prototype-bucket-shrub) none)) (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 9beb6ced05..dc2a169413 100644 --- a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc +++ b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc @@ -7413,7 +7413,12 @@ "draw-prototype-inline-array-shrub": [ [156, "v1", "terrain-context"], - [277, "v1", "terrain-context"] + [223, "v1", "drawable-group"], + [277, "v1", "terrain-context"], + [344, "v1", "drawable-group"], + [398, "v1", "terrain-context"], + [[498, 507], "a1", "prototype-bucket-shrub"], + [540, "v1", "terrain-context"] ], "(method 8 drawable-tree-instance-shrub)": [