mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-07-11 15:28:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

decomp: metalkor-* files (#2211)

Browse Source 
Manual patches:

- `metalkor-egg-reaction`: Rewrote `(.mula.s)`

---------

Co-authored-by: water <awaterford111445@gmail.com>
This commit is contained in:
Hat Kid
2023-02-11 15:34:31 +01:00
committed by GitHub
parent 3f5898b5c2
commit 7afa583bff
13 changed files with 15423 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/config/jak2/all-types.gc
+199 -256
View File
@@ -42705,40 +42705,31 @@
;; metalkor-setup ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
#|
(deftype metalkor-bomb (process-drawable)
((joint-mods UNKNOWN 49 :offset-assert 196)
((root-override collide-shape-moving :offset 128 :score 1)
(joint-mods joint-mod 49 :offset-assert 200)
)
:method-count-assert 21
:size-assert #x18c
:flag-assert #x150110018c
(:methods
(metalkor-bomb-method-20 () none 20)
(idle () _type_ :state 20)
)
)
|#
#|
(deftype gem-tracker (process)
((gems UNKNOWN 10 :offset-assert 124)
(gems-collected int8 :offset-assert 204)
(perm-byte-index int8 :offset-assert 205)
((gems handle 10 :offset-assert 128)
(gems-collected int8 :offset-assert 208)
(perm-byte-index int8 :offset-assert 209)
)
:method-count-assert 15
:size-assert #xd2
:flag-assert #xf006000d2
(:methods
(gem-tracker-method-9 () none 9)
(gem-tracker-method-10 () none 10)
(gem-tracker-method-11 () none 11)
(gem-tracker-method-12 () none 12)
(gem-tracker-method-13 () none 13)
(idle () _type_ :state 14)
)
)
|#
#|
(deftype flitter-gem-tracker (gem-tracker)
()
:method-count-assert 15
@@ -42747,9 +42738,7 @@
(:methods
)
)
|#
#|
(deftype wasp-gem-tracker (gem-tracker)
()
:method-count-assert 15
@@ -42758,95 +42747,82 @@
(:methods
)
)
|#
#|
(deftype rift-occlude (process-drawable)
((original-trans vector :inline :offset-assert 204)
((original-trans vector :inline :offset-assert 208)
)
:method-count-assert 21
:size-assert #xe0
:flag-assert #x15006000e0
(:methods
(rift-occlude-method-20 () none 20)
(idle () _type_ :state 20)
)
)
|#
#|
(deftype metalkor-distort (process-drawable)
()
((root-override collide-shape-moving :offset 128 :score 1)
)
:method-count-assert 21
:size-assert #xc8
:flag-assert #x15005000c8
(:methods
(metalkor-distort-method-20 () none 20)
(idle () _type_ :state 20)
)
)
|#
#|
(deftype metalkor-explode (process-drawable)
((ring uint64 :offset-assert 196)
((ring handle :offset-assert 200)
)
:method-count-assert 21
:size-assert #xd0
:flag-assert #x15005000d0
(:methods
(metalkor-explode-method-20 () none 20)
(idle () _type_ :state 20)
)
)
|#
#|
(deftype metalkor-kid (process-drawable)
()
:method-count-assert 21
:size-assert #xc8
:flag-assert #x15005000c8
(:methods
(metalkor-kid-method-20 () none 20)
(idle () _type_ :state 20)
)
)
|#
#|
(deftype nestb-tail-bound (process-drawable)
()
:method-count-assert 21
:size-assert #xc8
:flag-assert #x15005000c8
(:methods
(nestb-tail-bound-method-20 () none 20)
(idle () _type_ :state 20)
)
)
|#
#|
(deftype metalkor-ja-float-info (structure)
((float-anim basic :offset-assert 0)
(channel-index int8 :offset-assert 4)
((float-anim art-joint-anim :offset-assert 0)
(channel-index int8 :offset-assert 4)
)
:pack-me
:method-count-assert 9
:size-assert #x5
:flag-assert #x900000005
)
|#
#|
(deftype metalkor-spinner-info (structure)
((joint-index int8 :offset-assert 0)
(launch-angle float :offset-assert 4)
)
:pack-me
:method-count-assert 9
:size-assert #x8
:flag-assert #x900000008
)
|#
#|
(deftype metalkor-shot (metalhead-shot)
((old-transv vector :inline :offset-assert 492)
((old-transv vector :inline :offset-assert 496)
)
:method-count-assert 40
:size-assert #x200
@@ -42854,9 +42830,7 @@
(:methods
)
)
|#
#|
(deftype metalkor-flitter (flitter)
()
:method-count-assert 184
@@ -42865,9 +42839,7 @@
(:methods
)
)
|#
#|
(deftype metalkor-wasp (wasp)
()
:method-count-assert 166
@@ -42876,9 +42848,7 @@
(:methods
)
)
|#
#|
(deftype metalkor-spinner-chain-physics (chain-physics)
((gravity-mult float :offset-assert 1392)
(velocity-mult float :offset-assert 1396)
@@ -42889,87 +42859,75 @@
(:methods
)
)
|#
#|
(deftype metalkor-spinner (process-drawable)
((parent-joint-index int8 :offset-assert 196)
(target-pos vector :inline :offset-assert 204)
(chain basic :offset-assert 220)
(anim-speed float :offset-assert 224)
((parent-joint-index int8 :offset-assert 200)
(target-pos vector :inline :offset-assert 208)
(chain metalkor-spinner-chain-physics :offset-assert 224)
(anim-speed float :offset-assert 228)
)
:method-count-assert 23
:size-assert #xe8
:flag-assert #x17007000e8
(:methods
(metalkor-spinner-method-20 () none 20)
(metalkor-spinner-method-21 () none 21)
(metalkor-spinner-method-22 () none 22)
(break-it () _type_ :state 20)
(idle () _type_ :state 21)
(shoot-out () _type_ :state 22)
)
)
|#
#|
(deftype metalkor-egg (process-focusable)
((last-hit-normal vector :inline :offset-assert 204)
(sticky-time time-frame :offset-assert 220)
(flitter-slot int8 :offset-assert 228)
((last-hit-normal vector :inline :offset-assert 208)
(sticky-time time-frame :offset-assert 224)
(flitter-slot int8 :offset-assert 232)
)
:method-count-assert 31
:size-assert #xe9
:flag-assert #x1f007000e9
(:methods
(metalkor-egg-method-27 () none 27)
(metalkor-egg-method-28 () none 28)
(metalkor-egg-method-29 () none 29)
(metalkor-egg-method-30 () none 30)
(egg-pop () _type_ :state 27)
(fall () _type_ :state 28)
(hatch () _type_ :state 29)
(idle () _type_ :state 30)
)
)
|#
#|
(deftype metalkor-wings (process-drawable)
((prefix basic :offset-assert 196)
((prefix string :offset-assert 200)
)
:method-count-assert 21
:size-assert #xcc
:flag-assert #x15005000cc
(:methods
(metalkor-wings-method-20 () none 20)
(idle () _type_ :state 20)
)
)
|#
#|
(deftype metalkor-foot-lock (structure)
((lock cam-float-seeker :inline :offset-assert 0)
(old-position vector :inline :offset-assert 32)
(initialized basic :offset-assert 48)
(initialized symbol :offset-assert 48)
)
:method-count-assert 9
:size-assert #x34
:flag-assert #x900000034
)
|#
#|
(deftype metalkor-legs (process-focusable)
((prefix basic :offset-assert 200)
(trackable basic :offset-assert 204)
(joint-ik UNKNOWN 6 :offset-assert 208)
(ja-float-info UNKNOWN 3 :offset-assert 232)
(foot-locks UNKNOWN 6 :offset-assert 284)
((prefix string :offset-assert 204)
(trackable symbol :offset-assert 208)
(joint-ik joint-mod-ik 6 :offset-assert 212)
(ja-float-info metalkor-ja-float-info 3 :inline :offset-assert 236)
(foot-locks metalkor-foot-lock 6 :inline :offset 288)
)
:method-count-assert 28
:size-assert #x2a0
:flag-assert #x1c022002a0
(:methods
(metalkor-legs-method-27 () none 27)
(idle () _type_ :state 27)
)
)
|#
#|
(deftype metalkor-chain-physics (chain-physics)
((prev-rotation float :offset-assert 1392)
(prev-y-rotation float :offset-assert 1396)
@@ -42977,7 +42935,7 @@
(osc-y oscillating-float :inline :offset-assert 1424)
(rand-z delayed-rand-float :inline :offset-assert 1448)
(rand-y delayed-rand-float :inline :offset-assert 1480)
(move-with-parent basic :offset-assert 1508)
(move-with-parent symbol :offset-assert 1508)
)
:method-count-assert 18
:size-assert #x5e8
@@ -42985,123 +42943,117 @@
(:methods
)
)
|#
#|
(deftype metalkor-lowtorso (process-focusable)
((prefix basic :offset-assert 200)
(tail basic :offset-assert 204)
(tail-initialized basic :offset-assert 208)
(spinners UNKNOWN 4 :offset-assert 212)
(ja-float-info UNKNOWN 3 :offset-assert 244)
(no-collision-timer uint64 :offset-assert 292)
(egg-toss-joint-1 basic :offset-assert 300)
(egg-toss-joint-2 basic :offset-assert 304)
(egg-toss-joint-3 basic :offset-assert 308)
(egg-toss-joint-angle oscillating-float :inline :offset-assert 312)
((prefix string :offset-assert 204)
(tail metalkor-chain-physics :offset-assert 208) ;; guess
(tail-initialized symbol :offset-assert 212)
(spinners handle 4 :offset-assert 216)
(ja-float-info metalkor-ja-float-info 3 :inline :offset-assert 248)
(no-collision-timer time-frame :offset 296)
(egg-toss-joint-1 joint-mod :offset-assert 304)
(egg-toss-joint-2 joint-mod :offset-assert 308)
(egg-toss-joint-3 joint-mod :offset-assert 312)
(egg-toss-joint-angle oscillating-float :inline :offset-assert 316)
)
:method-count-assert 28
:size-assert #x154
:flag-assert #x1c00e00154
(:methods
(metalkor-lowtorso-method-27 () none 27)
(idle () _type_ :state 27)
)
)
|#
#|
(deftype metalkor (process-focusable)
((trackable basic :offset-assert 200)
(flitters UNKNOWN 10 :offset-assert 204)
(flitter-gem-tracker uint64 :offset-assert 284)
(wasps UNKNOWN 3 :offset-assert 292)
(wasp-gem-tracker uint64 :offset-assert 316)
(last-flitter-launched int8 :offset-assert 324)
(last-wasp-launched int8 :offset-assert 325)
(live-flitters int8 :offset-assert 326)
(live-wasps int8 :offset-assert 327)
(shoot-timer uint64 :offset-assert 332)
(target-angle float :offset-assert 340)
(wave-timer uint64 :offset-assert 348)
(in-wave basic :offset-assert 356)
(flitter-timer uint64 :offset-assert 364)
(wasp-timer uint64 :offset-assert 372)
(launching-flitters basic :offset-assert 380)
(launching-wasps basic :offset-assert 384)
(egg-timer uint64 :offset-assert 388)
(last-close-attack int8 :offset-assert 396)
(last-standing-attack int8 :offset-assert 397)
(stage int8 :offset-assert 398)
(next-stage-timer uint64 :offset-assert 404)
(initial-y float :offset-assert 412)
(shots-fired int16 :offset-assert 416)
(stage-hit-points float :offset-assert 420)
(hud uint64 :offset-assert 428)
(lowtorso uint64 :offset-assert 436)
(legs uint64 :offset-assert 444)
(wings uint64 :offset-assert 452)
(kid uint64 :offset-assert 460)
(explode uint64 :offset-assert 468)
(rift-occlude uint64 :offset-assert 476)
(last-attack-id uint32 :offset-assert 484)
(current-nav-poly nav-poly :offset-assert 488)
(shot-anticipate basic :offset-assert 492)
(spinners UNKNOWN 4 :offset-assert 500)
(neck basic :offset-assert 532)
(previous-flat-travel vector :inline :offset-assert 540)
(previous-flat-travel-timer uint64 :offset-assert 556)
(previous-flat-travel-long-timer uint64 :offset-assert 564)
(min-state-hit-points float :offset-assert 572)
(countdown-to-roar int8 :offset-assert 576)
(for-back-interp cam-float-seeker :inline :offset-assert 580)
(run-walk-interp cam-float-seeker :inline :offset-assert 604)
(left-right-interp cam-float-seeker :inline :offset-assert 628)
(walk-turn-interp cam-float-seeker :inline :offset-assert 652)
(idle-interp cam-float-seeker :inline :offset-assert 676)
(tmp-hit-points float :offset-assert 700)
(reps-till-idle-alt int8 :offset-assert 704)
(last-rotation float :offset-assert 708)
(no-collision-timer uint64 :offset-assert 716)
(egg-timer uint64 :offset-assert 388)
(egg-angle float :offset-assert 732)
(arm-frame float :offset-assert 736)
(been-to-entity basic :offset-assert 740)
(flying-speed cam-float-seeker :inline :offset-assert 744)
(wing-sound uint32 :offset-assert 768)
(wing-sound-playing basic :offset-assert 772)
(explode-sound uint32 :offset-assert 776)
(bomb-sound uint32 :offset-assert 780)
(stop-bomb-sound basic :offset-assert 784)
(hit-ring-trans vector :inline :offset-assert 796)
(hit-ring-offset vector :inline :offset-assert 812)
(ring-cam-pos cam-float-seeker :inline :offset-assert 828)
(need-teleport basic :offset-assert 852)
((trackable symbol :offset-assert 204)
(flitters handle 10 :offset-assert 208)
(flitter-gem-tracker handle :offset-assert 288)
(wasps handle 3 :offset-assert 296)
(wasp-gem-tracker handle :offset-assert 320)
(last-flitter-launched int8 :offset-assert 328)
(last-wasp-launched int8 :offset-assert 329)
(live-flitters int8 :offset-assert 330)
(live-wasps int8 :offset-assert 331)
(shoot-timer time-frame :offset-assert 336)
(target-angle float :offset-assert 344)
(wave-timer time-frame :offset-assert 352)
(in-wave symbol :offset-assert 360)
(flitter-timer time-frame :offset-assert 368)
(wasp-timer time-frame :offset-assert 376)
(launching-flitters symbol :offset-assert 384)
(launching-wasps symbol :offset-assert 388)
(egg-timer time-frame :offset-assert 392)
(last-close-attack int8 :offset-assert 400)
(last-standing-attack int8 :offset-assert 401)
(stage int8 :offset-assert 402)
(next-stage-timer time-frame :offset-assert 408)
(initial-y float :offset-assert 416)
(shots-fired int16 :offset-assert 420)
(stage-hit-points float :offset-assert 424)
(hud handle :offset-assert 432)
(lowtorso handle :offset-assert 440)
(legs handle :offset-assert 448)
(wings handle :offset-assert 456)
(kid handle :offset-assert 464)
(explode handle :offset-assert 472)
(rift-occlude handle :offset-assert 480)
(last-attack-id uint32 :offset-assert 488)
(current-nav-poly nav-poly :offset-assert 492)
(shot-anticipate sparticle-launch-control :offset-assert 496)
(spinners handle 4 :offset-assert 504)
(neck joint-mod :offset-assert 536)
(previous-flat-travel vector :inline :offset-assert 544)
(previous-flat-travel-timer time-frame :offset-assert 560)
(previous-flat-travel-long-timer time-frame :offset-assert 568)
(min-state-hit-points float :offset-assert 576)
(countdown-to-roar int8 :offset-assert 580)
(for-back-interp cam-float-seeker :inline :offset-assert 584)
(run-walk-interp cam-float-seeker :inline :offset-assert 608)
(left-right-interp cam-float-seeker :inline :offset-assert 632)
(walk-turn-interp cam-float-seeker :inline :offset-assert 656)
(idle-interp cam-float-seeker :inline :offset-assert 680)
(tmp-hit-points float :offset-assert 704)
(reps-till-idle-alt int8 :offset-assert 708)
(last-rotation float :offset-assert 712)
(no-collision-timer time-frame :offset-assert 720)
;; (egg-timer time-frame :offset-assert 392)
(egg-angle float :offset 736)
(arm-frame float :offset-assert 740)
(been-to-entity symbol :offset-assert 744)
(flying-speed cam-float-seeker :inline :offset-assert 748)
(wing-sound sound-id :offset-assert 772)
(wing-sound-playing symbol :offset-assert 776)
(explode-sound sound-id :offset-assert 780)
(bomb-sound sound-id :offset-assert 784)
(stop-bomb-sound symbol :offset-assert 788)
(hit-ring-trans vector :inline :offset-assert 800)
(hit-ring-offset vector :inline :offset-assert 816)
(ring-cam-pos cam-float-seeker :inline :offset-assert 832)
(need-teleport symbol :offset-assert 856)
)
:method-count-assert 43
:size-assert #x35c
:flag-assert #x2b02e0035c
(:methods
(metalkor-method-27 () none 27)
(metalkor-method-28 () none 28)
(metalkor-method-29 () none 29)
(metalkor-method-30 () none 30)
(metalkor-method-31 () none 31)
(metalkor-method-32 () none 32)
(metalkor-method-33 () none 33)
(metalkor-method-34 () none 34)
(metalkor-method-35 () none 35)
(metalkor-method-36 () none 36)
(metalkor-method-37 () none 37)
(metalkor-method-38 () none 38)
(metalkor-method-39 () none 39)
(metalkor-method-40 () none 40)
(metalkor-method-41 () none 41)
(metalkor-method-42 () none 42)
(beaten (symbol) _type_ :state 27)
(explode () _type_ :state 28)
(fly-to-ring () _type_ :state 29)
(last-gasp () _type_ :state 30)
(overload-recover () _type_ :state 31)
(fall-down () _type_ :state 32)
(tail-attack () _type_ :state 33)
(foot-attack () _type_ :state 34)
(get-close () _type_ :state 35)
(standing-shot () _type_ :state 36)
(chase-target () _type_ :state 37)
(play-drop-movie () _type_ :state 38)
(start-second-stage () _type_ :state 39)
(hang-shoot-n-launch () _type_ :state 40)
(hidden () _type_ :state 41)
(test () _type_ :state 42)
)
)
|#
#|
(deftype metalkor-ik-setup (structure)
((elbow-index int32 :offset-assert 0)
(hand-dist float :offset-assert 4)
@@ -43110,65 +43062,63 @@
:size-assert #x8
:flag-assert #x900000008
)
|#
;; (define-extern gem-tracker-get-slot function)
;; (define-extern *metalkor-flitter-nav-enemy-info* nav-enemy-info)
;; (define-extern *metalkor-bomb-probe-joints* array)
;; (define-extern metalkor-bomb-init-by-other function)
;; (define-extern gem-tracker-init-by-other function)
;; (define-extern rift-occlude-init-by-other function)
;; (define-extern metalkor-distort-init-by-other function)
;; (define-extern metalkor-explode-init-by-other function)
;; (define-extern metalkor-kid-init-by-other function)
;; (define-extern *metalkor-spinner-chain-setup* array)
;; (define-extern metalkor-spinner-init-by-other function)
;; (define-extern metalkor-egg-reaction function)
;; (define-extern metalkor-egg-init-by-other function)
;; (define-extern metalkor-wings-init-by-other function)
;; (define-extern *metalkor-ik-setup* array)
;; (define-extern metalkor-legs-init-by-other function)
;; (define-extern *metalkor-lowtorso-chain-setup* array)
;; (define-extern metalkor-lowtorso-init-by-other function)
(define-extern gem-tracker-get-slot (function process int :behavior gem-tracker))
(define-extern *metalkor-flitter-nav-enemy-info* nav-enemy-info)
(define-extern *metalkor-bomb-probe-joints* (array int8))
(define-extern metalkor-bomb-init-by-other (function vector entity-actor none :behavior metalkor-bomb))
(define-extern gem-tracker-init-by-other (function entity-actor int none :behavior gem-tracker))
(define-extern rift-occlude-init-by-other (function vector none :behavior rift-occlude))
(define-extern metalkor-distort-init-by-other (function vector quaternion none :behavior metalkor-distort))
(define-extern metalkor-explode-init-by-other (function vector quaternion handle none :behavior metalkor-explode))
(define-extern metalkor-kid-init-by-other (function vector none :behavior metalkor-kid))
(define-extern *metalkor-spinner-chain-setup* (array chain-physics-setup))
(define-extern metalkor-spinner-init-by-other (function vector int none :behavior metalkor-spinner))
(define-extern metalkor-egg-reaction (function control-info collide-query vector vector collide-status :behavior metalkor-egg))
(define-extern metalkor-egg-init-by-other (function vector vector int none :behavior metalkor-egg))
(define-extern metalkor-wings-init-by-other (function vector vector none :behavior metalkor-wings))
(define-extern *metalkor-ik-setup* (array metalkor-ik-setup))
(define-extern metalkor-legs-init-by-other (function string vector none :behavior metalkor-legs))
(define-extern *metalkor-lowtorso-chain-setup* (array chain-physics-setup))
(define-extern metalkor-lowtorso-init-by-other (function vector vector none :behavior metalkor-lowtorso))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; metalkor-states ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; (define-extern *metalkor-spinner-setup* array)
;; (define-extern metalkor-start-spinner function)
;; (define-extern metalkor-spinners-off function)
;; (define-extern metalkor-lowtorso-spinners-off function)
;; (define-extern metalkor-spinner-check function)
;; (define-extern metalkor-lowtorso-spinner-check function)
;; (define-extern metalkor-update-hud function)
;; (define-extern metalkor-all-spinners-on function)
;; (define-extern metalkor-ja-float function)
;; (define-extern metalkor-ja-float-stop function)
;; (define-extern metalkor-ja-float-children function)
;; (define-extern metalkor-ja-float-group? function)
;; (define-extern metalkor-get-ring function)
;; (define-extern metalkor-common function)
;; (define-extern set-countdown-to-roar function)
;; (define-extern metalkor-go-next-stage function)
;; (define-extern metalkor-setup-hit-anim function)
;; (define-extern metalkor-get-gem-tracker function)
;; (define-extern metalkor-handler function)
;; (define-extern metalkor-start-egg function)
;; (define-extern metalkor-check-egg function)
;; (define-extern metalkor-shoot-projectile function)
;; (define-extern metalkor-face-to-vector function)
;; (define-extern update-walk-anim function)
;; (define-extern rotate-and-update-hang-anim function)
;; (define-extern set-color-vectors function)
;; (define-extern metalkor-walk-the-walk function)
;; (define-extern metalkor-set-deadly function)
(define-extern *metalkor-spinner-setup* (array metalkor-spinner-info))
(define-extern metalkor-start-spinner (function int vector handle :behavior metalkor))
(define-extern metalkor-spinners-off (function none :behavior metalkor))
(define-extern metalkor-lowtorso-spinners-off (function none :behavior metalkor))
(define-extern metalkor-spinner-check (function int float vector none :behavior metalkor))
(define-extern metalkor-lowtorso-spinner-check (function metalkor-lowtorso float float none :behavior metalkor)) ;; possibly wrong arg0
(define-extern metalkor-update-hud (function none :behavior metalkor))
(define-extern metalkor-all-spinners-on (function symbol :behavior metalkor))
(define-extern metalkor-ja-float (function art-joint-anim float float float joint-control-channel :behavior metalkor))
(define-extern metalkor-ja-float-stop (function art-joint-anim none :behavior metalkor))
(define-extern metalkor-ja-float-children (function symbol :behavior metalkor))
(define-extern metalkor-ja-float-group? (function art-joint-anim int :behavior metalkor))
(define-extern metalkor-get-ring (function metalkor entity))
(define-extern metalkor-common (function none :behavior metalkor))
(define-extern set-countdown-to-roar (function none :behavior metalkor))
(define-extern metalkor-go-next-stage (function none :behavior metalkor))
(define-extern metalkor-setup-hit-anim (function attack-info process-drawable art-element art-element float none :behavior metalkor))
(define-extern metalkor-get-gem-tracker (function process-focusable none :behavior metalkor))
(define-extern metalkor-handler (function process int symbol event-message-block object :behavior metalkor))
(define-extern metalkor-start-egg (function symbol :behavior metalkor))
(define-extern metalkor-check-egg (function symbol :behavior metalkor))
(define-extern metalkor-shoot-projectile (function none :behavior metalkor))
(define-extern metalkor-face-to-vector (function vector float float none :behavior metalkor))
(define-extern update-walk-anim (function vector symbol none :behavior metalkor))
(define-extern rotate-and-update-hang-anim (function none :behavior metalkor))
(define-extern set-color-vectors (function float none :behavior metalkor))
(define-extern metalkor-walk-the-walk (function float symbol none :behavior metalkor))
(define-extern metalkor-set-deadly (function metalkor symbol int none :behavior metalkor))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; metalkor-extras ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
#|
(deftype nestb-formation (hover-formation)
()
:method-count-assert 16
@@ -43177,14 +43127,12 @@
(:methods
)
)
|#
#|
(deftype rift-ring-ingame (process-drawable)
((anim-speed delayed-rand-float :inline :offset-assert 196)
(stutter basic :offset-assert 224)
(spin-sound uint32 :offset-assert 228)
(spin-sound-playing basic :offset-assert 232)
((anim-speed delayed-rand-float :inline :offset-assert 200)
(stutter symbol :offset-assert 228)
(spin-sound sound-id :offset-assert 232)
(spin-sound-playing symbol :offset-assert 236)
)
:method-count-assert 21
:size-assert #xf0
@@ -43193,9 +43141,7 @@
(idle () _type_ :state 20)
)
)
|#
#|
(deftype nest-break-precipice (process-drawable)
()
:method-count-assert 22
@@ -43206,9 +43152,7 @@
(die () _type_ :state 21)
)
)
|#
#|
(deftype metalkor-rays (process-drawable)
()
:method-count-assert 21
@@ -43218,21 +43162,20 @@
(idle () _type_ :state 20)
)
)
|#
;; (define-extern metalkor-egg-handler function)
;; (define-extern metalkor-shot-move function)
;; (define-extern metalkor-legs-handler function)
;; (define-extern ik-adjust function)
;; (define-extern metalkor-update-ik function)
;; (define-extern *metalkor-lowtorso-spinner-setup* array)
;; (define-extern metalkor-lowtorso-start-spinner function)
;; (define-extern ja-aframe-num-of-proc function)
;; (define-extern metalkor-distort-update function)
;; (define-extern metalkor-rays-init-by-other function)
;; (define-extern *metalkor-bomb-collide-joints* array)
;; (define-extern metalkor-bomb-collide function)
;; (define-extern metalkor-bomb-ground-check function)
(define-extern metalkor-egg-handler (function process int symbol event-message-block object :behavior metalkor-egg))
(define-extern metalkor-shot-move (function metalkor-shot none))
(define-extern metalkor-legs-handler (function process int symbol event-message-block object :behavior metalkor-legs))
(define-extern ik-adjust (function float :behavior metalkor-legs))
(define-extern metalkor-update-ik (function none :behavior metalkor-legs))
(define-extern *metalkor-lowtorso-spinner-setup* (array metalkor-spinner-info))
(define-extern metalkor-lowtorso-start-spinner (function int vector none :behavior metalkor-lowtorso))
(define-extern ja-aframe-num-of-proc (function process-drawable int float))
(define-extern metalkor-distort-update (function none :behavior metalkor-distort))
(define-extern metalkor-rays-init-by-other (function vector quaternion none :behavior metalkor-rays))
(define-extern *metalkor-bomb-collide-joints* (array int8))
(define-extern metalkor-bomb-collide (function vector :behavior metalkor-bomb))
(define-extern metalkor-bomb-ground-check (function symbol :behavior metalkor-bomb))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; nestb-scenes ;;
decompiler/config/jak2/anonymous_function_types.jsonc
+6 -1
View File
@@ -1222,5 +1222,10 @@
[12, "(function none :behavior task-manager)"],
[13, "(function none :behavior task-manager)"]
],
"castle-baron": [[7, "(function collectable none)"]]
"castle-baron": [[7, "(function collectable none)"]],
"metalkor-extras": [[65, "(function vector :behavior metalkor-shot)"]],
"metalkor-setup": [
[1, "(function gem-tracker none)"],
[2, "(function gem-tracker none)"]
]
}
decompiler/config/jak2/label_types.jsonc
+21
View File
@@ -1633,5 +1633,26 @@
["L529", "uint64", true],
["L530", "uint64", true],
["L527", "uint64", true]
],
"metalkor-states": [
["L848", "vector"],
["L847", "vector"],
["L849", "vector"],
["L844", "attack-info"],
["L870", "uint64", true],
["L868", "uint64", true],
["L867", "uint64", true],
["L871", "uint64", true],
["L866", "uint64", true],
["L869", "uint64", true]
],
"metalkor-extras": [
["L382", "vector"],
["L381", "attack-info"],
["L420", "vector"],
["L419", "vector"],
["L430", "vector"],
["L431", "vector"],
["L423", "attack-info"]
]
}
decompiler/config/jak2/stack_structures.jsonc
+26 -1
View File
@@ -2100,5 +2100,30 @@
[656, "vector"],
[736, "sphere"],
[784, "enemy-init-by-other-params"]
]
],
"(method 20 metalkor)": [[16, "vector"]],
"metalkor-common": [[16, "script-context"]],
"metalkor-start-egg": [[16, "vector"]],
"metalkor-check-egg": [
[16, "vector"],
[32, "vector"]
],
"metalkor-bomb-ground-check": [[560, "bounding-box"]],
"metalkor-bomb-collide": [
[624, "vector"],
[560, "bounding-box"]
],
"metalkor-update-ik": [[688, "vector"]],
"(enter hatch metalkor-egg)": [[96, "enemy-init-by-other-params"]],
"(trans fall metalkor-egg)": [[16, "vector"]],
"(method 26 metalkor-shot)": [
[144, "event-message-block"],
[48, "vector"]
],
"(event idle metalkor-lowtorso)": [[176, "vector"]],
"metalkor-go-next-stage": [[160, "vector"]],
"(trans hang-shoot-n-launch metalkor)": [[32, "enemy-init-by-other-params"]],
"(trans test metalkor)": [[32, "vector"]],
"(trans explode metalkor)": [[16, "matrix"]],
"(method 12 metalkor-chain-physics)": [[560, "bounding-box"]]
}
decompiler/config/jak2/type_casts.jsonc
+154 -1
View File
@@ -9872,5 +9872,158 @@
[7, "v1", "krew-boss"],
[18, "a1", "krew-boss"]
],
"(trans idle krew-boss)": [[417, "v0", "(array collide-shape)"]]
"(trans idle krew-boss)": [[417, "v0", "(array collide-shape)"]],
"(method 11 metalkor)": [
[279, "v0", "(pointer actor-group)"],
["_stack_", 16, "res-tag"]
],
"(method 20 metalkor)": [[12, "a0", "collide-shape-prim-group"]],
"metalkor-get-ring": [
[11, "v0", "(pointer actor-group)"],
["_stack_", 16, "res-tag"]
],
"metalkor-update-hud": [
[13, "v1", "hud-metalkor"],
[19, "v1", "hud-metalkor"]
],
"metalkor-common": [[151, "a0", "process-drawable"]],
"metalkor-handler": [
[314, "s5", "attack-info"],
[319, "s5", "attack-info"],
[322, "s5", "attack-info"],
[325, "s5", "attack-info"],
[328, "s5", "attack-info"],
[331, "s5", "attack-info"],
[388, "s5", "attack-info"],
[394, "s5", "attack-info"],
[442, "s5", "attack-info"],
[447, "s5", "attack-info"]
],
"metalkor-start-egg": [
[73, "v1", "float"],
[47, "v1", "float"]
],
"metalkor-check-egg": [[50, "v1", "process-focusable"]],
"metalkor-setup-hit-anim": [[31, "v1", "float"]],
"metalkor-set-deadly": [[2, "v1", "collide-shape-prim-group"]],
"(trans idle metalkor-rays)": [[4, "a0", "process"]],
"metalkor-distort-update": [[38, "a1", "process-drawable"]],
"(trans idle metalkor-wings)": [[4, "a0", "process"]],
"(enter break-it metalkor-spinner)": [[32, "v1", "float"]],
"(trans idle metalkor-spinner)": [
[20, "a2", "process-drawable"],
[21, "v1", "int"]
],
"(enter shoot-out metalkor-spinner)": [[13, "v1", "float"]],
"(trans idle metalkor-legs)": [
[4, "a0", "process"],
[39, "gp", "process-drawable"],
[22, "v1", "metalkor-legs"],
[27, "v1", "metalkor-legs"],
[36, "a0", "metalkor-legs"],
[56, "v1", "metalkor-legs"]
],
"(trans idle metalkor-lowtorso)": [
[17, "a0", "process"],
[49, "a0", "metalkor-lowtorso"],
[52, "gp", "process-drawable"],
[35, "v1", "metalkor-lowtorso"],
[40, "v1", "metalkor-lowtorso"],
[69, "v1", "metalkor-lowtorso"]
],
"(event idle metalkor-lowtorso)": [
[15, "a0", "rgbaf"],
[20, "v1", "rgbaf"],
[166, "v1", "process-drawable"],
[170, "v1", "process-drawable"],
[6, "v1", "float"],
[96, "v1", "metalkor-lowtorso"],
[108, "a0", "metalkor-lowtorso"],
[112, "a0", "metalkor-lowtorso"]
],
"metalkor-update-ik": [["_stack_", 736, "vector"]],
"(trans fall metalkor-egg)": [
[44, "a0", "collide-shape-moving"],
[64, "a0", "collide-shape-moving"],
[69, "a0", "collide-shape-moving"],
[67, "v1", "collide-shape-moving"],
[49, "a0", "collide-shape-moving"]
],
"(method 26 metalkor-shot)": [
[223, "v1", "process-drawable"],
[344, "v1", "process-drawable"]
],
"(method 20 metalkor-legs)": [[10, "v1", "collide-shape-prim-group"]],
"(trans shoot-out metalkor-spinner)": [
[68, "a2", "metalkor"],
[69, "v1", "int"]
],
"metalkor-legs-handler": [
[39, "a0", "rgbaf"],
[44, "v1", "rgbaf"],
[70, "a0", "metalkor-legs"],
[74, "a0", "metalkor-legs"],
[58, "v1", "metalkor-legs"]
],
"(method 13 metalkor-chain-physics)": [
[93, "a0", "metalkor"],
[100, "a0", "metalkor"],
[120, "a0", "metalkor"],
[127, "a0", "metalkor"],
[406, "a0", "metalkor"],
[413, "a0", "metalkor"],
[435, "a0", "metalkor"],
[442, "a0", "metalkor"],
[146, "a0", "metalkor"],
[153, "a0", "metalkor"],
[273, "a0", "metalkor"],
[280, "a0", "metalkor"],
[28, "a0", "metalkor"],
[35, "a0", "metalkor"]
],
"(trans get-close metalkor)": [[48, "v1", "float"]],
"(trans standing-shot metalkor)": [
[29, "a0", "art-joint-anim"],
[33, "a0", "art-joint-anim"]
],
"(trans chase-target metalkor)": [[37, "v1", "float"]],
"update-walk-anim": [
[72, "a0", "art-joint-anim"],
[83, "a0", "art-joint-anim"],
[121, "a0", "art-joint-anim"],
[295, "v1", "float"],
[426, "v1", "float"]
],
"metalkor-egg-reaction": [
[10, "s5", "metalkor-egg"],
[116, "s5", "metalkor-egg"],
["_stack_", 32, "float"],
[130, "s5", "metalkor-egg"]
],
"metalkor-spinner-init-by-other": [
[32, "a0", "process-drawable"],
[72, "v1", "float"],
[94, "v1", "float"]
],
"metalkor-egg-init-by-other": [[94, "a0", "process-drawable"]],
"metalkor-wings-init-by-other": [[36, "a0", "process-drawable"]],
"metalkor-legs-init-by-other": [
[604, "a0", "process-drawable"],
[686, "a0", "metalkor-legs"]
],
"metalkor-lowtorso-init-by-other": [
[677, "a0", "process-drawable"],
[754, "a0", "metalkor-lowtorso"]
],
"metalkor-kid-init-by-other": [[37, "a0", "process-drawable"]],
"metalkor-explode-init-by-other": [[37, "a0", "process-drawable"]],
"rift-occlude-init-by-other": [[39, "a0", "process-drawable"]],
"(event idle gem-tracker)": [[37, "a1", "process"]],
"(trans hang-shoot-n-launch metalkor)": [
[79, "v0", "(pointer actor-group)"],
[369, "v1", "art-joint-anim"],
[373, "v1", "art-joint-anim"],
["_stack_", 16, "res-tag"]
],
"(trans explode metalkor)": [[15, "v0", "entity-actor"]]
}
goal_src/jak2/levels/nest/boss/metalkor-extras.gc
+2522
View File
File diff suppressed because it is too large Load Diff
goal_src/jak2/levels/nest/boss/metalkor-setup.gc
+1714
View File
File diff suppressed because it is too large Load Diff
goal_src/jak2/levels/nest/boss/metalkor-states.gc
+2917
View File
File diff suppressed because it is too large Load Diff
goal_src/jak2/levels/nest/boss/nestb-scenes.gc
+3 -3
View File
@@ -1772,8 +1772,8 @@ This commonly includes things such as:
)
(defun nestb-login ()
;; (set! *nav-network* (new 'loading-level 'nav-network))
;; (nav-network-method-9 *nav-network*)
(set! *nav-network* (new 'loading-level 'nav-network))
(nav-network-method-9 *nav-network*)
0
(none)
)
@@ -1788,7 +1788,7 @@ This commonly includes things such as:
)
(defun nestb-activate ((arg0 level))
;; (nav-network-method-10 *nav-network* arg0 *nestb-adjacency*)
(nav-network-method-10 *nav-network* arg0 *nestb-adjacency*)
0
(none)
)
test/decompiler/reference/jak2/levels/nest/boss/metalkor-extras_REF.gc
Generated Vendored
+2669
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/jak2/levels/nest/boss/metalkor-setup_REF.gc
Generated Vendored
+2206
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/jak2/levels/nest/boss/metalkor-states_REF.gc
Generated Vendored
+2984
View File
File diff suppressed because it is too large Load Diff
test/offline/config/jak2/config.jsonc
+2 -1
View File
@@ -301,7 +301,8 @@
"(method 49 traffic-engine)", // float stuff
"(method 14 nav-graph)",
"target-pilot-init",
"(method 224 crimson-guard)" // .mula.s
"(method 224 crimson-guard)", // .mula.s
"metalkor-egg-reaction" // .mula.s
],
"skip_compile_states": {