From cdf13a92ecc05939dc46c64b1a4a2b1a03d38991 Mon Sep 17 00:00:00 2001 From: jabermony <748988+jabermony@users.noreply.github.com> Date: Fri, 20 Oct 2023 06:40:24 +0100 Subject: [PATCH] Add label_types file merge for PAL version (#3086) --- decompiler/config/jak2/jak2_config.jsonc | 1 + decompiler/config/jak2/pal/label_types.jsonc | 1 + 2 files changed, 2 insertions(+) diff --git a/decompiler/config/jak2/jak2_config.jsonc b/decompiler/config/jak2/jak2_config.jsonc index 2aa7e149e6..60b04da07e 100644 --- a/decompiler/config/jak2/jak2_config.jsonc +++ b/decompiler/config/jak2/jak2_config.jsonc @@ -138,6 +138,7 @@ "pal": { "game_name": "jak2_pal", "expected_elf_name": "SCES_516.08", + "label_types_merge_file": "decompiler/config/jak2/pal/label_types.jsonc", "is_pal": true, "object_patches": {} }, diff --git a/decompiler/config/jak2/pal/label_types.jsonc b/decompiler/config/jak2/pal/label_types.jsonc index 531397cec8..6c4c3ba7e9 100644 --- a/decompiler/config/jak2/pal/label_types.jsonc +++ b/decompiler/config/jak2/pal/label_types.jsonc @@ -1,5 +1,6 @@ { "progress": [ + ["L879", "progress-global-state"], ["L880", "uint64", true], ["L881", "uint64", true], ["L882", "uint64", true],