From 4ebb9612467616d727145bd94695cc40ec1434f0 Mon Sep 17 00:00:00 2001
From: ManDude <7569514+ManDude@users.noreply.github.com>
Date: Thu, 30 Jun 2022 06:22:58 +0100
Subject: [PATCH] fix windows scripts for jak 2 (#1580)

* fix scripts for jak 2

* delete duplicates

* disable game text for now (unsupported)
---
 .vs/launch.vs.json                   |  4 ++--
 decompiler/config/jak2_ntsc_v1.jsonc | 28 +++++++++++++++++++++-------
 goal_src/{jak1 => }/user/.gitignore  |  0
 goal_src/{jak1 => }/user/readme.md   |  0
 scripts/batch/decomp-jak2.bat        |  2 +-
 5 files changed, 24 insertions(+), 10 deletions(-)
 rename goal_src/{jak1 => }/user/.gitignore (100%)
 rename goal_src/{jak1 => }/user/readme.md (100%)

diff --git a/.vs/launch.vs.json b/.vs/launch.vs.json
index 7bb03e1e47..590b013630 100644
--- a/.vs/launch.vs.json
+++ b/.vs/launch.vs.json
@@ -103,14 +103,14 @@
       "project" : "CMakeLists.txt",
       "projectTarget" : "decompiler.exe (bin\\decompiler.exe)",
       "name" : "Run - Disassembler - Jak 1",
-      "args" : [ "${workspaceRoot}/decompiler/config/jak1_ntsc_black_label.jsonc", "${workspaceRoot}/iso_data", "${workspaceRoot}/decompiler_out/jak1_ir1"]
+      "args" : [ "${workspaceRoot}/decompiler/config/jak1_ntsc_black_label.jsonc", "${workspaceRoot}/iso_data", "${workspaceRoot}/decompiler_out"]
     },
     {
       "type" : "default",
       "project" : "CMakeLists.txt",
       "projectTarget" : "decompiler.exe (bin\\decompiler.exe)",
       "name" : "Run - Decompiler - Jak 2",
-      "args" : [ "${workspaceRoot}/decompiler/config/jak2_ntsc_v1.jsonc", "${workspaceRoot}/iso_data/jak2", "${workspaceRoot}/decompiler_out/jak2"]
+      "args" : [ "${workspaceRoot}/decompiler/config/jak2_ntsc_v1.jsonc", "${workspaceRoot}/iso_data", "${workspaceRoot}/decompiler_out"]
     },
     {
       "type" : "default",
diff --git a/decompiler/config/jak2_ntsc_v1.jsonc b/decompiler/config/jak2_ntsc_v1.jsonc
index 377f090818..48c43cbe4b 100644
--- a/decompiler/config/jak2_ntsc_v1.jsonc
+++ b/decompiler/config/jak2_ntsc_v1.jsonc
@@ -19,7 +19,7 @@
   "disassemble_code": true,
 
   // Run the decompiler
-  "decompile_code": true,
+  "decompile_code": false,
 
   "find_functions": true,
 
@@ -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": true,
   // write goal imports for art groups
@@ -51,6 +51,9 @@
   // this is a guess at where each symbol is first defined/used.
   "generate_symbol_definition_map": false,
 
+  // genreate the all-types file
+  "generate_all_types" : false,
+
   // debug option for instruction decoder
   "write_hex_near_instructions": false,
 
@@ -68,10 +71,6 @@
   // set to true for PAL versions. this will forcefully skip files that have some data missing at the end.
   "is_pal": false,
 
-  "generate_all_types": true,
-  "write_patches": false,
-  "apply_patches": false,
-  "object_patches": [],
   // jak 1's all-types, used to generate "hints"
   "old_all_types_file": "decompiler/config/all-types.gc",
 
@@ -105,5 +104,20 @@
   "levels_convert_to_obj": false,
   // should we extract collision meshes?
   // these can be displayed in game, but makes the .fr3 files slightly larger
-  "extract_collision": true
+  "extract_collision": true,
+
+  ////////////////////////////
+  // PATCHING OPTIONS
+  ////////////////////////////
+  
+  // these are options related to xdelta3 patches on specific objects
+  // this allows us to get a more consistent input 
+  
+  // set to true to write new patch files
+  "write_patches": false,
+  // set to true to apply patch files
+  "apply_patches": true,
+  // what to patch an object to and what the patch file is
+  "object_patches": {
+  }
 }
diff --git a/goal_src/jak1/user/.gitignore b/goal_src/user/.gitignore
similarity index 100%
rename from goal_src/jak1/user/.gitignore
rename to goal_src/user/.gitignore
diff --git a/goal_src/jak1/user/readme.md b/goal_src/user/readme.md
similarity index 100%
rename from goal_src/jak1/user/readme.md
rename to goal_src/user/readme.md
diff --git a/scripts/batch/decomp-jak2.bat b/scripts/batch/decomp-jak2.bat
index b7dd544456..2958d5e07b 100644
--- a/scripts/batch/decomp-jak2.bat
+++ b/scripts/batch/decomp-jak2.bat
@@ -1,4 +1,4 @@
 @echo off
 cd ..\..
-out\build\Release\bin\decompiler decompiler\config\jak2_ntsc_v1.jsonc iso_data\jak2 decompiler_out\jak2
+out\build\Release\bin\decompiler decompiler\config\jak2_ntsc_v1.jsonc iso_data\ decompiler_out\
 pause