mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 11:26:18 -04:00
define every skeleton-group, name every inherited virtual state (#712)
* define every skeleton-group, name every inherited virtual state * typo!
This commit is contained in:
parent
7632b90a17
commit
03ffb97176
File diff suppressed because it is too large
Load diff
|
@ -22,7 +22,7 @@
|
||||||
(:methods
|
(:methods
|
||||||
(dummy-20 () none 20)
|
(dummy-20 () none 20)
|
||||||
(dummy-21 () none 21)
|
(dummy-21 () none 21)
|
||||||
(dummy-22 () none 22)
|
(pov-camera-playing () none 22) ;; state
|
||||||
(dummy-23 () none 23)
|
(dummy-23 () none 23)
|
||||||
(dummy-24 () none 24)
|
(dummy-24 () none 24)
|
||||||
(dummy-25 () none 25)
|
(dummy-25 () none 25)
|
||||||
|
|
|
@ -149,3 +149,4 @@
|
||||||
|
|
||||||
|
|
||||||
(declare-type target process-drawable)
|
(declare-type target process-drawable)
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
;; name in dgo: projectiles-h
|
;; name in dgo: projectiles-h
|
||||||
;; dgos: GAME, ENGINE
|
;; dgos: GAME, ENGINE
|
||||||
|
|
||||||
;; definition of type projectile
|
|
||||||
(deftype projectile (process-drawable)
|
(deftype projectile (process-drawable)
|
||||||
((base-trans vector :inline :offset-assert 176)
|
((base-trans vector :inline :offset-assert 176)
|
||||||
(target vector :inline :offset-assert 192)
|
(target vector :inline :offset-assert 192)
|
||||||
|
@ -36,8 +35,8 @@
|
||||||
:flag-assert #x1d0130019c
|
:flag-assert #x1d0130019c
|
||||||
(:methods
|
(:methods
|
||||||
(dummy-20 () none 20)
|
(dummy-20 () none 20)
|
||||||
(dummy-21 () none 21)
|
(projectile-dissipate () none 21) ;; state
|
||||||
(dummy-22 () none 22)
|
(projectile-impact () none 22) ;; state
|
||||||
(dummy-23 () none 23)
|
(dummy-23 () none 23)
|
||||||
(dummy-24 () none 24)
|
(dummy-24 () none 24)
|
||||||
(dummy-25 () none 25)
|
(dummy-25 () none 25)
|
||||||
|
@ -47,7 +46,6 @@
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
;; definition of type projectile-yellow
|
|
||||||
(deftype projectile-yellow (projectile)
|
(deftype projectile-yellow (projectile)
|
||||||
((mode int32 :offset-assert 412)
|
((mode int32 :offset-assert 412)
|
||||||
(angle float :offset-assert 416)
|
(angle float :offset-assert 416)
|
||||||
|
@ -58,7 +56,6 @@
|
||||||
:flag-assert #x1d014001a4
|
:flag-assert #x1d014001a4
|
||||||
)
|
)
|
||||||
|
|
||||||
;; definition of type projectile-blue
|
|
||||||
(deftype projectile-blue (projectile)
|
(deftype projectile-blue (projectile)
|
||||||
((mode int32 :offset-assert 412)
|
((mode int32 :offset-assert 412)
|
||||||
(joint-num int32 :offset-assert 416)
|
(joint-num int32 :offset-assert 416)
|
||||||
|
@ -68,3 +65,4 @@
|
||||||
:size-assert #x1a4
|
:size-assert #x1a4
|
||||||
:flag-assert #x1d014001a4
|
:flag-assert #x1d014001a4
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -132,17 +132,17 @@
|
||||||
:size-assert #x17c
|
:size-assert #x17c
|
||||||
:flag-assert #x350110017c
|
:flag-assert #x350110017c
|
||||||
(:methods
|
(:methods
|
||||||
(dummy-20 (_type_) none 20)
|
(dummy-20 () none 20)
|
||||||
(dummy-21 (_type_) none 21)
|
(give-cell () none 21) ;; state
|
||||||
(dummy-22 (_type_) none 22)
|
(dummy-22 () none 22)
|
||||||
(dummy-23 (_type_) none 23)
|
(enter-playing () none 23) ;; state
|
||||||
(dummy-24 (_type_) none 24)
|
(play-accept () none 24) ;; state
|
||||||
(dummy-25 (_type_) none 25)
|
(dummy-25 () none 25)
|
||||||
(dummy-26 (_type_) none 26)
|
(query () none 26) ;; state
|
||||||
(dummy-27 (_type_) none 27)
|
(play-anim () none 27) ;; state
|
||||||
(dummy-28 (_type_) none 28)
|
(hidden () none 28) ;; state
|
||||||
(dummy-29 (_type_) none 29)
|
(dummy-29 () none 29)
|
||||||
(dummy-30 (_type_) none 30)
|
(idle () none 30) ;; state
|
||||||
(dummy-31 (_type_) none 31)
|
(dummy-31 (_type_) none 31)
|
||||||
(dummy-32 (_type_ symbol) spool-anim 32)
|
(dummy-32 (_type_ symbol) spool-anim 32)
|
||||||
(dummy-33 (_type_) none 33)
|
(dummy-33 (_type_) none 33)
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
;; name in dgo: water-h
|
;; name in dgo: water-h
|
||||||
;; dgos: GAME, ENGINE
|
;; dgos: GAME, ENGINE
|
||||||
|
|
||||||
;; definition of type water-control
|
|
||||||
(deftype water-control (basic)
|
(deftype water-control (basic)
|
||||||
((flags uint32 :offset-assert 4)
|
((flags uint32 :offset-assert 4)
|
||||||
(process process :offset-assert 8)
|
(process process :offset-assert 8)
|
||||||
|
@ -99,8 +98,8 @@
|
||||||
:size-assert #xd4
|
:size-assert #xd4
|
||||||
:flag-assert #x1e007000d4
|
:flag-assert #x1e007000d4
|
||||||
(:methods
|
(:methods
|
||||||
(dummy-20 () none 20)
|
(water-vol-idle () none 20) ;; state
|
||||||
(dummy-21 () none 21)
|
(water-vol-startup () none 21) ;; state
|
||||||
(dummy-22 () none 22)
|
(dummy-22 () none 22)
|
||||||
(dummy-23 () none 23)
|
(dummy-23 () none 23)
|
||||||
(dummy-24 () none 24)
|
(dummy-24 () none 24)
|
||||||
|
|
|
@ -144,7 +144,7 @@
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
(defmacro seek! (place target rate)
|
(defmacro seek! (place target rate)
|
||||||
"Macro to use seek in-place. place is the target, and where the result is stored."
|
"Macro to use seek in-place. place is the base, and where the result is stored."
|
||||||
`(set! ,place (seek ,place ,target ,rate))
|
`(set! ,place (seek ,place ,target ,rate))
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
(m2 float :offset-assert 20)
|
(m2 float :offset-assert 20)
|
||||||
(yend float :offset-assert 24)
|
(yend float :offset-assert 24)
|
||||||
)
|
)
|
||||||
|
:allow-misaligned
|
||||||
:method-count-assert 18
|
:method-count-assert 18
|
||||||
:size-assert #x1c
|
:size-assert #x1c
|
||||||
:flag-assert #x120000001c
|
:flag-assert #x120000001c
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
;; name in dgo: nav-enemy-h
|
;; name in dgo: nav-enemy-h
|
||||||
;; dgos: GAME, COMMON, L1
|
;; dgos: GAME, COMMON, L1
|
||||||
|
|
||||||
;; definition of type nav-enemy-info
|
|
||||||
(deftype nav-enemy-info (basic)
|
(deftype nav-enemy-info (basic)
|
||||||
((idle-anim int32 :offset-assert 4)
|
((idle-anim int32 :offset-assert 4)
|
||||||
(walk-anim int32 :offset-assert 8)
|
(walk-anim int32 :offset-assert 8)
|
||||||
|
@ -64,7 +63,6 @@
|
||||||
:flag-assert #x9000000e8
|
:flag-assert #x9000000e8
|
||||||
)
|
)
|
||||||
|
|
||||||
;; definition of type nav-enemy
|
|
||||||
(deftype nav-enemy (process-drawable)
|
(deftype nav-enemy (process-drawable)
|
||||||
((hit-from-dir vector :inline :offset-assert 176)
|
((hit-from-dir vector :inline :offset-assert 176)
|
||||||
(event-param-point vector :inline :offset-assert 192)
|
(event-param-point vector :inline :offset-assert 192)
|
||||||
|
@ -72,7 +70,7 @@
|
||||||
(jump-dest vector :inline :offset-assert 224)
|
(jump-dest vector :inline :offset-assert 224)
|
||||||
(jump-trajectory trajectory :inline :offset-assert 240)
|
(jump-trajectory trajectory :inline :offset-assert 240)
|
||||||
(jump-time uint64 :offset-assert 280)
|
(jump-time uint64 :offset-assert 280)
|
||||||
(nav-info basic :offset-assert 288)
|
(nav-info nav-enemy-info :offset-assert 288)
|
||||||
(target-speed float :offset-assert 292)
|
(target-speed float :offset-assert 292)
|
||||||
(momentum-speed float :offset-assert 296)
|
(momentum-speed float :offset-assert 296)
|
||||||
(acceleration float :offset-assert 300)
|
(acceleration float :offset-assert 300)
|
||||||
|
@ -96,20 +94,20 @@
|
||||||
:size-assert #x190
|
:size-assert #x190
|
||||||
:flag-assert #x4c01200190
|
:flag-assert #x4c01200190
|
||||||
(:methods
|
(:methods
|
||||||
(dummy-20 () none 20)
|
(nav-enemy-attack () none 20) ;; state
|
||||||
(dummy-21 () none 21)
|
(nav-enemy-chase () none 21) ;; state
|
||||||
(dummy-22 () none 22)
|
(dummy-22 () none 22)
|
||||||
(dummy-23 () none 23)
|
(nav-enemy-die () none 23) ;; state
|
||||||
(dummy-24 () none 24)
|
(nav-enemy-fuel-cell () none 24) ;; state
|
||||||
(dummy-25 () none 25)
|
(nav-enemy-give-up () none 25) ;; state
|
||||||
(dummy-26 () none 26)
|
(nav-enemy-jump () none 26) ;; state
|
||||||
(dummy-27 () none 27)
|
(nav-enemy-jump-land () none 27) ;; state
|
||||||
(dummy-28 () none 28)
|
(nav-enemy-idle () none 28) ;; state
|
||||||
(dummy-29 () none 29)
|
(nav-enemy-notice () none 29) ;; state
|
||||||
(dummy-30 () none 30)
|
(nav-enemy-patrol () none 30) ;; state
|
||||||
(dummy-31 () none 31)
|
(nav-enemy-stare () none 31) ;; state
|
||||||
(dummy-32 () none 32)
|
(nav-enemy-stop-chase () none 32) ;; state
|
||||||
(dummy-33 () none 33)
|
(nav-enemy-victory () none 33) ;; state
|
||||||
(dummy-34 () none 34)
|
(dummy-34 () none 34)
|
||||||
(dummy-35 () none 35)
|
(dummy-35 () none 35)
|
||||||
(dummy-36 () none 36)
|
(dummy-36 () none 36)
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
(:methods
|
(:methods
|
||||||
(dummy-20 () none 20)
|
(dummy-20 () none 20)
|
||||||
(dummy-21 () none 21)
|
(dummy-21 () none 21)
|
||||||
(dummy-22 () none 22)
|
(pov-camera-playing () none 22)
|
||||||
(dummy-23 () none 23)
|
(dummy-23 () none 23)
|
||||||
(dummy-24 () none 24)
|
(dummy-24 () none 24)
|
||||||
(dummy-25 () none 25)
|
(dummy-25 () none 25)
|
||||||
|
|
|
@ -32,8 +32,8 @@
|
||||||
:flag-assert #x1d0130019c
|
:flag-assert #x1d0130019c
|
||||||
(:methods
|
(:methods
|
||||||
(dummy-20 () none 20)
|
(dummy-20 () none 20)
|
||||||
(dummy-21 () none 21)
|
(projectile-dissipate () none 21)
|
||||||
(dummy-22 () none 22)
|
(projectile-impact () none 22)
|
||||||
(dummy-23 () none 23)
|
(dummy-23 () none 23)
|
||||||
(dummy-24 () none 24)
|
(dummy-24 () none 24)
|
||||||
(dummy-25 () none 25)
|
(dummy-25 () none 25)
|
||||||
|
|
|
@ -120,17 +120,17 @@
|
||||||
:size-assert #x17c
|
:size-assert #x17c
|
||||||
:flag-assert #x350110017c
|
:flag-assert #x350110017c
|
||||||
(:methods
|
(:methods
|
||||||
(dummy-20 (_type_) none 20)
|
(dummy-20 () none 20)
|
||||||
(dummy-21 (_type_) none 21)
|
(give-cell () none 21)
|
||||||
(dummy-22 (_type_) none 22)
|
(dummy-22 () none 22)
|
||||||
(dummy-23 (_type_) none 23)
|
(enter-playing () none 23)
|
||||||
(dummy-24 (_type_) none 24)
|
(play-accept () none 24)
|
||||||
(dummy-25 (_type_) none 25)
|
(dummy-25 () none 25)
|
||||||
(dummy-26 (_type_) none 26)
|
(query () none 26)
|
||||||
(dummy-27 (_type_) none 27)
|
(play-anim () none 27)
|
||||||
(dummy-28 (_type_) none 28)
|
(hidden () none 28)
|
||||||
(dummy-29 (_type_) none 29)
|
(dummy-29 () none 29)
|
||||||
(dummy-30 (_type_) none 30)
|
(idle () none 30)
|
||||||
(dummy-31 (_type_) none 31)
|
(dummy-31 (_type_) none 31)
|
||||||
(dummy-32 (_type_ symbol) spool-anim 32)
|
(dummy-32 (_type_ symbol) spool-anim 32)
|
||||||
(dummy-33 (_type_) none 33)
|
(dummy-33 (_type_) none 33)
|
||||||
|
|
|
@ -149,8 +149,8 @@
|
||||||
:size-assert #xd4
|
:size-assert #xd4
|
||||||
:flag-assert #x1e007000d4
|
:flag-assert #x1e007000d4
|
||||||
(:methods
|
(:methods
|
||||||
(dummy-20 () none 20)
|
(water-vol-idle () none 20)
|
||||||
(dummy-21 () none 21)
|
(water-vol-startup () none 21)
|
||||||
(dummy-22 () none 22)
|
(dummy-22 () none 22)
|
||||||
(dummy-23 () none 23)
|
(dummy-23 () none 23)
|
||||||
(dummy-24 () none 24)
|
(dummy-24 () none 24)
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
(m2 float :offset-assert 20)
|
(m2 float :offset-assert 20)
|
||||||
(yend float :offset-assert 24)
|
(yend float :offset-assert 24)
|
||||||
)
|
)
|
||||||
:method-count-assert 18
|
:allow-misaligned :method-count-assert 18
|
||||||
:size-assert #x1c
|
:size-assert #x1c
|
||||||
:flag-assert #x120000001c
|
:flag-assert #x120000001c
|
||||||
)
|
)
|
||||||
|
|
|
@ -145,7 +145,7 @@
|
||||||
(jump-dest vector :inline :offset-assert 224)
|
(jump-dest vector :inline :offset-assert 224)
|
||||||
(jump-trajectory trajectory :inline :offset-assert 240)
|
(jump-trajectory trajectory :inline :offset-assert 240)
|
||||||
(jump-time uint64 :offset-assert 280)
|
(jump-time uint64 :offset-assert 280)
|
||||||
(nav-info basic :offset-assert 288)
|
(nav-info nav-enemy-info :offset-assert 288)
|
||||||
(target-speed float :offset-assert 292)
|
(target-speed float :offset-assert 292)
|
||||||
(momentum-speed float :offset-assert 296)
|
(momentum-speed float :offset-assert 296)
|
||||||
(acceleration float :offset-assert 300)
|
(acceleration float :offset-assert 300)
|
||||||
|
@ -169,20 +169,20 @@
|
||||||
:size-assert #x190
|
:size-assert #x190
|
||||||
:flag-assert #x4c01200190
|
:flag-assert #x4c01200190
|
||||||
(:methods
|
(:methods
|
||||||
(dummy-20 () none 20)
|
(nav-enemy-attack () none 20)
|
||||||
(dummy-21 () none 21)
|
(nav-enemy-chase () none 21)
|
||||||
(dummy-22 () none 22)
|
(dummy-22 () none 22)
|
||||||
(dummy-23 () none 23)
|
(nav-enemy-die () none 23)
|
||||||
(dummy-24 () none 24)
|
(nav-enemy-fuel-cell () none 24)
|
||||||
(dummy-25 () none 25)
|
(nav-enemy-give-up () none 25)
|
||||||
(dummy-26 () none 26)
|
(nav-enemy-jump () none 26)
|
||||||
(dummy-27 () none 27)
|
(nav-enemy-jump-land () none 27)
|
||||||
(dummy-28 () none 28)
|
(nav-enemy-idle () none 28)
|
||||||
(dummy-29 () none 29)
|
(nav-enemy-notice () none 29)
|
||||||
(dummy-30 () none 30)
|
(nav-enemy-patrol () none 30)
|
||||||
(dummy-31 () none 31)
|
(nav-enemy-stare () none 31)
|
||||||
(dummy-32 () none 32)
|
(nav-enemy-stop-chase () none 32)
|
||||||
(dummy-33 () none 33)
|
(nav-enemy-victory () none 33)
|
||||||
(dummy-34 () none 34)
|
(dummy-34 () none 34)
|
||||||
(dummy-35 () none 35)
|
(dummy-35 () none 35)
|
||||||
(dummy-36 () none 36)
|
(dummy-36 () none 36)
|
||||||
|
|
Loading…
Reference in a new issue