decomp3: eye renderer and more files (#3457)

- `eye` - `collision-editor` - `simple-nav-sphere` - `mech-part` - `mech-states` - `mech` - `target-mech` - `target-tube` - `flut-part` - `flut` - `target-flut`
open-goal · Apr 7, 2024 · ae0f139 · ae0f139
1 parent cc8801a
commit ae0f139
Show file tree

Hide file tree

Showing 67 changed files with 27,888 additions and 412 deletions.
diff --git a/decompiler/config/jak3/all-types.gc b/decompiler/config/jak3/all-types.gc
diff --git a/decompiler/config/jak3/ntsc_v1/anonymous_function_types.jsonc b/decompiler/config/jak3/ntsc_v1/anonymous_function_types.jsonc
@@ -545,5 +545,22 @@
     [107, "(function script-context object)"],
     [108, "(function script-context object)"]
   ],
-  "relocate": [[7, "(function sparticle-system sparticle-cpuinfo none)"]]
+  "relocate": [[7, "(function sparticle-system sparticle-cpuinfo none)"]],
+  "target-mech": [
+    [7, "(function object :behavior target)"],
+    [8, "(function object :behavior target)"],
+    [9, "(function object :behavior target)"],
+    [18, "(function surface surface surface int object :behavior target)"],
+    [19, "(function surface surface surface int object :behavior target)"]
+  ],
+  "mech-states": [[57, "(function object :behavior target)"]],
+  "target-flut": [
+    [14, "(function surface surface surface int object :behavior target)"],
+    [20, "(function object :behavior target)"],
+    [21, "(function object :behavior target)"],
+    [33, "(function process-focusable object)"],
+    [72, "(function object)"],
+    [73, "(function object :behavior target)"],
+    [74, "(function object :behavior target)"]
+  ]
 }
diff --git a/decompiler/config/jak3/ntsc_v1/hacks.jsonc b/decompiler/config/jak3/ntsc_v1/hacks.jsonc
@@ -385,7 +385,8 @@
     "(method 16 sparticle-launch-control)": [25, 35, 36, 48, 62, 65, 100, 102],
     "(anon-function 17 target-ladder)": [0, 1],
     "command-get-process": [46],
-    "foreground-draw-hud": [0, 7, 8, 9, 16, 22]
+    "foreground-draw-hud": [0, 7, 8, 9, 16, 22],
+    "target-flut-falling-anim-trans": [8, 9]
   },
 
   // Sometimes the game might use format strings that are fetched dynamically,

diff --git a/decompiler/config/jak3/ntsc_v1/inputs.jsonc b/decompiler/config/jak3/ntsc_v1/inputs.jsonc
@@ -44,7 +44,7 @@
     // "DGO/LJAKC.DGO",
     // "DGO/CTB.DGO",
     // "DGO/CTYCARC.DGO",
-    // "DGO/LMECH.DGO",
+    "DGO/LMECH.DGO",
     // "DGO/LBBSDRP2.DGO",
     // "DGO/NSA.DGO",
     // "DGO/LBBTCHA3.DGO",
@@ -78,7 +78,7 @@
     // "DGO/RAILB.DGO",
     // "DGO/LCTYHIJK.DGO",
     // "DGO/CTYPEPB.DGO",
-    // "DGO/PRECB.DGO",
+    "DGO/PRECB.DGO",
     // "DGO/LFORM.DGO",
     // "DGO/WASLEAPR.DGO",
     // "DGO/LKEIRA.DGO",
@@ -133,7 +133,7 @@
     // "DGO/CFA.DGO",
     // "DGO/LJINX.DGO",
     // "DGO/SEO.DGO",
-    // "DGO/PRECA.DGO",
+    "DGO/PRECA.DGO",
     // "DGO/TOWERC.DGO",
     // "DGO/WCA.DGO",
     // "DGO/SEC.DGO",
@@ -208,7 +208,7 @@
     // "DGO/LONINSIM.DGO",
     // "DGO/RUBA.DGO",
     // "DGO/DESRALLY.DGO",
-    // "DGO/WWD.DGO",
+    "DGO/WWD.DGO",
     // "DGO/STB.DGO",
     // "DGO/MIB.DGO",
     // "DGO/LCTYBLOW.DGO",
@@ -235,7 +235,7 @@
     // "DGO/TEMC.DGO",
     // "DGO/COMBC.DGO",
     // "DGO/LTRTWHLS.DGO",
-    // "DGO/PRECC.DGO",
+    "DGO/PRECC.DGO",
     // "DGO/DESCHASE.DGO",
     // "DGO/CITYCAST.DGO",
     // "DGO/CPO.DGO",

diff --git a/decompiler/config/jak3/ntsc_v1/label_types.jsonc b/decompiler/config/jak3/ntsc_v1/label_types.jsonc
@@ -584,5 +584,71 @@
     ["L200", "uint64", true],
     ["L203", "uint64", true],
     ["L201", "uint64", true]
+  ],
+  "target-tube": [["L191", "attack-info"]],
+  "mech": [["L118", "attack-info"]],
+  "target-mech": [
+    ["L256", "attack-info"],
+    ["L250", "vector"],
+    ["L249", "vector"]
+  ],
+  "mech-states": [
+    ["L675", "uint64", true],
+    ["L655", "uint64", true],
+    ["L663", "uint64", true],
+    ["L668", "uint64", true],
+    ["L659", "uint64", true],
+    ["L669", "uint64", true],
+    ["L654", "uint64", true],
+    ["L653", "uint64", true],
+    ["L672", "uint64", true],
+    ["L657", "uint64", true],
+    ["L656", "uint64", true],
+    ["L674", "uint64", true],
+    ["L676", "uint64", true],
+    ["L667", "uint64", true],
+    ["L658", "uint64", true],
+    ["L673", "uint64", true],
+    ["L670", "uint64", true],
+    ["L662", "uint64", true],
+    ["L661", "uint64", true],
+    ["L660", "uint64", true],
+    ["L666", "uint64", true],
+    ["L665", "uint64", true],
+    ["L652", "uint64", true],
+    ["L629", "attack-info"],
+    ["L671", "uint64", true],
+    ["L664", "uint64", true]
+  ],
+  "target-flut": [
+    ["L789", "uint64", true],
+    ["L766", "uint64", true],
+    ["L767", "uint64", true],
+    ["L774", "uint64", true],
+    ["L765", "uint64", true],
+    ["L768", "uint64", true],
+    ["L771", "uint64", true],
+    ["L773", "uint64", true],
+    ["L776", "uint64", true],
+    ["L750", "attack-info"],
+    ["L775", "uint64", true],
+    ["L770", "uint64", true],
+    ["L748", "attack-info"],
+    ["L769", "uint64", true],
+    ["L736", "attack-info"],
+    ["L735", "attack-info"],
+    ["L741", "attack-info"],
+    ["L740", "attack-info"],
+    ["L739", "attack-info"],
+    ["L772", "uint64", true],
+    ["L727", "attack-info"],
+    ["L764", "uint64", true],
+    ["L763", "uint64", true],
+    ["L762", "uint64", true]
+  ],
+  "flut": [
+    ["L139", "attack-info"],
+    ["L138", "attack-info"],
+    ["L137", "attack-info"]
   ]
 }
diff --git a/decompiler/config/jak3/ntsc_v1/stack_structures.jsonc b/decompiler/config/jak3/ntsc_v1/stack_structures.jsonc
@@ -718,5 +718,51 @@
     [176, "part-tracker-init-params"]
   ],
   "(method 9 mood-control)": [[16, "mood-control-work"]],
-  "check-drop-level-rain": [[16, "vector"]]
+  "check-drop-level-rain": [[16, "vector"]],
+  "(method 28 path-control)": [
+    [16, "vector"],
+    [32, "vector"],
+    [48, "vector"],
+    [64, "vector"],
+    [80, "vector"]
+  ],
+  "(method 29 path-control)": [[32, "vector"]],
+  "print-default-collision": [
+    [144, "vector"],
+    [96, "vector"],
+    [112, "vector"],
+    [128, "vector"],
+    [160, "matrix"]
+  ],
+  "mech-spawn-thruster": [[32, "vector"]],
+  "mech-shield-init-by-other": [[16, "shield-sphere-distort-spawn-params"]],
+  "target-mech-get-off?": [[560, ["inline-array", "sphere", 1]]],
+  "mech-update-ik": [
+    [16, "collide-query"],
+    [592, "vector"],
+    [608, "vector"],
+    [624, "vector"],
+    [640, "vector"],
+    [656, "vector"],
+    [672, "vector"]
+  ],
+  "target-mech-init": [[96, "shield-sphere-spawn-params"]],
+  "target-mech-add-thrust": [[16, "vector"]],
+  "target-mech-collision": [[144, "vector"]],
+  "(code target-mech-carry-throw)": [[640, ["inline-array", "sphere", 1]]],
+  "(trans target-mech-carry-drag)": [[560, ["inline-array", "sphere", 1]]],
+  "(code target-mech-carry-drop)": [[672, ["inline-array", "sphere", 1]]],
+  "target-mech-carry-update": [[560, ["inline-array", "sphere", 1]]],
+  "flut-update-ik": [
+    [16, "collide-query"],
+    [624, "vector"],
+    [640, "vector"],
+    [656, "vector"],
+    [592, "vector"],
+    [608, "vector"]
+  ],
+  "(code target-flut-get-on)": [
+    [16, "vector"],
+    [32, "vector"]
+  ]
 }