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

decomp: shuttle (#2444)

Browse Source
This commit is contained in:
Hat Kid
2023-04-01 00:17:47 +02:00
committed by GitHub
parent 57b5117cae
commit 318c76775c
9 changed files with 3854 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/config/jak2/all-types.gc
+40 -41
View File
@@ -41734,47 +41734,6 @@
;; ctyindb-obs ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; shuttle ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; (declare-type citizen nav-enemy)
;; (declare-type citizen-norm citizen)
;; (deftype citizen-rebel (citizen-norm)
;; ((nav-mesh-aid uint32 :offset-assert 1056)
;; (done? basic :offset-assert 1060)
;; (task-node uint16 :offset-assert 1064)
;; (end-pos vector :inline :offset-assert 1068)
;; (index uint32 :offset-assert 1084)
;; (gui-id uint32 :offset-assert 1088)
;; )
;; :method-count-assert 219
;; :size-assert #x448
;; :flag-assert #xdb03d00448
;; (:methods
;; )
;; )
;; (deftype city-shuttle-info (structure)
;; ((pos vector :inline :offset-assert 0)
;; (level basic :offset-assert 16)
;; (nav-mesh-id uint32 :offset-assert 20)
;; (time time-frame :offset-assert 24)
;; )
;; :method-count-assert 9
;; :size-assert #x20
;; :flag-assert #x900000020
;; )
;; (define-extern *citizen-rebel-global-info* civilian-global-info)
;; (define-extern *citizen-rebel-nav-enemy-info* nav-enemy-info)
;; ;; (define-extern shuttle-init function)
;; ;; (define-extern shuttle-cleanup function)
;; ;; (define-extern shuttle-update function)
;; ;; (define-extern *city-shuttle-info* array)
;; ;; (define-extern *city-burning-bush-shuttle-1-info* array)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; fordumpa-texture ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -51426,6 +51385,46 @@
)
)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; shuttle ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; this block was moved
(deftype citizen-rebel (citizen-norm)
((nav-mesh-aid actor-id :offset-assert 1060)
(done? symbol :offset-assert 1064)
(task-node uint16 :offset-assert 1068)
(end-pos vector :inline :offset-assert 1072)
(index uint32 :offset-assert 1088)
(gui-id uint32 :offset-assert 1092)
)
:method-count-assert 219
:size-assert #x448
:flag-assert #xdb03d00448
(:methods
)
)
(deftype city-shuttle-info (structure)
((pos vector :inline :offset-assert 0)
(level symbol :offset-assert 16)
(nav-mesh-id uint32 :offset-assert 20)
(time time-frame :offset-assert 24)
)
:method-count-assert 9
:size-assert #x20
:flag-assert #x900000020
)
(define-extern *citizen-rebel-global-info* civilian-global-info)
(define-extern *citizen-rebel-nav-enemy-info* nav-enemy-info)
(define-extern shuttle-init (function task-manager (array city-shuttle-info) none))
(define-extern shuttle-cleanup (function task-manager none))
(define-extern shuttle-update (function task-manager (array city-shuttle-info) uint none))
(define-extern *city-shuttle-info* (array city-shuttle-info))
(define-extern *city-burning-bush-shuttle-1-info* (array city-shuttle-info))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; metalhead-predator ;;
decompiler/config/jak2/ntsc_v1/anonymous_function_types.jsonc
+16
View File
@@ -1790,5 +1790,21 @@
[97, "(function grim-sewer none)"],
[98, "(function grim-sewer none)"],
[99, "(function object grim-sewer symbol)"]
],
"shuttle": [
[0, "(function none :behavior task-manager)"],
[1, "(function none :behavior task-manager)"],
[2, "(function none :behavior task-manager)"],
[3, "(function symbol :behavior task-manager)"],
[4, "(function none :behavior task-manager)"],
[5, "(function none :behavior task-manager)"],
[6, "(function citizen-rebel object symbol none :behavior task-manager)"],
[7, "(function none :behavior task-manager)"],
[8, "(function none :behavior task-manager)"],
[9, "(function none :behavior task-manager)"],
[10, "(function none :behavior task-manager)"],
[11, "(function none :behavior task-manager)"],
[12, "(function none :behavior task-manager)"],
[13, "(function citizen-rebel object symbol none :behavior task-manager)"]
]
}
decompiler/config/jak2/ntsc_v1/inputs.jsonc
+1
View File
@@ -512,6 +512,7 @@
"LRACELIT.DGO",
"LSACK.DGO",
"LSAMERGD.DGO",
"LSHUTTLE.DGO",
"LSMYSBRT.DGO",
"LTENTOB.DGO",
"LTENTOUT.DGO",
decompiler/config/jak2/ntsc_v1/label_types.jsonc
+5 -1
View File
@@ -1895,5 +1895,9 @@
"mog2-course": [["L295", "uint64", true]],
"jinx2-course": [["L306", "uint64", true]],
"grim2-course": [["L283", "uint64", true]],
"vortex": [["L29", "vector"]]
"vortex": [["L29", "vector"]],
"shuttle": [
["L348", "vector"],
["L337", "vector"]
]
}
decompiler/config/jak2/ntsc_v1/stack_structures.jsonc
+6
View File
@@ -2233,5 +2233,11 @@
"rift-rider-travel-post": [
[160, "vector"],
[176, "vector"]
],
"(code exit-vehicle citizen-rebel)": [
[96, "vector"],
[112, "vector"],
[128, "quaternion"],
[48, "quaternion"]
]
}
decompiler/config/jak2/ntsc_v1/type_casts.jsonc
+56 -6
View File
@@ -11016,9 +11016,7 @@
[[79, 86], "a0", "(pointer uint32)"],
[[87, 94], "a0", "(pointer vif-tag)"]
],
"init-vortex-polys": [
[[34, 40], "t0", "(pointer float)"]
],
"init-vortex-polys": [[[34, 40], "t0", "(pointer float)"]],
"draw-vortex": [
[[31, 38], "a0", "dma-packet"],
[[40, 47], "a0", "gs-gif-tag"],
@@ -11063,8 +11061,60 @@
[352, "a0", "(array object)"],
[384, "a0", "(array object)"],
[386, "a0", "(array object)"]
],
"(code wait citizen-rebel)": [
[101, "v1", "art-joint-anim"],
[150, "v1", "art-joint-anim"]
],
"(code wait-for-ride citizen-rebel)": [
[101, "v1", "art-joint-anim"],
[150, "v1", "art-joint-anim"]
],
"(trans wait-for-ride citizen-rebel)": [[13, "v1", "vehicle"]],
"(code exit-vehicle citizen-rebel)": [
[11, "a0", "vehicle"],
[14, "a0", "vehicle"],
[143, "s3", "vehicle"],
[146, "s3", "vehicle"],
[229, "s4", "vehicle"],
[232, "s4", "vehicle"],
[249, "s4", "vehicle"],
[253, "a0", "vehicle"],
[271, "v1", "vehicle"],
[325, "a0", "vehicle"],
[329, "a0", "vehicle"],
[39, "s4", "vehicle"],
[42, "s4", "vehicle"],
[47, "s4", "vehicle"],
[70, "a0", "vehicle"],
[74, "a0", "vehicle"],
[151, "s3", "vehicle"],
[251, "s4", "vehicle"]
],
"(code get-up-back citizen-rebel)": [[20, "v1", "art-joint-anim"]],
"(code get-up-front citizen-rebel)": [[20, "v1", "art-joint-anim"]],
"shuttle-update": [
[604, "s2", "citizen-rebel"],
[614, "s2", "citizen-rebel"],
[642, "s2", "citizen-rebel"],
[648, "s2", "citizen-rebel"],
[682, "s2", "citizen-rebel"],
[686, "s2", "citizen-rebel"],
[741, "s4", "vehicle"],
[744, "s4", "vehicle"],
[746, "s2", "citizen-rebel"],
[753, "s4", "vehicle"],
[773, "s4", "vehicle"],
[775, "s2", "citizen-rebel"],
[834, "s2", "citizen-rebel"],
[802, "s2", "citizen-rebel"],
[958, "v0", "citizen-rebel"],
[966, "v0", "citizen-rebel"],
[[980, 1001], "v0", "citizen-rebel"],
[1046, "s4", "process-drawable"],
[1074, "s4", "process-focusable"],
[1081, "s2", "process-drawable"],
[1094, "s2", "process-drawable"],
[1126, "s4", "citizen-rebel"]
]
}
goal_src/jak2/characters/underground_fighters/shuttle.gc
+1820
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/jak2/characters/underground_fighters/shuttle_REF.gc
Generated Vendored
+1909
View File
File diff suppressed because it is too large Load Diff
test/offline/config/jak2/config.jsonc
+1
View File
@@ -50,6 +50,7 @@
"DGO/LMEETBRT.DGO",
"DGO/LPORTRUN.DGO",
"DGO/LSACK.DGO",
"DGO/LSHUTTLE.DGO",
"DGO/MCN.DGO",
"DGO/MTN.DGO",
"DGO/NEB.DGO",