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

decomp: finish stadium-obs (#2294)

Browse Source 
Co-authored-by: water <awaterford111445@gmail.com>
This commit is contained in:
Hat Kid
2023-03-11 21:55:39 +01:00
committed by GitHub
parent 77242bd12e
commit a1dee19d0d
8 changed files with 7075 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/config/jak2/all-types.gc
+10 -9
View File
@@ -45223,8 +45223,8 @@
(deftype rift-rider (rigid-body-object)
(
(escort-actor actor-reference 2 :inline :offset-assert 272) ;; elt size: 8
(escort-force vector 2 :inline :offset-assert 288) ;; elt size: 16
(escort-actor entity-actor 2 :offset-assert 272) ;; elt size: 8
(escort-force vector 2 :inline :offset-assert 288) ;; elt size: 16
(brutter-balloon-actor entity-actor :offset-assert 320)
(path-pos float :offset-assert 324)
(dest-pos vector :inline :offset-assert 336)
@@ -45233,7 +45233,7 @@
(init-height float :offset-assert 360)
(battle-entity-triggered int32 :offset-assert 364)
(battle-info-index int32 :offset-assert 368)
(sound-id uint32 :offset-assert 372)
(sound-id sound-id :offset-assert 372)
(hover-volume float :offset-assert 376)
)
:method-count-assert 58
@@ -45315,10 +45315,11 @@
(move-rift-rider () _type_ :state 29)
(hit () _type_ :state 30)
(die () _type_ :state 31)
(stad-samos-method-32 (_type_) none 32)
(stad-samos-method-33 (_type_) none 33)
(stad-samos-method-34 (_type_) none 34)
(stad-samos-method-35 (_type_) none 35))
(init! (_type_) none 32)
(get-position (_type_) symbol 33)
(spawn-lightning (_type_) none 34)
(kill-lightning (_type_) none 35)
)
)
(deftype stad-youngsamos (stad-samos)
@@ -45409,14 +45410,14 @@
(define-extern *rift-rider-battle-table* (array rift-rider-battle-info))
(define-extern defend-stadium-rift-rider-handler (function process int symbol event-message-block object :behavior rift-rider))
(define-extern rift-rider-travel-post (function none :behavior rift-rider))
;; (define-extern rift-rider-bounce-reaction function)
(define-extern rift-rider-bounce-reaction (function control-info collide-query vector vector collide-status))
(define-extern *stad-nav-callback-info* nav-callback-info)
(define-extern *stad-samos-lightning-joint-tbl* (array int32))
(define-extern stad-samos-post (function none :behavior stad-samos))
(define-extern spawn-energy (function none :behavior stad-samos))
(define-extern stad-samos-handler (function process int symbol event-message-block object :behavior stad-samos))
(define-extern stadium-barrier-init-by-other (function vector quaternion vector none :behavior stadium-barrier))
(define-extern stadium-barrier-spawn (function stad-force-field vector quaternion vector (pointer process)))
(define-extern stadium-barrier-spawn (function stad-force-field vector quaternion vector (pointer stadium-barrier)))
(define-extern stad-keira-init-by-other (function none :behavior stad-keira))
(define-extern stad-brutter-init-by-other (function none :behavior stad-keira))
(define-extern *suppress-stadium* traffic-suppression-params)
decompiler/config/jak2/ntsc_v1/anonymous_function_types.jsonc
+2 -1
View File
@@ -1146,7 +1146,8 @@
[62, "(function object nav-control none)"],
[63, "(function object nav-control none)"],
[64, "(function object nav-control none)"],
[65, "(function object nav-control none)"]
[65, "(function object nav-control none)"],
[93, "(function rift-rider vector vector vector float)"]
],
"forrescb-obs": [
[0, "(function none :behavior task-manager)"],
decompiler/config/jak2/ntsc_v1/stack_structures.jsonc
+5 -1
View File
@@ -2229,5 +2229,9 @@
"(anon-function 30 hal2-course)": [[16, "event-message-block"]],
"(enter ambush gun-buoy)": [[32, "vector"]],
"gun-buoy-chase-post": [[32, "vector"]],
"(code open-guns gun-buoy)": [[16, "vector"]]
"(code open-guns gun-buoy)": [[16, "vector"]],
"rift-rider-travel-post": [
[160, "vector"],
[176, "vector"]
]
}