From ba6aa08155cc87b1a1ca2668fa720e7f34b2eaea Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Sat, 18 Jun 2022 23:14:18 +0100 Subject: [PATCH] `load-boundary` PAL patch --- decompiler/config/jak1_pal.jsonc | 8 ++++---- decompiler/config/jak1_pal/label_types.jsonc | 4 ++-- goal_src/engine/level/load-boundary.gc | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/decompiler/config/jak1_pal.jsonc b/decompiler/config/jak1_pal.jsonc index 244b3947b9..9bc8726b3c 100644 --- a/decompiler/config/jak1_pal.jsonc +++ b/decompiler/config/jak1_pal.jsonc @@ -6,7 +6,7 @@ // if you want to filter to only some object names. // it will make the decompiler much faster. - "allowed_objects": [], + "allowed_objects": ["load-boundary", "helix-slide-door-ag", "helix-button-ag"], "banned_objects": [], //////////////////////////// @@ -18,10 +18,10 @@ "disassemble_code": false, // Run the decompiler - "decompile_code": false, + "decompile_code": true, // run the first pass of the decompiler - "find_functions": false, + "find_functions": true, //////////////////////////// // DATA ANALYSIS OPTIONS @@ -35,7 +35,7 @@ // unpack textures to assets folder "process_tpages": false, // unpack game text to assets folder - "process_game_text": true, + "process_game_text": false, // unpack game count to assets folder "process_game_count": false, // write goal imports for art groups diff --git a/decompiler/config/jak1_pal/label_types.jsonc b/decompiler/config/jak1_pal/label_types.jsonc index 7580bef843..938d629912 100644 --- a/decompiler/config/jak1_pal/label_types.jsonc +++ b/decompiler/config/jak1_pal/label_types.jsonc @@ -1994,8 +1994,8 @@ "sparticle-launcher": [["L193", "adgif-shader"]], "load-boundary": [ - //["L327", "(inline-array lbvtx)", 12], - //["L324", "vector"] + ["L328", "(inline-array lbvtx)", 12], + ["L325", "vector"] ], "cam-debug": [ diff --git a/goal_src/engine/level/load-boundary.gc b/goal_src/engine/level/load-boundary.gc index 8e56a6bed9..c40c4d251f 100644 --- a/goal_src/engine/level/load-boundary.gc +++ b/goal_src/engine/level/load-boundary.gc @@ -2135,6 +2135,10 @@ ((= v1-4 'setting-unset) (remove-setting! (the-as symbol (command-get-param (car gp-0) #f))) ) + ;; PAL patch here + ((= v1-4 'sfx-volume) + (set-setting! 'sfx-volume (command-get-param (car gp-0) #f) (command-get-float (car (cdr gp-0)) 0.0) 0) + ) ((= v1-4 'blackout) (set-blackout-frames (the int (* 5.0000005 (the float (command-get-int (car gp-0) 0))))