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

[decomp] collectables + works ingame! (#971)

Browse Source 
* decomp: `collectables`

* fix types

* `powerups` and fixes

* fixes

* Merge branch 'pr/929' into d/temp/collectables

* fix collide stuff

* update things...

* update

* update

* temp bump global heap mem

* fix `defstate` hooks wrong/unnecessary sets & collide stuff for collectables

* dumb mistakes :)

* stub out broken process-drawable stuff

* update refs

* add `:no-inspect` key and save some memory & remove birth logs

* Update kmachine.h

* clang

* add citadel

* fix no-inspect key

* fix tests!!

* fix stupid mistake in `collide-shape-prim-sphere` alloc

* comment annoying print

* feedback

* fix edge-case probably

* remove `:no-inspect`s
This commit is contained in:
ManDude
2021-11-23 23:25:57 +00:00
committed by GitHub
parent f642935d10
commit 25b0e1be7d
246 changed files with 13131 additions and 2505 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/engine/debug/anim-tester_REF.gc
Generated Vendored
+3 -3
View File
@@ -1967,9 +1967,9 @@
)
;; definition for function anim-test-edit-sequence-list-handler
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 893]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 938]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 1045]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 893]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 938]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 1045]
;; Used lq/sq
(defun anim-test-edit-sequence-list-handler ((arg0 int) (arg1 list-control))
(local-vars
test/decompiler/reference/engine/debug/default-menu_REF.gc
Generated Vendored
+14 -10
View File
@@ -507,9 +507,9 @@
(let ((v1-0 (find-instance-by-name *edit-instance*)))
(when v1-0
(if (= arg1 4)
(set! (-> v1-0 unknown) (logxor (-> v1-0 unknown) (the-as uint arg0)))
(set! (-> v1-0 flags) (logxor (-> v1-0 flags) (the-as uint arg0)))
)
(logtest? (-> v1-0 unknown) arg0)
(logtest? (-> v1-0 flags) arg0)
)
)
)
@@ -630,9 +630,9 @@
(cond
(v1-0
(if (= arg1 4)
(set! (-> v1-0 unknown) (logxor (-> v1-0 unknown) 1))
(set! (-> v1-0 flags) (logxor (-> v1-0 flags) 1))
)
(zero? (logand (-> v1-0 unknown) 1))
(zero? (logand (-> v1-0 flags) 1))
)
(else
#f
@@ -3011,10 +3011,12 @@
(the-as object (cond
(gp-0
(when (= arg1 4)
(set! (-> gp-0 unknown-vector x) (* 4096.0 arg2))
(prototype-bucket-recalc-fields gp-0)
(set! (-> gp-0 dists x) (* 4096.0 arg2))
(prototype-bucket-recalc-fields
(the-as instance gp-0)
)
)
(* 0.00024414062 (-> gp-0 unknown-vector x))
(* 0.00024414062 (-> gp-0 dists x))
)
(else
(empty)
@@ -3047,10 +3049,12 @@
(the-as object (cond
(gp-0
(when (= arg1 4)
(set! (-> gp-0 unknown-vector w) (* 4096.0 arg2))
(prototype-bucket-recalc-fields gp-0)
(set! (-> gp-0 dists w) (* 4096.0 arg2))
(prototype-bucket-recalc-fields
(the-as instance gp-0)
)
)
(* 0.00024414062 (-> gp-0 unknown-vector w))
(* 0.00024414062 (-> gp-0 dists w))
)
(else
(empty)