decomp3: lightning renderer, nav code, texture remap, fix progress me…

…nu crash (#3461) Also adds: - BLERC - Minimap (with missing texture for the map, sprites work) - Eco Mine files - Precursor robot boss files - Sewer files - Vehicle files
open-goal · Apr 12, 2024 · 36f1592 · 36f1592
1 parent 5299bc4
commit 36f1592
Show file tree

Hide file tree

Showing 365 changed files with 230,650 additions and 7,737 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
@@ -562,5 +562,58 @@
     [72, "(function object)"],
     [73, "(function object :behavior target)"],
     [74, "(function object :behavior target)"]
+  ],
+  "nav-control": [
+    [0, "(function object nav-control none)"],
+    [1, "(function object nav-control none)"],
+    [2, "(function object nav-control none)"],
+    [3, "(function object nav-control none)"],
+    [4, "(function object nav-control none)"],
+    [5, "(function object nav-control none)"],
+    [6, "(function object nav-control none)"],
+    [7, "(function object nav-control none)"],
+    [8, "(function object nav-control none)"],
+    [9, "(function object nav-control none)"]
+  ],
+  "nav-enemy": [[7, "(function enemy-jump-info none :behavior nav-enemy)"]],
+  "task-control": [
+    [53, "(function game-task-node-info symbol object)"],
+    [54, "(function game-task-node-info object)"],
+    [67, "(function pair symbol)"]
+  ],
+  "merc-death": [[3, "(function time-frame :behavior process-drawable)"]],
+  "vehicle-states": [
+    [10, "(function collide-shape-prim none)"],
+    [12, "(function collide-shape-prim none)"]
+  ],
+  "prebot-states": [[21, "(function vector :behavior prebot)"]],
+  "wasall-obs": [
+    [0, "(function object)"],
+    [1, "(function object)"],
+    [2, "(function object)"],
+    [3, "(function object)"]
+  ],
+  "roboguard": [
+    [1, "(function cspace transformq none)"],
+    [2, "(function cspace transformq none)"],
+    [25, "(function int int float object :behavior roboguard)"],
+    [45, "(function roboguard symbol object)"]
+  ],
+  "vehicle": [
+    [6, "(function collide-shape-prim none)"],
+    [7, "(function collide-shape-prim none)"]
+  ],
+  "wvehicle-wheel": [
+    [7, "(function collide-shape-prim none)"],
+    [11, "(function collide-shape-prim none)"],
+    [17, "(function collide-shape-prim none)"]
+  ],
+  "wvehicle-states": [
+    [20, "(function collide-shape-prim none)"],
+    [22, "(function collide-shape-prim none)"]
+  ],
+  "wvehicle": [[6, "(function collide-shape-prim none)"]],
+  "pilot-states": [
+    [15, "(function surface surface surface int object :behavior target)"]
   ]
 }
diff --git a/decompiler/config/jak3/ntsc_v1/hacks.jsonc b/decompiler/config/jak3/ntsc_v1/hacks.jsonc
@@ -386,7 +386,35 @@
     "(anon-function 17 target-ladder)": [0, 1],
     "command-get-process": [46],
     "foreground-draw-hud": [0, 7, 8, 9, 16, 22],
-    "target-flut-falling-anim-trans": [8, 9]
+    "target-flut-falling-anim-trans": [8, 9],
+    "(method 12 nav-mesh)": [0, 1, 2, 9],
+    "(method 20 nav-mesh)": [9],
+    "(method 21 nav-mesh)": [7],
+    "(method 29 nav-mesh)": [0, 1, 2, 4],
+    "(method 33 nav-mesh)": [10, 11, 12, 13],
+    "(method 34 nav-mesh)": [0, 1, 2, 4],
+    "(method 35 nav-mesh)": [0, 1, 2, 4],
+    "(method 36 nav-mesh)": [1, 2],
+    "(method 37 nav-mesh)": [4],
+    "(method 45 nav-mesh)": [1, 2],
+    "(method 46 nav-mesh)": [1, 2, 19, 20],
+    "(method 48 nav-mesh)": [4, 5, 6, 8],
+    "(method 49 nav-mesh)": [0, 1, 2, 3, 5],
+    "(method 18 nav-control)": [11, 12, 19, 20, 31, 34],
+    "(method 19 nav-control)": [9, 10],
+    "(method 40 nav-state)": [1, 2],
+    "point-poly-distance-min": [0, 1, 2, 3, 4, 5, 6, 7, 10],
+    "find-closest-circle-ray-intersection": [0, 4, 15, 16, 17, 18],
+    "(method 39 vehicle)": [0, 10, 12, 15],
+    "(anon-function 7 vehicle-states)": [0, 2],
+    "(method 11 vehicle-hud-requests)": [0, 6, 7, 10],
+    "(anon-function 12 neo-juicer)": [29, 30],
+    "(method 160 neo-grenadier)": [1, 2, 3],
+    "(method 82 spydroid-orig)": [13],
+    "(method 118 vehicle)": [3, 4, 7, 8, 9, 10, 17, 26, 30, 31, 33],
+    "(method 25 squad-control)": [0, 4, 5, 7],
+    "target-pilot-post": [0, 29],
+    "(method 36 was-squad-control)": [0, 8, 11, 12, 14, 16]
   },
 
   // Sometimes the game might use format strings that are fetched dynamically,
@@ -415,7 +443,12 @@
     "(method 10 menu-loading-option)": [[113, 1]],
     "(method 10 menu-icon-info-option)": [[150, 1]],
     "(method 17 hud-goal)": [[71, 0]],
-    "(method 17 hud-miss)": [[71, 0]]
+    "(method 17 hud-miss)": [[71, 0]],
+    "(method 16 resetter)": [
+      [68, 1],
+      [101, 1],
+      [130, 1]
+    ]
   },
 
   "mips2c_functions_by_name": [
@@ -546,7 +579,8 @@
     "(method 9 font-work)",
     "(method 9 prim-strip)",
     "live-func-curve",
-    "birth-func-curve"
+    "birth-func-curve",
+    "sparticle-motion-blur-dirt"
   ],
 
   "mips2c_jump_table_functions": {},
@@ -562,8 +596,10 @@
     ["lfacctyb", 0, 0],
     ["intpfall", 0, 0],
     ["lfaccity", 0, 0],
+    ["lfacctyb-vis", 0, 0],
     ["ltowcity", 0, 0],
-    ["powergd", 0, 0]
+    ["powergd", 0, 0],
+    ["lcitysml", 0, 0]
   ],
 
   // some object files have garbage pad data at the end which makes the decompiler