mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-07-07 14:13:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

[jak2] bring other version fixes to source (#2528)

Browse Source 
- [x] compare NTSC-K
- [x] compare NTSC-J
- [x] compare PAL
- [x] figure out version order
- [x] ~~write delta patch for spanish text~~ no need for now

Fixes #2530
This commit is contained in:
ManDude
2023-04-23 20:11:08 +01:00
committed by GitHub
parent a264b6539b
commit c44256144e
19 changed files with 170 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/config/jak2/all-types.gc
+1 -1
View File
@@ -21327,7 +21327,7 @@
:flag-assert #xb00000034
(:methods
(draw (_type_ dma-buffer level) none 9)
(hud-sprite-method-10 (_type_) none 10)
(hud-sprite-method-10 (_type_ dma-buffer level int int int int) object 10)
)
)
decompiler/config/jak2/jak2_config.jsonc
+20 -3
View File
@@ -134,11 +134,28 @@
"game_name": "jak2_pal",
"expected_elf_name": "SCES_516.08",
"is_pal": true,
"type_casts_merge_file": "decompiler/config/jak2/pal/type_casts.jsonc",
"label_types_merge_file": "decompiler/config/jak2/pal/label_types.jsonc",
"hacks_merge_file": "decompiler/config/jak2/pal/hacks.jsonc",
"obj_file_name_map_file": "goal_src/jak2/build/all_objs.json",
"object_patches": {}
},
"ntsc_v2": {
"game_name": "jak2_us2",
"label_types_merge_file": "decompiler/config/jak2/ntsc_v2/label_types.jsonc",
"anonymous_function_types_merge_file": "decompiler/config/jak2/ntsc_v2/anonymous_function_types.jsonc",
"obj_file_name_map_file": "goal_src/jak2/build/all_objs.json",
"object_patches": {}
},
"jp": {
"game_name": "jak2_jp",
"expected_elf_name": "SCPS_150.57",
"label_types_merge_file": "decompiler/config/jak2/jp/label_types.jsonc",
"anonymous_function_types_merge_file": "decompiler/config/jak2/ntsc_v2/anonymous_function_types.jsonc",
"object_patches": {}
},
"ko": {
"game_name": "jak2_ko",
"expected_elf_name": "SCKA_200.10",
"anonymous_function_types_merge_file": "decompiler/config/jak2/ko/anonymous_function_types.jsonc",
"object_patches": {}
}
}
}
decompiler/config/jak2/jp/label_types.jsonc
+39
View File
@@ -0,0 +1,39 @@
{
"progress": [
["L880", "uint64", true],
["L881", "uint64", true],
["L882", "uint64", true],
["L883", "uint64", true],
["L884", "uint64", true],
["L885", "uint64", true],
["L886", "uint64", true],
["L887", "uint64", true],
["L888", "uint64", true],
["L889", "uint64", true],
["L890", "uint64", true],
["L891", "uint64", true],
["L892", "uint64", true],
["L893", "uint64", true],
["L894", "uint64", true],
["L954", "uint64", true],
["L955", "uint64", true]
],
"stadium-obs": [
["L679", "uint64", true],
["L680", "uint64", true],
["L681", "uint64", true],
["L682", "uint64", true],
["L683", "uint64", true],
["L684", "uint64", true],
["L685", "uint64", true],
["L686", "uint64", true],
["L578", "uint64", true],
["L577", "uint64", true],
["L576", "uint64", true],
["L575", "uint64", true],
["L574", "uint64", true],
["L573", "uint64", true],
["L461", "attack-info"],
["L459", "attack-info"]
]
}
decompiler/config/jak2/ko/anonymous_function_types.jsonc
+5
View File
@@ -0,0 +1,5 @@
{
"hud": [
[14, "(function object :behavior hud)"]
]
}
decompiler/config/jak2/ntsc_v2/anonymous_function_types.jsonc
+17
View File
@@ -0,0 +1,17 @@
{
"stadium-obs": [
[3, "(function none :behavior task-manager)"],
[4, "(function none :behavior task-manager)"],
[5, "(function none :behavior task-manager)"],
[6, "(function none :behavior task-manager)"],
[7, "(function none :behavior task-manager)"],
[8, "(function none :behavior task-manager)"],
[25, "(function none)"],
[62, "(function object nav-control none)"],
[63, "(function object nav-control none)"],
[64, "(function object nav-control none)"],
[65, "(function object nav-control none)"],
[66, "(function object nav-control none)"],
[94, "(function rift-rider vector vector vector float)"]
]
}
decompiler/config/jak2/ntsc_v2/label_types.jsonc
+20
View File
@@ -0,0 +1,20 @@
{
"stadium-obs": [
["L679", "uint64", true],
["L680", "uint64", true],
["L681", "uint64", true],
["L682", "uint64", true],
["L683", "uint64", true],
["L684", "uint64", true],
["L685", "uint64", true],
["L686", "uint64", true],
["L578", "uint64", true],
["L577", "uint64", true],
["L576", "uint64", true],
["L575", "uint64", true],
["L574", "uint64", true],
["L573", "uint64", true],
["L461", "attack-info"],
["L459", "attack-info"]
]
}
decompiler/config/jak2/pal/hacks.jsonc
-1
View File
@@ -1 +0,0 @@
{}
decompiler/config/jak2/pal/label_types.jsonc
+21 -1
View File
@@ -1 +1,21 @@
{}
{
"progress": [
["L880", "uint64", true],
["L881", "uint64", true],
["L882", "uint64", true],
["L883", "uint64", true],
["L884", "uint64", true],
["L885", "uint64", true],
["L886", "uint64", true],
["L887", "uint64", true],
["L888", "uint64", true],
["L889", "uint64", true],
["L890", "uint64", true],
["L891", "uint64", true],
["L892", "uint64", true],
["L893", "uint64", true],
["L894", "uint64", true],
["L954", "uint64", true],
["L955", "uint64", true]
]
}
decompiler/config/jak2/pal/type_casts.jsonc
-1
View File
@@ -1 +0,0 @@
{}
game/graphics/opengl_renderer/OpenGLRenderer.cpp
+12
View File
@@ -122,6 +122,9 @@ void OpenGLRenderer::init_bucket_renderers_jak2() {
init_bucket_renderer<Merc2>(
fmt::format("merc-l{}-tfrag", i), BucketCategory::MERC,
GET_BUCKET_ID_FOR_LIST(BucketId::MERC_L0_TFRAG, BucketId::MERC_L1_TFRAG, i));
init_bucket_renderer<Generic2>(
fmt::format("gmerc-l{}-tfrag", i), BucketCategory::MERC,
GET_BUCKET_ID_FOR_LIST(BucketId::GMERC_L0_TFRAG, BucketId::GMERC_L1_TFRAG, i));
init_bucket_renderer<TextureUploadHandler>(
fmt::format("tex-l{}-shrub", i), BucketCategory::TEX,
@@ -132,6 +135,9 @@ void OpenGLRenderer::init_bucket_renderers_jak2() {
init_bucket_renderer<Merc2>(
fmt::format("merc-l{}-shrub", i), BucketCategory::MERC,
GET_BUCKET_ID_FOR_LIST(BucketId::MERC_L0_SHRUB, BucketId::MERC_L1_SHRUB, i));
init_bucket_renderer<Generic2>(
fmt::format("gmerc-l{}-shrub", i), BucketCategory::MERC,
GET_BUCKET_ID_FOR_LIST(BucketId::GMERC_L0_SHRUB, BucketId::GMERC_L1_SHRUB, i));
init_bucket_renderer<TextureUploadHandler>(
fmt::format("tex-l{}-alpha", i), BucketCategory::TEX,
@@ -151,6 +157,9 @@ void OpenGLRenderer::init_bucket_renderers_jak2() {
init_bucket_renderer<Merc2>(
fmt::format("merc-l{}-alpha", i), BucketCategory::MERC,
GET_BUCKET_ID_FOR_LIST(BucketId::MERC_L0_ALPHA, BucketId::MERC_L1_ALPHA, i));
init_bucket_renderer<Generic2>(
fmt::format("gmerc-l{}-alpha", i), BucketCategory::GENERIC,
GET_BUCKET_ID_FOR_LIST(BucketId::GMERC_L0_ALPHA, BucketId::GMERC_L1_ALPHA, i));
init_bucket_renderer<TextureUploadHandler>(
fmt::format("tex-l{}-pris", i), BucketCategory::TEX,
@@ -168,6 +177,9 @@ void OpenGLRenderer::init_bucket_renderers_jak2() {
init_bucket_renderer<Merc2>(
fmt::format("merc-l{}-pris2", i), BucketCategory::MERC,
GET_BUCKET_ID_FOR_LIST(BucketId::MERC_L0_PRIS2, BucketId::MERC_L1_PRIS2, i));
init_bucket_renderer<Generic2>(
fmt::format("gmerc-l{}-pris2", i), BucketCategory::GENERIC,
GET_BUCKET_ID_FOR_LIST(BucketId::GMERC_L0_PRIS2, BucketId::GMERC_L1_PRIS2, i));
init_bucket_renderer<TextureUploadHandler>(
fmt::format("tex-l{}-water", i), BucketCategory::TEX,
goal_src/jak2/engine/ui/hud-h.gc
+1 -1
View File
@@ -56,7 +56,7 @@
:flag-assert #xb00000034
(:methods
(draw (_type_ dma-buffer level) none 9)
(hud-sprite-method-10 (_type_) none 10)
(hud-sprite-method-10 (_type_ dma-buffer level int int int int) object 10)
)
)
goal_src/jak2/engine/ui/hud.gc
+2 -1
View File
@@ -910,8 +910,9 @@
)
(defmethod alloc-string-if-needed hud ((obj hud) (arg0 int))
;; jp patch here (32 -> 64)
(if (not (-> obj strings arg0 text))
(set! (-> obj strings arg0 text) (new 'process 'string 32 (the-as string #f)))
(set! (-> obj strings arg0 text) (new 'process 'string 64 (the-as string #f)))
)
0
(none)
goal_src/jak2/engine/ui/progress/progress.gc
+4 -4
View File
@@ -1628,11 +1628,11 @@
(case (-> self next) ;; patched to next instead of current because we save synchronously
(('formatting 'format-card)
(set-next-state self 'error-formatting 0)
)
(('creating)
) ;; jp patch
(('creating 'create-game)
(set-next-state self 'error-creating 0)
)
(('saving 'select-save 'select-save-title 'select-save-title-hero)
) ;; jp patch
(('saving 'select-save 'select-save-title 'select-save-title-hero 'already-exists)
(set-next-state self 'error-saving 0)
)
(('loading 'select-load)
goal_src/jak2/levels/stadium/stadium-obs.gc
+11
View File
@@ -3284,6 +3284,17 @@ This commonly includes things such as:
)
)
;; jp patch
(set-subtask-hook!
*game-info*
236
0
(the-as
(function object)
(lambda :behavior task-manager () (task-close! "stadium-burning-bush-race-board-introduction") (none))
)
)
(set-subtask-hook!
*game-info*
236
scripts/batch/decomp-jak2_jp.bat
+4
View File
@@ -0,0 +1,4 @@
@echo off
cd ..\..
out\build\Release\bin\decompiler decompiler\config\jak2\jak2_config.jsonc iso_data\ decompiler_out\ --version jp
pause
scripts/batch/decomp-jak2_ko.bat
+4
View File
@@ -0,0 +1,4 @@
@echo off
cd ..\..
out\build\Release\bin\decompiler decompiler\config\jak2\jak2_config.jsonc iso_data\ decompiler_out\ --version ko
pause
scripts/batch/decomp-jak2_pal.bat
+4
View File
@@ -0,0 +1,4 @@
@echo off
cd ..\..
out\build\Release\bin\decompiler decompiler\config\jak2\jak2_config.jsonc iso_data\ decompiler_out\ --version pal
pause
scripts/batch/decomp-jak2_us2.bat
+4
View File
@@ -0,0 +1,4 @@
@echo off
cd ..\..
out\build\Release\bin\decompiler decompiler\config\jak2\jak2_config.jsonc iso_data\ decompiler_out\ --version ntsc_v2
pause
test/decompiler/reference/jak2/engine/ui/hud-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -47,7 +47,7 @@
:flag-assert #xb00000034
(:methods
(draw (_type_ dma-buffer level) none 9)
(hud-sprite-method-10 (_type_) none 10)
(hud-sprite-method-10 (_type_ dma-buffer level int int int int) object 10)
)
)