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

revamp controller LED in jak 1 + reorganize some pc-settings things + fix some jak 2 decomp (#2719)

Browse Source
This commit is contained in:
ManDude
2023-06-13 19:26:44 +01:00
committed by GitHub
parent 1eec021593
commit e2c84d7635
63 changed files with 1406 additions and 1226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/config/jak1/all-types.gc
+1
View File
@@ -1674,6 +1674,7 @@
(input-opts-binds-unset #x1614)
(input-opts-binds-unknown #x1615)
(progress-no-other-resolution-options #x1616)
(input-opts-controller-led-reflect-heat #x1617)
;; GAME-TEXT-ID ENUM ENDS
)
decompiler/config/jak2/all-types.gc
+21 -24
View File
@@ -5150,14 +5150,14 @@
(deftype texture-anim-layer (structure)
((extra vector :inline :offset 240)
(func symbol :offset 256)
(func-id basic :offset 256)
(init-func symbol :offset 260)
(init-func-id basic :offset 260)
(tex texture :offset 264)
(func (function texture-anim-layer int) :offset 256)
(func-id symbol :offset 256)
(init-func (function texture-anim-layer int) :offset 260)
(init-func-id symbol :offset 260)
(tex texture :offset 264)
(start-time float :offset 268)
(end-time float :offset 272)
(tex-name basic :offset 276)
(tex-name string :offset 276)
(test gs-test :offset 280)
(alpha gs-alpha :offset 288)
(clamp gs-clamp :offset 296)
@@ -5182,19 +5182,19 @@
:size-assert #x130
:flag-assert #xb00000130
(:methods
(texture-anim-layer-method-9 () none 9)
(texture-anim-layer-method-10 () none 10)
(texture-anim-layer-method-9 (_type_) _type_ 9)
(texture-anim-layer-method-10 (_type_) _type_ 10)
)
)
(deftype texture-anim (structure)
((num-layers uint32 :offset-assert 0)
(func symbol :offset-assert 4)
(func-id basic :offset 4)
(init-func symbol :offset-assert 8)
(init-func-id basic :offset 8)
(func (function texture-anim int) :offset-assert 4)
(func-id symbol :offset 4)
(init-func (function texture-anim int) :offset-assert 8)
(init-func-id symbol :offset 8)
(tex texture :offset-assert 12)
(tex-name string :offset-assert 16)
(tex-name string :offset-assert 16)
(extra vector :inline :offset-assert 32)
(color rgba :offset-assert 48)
(frame-time float :offset-assert 52)
@@ -5209,8 +5209,8 @@
:size-assert #x58
:flag-assert #xb00000058
(:methods
(texture-anim-method-9 () none 9)
(texture-anim-method-10 () none 10)
(texture-anim-method-9 (_type_) _type_ 9)
(texture-anim-method-10 (_type_) _type_ 10)
)
)
@@ -5221,8 +5221,8 @@
:size-assert #x10
:flag-assert #xb00000010
(:methods
(texture-anim-array-method-9 (_type_) none 9)
(texture-anim-array-method-10 () none 10)
(texture-anim-array-method-9 (_type_) _type_ 9)
(texture-anim-array-method-10 (_type_) _type_ 10)
)
)
@@ -5237,7 +5237,7 @@
(corner2 vector :inline :offset-assert 192)
(corner3 vector :inline :offset-assert 208)
(const vector :inline :offset-assert 224)
(random vector 8 :inline :offset-assert 240)
(random vector4w 8 :inline :offset-assert 240)
(random-index uint8 :offset-assert 368)
)
:method-count-assert 9
@@ -18917,10 +18917,12 @@
(region-array region-array :offset-assert 192)
(collide-hash collide-hash :offset-assert 196)
;; 200 is some array
(wind-array uint32 :offset 200)
;; 204 is maybe that array's length
(wind-array-length int32 :offset 204)
(city-level-info city-level-info :offset 208)
(vis-spheres vector-array :offset 216)
(vis-spheres-length uint32 :offset 248)
(region-tree drawable-tree-region-prim :offset 252)
(tfrag-masks texture-masks-array :offset-assert 256)
@@ -18942,11 +18944,6 @@
(bsp-scale vector :inline :offset-assert 288)
(bsp-offset vector :inline :offset-assert 304)
(unk-data uint32 18 :offset 180)
(end uint8 :offset 399)
)
:method-count-assert 19
@@ -24875,7 +24872,7 @@
;; texture-anim ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; (define-extern *texture-anim-work* object)
(define-extern *texture-anim-work* texture-anim-work)
;; (define-extern texture-anim-layer-interp function)
;; (define-extern texture-anim-layer-add-shader function)
;; (define-extern texture-anim-layer-add-clut-shader function)
decompiler/config/jak2/ntsc_v1/type_casts.jsonc
+10 -1
View File
@@ -10374,5 +10374,14 @@
[[188, 246], "gp", "shadow-dcache"],
[93, "v1", "shadow-dcache"]
],
"(method 40 battle)": [[26, "v0", "enemy-option"]]
"(method 40 battle)": [[26, "v0", "enemy-option"]],
"(method 9 texture-anim)": [
[5, "v1", "symbol"],
[11, "v1", "symbol"],
["_stack_", 16, "texture-page"]
],
"(method 9 texture-anim-layer)": [
[5, "v1", "symbol"],
[11, "v1", "symbol"]
]
}
decompiler/util/data_decompile.cpp
+6 -1
View File
@@ -1428,7 +1428,12 @@ goos::Object decompile_structure(const TypeSpec& type,
// do nothing, the default is zero?
field_defs_out.emplace_back(field.name(), pretty_print::to_symbol("0"));
} else if (word.kind() == LinkedWord::SYM_PTR) {
if (word.symbol_name() == "#f" || word.symbol_name() == "#t") {
if (word.symbol_name() == "#f") {
field_defs_out.emplace_back(
field.name(), pretty_print::to_symbol(fmt::format("{}", word.symbol_name())));
} else if (!ts.tc(field.type(), TypeSpec("symbol"))) {
continue;
} else if (word.symbol_name() == "#t") {
field_defs_out.emplace_back(
field.name(), pretty_print::to_symbol(fmt::format("{}", word.symbol_name())));
} else {