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

[decomp2] game-info, game-task and task-control (#1884)

Browse Source 
And everything else needed for them!

A couple functions are bad currently.

- fixes #1929 - untested on linux
- fixes #1924 - now you need to type `,` before a lambda you want to put
in a pair.
- fix debugger symbol table in jak 2
- made the decompiler output `(meters 2)` instead of `(meters 2.0)`
- fixed a bug with the bitfield enum special -1 case
- made bad game text decomp not exit the decompiler
- added `editable-player` and `script`
This commit is contained in:
ManDude
2022-09-28 00:44:20 +01:00
committed by GitHub
parent e3a4627eeb
commit 9351bf782e
129 changed files with 48750 additions and 6299 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/jak1/engine/camera/cam-layout_REF.gc
Generated Vendored
+10 -22
View File
@@ -595,13 +595,7 @@
(format *stdcon* "~S ~f~%" (-> arg1 disp) (vector-length gp-0))
(vector+! gp-0 gp-0 (-> arg1 origin))
(camera-line (-> arg1 origin) gp-0 (-> arg1 color))
(camera-cross
(new 'static 'vector :y 1024.0)
(new 'static 'vector :z 1024.0)
gp-0
(-> arg1 color)
(meters 1.0)
)
(camera-cross (new 'static 'vector :y 1024.0) (new 'static 'vector :z 1024.0) gp-0 (-> arg1 color) (meters 1))
)
)
@@ -623,13 +617,7 @@
(format *stdcon* "~S ~f~%" (-> arg1 disp) (vector-length gp-0))
(vector+! gp-0 gp-0 (-> arg1 origin))
(camera-line (-> arg1 origin) gp-0 (-> arg1 color))
(camera-cross
(new 'static 'vector :y 1024.0)
(new 'static 'vector :z 1024.0)
gp-0
(-> arg1 color)
(meters 1.0)
)
(camera-cross (new 'static 'vector :y 1024.0) (new 'static 'vector :z 1024.0) gp-0 (-> arg1 color) (meters 1))
)
)
@@ -665,7 +653,7 @@
(new 'static 'vector :z 1024.0)
s5-1
(new 'static 'vector4w :x #x80 :w #x80)
(meters 1.0)
(meters 1)
)
)
)
@@ -678,7 +666,7 @@
(new 'static 'vector :z 1024.0)
s5-2
(new 'static 'vector4w :y #x80 :w #x80)
(meters 1.0)
(meters 1)
)
)
)
@@ -691,7 +679,7 @@
(new 'static 'vector :z 1024.0)
s5-3
(new 'static 'vector4w :x #x80 :z #x80 :w #x80)
(meters 1.0)
(meters 1)
)
)
)
@@ -742,7 +730,7 @@
(new 'static 'vector :z 1024.0)
s5-4
(new 'static 'vector4w :x #xff :y #xff :w #x80)
(meters 1.0)
(meters 1)
)
)
)
@@ -785,7 +773,7 @@
(new 'static 'vector :z 1024.0)
s5-5
(new 'static 'vector4w :z #xff :w #x80)
(meters 1.0)
(meters 1)
)
(curve-get-pos! s5-5 (cam-slave-get-float arg0 'intro-exitValue (the-as float 0.0)) s3-2)
(vector+! s5-5 s5-5 s4-2)
@@ -794,7 +782,7 @@
(new 'static 'vector :z 1024.0)
s5-5
(new 'static 'vector4w :z #xff :w #x80)
(meters 1.0)
(meters 1)
)
)
)
@@ -822,7 +810,7 @@
(new 'static 'vector :z 1024.0)
s5-6
(new 'static 'vector4w :x #xff :y #xff :w #x80)
(meters 1.0)
(meters 1)
)
)
)
@@ -846,7 +834,7 @@
(new 'static 'vector :z 1024.0)
s5-7
(new 'static 'vector4w :y #xff :z #xff :w #x80)
(meters 1.0)
(meters 1)
)
)
)
test/decompiler/reference/jak1/engine/debug/debug_REF.gc
Generated Vendored
+7 -7
View File
@@ -995,7 +995,7 @@
arg1
(-> arg2 vector 3)
(the-as vector (-> arg2 vector))
(meters 2.0)
(meters 2)
(new 'static 'rgba :r #xff :a #x80)
)
(add-debug-vector
@@ -1003,7 +1003,7 @@
arg1
(-> arg2 vector 3)
(-> arg2 vector 1)
(meters 2.0)
(meters 2)
(new 'static 'rgba :g #xff :a #x80)
)
(add-debug-vector
@@ -1011,7 +1011,7 @@
arg1
(-> arg2 vector 3)
(-> arg2 vector 2)
(meters 2.0)
(meters 2)
(new 'static 'rgba :b #xff :a #x80)
)
arg2
@@ -1024,11 +1024,11 @@
arg1
arg3
(the-as vector (-> arg2 vector))
(meters 2.0)
(meters 2)
(new 'static 'rgba :r #xff :a #x80)
)
(add-debug-vector arg0 arg1 arg3 (-> arg2 vector 1) (meters 2.0) (new 'static 'rgba :g #xff :a #x80))
(add-debug-vector arg0 arg1 arg3 (-> arg2 vector 2) (meters 2.0) (new 'static 'rgba :b #xff :a #x80))
(add-debug-vector arg0 arg1 arg3 (-> arg2 vector 1) (meters 2) (new 'static 'rgba :g #xff :a #x80))
(add-debug-vector arg0 arg1 arg3 (-> arg2 vector 2) (meters 2) (new 'static 'rgba :b #xff :a #x80))
arg2
)
@@ -1291,7 +1291,7 @@
arg1
arg3
(-> arg2 direction)
(meters 3.0)
(meters 3)
(new 'static 'rgba :r #xff :g #xff :b #xff :a #x80)
)
(let ((s2-1 (vector+*! (new-stack-vector0) arg3 (-> arg2 direction) (* 12288.0 (-> arg2 levels x))))
test/decompiler/reference/jak1/engine/debug/default-menu_REF.gc
Generated Vendored
+140 -140
View File
@@ -3424,8 +3424,8 @@
(flag "Use menu subdiv" *artist-use-menu-subdiv* dm-boolean-toggle-pick-func)
(float-var "Subdiv Close" close dm-subdiv-float 10 1 #t 1 200 1)
(float-var "Subdiv Far" far dm-subdiv-float 10 1 #t 1 200 1)
(function "Target Start" #f (lambda () (start 'debug (get-or-create-continue! *game-info*))))
(function "Target Stop" #f (lambda () (stop 'debug)))
(function "Target Start" #f ,(lambda () (start 'debug (get-or-create-continue! *game-info*))))
(function "Target Stop" #f ,(lambda () (stop 'debug)))
(menu
"Anim Tester"
(int-var "Speed" anim-speed dm-subdiv-int 10 10 #t -300 1000)
@@ -3454,34 +3454,34 @@
(function
"New Game"
#f
(lambda () (initialize! *game-info* 'game (the-as game-save #f) (the-as string #f)) (none))
,(lambda () (initialize! *game-info* 'game (the-as game-save #f) (the-as string #f)) (none))
)
(function
"New Life"
#f
(lambda () (initialize! *game-info* 'die (the-as game-save #f) (the-as string #f)) (none))
,(lambda () (initialize! *game-info* 'die (the-as game-save #f) (the-as string #f)) (none))
)
(function
"Reset Game"
#f
(lambda ()
(set! (-> *game-info* mode) 'debug)
(initialize! *game-info* 'game (the-as game-save #f) (the-as string #f))
(none)
)
,(lambda ()
(set! (-> *game-info* mode) 'debug)
(initialize! *game-info* 'game (the-as game-save #f) (the-as string #f))
(none)
)
)
(function "Reset Actors" #f (lambda () (reset-actors 'debug) (none)))
(function "Save Game" #f (lambda () (auto-save-command 'save 0 0 *default-pool*) (none)))
(function "Load Game" #f (lambda () (auto-save-command 'restore 0 0 *default-pool*) (none)))
(flag "Target" #f (lambda ((arg0 int) (arg1 debug-menu-msg))
(when (= arg1 (debug-menu-msg press))
(if *target*
(stop 'debug)
(start 'debug (get-or-create-continue! *game-info*))
)
)
*target*
)
(function "Reset Actors" #f ,(lambda () (reset-actors 'debug) (none)))
(function "Save Game" #f ,(lambda () (auto-save-command 'save 0 0 *default-pool*) (none)))
(function "Load Game" #f ,(lambda () (auto-save-command 'restore 0 0 *default-pool*) (none)))
(flag "Target" #f ,(lambda ((arg0 int) (arg1 debug-menu-msg))
(when (= arg1 (debug-menu-msg press))
(if *target*
(stop 'debug)
(start 'debug (get-or-create-continue! *game-info*))
)
)
*target*
)
)
(flag "Game Mode" play dm-game-mode-pick-func)
(flag "Debug Mode" debug dm-game-mode-pick-func)
@@ -3491,12 +3491,12 @@
(float-var
"sfx-volume"
#f
(lambda ((arg0 int) (arg1 debug-menu-msg) (arg2 float))
(if (= arg1 (debug-menu-msg press))
(set! (-> *setting-control* default sfx-volume) arg2)
(-> *setting-control* default sfx-volume)
)
)
,(lambda ((arg0 int) (arg1 debug-menu-msg) (arg2 float))
(if (= arg1 (debug-menu-msg press))
(set! (-> *setting-control* default sfx-volume) arg2)
(-> *setting-control* default sfx-volume)
)
)
2
1
#t
@@ -3507,12 +3507,12 @@
(float-var
"music-volume"
#f
(lambda ((arg0 int) (arg1 debug-menu-msg) (arg2 float))
(if (= arg1 (debug-menu-msg press))
(set! (-> *setting-control* default music-volume) arg2)
(-> *setting-control* default music-volume)
)
)
,(lambda ((arg0 int) (arg1 debug-menu-msg) (arg2 float))
(if (= arg1 (debug-menu-msg press))
(set! (-> *setting-control* default music-volume) arg2)
(-> *setting-control* default music-volume)
)
)
2
1
#t
@@ -3523,12 +3523,12 @@
(float-var
"dialog-volume"
#f
(lambda ((arg0 int) (arg1 debug-menu-msg) (arg2 float))
(if (= arg1 (debug-menu-msg press))
(set! (-> *setting-control* default dialog-volume) arg2)
(-> *setting-control* default dialog-volume)
)
)
,(lambda ((arg0 int) (arg1 debug-menu-msg) (arg2 float))
(if (= arg1 (debug-menu-msg press))
(set! (-> *setting-control* default dialog-volume) arg2)
(-> *setting-control* default dialog-volume)
)
)
2
1
#t
@@ -3549,32 +3549,32 @@
(flag
"play-hints "
#f
(lambda ((arg0 int) (arg1 debug-menu-msg))
(if (= arg1 (debug-menu-msg press))
(set! (-> *setting-control* default play-hints) (not (-> *setting-control* default play-hints)))
)
(-> *setting-control* default play-hints)
)
,(lambda ((arg0 int) (arg1 debug-menu-msg))
(if (= arg1 (debug-menu-msg press))
(set! (-> *setting-control* default play-hints) (not (-> *setting-control* default play-hints)))
)
(-> *setting-control* default play-hints)
)
)
(flag
"vibration"
#f
(lambda ((arg0 int) (arg1 debug-menu-msg))
(if (= arg1 (debug-menu-msg press))
(set! (-> *setting-control* default vibration) (not (-> *setting-control* default vibration)))
)
(-> *setting-control* default vibration)
)
,(lambda ((arg0 int) (arg1 debug-menu-msg))
(if (= arg1 (debug-menu-msg press))
(set! (-> *setting-control* default vibration) (not (-> *setting-control* default vibration)))
)
(-> *setting-control* default vibration)
)
)
(flag
"border-mode"
#f
(lambda ((arg0 int) (arg1 debug-menu-msg))
(if (= arg1 (debug-menu-msg press))
(set! (-> *setting-control* default border-mode) (not (-> *setting-control* default border-mode)))
)
(-> *setting-control* default border-mode)
)
,(lambda ((arg0 int) (arg1 debug-menu-msg))
(if (= arg1 (debug-menu-msg press))
(set! (-> *setting-control* default border-mode) (not (-> *setting-control* default border-mode)))
)
(-> *setting-control* default border-mode)
)
)
)
)
@@ -3742,7 +3742,7 @@
'(menu
"Actor"
(flag "Spawn Actors" *spawn-actors* dm-boolean-toggle-pick-func)
(function "Reset Actors" #f (lambda () (reset-actors 'debug) (none)))
(function "Reset Actors" #f ,(lambda () (reset-actors 'debug) (none)))
(menu
"Actor Compaction"
(flag "off" #f dm-compact-actor-pick-func)
@@ -3784,63 +3784,63 @@
'(menu
"Target"
(flag "Target Stats" *stats-target* dm-boolean-toggle-pick-func)
(function "Play" #f (lambda () (play #t #t)))
(function "Start" #f (lambda () (the-as int (start 'debug (get-or-create-continue! *game-info*)))))
(function "Stop" #f (lambda () (stop 'debug)))
(function "Play" #f ,(lambda () (play #t #t)))
(function "Start" #f ,(lambda () (the-as int (start 'debug (get-or-create-continue! *game-info*)))))
(function "Stop" #f ,(lambda () (stop 'debug)))
(flag
"Invulnerable"
#f
(lambda ((arg0 int) (arg1 debug-menu-msg))
(when (= arg1 (debug-menu-msg press))
(if *target*
(logxor! (-> *target* state-flags) (state-flags invulnerable))
)
)
(the-as symbol (and *target* (logtest? (-> *target* state-flags) (state-flags invulnerable))))
)
,(lambda ((arg0 int) (arg1 debug-menu-msg))
(when (= arg1 (debug-menu-msg press))
(if *target*
(logxor! (-> *target* state-flags) (state-flags invulnerable))
)
)
(the-as symbol (and *target* (logtest? (-> *target* state-flags) (state-flags invulnerable))))
)
)
(function
"Reset Trans"
#f
(lambda () (when *target*
(position-in-front-of-camera! (target-pos 0) (the-as float 40960.0) (the-as float 4096.0))
(set! (-> *target* control transv quad) (the-as uint128 0))
(quaternion-identity! (-> *target* control quat))
(quaternion-identity! (-> *target* control unknown-quaternion00))
(quaternion-identity! (-> *target* control dir-targ))
)
)
,(lambda () (when *target*
(position-in-front-of-camera! (target-pos 0) (the-as float 40960.0) (the-as float 4096.0))
(set! (-> *target* control transv quad) (the-as uint128 0))
(quaternion-identity! (-> *target* control quat))
(quaternion-identity! (-> *target* control unknown-quaternion00))
(quaternion-identity! (-> *target* control dir-targ))
)
)
)
(function "Zero Trans" #f (lambda () (when *target*
(set-vector! (-> *target* control trans) 0.0 163840.0 0.0 1.0)
(set! (-> *target* control transv quad) (the-as uint128 0))
(quaternion-identity! (-> *target* control quat))
(quaternion-identity! (-> *target* control unknown-quaternion00))
(quaternion-identity! (-> *target* control dir-targ))
)
)
(function "Zero Trans" #f ,(lambda () (when *target*
(set-vector! (-> *target* control trans) 0.0 163840.0 0.0 1.0)
(set! (-> *target* control transv quad) (the-as uint128 0))
(quaternion-identity! (-> *target* control quat))
(quaternion-identity! (-> *target* control unknown-quaternion00))
(quaternion-identity! (-> *target* control dir-targ))
)
)
)
(menu
"Mode"
(function "normal" #f (lambda () (send-event *target* 'end-mode)))
(function "racing" #f (lambda () (send-event *target* 'change-mode 'racing #f)))
(function "snowball" #f (lambda () (send-event *target* 'change-mode 'snowball #f)))
(function "normal" #f ,(lambda () (send-event *target* 'end-mode)))
(function "racing" #f ,(lambda () (send-event *target* 'change-mode 'racing #f)))
(function "snowball" #f ,(lambda () (send-event *target* 'change-mode 'snowball #f)))
)
(flag "Slow Frame Rate" *slow-frame-rate* dm-boolean-toggle-pick-func)
(function "Print Pos" #f (lambda ()
(let ((v1-0 (target-pos 0)))
(format #t "~6,,2m ~6,,2m ~6,,2m~%" (-> v1-0 x) (-> v1-0 y) (-> v1-0 z))
)
0
(none)
)
(function "Print Pos" #f ,(lambda ()
(let ((v1-0 (target-pos 0)))
(format #t "~6,,2m ~6,,2m ~6,,2m~%" (-> v1-0 x) (-> v1-0 y) (-> v1-0 z))
)
0
(none)
)
)
(function "Save Continue" #f (lambda ()
(if *target*
(trsq->continue-point (-> *target* control))
)
(none)
)
(function "Save Continue" #f ,(lambda ()
(if *target*
(trsq->continue-point (-> *target* control))
)
(none)
)
)
)
)
@@ -3902,7 +3902,7 @@
(flag "Amb Snd Class" *ambient-sound-class* dm-boolean-toggle-pick-func)
(flag "Amb Spheres" *execute-ambients* dm-boolean-toggle-pick-func)
(flag "Sound channels" *display-iop-info* dm-boolean-toggle-pick-func)
(function "List Sounds" #f (lambda () (list-sounds)))
(function "List Sounds" #f ,(lambda () (list-sounds)))
)
)
)
@@ -3923,48 +3923,48 @@
'(main-menu
"Popup"
(flag "Cam 1" pad-1 dm-cam-externalize)
(flag "Target" #f (lambda ((arg0 int) (arg1 debug-menu-msg))
(when (= arg1 (debug-menu-msg press))
(if *target*
(stop 'debug)
(start 'debug (get-or-create-continue! *game-info*))
)
)
*target*
)
)
(flag "Game" #f (lambda ((arg0 int) (arg1 debug-menu-msg))
(when (= arg1 (debug-menu-msg press))
(let ((v1-3 (-> *game-info* mode)))
(set! (-> *game-info* mode) (cond
((= v1-3 'play)
'debug
)
((= v1-3 'debug)
'play
)
(else
(-> *game-info* mode)
)
)
)
)
)
(= (-> *game-info* mode) 'play)
)
)
(function "Clean" #f (lambda ((arg0 int) (arg1 debug-menu-msg))
(if (time-of-day-setup #f)
(time-of-day-setup #t)
(flag "Target" #f ,(lambda ((arg0 int) (arg1 debug-menu-msg))
(when (= arg1 (debug-menu-msg press))
(if *target*
(stop 'debug)
(start 'debug (get-or-create-continue! *game-info*))
)
(set! *display-entity-errors* #f)
(set! *display-profile* #f)
(set! *display-actor-marks* #f)
#f
)
*target*
)
)
(flag "Game" #f ,(lambda ((arg0 int) (arg1 debug-menu-msg))
(when (= arg1 (debug-menu-msg press))
(let ((v1-3 (-> *game-info* mode)))
(set! (-> *game-info* mode) (cond
((= v1-3 'play)
'debug
)
((= v1-3 'debug)
'play
)
(else
(-> *game-info* mode)
)
)
)
)
)
(= (-> *game-info* mode) 'play)
)
)
(function "Clean" #f ,(lambda ((arg0 int) (arg1 debug-menu-msg))
(if (time-of-day-setup #f)
(time-of-day-setup #t)
)
(set! *display-entity-errors* #f)
(set! *display-profile* #f)
(set! *display-actor-marks* #f)
#f
)
)
(flag "Stats" *stats-target* dm-boolean-toggle-pick-func)
(function "Reset" #f (lambda () (reset-actors 'debug) (none)))
(function "Reset" #f ,(lambda () (reset-actors 'debug) (none)))
)
)
arg0
test/decompiler/reference/jak1/engine/game/game-info_REF.gc
Generated Vendored
+2 -2
View File
@@ -12,7 +12,7 @@
)
)
(add-debug-text-sphere #t (bucket-id debug-no-zbuf) (-> obj trans) 819.2 (symbol->string (-> obj name)) s5-0)
(add-debug-vector #t (bucket-id debug-no-zbuf) (-> obj trans) (-> obj normal) (meters 2.0) s5-0)
(add-debug-vector #t (bucket-id debug-no-zbuf) (-> obj trans) (-> obj normal) (meters 2) s5-0)
)
0
(none)
@@ -743,7 +743,7 @@
(bucket-id debug-no-zbuf)
(-> obj trans)
a3-2
(meters 2.0)
(meters 2)
(new 'static 'rgba :r #xff :g #x80 :a #x80)
)
)
test/decompiler/reference/jak1/engine/gfx/tfrag/subdivide_REF.gc
Generated Vendored
+1 -1
View File
@@ -145,7 +145,7 @@
)
;; definition for symbol *subdivide-settings*, type subdivide-settings
(define *subdivide-settings* (new 'global 'subdivide-settings (meters 30.0) (meters 70.0)))
(define *subdivide-settings* (new 'global 'subdivide-settings (meters 30) (meters 70)))
;; definition for function set-tfrag-dists!
;; INFO: Return type mismatch tfrag-dists vs none.
test/decompiler/reference/jak1/engine/nav/navigate_REF.gc
Generated Vendored
+2 -2
View File
@@ -1735,8 +1735,8 @@
(-> s5-0 bounds w)
(new 'static 'rgba :r #xff :g #xff :a #x20)
)
(add-debug-vector #t (bucket-id debug-no-zbuf) (-> s5-0 origin) *x-vector* (meters 1.0) *color-red*)
(add-debug-vector #t (bucket-id debug-no-zbuf) (-> s5-0 origin) *z-vector* (meters 1.0) *color-blue*)
(add-debug-vector #t (bucket-id debug-no-zbuf) (-> s5-0 origin) *x-vector* (meters 1) *color-red*)
(add-debug-vector #t (bucket-id debug-no-zbuf) (-> s5-0 origin) *z-vector* (meters 1) *color-blue*)
(when (logtest? (-> obj flags) (nav-control-flags navcf2))
(dotimes (s3-0 (-> s5-0 vertex-count))
(add-debug-x
test/decompiler/reference/jak1/engine/target/logic-target_REF.gc
Generated Vendored
+9 -9
View File
@@ -126,7 +126,7 @@
(bucket-id debug-no-zbuf)
(-> s2-0 intersect)
(-> s2-0 surface-normal)
(meters 1.0)
(meters 1)
(the-as rgba (+ s1-1 (shl s4-0 24)))
)
(add-debug-vector
@@ -134,7 +134,7 @@
(bucket-id debug-no-zbuf)
(-> s2-0 intersect)
(-> s2-0 local-normal)
(meters 1.0)
(meters 1)
(the-as rgba (+ s1-1 (shl s4-0 24)))
)
)
@@ -966,7 +966,7 @@
(bucket-id debug-no-zbuf)
(-> self control trans)
gp-0
(meters 2.0)
(meters 2)
(new 'static 'rgba :r #xff :g #xff :b #xff :a #x80)
)
(add-debug-vector
@@ -974,7 +974,7 @@
(bucket-id debug-no-zbuf)
(-> self control trans)
s5-0
(meters 2.0)
(meters 2)
(new 'static 'rgba :r #xff :a #x80)
)
)
@@ -983,7 +983,7 @@
(bucket-id debug-no-zbuf)
(-> self control trans)
(-> self control unknown-matrix01 vector 2)
(meters 2.0)
(meters 2)
(new 'static 'rgba :r #xff :b #xff :a #x80)
)
(rotate-toward-orientation!
@@ -1231,7 +1231,7 @@
(bucket-id debug-no-zbuf)
(-> self control trans)
(-> self control ground-poly-normal)
(meters 2.0)
(meters 2)
(new 'static 'rgba :b #xff :a #x80)
)
(add-debug-vector
@@ -1239,7 +1239,7 @@
(bucket-id debug-no-zbuf)
(-> self control trans)
(-> self control local-normal)
(meters 2.0)
(meters 2)
(new 'static 'rgba :b #xff :a #x80)
)
(add-debug-vector
@@ -1255,7 +1255,7 @@
(bucket-id debug-no-zbuf)
(-> self control trans)
(-> self control dynam gravity-normal)
(meters 3.0)
(meters 3)
(new 'static 'rgba :r #xff :b #xff :a #x80)
)
)
@@ -1386,7 +1386,7 @@
(bucket-id debug-no-zbuf)
(-> (the-as swingpole s4-0) root trans)
(the-as vector (&-> s4-0 stack 16))
(meters 3.0)
(meters 3)
(new 'static 'rgba :r #xff :b #xff :a #x80)
)
(add-debug-sphere
test/decompiler/reference/jak1/levels/finalboss/sage-finalboss_REF.gc
Generated Vendored
+7 -7
View File
@@ -426,13 +426,13 @@
(271 joint "camera")
(269 send-event self activate-particle 5)
(272 send-event self flash)
(272 eval (lambda :behavior sage-finalboss
()
(let ((a0-1 (get-task-control (game-task finalboss-movies))))
(save-reminder a0-1 (logior (get-reminder a0-1 0) 1) 0)
)
(none)
)
(272 eval ,(lambda :behavior sage-finalboss
()
(let ((a0-1 (get-task-control (game-task finalboss-movies))))
(save-reminder a0-1 (logior (get-reminder a0-1 0) 1) 0)
)
(none)
)
)
(273 send-event self deactivate-particle 5)
(333 joint "cameraB")
test/decompiler/reference/jak1/levels/flut_common/target-flut_REF.gc
Generated Vendored
+1 -1
View File
@@ -1335,7 +1335,7 @@
)
(!= (-> self control unknown-uint31) 1)
)
(target-shoved (meters 2.0) (-> *TARGET-bank* smack-surface-height) (the-as process #f) target-flut-hit)
(target-shoved (meters 2) (-> *TARGET-bank* smack-surface-height) (the-as process #f) target-flut-hit)
)
(if (and (logtest? (-> self water flags) (water-flags wt09))
(zero? (mod (- (-> *display* base-frame-counter) (-> self state-time)) 21))
test/decompiler/reference/jak1/levels/ogre/flying-lurker_REF.gc
Generated Vendored
+1 -1
View File
@@ -750,7 +750,7 @@
:trans (behavior ()
(dummy-20 self)
(when (not (movie?))
(flying-lurker-calc-speed (meters 15.0) (meters 30.0) (meters 0.11666667) (meters 0.083333336))
(flying-lurker-calc-speed (meters 15) (meters 30) (meters 0.11666667) (meters 0.083333336))
(flying-lurker-move)
(flying-lurker-rotate)
(when (and (-> self alt-actor)
test/decompiler/reference/jak1/levels/sunken/target-tube_REF.gc
Generated Vendored
+2 -2
View File
@@ -281,7 +281,7 @@
(bucket-id debug-no-zbuf)
(-> self control trans)
s3-1
(meters 2.0)
(meters 2)
(new 'static 'rgba :r #xff :g #xff :a #x80)
)
(vector-matrix*! s3-1 s3-1 (-> self control unknown-matrix00))
@@ -294,7 +294,7 @@
(bucket-id debug-no-zbuf)
(-> self control trans)
s4-2
(meters 2.0)
(meters 2)
(new 'static 'rgba :r #xff :g #x80 :b #x40 :a #x80)
)
(vector-matrix*! s4-2 s4-2 (-> self control unknown-matrix00))
test/decompiler/reference/jak2/decompiler-macros.gc
Generated Vendored
+1 -1
View File
@@ -965,4 +965,4 @@
:fo-curve ,fo-curve
:mask (sound-mask ,@snd-mask)
))
)
)
test/decompiler/reference/jak2/engine/anim/joint-mod-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -156,7 +156,7 @@
;; definition (debug) for function joint-mod-debug-draw
;; WARN: Return type mismatch int vs none.
(defun-debug joint-mod-debug-draw ((arg0 joint-mod))
(add-debug-matrix #t (bucket-id debug-no-zbuf1) (-> arg0 joint bone transform) (meters 2.0))
(add-debug-matrix #t (bucket-id debug-no-zbuf1) (-> arg0 joint bone transform) (meters 2))
0
(none)
)
test/decompiler/reference/jak2/engine/camera/cam-layout_REF.gc
Generated Vendored
+10 -22
View File
@@ -655,13 +655,7 @@
(format *stdcon* "~S ~f~%" (-> arg1 disp) (vector-length s5-0))
(vector+! s5-0 s5-0 (-> arg1 origin))
(camera-line (-> arg1 origin) s5-0 (-> arg1 color))
(camera-cross
(new 'static 'vector :y 1024.0)
(new 'static 'vector :z 1024.0)
s5-0
(-> arg1 color)
(meters 1.0)
)
(camera-cross (new 'static 'vector :y 1024.0) (new 'static 'vector :z 1024.0) s5-0 (-> arg1 color) (meters 1))
)
(none)
)
@@ -684,13 +678,7 @@
(format *stdcon* "~S ~f~%" (-> arg1 disp) (vector-length s5-0))
(vector+! s5-0 s5-0 (-> arg1 origin))
(camera-line (-> arg1 origin) s5-0 (-> arg1 color))
(camera-cross
(new 'static 'vector :y 1024.0)
(new 'static 'vector :z 1024.0)
s5-0
(-> arg1 color)
(meters 1.0)
)
(camera-cross (new 'static 'vector :y 1024.0) (new 'static 'vector :z 1024.0) s5-0 (-> arg1 color) (meters 1))
)
(none)
)
@@ -721,7 +709,7 @@
(new 'static 'vector :z 1024.0)
s5-1
(new 'static 'vector4w :x #x80 :w #x80)
(meters 1.0)
(meters 1)
)
)
)
@@ -734,7 +722,7 @@
(new 'static 'vector :z 1024.0)
s5-2
(new 'static 'vector4w :y #x80 :w #x80)
(meters 1.0)
(meters 1)
)
)
)
@@ -749,7 +737,7 @@
(new 'static 'vector :z 1024.0)
s5-3
(new 'static 'vector4w :x #x80 :z #x80 :w #x80)
(meters 1.0)
(meters 1)
)
)
)
@@ -800,7 +788,7 @@
(new 'static 'vector :z 1024.0)
s5-4
(new 'static 'vector4w :x #xff :y #xff :w #x80)
(meters 1.0)
(meters 1)
)
)
)
@@ -843,7 +831,7 @@
(new 'static 'vector :z 1024.0)
s5-5
(new 'static 'vector4w :z #xff :w #x80)
(meters 1.0)
(meters 1)
)
(curve-get-pos! s5-5 (cam-slave-get-float arg0 'intro-exitValue 0.0) s3-2)
(vector+! s5-5 s5-5 s4-2)
@@ -852,7 +840,7 @@
(new 'static 'vector :z 1024.0)
s5-5
(new 'static 'vector4w :z #xff :w #x80)
(meters 1.0)
(meters 1)
)
)
)
@@ -882,7 +870,7 @@
(new 'static 'vector :z 1024.0)
s5-6
(new 'static 'vector4w :x #xff :y #xff :w #x80)
(meters 1.0)
(meters 1)
)
)
)
@@ -908,7 +896,7 @@
(new 'static 'vector :z 1024.0)
s5-7
(new 'static 'vector4w :y #xff :z #xff :w #x80)
(meters 1.0)
(meters 1)
)
)
)
test/decompiler/reference/jak2/engine/debug/debug_REF.gc
Generated Vendored
+5 -5
View File
@@ -1283,11 +1283,11 @@
bucket
position
(the-as vector (-> mat vector))
(meters 2.0)
(meters 2)
(new 'static 'rgba :r #xff :a #x80)
)
(add-debug-vector enable bucket position (-> mat vector 1) (meters 2.0) (new 'static 'rgba :g #xff :a #x80))
(add-debug-vector enable bucket position (-> mat vector 2) (meters 2.0) (new 'static 'rgba :b #xff :a #x80))
(add-debug-vector enable bucket position (-> mat vector 1) (meters 2) (new 'static 'rgba :g #xff :a #x80))
(add-debug-vector enable bucket position (-> mat vector 2) (meters 2) (new 'static 'rgba :b #xff :a #x80))
mat
)
@@ -1305,7 +1305,7 @@
;; definition (debug) for function add-debug-cspace
(defun-debug add-debug-cspace ((enable symbol) (bucket bucket-id) (csp cspace))
(add-debug-matrix enable bucket (-> csp bone transform) (meters 2.0))
(add-debug-matrix enable bucket (-> csp bone transform) (meters 2))
csp
)
@@ -1636,7 +1636,7 @@
bucket
position
(-> light direction)
(meters 3.0)
(meters 3)
(new 'static 'rgba :r #xff :g #xff :b #xff :a #x80)
)
(let ((sphere-pos (new-stack-vector0)))
test/decompiler/reference/jak2/engine/debug/default-menu_REF.gc
Generated Vendored
+1382 -1382
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/jak2/engine/debug/editable-player_REF.gc
Generated Vendored
+237 -203
View File
@@ -1686,7 +1686,7 @@
(when s4-0
(let ((gp-1 (-> arg3 param 0)))
(set! (-> *syntax-context* got-error?) #f)
(eval! *syntax-context* gp-1)
(eval! *syntax-context* (the-as pair gp-1))
(when (not (-> *syntax-context* got-error?))
(set! (-> s4-0 changed) #t)
(cond
@@ -2285,192 +2285,67 @@
)
;; definition for function dm-editable-light-float-func
;; ERROR: failed type prop at 36: add failed: editable uint
;; WARN: Return type mismatch symbol vs object.
(defun dm-editable-light-float-func ((a0-0 object) (a1-0 debug-menu-msg) (a2-0 float) (a3-0 symbol))
(local-vars
(v0-0 symbol)
(v0-1 symbol)
(v0-2 none)
(v0-3 none)
(v1-0 (pointer editable-player))
(v1-1 int)
(v1-2 (pointer editable-player))
(v1-3 editable-player)
(v1-4 editable-array)
(v1-5 int)
(v1-6 int)
(v1-7 symbol)
(v1-8 symbol)
(v1-11 uint)
(v1-12 none)
(v1-13 none)
(v1-14 none)
(v1-15 none)
(v1-17 none)
(v1-18 none)
(v1-19 none)
(v1-21 none)
(v1-22 none)
(v1-23 none)
(v1-24 none)
(v1-25 none)
(v1-26 none)
(v1-27 none)
(v1-29 none)
(v1-30 none)
(v1-31 none)
(v1-32 none)
(v1-33 none)
(a0-1 (pointer editable-player))
(a0-2 editable-player)
(a0-3 editable-array)
(a0-4 editable-flag)
(a0-5 editable-flag)
(a0-6 editable)
(a0-7 editable)
(a0-8 none)
(a0-9 none)
(a0-10 none)
(a0-11 none)
(a0-12 none)
(a0-13 none)
(a0-14 none)
(a0-15 none)
(a0-18 none)
(a0-20 none)
(a0-21 none)
(a0-22 none)
(a1-1 type)
(a1-3 none)
(a1-4 none)
(s2-0 editable)
(s3-0 int)
(s3-1 none)
(s4-0 int)
(s4-1 none)
(s5-1 none)
(t9-0 (function object type symbol))
(t9-1 none)
(t9-2 none)
(f0-0 float)
(f30-0 none)
)
(defun dm-editable-light-float-func ((arg0 int) (arg1 debug-menu-msg) (arg2 float) (arg3 float))
(cond
((begin (set! v1-0 *editable*) (not v1-0))
(set! v0-0 a3-0)
((not *editable*)
arg3
)
((begin (set! v1-1 4) (= a1-0 v1-1))
(set! v1-2 *editable*)
(set! v1-3 (-> v1-2 0))
(set! v1-4 (-> v1-3 current))
(set! s4-0 (-> v1-4 length))
(set! s3-0 0)
(set! v1-5 (sll s3-0 2))
(set! a0-1 *editable*)
(set! a0-2 (-> a0-1 0))
(set! a0-3 (-> a0-2 current))
(set! v1-6 (+ v1-5 a0-3))
(set! s2-0 (dynamic-array-field-access v1-6 data PLACEHOLDER))
(while (<.si s3-0 s4-0)
(when (begin
(and s2-0
(begin (set! v1-8 #t) (set! a0-4 (-> s2-0 flags)) (set! a0-5 (logand a0-4 1)) (cmove-#f-zero v1-7 a0-5 v1-8))
)
v1-7
)
(when (begin
(if (begin (set! t9-0 type?) (set! a0-6 s2-0) (set! a1-1 editable-light) (set! v0-1 (call! a0-6 a1-1)) v0-1)
(set! a0-7 s2-0)
)
a0-7
((= arg1 (debug-menu-msg press))
(let* ((s4-0 (-> *editable* 0 current length))
(s3-0 0)
(s2-0 (-> *editable* 0 current data s3-0))
)
(while (< s3-0 s4-0)
(when (and s2-0 (logtest? (-> s2-0 flags) (editable-flag selected)))
(let ((a0-7 (if (type? s2-0 editable-light)
s2-0
)
)
)
(when (begin
(set! f0-0 (gpr->fpr a2-0))
(set! v1-11 (sra a0-0 3))
(set! v1-12 (the-as none (+ a0-7 v1-11)))
(s.f! v1-12 f0-0)
(set! v1-13 (the-as none (-> a0-7 flags)))
(set! v1-14 (the-as none (logior v1-13 2048)))
(set! (-> a0-7 flags) (the-as editable-flag v1-14))
(set! v1-15 (the-as none (-> a0-7 region)))
v1-15
)
(set! a1-3 (the-as none #t))
(s.w! v1-15 a1-3)
(when (the-as editable a0-7)
(set! (-> (&+ (the-as (pointer float) a0-7) (/ arg0 8)) 0) arg2)
(logior! (-> (the-as editable a0-7) flags) (editable-flag changed))
(let ((v1-15 (-> (the-as editable a0-7) region)))
(if v1-15
(set! (-> v1-15 changed) #t)
)
)
(update-light-sphere-from-editable-light (the-as editable-light a0-7))
)
)
(set! t9-1 (the-as none update-light-sphere-from-editable-light))
(call!)
(set! v1-16 (the-as none v0-2))
)
(+! s3-0 1)
(set! s2-0 (-> *editable* 0 current data s3-0))
)
(set! s3-0 (the-as int (+ s3-0 1)))
(set! v1-17 (the-as none (sll s3-0 2)))
(set! a0-8 (the-as none *editable*))
(set! a0-9 (the-as none (l.wu a0-8)))
(set! a0-10 (the-as none (l.wu (+ a0-9 196))))
(set! v1-18 (the-as none (+ v1-17 a0-10)))
(set! v1-19 (the-as none (l.wu (+ v1-18 120))))
(set! s2-0 (the-as editable v1-19))
)
(set! v0-0 #f)
(the-as float #f)
)
(else
(set! f30-0 (the-as none (gpr->fpr a3-0)))
(set! v1-21 (the-as none *editable*))
(set! v1-22 (the-as none (l.wu v1-21)))
(set! v1-23 (the-as none (l.wu (+ v1-22 196))))
(set! s5-1 (the-as none (l.w (+ v1-23 4))))
(set! s4-1 (the-as none 0))
(set! v1-24 (the-as none (sll s4-1 2)))
(set! a0-11 (the-as none *editable*))
(set! a0-12 (the-as none (l.wu a0-11)))
(set! a0-13 (the-as none (l.wu (+ a0-12 196))))
(set! v1-25 (the-as none (+ v1-24 a0-13)))
(set! s3-1 (the-as none (l.wu (+ v1-25 120))))
(while (<.si s4-1 s5-1)
(when (begin
(and s3-1 (begin
(set! v1-27 (the-as none #t))
(set! a0-14 (the-as none (l.wu s3-1)))
(set! a0-15 (the-as none (logand a0-14 1)))
(cmove-#f-zero v1-26 a0-15 v1-27)
)
)
v1-26
(let ((f30-0 arg3))
(let* ((s5-1 (-> *editable* 0 current length))
(s4-1 0)
(s3-1 (-> *editable* 0 current data s4-1))
)
(while (< s4-1 s5-1)
(when (and s3-1 (logtest? (-> s3-1 flags) (editable-flag selected)))
(let ((v1-29 (if (type? s3-1 editable-light)
s3-1
)
)
)
(if (the-as editable v1-29)
(set! f30-0 (-> (&+ (the-as (pointer float) v1-29) (/ arg0 8)) 0))
)
)
(when (begin
(if (begin
(set! t9-2 (the-as none type?))
(set! a0-16 (the-as none s3-1))
(set! a1-4 (the-as none editable-light))
(set! v0-3 (the-as none (call!)))
v0-3
)
(set! v1-29 (the-as none s3-1))
)
v1-29
)
(set! a0-18 (the-as none (sra a0-0 3)))
(set! v1-30 (the-as none (+ v1-29 a0-18)))
(set! f30-0 (the-as none (l.f v1-30)))
(set! a0-19 (the-as none (fpr->gpr f30-0)))
)
(+! s4-1 1)
(set! s3-1 (-> *editable* 0 current data s4-1))
)
)
(set! s4-1 (the-as none (+ s4-1 1)))
(set! v1-31 (the-as none (sll s4-1 2)))
(set! a0-20 (the-as none *editable*))
(set! a0-21 (the-as none (l.wu a0-20)))
(set! a0-22 (the-as none (l.wu (+ a0-21 196))))
(set! v1-32 (the-as none (+ v1-31 a0-22)))
(set! v1-33 (the-as none (l.wu (+ v1-32 120))))
(set! s3-1 (the-as none v1-33))
f30-0
)
(set! v0-0 (the-as symbol (fpr->gpr f30-0)))
)
)
(ret-value v0-0)
)
;; definition for function dm-cam-externalize2
@@ -2503,44 +2378,203 @@
)
;; definition for function dm-editable-boolean-toggle-pick-func
;; ERROR: failed type prop at 5: add failed: editable-player int
(defun dm-editable-boolean-toggle-pick-func ((a0-0 int) (a1-0 debug-menu-msg))
(local-vars
(v0-0 none)
(v1-0 (pointer editable-player))
(v1-1 (pointer editable-player))
(v1-2 editable-player)
(v1-3 none)
(a0-1 int)
(a0-2 none)
(a0-4 none)
(a0-5 none)
)
(defun dm-editable-boolean-toggle-pick-func ((arg0 int) (arg1 debug-menu-msg))
(cond
((begin (set! v1-0 *editable*) v1-0)
(when (begin
(set! v1-1 *editable*)
(set! v1-2 (-> v1-1 0))
(set! a0-1 (sra a0-0 3))
(set! v1-3 (the-as none (+ v1-2 a0-1)))
(set! a0-2 (the-as none 4))
(= a1-0 a0-2)
)
(set! a0-4 (the-as none (l.wu v1-3)))
(set! a0-5 (the-as none (not a0-4)))
(s.w! v1-3 a0-5)
)
(set! v0-0 (the-as none (l.wu v1-3)))
)
(*editable*
(let ((v1-3 (&+ (the-as (pointer symbol) (-> *editable* 0)) (/ arg0 8))))
(if (= arg1 (debug-menu-msg press))
(set! (-> v1-3 0) (not (-> v1-3 0)))
)
(-> v1-3 0)
)
)
(else
#f
)
)
(ret-none)
)
;; definition for function editable-menu-context-make-menus
;; ERROR: function was not converted to expressions. Cannot decompile.
(defun editable-menu-context-make-menus ((arg0 debug-menu-context))
(debug-menu-make-from-template
arg0
'(main-menu
"Editable"
(flag "Cam 1" pad-1 dm-cam-externalize2)
(flag "Left Handed" 212 dm-editable-boolean-toggle-pick-func)
(menu
"Insert"
(function "Sphere" 27 editable-menu-command)
(function "Point" 28 editable-menu-command)
(function "Sample" 29 editable-menu-command)
(function "Light" 31 editable-menu-command)
(function "Entity" 32 editable-menu-command)
(function "Face" 33 editable-menu-command)
(function "Plane" 34 editable-menu-command)
(function "Box" 35 editable-menu-command)
(function "Edit-Plane Set" 45 editable-menu-command)
(function "Edit-Plane Clear" 46 editable-menu-command)
)
(menu
"Select"
(function "None" 6 editable-menu-command)
(function "All" 5 editable-menu-command)
(function "Owner" 10 editable-menu-command)
(function "Current Region" 11 editable-menu-command)
(function "Current Face" 12 editable-menu-command)
(function "Current Prim" 13 editable-menu-command)
)
(menu
"Selection"
(function "Copy" 37 editable-menu-command)
(function "Delete" 36 editable-menu-command)
(function "Flip Side" 42 editable-menu-command)
(function "Snap to Ground" 39 editable-menu-command)
(function "Snap XZ" 40 editable-menu-command)
(function "Snap Y" 41 editable-menu-command)
(function "Resize to Param" 38 editable-menu-command)
(function "Set to current Region" 43 editable-menu-command)
(function "Set to new Region" 44 editable-menu-command)
(flag "No Save" 2 dm-editable-flag-pick-func)
(flag "Top Set" 512 dm-editable-flag-pick-func)
(flag "Bot Set" 1024 dm-editable-flag-pick-func)
)
(menu
"Region"
(function "Print Info" 53 editable-menu-command)
(function "Copy" 48 editable-menu-command)
(function "Delete" 47 editable-menu-command)
(function "Add to current Region" 49 editable-menu-command)
(flag
"Region Lock"
#f
,(lambda ((arg0 int) (arg1 float) (arg2 float))
(if (= arg1 4)
(set! (-> *editable* 0 current region-lock?) (not (-> *editable* 0 current region-lock?)))
)
(-> *editable* 0 current region-lock?)
)
)
(flag "Camera" camera dm-region-tree-pick-func)
(flag "Target" target dm-region-tree-pick-func)
(flag "Water" water dm-region-tree-pick-func)
(flag "Data" data dm-region-tree-pick-func)
(flag "City Vis" city_vis dm-region-tree-pick-func)
)
(menu
"Filter"
(flag "None" 1 dm-editable-filter0-pick-func)
(flag "Unknown" 2 dm-editable-filter0-pick-func)
(flag "Sound" 4 dm-editable-filter0-pick-func)
(flag "Part" 8 dm-editable-filter0-pick-func)
(flag "Load" 64 dm-editable-filter0-pick-func)
(flag "User Setting" 16 dm-editable-filter0-pick-func)
(flag "Cam Setting" 32 dm-editable-filter0-pick-func)
(flag "Camera" 256 dm-editable-filter1-pick-func)
(flag "Target" 512 dm-editable-filter1-pick-func)
(flag "Water" 1024 dm-editable-filter1-pick-func)
(flag "Data" 2048 dm-editable-filter1-pick-func)
(flag "Sample" 8192 dm-editable-filter1-pick-func)
(flag "Light" 16384 dm-editable-filter1-pick-func)
(flag "Entity" 32768 dm-editable-filter1-pick-func)
(flag "City Vis" 4096 dm-editable-filter1-pick-func)
)
(menu
"Light"
(flag "Show Light Names" 216 dm-editable-boolean-toggle-pick-func)
(float-var
"Red"
60
dm-editable-light-float-func
2
(new 'static 'bfloat :data 0.00390625)
#t
0
(new 'static 'bfloat :data 1.9921875)
0
)
(float-var
"Green"
64
dm-editable-light-float-func
2
(new 'static 'bfloat :data 0.00390625)
#t
0
(new 'static 'bfloat :data 1.9921875)
0
)
(float-var
"Blue"
68
dm-editable-light-float-func
2
(new 'static 'bfloat :data 0.00390625)
#t
0
(new 'static 'bfloat :data 1.9921875)
0
)
(float-var
"Palette Index"
72
dm-editable-light-float-func
2
(new 'static 'bfloat :data 1.0)
#t
(new 'static 'bfloat :data -1.0)
(new 'static 'bfloat :data 7.0)
0
)
(float-var "Decay Start" 76 dm-editable-light-float-func 2 (new 'static 'bfloat :data 0.00390625) #t 0 1 0)
(float-var
"Ambient Point Ratio"
80
dm-editable-light-float-func
2
(new 'static 'bfloat :data 0.00390625)
#t
0
1
0
)
(float-var "Brightness" 84 dm-editable-light-float-func 2 (new 'static 'bfloat :data 0.00390625) #t 0 1 0)
)
(float-var
"Param"
#f
,(lambda ((arg0 int) (arg1 float) (arg2 float)) (cond
((= arg1 4)
(if (and *editable* (nonzero? *editable*))
(set! (-> *editable* 0 current edit-param0) arg2)
)
)
((or (not *editable*) (zero? *editable*))
0.0
)
(else
(-> *editable* 0 current edit-param0)
)
)
)
3
(new 'static 'bfloat :data 0.5)
#t
0
500
1
)
(function "Rotate Level" 55 editable-menu-command)
(function "Trans Y Level" 56 editable-menu-command)
(function "Revert" 51 editable-menu-command)
(function "Save" 50 editable-menu-command-no-close)
(function "Update Game" 52 editable-menu-command-no-close)
(function "Cancel" 17 editable-menu-command)
(function "Exit" 1 editable-menu-command)
)
)
arg0
)
;; failed to figure out what this is:
(editable-menu-context-make-menus *editable-menu-context*)
test/decompiler/reference/jak2/engine/debug/editable_REF.gc
Generated Vendored
+1 -1
View File
@@ -1390,7 +1390,7 @@
(bucket-id debug-no-zbuf1)
(edit-get-trans obj)
s1-0
(meters 2.0)
(meters 2)
(the-as rgba (-> (new 'static 'array uint64 1 #x8000ffff) 0))
)
)
test/decompiler/reference/jak2/engine/debug/history_REF.gc
Generated Vendored
+1 -4
View File
@@ -713,7 +713,7 @@
(bucket-id debug-no-zbuf1)
(-> s5-0 origin)
(-> s5-0 vector)
(meters 1.0)
(meters 1)
(the-as rgba (logior t1-7 (shl v1-8 24)))
)
)
@@ -751,6 +751,3 @@
0
)
test/decompiler/reference/jak2/engine/entity/actor-link-h_REF.gc
Generated Vendored
+2 -2
View File
@@ -173,7 +173,7 @@
(set! s4-0 (entity-actor-lookup s4-0 'prev-actor 0))
)
(while s4-0
(if (arg0 (the-as entity-actor s4-0) arg1)
(if (arg0 s4-0 arg1)
(return (the-as int #f))
)
(let ((a0-4 s4-0))
@@ -300,7 +300,7 @@
;; definition for method 9 of type actor-link-info
(defmethod get-matching-actor-type-mask actor-link-info ((obj actor-link-info) (arg0 type))
(let ((s3-0 (the-as entity-actor (-> obj process entity)))
(let ((s3-0 (-> obj process entity))
(s5-0 0)
)
(let ((s4-0 1))
test/decompiler/reference/jak2/engine/entity/entity-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -31,7 +31,7 @@
:size-assert #x10
:flag-assert #xa00000010
(:methods
(update-perm! (_type_ symbol entity-perm-status) _type_ 9)
(update (_type_ symbol entity-perm-status) _type_ 9)
)
)
test/decompiler/reference/jak2/engine/entity/entity_REF.gc
Generated Vendored
+6 -6
View File
@@ -515,7 +515,7 @@
)
;; definition for function process-entity-set!
(defun process-entity-set! ((arg0 process) (arg1 entity))
(defun process-entity-set! ((arg0 process) (arg1 entity-actor))
(set! (-> arg0 entity) arg1)
(if arg1
(set! (-> arg0 level) (-> arg1 extra level))
@@ -1262,7 +1262,7 @@
;; definition (debug) for function draw-actor-marks
;; WARN: Return type mismatch int vs none.
(defun-debug draw-actor-marks ((arg0 process))
(local-vars (sv-16 entity) (sv-20 (pointer int32)))
(local-vars (sv-16 entity-actor) (sv-20 (pointer int32)))
(b!
(not (and (or (type? arg0 process-drawable) (= (-> arg0 type) part-tracker) (type? arg0 part-spawner))
(nonzero? (-> (the-as part-spawner arg0) root))
@@ -2147,7 +2147,7 @@
)
;; definition for method 9 of type entity-perm
(defmethod update-perm! entity-perm ((obj entity-perm) (arg0 symbol) (arg1 entity-perm-status))
(defmethod update entity-perm ((obj entity-perm) (arg0 symbol) (arg1 entity-perm-status))
(cond
((= arg0 'game)
(logclear! (-> obj status) arg1)
@@ -2211,7 +2211,7 @@
(if (not (and (-> s0-0 extra process) (logtest? (-> s0-0 extra process mask) (process-mask no-kill))))
(kill! s0-0)
)
(update-perm! (-> s0-0 extra perm) arg0 (the-as entity-perm-status s5-0))
(update (-> s0-0 extra perm) arg0 (the-as entity-perm-status s5-0))
)
)
)
@@ -2220,13 +2220,13 @@
)
(let ((s3-1 (-> s4-0 task-perm-list)))
(dotimes (s2-1 (-> s3-1 length))
(update-perm! (-> s3-1 data s2-1) arg0 (the-as entity-perm-status s5-0))
(update (-> s3-1 data s2-1) arg0 (the-as entity-perm-status s5-0))
)
(logior! (-> s3-1 data 1 status) (entity-perm-status complete))
)
(let ((s4-1 (-> s4-0 perm-list)))
(dotimes (s3-2 (-> s4-1 length))
(update-perm! (-> s4-1 data s3-2) arg0 (the-as entity-perm-status s5-0))
(update (-> s4-1 data s3-2) arg0 (the-as entity-perm-status s5-0))
)
)
)
test/decompiler/reference/jak2/engine/game/fact-h_REF.gc
Generated Vendored
+7 -7
View File
@@ -480,7 +480,7 @@
(eco-level float :offset-assert 44)
(eco-pickup-time time-frame :offset-assert 48)
(eco-timeout time-frame :offset-assert 56)
(eco-source uint64 :offset-assert 64)
(eco-source handle :offset-assert 64)
(eco-source-time time-frame :offset-assert 72)
(health float :offset-assert 80)
(health-max float :offset-assert 84)
@@ -1342,9 +1342,9 @@
;; INFO: Used lq/sq
;; WARN: Return type mismatch object vs fact-info.
(defmethod new fact-info ((allocation symbol) (type-to-make type) (arg0 process) (arg1 pickup-type) (arg2 float))
(local-vars (sv-16 fact-info) (sv-20 entity) (sv-24 task-mask))
(local-vars (sv-16 fact-info) (sv-20 res-lump) (sv-24 task-mask))
(set! sv-16 (object-new allocation type-to-make (the-as int (-> type-to-make size))))
(set! sv-20 (-> arg0 entity))
(set! sv-20 (the-as res-lump (-> arg0 entity)))
(set! sv-24 (process-task-mask arg0))
(when (zero? sv-16)
(go process-drawable-art-error "memory")
@@ -1353,7 +1353,7 @@
(set! (-> sv-16 process) arg0)
(set! (-> sv-16 pickup-type) arg1)
(set! (-> sv-16 pickup-amount) arg2)
(let ((s4-1 (-> ((method-of-type res-lump lookup-tag-idx) sv-20 'eco-info 'base -1000000000.0) lo)))
(let ((s4-1 (-> (lookup-tag-idx sv-20 'eco-info 'base -1000000000.0) lo)))
(when (>= (the-as int s4-1) 0)
(let ((s3-0 (the-as int s4-1))
(s2-0 (-> sv-20 tag s4-1))
@@ -1429,7 +1429,7 @@
)
(local-vars (sv-16 res-tag) (sv-32 res-tag))
(let ((gp-0 (the-as fact-info-enemy ((method-of-type fact-info new) allocation type-to-make arg0 arg2 arg3))))
(let ((s5-0 (-> gp-0 process entity)))
(let ((s5-0 (the-as res-lump (-> gp-0 process entity))))
(set! (-> gp-0 speed) (res-lump-float s5-0 'speed :default 1.0))
(set! (-> gp-0 idle-distance) (res-lump-float s5-0 'idle-distance :default (-> arg1 0)))
(set! (-> gp-0 notice-top) (res-lump-float s5-0 'notice-top :default 4096000.0))
@@ -1492,7 +1492,7 @@
;; definition for method 0 of type fact-info-crate
(defmethod new fact-info-crate ((allocation symbol) (type-to-make type) (arg0 process) (arg1 pickup-type) (arg2 float))
(let ((gp-0 (the-as fact-info-crate ((method-of-type fact-info new) allocation type-to-make arg0 arg1 arg2))))
(let ((a0-1 (-> gp-0 process entity)))
(let ((a0-1 (the-as res-lump (-> gp-0 process entity))))
(set! (-> gp-0 suck-count) (res-lump-value a0-1 'suck-count int :time -1000000000.0))
)
gp-0
@@ -1502,7 +1502,7 @@
;; definition for method 0 of type fact-info-target
(defmethod new fact-info-target ((allocation symbol) (type-to-make type) (arg0 process-drawable) (arg1 pickup-type) (arg2 float))
(let ((gp-0 (the-as fact-info-target ((method-of-type fact-info new) allocation type-to-make arg0 arg1 arg2))))
(set! (-> gp-0 eco-source) (the-as uint #f))
(set! (-> gp-0 eco-source) (the-as handle #f))
(reset! gp-0 #f)
gp-0
)
test/decompiler/reference/jak2/engine/game/game-info-h_REF.gc
Generated Vendored
+51 -50
View File
@@ -52,17 +52,17 @@
;; definition of type highscore-info
(deftype highscore-info (structure)
((flags uint8 :offset-assert 0)
(award-scores float 3 :offset-assert 4)
(bronze-score float :offset 4)
(silver-score float :offset 8)
(gold-score float :offset 12)
((flags highscore-flags :offset-assert 0)
(award-scores float 3 :offset-assert 4)
(bronze-score float :offset 4)
(silver-score float :offset 8)
(gold-score float :offset 12)
)
:method-count-assert 10
:size-assert #x10
:flag-assert #xa00000010
(:methods
(highscore-info-method-9 () none 9)
(get-rank (_type_ float) int 9)
)
)
@@ -176,7 +176,7 @@
(trans vector :inline :offset-assert 16)
(quat vector :inline :offset-assert 32)
(camera-trans vector :inline :offset-assert 48)
(camera-rot float 9 :offset-assert 64)
(camera-rot vector3s 3 :inline :offset-assert 64)
(on-goto pair :offset-assert 100)
(vis-nick symbol :offset-assert 104)
(want level-buffer-state 6 :inline :offset-assert 108)
@@ -186,9 +186,9 @@
:size-assert #xd8
:flag-assert #xc000000d8
(:methods
(continue-point-method-9 () none 9)
(continue-point-method-10 () none 10)
(continue-point-method-11 (_type_) none 11)
(debug-draw (_type_) int 9)
(continue-point-method-10 (_type_ load-state) continue-point 10)
(move-camera! (_type_) none 11)
)
)
@@ -249,10 +249,10 @@
(gun-ammo float 4 :offset-assert 164)
(shield float :offset-assert 180)
(score float :offset-assert 184)
(score-owner uint64 :offset-assert 192)
(timer uint64 :offset-assert 200)
(timer-owner uint64 :offset-assert 208)
(timer-flash basic :offset-assert 216)
(score-owner handle :offset-assert 192)
(timer time-frame :offset-assert 200)
(timer-owner handle :offset-assert 208)
(timer-flash symbol :offset-assert 216)
(counter float :offset-assert 220)
(counter-flash basic :offset-assert 224)
(attack-id uint32 :offset-assert 228)
@@ -262,9 +262,9 @@
(last-continue continue-point :offset-assert 244)
(play-list (array game-task-info) :offset-assert 248)
(sub-task-list (array game-task-node-info) :offset-assert 252)
(unknown-pad5 array :offset-assert 256)
(unknown-pad5 (array game-task-node-info) :offset-assert 256)
(task-counter uint32 :offset-assert 260)
(unknown-pad6 uint32 :offset-assert 264)
(unknown-pad6 (array uint16) :offset-assert 264)
(level-opened uint8 32 :offset-assert 268)
(total-deaths int32 :offset-assert 300)
(continue-deaths int32 :offset-assert 304)
@@ -275,9 +275,9 @@
(death-time time-frame :offset-assert 336)
(hit-time time-frame :offset-assert 344)
(task-pickup-time time-frame :offset-assert 352)
(unknown-array1 (array uint64) :offset-assert 360)
(unknown-array2 (array uint64) :offset-assert 364)
(unknown-array3 (array uint64) :offset-assert 368)
(unknown-array1 (array time-frame) :offset-assert 360)
(task-enter-times (array time-frame) :offset-assert 364)
(task-in-times (array time-frame) :offset-assert 368)
(death-pos vector-array :offset 372)
(stop-watch-start uint64 :offset-assert 376)
(stop-watch-stop uint64 :offset-assert 384)
@@ -293,8 +293,8 @@
(auto-save-card int32 :offset-assert 452)
(auto-save-which int32 :offset-assert 456)
(auto-save-count int32 :offset-assert 460)
(pov-camera-handle uint64 :offset-assert 464)
(other-camera-handle uint64 :offset-assert 472)
(pov-camera-handle handle :offset-assert 464)
(other-camera-handle handle :offset-assert 472)
(controller handle 2 :offset-assert 480)
(race-timer uint64 :offset-assert 496)
(race-current-lap-count int32 :offset-assert 504)
@@ -307,11 +307,11 @@
(distance float :offset-assert 540)
(kiosk-timeout uint64 :offset-assert 544)
(pause-start-time time-frame :offset-assert 552)
(game-score (array highscore-info) :offset-assert 560)
(game-score (array float) :offset-assert 560)
(goal float :offset-assert 564)
(miss float :offset-assert 568)
(miss-max float :offset-assert 572)
(unknown-array4 (array uint64) :offset-assert 576)
(task-close-times (array time-frame) :offset-assert 576)
(live-eco-pill-count int32 :offset-assert 580)
(live-gem-count int32 :offset-assert 584)
(air-supply float :offset-assert 588)
@@ -324,27 +324,27 @@
:flag-assert #x1f0000025c
(:methods
(initialize! (_type_ symbol game-save string) _type_ 9)
(game-info-method-10 () none 10)
(give (_type_ symbol float handle) float 10)
(task-complete? (_type_ game-task) symbol 11)
(game-info-method-12 (_type_) none 12)
(game-info-method-13 () none 13)
(game-info-method-14 () none 14)
(game-info-method-15 () none 15)
(copy-perms-from-level! (_type_ level) none 16)
(copy-perms-to-level! (_type_ level) none 17)
(game-info-method-18 () none 18)
(get-current-continue-point (_type_) continue-point 19)
(subtask-index-by-name (_type_ string) int 12)
(set-subtask-hook! (_type_ int int function) function 13)
(actor-perm (_type_ actor-id) entity-perm 14)
(task-perm-by-index (_type_ int) entity-perm 15)
(copy-perms-from-level! (_type_ level) int 16)
(copy-perms-to-level! (_type_ level) int 17)
(game-info-method-18 (_type_ symbol) _type_ 18)
(get-current-continue-forced (_type_) continue-point 19)
(get-continue-by-name (_type_ string) continue-point 20)
(set-continue! (_type_ basic object) continue-point 21)
(game-info-method-22 () none 22)
(game-info-method-23 () none 23)
(game-info-method-24 () none 24)
(game-info-method-25 () none 25)
(game-info-method-26 () none 26)
(set-continue! (_type_ basic symbol) continue-point 21)
(game-info-method-22 (_type_) int 22)
(game-info-method-23 (_type_ game-save string) int 23)
(game-info-method-24 (_type_ game-save) none 24)
(you-suck-stage (_type_ symbol) int 25)
(you-suck-scale (_type_) float 26)
(get-next-attack-id (_type_) uint 27)
(game-info-method-28 () none 28)
(game-info-method-29 () none 29)
(game-info-method-30 () none 30)
(game-info-method-28 (_type_ game-score float) int 28)
(get-game-score-ref (_type_ int) (pointer float) 29)
(calculate-percentage (_type_) float 30)
)
)
@@ -454,13 +454,14 @@
)
;; failed to figure out what this is:
(set! gp-0 (when (or (not *game-info*) (zero? *game-info*))
(set! gp-0 (new 'static 'game-info :mode 'debug :current-continue #f :last-continue #f))
(set! (-> gp-0 unknown-array1) (new 'global 'boxed-array uint64 110))
(set! (-> gp-0 unknown-array4) (new 'global 'boxed-array uint64 110))
(set! (-> gp-0 unknown-array2) (new 'global 'boxed-array uint64 32))
(set! (-> gp-0 unknown-array3) (new 'global 'boxed-array uint64 32))
(set! *game-info* gp-0)
gp-0
)
(set! gp-0
(when (or (not *game-info*) (zero? *game-info*))
(set! gp-0 (new 'static 'game-info :mode 'debug :current-continue #f :last-continue #f))
(set! (-> gp-0 unknown-array1) (the-as (array time-frame) (new 'global 'boxed-array uint64 110)))
(set! (-> gp-0 task-close-times) (the-as (array time-frame) (new 'global 'boxed-array uint64 110)))
(set! (-> gp-0 task-enter-times) (the-as (array time-frame) (new 'global 'boxed-array uint64 32)))
(set! (-> gp-0 task-in-times) (the-as (array time-frame) (new 'global 'boxed-array uint64 32)))
(set! *game-info* gp-0)
gp-0
)
)
test/decompiler/reference/jak2/engine/game/game-info_REF.gc
Generated Vendored
+1770
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/jak2/engine/game/settings-h_REF.gc
Generated Vendored
+2 -2
View File
@@ -43,7 +43,7 @@
(board symbol :offset-assert 156)
(jump symbol :offset-assert 160)
(speed-mult float :offset-assert 164)
(features uint64 :offset-assert 168)
(features game-feature :offset-assert 168)
(sfx-volume float :offset-assert 176)
(sfx-movie-volume float :offset-assert 180)
(music-volume float :offset-assert 184)
@@ -70,7 +70,7 @@
(allow-continue symbol :offset-assert 268)
(spotlight-color rgba :offset-assert 272)
(subtitle symbol :offset-assert 276)
(borrow symbol :offset-assert 280)
(borrow pair :offset-assert 280)
(doorway symbol :offset-assert 284)
(gen symbol :offset-assert 288)
(half-speed symbol :offset-assert 292)
test/decompiler/reference/jak2/engine/game/settings_REF.gc
Generated Vendored
+5 -6
View File
@@ -440,7 +440,7 @@
(logclear! (-> obj features) arg3)
)
(('abs)
(set! (-> obj features) arg3)
(set! (-> obj features) (the-as game-feature arg3))
)
)
)
@@ -464,7 +464,7 @@
(set! (-> obj race-minimap) (the-as int arg3))
)
(('borrow)
(set! (-> obj borrow) arg1)
(set! (-> obj borrow) (the-as pair arg1))
)
(('half-speed)
(set! (-> obj half-speed) arg1)
@@ -910,8 +910,7 @@
;; definition for method 17 of type setting-control
(defmethod apply-settings setting-control ((obj setting-control))
*speech-control*
((method-of-type speech-control speech-control-method-11))
(speech-control-method-11 *speech-control*)
(let ((s5-0 (-> obj user-current)))
(let ((s4-0 (-> obj user-target)))
(mem-copy! (the-as pointer s4-0) (the-as pointer (-> obj user-default)) 528)
@@ -1413,7 +1412,7 @@
(set! (-> gp-0 allow-look-around) #t)
(set! (-> gp-0 border-mode) #f)
(set! (-> gp-0 region-mode) #t)
(set! (-> gp-0 borrow) (the-as symbol '()))
(set! (-> gp-0 borrow) '())
(set! (-> gp-0 sfx-volume) (* 0.01000001 f0-1))
(set! (-> gp-0 music-volume) (* 0.01000001 f0-1))
(set! (-> gp-0 dialog-volume) (* 0.01000001 f0-1))
@@ -1489,7 +1488,7 @@
(set! (-> gp-0 speed-mult) 1.0)
(set! (-> gp-0 rain) 0.0)
(set! (-> gp-0 snow) 0.0)
(set! (-> gp-0 features) (the-as uint -1))
(set! (-> gp-0 features) (the-as game-feature -1))
(set! (-> gp-0 sound-flava) (the-as uint 0))
(set! (-> gp-0 sound-flava-priority) 0.0)
(set! (-> gp-0 sound-reverb) 0.0)
test/decompiler/reference/jak2/engine/game/task/game-task_REF.gc
Generated Vendored
+12322
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/jak2/engine/task/task-control-h_REF.gc → test/decompiler/reference/jak2/engine/game/task/task-control-h_REF.gc
Generated Vendored
+106 -105
View File
@@ -937,7 +937,8 @@
(deftype game-task-event (basic)
((actor game-task-actor :offset-assert 4)
(action game-task-action :offset-assert 5)
(icon game-task-icon :offset 6)
(tex game-task-icon :offset-assert 6)
(icon uint16 :offset 6)
(flags game-task-flags :offset 7)
(scene basic :offset 8)
(distance meters :offset-assert 12)
@@ -966,33 +967,34 @@
;; definition of type task-manager-info
(deftype task-manager-info (structure)
((mask task-manager-mask :offset-assert 0)
(level basic :offset-assert 4)
(manager handle :offset-assert 8)
(fail-message uint32 :offset-assert 16)
(retry-message uint32 :offset-assert 20)
(intro-scene basic :offset-assert 24)
(resolution-scene basic :offset-assert 28)
(resolution-scene-continue basic :offset-assert 32)
(retry-continue basic :offset-assert 36)
(fail-continue basic :offset-assert 40)
(init-hook basic :offset-assert 44)
(cleanup-hook basic :offset-assert 48)
(update-hook basic :offset-assert 52)
(code-hook basic :offset-assert 56)
(complete-hook basic :offset-assert 60)
(fail-hook basic :offset-assert 64)
(event-hook basic :offset-assert 68)
(final-node uint16 :offset-assert 72)
(time-limit int32 :offset-assert 76)
(sphere-count int8 :offset-assert 80)
(index int8 :offset-assert 81)
(intro-delay uint16 :offset-assert 82)
(sphere-array uint32 :offset-assert 84)
(on-complete basic :offset-assert 88)
(on-fail basic :offset-assert 92)
(begin-sphere sphere :inline :offset-assert 96)
(end-sphere sphere :inline :offset-assert 112)
((mask task-manager-mask :offset-assert 0)
(level symbol :offset-assert 4)
(manager handle :offset-assert 8)
(fail-message game-text-id :offset-assert 16)
(retry-message game-text-id :offset-assert 20)
(intro-scene string :offset-assert 24)
(resolution-scene string :offset-assert 28)
(resolution-scene-continue string :offset-assert 32)
(retry-continue string :offset-assert 36)
(fail-continue string :offset-assert 40)
(init-hook (function object) :offset-assert 44)
(cleanup-hook (function object) :offset-assert 48)
(update-hook (function object) :offset-assert 52)
(code-hook (function object) :offset-assert 56)
(complete-hook (function object) :offset-assert 60)
(fail-hook (function object) :offset-assert 64)
(event-hook (function process int symbol event-message-block object) :offset-assert 68)
(hooks (function object) 7 :offset 44)
(final-node game-task-node :offset-assert 72)
(time-limit int32 :offset-assert 76)
(sphere-count int8 :offset-assert 80)
(index int8 :offset-assert 81)
(intro-delay uint16 :offset-assert 82)
(sphere-array uint32 :offset-assert 84)
(on-complete pair :offset-assert 88)
(on-fail pair :offset-assert 92)
(begin-sphere sphere :inline :offset-assert 96)
(end-sphere sphere :inline :offset-assert 112)
)
:method-count-assert 9
:size-assert #x80
@@ -1059,7 +1061,6 @@
)
;; definition (debug) for function game-task-node-flag->string
;; WARN: Return type mismatch object vs none.
(defun-debug game-task-node-flag->string ((arg0 game-task-node-flag))
(if (= (logand arg0 (game-task-node-flag clear-task-mask)) (game-task-node-flag clear-task-mask))
(format #t "clear-task-mask ")
@@ -1121,7 +1122,6 @@
(if (= (logand (game-task-node-flag no-audio) arg0) (game-task-node-flag no-audio))
(format #t "no-audio ")
)
(none)
)
;; definition (debug) for function game-task-node-command->string
@@ -1204,35 +1204,35 @@
;; definition of type game-task-node-info
(deftype game-task-node-info (basic)
((level basic :offset-assert 4)
(task game-task :offset-assert 8)
(name string :offset-assert 12)
(when-open array :offset-assert 16)
(flags game-task-node-flag :offset-assert 20)
(parent-node uint16 4 :offset-assert 24)
(task-mask task-mask :offset-assert 32)
(on-open basic :offset-assert 36)
(info task-manager-info :offset-assert 40)
(borrow basic :offset-assert 44)
(open? symbol :offset-assert 48)
(on-close basic :offset-assert 52)
(close-time time-frame :offset-assert 56)
(death-count uint16 :offset-assert 64)
(gem-count uint16 :offset-assert 66)
(skill-count uint16 :offset-assert 68)
(suck-death-count uint8 :offset-assert 70)
(add game-task-node-command :offset-assert 71)
(description uint32 :offset-assert 72)
((level symbol :offset-assert 4)
(task game-task :offset-assert 8)
(name string :offset-assert 12)
(when-open (array game-task-event) :offset-assert 16)
(flags game-task-node-flag :offset-assert 20)
(parent-node game-task-node 4 :offset-assert 24)
(task-mask task-mask :offset-assert 32)
(on-open pair :offset-assert 36)
(info task-manager-info :offset-assert 40)
(borrow pair :offset-assert 44)
(open? (function game-task-node-info symbol) :offset-assert 48)
(on-close pair :offset-assert 52)
(close-time time-frame :offset-assert 56)
(death-count uint16 :offset-assert 64)
(gem-count uint16 :offset-assert 66)
(skill-count uint16 :offset-assert 68)
(suck-death-count uint8 :offset-assert 70)
(add game-task-node-command :offset-assert 71)
(description game-text-id :offset-assert 72)
)
:method-count-assert 14
:size-assert #x4c
:flag-assert #xe0000004c
(:methods
(dummy-9 () none 9)
(dummy-10 () none 10)
(dummy-11 () none 11)
(dummy-12 () none 12)
(dummy-13 () none 13)
(close! (_type_ symbol) int 9)
(open! (_type_ symbol) int 10)
(open? (_type_) symbol 11)
(copy-hooks! (_type_ game-task-node-info) game-task-node-info 12)
(eval-add (_type_) int 13)
)
)
@@ -1333,14 +1333,14 @@
;; definition of type game-task-info
(deftype game-task-info (basic)
((name string :offset-assert 4)
(text-name uint32 :offset-assert 8)
(pre-play-node uint16 :offset-assert 12)
(kiosk-play-node uint16 :offset-assert 14)
(pre-play-continue string :offset-assert 16)
(play-node uint16 :offset-assert 20)
(play-continue string :offset-assert 24)
(kiosk-play-continue string :offset-assert 28)
((name string :offset-assert 4)
(text-name game-text-id :offset-assert 8)
(pre-play-node game-task-node :offset-assert 12)
(kiosk-play-node game-task-node :offset-assert 14)
(pre-play-continue string :offset-assert 16)
(play-node game-task-node :offset-assert 20)
(play-continue string :offset-assert 24)
(kiosk-play-continue string :offset-assert 28)
)
:method-count-assert 9
:size-assert #x20
@@ -1370,14 +1370,15 @@
(deftype game-task-control (basic)
((counter uint32 :offset-assert 4)
(actor game-task-actor :offset-assert 8)
(current-node uint16 :offset-assert 10)
(current-event uint32 :offset-assert 12)
(current-node game-task-node :offset-assert 10)
(current-event game-task-event :offset-assert 12)
)
:method-count-assert 10
:size-assert #x10
:flag-assert #xa00000010
(:methods
(dummy-9 () none 9)
(new (symbol type game-task-actor) _type_ 0)
(game-task-control-method-9 (_type_) game-task-event 9)
)
)
@@ -1398,52 +1399,52 @@
;; definition of type task-manager
(deftype task-manager (process)
((node-info basic :offset-assert 128)
(info task-manager-info :offset-assert 132)
(lev-name basic :offset-assert 136)
(fail-on-death? symbol :offset-assert 140)
(fail-now basic :offset-assert 144)
(retry-now basic :offset-assert 148)
(allow-fail basic :offset-assert 152)
(state-time time-frame :offset-assert 160)
(count int16 :offset-assert 168)
(max-count int16 :offset-assert 170)
(sub-state uint32 :offset-assert 172)
(slave uint64 32 :offset-assert 176)
(arrow uint64 :offset-assert 432)
(link uint32 :offset-assert 440)
(start-time time-frame :offset-assert 448)
(total-time time-frame :offset-assert 456)
(beep-time time-frame :offset-assert 464)
(time-limit time-frame :offset-assert 472)
(begin-pos vector :inline :offset-assert 480)
(end-pos vector :inline :offset-assert 496)
(data-int8 int8 32 :offset-assert 512)
(data-int32 int32 32 :offset-assert 544)
(data-float float 32 :offset-assert 672)
(data-vector vector 32 :inline :offset-assert 800)
(actor-group uint32 4 :offset-assert 1312)
(minimap uint32 8 :offset-assert 1328)
(hud uint64 4 :offset-assert 1360)
(hud-timer time-frame :offset 1360)
(hud-counter int64 :offset 1368)
(sound-id uint32 4 :offset-assert 1392)
(intro-time time-frame :offset-assert 1408)
((node-info game-task-node-info :offset-assert 128)
(info task-manager-info :offset-assert 132)
(lev-name symbol :offset-assert 136)
(fail-on-death? symbol :offset-assert 140)
(fail-now symbol :offset-assert 144)
(retry-now symbol :offset-assert 148)
(allow-fail symbol :offset-assert 152)
(state-time time-frame :offset-assert 160)
(count int16 :offset-assert 168)
(max-count int16 :offset-assert 170)
(sub-state uint32 :offset-assert 172)
(slave handle 32 :offset-assert 176)
(arrow handle :offset-assert 432)
(link uint32 :offset-assert 440)
(start-time time-frame :offset-assert 448)
(total-time time-frame :offset-assert 456)
(beep-time time-frame :offset-assert 464)
(time-limit time-frame :offset-assert 472)
(begin-pos vector :inline :offset-assert 480)
(end-pos vector :inline :offset-assert 496)
(data-int8 int8 32 :offset-assert 512)
(data-int32 int32 32 :offset-assert 544)
(data-float float 32 :offset-assert 672)
(data-vector vector 32 :inline :offset-assert 800)
(actor-group uint32 4 :offset-assert 1312)
(minimap uint32 8 :offset-assert 1328)
(hud handle 4 :offset-assert 1360)
(hud-timer handle :offset 1360)
(hud-counter handle :offset 1368)
(sound-id sound-id 4 :offset-assert 1392)
(intro-time time-frame :offset-assert 1408)
)
:heap-base #x510
:method-count-assert 23
:size-assert #x588
:flag-assert #x1705100588
(:methods
(dummy-14 () none 14)
(dummy-15 () none 15)
(dummy-16 () none 16)
(dummy-17 () none 17)
(dummy-18 () none 18)
(dummy-19 () none 19)
(dummy-20 () none 20)
(dummy-21 () none 21)
(dummy-22 () none 22)
(wait () _type_ :state 14)
(active () _type_ :state 15)
(complete () _type_ :state 16)
(fail () _type_ :state 17)
(retry () _type_ :state 18)
(initialize! (_type_) int 19)
(kill-all-children (_type_) int 20)
(check-time (_type_) int 21)
(task-manager-method-22 (_type_) symbol 22)
)
)
test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc
Generated Vendored
+2421
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/jak2/engine/geometry/geometry-h_REF.gc
Generated Vendored
+1 -5
View File
@@ -42,7 +42,7 @@
:size-assert #x30
:flag-assert #xb00000030
(:methods
(debug-draw! (_type_) none 9)
(debug-draw (_type_) int 9)
(point-past-plane? (_type_ vector) symbol 10)
)
)
@@ -65,7 +65,3 @@
;; failed to figure out what this is:
0
test/decompiler/reference/jak2/engine/gfx/mood/mood-funcs_REF.gc
Generated Vendored
+4 -4
View File
@@ -1336,8 +1336,8 @@
(set! (-> arg0 times 5 w) 1.0)
(set! (-> arg0 times 4 w) (-> gp-1 fire-floor))
(update-mood-flames arg0 6 1 12 0.9 0.0009765625 2.0)
(if (and (task-node-closed? (game-task-node drill-mech-resolution))
(not (task-node-closed? (game-task-node drill-mech-started-smashing)))
(if (and (task-node-closed? (game-task-node drill-mech-smash-consoles))
(not (task-node-closed? (game-task-node drill-mech-resolution)))
)
(update-mood-pulse arg0 7 52 0.75 0.25 (* 65536.0 (-> self clock seconds-per-frame)) 16384.0)
)
@@ -1460,8 +1460,8 @@
(let ((gp-0 (the-as drillb-states (-> arg0 state))))
(set! (-> arg0 times 1 w) 1.0)
(set! (-> arg0 times 4 w) (-> gp-0 fire-floor))
(if (and (task-node-closed? (game-task-node drill-mech-resolution))
(not (task-node-closed? (game-task-node drill-mech-started-smashing)))
(if (and (task-node-closed? (game-task-node drill-mech-smash-consoles))
(not (task-node-closed? (game-task-node drill-mech-resolution)))
)
(update-mood-pulse arg0 7 12 0.75 0.25 (* 65536.0 (-> self clock seconds-per-frame)) 16384.0)
)
test/decompiler/reference/jak2/engine/gfx/sprite/particles/sparticle-launcher_REF.gc
Generated Vendored
+1 -1
View File
@@ -1279,7 +1279,7 @@
(-> s5-1 w)
(new 'static 'rgba :g #xff :a #x80)
)
(add-debug-matrix *display-sprite-marks* (bucket-id debug2) (-> obj origin) (meters 2.0))
(add-debug-matrix *display-sprite-marks* (bucket-id debug2) (-> obj origin) (meters 2))
)
(sphere-in-view-frustum? (the-as sphere s5-1))
)
test/decompiler/reference/jak2/engine/level/level-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -485,7 +485,7 @@
(login-begin (_type_) _type_ 19)
(debug-print-region-splitbox (_type_ vector object) none 20)
(get-art-group-by-name (_type_ string) art-group 21)
(level-method-22 () none 22)
(level-method-22 (_type_ symbol) int 22)
(lookup-text (_type_ game-text-id symbol) string 23)
(level-method-24 () none 24)
(birth (_type_) _type_ 25)
test/decompiler/reference/jak2/engine/level/level-info_REF.gc
Generated Vendored
+1228 -248
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/jak2/engine/load/load-state_REF.gc
Generated Vendored
+359
View File
@@ -0,0 +1,359 @@
;;-*-Lisp-*-
(in-package goal)
;; definition for method 2 of type level-buffer-state
(defmethod print level-buffer-state ((obj level-buffer-state))
(format
#t
"#<level-buffer-state ~A ~A ~A ~A @ #x~X>"
(-> obj name)
(-> obj display?)
(-> obj force-vis?)
(-> obj force-inside?)
obj
)
obj
)
;; definition for method 9 of type load-state
(defmethod reset! load-state ((obj load-state))
(dotimes (v1-0 6)
(set! (-> obj want v1-0 name) #f)
(set! (-> obj want v1-0 display?) #f)
(set! (-> obj want v1-0 force-vis?) #f)
(set! (-> obj want v1-0 force-inside?) #f)
)
(dotimes (v1-3 3)
(set! (-> obj want-sound v1-3) #f)
)
(set! (-> obj command-list) '())
(dotimes (v1-7 256)
(set! (-> obj object-name v1-7) #f)
(set! (-> obj object-status v1-7) (the-as basic 0))
)
obj
)
;; definition for method 11 of type load-state
(defmethod want-levels load-state ((obj load-state) (arg0 (pointer symbol)))
(dotimes (v1-0 6)
(dotimes (a2-0 6)
(when (= (-> obj want v1-0 name) (-> arg0 a2-0))
(set! (-> arg0 a2-0) #f)
(goto cfg-8)
)
)
(set! (-> obj want v1-0 name) #f)
(label cfg-8)
)
(dotimes (v1-3 6)
(when (-> arg0 v1-3)
(dotimes (a2-13 6)
(when (not (-> obj want a2-13 name))
(set! (-> obj want a2-13 name) (-> arg0 v1-3))
(set! (-> obj want a2-13 display?) #f)
(set! (-> obj want a2-13 force-vis?) #f)
(set! (-> obj want a2-13 force-inside?) #f)
(goto cfg-19)
)
)
)
(label cfg-19)
)
(add-borrow-levels obj)
0
)
;; definition for method 12 of type load-state
;; WARN: Return type mismatch int vs none.
(defmethod want-sound-banks load-state ((obj load-state) (arg0 (pointer symbol)))
(dotimes (v1-0 3)
(dotimes (a2-0 3)
(when (= (-> obj want-sound v1-0) (-> arg0 a2-0))
(set! (-> arg0 a2-0) #f)
(goto cfg-8)
)
)
(set! (-> obj want-sound v1-0) #f)
(label cfg-8)
)
(dotimes (v1-3 3)
(when (-> arg0 v1-3)
(dotimes (a2-13 3)
(when (not (-> obj want-sound a2-13))
(set! (-> obj want-sound a2-13) (-> arg0 v1-3))
(goto cfg-19)
)
)
)
(label cfg-19)
)
0
(none)
)
;; definition for method 13 of type load-state
(defmethod want-display-level load-state ((obj load-state) (arg0 symbol) (arg1 symbol))
(dotimes (v1-0 6)
(when (= (-> obj want v1-0 name) arg0)
(set! (-> obj want v1-0 display?) arg1)
(add-borrow-levels obj)
(return 0)
)
)
(if arg1
(format 0 "ERROR: can't display ~A because it isn't loaded~%" arg0)
)
0
)
;; definition for method 14 of type load-state
;; WARN: Return type mismatch int vs none.
(defmethod want-vis-level load-state ((obj load-state) (arg0 symbol))
(let ((v1-0 (lookup-level-info arg0)))
(if v1-0
(set! arg0 (-> v1-0 name))
)
)
(set! (-> obj vis-nick) arg0)
0
(none)
)
;; definition for method 15 of type load-state
(defmethod want-force-vis load-state ((obj load-state) (arg0 symbol) (arg1 symbol))
(dotimes (v1-0 6)
(when (= (-> obj want v1-0 name) arg0)
(set! (-> obj want v1-0 force-vis?) arg1)
(return 0)
)
)
(format 0 "ERROR: can't force vis on ~A because it isn't loaded~%" arg0)
0
)
;; definition for method 16 of type load-state
;; WARN: Return type mismatch int vs none.
;; WARN: Function (method 16 load-state) has a return type of none, but the expression builder found a return statement.
(defmethod want-force-inside load-state ((obj load-state) (arg0 symbol) (arg1 symbol))
(dotimes (v1-0 6)
(when (= (-> obj want v1-0 name) arg0)
(set! (-> obj want v1-0 force-inside?) arg1)
(return 0)
)
)
(format 0 "ERROR: can't force inside on ~A because it isn't loaded~%" arg0)
0
(none)
)
;; definition for method 21 of type load-state
;; WARN: Return type mismatch int vs none.
(defmethod add-borrow-levels load-state ((obj load-state))
(dotimes (s5-0 6)
(let ((a0-1 (-> obj want s5-0 name)))
(when a0-1
(let ((a0-2 (lookup-level-info a0-1)))
(when (= (-> a0-2 memory-mode) (load-buffer-mode borrow))
(set! (-> obj want s5-0 name) #f)
(set! (-> obj want s5-0 display?) #f)
(set! (-> obj want s5-0 force-vis?) #f)
(set! (-> obj want s5-0 force-inside?) #f)
)
)
)
)
)
(let ((s5-1 (new 'stack 'array symbol 24)))
(set! (-> s5-1 length) 0)
(dotimes (s4-0 6)
(let ((a0-5 (-> obj want s4-0 name)))
(when a0-5
(let ((v1-22 (+ (* (-> s5-1 length) 4) (the-as int s5-1))))
(s.w! (+ v1-22 12) a0-5)
)
(let ((v1-25 (-> obj want s4-0 display?))
(a1-4 (+ (* (+ (-> s5-1 length) 1) 4) (the-as int s5-1)))
)
(s.w! (+ a1-4 12) v1-25)
)
(let ((v1-28 (-> obj want s4-0 force-vis?))
(a1-8 (+ (* (+ (-> s5-1 length) 2) 4) (the-as int s5-1)))
)
(s.w! (+ a1-8 12) v1-28)
)
(let ((v1-31 (-> obj want s4-0 force-inside?))
(a1-12 (+ (* (+ (-> s5-1 length) 3) 4) (the-as int s5-1)))
)
(s.w! (+ a1-12 12) v1-31)
)
(+! (-> s5-1 length) 4)
(let ((v1-34 (lookup-level-info a0-5)))
(countdown (a0-6 2)
(when (and (-> v1-34 borrow-level a0-6) (< (-> s5-1 length) (-> s5-1 allocated-length)))
(let ((a1-21 (-> v1-34 borrow-level a0-6))
(a2-4 (+ (* (-> s5-1 length) 4) (the-as int s5-1)))
)
(s.w! (+ a2-4 12) a1-21)
)
(let ((a1-25 (if (-> obj want s4-0 display?)
(-> v1-34 borrow-display? a0-6)
)
)
(a2-8 (+ (* (+ (-> s5-1 length) 1) 4) (the-as int s5-1)))
)
(s.w! (+ a2-8 12) a1-25)
)
(let ((a1-31 (+ (* (+ (-> s5-1 length) 2) 4) (the-as int s5-1))))
(s.w! (+ a1-31 12) #f)
)
(let ((a1-35 (+ (* (+ (-> s5-1 length) 3) 4) (the-as int s5-1))))
(s.w! (+ a1-35 12) #f)
)
(+! (-> s5-1 length) 4)
)
)
)
)
)
)
(dotimes (v1-39 6)
(cond
((< (* v1-39 4) (-> s5-1 length))
(set! (-> obj want v1-39 name) (the-as symbol (l.wu (+ (* (* v1-39 4) 4) (the-as int s5-1) 12))))
(set! (-> obj want v1-39 display?) (the-as symbol (l.wu (+ (* (+ (* v1-39 4) 1) 4) (the-as int s5-1) 12))))
(set! (-> obj want v1-39 force-vis?) (the-as symbol (l.wu (+ (* (+ (* v1-39 4) 2) 4) (the-as int s5-1) 12))))
(set! (-> obj want v1-39 force-inside?)
(the-as symbol (l.wu (+ (* (+ (* v1-39 4) 3) 4) (the-as int s5-1) 12)))
)
)
(else
(set! (-> obj want v1-39 name) #f)
(set! (-> obj want v1-39 display?) #f)
(set! (-> obj want v1-39 force-vis?) #f)
(set! (-> obj want v1-39 force-inside?) #f)
)
)
)
)
0
(none)
)
;; definition for symbol *display-load-commands*, type symbol
(define *display-load-commands* #f)
;; definition for method 18 of type load-state
(defmethod backup-load-state-and-set-cmds load-state ((obj load-state) (arg0 pair))
(dotimes (s4-0 256)
(when (-> obj object-name s4-0)
(format 0 "WARNING: load state somehow aquired object command ~A~%" (-> obj object-name s4-0))
(set! (-> obj object-name s4-0) #f)
)
)
(mem-copy! (&-> *backup-load-state* type) (&-> obj type) 2168)
(set! (-> *backup-load-state* command-list) '())
(set! (-> obj command-list) arg0)
0
)
;; definition for method 19 of type load-state
(defmethod restore-load-state-and-cleanup load-state ((obj load-state))
(with-pp
(execute-commands-up-to obj 100000.0)
(dotimes (s5-0 256)
(when (-> obj object-name s5-0)
(let ((a0-3 (entity-by-name (-> obj object-name s5-0))))
(set! (-> a0-3 extra perm status) (the-as entity-perm-status (-> obj object-status s5-0)))
(if (-> a0-3 extra process)
(kill! a0-3)
)
)
(set! (-> obj object-name s5-0) #f)
)
)
(let ((s5-1 (new 'stack-no-clear 'inline-array 'level-buffer-state 6)))
(dotimes (s4-0 6)
((method-of-type level-buffer-state new) (the-as symbol (-> s5-1 s4-0)) level-buffer-state)
)
(dotimes (s4-1 6)
(mem-copy! (the-as pointer (-> s5-1 s4-1)) (the-as pointer (-> *load-state* want s4-1)) 16)
)
(mem-copy! (&-> obj type) (&-> *backup-load-state* type) 2168)
(when (!= (-> pp type) scene-player)
(dotimes (gp-1 6)
(mem-copy! (the-as pointer (-> *load-state* want gp-1)) (the-as pointer (-> s5-1 gp-1)) 16)
)
)
)
(add-borrow-levels *load-state*)
0
)
)
;; definition for method 20 of type load-state
(defmethod restore-load-state load-state ((obj load-state))
(dotimes (v1-0 256)
(if (-> obj object-name v1-0)
(set! (-> obj object-name v1-0) #f)
)
)
(mem-copy! (&-> obj type) (&-> *backup-load-state* type) 2168)
0
)
;; definition for method 17 of type load-state
;; WARN: Return type mismatch int vs none.
;; WARN: Function (method 17 load-state) has a return type of none, but the expression builder found a return statement.
(defmethod execute-commands-up-to load-state ((obj load-state) (arg0 float))
(with-pp
(let ((s4-0 (new 'stack 'script-context (the-as basic (process->ppointer pp)) pp (the-as vector #f))))
(set! (-> s4-0 load-state) obj)
(while (not (null? (-> obj command-list)))
(let ((f0-0 (command-get-float (car (car (-> obj command-list))) 0.0))
(s3-0 (cdr (car (-> obj command-list))))
)
(if (< arg0 f0-0)
(return #f)
)
(if *display-load-commands*
(format 0 "NOTICE: ~D: ~f: execute command ~A~%" (-> pp clock frame-counter) f0-0 s3-0)
)
(cond
((pair? (car s3-0))
(let ((a1-4 (car s3-0)))
(while (not (null? s3-0))
(eval! s4-0 (the-as pair a1-4))
(set! s3-0 (cdr s3-0))
(set! a1-4 (car s3-0))
)
)
)
(else
(eval! s4-0 s3-0)
)
)
)
(set! (-> obj command-list) (cdr (-> obj command-list)))
)
)
0
(none)
)
)
;; failed to figure out what this is:
(kmemopen global "load-state")
;; definition for symbol *backup-load-state*, type load-state
(define *backup-load-state* (new 'global 'load-state))
;; definition (perm) for symbol *load-state*, type load-state
(define-perm *load-state* load-state (new 'global 'load-state))
;; failed to figure out what this is:
(kmemclose)
test/decompiler/reference/jak2/engine/math/vector-h_REF.gc
Generated Vendored
+1
View File
@@ -1058,6 +1058,7 @@
(y float :offset 4)
(z float :offset 8)
)
:pack-me
:method-count-assert 9
:size-assert #xc
:flag-assert #x90000000c
test/decompiler/reference/jak2/engine/ps2/memcard-h_REF.gc
Generated Vendored
+1
View File
@@ -74,6 +74,7 @@
(mem-actual int32 :offset-assert 24)
(file mc-file-info 4 :inline :offset-assert 28)
)
:pack-me
:method-count-assert 9
:size-assert #x12c
:flag-assert #x90000012c
test/decompiler/reference/jak2/engine/ps2/pad_REF.gc
Generated Vendored
+146 -146
View File
@@ -106,7 +106,7 @@
:flag-assert #xa00000090
(:methods
(new (symbol type int) _type_ 0)
(invert-analog-if-needed (_type_) none 9)
(adjust-to-screen-flip (_type_) int 9)
)
)
@@ -286,166 +286,166 @@
;; definition for function service-cpads
(defun service-cpads ()
(let ((gp-0 *cpad-list*))
(dotimes (s5-0 (-> gp-0 num-cpads))
(let ((s4-0 (-> *cpad-list* cpads s5-0)))
(set! (-> s4-0 old-leftx 1) (-> s4-0 old-leftx 0))
(set! (-> s4-0 old-leftx 0) (-> s4-0 leftx))
(set! (-> s4-0 old-lefty 1) (-> s4-0 old-lefty 0))
(set! (-> s4-0 old-lefty 0) (-> s4-0 lefty))
(set! (-> s4-0 old-rightx 1) (-> s4-0 old-rightx 0))
(set! (-> s4-0 old-rightx 0) (-> s4-0 rightx))
(set! (-> s4-0 old-righty 1) (-> s4-0 old-righty 0))
(set! (-> s4-0 old-righty 0) (-> s4-0 righty))
(cpad-get-data s4-0)
(invert-analog-if-needed s4-0)
(let ((pads *cpad-list*))
(dotimes (i (-> pads num-cpads))
(let ((pad (-> *cpad-list* cpads i)))
(set! (-> pad old-leftx 1) (-> pad old-leftx 0))
(set! (-> pad old-leftx 0) (-> pad leftx))
(set! (-> pad old-lefty 1) (-> pad old-lefty 0))
(set! (-> pad old-lefty 0) (-> pad lefty))
(set! (-> pad old-rightx 1) (-> pad old-rightx 0))
(set! (-> pad old-rightx 0) (-> pad rightx))
(set! (-> pad old-righty 1) (-> pad old-righty 0))
(set! (-> pad old-righty 0) (-> pad righty))
(cpad-get-data pad)
(adjust-to-screen-flip pad)
(cond
((zero? (logand (-> s4-0 valid) 128))
(dotimes (s3-0 2)
((zero? (logand (-> pad valid) 128))
(dotimes (buzz-i 2)
(cond
((and (-> s4-0 buzz) (< (get-current-time) (-> s4-0 buzz-time s3-0)) (= *master-mode* 'game))
(let ((v1-20 s3-0))
((and (-> pad buzz) (< (get-current-time) (-> pad buzz-time buzz-i)) (= *master-mode* 'game))
(let ((v1-20 buzz-i))
(cond
((zero? v1-20)
(set! (-> s4-0 direct s3-0)
(logand (ash (-> s4-0 buzz-val s3-0) (- (the-as int (logand (get-integral-current-time) 7)))) 1)
(set! (-> pad direct buzz-i)
(logand (ash (-> pad buzz-val buzz-i) (- (the-as int (logand (get-integral-current-time) 7)))) 1)
)
)
((= v1-20 1)
(set! (-> s4-0 direct s3-0) (-> s4-0 buzz-val s3-0))
(set! (-> pad direct buzz-i) (-> pad buzz-val buzz-i))
)
)
)
)
((and (zero? s3-0) (> (-> s4-0 buzz-pause-time) 0))
(set! (-> s4-0 direct s3-0)
(logand (ash (-> s4-0 buzz-pause-val s3-0) (- (the-as int (logand (get-integral-current-time) 7)))) 1)
((and (zero? buzz-i) (> (-> pad buzz-pause-time) 0))
(set! (-> pad direct buzz-i)
(logand (ash (-> pad buzz-pause-val buzz-i) (- (the-as int (logand (get-integral-current-time) 7)))) 1)
)
(+! (-> s4-0 buzz-pause-time) -1)
(+! (-> pad buzz-pause-time) -1)
)
(else
(set! (-> s4-0 buzz-val s3-0) (the-as uint 0))
(set! (-> s4-0 direct s3-0) (the-as uint 0))
(when (zero? s3-0)
(set! (-> s4-0 buzz-pause-time) (the-as uint 0))
(set! (-> pad buzz-val buzz-i) (the-as uint 0))
(set! (-> pad direct buzz-i) (the-as uint 0))
(when (zero? buzz-i)
(set! (-> pad buzz-pause-time) (the-as uint 0))
0
)
)
)
)
(when (< (the-as uint 192) (-> s4-0 direct 1))
(set! (-> s4-0 direct 0) (the-as uint 0))
(when (< (the-as uint 192) (-> pad direct 1))
(set! (-> pad direct 0) (the-as uint 0))
0
)
(set! (-> s4-0 button0-abs 2) (-> s4-0 button0-abs 1))
(set! (-> s4-0 button0-abs 1) (-> s4-0 button0-shadow-abs 0))
(set! (-> s4-0 button0-rel 2) (-> s4-0 button0-rel 1))
(set! (-> s4-0 button0-rel 1) (-> s4-0 button0-rel 0))
(when (= (-> s4-0 status) 115)
(set! (-> s4-0 abutton 0) (the-as uint (if (logtest? (-> s4-0 button0-abs 0) (pad-buttons right))
(set! (-> pad button0-abs 2) (-> pad button0-abs 1))
(set! (-> pad button0-abs 1) (-> pad button0-shadow-abs 0))
(set! (-> pad button0-rel 2) (-> pad button0-rel 1))
(set! (-> pad button0-rel 1) (-> pad button0-rel 0))
(when (= (-> pad status) 115)
(set! (-> pad abutton 0) (the-as uint (if (logtest? (-> pad button0-abs 0) (pad-buttons right))
255
0
)
)
)
(set! (-> pad abutton 1) (the-as uint (if (logtest? (-> pad button0-abs 0) (pad-buttons left))
255
0
)
)
)
(set! (-> pad abutton 2) (the-as uint (if (logtest? (-> pad button0-abs 0) (pad-buttons up))
255
0
)
)
)
(set! (-> pad abutton 3) (the-as uint (if (logtest? (-> pad button0-abs 0) (pad-buttons down))
255
0
)
)
)
(set! (-> pad abutton 6) (the-as uint (if (logtest? (-> pad button0-abs 0) (pad-buttons x))
255
0
)
)
)
(set! (-> pad abutton 5) (the-as uint (if (logtest? (-> pad button0-abs 0) (pad-buttons circle))
255
0
)
)
)
(set! (-> pad abutton 4) (the-as uint (if (logtest? (-> pad button0-abs 0) (pad-buttons triangle))
255
0
)
)
)
(set! (-> pad abutton 7) (the-as uint (if (logtest? (-> pad button0-abs 0) (pad-buttons square))
255
0
)
)
)
(set! (-> pad abutton 8) (the-as uint (if (logtest? (-> pad button0-abs 0) (pad-buttons l1))
255
0
)
)
)
(set! (-> pad abutton 10) (the-as uint (if (logtest? (-> pad button0-abs 0) (pad-buttons l2))
255
0
)
)
)
(set! (-> s4-0 abutton 1) (the-as uint (if (logtest? (-> s4-0 button0-abs 0) (pad-buttons left))
(set! (-> pad abutton 9) (the-as uint (if (logtest? (-> pad button0-abs 0) (pad-buttons r1))
255
0
)
)
)
(set! (-> pad abutton 11) (the-as uint (if (logtest? (-> pad button0-abs 0) (pad-buttons r2))
255
0
)
)
)
(set! (-> s4-0 abutton 2) (the-as uint (if (logtest? (-> s4-0 button0-abs 0) (pad-buttons up))
255
0
)
)
)
(set! (-> s4-0 abutton 3) (the-as uint (if (logtest? (-> s4-0 button0-abs 0) (pad-buttons down))
255
0
)
)
)
(set! (-> s4-0 abutton 6) (the-as uint (if (logtest? (-> s4-0 button0-abs 0) (pad-buttons x))
255
0
)
)
)
(set! (-> s4-0 abutton 5) (the-as uint (if (logtest? (-> s4-0 button0-abs 0) (pad-buttons circle))
255
0
)
)
)
(set! (-> s4-0 abutton 4) (the-as uint (if (logtest? (-> s4-0 button0-abs 0) (pad-buttons triangle))
255
0
)
)
)
(set! (-> s4-0 abutton 7) (the-as uint (if (logtest? (-> s4-0 button0-abs 0) (pad-buttons square))
255
0
)
)
)
(set! (-> s4-0 abutton 8) (the-as uint (if (logtest? (-> s4-0 button0-abs 0) (pad-buttons l1))
255
0
)
)
)
(set! (-> s4-0 abutton 10) (the-as uint (if (logtest? (-> s4-0 button0-abs 0) (pad-buttons l2))
255
0
)
)
)
(set! (-> s4-0 abutton 9) (the-as uint (if (logtest? (-> s4-0 button0-abs 0) (pad-buttons r1))
255
0
)
)
)
(set! (-> s4-0 abutton 11) (the-as uint (if (logtest? (-> s4-0 button0-abs 0) (pad-buttons r2))
255
0
)
)
)
)
(let ((s3-1 (-> s4-0 button0)))
(let ((buttons-pushed (the-as pad-buttons (-> pad button0))))
(cond
((< (-> s4-0 lefty) (the-as uint 30))
(set! s3-1 (logior #x10000 s3-1))
((< (-> pad lefty) (the-as uint 30))
(set! buttons-pushed (logior (pad-buttons l-analog-down) buttons-pushed))
)
((< (the-as uint 225) (-> s4-0 lefty))
(set! s3-1 (logior #x40000 s3-1))
((< (the-as uint 225) (-> pad lefty))
(set! buttons-pushed (logior (pad-buttons l-analog-up) buttons-pushed))
)
)
(cond
((< (-> s4-0 leftx) (the-as uint 30))
(set! s3-1 (logior #x80000 s3-1))
((< (-> pad leftx) (the-as uint 30))
(set! buttons-pushed (logior (pad-buttons l-analog-left) buttons-pushed))
)
((< (the-as uint 225) (-> s4-0 leftx))
(set! s3-1 (logior #x20000 s3-1))
((< (the-as uint 225) (-> pad leftx))
(set! buttons-pushed (logior (pad-buttons l-analog-right) buttons-pushed))
)
)
(cond
((< (-> s4-0 righty) (the-as uint 30))
(set! s3-1 (logior #x100000 s3-1))
((< (-> pad righty) (the-as uint 30))
(set! buttons-pushed (logior (pad-buttons r-analog-down) buttons-pushed))
)
((< (the-as uint 225) (-> s4-0 righty))
(set! s3-1 (logior #x400000 s3-1))
((< (the-as uint 225) (-> pad righty))
(set! buttons-pushed (logior (pad-buttons r-analog-up) buttons-pushed))
)
)
(cond
((< (-> s4-0 rightx) (the-as uint 30))
(set! s3-1 (logior #x800000 s3-1))
((< (-> pad rightx) (the-as uint 30))
(set! buttons-pushed (logior (pad-buttons r-analog-left) buttons-pushed))
)
((< (the-as uint 225) (-> s4-0 rightx))
(set! s3-1 (logior #x200000 s3-1))
((< (the-as uint 225) (-> pad rightx))
(set! buttons-pushed (logior (pad-buttons r-analog-right) buttons-pushed))
)
)
(let ((v1-123 (get-current-language)))
@@ -453,13 +453,13 @@
((or (= v1-123 (language-enum japanese)) (= v1-123 (language-enum korean)))
(case (scf-get-territory)
((2 3)
(if (logtest? s3-1 8192)
(set! s3-1 (logior #x1000000 s3-1))
(if (logtest? buttons-pushed (pad-buttons circle))
(set! buttons-pushed (logior (pad-buttons confirm) buttons-pushed))
)
)
(else
(if (logtest? s3-1 #x6000)
(set! s3-1 (logior #x1000000 s3-1))
(if (logtest? buttons-pushed (pad-buttons circle x))
(set! buttons-pushed (logior (pad-buttons confirm) buttons-pushed))
)
)
)
@@ -467,55 +467,55 @@
((let ((v1-135 (scf-get-territory)))
(or (= v1-135 2) (= v1-135 3))
)
(if (logtest? s3-1 #x6000)
(set! s3-1 (logior #x1000000 s3-1))
(if (logtest? buttons-pushed (pad-buttons circle x))
(set! buttons-pushed (logior (pad-buttons confirm) buttons-pushed))
)
)
(else
(if (logtest? s3-1 #x4000)
(set! s3-1 (logior #x1000000 s3-1))
(if (logtest? buttons-pushed (pad-buttons x))
(set! buttons-pushed (logior (pad-buttons confirm) buttons-pushed))
)
)
)
)
(set! (-> s4-0 button0-shadow-abs 0) (the-as pad-buttons s3-1))
(set! (-> s4-0 button0-abs 0) (the-as pad-buttons s3-1))
(set! (-> pad button0-shadow-abs 0) buttons-pushed)
(set! (-> pad button0-abs 0) buttons-pushed)
)
(set! (-> s4-0 button0-rel 0) (logclear (-> s4-0 button0-abs 0) (-> s4-0 button0-abs 1)))
(set! (-> pad button0-rel 0) (logclear (-> pad button0-abs 0) (-> pad button0-abs 1)))
(when *cpad-debug*
(set! (-> s4-0 leftx) (the-as uint 255))
(set! (-> s4-0 rightx) (the-as uint 255))
(set! (-> pad leftx) (the-as uint 255))
(set! (-> pad rightx) (the-as uint 255))
)
(set! (-> s4-0 stick0-speed) 1.0)
(set! (-> pad stick0-speed) 1.0)
(cond
((= (shr (-> s4-0 status) 4) 7)
(let ((f30-0 (* 0.0078125 (the float (+ (-> s4-0 leftx) -128))))
(f28-0 (* 0.0078125 (the float (- 127 (the-as int (-> s4-0 lefty))))))
((= (shr (-> pad status) 4) 7)
(let ((f30-0 (* 0.0078125 (the float (+ (-> pad leftx) -128))))
(f28-0 (* 0.0078125 (the float (- 127 (the-as int (-> pad lefty))))))
)
(set! (-> s4-0 stick0-dir) (atan (- f30-0) f28-0))
(set! (-> s4-0 stick0-speed) (fmin 1.0 (sqrtf (+ (* f30-0 f30-0) (* f28-0 f28-0)))))
(set! (-> pad stick0-dir) (atan (- f30-0) f28-0))
(set! (-> pad stick0-speed) (fmin 1.0 (sqrtf (+ (* f30-0 f30-0) (* f28-0 f28-0)))))
)
(if (< (-> s4-0 stick0-speed) 0.3)
(set! (-> s4-0 stick0-speed) 0.0)
(if (< (-> pad stick0-speed) 0.3)
(set! (-> pad stick0-speed) 0.0)
)
)
(else
(set! (-> s4-0 leftx) (the-as uint 128))
(set! (-> s4-0 lefty) (the-as uint 128))
(set! (-> s4-0 rightx) (the-as uint 128))
(set! (-> s4-0 righty) (the-as uint 128))
(set! (-> s4-0 stick0-dir) 0.0)
(set! (-> s4-0 stick0-speed) 0.0)
(set! (-> pad leftx) (the-as uint 128))
(set! (-> pad lefty) (the-as uint 128))
(set! (-> pad rightx) (the-as uint 128))
(set! (-> pad righty) (the-as uint 128))
(set! (-> pad stick0-dir) 0.0)
(set! (-> pad stick0-speed) 0.0)
)
)
(if (or (!= (-> s4-0 button0-abs 0) (-> s4-0 button0-abs 1))
(or (< 0.3 (-> s4-0 stick0-speed)) (zero? (-> s4-0 change-time)))
(if (or (!= (-> pad button0-abs 0) (-> pad button0-abs 1))
(or (< 0.3 (-> pad stick0-speed)) (zero? (-> pad change-time)))
)
(set! (-> s4-0 change-time) (get-current-time))
(set! (-> pad change-time) (get-current-time))
)
)
(else
(cpad-invalid! s4-0)
(cpad-invalid! pad)
)
)
)
test/decompiler/reference/jak2/engine/sound/speech-h_REF.gc
Generated Vendored
+1 -5
View File
@@ -137,7 +137,7 @@
(:methods
(speech-control-method-9 () none 9)
(speech-control-method-10 () none 10)
(speech-control-method-11 () none 11)
(speech-control-method-11 (_type_) none 11)
(speech-control-method-12 () none 12)
(speech-control-method-13 () none 13)
(speech-control-method-14 () none 14)
@@ -161,7 +161,3 @@
;; failed to figure out what this is:
0
test/decompiler/reference/jak2/engine/target/board/board-states_REF.gc
Generated Vendored
+1 -1
View File
@@ -924,7 +924,7 @@
:enter (behavior ((arg0 meters) (arg1 meters) (arg2 symbol))
(local-vars
(sv-144 (function vector entity-actor skeleton-group vector none :behavior manipy))
(sv-160 entity)
(sv-160 entity-actor)
)
(if (= arg2 'hit)
(set! arg2 #f)
test/decompiler/reference/jak2/engine/target/board/target-board_REF.gc
Generated Vendored
+3 -3
View File
@@ -1240,7 +1240,7 @@
(set! (-> a2-6 ignore-process1) #f)
(set! (-> a2-6 ignore-pat) (-> v1-30 pat-ignore-mask))
(set! (-> a2-6 action-mask) (collide-action solid))
(collide-shape-method-32 v1-30 (-> v1-30 transv) a2-6 (meters 1.0))
(collide-shape-method-32 v1-30 (-> v1-30 transv) a2-6 (meters 1))
)
(when (logtest? (-> self control root-prim prim-core action) (collide-action check-edge))
(set! (-> *collide-edge-board-spec* flags) (logand -3 (-> *collide-edge-board-spec* flags)))
@@ -1660,7 +1660,7 @@
(bucket-id debug-no-zbuf1)
(-> self control trans)
s5-0
(meters 2.0)
(meters 2)
(the-as rgba (-> (new 'static 'array uint64 1 #x8000ff00) 0))
)
)
@@ -2438,7 +2438,7 @@
(set! (-> a2-4 ignore-process1) #f)
(set! (-> a2-4 ignore-pat) (-> v1-103 pat-ignore-mask))
(set! (-> a2-4 action-mask) (collide-action solid))
(collide-shape-method-32 v1-103 (-> v1-103 transv) a2-4 (meters 1.0))
(collide-shape-method-32 v1-103 (-> v1-103 transv) a2-4 (meters 1))
)
(when (logtest? (-> self control root-prim prim-core action) (collide-action check-edge))
(set! (-> *collide-edge-board-spec* flags) (logand -5 (-> *collide-edge-board-spec* flags)))
test/decompiler/reference/jak2/engine/target/gun/gun-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -469,7 +469,7 @@
(zero? (logand (focus-status dead hit board mech dark teleporting) (-> arg0 focus-status)))
(zero? (logand (surface-flag gun-inactive gun-hide gun-off) (-> arg0 control unknown-surface01 flags)))
(zero? (logand (state-flags sf18) (-> arg0 state-flags)))
(logtest? (the-as game-feature (logand (-> *setting-control* user-current features) 960))
(logtest? (logand (-> *setting-control* user-current features) (game-feature gun-yellow gun-red gun-blue gun-dark))
(-> arg0 game features)
)
(or (zero? (logand (-> arg0 control unknown-surface01 flags) (surface-flag duck))) (can-exit-duck?))
test/decompiler/reference/jak2/engine/target/logic-target_REF.gc
Generated Vendored
+14 -14
View File
@@ -1232,7 +1232,7 @@
(bucket-id debug-no-zbuf1)
(-> self control trans)
gp-0
(meters 2.0)
(meters 2)
(the-as rgba (-> (new 'static 'array uint64 1 #x8000ffff) 0))
)
(add-debug-vector
@@ -1240,7 +1240,7 @@
(bucket-id debug-no-zbuf1)
(-> self control trans)
s5-0
(meters 2.0)
(meters 2)
(the-as rgba (-> (new 'static 'array uint64 1 #x800080ff) 0))
)
)
@@ -1249,7 +1249,7 @@
(bucket-id debug-no-zbuf1)
(-> self control trans)
(-> self control unknown-matrix01 vector 2)
(meters 2.0)
(meters 2)
(the-as rgba (-> (new 'static 'array uint64 1 #x80ff00ff) 0))
)
(rotate-toward-orientation!
@@ -1600,7 +1600,7 @@
(let ((gp-0 (-> self current-level)))
(set! (-> self current-level) (level-get-target-inside *level*))
(if (-> self current-level)
(+! (-> self game unknown-array3 (-> self current-level info task-level))
(+! (-> self game task-in-times (-> self current-level info task-level))
(- (-> self clock frame-counter) (-> self clock old-frame-counter))
)
)
@@ -2029,7 +2029,7 @@
(bucket-id debug-no-zbuf1)
(-> self control trans)
gp-0
(meters 2.0)
(meters 2)
(new 'static 'rgba :b #xff :a #x80)
)
)
@@ -2039,7 +2039,7 @@
(bucket-id debug-no-zbuf1)
(-> self control trans)
(-> self control local-normal)
(meters 2.0)
(meters 2)
(the-as rgba (-> (new 'static 'array uint64 1 #x800000ff) 0))
)
(add-debug-vector
@@ -2055,7 +2055,7 @@
(bucket-id debug-no-zbuf1)
(-> self control trans)
(-> self control dynam gravity-normal)
(meters 3.0)
(meters 3)
(the-as rgba (-> (new 'static 'array uint64 1 #x80ff00ff) 0))
)
(add-debug-vector
@@ -2063,7 +2063,7 @@
(bucket-id debug-no-zbuf1)
(-> self control trans)
(-> self control unknown-vector02)
(meters 3.0)
(meters 3)
(the-as rgba (-> (new 'static 'array uint64 1 #x80ff00ff) 0))
)
(add-debug-vector
@@ -2071,7 +2071,7 @@
(bucket-id debug-no-zbuf1)
(-> self control trans)
(vector-y-quaternion! (new 'stack-no-clear 'vector) (-> self control unknown-quaternion00))
(meters 3.0)
(meters 3)
(the-as rgba (-> (new 'static 'array uint64 1 #x800000ff) 0))
)
)
@@ -2335,7 +2335,7 @@
(bucket-id debug-no-zbuf1)
(-> (the-as swingpole s2-0) root trans)
(-> (the-as swingpole s2-0) dir)
(meters 3.0)
(meters 3)
(the-as rgba (-> (new 'static 'array uint64 1 #x80ff00ff) 0))
)
(add-debug-sphere
@@ -2710,7 +2710,7 @@
(set! (-> a2-3 ignore-pat) (-> v1-52 pat-ignore-mask))
)
(set! (-> a2-3 action-mask) (collide-action solid))
(collide-shape-method-32 (-> self control) (-> self control transv) a2-3 (meters 1.0))
(collide-shape-method-32 (-> self control) (-> self control transv) a2-3 (meters 1))
)
(if (and (logtest? (-> self control root-prim prim-core action) (collide-action check-edge))
(>= (vector-dot
@@ -2846,7 +2846,7 @@
(set! (-> a2-0 ignore-pat) (-> v1-30 pat-ignore-mask))
)
(set! (-> a2-0 action-mask) (collide-action solid))
(collide-shape-method-32 (-> self control) (-> self control transv) a2-0 (meters 1.0))
(collide-shape-method-32 (-> self control) (-> self control transv) a2-0 (meters 1))
)
(if (and (logtest? (-> self control root-prim prim-core action) (collide-action check-edge))
(>= (vector-dot
@@ -2975,7 +2975,7 @@
(set! (-> a2-0 ignore-pat) (-> v1-29 pat-ignore-mask))
)
(set! (-> a2-0 action-mask) (collide-action solid))
(collide-shape-method-32 (-> self control) (-> self control transv) a2-0 (meters 1.0))
(collide-shape-method-32 (-> self control) (-> self control transv) a2-0 (meters 1))
)
(if (and (logtest? (-> self control root-prim prim-core action) (collide-action check-edge))
(>= (vector-dot
@@ -3218,7 +3218,7 @@
(set! (-> *setting-control* cam-default mode-name) 'cam-string)
(apply-settings *setting-control*)
(if (not arg0)
(set! arg0 (get-current-continue-point *game-info*))
(set! arg0 (get-current-continue-forced *game-info*))
)
(set-continue! *game-info* arg0 #f)
(stack-size-set! (-> obj main-thread) 1024)
test/decompiler/reference/jak2/engine/ui/minimap-h_REF.gc
Generated Vendored
+6 -10
View File
@@ -337,7 +337,7 @@
(format #t "[~8x] ~A~%" obj 'connection-minimap)
(format #t "~1Tnext: #<connection-minimap @ #x~X>~%" (-> obj next))
(format #t "~1Tkey: ~A~%" (-> obj key))
(format #t "~1Tupdate-time: ~D~%" (-> obj update-time))
(format #t "~1Tupdate-time: ~D~%" (-> obj handle))
(format #t "~1Tparam[4] @ #x~X~%" (-> obj param))
(dotimes (s5-0 4)
(format #t "~T [~D]~1Tparam: ~A~%" s5-0 (-> obj param s5-0))
@@ -355,7 +355,7 @@
(format #t "~T [~D]~1Tparam-float: ~f~%" s5-3 (the-as float (-> obj param s5-3)))
)
(format #t "~1Tparam-quat: #x~X~%" (-> obj param-quat))
(format #t "~1Thandle: ~D~%" (-> obj update-time))
(format #t "~1Thandle: ~D~%" (-> obj handle))
(format #t "~1Tposition: #<vector @ #x~X>~%" (-> obj position))
(format #t "~1Talpha: ~f~%" (-> obj alpha))
(format #t "~1Tclass: #<minimap-class-node @ #x~X>~%" (-> obj class))
@@ -441,8 +441,8 @@
(format #t "~1Tallocated-length: ~D~%" (-> obj allocated-length))
(format #t "~1Telement-type: ~A~%" (-> obj element-type))
(format #t "~1Texecute-time: ~D~%" (-> obj execute-time))
(format #t "~1Talive-list: #<connection-minimap @ #x~X>~%" (-> obj alive-list))
(format #t "~1Tdead-list: #<connection-minimap @ #x~X>~%" (-> obj dead-list))
(format #t "~1Talive-list: #<connection-minimap @ #x~X>~%" (-> obj alive-list-override))
(format #t "~1Tdead-list: #<connection-minimap @ #x~X>~%" (-> obj dead-list-override))
(format #t "~1Tdata[0] @ #x~X~%" (-> obj data))
(label cfg-4)
obj
@@ -535,7 +535,7 @@
(ctywide basic :offset-assert 268)
(inv-scale float :offset 212)
(fade float :offset 220)
(engine basic :offset-assert 272)
(engine engine-minimap :offset-assert 272)
(engine-key uint32 :offset-assert 276)
(trail minimap-trail 6 :inline :offset-assert 288)
(race-tex basic :offset-assert 1536)
@@ -553,7 +553,7 @@
(minimap-method-9 () none 9)
(minimap-method-10 () none 10)
(minimap-method-11 () none 11)
(minimap-method-12 () none 12)
(minimap-method-12 (_type_ process uint int vector int) connection-minimap 12)
(minimap-method-13 () none 13)
(minimap-method-14 () none 14)
(minimap-method-15 () none 15)
@@ -612,7 +612,3 @@
;; failed to figure out what this is:
0
test/decompiler/reference/jak2/engine/util/script-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -48,7 +48,7 @@
:flag-assert #xc000000a0
(:methods
(new (symbol type basic process vector) _type_ 0)
(eval! (_type_ object) object 9)
(eval! (_type_ pair) object 9)
(script-context-method-10 (_type_ object pair) object 10)
(script-context-method-11 (_type_ pair pair symbol) symbol 11)
)
test/decompiler/reference/jak2/kernel/gkernel_REF.gc
Generated Vendored
+1 -1
View File
@@ -1493,7 +1493,7 @@
(when (!= (-> obj status) 'dead)
(set! (-> obj next-state) dead-state)
(if (-> obj entity)
(entity-deactivate-handler obj (the-as entity-actor (-> obj entity)))
(entity-deactivate-handler obj (-> obj entity))
)
(let ((s5-0 pp))
(set! pp obj)
test/decompiler/reference/jak2/levels/common/airlock_REF.gc
Generated Vendored
+27 -9
View File
@@ -134,7 +134,7 @@
;; definition for method 22 of type com-airlock
(defmethod init-airlock! com-airlock ((obj com-airlock))
(process-entity-status! obj (entity-perm-status subtask-complete) #f)
(process-drawable-from-entity! obj (the-as entity-actor (-> obj entity)))
(process-drawable-from-entity! obj (-> obj entity))
(logclear! (-> obj mask) (process-mask actor-pause))
(set! (-> obj were-behind?) #f)
(set! (-> obj inner?)
@@ -197,7 +197,10 @@
(when (and (< f30-0 0.0) (< 0.0 (-> obj last-distance)))
(let ((s5-1 (res-lump-struct (-> obj entity) 'on-cross structure)))
(if s5-1
(eval! (new 'stack 'script-context (the-as basic (process->ppointer self)) self (the-as vector #f)) s5-1)
(eval!
(new 'stack 'script-context (the-as basic (process->ppointer self)) self (the-as vector #f))
(the-as pair s5-1)
)
)
)
)
@@ -251,7 +254,7 @@
)
(and (eval!
(new 'stack 'script-context (the-as basic (process->ppointer self)) self (the-as vector #f))
(-> obj open-test)
(the-as pair (-> obj open-test))
)
(-> *setting-control* user-current airlock)
)
@@ -280,7 +283,7 @@
(with-pp
(let ((gp-1 (eval!
(new 'stack 'script-context (the-as basic (process->ppointer pp)) pp (the-as vector #f))
(-> obj level-name)
(the-as pair (-> obj level-name))
)
)
(s4-0 #f)
@@ -545,7 +548,10 @@
(begin
(let ((gp-0 (res-lump-struct (-> self entity) 'on-activate structure)))
(if gp-0
(eval! (new 'stack 'script-context (the-as basic (process->ppointer self)) self (the-as vector #f)) gp-0)
(eval!
(new 'stack 'script-context (the-as basic (process->ppointer self)) self (the-as vector #f))
(the-as pair gp-0)
)
)
)
(destination-loaded? self #f)
@@ -610,7 +616,10 @@
()
(let ((gp-0 (res-lump-struct (-> self entity) 'on-exit structure)))
(if (and gp-0 (not *scene-player*))
(eval! (new 'stack 'script-context (the-as basic (process->ppointer self)) self (the-as vector #f)) gp-0)
(eval!
(new 'stack 'script-context (the-as basic (process->ppointer self)) self (the-as vector #f))
(the-as pair gp-0)
)
)
)
(the-as
@@ -619,7 +628,10 @@
(let ((gp-1 (res-lump-struct (-> self entity) 'on-inside structure)))
(set! (-> self were-behind?) #f)
(if (and gp-1 (not *scene-player*))
(eval! (new 'stack 'script-context (the-as basic (process->ppointer self)) self (the-as vector #f)) gp-1)
(eval!
(new 'stack 'script-context (the-as basic (process->ppointer self)) self (the-as vector #f))
(the-as pair gp-1)
)
)
)
)
@@ -676,7 +688,10 @@
(when (< 0.0 (check-crossing-distance self (target-pos 0) #f))
(let ((gp-3 (res-lump-struct (-> self entity) 'on-deactivate structure)))
(if (and gp-3 (not *scene-player*))
(eval! (new 'stack 'script-context (the-as basic (process->ppointer self)) self (the-as vector #f)) gp-3)
(eval!
(new 'stack 'script-context (the-as basic (process->ppointer self)) self (the-as vector #f))
(the-as pair gp-3)
)
)
)
)
@@ -811,7 +826,10 @@
(process-entity-status! self (entity-perm-status subtask-complete) #t)
(let ((s5-10 (res-lump-struct (-> self entity) 'on-enter structure)))
(if s5-10
(eval! (new 'stack 'script-context (the-as basic (process->ppointer self)) self (the-as vector #f)) s5-10)
(eval!
(new 'stack 'script-context (the-as basic (process->ppointer self)) self (the-as vector #f))
(the-as pair s5-10)
)
)
)
(if (and (-> self sound-open)
test/offline/config/jak2/config.jsonc
+7
View File
@@ -143,6 +143,11 @@
// texture
"(method 9 texture-page-dir)", // asm
// game-info
"(method 9 game-info)", // todo
"(method 28 game-info)", // todo
"(method 29 game-info)", // todo
// mysql-nav-graph
"(method 18 mysql-nav-graph)", // asm / dead-code
"(method 10 mysql-nav-graph)",
@@ -157,6 +162,8 @@
"(method 9 drawable-tree-instance-tie)", // duplicate
"(method 21 load-state)",
"i-hopefully-will-never-exist-dont-add-anything-after-me-please"
],