From 7878167cd94132da2a14a3b6677faa71cebc506a Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Mon, 9 Aug 2021 00:26:38 -0400 Subject: [PATCH] decomp: 1 function left - new decomp issue now ConditionalMoveFalseElement::push_to_stack --- .../config/jak1_ntsc_black_label/label_types.jsonc | 1 + .../config/jak1_ntsc_black_label/type_casts.jsonc | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/decompiler/config/jak1_ntsc_black_label/label_types.jsonc b/decompiler/config/jak1_ntsc_black_label/label_types.jsonc index 3f0c8661d1..8f784e77d4 100644 --- a/decompiler/config/jak1_ntsc_black_label/label_types.jsonc +++ b/decompiler/config/jak1_ntsc_black_label/label_types.jsonc @@ -1414,6 +1414,7 @@ ], "nav-enemy": [ + ["L349", "attack-info", true], ["L353", "float", true], ["L354", "float", true], ["L355", "float", true], diff --git a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc index 43c203f05f..da9cb3dfc0 100644 --- a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc +++ b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc @@ -1801,6 +1801,12 @@ "nav-enemy-set-base-collide-sphere-collide-with": [ [[0, 999], "s6", "nav-enemy"], + [32, "v1", "collide-shape-prim-sphere"], + [33, "s5", "collide-shape-prim-group"], + [37, "v1", "collide-shape-prim-sphere"], + [38, "s5", "collide-shape-prim-group"], + [42, "v1", "collide-shape-prim-sphere"], + [43, "s5", "collide-shape-prim-group"], [50, "s4", "collide-shape-prim-group"] ], @@ -2134,5 +2140,11 @@ [[0, 999], "s6", "process-drawable"] ], + "(method 7 nav-enemy)": [ + [5, "v1", "int"], + [10, "v1", "int"], + [19, "t9", "(function process-drawable int none)"] + ], + "placeholder-do-not-add-below": [] }