From 72194ef24385b76708349b40cb9e0940f744e138 Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Sun, 8 Aug 2021 20:15:12 -0400 Subject: [PATCH] decomp: finish `misty-warehouse` --- decompiler/config/jak1_ntsc_black_label/type_casts.jsonc | 3 ++- goal_src/engine/game/generic-obs-h.gc | 4 +--- test/decompiler/reference/engine/game/generic-obs-h_REF.gc | 2 +- test/decompiler/reference/levels/misty/misty-warehouse_REF.gc | 4 +++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc index 6335c2e8fd..00a2eafc35 100644 --- a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc +++ b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc @@ -1796,7 +1796,8 @@ ], "misty-camera-view": [ - [19, "t9", "(function object object object object)"] + [19, "t9", "(function object object object object)"], + [25, "v1", "handle"] ], "(method 11 silostep)": [ diff --git a/goal_src/engine/game/generic-obs-h.gc b/goal_src/engine/game/generic-obs-h.gc index 7fb0185a53..e4fc3c3996 100644 --- a/goal_src/engine/game/generic-obs-h.gc +++ b/goal_src/engine/game/generic-obs-h.gc @@ -71,9 +71,7 @@ ) (deftype camera-tracker (process) - ( - ;(name basic :offset-assert 4) - (grab-target uint64 :offset 120) + ((grab-target handle :offset 120) (grab-event basic :offset-assert 128) (release-event basic :offset-assert 132) (old-global-mask uint32 :offset-assert 136) diff --git a/test/decompiler/reference/engine/game/generic-obs-h_REF.gc b/test/decompiler/reference/engine/game/generic-obs-h_REF.gc index 556a95506d..017a26aff7 100644 --- a/test/decompiler/reference/engine/game/generic-obs-h_REF.gc +++ b/test/decompiler/reference/engine/game/generic-obs-h_REF.gc @@ -121,7 +121,7 @@ ;; definition of type camera-tracker (deftype camera-tracker (process) - ((grab-target uint64 :offset 120) + ((grab-target handle :offset 120) (grab-event basic :offset-assert 128) (release-event basic :offset-assert 132) (old-global-mask uint32 :offset-assert 136) diff --git a/test/decompiler/reference/levels/misty/misty-warehouse_REF.gc b/test/decompiler/reference/levels/misty/misty-warehouse_REF.gc index a00537fe3a..61d385ba0d 100644 --- a/test/decompiler/reference/levels/misty/misty-warehouse_REF.gc +++ b/test/decompiler/reference/levels/misty/misty-warehouse_REF.gc @@ -149,7 +149,9 @@ (-> gp-0 ppointer) ) ) - (v0-3 (logior (shl (-> v1-1 0 pid) 32) (.asm.sllv.r0 v1-1))) + (v0-3 + (logior (shl (-> v1-1 0 pid) 32) (new 'static 'handle :process v1-1)) + ) ) (set! (-> self cam-tracker) (the-as uint v0-3)) v0-3