diff --git a/decompiler/config/all-types.gc b/decompiler/config/all-types.gc index 08361219f..3773fa278 100644 --- a/decompiler/config/all-types.gc +++ b/decompiler/config/all-types.gc @@ -9237,7 +9237,7 @@ (deftype align-control (basic) ((flags uint32 :offset-assert 4) - (process basic :offset-assert 8) + (process process :offset-assert 8) (frame-group basic :offset-assert 12) (frame-num float :offset-assert 16) (matrix matrix 2 :inline :offset-assert 32) @@ -9300,69 +9300,59 @@ ) ) -; (deftype process-drawable-reserved (process-drawable) -; () -; :method-count-assert 63 -; :size-assert #xb0 -; :flag-assert #x3f004000b0 -; ;; not enough basic ops -; (:methods -; (dummy-9 () none 9) -; (dummy-10 () none 10) -; (dummy-11 () none 11) -; (dummy-12 () none 12) -; (dummy-13 () none 13) -; (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) -; (dummy-23 () none 23) -; (dummy-24 () none 24) -; (dummy-25 () none 25) -; (dummy-26 () none 26) -; (dummy-27 () none 27) -; (dummy-28 () none 28) -; (dummy-29 () none 29) -; (dummy-30 () none 30) -; (dummy-31 () none 31) -; (dummy-32 () none 32) -; (dummy-33 () none 33) -; (dummy-34 () none 34) -; (dummy-35 () none 35) -; (dummy-36 () none 36) -; (dummy-37 () none 37) -; (dummy-38 () none 38) -; (dummy-39 () none 39) -; (dummy-40 () none 40) -; (dummy-41 () none 41) -; (dummy-42 () none 42) -; (dummy-43 () none 43) -; (dummy-44 () none 44) -; (dummy-45 () none 45) -; (dummy-46 () none 46) -; (dummy-47 () none 47) -; (dummy-48 () none 48) -; (dummy-49 () none 49) -; (dummy-50 () none 50) -; (dummy-51 () none 51) -; (dummy-52 () none 52) -; (dummy-53 () none 53) -; (dummy-54 () none 54) -; (dummy-55 () none 55) -; (dummy-56 () none 56) -; (dummy-57 () none 57) -; (dummy-58 () none 58) -; (dummy-59 () none 59) -; (dummy-60 () none 60) -; (dummy-61 () none 61) -; (dummy-62 () none 62) -; ) -; ) +(deftype process-drawable-reserved (process-drawable) + () + :heap-base #x40 + :method-count-assert 63 + :size-assert #xb0 + :flag-assert #x3f004000b0 + ;; not enough basic ops + (:methods + (dummy-20 () none 20) + (dummy-21 () none 21) + (dummy-22 () none 22) + (dummy-23 () none 23) + (dummy-24 () none 24) + (dummy-25 () none 25) + (dummy-26 () none 26) + (dummy-27 () none 27) + (dummy-28 () none 28) + (dummy-29 () none 29) + (dummy-30 () none 30) + (dummy-31 () none 31) + (dummy-32 () none 32) + (dummy-33 () none 33) + (dummy-34 () none 34) + (dummy-35 () none 35) + (dummy-36 () none 36) + (dummy-37 () none 37) + (dummy-38 () none 38) + (dummy-39 () none 39) + (dummy-40 () none 40) + (dummy-41 () none 41) + (dummy-42 () none 42) + (dummy-43 () none 43) + (dummy-44 () none 44) + (dummy-45 () none 45) + (dummy-46 () none 46) + (dummy-47 () none 47) + (dummy-48 () none 48) + (dummy-49 () none 49) + (dummy-50 () none 50) + (dummy-51 () none 51) + (dummy-52 () none 52) + (dummy-53 () none 53) + (dummy-54 () none 54) + (dummy-55 () none 55) + (dummy-56 () none 56) + (dummy-57 () none 57) + (dummy-58 () none 58) + (dummy-59 () none 59) + (dummy-60 () none 60) + (dummy-61 () none 61) + (dummy-62 () none 62) + ) + ) (deftype attack-info (structure) ((trans vector :inline :offset-assert 0) @@ -9372,13 +9362,13 @@ (invinc-time uint64 :offset-assert 56) (mask uint32 :offset-assert 64) (mode basic :offset-assert 68) - (shove-back float :offset-assert 72) ;; meters - (shove-up float :offset-assert 76) ;; meters - (speed float :offset-assert 80) ;; meters - (dist float :offset-assert 84) ;; meters + (shove-back float :offset-assert 72) ;; meters + (shove-up float :offset-assert 76) ;; meters + (speed float :offset-assert 80) ;; meters + (dist float :offset-assert 84) ;; meters (control float :offset-assert 88) (angle basic :offset-assert 92) - (rotate-to float :offset-assert 96) ;; deg + (rotate-to float :offset-assert 96) ;; deg (prev-state basic :offset-assert 100) ) :method-count-assert 10 @@ -9390,15 +9380,15 @@ ) ) -; (deftype ground-tween-info (structure) -; ((chan UNKNOWN 3 :offset-assert 0) -; (blend UNKNOWN 3 :offset-assert 4) -; (group UNKNOWN 5 :offset-assert 16) -; ) -; :method-count-assert 9 -; :size-assert #x24 -; :flag-assert #x900000024 -; ) +(deftype ground-tween-info (structure) + ((chan uint8 3 :offset-assert 0) + (blend uint32 3 :offset-assert 4) + (group uint32 5 :offset-assert 16) + ) + :method-count-assert 9 + :size-assert #x24 + :flag-assert #x900000024 + ) ;; - Unknowns @@ -9415,21 +9405,21 @@ ;; - Types (deftype manipy (process-drawable) - ((new-trans-hook basic :offset-assert 176) - (cur-trans-hook basic :offset-assert 180) - (cur-event-hook basic :offset-assert 184) + ((new-trans-hook function :offset-assert 176) + (cur-trans-hook function :offset-assert 180) + (cur-event-hook function :offset-assert 184) (new-joint-anim basic :offset-assert 188) (new-joint-anim-blend uint64 :offset-assert 192) (anim-mode basic :offset-assert 200) (cur-grab-handle uint64 :offset-assert 208) (cur-target-handle uint64 :offset-assert 216) (old-grab-pos vector :inline :offset-assert 224) - (joint joint 4 :offset-assert 240) - (new-post-hook basic :offset-assert 256) - (cur-post-hook basic :offset-assert 260) + (joint joint 4 :offset-assert 240) + (new-post-hook function :offset-assert 256) + (cur-post-hook function :offset-assert 260) (clone-copy-trans basic :offset-assert 264) (shadow-backup basic :offset-assert 268) - (draw? basic :offset-assert 272) + (draw? symbol :offset-assert 272) ) :heap-base #xb0 :method-count-assert 20 @@ -9449,7 +9439,7 @@ (deftype part-spawner (process-drawable) ((mode uint32 :offset-assert 176) (enable basic :offset-assert 180) - (radius float :offset-assert 184) ; meters + (radius float :offset-assert 184) ;; meters (world-sphere sphere :inline :offset-assert 192) ) :heap-base #x60 @@ -9462,55 +9452,71 @@ ) ) -;; (deftype part-tracker (process) -;; () -;; :method-count-assert 14 -;; :size-assert #xf8 -;; :flag-assert #xe009000f8 -;; ;; inherited inspect of process -;; (:methods -;; ) -;; ) +(deftype part-tracker (process) + ((root basic :offset-assert 112) + (part basic :offset-assert 116) + (target uint64 :offset-assert 120) + (callback basic :offset-assert 128) + (linger-callback basic :offset-assert 132) + (duration uint64 :offset-assert 136) + (linger-duration uint64 :offset-assert 144) + (start-time uint64 :offset-assert 152) + (offset vector :inline :offset-assert 160) + (userdata uint64 :offset-assert 176) + (user-time uint64 2 :offset-assert 184) + (user-vector vector 2 :inline :offset-assert 208) + (user-handle uint32 2 :offset-assert 240) + ) + :heap-base #x90 + :method-count-assert 14 + :size-assert #xf8 + :flag-assert #xe009000f8 + ;; inherited inspect of process + (:methods + ) + ) + (deftype camera-tracker (process) ( - ;(~Tname basic :offset-assert 4) - (~Tgrab-target uint64 :offset 120) - (~Tgrab-event basic :offset-assert 128) - (~Trelease-event basic :offset-assert 132) - (~Told-global-mask uint32 :offset-assert 136) - (~Told-self-mask uint32 :offset-assert 140) - (~Told-parent-mask uint32 :offset-assert 144) - (~Tlook-at-target uint64 :offset-assert 152) - (~Tpov-target uint64 :offset-assert 160) - (~Twork-process uint64 :offset-assert 168) - (~Tanim-process uint64 :offset-assert 176) - (~Tstart-time uint64 :offset-assert 184) - (~Tcallback basic :offset-assert 192) - (~Tuserdata basic :offset-assert 196) - (~Tmessage basic :offset-assert 200) - (~Tborder-value basic :offset-assert 204) - (~Tmask-to-clear uint32 :offset-assert 208) - (~Tscript basic :offset-assert 212) - (~Tscript-line basic :offset-assert 216) - (~Tscript-func basic :offset-assert 220) + ;(name basic :offset-assert 4) + (grab-target uint64 :offset 120) + (grab-event basic :offset-assert 128) + (release-event basic :offset-assert 132) + (old-global-mask uint32 :offset-assert 136) + (old-self-mask uint32 :offset-assert 140) + (old-parent-mask uint32 :offset-assert 144) + (look-at-target uint64 :offset-assert 152) + (pov-target uint64 :offset-assert 160) + (work-process uint64 :offset-assert 168) + (anim-process uint64 :offset-assert 176) + (start-time uint64 :offset-assert 184) + (callback basic :offset-assert 192) + (userdata basic :offset-assert 196) + (message basic :offset-assert 200) + (border-value basic :offset-assert 204) + (mask-to-clear uint32 :offset-assert 208) + (script basic :offset-assert 212) + (script-line basic :offset-assert 216) + (script-func basic :offset-assert 220) ) :heap-base #x70 :method-count-assert 15 :size-assert #xe0 :flag-assert #xf007000e0 - ;; inherited inspect of processfield ~Tuserdata is a basic loaded with a signed load + ;; inherited inspect of process + ;; field ~Tuserdata is a basic loaded with a signed load (:methods (dummy-14 () none 14) ) ) (deftype touch-tracker (process-drawable) - ((~Tduration uint64 :offset-assert 176) - (~Ttarget uint64 :offset-assert 184) - (~Tevent basic :offset-assert 192) - (~Trun-function basic :offset-assert 196) - (~Tcallback basic :offset-assert 200) - (~Tevent-mode basic :offset-assert 204) + ((duration uint64 :offset-assert 176) + (target uint64 :offset-assert 184) + (event basic :offset-assert 192) + (run-function basic :offset-assert 196) + (callback basic :offset-assert 200) + (event-mode basic :offset-assert 204) ) :heap-base #x60 :method-count-assert 20 @@ -9520,10 +9526,10 @@ ) (deftype swingpole (process) - ((~Troot basic :offset-assert 112) - (~Tdir vector :inline :offset-assert 128) - (~Trange float :offset-assert 144) ;; meters - (~Tedge-length float :offset-assert 148) ;; meters + ((root basic :offset-assert 112) + (dir vector :inline :offset-assert 128) + (range float :offset-assert 144) ;; meters + (edge-length float :offset-assert 148) ;; meters ) :heap-base #x30 :method-count-assert 14 @@ -9646,7 +9652,7 @@ (dummy-12 (_type_ float) float 12) (dummy-13 (_type_) float 13) (dummy-14 (_type_ uint float float float) int 14) ;; 3 arg for parent 5 for child - (dummy-15 (_type_) float 15) ;; wip + (dummy-15 (_type_ process) float 15) ;; wip (dummy-16 (_type_ float) float 16) (dummy-17 (_type_) float 17) ) @@ -9669,7 +9675,7 @@ (dummy-12 (_type_ float) float 12) (dummy-13 (_type_) float 13) (dummy-14 (_type_ uint float float float) int 14) - (dummy-15 (_type_) float 15) ;; wip + (dummy-15 (_type_ process) float 15) ;; wip ;; (dummy-16 () none 16) ;; (dummy-17 () none 17) ) @@ -9689,7 +9695,7 @@ (dummy-12 (_type_ float) float 12) (dummy-13 (_type_) float 13) (dummy-14 (_type_ uint float float float) int 14) - (dummy-15 (_type_) float 15) ;; wip + (dummy-15 (_type_ process) float 15) ;; wip ;; (dummy-16 () none 16) ;; (dummy-17 () none 17) ) @@ -10092,8 +10098,7 @@ ((used-size uint32 :offset-assert 4) (max-size uint32 :offset-assert 8) (id uint64 :offset-assert 16) - (pad uint8 8) ;; added - (data uint8 40960 :offset-assert 32) + (data uint8 #xa000 :offset 32) ) :method-count-assert 12 :size-assert #xa020 @@ -10360,6 +10365,13 @@ ) ) +(defenum collide-list-enum + (hit-by-player) + (usually-hit-by-player) + (hit-by-others) + (player) + ) + (deftype collide-shape (trsqv) ((process basic :offset-assert 140) (max-iteration-count uint8 :offset-assert 144) @@ -10377,7 +10389,7 @@ :size-assert #xb8 :flag-assert #x38000000b8 (:methods - (new (symbol type process int) _type_) + (new (symbol type process collide-list-enum) _type_) (dummy-26 () none 26) (dummy-28 () none 28) (dummy-29 () none 29) @@ -13602,61 +13614,61 @@ ) (deftype progress (process) - ((~Tcurrent-debug-string int32 :offset-assert 112) - (~Tcurrent-debug-language int32 :offset-assert 116) - (~Tcurrent-debug-group int32 :offset-assert 120) - (~Tin-out-position int32 :offset-assert 124) - (~Tdisplay-state uint64 :offset-assert 128) - (~Tnext-display-state uint64 :offset-assert 136) - (~Toption-index int32 :offset-assert 144) - (~Tselected-option basic :offset-assert 148) - (~Tcompletion-percentage float :offset-assert 152) - (~Tready-to-run basic :offset-assert 156) - (~Tdisplay-level-index int32 :offset-assert 160) - (~Tnext-level-index int32 :offset-assert 164) - (~Ttask-index int32 :offset-assert 168) - (~Tin-transition basic :offset-assert 172) - (~Tlast-in-transition basic :offset-assert 176) - (~Tforce-transition basic :offset-assert 180) - (~Tstat-transition basic :offset-assert 184) - (~Tlevel-transition int32 :offset-assert 188) - (~Tlanguage-selection uint64 :offset-assert 192) - (~Tlanguage-direction basic :offset-assert 200) - (~Tlanguage-transition basic :offset-assert 204) - (~Tlanguage-x-offset int32 :offset-assert 208) - (~Tsides-x-scale float :offset-assert 212) - (~Tsides-y-scale float :offset-assert 216) - (~Tleft-x-offset int32 :offset-assert 220) - (~Tright-x-offset int32 :offset-assert 224) - (~Tbutton-scale float :offset-assert 228) - (~Tslot-scale float :offset-assert 232) - (~Tleft-side-x-scale float :offset-assert 236) - (~Tleft-side-y-scale float :offset-assert 240) - (~Tright-side-x-scale float :offset-assert 244) - (~Tright-side-y-scale float :offset-assert 248) - (~Tsmall-orb-y-offset int32 :offset-assert 252) - (~Tbig-orb-y-offset int32 :offset-assert 256) - (~Ttransition-offset int32 :offset-assert 260) - (~Ttransition-offset-invert int32 :offset-assert 264) - (~Ttransition-percentage float :offset-assert 268) - (~Ttransition-percentage-invert float :offset-assert 272) - (~Ttransition-speed float :offset-assert 276) - (~Ttotal-nb-of-power-cells int32 :offset-assert 280) - (~Ttotal-nb-of-orbs int32 :offset-assert 284) - (~Ttotal-nb-of-buzzers int32 :offset-assert 288) - (~Tcard-info mc-slot-info :offset-assert 292) - (~Tlast-option-index-change uint64 :offset-assert 296) - (~Tvideo-mode-timeout uint64 :offset-assert 304) + ((current-debug-string int32 :offset-assert 112) + (current-debug-language int32 :offset-assert 116) + (current-debug-group int32 :offset-assert 120) + (in-out-position int32 :offset-assert 124) + (display-state uint64 :offset-assert 128) + (next-display-state uint64 :offset-assert 136) + (option-index int32 :offset-assert 144) + (selected-option basic :offset-assert 148) + (completion-percentage float :offset-assert 152) + (ready-to-run basic :offset-assert 156) + (display-level-index int32 :offset-assert 160) + (next-level-index int32 :offset-assert 164) + (task-index int32 :offset-assert 168) + (in-transition basic :offset-assert 172) + (last-in-transition basic :offset-assert 176) + (force-transition basic :offset-assert 180) + (stat-transition basic :offset-assert 184) + (level-transition int32 :offset-assert 188) + (language-selection uint64 :offset-assert 192) + (language-direction basic :offset-assert 200) + (language-transition basic :offset-assert 204) + (language-x-offset int32 :offset-assert 208) + (sides-x-scale float :offset-assert 212) + (sides-y-scale float :offset-assert 216) + (left-x-offset int32 :offset-assert 220) + (right-x-offset int32 :offset-assert 224) + (button-scale float :offset-assert 228) + (slot-scale float :offset-assert 232) + (left-side-x-scale float :offset-assert 236) + (left-side-y-scale float :offset-assert 240) + (right-side-x-scale float :offset-assert 244) + (right-side-y-scale float :offset-assert 248) + (small-orb-y-offset int32 :offset-assert 252) + (big-orb-y-offset int32 :offset-assert 256) + (transition-offset int32 :offset-assert 260) + (transition-offset-invert int32 :offset-assert 264) + (transition-percentage float :offset-assert 268) + (transition-percentage-invert float :offset-assert 272) + (transition-speed float :offset-assert 276) + (total-nb-of-power-cells int32 :offset-assert 280) + (total-nb-of-orbs int32 :offset-assert 284) + (total-nb-of-buzzers int32 :offset-assert 288) + (card-info mc-slot-info :offset-assert 292) + (last-option-index-change uint64 :offset-assert 296) + (video-mode-timeout uint64 :offset-assert 304) (pad uint8 :offset 731) - ; (~Tdisplay-state-stack UNKNOWN 5 :offset-assert 312) - ; (~Toption-index-stack UNKNOWN 5 :offset-assert 352) - ; (~Tdisplay-state-pos int32 :offset-assert 372) - ; (~Tnb-of-icons int32 :offset-assert 376) - ; (~Ticons UNKNOWN 6 :offset-assert 380) - ; (~Tmax-nb-of-particles int32 :offset-assert 404) - ; (~Tnb-of-particles int32 :offset-assert 408) - ; (~Tparticles UNKNOWN 40 :offset-assert 412) - ; (~Tparticle-state UNKNOWN 40 :offset-assert 572) + ; (display-state-stack UNKNOWN 5 :offset-assert 312) + ; (option-index-stack UNKNOWN 5 :offset-assert 352) + ; (display-state-pos int32 :offset-assert 372) + ; (nb-of-icons int32 :offset-assert 376) + ; (icons UNKNOWN 6 :offset-assert 380) + ; (max-nb-of-particles int32 :offset-assert 404) + ; (nb-of-particles int32 :offset-assert 408) + ; (particles UNKNOWN 40 :offset-assert 412) + ; (particle-state UNKNOWN 40 :offset-assert 572) ) :method-count-assert 59 :size-assert #x2dc @@ -16100,17 +16112,17 @@ ; ) (deftype auto-save (process) - ((~Tcard int32 :offset-assert 112) - (~Tslot int32 :offset-assert 116) - (~Twhich int32 :offset-assert 120) - (~Tbuffer kheap :offset-assert 124) - (~Tmode basic :offset-assert 128) - (~Tresult uint32 :offset-assert 132) - (~Tsave basic :offset-assert 136) - (~Tinfo mc-slot-info :inline :offset-assert 140) - (~Tnotify uint64 :offset-assert 440) - (~Tstate-time uint64 :offset-assert 448) - (~Tpart basic :offset-assert 456) + ((card int32 :offset-assert 112) + (slot int32 :offset-assert 116) + (which int32 :offset-assert 120) + (buffer kheap :offset-assert 124) + (mode basic :offset-assert 128) + (result uint32 :offset-assert 132) + (save basic :offset-assert 136) + (info mc-slot-info :inline :offset-assert 140) + (notify uint64 :offset-assert 440) + (state-time uint64 :offset-assert 448) + (part basic :offset-assert 456) ) :heap-base #x160 :method-count-assert 23 @@ -17385,7 +17397,7 @@ ) (deftype list-keeper (process) - ((~Tdummy float :offset-assert 112) + ((dummy float :offset-assert 112) ) :heap-base #x10 :method-count-assert 14 @@ -18267,9 +18279,9 @@ ; ) ; (deftype med-res-level (process-drawable) -; ((~Tlevel basic :offset-assert 176) -; (~Tpart-mode basic :offset-assert 180) -; (~Tindex int32 :offset-assert 184) +; ((level basic :offset-assert 176) +; (part-mode basic :offset-assert 180) +; (index int32 :offset-assert 184) ; ) ; :method-count-assert 20 ; :size-assert #xbc @@ -18291,12 +18303,12 @@ ; ) ; (deftype launcher (process-drawable) -; ((~Tspring-height meters :offset-assert 176) -; (~Tcamera basic :offset-assert 180) -; (~Tactive-distance float :offset-assert 184) -; (~Tseek-time uint64 :offset-assert 192) -; (~Tdest vector :inline :offset-assert 208) -; (~Tsound-id uint32 :offset-assert 224) +; ((spring-height meters :offset-assert 176) +; (camera basic :offset-assert 180) +; (active-distance float :offset-assert 184) +; (seek-time uint64 :offset-assert 192) +; (dest vector :inline :offset-assert 208) +; (sound-id uint32 :offset-assert 224) ; ) ; :method-count-assert 20 ; :size-assert #xe4 @@ -18633,11 +18645,11 @@ ; ) ; (deftype voicebox (process-drawable) -; ((~Tbase-trans vector :inline :offset-assert 176) -; (~Tseeker cam-float-seeker :inline :offset-assert 192) -; (~Tblend float :offset-assert 216) -; (~Ttwist float :offset-assert 220) -; (~Thint uint64 :offset-assert 224) +; ((base-trans vector :inline :offset-assert 176) +; (seeker cam-float-seeker :inline :offset-assert 192) +; (blend float :offset-assert 216) +; (twist float :offset-assert 220) +; (hint uint64 :offset-assert 224) ; ) ; :method-count-assert 23 ; :size-assert #xe8 @@ -19781,14 +19793,14 @@ ; ) ; (deftype crate (process-drawable) -; ((~Tsmush smush-control :inline :offset-assert 176) -; (~Tbase vector :inline :offset-assert 208) -; (~Tlook basic :offset-assert 224) -; (~Tdefense basic :offset-assert 228) -; (~Tincomming-attack-id uint64 :offset-assert 232) -; (~Ttarget uint64 :offset-assert 240) -; (~Tchild-count int32 :offset-assert 248) -; (~Tvictory-anim basic :offset-assert 252) +; ((smush smush-control :inline :offset-assert 176) +; (base vector :inline :offset-assert 208) +; (look basic :offset-assert 224) +; (defense basic :offset-assert 228) +; (incomming-attack-id uint64 :offset-assert 232) +; (target uint64 :offset-assert 240) +; (child-count int32 :offset-assert 248) +; (victory-anim basic :offset-assert 252) ; ) ; :method-count-assert 30 ; :size-assert #x100 @@ -19913,7 +19925,7 @@ ; ) ; (deftype pickup-spawner (crate) -; ((~Tblocker basic :offset-assert 256) +; ((blocker basic :offset-assert 256) ; ) ; :method-count-assert 30 ; :size-assert #x104 @@ -20019,7 +20031,7 @@ ; ) ; (deftype hud-health (hud) -; ((~Tscale float :offset-assert 280) +; ((scale float :offset-assert 280) ; ) ; :method-count-assert 27 ; :size-assert #x11c @@ -20048,12 +20060,12 @@ ; ) ; (deftype hud-money-all (hud) -; ((~Tx-scale float :offset-assert 280) -; (~Ty-scale float :offset-assert 284) -; (~Ty-pos int32 :offset-assert 288) -; (~Ttotal-orbs int32 :offset-assert 292) -; (~Tlevel-index int32 :offset-assert 296) -; (~Tstart-time uint64 :offset-assert 304) +; ((x-scale float :offset-assert 280) +; (y-scale float :offset-assert 284) +; (y-pos int32 :offset-assert 288) +; (total-orbs int32 :offset-assert 292) +; (level-index int32 :offset-assert 296) +; (start-time uint64 :offset-assert 304) ; ) ; :method-count-assert 27 ; :size-assert #x138 @@ -20082,9 +20094,9 @@ ; ) ; (deftype hud-money (hud) -; ((~Tx-scale float :offset-assert 280) -; (~Ty-scale float :offset-assert 284) -; (~Ty-pos int32 :offset-assert 288) +; ((x-scale float :offset-assert 280) +; (y-scale float :offset-assert 284) +; (y-pos int32 :offset-assert 288) ; ) ; :method-count-assert 27 ; :size-assert #x124 @@ -20113,13 +20125,13 @@ ; ) ; (deftype hud-fuel-cell (hud) -; ((~Tscale-starburst-3-x float :offset-assert 280) -; (~Tscale-starburst-3-y float :offset-assert 284) -; (~Tscale-starburst-4-x float :offset-assert 288) -; (~Tscale-starburst-4-y float :offset-assert 292) -; (~Tscale-icon float :offset-assert 296) -; (~Tscale-center float :offset-assert 300) -; (~Ticon-pos-y int32 :offset-assert 304) +; ((scale-starburst-3-x float :offset-assert 280) +; (scale-starburst-3-y float :offset-assert 284) +; (scale-starburst-4-x float :offset-assert 288) +; (scale-starburst-4-y float :offset-assert 292) +; (scale-icon float :offset-assert 296) +; (scale-center float :offset-assert 300) +; (icon-pos-y int32 :offset-assert 304) ; ) ; :method-count-assert 27 ; :size-assert #x134 @@ -20148,8 +20160,8 @@ ; ) ; (deftype hud-buzzers (hud) -; ((~Tscale float :offset-assert 280) -; (~Ttext-y-offset int32 :offset-assert 284) +; ((scale float :offset-assert 280) +; (text-y-offset int32 :offset-assert 284) ; ) ; :method-count-assert 27 ; :size-assert #x120 @@ -20178,9 +20190,9 @@ ; ) ; (deftype hud-power (hud) -; ((~Tscale-timer float :offset-assert 280) -; (~Tscale-backing float :offset-assert 284) -; (~Tscale-blue float :offset-assert 288) +; ((scale-timer float :offset-assert 280) +; (scale-backing float :offset-assert 284) +; (scale-blue float :offset-assert 288) ; ) ; :method-count-assert 27 ; :size-assert #x124 @@ -20771,7 +20783,7 @@ ;; - Types ; (deftype viewer (process-drawable) -; ((~Tjanim basic :offset-assert 176) +; ((janim basic :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -21304,8 +21316,8 @@ ;; - Types ; (deftype water-anim (water-vol) -; ((~Tlook int32 :offset-assert 212) -; (~Tplay-ambient-sound? basic :offset-assert 216) +; ((look int32 :offset-assert 212) +; (play-ambient-sound? basic :offset-assert 216) ; ) ; :method-count-assert 30 ; :size-assert #xdc @@ -21500,20 +21512,20 @@ ; ) ; (deftype rigid-body-platform (process-drawable) -; ((~Tinfo rigid-body-platform-constants :offset-assert 176) -; (~Trbody rigid-body :inline :offset-assert 192) -; (~Tcontrol-point-array basic :offset-assert 616) -; (~Tplayer-velocity vector :inline :offset-assert 624) -; (~Tplayer-velocity-prev vector :inline :offset-assert 640) -; (~Tplayer-force-position vector :inline :offset-assert 656) -; (~Tplayer-force vector :inline :offset-assert 672) -; (~Tsim-time-remaining float :offset-assert 688) -; (~Tfloat-height-offset float :offset-assert 692) -; (~Tplayer-attack-id int32 :offset-assert 696) -; (~Tplayer-bonk-timeout uint64 :offset-assert 704) -; (~Twater-anim basic :offset-assert 712) -; (~Tplayer-contact basic :offset-assert 716) -; (~Tplayer-impulse basic :offset-assert 720) +; ((info rigid-body-platform-constants :offset-assert 176) +; (rbody rigid-body :inline :offset-assert 192) +; (control-point-array basic :offset-assert 616) +; (player-velocity vector :inline :offset-assert 624) +; (player-velocity-prev vector :inline :offset-assert 640) +; (player-force-position vector :inline :offset-assert 656) +; (player-force vector :inline :offset-assert 672) +; (sim-time-remaining float :offset-assert 688) +; (float-height-offset float :offset-assert 692) +; (player-attack-id int32 :offset-assert 696) +; (player-bonk-timeout uint64 :offset-assert 704) +; (water-anim basic :offset-assert 712) +; (player-contact basic :offset-assert 716) +; (player-impulse basic :offset-assert 720) ; ) ; :method-count-assert 35 ; :size-assert #x2d4 @@ -21628,30 +21640,30 @@ ; ) ; (deftype nav-enemy (process-drawable) -; ((~Thit-from-dir vector :inline :offset-assert 176) -; (~Tevent-param-point vector :inline :offset-assert 192) -; (~Tfrustration-point vector :inline :offset-assert 208) -; (~Tjump-dest vector :inline :offset-assert 224) -; (~Tjump-trajectory trajectory :inline :offset-assert 240) -; (~Tjump-time uint64 :offset-assert 280) -; (~Tnav-info basic :offset-assert 288) -; (~Ttarget-speed float :offset-assert 292) -; (~Tmomentum-speed float :offset-assert 296) -; (~Tacceleration float :offset-assert 300) -; (~Trotate-speed float :offset-assert 304) -; (~Tturn-time uint64 :offset-assert 312) -; (~Tfrustration-time uint64 :offset-assert 320) -; (~Tspeed-scale float :offset-assert 328) -; (~Tneck basic :offset-assert 332) -; (~Treaction-time uint64 :offset-assert 336) -; (~Tnotice-time uint64 :offset-assert 344) -; (~Tstate-timeout uint64 :offset-assert 352) -; (~Tfree-time uint64 :offset-assert 360) -; (~Ttouch-time uint64 :offset-assert 368) -; (~Tnav-enemy-flags uint32 :offset-assert 376) -; (~Tincomming-attack-id uint64 :offset-assert 384) -; (~Tjump-return-state basic :offset-assert 392) -; (~Trand-gen basic :offset-assert 396) +; ((hit-from-dir vector :inline :offset-assert 176) +; (event-param-point vector :inline :offset-assert 192) +; (frustration-point vector :inline :offset-assert 208) +; (jump-dest vector :inline :offset-assert 224) +; (jump-trajectory trajectory :inline :offset-assert 240) +; (jump-time uint64 :offset-assert 280) +; (nav-info basic :offset-assert 288) +; (target-speed float :offset-assert 292) +; (momentum-speed float :offset-assert 296) +; (acceleration float :offset-assert 300) +; (rotate-speed float :offset-assert 304) +; (turn-time uint64 :offset-assert 312) +; (frustration-time uint64 :offset-assert 320) +; (speed-scale float :offset-assert 328) +; (neck basic :offset-assert 332) +; (reaction-time uint64 :offset-assert 336) +; (notice-time uint64 :offset-assert 344) +; (state-timeout uint64 :offset-assert 352) +; (free-time uint64 :offset-assert 360) +; (touch-time uint64 :offset-assert 368) +; (nav-enemy-flags uint32 :offset-assert 376) +; (incomming-attack-id uint64 :offset-assert 384) +; (jump-return-state basic :offset-assert 392) +; (rand-gen basic :offset-assert 396) ; ) ; :method-count-assert 76 ; :size-assert #x190 @@ -21800,9 +21812,9 @@ ;; - Types ; (deftype baseplat (process-drawable) -; ((~Tsmush smush-control :inline :offset-assert 176) -; (~Tbasetrans vector :inline :offset-assert 208) -; (~Tbouncing basic :offset-assert 224) +; ((smush smush-control :inline :offset-assert 176) +; (basetrans vector :inline :offset-assert 208) +; (bouncing basic :offset-assert 224) ; ) ; :method-count-assert 27 ; :size-assert #xe4 @@ -21831,17 +21843,17 @@ ; ) ; (deftype eco-door (process-drawable) -; ((~Tspeed float :offset-assert 176) -; (~Topen-distance float :offset-assert 180) -; (~Tclose-distance float :offset-assert 184) -; (~Tout-dir vector :inline :offset-assert 192) -; (~Topen-sound uint128 :offset-assert 208) -; (~Tclose-sound uint128 :offset-assert 224) -; (~Tstate-actor basic :offset-assert 240) -; (~Tflags int32 :offset-assert 244) -; (~Tlocked basic :offset-assert 248) -; (~Tauto-close basic :offset-assert 252) -; (~Tone-way basic :offset-assert 256) +; ((speed float :offset-assert 176) +; (open-distance float :offset-assert 180) +; (close-distance float :offset-assert 184) +; (out-dir vector :inline :offset-assert 192) +; (open-sound uint128 :offset-assert 208) +; (close-sound uint128 :offset-assert 224) +; (state-actor basic :offset-assert 240) +; (flags int32 :offset-assert 244) +; (locked basic :offset-assert 248) +; (auto-close basic :offset-assert 252) +; (one-way basic :offset-assert 256) ; ) ; :method-count-assert 27 ; :size-assert #x104 @@ -21888,19 +21900,19 @@ ;; - Types ; (deftype basebutton (process-drawable) -; ((~Tdown? basic :offset-assert 176) -; (~Tspawned-by-other? basic :offset-assert 180) -; (~Tmove-to? basic :offset-assert 184) -; (~Tnotify-actor basic :offset-assert 188) -; (~Ttimeout float :offset-assert 192) -; (~Tbutton-id int32 :offset-assert 196) -; (~Tevent-going-down basic :offset-assert 200) -; (~Tevent-down basic :offset-assert 204) -; (~Tevent-going-up basic :offset-assert 208) -; (~Tevent-up basic :offset-assert 212) -; (~Tanim-speed float :offset-assert 216) -; (~Tmove-to-pos vector :inline :offset-assert 224) -; (~Tmove-to-quat quaternion :inline :offset-assert 240) +; ((down? basic :offset-assert 176) +; (spawned-by-other? basic :offset-assert 180) +; (move-to? basic :offset-assert 184) +; (notify-actor basic :offset-assert 188) +; (timeout float :offset-assert 192) +; (button-id int32 :offset-assert 196) +; (event-going-down basic :offset-assert 200) +; (event-down basic :offset-assert 204) +; (event-going-up basic :offset-assert 208) +; (event-up basic :offset-assert 212) +; (anim-speed float :offset-assert 216) +; (move-to-pos vector :inline :offset-assert 224) +; (move-to-quat quaternion :inline :offset-assert 240) ; ) ; :method-count-assert 32 ; :size-assert #x100 @@ -21934,10 +21946,10 @@ ; ) ; (deftype warp-gate (process-drawable) -; ((~Tlevel basic :offset-assert 176) -; (~Tlevel-slot int32 :offset-assert 180) -; (~Tmin-slot int32 :offset-assert 184) -; (~Tmax-slot int32 :offset-assert 188) +; ((level basic :offset-assert 176) +; (level-slot int32 :offset-assert 180) +; (min-slot int32 :offset-assert 184) +; (max-slot int32 :offset-assert 188) ; ) ; :method-count-assert 24 ; :size-assert #xc0 @@ -22081,14 +22093,14 @@ ; ) ; (deftype joint-exploder (process-drawable) -; ((~Tdie-if-below-y float :offset-assert 176) -; (~Tdie-if-beyond-xz-dist-sqrd float :offset-assert 180) -; (~Tjoints basic :offset-assert 184) -; (~Tstatic-params basic :offset-assert 188) -; (~Tanim basic :offset-assert 192) -; (~Tscale-vector vector :inline :offset-assert 208) -; (~Ttuning joint-exploder-tuning :inline :offset-assert 224) -; (~Tlists UNKNOWN 5 :offset-assert 288) +; ((die-if-below-y float :offset-assert 176) +; (die-if-beyond-xz-dist-sqrd float :offset-assert 180) +; (joints basic :offset-assert 184) +; (static-params basic :offset-assert 188) +; (anim basic :offset-assert 192) +; (scale-vector vector :inline :offset-assert 208) +; (tuning joint-exploder-tuning :inline :offset-assert 224) +; (lists UNKNOWN 5 :offset-assert 288) ; ) ; :method-count-assert 29 ; :size-assert #x210 @@ -22230,21 +22242,21 @@ ;; - Types ; (deftype sharkey (nav-enemy) -; ((~Tdir vector :inline :offset-assert 400) -; (~Tspawn-point vector :inline :offset-assert 416) -; (~Tscale float :offset-assert 432) -; (~Tanim-speed float :offset-assert 436) -; (~Ty-max meters :offset-assert 440) -; (~Ty-min meters :offset-assert 444) -; (~Tattack-time float :offset-assert 448) -; (~Tplayer-water-time uint64 :offset-assert 456) -; (~Tplayer-in-water basic :offset-assert 464) -; (~Tlast-y float :offset-assert 468) -; (~Tspawn-distance meters :offset-assert 472) -; (~Tchase-speed meters :offset-assert 476) -; (~Ty-speed meters :offset-assert 480) -; (~Tsound-id uint32 :offset-assert 484) -; (~Tenable-patrol basic :offset-assert 488) +; ((dir vector :inline :offset-assert 400) +; (spawn-point vector :inline :offset-assert 416) +; (scale float :offset-assert 432) +; (anim-speed float :offset-assert 436) +; (y-max meters :offset-assert 440) +; (y-min meters :offset-assert 444) +; (attack-time float :offset-assert 448) +; (player-water-time uint64 :offset-assert 456) +; (player-in-water basic :offset-assert 464) +; (last-y float :offset-assert 468) +; (spawn-distance meters :offset-assert 472) +; (chase-speed meters :offset-assert 476) +; (y-speed meters :offset-assert 480) +; (sound-id uint32 :offset-assert 484) +; (enable-patrol basic :offset-assert 488) ; ) ; :method-count-assert 76 ; :size-assert #x1ec @@ -22345,15 +22357,15 @@ ;; - Types ; (deftype orb-cache-top (baseplat) -; ((~Tactive-distance float :offset-assert 228) -; (~Tinactive-distance float :offset-assert 232) -; (~Tmoney-list UNKNOWN 60 :offset-assert 240) -; (~Tmoney-pos-list UNKNOWN 60 :offset-assert 720) -; (~Tmoney-pos-actual UNKNOWN 60 :offset-assert 960) -; (~Tplatform-pos float :offset-assert 1200) -; (~Troot-pos float :offset-assert 1204) -; (~Tmoney int32 :offset-assert 1208) -; (~Tactivated basic :offset-assert 1212) +; ((active-distance float :offset-assert 228) +; (inactive-distance float :offset-assert 232) +; (money-list UNKNOWN 60 :offset-assert 240) +; (money-pos-list UNKNOWN 60 :offset-assert 720) +; (money-pos-actual UNKNOWN 60 :offset-assert 960) +; (platform-pos float :offset-assert 1200) +; (root-pos float :offset-assert 1204) +; (money int32 :offset-assert 1208) +; (activated basic :offset-assert 1212) ; ) ; :method-count-assert 29 ; :size-assert #x4c0 @@ -22401,9 +22413,9 @@ ;; - Types ; (deftype plat (baseplat) -; ((~Tpath-pos float :offset-assert 228) -; (~Tsync sync-info-eased :inline :offset-assert 232) -; (~Tsound-id uint32 :offset-assert 260) +; ((path-pos float :offset-assert 228) +; (sync sync-info-eased :inline :offset-assert 232) +; (sound-id uint32 :offset-assert 260) ; ) ; :method-count-assert 33 ; :size-assert #x108 @@ -22454,15 +22466,15 @@ ;; - Types ; (deftype plat-button (process-drawable) -; ((~Tgo-back-if-lost-player? basic :offset-assert 176) -; (~Tgrab-player? basic :offset-assert 180) -; (~Tshould-grab-player? basic :offset-assert 184) -; (~Tpath-pos float :offset-assert 188) -; (~Tbidirectional? basic :offset-assert 192) -; (~Tallow-auto-kill basic :offset-assert 196) -; (~Tsound-id uint32 :offset-assert 200) -; (~Ttrans-off vector :inline :offset-assert 208) -; (~Tspawn-pos vector :inline :offset-assert 224) +; ((go-back-if-lost-player? basic :offset-assert 176) +; (grab-player? basic :offset-assert 180) +; (should-grab-player? basic :offset-assert 184) +; (path-pos float :offset-assert 188) +; (bidirectional? basic :offset-assert 192) +; (allow-auto-kill basic :offset-assert 196) +; (sound-id uint32 :offset-assert 200) +; (trans-off vector :inline :offset-assert 208) +; (spawn-pos vector :inline :offset-assert 224) ; ) ; :method-count-assert 33 ; :size-assert #xf0 @@ -22516,13 +22528,13 @@ ;; - Types ; (deftype plat-eco (plat) -; ((~Tnotice-dist float :offset-assert 264) -; (~Tsync-offset-dest float :offset-assert 268) -; (~Tsync-offset-faux float :offset-assert 272) -; (~Tsync-linear-val float :offset-assert 276) -; (~Ttarget uint64 :offset-assert 280) -; (~Tunlit-look lod-set :inline :offset-assert 288) -; (~Tlit-look lod-set :inline :offset-assert 324) +; ((notice-dist float :offset-assert 264) +; (sync-offset-dest float :offset-assert 268) +; (sync-offset-faux float :offset-assert 272) +; (sync-linear-val float :offset-assert 276) +; (target uint64 :offset-assert 280) +; (unlit-look lod-set :inline :offset-assert 288) +; (lit-look lod-set :inline :offset-assert 324) ; ) ; :method-count-assert 33 ; :size-assert #x165 @@ -22608,19 +22620,19 @@ ; ) ; (deftype ropebridge (process-drawable) -; ((~Tsubtype uint64 :offset-assert 176) -; (~Tsubtype-name basic :offset-assert 184) -; (~Tagitated-time-stamp uint64 :offset-assert 192) -; (~Tbonk-time-stamp uint64 :offset-assert 200) -; (~Tattack-flop-time-stamp uint64 :offset-assert 208) -; (~Tplayer-attack-id uint64 :offset-assert 216) -; (~Tsleep-dist float :offset-assert 224) -; (~Tdo-physics? basic :offset-assert 228) -; (~Ttuning ropebridge-tuning :offset-assert 232) -; (~Tworld-matrix matrix :inline :offset-assert 240) -; (~Tinv-world-matrix matrix :inline :offset-assert 304) -; (~Textra-trans vector :inline :offset-assert 368) -; (~Tspring-point UNKNOWN 36 :offset-assert 384) +; ((subtype uint64 :offset-assert 176) +; (subtype-name basic :offset-assert 184) +; (agitated-time-stamp uint64 :offset-assert 192) +; (bonk-time-stamp uint64 :offset-assert 200) +; (attack-flop-time-stamp uint64 :offset-assert 208) +; (player-attack-id uint64 :offset-assert 216) +; (sleep-dist float :offset-assert 224) +; (do-physics? basic :offset-assert 228) +; (tuning ropebridge-tuning :offset-assert 232) +; (world-matrix matrix :inline :offset-assert 240) +; (inv-world-matrix matrix :inline :offset-assert 304) +; (extra-trans vector :inline :offset-assert 368) +; (spring-point UNKNOWN 36 :offset-assert 384) ; ) ; :method-count-assert 29 ; :size-assert #x840 @@ -22718,13 +22730,13 @@ ; ) ; (deftype mistycannon-missile (process-drawable) -; ((~Tmuzzle-time float :offset-assert 176) -; (~Ttumble-quat quaternion :inline :offset-assert 192) -; (~Tblast-radius float :offset-assert 208) -; (~Twater-height float :offset-assert 212) -; (~Tsfx uint32 :offset-assert 216) -; (~Tpart2 basic :offset-assert 220) -; (~Tground-time uint64 :offset-assert 224) +; ((muzzle-time float :offset-assert 176) +; (tumble-quat quaternion :inline :offset-assert 192) +; (blast-radius float :offset-assert 208) +; (water-height float :offset-assert 212) +; (sfx uint32 :offset-assert 216) +; (part2 basic :offset-assert 220) +; (ground-time uint64 :offset-assert 224) ; ) ; :method-count-assert 21 ; :size-assert #xe8 @@ -22760,24 +22772,24 @@ ; ) ; (deftype mistycannon (process-drawable) -; ((~Trotate angle-tracker :inline :offset-assert 176) -; (~Ttilt angle-tracker :inline :offset-assert 192) -; (~Tfront-wheel float :offset-assert 208) -; (~Trear-wheel float :offset-assert 212) -; (~Tlast-known-rotation float :offset-assert 216) -; (~Tpart-timer uint64 :offset-assert 224) -; (~Thellmouth vector :inline :offset-assert 240) -; (~Tpostbindinfo-ok basic :offset-assert 256) -; (~Tlaunch-origin vector :inline :offset-assert 272) -; (~Tgoggles vector :inline :offset-assert 288) -; (~Tavoid-entity basic :offset-assert 304) -; (~Tcenter-point vector :inline :offset-assert 320) -; (~Tat-point vector :inline :offset-assert 336) -; (~Taccuracy-range float :offset-assert 352) -; (~Ttarget-theta float :offset-assert 356) -; (~Tsound-id uint32 :offset-assert 360) -; (~Taim-sound-id uint32 :offset-assert 364) -; (~Tplayer-touching-grips? basic :offset-assert 368) +; ((rotate angle-tracker :inline :offset-assert 176) +; (tilt angle-tracker :inline :offset-assert 192) +; (front-wheel float :offset-assert 208) +; (rear-wheel float :offset-assert 212) +; (last-known-rotation float :offset-assert 216) +; (part-timer uint64 :offset-assert 224) +; (hellmouth vector :inline :offset-assert 240) +; (postbindinfo-ok basic :offset-assert 256) +; (launch-origin vector :inline :offset-assert 272) +; (goggles vector :inline :offset-assert 288) +; (avoid-entity basic :offset-assert 304) +; (center-point vector :inline :offset-assert 320) +; (at-point vector :inline :offset-assert 336) +; (accuracy-range float :offset-assert 352) +; (target-theta float :offset-assert 356) +; (sound-id uint32 :offset-assert 360) +; (aim-sound-id uint32 :offset-assert 364) +; (player-touching-grips? basic :offset-assert 368) ; ) ; :method-count-assert 24 ; :size-assert #x174 @@ -22868,8 +22880,8 @@ ;; - Types ; (deftype babak-with-cannon (babak) -; ((~Tcannon-ent basic :offset-assert 400) -; (~Tdistance float :offset-assert 404) +; ((cannon-ent basic :offset-assert 400) +; (distance float :offset-assert 404) ; ) ; :method-count-assert 76 ; :size-assert #x198 @@ -23088,7 +23100,7 @@ ;; - Types ; (deftype windmill-one (process-drawable) -; ((~Tsound-id uint32 :offset-assert 176) +; ((sound-id uint32 :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -23110,11 +23122,11 @@ ; ) ; (deftype grottopole (process-drawable) -; ((~Tspeed meters :offset-assert 176) -; (~Tdistance meters :offset-assert 180) -; (~Tposition int32 :offset-assert 184) -; (~Tmax-position int32 :offset-assert 188) -; (~Tincomming-attack-id uint64 :offset-assert 192) +; ((speed meters :offset-assert 176) +; (distance meters :offset-assert 180) +; (position int32 :offset-assert 184) +; (max-position int32 :offset-assert 188) +; (incomming-attack-id uint64 :offset-assert 192) ; ) ; :method-count-assert 20 ; :size-assert #xc8 @@ -23157,7 +23169,7 @@ ; ) ; (deftype flying-rock (process-drawable) -; ((~Ttumble quaternion :inline :offset-assert 176) +; ((tumble quaternion :inline :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xc0 @@ -23179,7 +23191,7 @@ ; ) ; (deftype bladeassm (process-drawable) -; ((~Tangle float :offset-assert 176) +; ((angle float :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -23201,16 +23213,16 @@ ; ) ; (deftype flutflutegg (process-drawable) -; ((~Tfall-dist meters :offset-assert 176) -; (~Tstart vector :inline :offset-assert 192) -; (~Tdir vector :inline :offset-assert 208) -; (~Tpos float :offset-assert 224) -; (~Tvel float :offset-assert 228) -; (~Twobbler basic :offset-assert 232) -; (~Tlast-impulse-time int32 :offset-assert 236) -; (~Tincomming-attack-id uint64 :offset-assert 240) -; (~Tambients-played int32 :offset-assert 248) -; (~Tambient ambient-control :inline :offset-assert 256) +; ((fall-dist meters :offset-assert 176) +; (start vector :inline :offset-assert 192) +; (dir vector :inline :offset-assert 208) +; (pos float :offset-assert 224) +; (vel float :offset-assert 228) +; (wobbler basic :offset-assert 232) +; (last-impulse-time int32 :offset-assert 236) +; (incomming-attack-id uint64 :offset-assert 240) +; (ambients-played int32 :offset-assert 248) +; (ambient ambient-control :inline :offset-assert 256) ; ) ; :method-count-assert 21 ; :size-assert #x110 @@ -23233,7 +23245,7 @@ ; ) ; (deftype harvester (process-drawable) -; ((~Talt-actor basic :offset-assert 176) +; ((alt-actor basic :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -23410,8 +23422,8 @@ ;; - Types ; (deftype bird-lady-beach (process-taskable) -; ((~Tflutflut uint64 :offset-assert 384) -; (~Tegg uint64 :offset-assert 392) +; ((flutflut uint64 :offset-assert 384) +; (egg uint64 :offset-assert 392) ; ) ; :method-count-assert 53 ; :size-assert #x190 @@ -23552,7 +23564,7 @@ ;; - Types ; (deftype sculptor (process-taskable) -; ((~Tmuse uint64 :offset-assert 384) +; ((muse uint64 :offset-assert 384) ; ) ; :method-count-assert 53 ; :size-assert #x188 @@ -23643,29 +23655,29 @@ ; ) ; (deftype pelican (process-drawable) -; ((~Tquery gui-query :inline :offset-assert 176) -; (~Tfuel-cell uint64 :offset-assert 208) -; (~Tcam-tracker uint64 :offset-assert 216) -; (~Tpath-data UNKNOWN 8 :offset-assert 224) -; (~Tpath-circle basic :offset-assert 224) -; (~Tpath-dive0 basic :offset-assert 228) -; (~Tpath-to-nest0 basic :offset-assert 232) -; (~Tpath-from-nest0 basic :offset-assert 236) -; (~Tpath-spit0 basic :offset-assert 240) -; (~Tpath-dive1 basic :offset-assert 244) -; (~Tpath-to-nest1 basic :offset-assert 248) -; (~Tpath-to-nest2 basic :offset-assert 252) -; (~Tpath-cache basic :offset-assert 256) -; (~Ttime-cache uint64 :offset-assert 264) -; (~Tpath-pos float :offset-assert 272) -; (~Tpath-speed float :offset-assert 276) -; (~Tpath-max float :offset-assert 280) -; (~Tpath-vector vector :inline :offset-assert 288) -; (~Tstate-vector vector :inline :offset-assert 304) -; (~Tstate-vector1 vector :inline :offset-assert 320) -; (~Tstate-float UNKNOWN 2 :offset-assert 336) -; (~Tstate-object basic :offset-assert 344) -; (~Tneck basic :offset-assert 348) +; ((query gui-query :inline :offset-assert 176) +; (fuel-cell uint64 :offset-assert 208) +; (cam-tracker uint64 :offset-assert 216) +; (path-data UNKNOWN 8 :offset-assert 224) +; (path-circle basic :offset-assert 224) +; (path-dive0 basic :offset-assert 228) +; (path-to-nest0 basic :offset-assert 232) +; (path-from-nest0 basic :offset-assert 236) +; (path-spit0 basic :offset-assert 240) +; (path-dive1 basic :offset-assert 244) +; (path-to-nest1 basic :offset-assert 248) +; (path-to-nest2 basic :offset-assert 252) +; (path-cache basic :offset-assert 256) +; (time-cache uint64 :offset-assert 264) +; (path-pos float :offset-assert 272) +; (path-speed float :offset-assert 276) +; (path-max float :offset-assert 280) +; (path-vector vector :inline :offset-assert 288) +; (state-vector vector :inline :offset-assert 304) +; (state-vector1 vector :inline :offset-assert 320) +; (state-float UNKNOWN 2 :offset-assert 336) +; (state-object basic :offset-assert 344) +; (neck basic :offset-assert 348) ; ) ; :method-count-assert 20 ; :size-assert #x160 @@ -23718,12 +23730,12 @@ ;; - Types ; (deftype lurkerworm (process-drawable) -; ((~Ttwister basic :offset-assert 176) -; (~Thead-tilt float :offset-assert 180) -; (~Tstrike-count int32 :offset-assert 184) -; (~Tangle float :offset-assert 188) -; (~Tvulnerable basic :offset-assert 192) -; (~Tpart2 basic :offset-assert 196) +; ((twister basic :offset-assert 176) +; (head-tilt float :offset-assert 180) +; (strike-count int32 :offset-assert 184) +; (angle float :offset-assert 188) +; (vulnerable basic :offset-assert 192) +; (part2 basic :offset-assert 196) ; ) ; :method-count-assert 22 ; :size-assert #xc8 @@ -23775,7 +23787,7 @@ ;; - Types ; (deftype lurkercrab (nav-enemy) -; ((~Torient basic :offset-assert 400) +; ((orient basic :offset-assert 400) ; ) ; :method-count-assert 76 ; :size-assert #x194 @@ -23966,11 +23978,11 @@ ;; - Types ; (deftype beach-rock (process-drawable) -; ((~Ttrigger basic :offset-assert 176) -; (~Tmovie-start uint64 :offset-assert 184) -; (~Tpart-falling basic :offset-assert 192) -; (~Tpart-landing basic :offset-assert 196) -; (~Tprev-frame float :offset-assert 200) +; ((trigger basic :offset-assert 176) +; (movie-start uint64 :offset-assert 184) +; (part-falling basic :offset-assert 192) +; (part-landing basic :offset-assert 196) +; (prev-frame float :offset-assert 200) ; ) ; :method-count-assert 24 ; :size-assert #xcc @@ -24035,19 +24047,19 @@ ;; - Types ; (deftype seagull (process-drawable) -; ((~Tindex int32 :offset-assert 176) -; (~Tflock uint32 :offset-assert 180) -; (~Theading float :offset-assert 184) -; (~Ttilt float :offset-assert 188) -; (~Tmax-tilt float :offset-assert 192) -; (~Tangletan float :offset-assert 196) -; (~Ttarget-dist float :offset-assert 200) -; (~Tscared int32 :offset-assert 204) -; (~Ttemp-heading float :offset-assert 208) -; (~Ttemp-heading-time int32 :offset-assert 212) -; (~Tpart-time uint64 :offset-assert 216) -; (~Tthrust float :offset-assert 224) -; (~Tteleport basic :offset-assert 228) +; ((index int32 :offset-assert 176) +; (flock uint32 :offset-assert 180) +; (heading float :offset-assert 184) +; (tilt float :offset-assert 188) +; (max-tilt float :offset-assert 192) +; (angletan float :offset-assert 196) +; (target-dist float :offset-assert 200) +; (scared int32 :offset-assert 204) +; (temp-heading float :offset-assert 208) +; (temp-heading-time int32 :offset-assert 212) +; (part-time uint64 :offset-assert 216) +; (thrust float :offset-assert 224) +; (teleport basic :offset-assert 228) ; ) ; :method-count-assert 28 ; :size-assert #xe8 @@ -24077,21 +24089,21 @@ ; ) ; (deftype seagullflock (process) -; ((~Tpath basic :offset-assert 112) -; (~Ttrans vector :inline :offset-assert 128) -; (~Tbird UNKNOWN 64 :offset-assert 144) -; (~Tbirds int32 :offset-assert 400) -; (~Tlink basic :offset-assert 404) -; (~Tbird-at-waterfall uint64 :offset-assert 408) -; (~Tbirds-at-waterfall int32 :offset-assert 416) -; (~Ttarget vector :inline :offset-assert 432) -; (~Ttargetnum int32 :offset-assert 448) -; (~Talert-time uint64 :offset-assert 456) -; (~Tteleport-frames int32 :offset-assert 464) -; (~Tcam-tracker uint64 :offset-assert 472) -; (~Tstate-time uint64 :offset-assert 480) -; (~Tsquall basic :offset-assert 488) -; (~Tmax-lift float :offset-assert 492) +; ((path basic :offset-assert 112) +; (trans vector :inline :offset-assert 128) +; (bird UNKNOWN 64 :offset-assert 144) +; (birds int32 :offset-assert 400) +; (link basic :offset-assert 404) +; (bird-at-waterfall uint64 :offset-assert 408) +; (birds-at-waterfall int32 :offset-assert 416) +; (target vector :inline :offset-assert 432) +; (targetnum int32 :offset-assert 448) +; (alert-time uint64 :offset-assert 456) +; (teleport-frames int32 :offset-assert 464) +; (cam-tracker uint64 :offset-assert 472) +; (state-time uint64 :offset-assert 480) +; (squall basic :offset-assert 488) +; (max-lift float :offset-assert 492) ; ) ; :method-count-assert 17 ; :size-assert #x1f0 @@ -24606,7 +24618,7 @@ ; ) ; (deftype warp-gate-switch (basebutton) -; ((~Twarp uint64 :offset-assert 256) +; ((warp uint64 :offset-assert 256) ; ) ; :method-count-assert 33 ; :size-assert #x108 @@ -24641,10 +24653,10 @@ ; ) ; (deftype village-cam (process) -; ((~Troot basic :offset-assert 112) -; (~Trange meters :offset-assert 116) -; (~Tindex int32 :offset-assert 120) -; (~Tstate-time uint64 :offset-assert 128) +; ((root basic :offset-assert 112) +; (range meters :offset-assert 116) +; (index int32 :offset-assert 120) +; (state-time uint64 :offset-assert 128) ; ) ; :method-count-assert 15 ; :size-assert #x88 @@ -24683,10 +24695,10 @@ ;; - Types ; (deftype oracle (process-taskable) -; ((~Tfirst-task uint8 :offset-assert 380) -; (~Tsecond-task uint8 :offset-assert 381) -; (~Tleft-eye-cell uint64 :offset-assert 384) -; (~Tright-eye-cell uint64 :offset-assert 392) +; ((first-task uint8 :offset-assert 380) +; (second-task uint8 :offset-assert 381) +; (left-eye-cell uint64 :offset-assert 384) +; (right-eye-cell uint64 :offset-assert 392) ; ) ; :method-count-assert 53 ; :size-assert #x190 @@ -24781,26 +24793,26 @@ ; ) ; (deftype battlecontroller (process-drawable) -; ((~Tfinal-pickup-spawn-point vector :inline :offset-assert 176) -; (~Tactivate-distance float :offset-assert 192) -; (~Tmax-spawn-count int16 :offset-assert 196) -; (~Tspawn-count int16 :offset-assert 198) -; (~Tdie-count int16 :offset-assert 200) -; (~Ttarget-count int8 :offset-assert 202) -; (~Tspawner-count int8 :offset-assert 203) -; (~Tcreature-type-count int8 :offset-assert 204) -; (~Tspawner-array UNKNOWN 8 :offset-assert 208) -; (~Tspawn-period uint64 :offset-assert 464) -; (~Tpath-spawn basic :offset-assert 472) -; (~Tcreature-type-array UNKNOWN 4 :offset-assert 476) -; (~Tfinal-pickup-type int32 :offset-assert 604) -; (~Tprespawn basic :offset-assert 608) -; (~Tnoticed-player basic :offset-assert 612) -; (~Tcamera-on basic :offset-assert 616) -; (~Tmisty-ambush-collision-hack basic :offset-assert 620) -; (~Tdisable-ocean basic :offset-assert 624) -; (~Tdisable-near-ocean basic :offset-assert 628) -; (~Tdisable-mid-ocean basic :offset-assert 632) +; ((final-pickup-spawn-point vector :inline :offset-assert 176) +; (activate-distance float :offset-assert 192) +; (max-spawn-count int16 :offset-assert 196) +; (spawn-count int16 :offset-assert 198) +; (die-count int16 :offset-assert 200) +; (target-count int8 :offset-assert 202) +; (spawner-count int8 :offset-assert 203) +; (creature-type-count int8 :offset-assert 204) +; (spawner-array UNKNOWN 8 :offset-assert 208) +; (spawn-period uint64 :offset-assert 464) +; (path-spawn basic :offset-assert 472) +; (creature-type-array UNKNOWN 4 :offset-assert 476) +; (final-pickup-type int32 :offset-assert 604) +; (prespawn basic :offset-assert 608) +; (noticed-player basic :offset-assert 612) +; (camera-on basic :offset-assert 616) +; (misty-ambush-collision-hack basic :offset-assert 620) +; (disable-ocean basic :offset-assert 624) +; (disable-near-ocean basic :offset-assert 628) +; (disable-mid-ocean basic :offset-assert 632) ; ) ; :method-count-assert 29 ; :size-assert #x27c @@ -24886,11 +24898,11 @@ ;; - Types ; (deftype citb-arm-section (process-drawable) -; ((~Tsync sync-info :inline :offset-assert 176) -; (~Tcull-dir-local vector :inline :offset-assert 192) -; (~Tcull-dot float :offset-assert 208) -; (~Trot-scale float :offset-assert 212) -; (~Ty-angle float :offset-assert 216) +; ((sync sync-info :inline :offset-assert 176) +; (cull-dir-local vector :inline :offset-assert 192) +; (cull-dot float :offset-assert 208) +; (rot-scale float :offset-assert 212) +; (y-angle float :offset-assert 216) ; ) ; :method-count-assert 23 ; :size-assert #xdc @@ -25107,8 +25119,8 @@ ; ) ; (deftype citb-disc (process-drawable) -; ((~Tsync sync-info :inline :offset-assert 176) -; (~Trot-scale float :offset-assert 184) +; ((sync sync-info :inline :offset-assert 176) +; (rot-scale float :offset-assert 184) ; ) ; :method-count-assert 22 ; :size-assert #xbc @@ -25285,7 +25297,7 @@ ; ) ; (deftype citb-launcher (plat) -; ((~Tlauncher uint32 :offset-assert 264) +; ((launcher uint32 :offset-assert 264) ; ) ; :method-count-assert 33 ; :size-assert #x10c @@ -25320,7 +25332,7 @@ ; ) ; (deftype citb-robotboss (process-drawable) -; ((~Tshield-on basic :offset-assert 176) +; ((shield-on basic :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -25342,7 +25354,7 @@ ; ) ; (deftype citb-coil (process-drawable) -; ((~Tpart-off basic :offset-assert 176) +; ((part-off basic :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -25426,14 +25438,14 @@ ; ) ; (deftype citb-generator (process-drawable) -; ((~Tnormal-look lod-set :inline :offset-assert 176) -; (~Tbroken-look lod-set :inline :offset-assert 212) -; (~Tmushroom-pos vector :inline :offset-assert 256) -; (~Tmushroom basic :offset-assert 272) -; (~Tbirth-fuel-cell basic :offset-assert 276) -; (~Ttrigger-others basic :offset-assert 280) -; (~Tpart-broken basic :offset-assert 284) -; (~Tpart-mushroom basic :offset-assert 288) +; ((normal-look lod-set :inline :offset-assert 176) +; (broken-look lod-set :inline :offset-assert 212) +; (mushroom-pos vector :inline :offset-assert 256) +; (mushroom basic :offset-assert 272) +; (birth-fuel-cell basic :offset-assert 276) +; (trigger-others basic :offset-assert 280) +; (part-broken basic :offset-assert 284) +; (part-mushroom basic :offset-assert 288) ; ) ; :method-count-assert 22 ; :size-assert #x124 @@ -25567,7 +25579,7 @@ ;; - Types ; (deftype citb-base-plat (process-drawable) -; ((~Tidle-distance float :offset-assert 176) +; ((idle-distance float :offset-assert 176) ; ) ; :method-count-assert 25 ; :size-assert #xb4 @@ -25628,7 +25640,7 @@ ; ) ; (deftype citb-plat (plat) -; ((~Ttrans-offset vector :inline :offset-assert 272) +; ((trans-offset vector :inline :offset-assert 272) ; ) ; :method-count-assert 33 ; :size-assert #x120 @@ -25663,10 +25675,10 @@ ; ) ; (deftype citb-stair-plat (citb-base-plat) -; ((~Tidle-height float :offset-assert 180) -; (~Trise-height float :offset-assert 184) -; (~Tdelay uint64 :offset-assert 192) -; (~Trise basic :offset-assert 200) +; ((idle-height float :offset-assert 180) +; (rise-height float :offset-assert 184) +; (delay uint64 :offset-assert 192) +; (rise basic :offset-assert 200) ; ) ; :method-count-assert 25 ; :size-assert #xcc @@ -25693,11 +25705,11 @@ ; ) ; (deftype citb-chain-plat (rigid-body-platform) -; ((~Torig-trans vector :inline :offset-assert 736) -; (~Torig-quat quaternion :inline :offset-assert 752) -; (~Tbeam-end vector :inline :offset-assert 768) -; (~Tfloat-offset float :offset-assert 784) -; (~Tidle-offset float :offset-assert 788) +; ((orig-trans vector :inline :offset-assert 736) +; (orig-quat quaternion :inline :offset-assert 752) +; (beam-end vector :inline :offset-assert 768) +; (float-offset float :offset-assert 784) +; (idle-offset float :offset-assert 788) ; ) ; :method-count-assert 35 ; :size-assert #x318 @@ -25760,7 +25772,7 @@ ; ) ; (deftype citb-donut (citb-base-plat) -; ((~Tsync sync-info :inline :offset-assert 180) +; ((sync sync-info :inline :offset-assert 180) ; ) ; :method-count-assert 25 ; :size-assert #xbc @@ -25821,10 +25833,10 @@ ; ) ; (deftype citb-firehose (process-drawable) -; ((~Tidle-distance float :offset-assert 176) -; (~Tsync sync-info :inline :offset-assert 180) -; (~Tlast-sync float :offset-assert 188) -; (~Tblast-pos vector :inline :offset-assert 192) +; ((idle-distance float :offset-assert 176) +; (sync sync-info :inline :offset-assert 180) +; (last-sync float :offset-assert 188) +; (blast-pos vector :inline :offset-assert 192) ; ) ; :method-count-assert 20 ; :size-assert #xd0 @@ -25846,9 +25858,9 @@ ; ) ; (deftype citb-exit-plat (plat-button) -; ((~Tidle-height float :offset-assert 240) -; (~Trise-height float :offset-assert 244) -; (~Tactivated basic :offset-assert 248) +; ((idle-height float :offset-assert 240) +; (rise-height float :offset-assert 244) +; (activated basic :offset-assert 248) ; ) ; :method-count-assert 33 ; :size-assert #xfc @@ -25917,10 +25929,10 @@ ;; - Types ; (deftype citb-sagecage (process-drawable) -; ((~Tbar-array UNKNOWN 12 :offset-assert 176) -; (~Tangle-offset float :offset-assert 368) -; (~Tbars-on basic :offset-assert 372) -; (~Tcloning basic :offset-assert 376) +; ((bar-array UNKNOWN 12 :offset-assert 176) +; (angle-offset float :offset-assert 368) +; (bars-on basic :offset-assert 372) +; (cloning basic :offset-assert 376) ; ) ; :method-count-assert 22 ; :size-assert #x17c @@ -25944,22 +25956,22 @@ ; ) ; (deftype citb-sage (process-taskable) -; ((~Tspawn-pos vector :inline :offset-assert 384) -; (~Ttarget-pos vector :inline :offset-assert 400) -; (~Tdir vector :inline :offset-assert 416) -; (~Trot-y float :offset-assert 432) -; (~Trot-x float :offset-assert 436) -; (~Tidle-anim int32 :offset-assert 440) -; (~Tattack-start-anim int32 :offset-assert 444) -; (~Tattack-anim int32 :offset-assert 448) -; (~Tbeam-joint int32 :offset-assert 452) -; (~Tcage uint64 :offset-assert 456) -; (~Tpart-impact basic :offset-assert 464) -; (~Tbeam-on basic :offset-assert 468) -; (~Tresolution-anim basic :offset-assert 472) -; (~Tsound-name basic :offset-assert 476) -; (~Tsound-id uint32 :offset-assert 480) -; (~Talt-actor basic :offset-assert 484) +; ((spawn-pos vector :inline :offset-assert 384) +; (target-pos vector :inline :offset-assert 400) +; (dir vector :inline :offset-assert 416) +; (rot-y float :offset-assert 432) +; (rot-x float :offset-assert 436) +; (idle-anim int32 :offset-assert 440) +; (attack-start-anim int32 :offset-assert 444) +; (attack-anim int32 :offset-assert 448) +; (beam-joint int32 :offset-assert 452) +; (cage uint64 :offset-assert 456) +; (part-impact basic :offset-assert 464) +; (beam-on basic :offset-assert 468) +; (resolution-anim basic :offset-assert 472) +; (sound-name basic :offset-assert 476) +; (sound-id uint32 :offset-assert 480) +; (alt-actor basic :offset-assert 484) ; ) ; :method-count-assert 53 ; :size-assert #x1e8 @@ -26176,11 +26188,11 @@ ; ) ; (deftype green-sagecage (citb-sage) -; ((~Twhich-movie int32 :offset-assert 488) -; (~Tevilbro uint64 :offset-assert 496) -; (~Tevilsis uint64 :offset-assert 504) -; (~Trobotboss uint64 :offset-assert 512) -; (~Texitplat uint64 :offset-assert 520) +; ((which-movie int32 :offset-assert 488) +; (evilbro uint64 :offset-assert 496) +; (evilsis uint64 :offset-assert 504) +; (robotboss uint64 :offset-assert 512) +; (exitplat uint64 :offset-assert 520) ; ) ; :method-count-assert 53 ; :size-assert #x210 @@ -26264,26 +26276,26 @@ ;; - Types ; (deftype snow-bunny (nav-enemy) -; ((~Tpatrol-rand-distraction int32 :offset-assert 400) -; (~Tbase-hop-dist float :offset-assert 404) -; (~Thalfway-dist float :offset-assert 408) -; (~Tretreat-timeout float :offset-assert 412) -; (~Tgnd-popup float :offset-assert 416) -; (~Tjump-height-min float :offset-assert 420) -; (~Tjump-height-factor float :offset-assert 424) -; (~Tjump-anim-start-frame float :offset-assert 428) -; (~Tdefense uint64 :offset-assert 432) -; (~Tretreat-timeout-time uint64 :offset-assert 440) -; (~Tlast-nondangerous-time uint64 :offset-assert 448) -; (~Tpatrol-hop-failed? basic :offset-assert 456) -; (~Tshould-retreat? basic :offset-assert 460) -; (~Tgot-jump-event? basic :offset-assert 464) -; (~Tusing-jump-event? basic :offset-assert 468) -; (~Tjump-anim int8 :offset-assert 472) -; (~Tnotice-land-anim int8 :offset-assert 473) -; (~Tattack-anim int8 :offset-assert 474) -; (~Tfinal-dest vector :inline :offset-assert 480) -; (~Tjump-event-dest vector :inline :offset-assert 496) +; ((patrol-rand-distraction int32 :offset-assert 400) +; (base-hop-dist float :offset-assert 404) +; (halfway-dist float :offset-assert 408) +; (retreat-timeout float :offset-assert 412) +; (gnd-popup float :offset-assert 416) +; (jump-height-min float :offset-assert 420) +; (jump-height-factor float :offset-assert 424) +; (jump-anim-start-frame float :offset-assert 428) +; (defense uint64 :offset-assert 432) +; (retreat-timeout-time uint64 :offset-assert 440) +; (last-nondangerous-time uint64 :offset-assert 448) +; (patrol-hop-failed? basic :offset-assert 456) +; (should-retreat? basic :offset-assert 460) +; (got-jump-event? basic :offset-assert 464) +; (using-jump-event? basic :offset-assert 468) +; (jump-anim int8 :offset-assert 472) +; (notice-land-anim int8 :offset-assert 473) +; (attack-anim int8 :offset-assert 474) +; (final-dest vector :inline :offset-assert 480) +; (jump-event-dest vector :inline :offset-assert 496) ; ) ; :method-count-assert 77 ; :size-assert #x200 @@ -26489,13 +26501,13 @@ ;; - Types ; (deftype drop-plat (process-drawable) -; ((~Tspin-axis vector :inline :offset-assert 176) -; (~Tspin-angle float :offset-assert 192) -; (~Tspin-speed float :offset-assert 196) -; (~Tinterp float :offset-assert 200) -; (~Tduration uint64 :offset-assert 208) -; (~Tdelay uint64 :offset-assert 216) -; (~Tcolor int8 :offset-assert 224) +; ((spin-axis vector :inline :offset-assert 176) +; (spin-angle float :offset-assert 192) +; (spin-speed float :offset-assert 196) +; (interp float :offset-assert 200) +; (duration uint64 :offset-assert 208) +; (delay uint64 :offset-assert 216) +; (color int8 :offset-assert 224) ; ) ; :method-count-assert 22 ; :size-assert #xe1 @@ -26529,19 +26541,19 @@ ; ) ; (deftype citb-drop-plat (process-drawable) -; ((~Tx-count int32 :offset-assert 176) -; (~Tz-count int32 :offset-assert 180) -; (~Tchild-count int32 :offset-assert 184) -; (~Tchild-array basic :offset-assert 188) -; (~Tchild-color-array uint32 :offset-assert 192) -; (~Tx-dir vector :inline :offset-assert 208) -; (~Tz-dir vector :inline :offset-assert 224) -; (~Torigin vector :inline :offset-assert 240) -; (~Tx-spacing float :offset-assert 256) -; (~Tz-spacing float :offset-assert 260) -; (~Tidle-distance float :offset-assert 264) -; (~Tduration uint64 :offset-assert 272) -; (~Tdrop-time uint64 :offset-assert 280) +; ((x-count int32 :offset-assert 176) +; (z-count int32 :offset-assert 180) +; (child-count int32 :offset-assert 184) +; (child-array basic :offset-assert 188) +; (child-color-array uint32 :offset-assert 192) +; (x-dir vector :inline :offset-assert 208) +; (z-dir vector :inline :offset-assert 224) +; (origin vector :inline :offset-assert 240) +; (x-spacing float :offset-assert 256) +; (z-spacing float :offset-assert 260) +; (idle-distance float :offset-assert 264) +; (duration uint64 :offset-assert 272) +; (drop-time uint64 :offset-assert 280) ; ) ; :method-count-assert 20 ; :size-assert #x120 @@ -27033,21 +27045,21 @@ ;; - Types ; (deftype cavecrystal (process-drawable) -; ((~Tis-master? basic :offset-assert 176) -; (~Tcrystal-id int32 :offset-assert 180) -; (~Tglow-u float :offset-assert 184) -; (~Tglow-wf-period int32 :offset-assert 188) -; (~Tglow-wf-offset int32 :offset-assert 192) -; (~Tprev-compute-glow-time uint64 :offset-assert 200) -; (~Tstart-fade-time uint64 :offset-assert 208) -; (~Tend-fade-time uint64 :offset-assert 216) -; (~Tactivated-time uint64 :offset-assert 224) -; (~Tlast-updated-user-lighting uint64 :offset-assert 232) -; (~Tplayer-attack-id uint64 :offset-assert 240) -; (~Ton-color-mult vector :inline :offset-assert 256) -; (~Ton-color-emissive vector :inline :offset-assert 272) -; (~Toff-color-mult vector :inline :offset-assert 288) -; (~Toff-color-emissive vector :inline :offset-assert 304) +; ((is-master? basic :offset-assert 176) +; (crystal-id int32 :offset-assert 180) +; (glow-u float :offset-assert 184) +; (glow-wf-period int32 :offset-assert 188) +; (glow-wf-offset int32 :offset-assert 192) +; (prev-compute-glow-time uint64 :offset-assert 200) +; (start-fade-time uint64 :offset-assert 208) +; (end-fade-time uint64 :offset-assert 216) +; (activated-time uint64 :offset-assert 224) +; (last-updated-user-lighting uint64 :offset-assert 232) +; (player-attack-id uint64 :offset-assert 240) +; (on-color-mult vector :inline :offset-assert 256) +; (on-color-emissive vector :inline :offset-assert 272) +; (off-color-mult vector :inline :offset-assert 288) +; (off-color-emissive vector :inline :offset-assert 304) ; ) ; :method-count-assert 22 ; :size-assert #x140 @@ -27387,8 +27399,8 @@ ;; - Types ; (deftype static-screen (process) -; ((~Tpart UNKNOWN 1 :offset-assert 112) -; (~Tstate-time uint64 :offset-assert 120) +; ((part UNKNOWN 1 :offset-assert 112) +; (state-time uint64 :offset-assert 120) ; ) ; :method-count-assert 15 ; :size-assert #x80 @@ -27497,13 +27509,13 @@ ;; - Types ; (deftype light-eco-child (process-drawable) -; ((~Tangle-bit int32 :offset-assert 176) -; (~Tground-y float :offset-assert 180) -; (~Tfalling-start-time uint64 :offset-assert 184) -; (~Tlast-update-time uint64 :offset-assert 192) -; (~Trot vector :inline :offset-assert 208) -; (~Trotv vector :inline :offset-assert 224) -; (~Ttraj trajectory :inline :offset-assert 240) +; ((angle-bit int32 :offset-assert 176) +; (ground-y float :offset-assert 180) +; (falling-start-time uint64 :offset-assert 184) +; (last-update-time uint64 :offset-assert 192) +; (rot vector :inline :offset-assert 208) +; (rotv vector :inline :offset-assert 224) +; (traj trajectory :inline :offset-assert 240) ; ) ; :method-count-assert 21 ; :size-assert #x118 @@ -27526,12 +27538,12 @@ ; ) ; (deftype light-eco-mother (process-drawable) -; ((~Tplayer-got-eco? basic :offset-assert 176) -; (~Tangle-mask uint64 :offset-assert 184) -; (~Tdelay-til-spawn int32 :offset-assert 192) -; (~Tpart2 basic :offset-assert 196) -; (~Tlast-update-time uint64 :offset-assert 200) -; (~Tlast-spawned-time uint64 :offset-assert 208) +; ((player-got-eco? basic :offset-assert 176) +; (angle-mask uint64 :offset-assert 184) +; (delay-til-spawn int32 :offset-assert 192) +; (part2 basic :offset-assert 196) +; (last-update-time uint64 :offset-assert 200) +; (last-spawned-time uint64 :offset-assert 208) ; ) ; :method-count-assert 22 ; :size-assert #xd8 @@ -27612,10 +27624,10 @@ ; ) ; (deftype arcing-shot (process-drawable) -; ((~Ty-vel float :offset-assert 176) -; (~Tgrav float :offset-assert 180) -; (~Tfrom vector :inline :offset-assert 192) -; (~Tto vector :inline :offset-assert 208) +; ((y-vel float :offset-assert 176) +; (grav float :offset-assert 180) +; (from vector :inline :offset-assert 192) +; (to vector :inline :offset-assert 208) ; ) ; :method-count-assert 20 ; :size-assert #xe0 @@ -27637,10 +27649,10 @@ ; ) ; (deftype darkecobomb (arcing-shot) -; ((~Tflight-time uint64 :offset-assert 224) -; (~Tcountdown-time float :offset-assert 232) -; (~Tanim-speed float :offset-assert 236) -; (~Tnext-tick float :offset-assert 240) +; ((flight-time uint64 :offset-assert 224) +; (countdown-time float :offset-assert 232) +; (anim-speed float :offset-assert 236) +; (next-tick float :offset-assert 240) ; ) ; :method-count-assert 20 ; :size-assert #xf4 @@ -27662,7 +27674,7 @@ ; ) ; (deftype greenshot (arcing-shot) -; ((~Tflight-time uint64 :offset-assert 224) +; ((flight-time uint64 :offset-assert 224) ; ) ; :method-count-assert 20 ; :size-assert #xe8 @@ -27684,13 +27696,13 @@ ; ) ; (deftype redshot (arcing-shot) -; ((~Tflight-time uint64 :offset-assert 224) -; (~Tstall-time uint64 :offset-assert 232) -; (~Tring torus :inline :offset-assert 240) -; (~Trotation-offset uint64 :offset-assert 280) -; (~Tpart-track uint64 :offset-assert 288) -; (~Tshot-particle basic :offset-assert 296) -; (~Ttest-particle basic :offset-assert 300) +; ((flight-time uint64 :offset-assert 224) +; (stall-time uint64 :offset-assert 232) +; (ring torus :inline :offset-assert 240) +; (rotation-offset uint64 :offset-assert 280) +; (part-track uint64 :offset-assert 288) +; (shot-particle basic :offset-assert 296) +; (test-particle basic :offset-assert 300) ; ) ; :method-count-assert 20 ; :size-assert #x130 @@ -27712,7 +27724,7 @@ ; ) ; (deftype yellowshot (arcing-shot) -; ((~Tflight-time uint64 :offset-assert 224) +; ((flight-time uint64 :offset-assert 224) ; ) ; :method-count-assert 20 ; :size-assert #xe8 @@ -27785,7 +27797,7 @@ ; ) ; (deftype ecoclaw (process-drawable) -; ((~Tparticles UNKNOWN 3 :offset-assert 176) +; ((particles UNKNOWN 3 :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #x110 @@ -27807,7 +27819,7 @@ ; ) ; (deftype silodoor (process-drawable) -; ((~Tpart-opened float :offset-assert 176) +; ((part-opened float :offset-assert 176) ; ) ; :method-count-assert 22 ; :size-assert #xb4 @@ -27831,7 +27843,7 @@ ; ) ; (deftype finalbosscam (process-taskable) -; ((~Trobotboss uint64 :offset-assert 384) +; ((robotboss uint64 :offset-assert 384) ; ) ; :method-count-assert 53 ; :size-assert #x188 @@ -27913,10 +27925,10 @@ ;; - Types ; (deftype green-eco-lurker (nav-enemy) -; ((~Tplayed-sound? basic :offset-assert 400) -; (~Tsound-delay int32 :offset-assert 404) -; (~Tappear-dest vector :inline :offset-assert 416) -; (~Ttraj trajectory :inline :offset-assert 432) +; ((played-sound? basic :offset-assert 400) +; (sound-delay int32 :offset-assert 404) +; (appear-dest vector :inline :offset-assert 416) +; (traj trajectory :inline :offset-assert 432) ; ) ; :method-count-assert 76 ; :size-assert #x1d8 @@ -27994,9 +28006,9 @@ ; ) ; (deftype green-eco-lurker-gen (process-drawable) -; ((~Tnum-to-spawn int32 :offset-assert 176) -; (~Tnum-spawned int32 :offset-assert 180) -; (~Tnum-alive int32 :offset-assert 184) +; ((num-to-spawn int32 :offset-assert 176) +; (num-spawned int32 :offset-assert 180) +; (num-alive int32 :offset-assert 184) ; ) ; :method-count-assert 20 ; :size-assert #xbc @@ -28230,9 +28242,9 @@ ; ) ; (deftype powercellalt (process-drawable) -; ((~Tjump-pos vector :inline :offset-assert 176) -; (~Tbase vector :inline :offset-assert 192) -; (~Tindex int32 :offset-assert 208) +; ((jump-pos vector :inline :offset-assert 176) +; (base vector :inline :offset-assert 192) +; (index int32 :offset-assert 208) ; ) ; :method-count-assert 23 ; :size-assert #xd4 @@ -28277,11 +28289,11 @@ ;; - Types ; (deftype plat-eco-finalboss (plat-eco) -; ((~Tforce-dest float :offset-assert 360) -; (~Ttarg-dest float :offset-assert 364) -; (~Tdest float :offset-assert 368) -; (~Tspeed float :offset-assert 372) -; (~Ttouch-time uint64 :offset-assert 376) +; ((force-dest float :offset-assert 360) +; (targ-dest float :offset-assert 364) +; (dest float :offset-assert 368) +; (speed float :offset-assert 372) +; (touch-time uint64 :offset-assert 376) ; ) ; :method-count-assert 33 ; :size-assert #x180 @@ -28325,23 +28337,23 @@ ; ) ; (deftype sage-finalboss (process-taskable) -; ((~Tredsage uint64 :offset-assert 384) -; (~Tbluesage uint64 :offset-assert 392) -; (~Tyellowsage uint64 :offset-assert 400) -; (~Tassistant uint64 :offset-assert 408) -; (~Trobotplat uint64 :offset-assert 416) -; (~Trobotboss uint64 :offset-assert 424) -; (~Tsilodoor uint64 :offset-assert 432) -; (~Tjak-white uint64 :offset-assert 440) -; (~Tleft-door basic :offset-assert 448) -; (~Tright-door basic :offset-assert 452) -; (~Tkick-in-the-door basic :offset-assert 456) -; (~Tkick-the-credits basic :offset-assert 460) -; (~Tcredit-fade float :offset-assert 464) -; (~Tpalette-val float :offset-assert 468) -; (~Tparticle UNKNOWN 9 :offset-assert 472) -; (~Tparticle-whiteout basic :offset-assert 616) -; (~Tcredits-played basic :offset-assert 620) +; ((redsage uint64 :offset-assert 384) +; (bluesage uint64 :offset-assert 392) +; (yellowsage uint64 :offset-assert 400) +; (assistant uint64 :offset-assert 408) +; (robotplat uint64 :offset-assert 416) +; (robotboss uint64 :offset-assert 424) +; (silodoor uint64 :offset-assert 432) +; (jak-white uint64 :offset-assert 440) +; (left-door basic :offset-assert 448) +; (right-door basic :offset-assert 452) +; (kick-in-the-door basic :offset-assert 456) +; (kick-the-credits basic :offset-assert 460) +; (credit-fade float :offset-assert 464) +; (palette-val float :offset-assert 468) +; (particle UNKNOWN 9 :offset-assert 472) +; (particle-whiteout basic :offset-assert 616) +; (credits-played basic :offset-assert 620) ; ) ; :method-count-assert 53 ; :size-assert #x270 @@ -28655,7 +28667,7 @@ ;; - Types ; (deftype evilbro (process-taskable) -; ((~Tevilsis basic :offset-assert 380) +; ((evilsis basic :offset-assert 380) ; ) ; :method-count-assert 53 ; :size-assert #x180 @@ -28842,8 +28854,8 @@ ;; - Types ; (deftype eggtop (process-drawable) -; ((~Tcam-tracker uint64 :offset-assert 176) -; (~Tsound-id uint32 :offset-assert 184) +; ((cam-tracker uint64 :offset-assert 176) +; (sound-id uint32 :offset-assert 184) ; ) ; :method-count-assert 20 ; :size-assert #xbc @@ -28910,15 +28922,15 @@ ;; - Types ; (deftype plat-flip (process-drawable) -; ((~Tpath-pos float :offset-assert 176) -; (~Tbefore-turn-down-time float :offset-assert 180) -; (~Tturn-down-time float :offset-assert 184) -; (~Tbefore-turn-up-time float :offset-assert 188) -; (~Tturn-up-time float :offset-assert 192) -; (~Ttotal-time float :offset-assert 196) -; (~Tsync sync-info :inline :offset-assert 200) -; (~Tbase-pos vector :inline :offset-assert 208) -; (~Tsmush smush-control :inline :offset-assert 224) +; ((path-pos float :offset-assert 176) +; (before-turn-down-time float :offset-assert 180) +; (turn-down-time float :offset-assert 184) +; (before-turn-up-time float :offset-assert 188) +; (turn-up-time float :offset-assert 192) +; (total-time float :offset-assert 196) +; (sync sync-info :inline :offset-assert 200) +; (base-pos vector :inline :offset-assert 208) +; (smush smush-control :inline :offset-assert 224) ; ) ; :method-count-assert 20 ; :size-assert #x100 @@ -28964,7 +28976,7 @@ ;; - Types ; (deftype aphid (nav-enemy) -; ((~Ttry int32 :offset-assert 400) +; ((try int32 :offset-assert 400) ; ) ; :method-count-assert 76 ; :size-assert #x194 @@ -29300,9 +29312,9 @@ ;; - Types ; (deftype jungle-elevator (plat-button) -; ((~Tbottom-height float :offset-assert 240) -; (~Tteleport-if-below-y float :offset-assert 244) -; (~Tteleport-if-above-y float :offset-assert 248) +; ((bottom-height float :offset-assert 240) +; (teleport-if-below-y float :offset-assert 244) +; (teleport-if-above-y float :offset-assert 248) ; ) ; :method-count-assert 33 ; :size-assert #xfc @@ -29347,8 +29359,8 @@ ;; - Types ; (deftype springbox (process-drawable) -; ((~Tspring-height meters :offset-assert 176) -; (~Tsmush float :offset-assert 180) +; ((spring-height meters :offset-assert 176) +; (smush float :offset-assert 180) ; ) ; :method-count-assert 20 ; :size-assert #xb8 @@ -29387,8 +29399,8 @@ ;; - Types ; (deftype hopper (nav-enemy) -; ((~Tjump-length float :offset-assert 400) -; (~Tshadow-min-y float :offset-assert 404) +; ((jump-length float :offset-assert 400) +; (shadow-min-y float :offset-assert 404) ; ) ; :method-count-assert 76 ; :size-assert #x198 @@ -29506,18 +29518,18 @@ ; ) ; (deftype junglesnake (process-drawable) -; ((~Tstate-time uint64 :offset-assert 168) -; (~Thit-player basic :offset-assert 184) -; (~Tis-lethal? basic :offset-assert 188) -; (~Trefractory-delay int32 :offset-assert 192) -; (~Try float :offset-assert 196) -; (~Tdes-ry float :offset-assert 200) -; (~Ttilt float :offset-assert 204) -; (~Tdes-tilt float :offset-assert 208) -; (~Ttrack-player-ry basic :offset-assert 212) -; (~Ttrack-player-tilt basic :offset-assert 216) -; (~Ttwist-joints UNKNOWN 24 :offset-assert 220) -; (~Ttilt-joints UNKNOWN 3 :offset-assert 604) +; ((state-time uint64 :offset-assert 168) +; (hit-player basic :offset-assert 184) +; (is-lethal? basic :offset-assert 188) +; (refractory-delay int32 :offset-assert 192) +; (ry float :offset-assert 196) +; (des-ry float :offset-assert 200) +; (tilt float :offset-assert 204) +; (des-tilt float :offset-assert 208) +; (track-player-ry basic :offset-assert 212) +; (track-player-tilt basic :offset-assert 216) +; (twist-joints UNKNOWN 24 :offset-assert 220) +; (tilt-joints UNKNOWN 3 :offset-assert 604) ; ) ; :method-count-assert 25 ; :size-assert #x28c @@ -29570,13 +29582,13 @@ ;; - Types ; (deftype darkvine (process-drawable) -; ((~Tspeed float :offset-assert 176) -; (~Ttip-index int8 :offset-assert 180) -; (~Tdangerous basic :offset-assert 184) -; (~Tvulnerable basic :offset-assert 188) -; (~Thit-player basic :offset-assert 192) -; (~Ttouch-time uint64 :offset-assert 200) -; (~Tplayer-attack-id int32 :offset-assert 208) +; ((speed float :offset-assert 176) +; (tip-index int8 :offset-assert 180) +; (dangerous basic :offset-assert 184) +; (vulnerable basic :offset-assert 188) +; (hit-player basic :offset-assert 192) +; (touch-time uint64 :offset-assert 200) +; (player-attack-id int32 :offset-assert 208) ; ) ; :method-count-assert 20 ; :size-assert #xd4 @@ -29669,8 +29681,8 @@ ; ) ; (deftype lurkerm-tall-sail (process-drawable) -; ((~Tspeed float :offset-assert 176) -; (~Talt-actor basic :offset-assert 180) +; ((speed float :offset-assert 176) +; (alt-actor basic :offset-assert 180) ; ) ; :method-count-assert 20 ; :size-assert #xb8 @@ -29692,8 +29704,8 @@ ; ) ; (deftype lurkerm-short-sail (process-drawable) -; ((~Tspeed float :offset-assert 176) -; (~Talt-actor basic :offset-assert 180) +; ((speed float :offset-assert 176) +; (alt-actor basic :offset-assert 180) ; ) ; :method-count-assert 20 ; :size-assert #xb8 @@ -29715,11 +29727,11 @@ ; ) ; (deftype lurkerm-piston (process-drawable) -; ((~Tsync sync-info :inline :offset-assert 176) -; (~Tbase vector :inline :offset-assert 192) -; (~Theight vector :inline :offset-assert 208) -; (~Tspeed float :offset-assert 224) -; (~Talt-actor basic :offset-assert 228) +; ((sync sync-info :inline :offset-assert 176) +; (base vector :inline :offset-assert 192) +; (height vector :inline :offset-assert 208) +; (speed float :offset-assert 224) +; (alt-actor basic :offset-assert 228) ; ) ; :method-count-assert 20 ; :size-assert #xe8 @@ -29741,8 +29753,8 @@ ; ) ; (deftype accordian (process-drawable) -; ((~Tspeed float :offset-assert 176) -; (~Talt-actor basic :offset-assert 180) +; ((speed float :offset-assert 176) +; (alt-actor basic :offset-assert 180) ; ) ; :method-count-assert 20 ; :size-assert #xb8 @@ -29836,10 +29848,10 @@ ; ) ; (deftype precurbridge (process-drawable) -; ((~Tsmush smush-control :inline :offset-assert 176) -; (~Tbase vector :inline :offset-assert 208) -; (~Tactivation-point vector :inline :offset-assert 224) -; (~Tspan-array UNKNOWN 8 :offset-assert 240) +; ((smush smush-control :inline :offset-assert 176) +; (base vector :inline :offset-assert 208) +; (activation-point vector :inline :offset-assert 224) +; (span-array UNKNOWN 8 :offset-assert 240) ; ) ; :method-count-assert 20 ; :size-assert #x110 @@ -29861,7 +29873,7 @@ ; ) ; (deftype maindoor (process-drawable) -; ((~Tthresh vector :inline :offset-assert 176) +; ((thresh vector :inline :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xc0 @@ -29911,8 +29923,8 @@ ; ) ; (deftype jngpusher (process-drawable) -; ((~Tsync sync-info :inline :offset-assert 176) -; (~Tback-prim basic :offset-assert 184) +; ((sync sync-info :inline :offset-assert 176) +; (back-prim basic :offset-assert 184) ; ) ; :method-count-assert 20 ; :size-assert #xbc @@ -30003,30 +30015,30 @@ ;; - Types ; (deftype periscope (process-drawable) -; ((~Ty-offset meters :offset-assert 176) -; (~Ty-offset-grips meters :offset-assert 180) -; (~Theight meters :offset-assert 184) -; (~Tturn deg :offset-assert 188) -; (~Ttilt deg :offset-assert 192) -; (~Ttarget-turn deg :offset-assert 196) -; (~Ttarget-tilt deg :offset-assert 200) -; (~Tbase vector :inline :offset-assert 208) -; (~Treflector-trans vector :inline :offset-assert 224) -; (~Tnext-reflector-trans vector :inline :offset-assert 240) -; (~Tprev-reflector-trans vector :inline :offset-assert 256) -; (~Told-camera-matrix matrix :inline :offset-assert 272) -; (~Treflector uint32 :offset-assert 336) -; (~Tgauge-rot deg :offset-assert 340) -; (~Tlock-time uint64 :offset-assert 344) -; (~Taligned? basic :offset-assert 352) -; (~Traised? basic :offset-assert 356) -; (~Tplayer-touching-grips? basic :offset-assert 360) -; (~Tgrips-moving? basic :offset-assert 364) -; (~Tsound-id uint32 :offset-assert 368) -; (~Trise-sound-id uint32 :offset-assert 372) -; (~Tgrips-sound-id uint32 :offset-assert 376) -; (~Tgrips basic :offset-assert 380) -; (~Tpart-aligned basic :offset-assert 384) +; ((y-offset meters :offset-assert 176) +; (y-offset-grips meters :offset-assert 180) +; (height meters :offset-assert 184) +; (turn deg :offset-assert 188) +; (tilt deg :offset-assert 192) +; (target-turn deg :offset-assert 196) +; (target-tilt deg :offset-assert 200) +; (base vector :inline :offset-assert 208) +; (reflector-trans vector :inline :offset-assert 224) +; (next-reflector-trans vector :inline :offset-assert 240) +; (prev-reflector-trans vector :inline :offset-assert 256) +; (old-camera-matrix matrix :inline :offset-assert 272) +; (reflector uint32 :offset-assert 336) +; (gauge-rot deg :offset-assert 340) +; (lock-time uint64 :offset-assert 344) +; (aligned? basic :offset-assert 352) +; (raised? basic :offset-assert 356) +; (player-touching-grips? basic :offset-assert 360) +; (grips-moving? basic :offset-assert 364) +; (sound-id uint32 :offset-assert 368) +; (rise-sound-id uint32 :offset-assert 372) +; (grips-sound-id uint32 :offset-assert 376) +; (grips basic :offset-assert 380) +; (part-aligned basic :offset-assert 384) ; ) ; :method-count-assert 20 ; :size-assert #x184 @@ -30069,11 +30081,11 @@ ; ) ; (deftype reflector-origin (process-drawable) -; ((~Treflector-trans vector :inline :offset-assert 176) -; (~Tnext-reflector-trans vector :inline :offset-assert 192) -; (~Treflector uint32 :offset-assert 208) -; (~Tnext basic :offset-assert 212) -; (~Tblocker basic :offset-assert 216) +; ((reflector-trans vector :inline :offset-assert 176) +; (next-reflector-trans vector :inline :offset-assert 192) +; (reflector uint32 :offset-assert 208) +; (next basic :offset-assert 212) +; (blocker basic :offset-assert 216) ; ) ; :method-count-assert 20 ; :size-assert #xdc @@ -30095,7 +30107,7 @@ ; ) ; (deftype reflector-mirror (process-drawable) -; ((~Tbeam-end vector :inline :offset-assert 176) +; ((beam-end vector :inline :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xc0 @@ -30284,29 +30296,29 @@ ; ) ; (deftype fisher (process-taskable) -; ((~Tpaddle-end UNKNOWN 2 :offset-assert 384) -; (~Tpaddle-pos vector :inline :offset-assert 416) -; (~Tpaddle float :offset-assert 432) -; (~Tpaddle-vel float :offset-assert 436) -; (~Tspawner float :offset-assert 440) -; (~Tspawner-last float :offset-assert 444) -; (~Tspawn-time uint64 :offset-assert 448) -; (~Tturn-time uint64 :offset-assert 456) -; (~Tswing-time uint64 :offset-assert 464) -; (~Tblock-time uint64 :offset-assert 472) -; (~Tblock int32 :offset-assert 480) -; (~Tcaught int32 :offset-assert 484) -; (~Tmissed int32 :offset-assert 488) -; (~Tdifficulty int32 :offset-assert 492) -; (~Tstart-time uint64 :offset-assert 496) -; (~Tambient-big-one uint64 :offset-assert 504) -; (~Tambient-steady uint64 :offset-assert 512) -; (~Tambient-sagging uint64 :offset-assert 520) -; (~Tambient-almost uint64 :offset-assert 528) -; (~Tcheat-temp int32 :offset-assert 536) -; (~Thard basic :offset-assert 540) -; (~Ttraining basic :offset-assert 544) -; (~Tparams fisher-params :inline :offset-assert 552) +; ((paddle-end UNKNOWN 2 :offset-assert 384) +; (paddle-pos vector :inline :offset-assert 416) +; (paddle float :offset-assert 432) +; (paddle-vel float :offset-assert 436) +; (spawner float :offset-assert 440) +; (spawner-last float :offset-assert 444) +; (spawn-time uint64 :offset-assert 448) +; (turn-time uint64 :offset-assert 456) +; (swing-time uint64 :offset-assert 464) +; (block-time uint64 :offset-assert 472) +; (block int32 :offset-assert 480) +; (caught int32 :offset-assert 484) +; (missed int32 :offset-assert 488) +; (difficulty int32 :offset-assert 492) +; (start-time uint64 :offset-assert 496) +; (ambient-big-one uint64 :offset-assert 504) +; (ambient-steady uint64 :offset-assert 512) +; (ambient-sagging uint64 :offset-assert 520) +; (ambient-almost uint64 :offset-assert 528) +; (cheat-temp int32 :offset-assert 536) +; (hard basic :offset-assert 540) +; (training basic :offset-assert 544) +; (params fisher-params :inline :offset-assert 552) ; ) ; :method-count-assert 53 ; :size-assert #x260 @@ -30361,12 +30373,12 @@ ; ) ; (deftype fisher-fish (process-drawable) -; ((~Tdir vector :inline :offset-assert 176) -; (~Toffset float :offset-assert 192) -; (~Tpos float :offset-assert 196) -; (~Tvel float :offset-assert 200) -; (~Tmode basic :offset-assert 204) -; (~Tsize meters :offset-assert 208) +; ((dir vector :inline :offset-assert 176) +; (offset float :offset-assert 192) +; (pos float :offset-assert 196) +; (vel float :offset-assert 200) +; (mode basic :offset-assert 204) +; (size meters :offset-assert 208) ; ) ; :method-count-assert 20 ; :size-assert #xd4 @@ -30463,11 +30475,11 @@ ;; - Types ; (deftype launcherdoor (process-drawable) -; ((~Tnotify-player-passed-thru? basic :offset-assert 176) -; (~Tthresh-y float :offset-assert 180) -; (~Topen-speed float :offset-assert 184) -; (~Tclose-speed float :offset-assert 188) -; (~Tload-mode basic :offset-assert 192) +; ((notify-player-passed-thru? basic :offset-assert 176) +; (thresh-y float :offset-assert 180) +; (open-speed float :offset-assert 184) +; (close-speed float :offset-assert 188) +; (load-mode basic :offset-assert 192) ; ) ; :method-count-assert 20 ; :size-assert #xc4 @@ -31057,14 +31069,14 @@ ;; - Types ; (deftype racer (process-drawable) -; ((~Textra-trans vector :inline :offset-assert 176) -; (~Tcondition int32 :offset-assert 192) -; (~Tcell uint64 :offset-assert 200) -; (~Tpath-data UNKNOWN 2 :offset-assert 208) -; (~Tpath-target basic :offset-assert 208) -; (~Tpath-racer basic :offset-assert 212) -; (~Tauto-get-off basic :offset-assert 216) -; (~Tshadow-backup basic :offset-assert 220) +; ((extra-trans vector :inline :offset-assert 176) +; (condition int32 :offset-assert 192) +; (cell uint64 :offset-assert 200) +; (path-data UNKNOWN 2 :offset-assert 208) +; (path-target basic :offset-assert 208) +; (path-racer basic :offset-assert 212) +; (auto-get-off basic :offset-assert 216) +; (shadow-backup basic :offset-assert 220) ; ) ; :method-count-assert 24 ; :size-assert #xe0 @@ -31267,14 +31279,14 @@ ;; - Types ; (deftype flutflut (process-drawable) -; ((~Textra-trans vector :inline :offset-assert 176) -; (~Tcondition int32 :offset-assert 192) -; (~Tauto-get-off basic :offset-assert 196) -; (~Tcell uint64 :offset-assert 200) -; (~Tpath-data UNKNOWN 2 :offset-assert 208) -; (~Tpath-target basic :offset-assert 208) -; (~Tpath-flut basic :offset-assert 212) -; (~Ttouch-time uint64 :offset-assert 216) +; ((extra-trans vector :inline :offset-assert 176) +; (condition int32 :offset-assert 192) +; (auto-get-off basic :offset-assert 196) +; (cell uint64 :offset-assert 200) +; (path-data UNKNOWN 2 :offset-assert 208) +; (path-target basic :offset-assert 208) +; (path-flut basic :offset-assert 212) +; (touch-time uint64 :offset-assert 216) ; ) ; :method-count-assert 24 ; :size-assert #xe0 @@ -31525,7 +31537,7 @@ ;; - Types ; (deftype assistant (process-taskable) -; ((~Tsound-id uint32 :offset-assert 380) +; ((sound-id uint32 :offset-assert 380) ; ) ; :method-count-assert 53 ; :size-assert #x180 @@ -31598,8 +31610,8 @@ ;; - Types ; (deftype sage (process-taskable) -; ((~Treminder-played basic :offset-assert 380) -; (~Tassistant uint64 :offset-assert 384) +; ((reminder-played basic :offset-assert 380) +; (assistant uint64 :offset-assert 384) ; ) ; :method-count-assert 53 ; :size-assert #x188 @@ -31700,23 +31712,23 @@ ; ) ; (deftype yakow (process-drawable) -; ((~Tplayer-attack-id int32 :offset-assert 176) -; (~Twalk-run-blend float :offset-assert 180) -; (~Twalk-turn-blend float :offset-assert 184) -; (~Trun-mode basic :offset-assert 188) -; (~Ttravel-speed meters :offset-assert 192) -; (~Tfinal-speed meters :offset-assert 196) -; (~Trotate-speed float :offset-assert 200) -; (~Tturn-time uint64 :offset-assert 208) -; (~Tvulnerable basic :offset-assert 216) -; (~Tgrazing basic :offset-assert 220) -; (~Tpush-velocity vector :inline :offset-assert 224) -; (~Thome-base vector :inline :offset-assert 240) -; (~Tdest-base vector :inline :offset-assert 256) -; (~Tdest-rot deg :offset-assert 272) -; (~Tenable-turn-around basic :offset-assert 276) -; (~Trotating basic :offset-assert 280) -; (~Tin-pen basic :offset-assert 284) +; ((player-attack-id int32 :offset-assert 176) +; (walk-run-blend float :offset-assert 180) +; (walk-turn-blend float :offset-assert 184) +; (run-mode basic :offset-assert 188) +; (travel-speed meters :offset-assert 192) +; (final-speed meters :offset-assert 196) +; (rotate-speed float :offset-assert 200) +; (turn-time uint64 :offset-assert 208) +; (vulnerable basic :offset-assert 216) +; (grazing basic :offset-assert 220) +; (push-velocity vector :inline :offset-assert 224) +; (home-base vector :inline :offset-assert 240) +; (dest-base vector :inline :offset-assert 256) +; (dest-rot deg :offset-assert 272) +; (enable-turn-around basic :offset-assert 276) +; (rotating basic :offset-assert 280) +; (in-pen basic :offset-assert 284) ; ) ; :method-count-assert 20 ; :size-assert #x120 @@ -31777,11 +31789,11 @@ ;; - Types ; (deftype windmill-sail (process-drawable) -; ((~Tsync sync-info :inline :offset-assert 176) -; (~Tblade-normal vector :inline :offset-assert 192) -; (~Torig-quat quaternion :inline :offset-assert 208) -; (~Talt-actor basic :offset-assert 224) -; (~Tpart2 basic :offset-assert 228) +; ((sync sync-info :inline :offset-assert 176) +; (blade-normal vector :inline :offset-assert 192) +; (orig-quat quaternion :inline :offset-assert 208) +; (alt-actor basic :offset-assert 224) +; (part2 basic :offset-assert 228) ; ) ; :method-count-assert 20 ; :size-assert #xe8 @@ -31803,9 +31815,9 @@ ; ) ; (deftype sagesail (process-drawable) -; ((~Tsync sync-info :inline :offset-assert 176) -; (~Tblade-normal vector :inline :offset-assert 192) -; (~Torig-quat quaternion :inline :offset-assert 208) +; ((sync sync-info :inline :offset-assert 176) +; (blade-normal vector :inline :offset-assert 192) +; (orig-quat quaternion :inline :offset-assert 208) ; ) ; :method-count-assert 20 ; :size-assert #xe0 @@ -31827,10 +31839,10 @@ ; ) ; (deftype windspinner (process-drawable) -; ((~Tblade-normal vector :inline :offset-assert 176) -; (~Torig-quat quaternion :inline :offset-assert 192) -; (~Tangle float :offset-assert 208) -; (~Tangle-vel float :offset-assert 212) +; ((blade-normal vector :inline :offset-assert 176) +; (orig-quat quaternion :inline :offset-assert 192) +; (angle float :offset-assert 208) +; (angle-vel float :offset-assert 212) ; ) ; :method-count-assert 20 ; :size-assert #xd8 @@ -31852,7 +31864,7 @@ ; ) ; (deftype mayorgears (process-drawable) -; ((~Talt-actor basic :offset-assert 176) +; ((alt-actor basic :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -31874,8 +31886,8 @@ ; ) ; (deftype reflector-middle (process-drawable) -; ((~Treflector-trans vector :inline :offset-assert 176) -; (~Tnext-reflector-trans vector :inline :offset-assert 192) +; ((reflector-trans vector :inline :offset-assert 176) +; (next-reflector-trans vector :inline :offset-assert 192) ; ) ; :method-count-assert 20 ; :size-assert #xd0 @@ -31918,7 +31930,7 @@ ; ) ; (deftype villa-starfish (process-drawable) -; ((~Tchild-count int8 :offset-assert 176) +; ((child-count int8 :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb1 @@ -32017,7 +32029,7 @@ ; ) ; (deftype village-fish (process-drawable) -; ((~Tchild-count int8 :offset-assert 176) +; ((child-count int8 :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb1 @@ -32090,8 +32102,8 @@ ; ) ; (deftype hutlamp (process-drawable) -; ((~Tpivot basic :offset-assert 176) -; (~Tclock cyclegen :inline :offset-assert 180) +; ((pivot basic :offset-assert 176) +; (clock cyclegen :inline :offset-assert 180) ; ) ; :method-count-assert 20 ; :size-assert #xbc @@ -32311,33 +32323,33 @@ ; ) ; (deftype fishermans-boat (rigid-body-platform) -; ((~Tstabilizer-array UNKNOWN 2 :offset-assert 736) -; (~Tengine-thrust-local-pos vector :inline :offset-assert 800) -; (~Tignition basic :offset-assert 816) -; (~Tengine-thrust float :offset-assert 820) -; (~Tpropeller basic :offset-assert 824) -; (~Tdock-point vector :inline :offset-assert 832) -; (~Tdest-dir vector :inline :offset-assert 848) -; (~Tdock-point-index int8 :offset-assert 864) -; (~Tauto-pilot basic :offset-assert 868) -; (~Tanchored basic :offset-assert 872) -; (~Twaiting-for-player basic :offset-assert 876) -; (~Tplayer-riding basic :offset-assert 880) -; (~Tboat-path vehicle-path :inline :offset-assert 896) -; (~Tcam-tracker uint64 :offset-assert 1064) -; (~Tplayer-attack-id int32 :offset-assert 696) -; (~Tkill-player basic :offset-assert 1076) -; (~Tengine-sound-id uint32 :offset-assert 1080) -; (~Tengine-sound-envelope float :offset-assert 1084) -; (~Tdebug-draw basic :offset-assert 1088) -; (~Tdebug-path-record basic :offset-assert 1092) -; (~Tdebug-path-playback basic :offset-assert 1096) -; (~Tmeasure-parameters basic :offset-assert 1100) -; (~Tcontroller vehicle-controller :inline :offset-assert 1104) -; (~Tanim basic :offset-assert 1244) -; (~Told-target-pos transformq :inline :offset-assert 1248) -; (~Tevilbro uint64 :offset-assert 1296) -; (~Tevilsis uint64 :offset-assert 1304) +; ((stabilizer-array UNKNOWN 2 :offset-assert 736) +; (engine-thrust-local-pos vector :inline :offset-assert 800) +; (ignition basic :offset-assert 816) +; (engine-thrust float :offset-assert 820) +; (propeller basic :offset-assert 824) +; (dock-point vector :inline :offset-assert 832) +; (dest-dir vector :inline :offset-assert 848) +; (dock-point-index int8 :offset-assert 864) +; (auto-pilot basic :offset-assert 868) +; (anchored basic :offset-assert 872) +; (waiting-for-player basic :offset-assert 876) +; (player-riding basic :offset-assert 880) +; (boat-path vehicle-path :inline :offset-assert 896) +; (cam-tracker uint64 :offset-assert 1064) +; (player-attack-id int32 :offset-assert 696) +; (kill-player basic :offset-assert 1076) +; (engine-sound-id uint32 :offset-assert 1080) +; (engine-sound-envelope float :offset-assert 1084) +; (debug-draw basic :offset-assert 1088) +; (debug-path-record basic :offset-assert 1092) +; (debug-path-playback basic :offset-assert 1096) +; (measure-parameters basic :offset-assert 1100) +; (controller vehicle-controller :inline :offset-assert 1104) +; (anim basic :offset-assert 1244) +; (old-target-pos transformq :inline :offset-assert 1248) +; (evilbro uint64 :offset-assert 1296) +; (evilsis uint64 :offset-assert 1304) ; ) ; :method-count-assert 35 ; :size-assert #x520 @@ -32453,8 +32465,8 @@ ;; - Types ; (deftype sequenceA-village1 (process-taskable) -; ((~Tboat uint64 :offset-assert 384) -; (~Tside uint64 :offset-assert 392) +; ((boat uint64 :offset-assert 384) +; (side uint64 :offset-assert 392) ; ) ; :method-count-assert 53 ; :size-assert #x190 @@ -32559,10 +32571,10 @@ ; ) ; (deftype training-cam (process) -; ((~Troot basic :offset-assert 112) -; (~Trange meters :offset-assert 116) -; (~Tindex int32 :offset-assert 120) -; (~Tstate-time uint64 :offset-assert 128) +; ((root basic :offset-assert 112) +; (range meters :offset-assert 116) +; (index int32 :offset-assert 120) +; (state-time uint64 :offset-assert 128) ; ) ; :method-count-assert 15 ; :size-assert #x88 @@ -32579,7 +32591,7 @@ ; ) ; (deftype tra-pontoon (rigid-body-platform) -; ((~Tanchor-point vector :inline :offset-assert 736) +; ((anchor-point vector :inline :offset-assert 736) ; ) ; :method-count-assert 35 ; :size-assert #x2f0 @@ -32644,8 +32656,8 @@ ; ) ; (deftype scarecrow-a (process-drawable) -; ((~Tincomming-attack-id uint64 :offset-assert 176) -; (~Tintersection vector :inline :offset-assert 192) +; ((incomming-attack-id uint64 :offset-assert 176) +; (intersection vector :inline :offset-assert 192) ; ) ; :method-count-assert 22 ; :size-assert #xd0 @@ -32669,8 +32681,8 @@ ; ) ; (deftype scarecrow-b (process-drawable) -; ((~Tincomming-attack-id uint64 :offset-assert 176) -; (~Tintersection vector :inline :offset-assert 192) +; ((incomming-attack-id uint64 :offset-assert 176) +; (intersection vector :inline :offset-assert 192) ; ) ; :method-count-assert 22 ; :size-assert #xd0 @@ -32776,8 +32788,8 @@ ; ) ; (deftype windturbine (process-drawable) -; ((~Tspawn-particle-enable basic :offset-assert 176) -; (~Tangle-speed float :offset-assert 180) +; ((spawn-particle-enable basic :offset-assert 176) +; (angle-speed float :offset-assert 180) ; ) ; :method-count-assert 20 ; :size-assert #xb8 @@ -32799,10 +32811,10 @@ ; ) ; (deftype mis-bone-bridge (process-drawable) -; ((~Tparticle-group basic :offset-assert 176) -; (~Tplayer-attack-id int32 :offset-assert 180) -; (~Tfall-anim-index int32 :offset-assert 184) -; (~Thit-points int8 :offset-assert 188) +; ((particle-group basic :offset-assert 176) +; (player-attack-id int32 :offset-assert 180) +; (fall-anim-index int32 :offset-assert 184) +; (hit-points int8 :offset-assert 188) ; ) ; :method-count-assert 20 ; :size-assert #xbd @@ -32916,7 +32928,7 @@ ; ) ; (deftype bone-platform (rigid-body-platform) -; ((~Tanchor-point vector :inline :offset-assert 736) +; ((anchor-point vector :inline :offset-assert 736) ; ) ; :method-count-assert 35 ; :size-assert #x2f0 @@ -33024,7 +33036,7 @@ ; ) ; (deftype boat-fuelcell (process-drawable) -; ((~Tplay-cutscene? basic :offset-assert 176) +; ((play-cutscene? basic :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -33086,8 +33098,8 @@ ;; - Types ; (deftype silostep (process-drawable) -; ((~Tanim-limit float :offset-assert 176) -; (~Tcam-tracker uint64 :offset-assert 184) +; ((anim-limit float :offset-assert 176) +; (cam-tracker uint64 :offset-assert 184) ; ) ; :method-count-assert 20 ; :size-assert #xc0 @@ -33159,8 +33171,8 @@ ;; - Types ; (deftype keg-conveyor (process-drawable) -; ((~Tpivot basic :offset-assert 176) -; (~Tquat quaternion :inline :offset-assert 192) +; ((pivot basic :offset-assert 176) +; (quat quaternion :inline :offset-assert 192) ; ) ; :method-count-assert 20 ; :size-assert #xd0 @@ -33182,8 +33194,8 @@ ; ) ; (deftype keg-conveyor-paddle (process-drawable) -; ((~Tobject-on-paddle uint32 :offset-assert 176) -; (~Tsync sync-info :inline :offset-assert 180) +; ((object-on-paddle uint32 :offset-assert 176) +; (sync sync-info :inline :offset-assert 180) ; ) ; :method-count-assert 20 ; :size-assert #xbc @@ -33205,12 +33217,12 @@ ; ) ; (deftype keg (process-drawable) -; ((~Tsync-offset float :offset-assert 176) -; (~Tkeg-behavior int8 :offset-assert 180) -; (~Tpath-position vector :inline :offset-assert 192) -; (~Tshadow-enable-plane vector :inline :offset-assert 208) -; (~Tsmush smush-control :inline :offset-assert 224) -; (~Tsound-id uint32 :offset-assert 256) +; ((sync-offset float :offset-assert 176) +; (keg-behavior int8 :offset-assert 180) +; (path-position vector :inline :offset-assert 192) +; (shadow-enable-plane vector :inline :offset-assert 208) +; (smush smush-control :inline :offset-assert 224) +; (sound-id uint32 :offset-assert 256) ; ) ; :method-count-assert 20 ; :size-assert #x104 @@ -33313,16 +33325,16 @@ ;; - Types ; (deftype muse (nav-enemy) -; ((~Tcurrent-path-index float :offset-assert 400) -; (~Tprev-path-index float :offset-assert 404) -; (~Tdest-path-index float :offset-assert 408) -; (~Tplayer-path-index float :offset-assert 412) -; (~Tmax-path-index float :offset-assert 416) -; (~Tsprint-distance float :offset-assert 420) -; (~Tdest-point vector :inline :offset-assert 432) -; (~Tanim basic :offset-assert 448) -; (~Tvictory-anim basic :offset-assert 452) -; (~Told-target-pos transformq :inline :offset-assert 464) +; ((current-path-index float :offset-assert 400) +; (prev-path-index float :offset-assert 404) +; (dest-path-index float :offset-assert 408) +; (player-path-index float :offset-assert 412) +; (max-path-index float :offset-assert 416) +; (sprint-distance float :offset-assert 420) +; (dest-point vector :inline :offset-assert 432) +; (anim basic :offset-assert 448) +; (victory-anim basic :offset-assert 452) +; (old-target-pos transformq :inline :offset-assert 464) ; ) ; :method-count-assert 76 ; :size-assert #x200 @@ -33437,7 +33449,7 @@ ;; - Types ; (deftype bonelurker (nav-enemy) -; ((~Tbump-player-time uint64 :offset-assert 400) +; ((bump-player-time uint64 :offset-assert 400) ; ) ; :method-count-assert 76 ; :size-assert #x198 @@ -33568,12 +33580,12 @@ ; ) ; (deftype quicksandlurker (process-drawable) -; ((~Toriginal-position vector :inline :offset-assert 176) -; (~Ty-offset float :offset-assert 192) -; (~Ttheta-angle float :offset-assert 196) -; (~Tradial-offset float :offset-assert 200) -; (~Tbob-angle float :offset-assert 204) -; (~Tmud-entity basic :offset-assert 208) +; ((original-position vector :inline :offset-assert 176) +; (y-offset float :offset-assert 192) +; (theta-angle float :offset-assert 196) +; (radial-offset float :offset-assert 200) +; (bob-angle float :offset-assert 204) +; (mud-entity basic :offset-assert 208) ; ) ; :method-count-assert 20 ; :size-assert #xd4 @@ -33633,9 +33645,9 @@ ;; - Types ; (deftype teetertotter (process-drawable) -; ((~Tlaunched-player basic :offset-assert 176) -; (~Tin-launch-window basic :offset-assert 180) -; (~Trock-is-dangerous basic :offset-assert 184) +; ((launched-player basic :offset-assert 176) +; (in-launch-window basic :offset-assert 180) +; (rock-is-dangerous basic :offset-assert 184) ; ) ; :method-count-assert 20 ; :size-assert #xbc @@ -33695,28 +33707,28 @@ ; ) ; (deftype balloonlurker (rigid-body-platform) -; ((~Texplosion-force-position vector :inline :offset-assert 736) -; (~Texplosion-force vector :inline :offset-assert 752) -; (~Texplosion basic :offset-assert 768) -; (~Texplosion-joint-index UNKNOWN 2 :offset-assert 772) -; (~Tvulnerable basic :offset-assert 776) -; (~Twater-y float :offset-assert 780) -; (~Tpropeller basic :offset-assert 784) -; (~Trudder basic :offset-assert 788) -; (~Tmine UNKNOWN 2 :offset-assert 792) -; (~Tbuoyancy-factor float :offset-assert 800) -; (~Trudder-control float :offset-assert 804) -; (~Tthrottle-control float :offset-assert 808) -; (~Tengine-thrust float :offset-assert 812) -; (~Tdest-point vector :inline :offset-assert 816) -; (~Tdest-point-old vector :inline :offset-assert 832) -; (~Tdest-index int8 :offset-assert 848) -; (~Tauto-pilot basic :offset-assert 852) -; (~Tdead basic :offset-assert 856) -; (~Tanim-frame float :offset-assert 860) -; (~Tengine-sound-id uint32 :offset-assert 864) -; (~Tpedal-sound-id uint32 :offset-assert 868) -; (~Tframe-count int8 :offset-assert 872) +; ((explosion-force-position vector :inline :offset-assert 736) +; (explosion-force vector :inline :offset-assert 752) +; (explosion basic :offset-assert 768) +; (explosion-joint-index UNKNOWN 2 :offset-assert 772) +; (vulnerable basic :offset-assert 776) +; (water-y float :offset-assert 780) +; (propeller basic :offset-assert 784) +; (rudder basic :offset-assert 788) +; (mine UNKNOWN 2 :offset-assert 792) +; (buoyancy-factor float :offset-assert 800) +; (rudder-control float :offset-assert 804) +; (throttle-control float :offset-assert 808) +; (engine-thrust float :offset-assert 812) +; (dest-point vector :inline :offset-assert 816) +; (dest-point-old vector :inline :offset-assert 832) +; (dest-index int8 :offset-assert 848) +; (auto-pilot basic :offset-assert 852) +; (dead basic :offset-assert 856) +; (anim-frame float :offset-assert 860) +; (engine-sound-id uint32 :offset-assert 864) +; (pedal-sound-id uint32 :offset-assert 868) +; (frame-count int8 :offset-assert 872) ; ) ; :method-count-assert 35 ; :size-assert #x369 @@ -34023,7 +34035,7 @@ ;; - Types ; (deftype village2cam (pov-camera) -; ((~Tseq uint64 :offset-assert 224) +; ((seq uint64 :offset-assert 224) ; ) ; :method-count-assert 30 ; :size-assert #xe8 @@ -34055,9 +34067,9 @@ ; ) ; (deftype pontoon (rigid-body-platform) -; ((~Tanchor-point vector :inline :offset-assert 736) -; (~Ttask uint8 :offset-assert 752) -; (~Talt-task uint8 :offset-assert 753) +; ((anchor-point vector :inline :offset-assert 736) +; (task uint8 :offset-assert 752) +; (alt-task uint8 :offset-assert 753) ; ) ; :method-count-assert 35 ; :size-assert #x2f2 @@ -34166,7 +34178,7 @@ ; ) ; (deftype allpontoons (process-drawable) -; ((~Ttask uint8 :offset-assert 176) +; ((task uint8 :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb1 @@ -34188,8 +34200,8 @@ ; ) ; (deftype fireboulder (process-drawable) -; ((~Ttracker uint64 :offset-assert 176) -; (~Ttask uint8 :offset-assert 184) +; ((tracker uint64 :offset-assert 176) +; (task uint8 :offset-assert 184) ; ) ; :method-count-assert 20 ; :size-assert #xb9 @@ -34232,8 +34244,8 @@ ; ) ; (deftype exit-chamber-dummy (process-drawable) -; ((~Torig-trans vector :inline :offset-assert 176) -; (~Tfcell-handle uint64 :offset-assert 192) +; ((orig-trans vector :inline :offset-assert 176) +; (fcell-handle uint64 :offset-assert 192) ; ) ; :method-count-assert 21 ; :size-assert #xc8 @@ -34256,7 +34268,7 @@ ; ) ; (deftype ogreboss-village2 (process-drawable) -; ((~Tboulder uint64 :offset-assert 176) +; ((boulder uint64 :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb8 @@ -34687,11 +34699,11 @@ ; ) ; (deftype swamp-tetherrock (process-drawable) -; ((~Ttension float :offset-assert 176) -; (~Ttension-pt vector :inline :offset-assert 192) -; (~Tblimp basic :offset-assert 208) -; (~Trot-at-init quaternion :inline :offset-assert 224) -; (~Thits int32 :offset-assert 240) +; ((tension float :offset-assert 176) +; (tension-pt vector :inline :offset-assert 192) +; (blimp basic :offset-assert 208) +; (rot-at-init quaternion :inline :offset-assert 224) +; (hits int32 :offset-assert 240) ; ) ; :method-count-assert 20 ; :size-assert #xf4 @@ -34713,14 +34725,14 @@ ; ) ; (deftype precursor-arm (process-drawable) -; ((~Ty-init float :offset-assert 176) -; (~Ty-offset float :offset-assert 180) -; (~Trot-speed float :offset-assert 184) -; (~Trot-dist float :offset-assert 188) -; (~Trot-base float :offset-assert 192) -; (~Trot-t float :offset-assert 196) -; (~Tinit-mat matrix :inline :offset-assert 208) -; (~Ttension float :offset-assert 272) +; ((y-init float :offset-assert 176) +; (y-offset float :offset-assert 180) +; (rot-speed float :offset-assert 184) +; (rot-dist float :offset-assert 188) +; (rot-base float :offset-assert 192) +; (rot-t float :offset-assert 196) +; (init-mat matrix :inline :offset-assert 208) +; (tension float :offset-assert 272) ; ) ; :method-count-assert 20 ; :size-assert #x114 @@ -34742,18 +34754,18 @@ ; ) ; (deftype swamp-rope (process-drawable) -; ((~Tparent-rp int32 :offset-assert 176) -; (~Tother-entity basic :offset-assert 180) -; (~Tother-rp int32 :offset-assert 184) -; (~Told-scale float :offset-assert 188) -; (~Tframe swamp-rope-oscillator :inline :offset-assert 192) -; (~Tother-pos vector :inline :offset-assert 224) -; (~Tscale-base float :offset-assert 240) -; (~Tbase-vec vector :inline :offset-assert 256) -; (~Tscale-t float :offset-assert 272) -; (~Tx-t float :offset-assert 276) -; (~Tz-t float :offset-assert 280) -; (~Trot-speed float :offset-assert 284) +; ((parent-rp int32 :offset-assert 176) +; (other-entity basic :offset-assert 180) +; (other-rp int32 :offset-assert 184) +; (old-scale float :offset-assert 188) +; (frame swamp-rope-oscillator :inline :offset-assert 192) +; (other-pos vector :inline :offset-assert 224) +; (scale-base float :offset-assert 240) +; (base-vec vector :inline :offset-assert 256) +; (scale-t float :offset-assert 272) +; (x-t float :offset-assert 276) +; (z-t float :offset-assert 280) +; (rot-speed float :offset-assert 284) ; ) ; :method-count-assert 21 ; :size-assert #x120 @@ -34776,22 +34788,22 @@ ; ) ; (deftype swamp-blimp (process-drawable) -; ((~Tthe-ropes UNKNOWN 5 :offset-assert 176) -; (~Tarm-timer int32 :offset-assert 216) -; (~Ttrans-at-init vector :inline :offset-assert 224) -; (~Trot-at-init quaternion :inline :offset-assert 240) -; (~Ty-vel float :offset-assert 256) -; (~Ty-offset float :offset-assert 260) -; (~Ty-offset-target float :offset-assert 264) -; (~Tmain-tilt-rand swamp-blimp-rand-vector :inline :offset-assert 272) -; (~Tmain-tilt-oscillator swamp-blimp-oscillator :inline :offset-assert 320) -; (~Tgondola-tilt-oscillator swamp-blimp-oscillator :inline :offset-assert 384) -; (~Tpos-rand swamp-blimp-rand-vector :inline :offset-assert 448) -; (~Tpos-oscillator swamp-blimp-oscillator :inline :offset-assert 496) -; (~Tscale-rand swamp-rope-rand-float :inline :offset-assert 556) -; (~Tscale-oscillator swamp-rope-oscillator :inline :offset-assert 576) -; (~Tgondola basic :offset-assert 600) -; (~Tbag basic :offset-assert 604) +; ((the-ropes UNKNOWN 5 :offset-assert 176) +; (arm-timer int32 :offset-assert 216) +; (trans-at-init vector :inline :offset-assert 224) +; (rot-at-init quaternion :inline :offset-assert 240) +; (y-vel float :offset-assert 256) +; (y-offset float :offset-assert 260) +; (y-offset-target float :offset-assert 264) +; (main-tilt-rand swamp-blimp-rand-vector :inline :offset-assert 272) +; (main-tilt-oscillator swamp-blimp-oscillator :inline :offset-assert 320) +; (gondola-tilt-oscillator swamp-blimp-oscillator :inline :offset-assert 384) +; (pos-rand swamp-blimp-rand-vector :inline :offset-assert 448) +; (pos-oscillator swamp-blimp-oscillator :inline :offset-assert 496) +; (scale-rand swamp-rope-rand-float :inline :offset-assert 556) +; (scale-oscillator swamp-rope-oscillator :inline :offset-assert 576) +; (gondola basic :offset-assert 600) +; (bag basic :offset-assert 604) ; ) ; :method-count-assert 20 ; :size-assert #x260 @@ -34857,10 +34869,10 @@ ;; - Types ; (deftype assistant-bluehut (process-taskable) -; ((~Tsound-id uint32 :offset-assert 380) -; (~Tjaws uint64 :offset-assert 384) -; (~Tsage basic :offset-assert 392) -; (~Tim-talking basic :offset-assert 396) +; ((sound-id uint32 :offset-assert 380) +; (jaws uint64 :offset-assert 384) +; (sage basic :offset-assert 392) +; (im-talking basic :offset-assert 396) ; ) ; :method-count-assert 53 ; :size-assert #x190 @@ -34915,8 +34927,8 @@ ; ) ; (deftype sage-bluehut (process-taskable) -; ((~Treminder-played basic :offset-assert 380) -; (~Tassistant basic :offset-assert 384) +; ((reminder-played basic :offset-assert 380) +; (assistant basic :offset-assert 384) ; ) ; :method-count-assert 53 ; :size-assert #x184 @@ -35053,8 +35065,8 @@ ;; - Types ; (deftype assistant-levitator (process-taskable) -; ((~Tboulder basic :offset-assert 380) -; (~Tparticle UNKNOWN 4 :offset-assert 384) +; ((boulder basic :offset-assert 380) +; (particle UNKNOWN 4 :offset-assert 384) ; ) ; :method-count-assert 53 ; :size-assert #x190 @@ -35131,9 +35143,9 @@ ;; - Types ; (deftype sunken-elevator (plat-button) -; ((~Tplay-at-top-going-up-camera? basic :offset-assert 240) -; (~Tteleport-if-below-y float :offset-assert 244) -; (~Tteleport-if-above-y float :offset-assert 248) +; ((play-at-top-going-up-camera? basic :offset-assert 240) +; (teleport-if-below-y float :offset-assert 244) +; (teleport-if-above-y float :offset-assert 248) ; ) ; :method-count-assert 33 ; :size-assert #xfc @@ -35182,9 +35194,9 @@ ;; - Types ; (deftype swamp-spike (process-drawable) -; ((~Tsync sync-info :inline :offset-assert 176) -; (~Topen-gate basic :offset-assert 184) -; (~Tdangerous basic :offset-assert 188) +; ((sync sync-info :inline :offset-assert 176) +; (open-gate basic :offset-assert 184) +; (dangerous basic :offset-assert 188) ; ) ; :method-count-assert 21 ; :size-assert #xc0 @@ -35229,12 +35241,12 @@ ; ) ; (deftype balance-plat (process-drawable) -; ((~Ty-travel float :offset-assert 176) -; (~Ty-init float :offset-assert 180) -; (~Ty-offset float :offset-assert 184) -; (~Ty-vel float :offset-assert 188) -; (~Ty-accel float :offset-assert 192) -; (~Tgot-grow basic :offset-assert 196) +; ((y-travel float :offset-assert 176) +; (y-init float :offset-assert 180) +; (y-offset float :offset-assert 184) +; (y-vel float :offset-assert 188) +; (y-accel float :offset-assert 192) +; (got-grow basic :offset-assert 196) ; ) ; :method-count-assert 20 ; :size-assert #xc8 @@ -35277,8 +35289,8 @@ ; ) ; (deftype tar-plat (rigid-body-platform) -; ((~Tanchor-point vector :inline :offset-assert 736) -; (~Tfloat-height float :offset-assert 752) +; ((anchor-point vector :inline :offset-assert 736) +; (float-height float :offset-assert 752) ; ) ; :method-count-assert 35 ; :size-assert #x2f4 @@ -35462,13 +35474,13 @@ ; ) ; (deftype swamp-bat (process-drawable) -; ((~Tpath-origin vector :inline :offset-assert 176) -; (~Tidle-position-angle UNKNOWN 8 :offset-assert 192) -; (~Tpath-select-plane UNKNOWN 2 :offset-assert 224) -; (~Tpath-list UNKNOWN 2 :offset-assert 256) -; (~Tpath-select int8 :offset-assert 264) -; (~Tslave-count int8 :offset-assert 265) -; (~Tpath-count int8 :offset-assert 266) +; ((path-origin vector :inline :offset-assert 176) +; (idle-position-angle UNKNOWN 8 :offset-assert 192) +; (path-select-plane UNKNOWN 2 :offset-assert 224) +; (path-list UNKNOWN 2 :offset-assert 256) +; (path-select int8 :offset-assert 264) +; (slave-count int8 :offset-assert 265) +; (path-count int8 :offset-assert 266) ; ) ; :method-count-assert 20 ; :size-assert #x10b @@ -35490,16 +35502,16 @@ ; ) ; (deftype swamp-bat-slave (process-drawable) -; ((~Tsync sync-info :inline :offset-assert 176) -; (~Tidle-anim-speed float :offset-assert 184) -; (~Tstrafe-envelope float :offset-assert 188) -; (~Tstrafe-distance float :offset-assert 192) -; (~Tpath-point-count float :offset-assert 196) -; (~Tidle-path swamp-bat-idle-path :inline :offset-assert 208) -; (~Tidle-position vector :inline :offset-assert 256) -; (~Tidle-position-index int8 :offset-assert 272) -; (~Tpath-select int8 :offset-assert 273) -; (~Tlaunch-ready basic :offset-assert 276) +; ((sync sync-info :inline :offset-assert 176) +; (idle-anim-speed float :offset-assert 184) +; (strafe-envelope float :offset-assert 188) +; (strafe-distance float :offset-assert 192) +; (path-point-count float :offset-assert 196) +; (idle-path swamp-bat-idle-path :inline :offset-assert 208) +; (idle-position vector :inline :offset-assert 256) +; (idle-position-index int8 :offset-assert 272) +; (path-select int8 :offset-assert 273) +; (launch-ready basic :offset-assert 276) ; ) ; :method-count-assert 21 ; :size-assert #x118 @@ -35558,17 +35570,17 @@ ;; - Types ; (deftype swamp-rat (nav-enemy) -; ((~Tup-vector vector :inline :offset-assert 400) -; (~Tstate-float float :offset-assert 416) -; (~Tstate-vector vector :inline :offset-assert 432) -; (~Tfree-time uint64 :offset-assert 360) -; (~Twiggle-time uint64 :offset-assert 456) -; (~Twiggle-angle float :offset-assert 464) -; (~Tdelta-wiggle-angle float :offset-assert 468) -; (~Twiggle-factor float :offset-assert 472) -; (~Tmin-height float :offset-assert 476) -; (~Tchase-rest-time uint64 :offset-assert 480) -; (~Ttarget-nav-time uint64 :offset-assert 488) +; ((up-vector vector :inline :offset-assert 400) +; (state-float float :offset-assert 416) +; (state-vector vector :inline :offset-assert 432) +; (free-time uint64 :offset-assert 360) +; (wiggle-time uint64 :offset-assert 456) +; (wiggle-angle float :offset-assert 464) +; (delta-wiggle-angle float :offset-assert 468) +; (wiggle-factor float :offset-assert 472) +; (min-height float :offset-assert 476) +; (chase-rest-time uint64 :offset-assert 480) +; (target-nav-time uint64 :offset-assert 488) ; ) ; :method-count-assert 76 ; :size-assert #x1f0 @@ -35670,16 +35682,16 @@ ;; - Types ; (deftype swamp-rat-nest (process-drawable) -; ((~Tdummy uint32 :offset-assert 176) -; (~Tdamaged basic :offset-assert 180) -; (~Tdummy-type int8 :offset-assert 184) -; (~Trat-count int8 :offset-assert 185) -; (~Thit-points int8 :offset-assert 186) -; (~Tdefensive-rat-count int8 :offset-assert 187) -; (~Tspawn-period float :offset-assert 188) -; (~Tspawn-period-scale float :offset-assert 192) -; (~Ttest-interval uint64 :offset-assert 200) -; (~Tplayer-attack-id int32 :offset-assert 208) +; ((dummy uint32 :offset-assert 176) +; (damaged basic :offset-assert 180) +; (dummy-type int8 :offset-assert 184) +; (rat-count int8 :offset-assert 185) +; (hit-points int8 :offset-assert 186) +; (defensive-rat-count int8 :offset-assert 187) +; (spawn-period float :offset-assert 188) +; (spawn-period-scale float :offset-assert 192) +; (test-interval uint64 :offset-assert 200) +; (player-attack-id int32 :offset-assert 208) ; ) ; :method-count-assert 20 ; :size-assert #xd4 @@ -35701,11 +35713,11 @@ ; ) ; (deftype swamp-rat-nest-dummy (process-drawable) -; ((~Ttop-sphere sphere :inline :offset-assert 176) -; (~Tdeath-part basic :offset-assert 192) -; (~Tspawn-joint-array UNKNOWN 6 :offset-assert 196) -; (~Tspawn-joint-count int8 :offset-assert 202) -; (~Tparticle-spawn-joint int8 :offset-assert 203) +; ((top-sphere sphere :inline :offset-assert 176) +; (death-part basic :offset-assert 192) +; (spawn-joint-array UNKNOWN 6 :offset-assert 196) +; (spawn-joint-count int8 :offset-assert 202) +; (particle-spawn-joint int8 :offset-assert 203) ; ) ; :method-count-assert 22 ; :size-assert #xcc @@ -35850,7 +35862,7 @@ ; ) ; (deftype kermit-pulse (process-drawable) -; ((~Tsound-id uint32 :offset-assert 176) +; ((sound-id uint32 :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -35872,14 +35884,14 @@ ; ) ; (deftype kermit (nav-enemy) -; ((~Trotate-dir vector :inline :offset-assert 400) -; (~Tcharging-part basic :offset-assert 416) -; (~Tairborne basic :offset-assert 420) -; (~Ttongue-control basic :offset-assert 424) -; (~Ttongue-pulse-pos float :offset-assert 428) -; (~Tmiss-count int8 :offset-assert 432) -; (~Tcharged-up basic :offset-assert 436) -; (~Tsound-id uint32 :offset-assert 440) +; ((rotate-dir vector :inline :offset-assert 400) +; (charging-part basic :offset-assert 416) +; (airborne basic :offset-assert 420) +; (tongue-control basic :offset-assert 424) +; (tongue-pulse-pos float :offset-assert 428) +; (miss-count int8 :offset-assert 432) +; (charged-up basic :offset-assert 436) +; (sound-id uint32 :offset-assert 440) ; ) ; :method-count-assert 76 ; :size-assert #x1bc @@ -36040,20 +36052,20 @@ ;; - Types ; (deftype billy (process-taskable) -; ((~Tfarthy uint64 :offset-assert 384) -; (~Tpath-data UNKNOWN 3 :offset-assert 392) -; (~Tpath-snacks basic :offset-assert 392) -; (~Tpath-starts basic :offset-assert 396) -; (~Tpath-waypts basic :offset-assert 400) -; (~Tpassed-last-stage basic :offset-assert 404) -; (~Tspawn-rats basic :offset-assert 408) -; (~Tcurrent-wave int32 :offset-assert 412) -; (~Twave-start-time uint64 :offset-assert 416) -; (~Tnum-snacks int32 :offset-assert 424) -; (~Tnum-rats int32 :offset-assert 428) -; (~Tmax-rats int32 :offset-assert 432) -; (~Trat-speed float :offset-assert 436) -; (~Toffending-rat uint64 :offset-assert 440) +; ((farthy uint64 :offset-assert 384) +; (path-data UNKNOWN 3 :offset-assert 392) +; (path-snacks basic :offset-assert 392) +; (path-starts basic :offset-assert 396) +; (path-waypts basic :offset-assert 400) +; (passed-last-stage basic :offset-assert 404) +; (spawn-rats basic :offset-assert 408) +; (current-wave int32 :offset-assert 412) +; (wave-start-time uint64 :offset-assert 416) +; (num-snacks int32 :offset-assert 424) +; (num-rats int32 :offset-assert 428) +; (max-rats int32 :offset-assert 432) +; (rat-speed float :offset-assert 436) +; (offending-rat uint64 :offset-assert 440) ; ) ; :method-count-assert 53 ; :size-assert #x1c0 @@ -36108,7 +36120,7 @@ ; ) ; (deftype billy-snack (process-drawable) -; ((~Tnum-rats int32 :offset-assert 176) +; ((num-rats int32 :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -36130,10 +36142,10 @@ ; ) ; (deftype billy-rat (swamp-rat) -; ((~Tdest-type uint64 :offset-assert 496) -; (~Tsnack uint64 :offset-assert 504) -; (~Tdestination vector :inline :offset-assert 512) -; (~Tbilly uint32 :offset-assert 528) +; ((dest-type uint64 :offset-assert 496) +; (snack uint64 :offset-assert 504) +; (destination vector :inline :offset-assert 512) +; (billy uint32 :offset-assert 528) ; ) ; :method-count-assert 76 ; :size-assert #x214 @@ -36293,7 +36305,7 @@ ;; - Types ; (deftype maincavecam (pov-camera) -; ((~Tseq uint64 :offset-assert 224) +; ((seq uint64 :offset-assert 224) ; ) ; :method-count-assert 30 ; :size-assert #xe8 @@ -36377,7 +36389,7 @@ ; ) ; (deftype cavetrapdoor (process-drawable) -; ((~Tdelay-before-wiggle int32 :offset-assert 176) +; ((delay-before-wiggle int32 :offset-assert 176) ; ) ; :method-count-assert 22 ; :size-assert #xb4 @@ -36401,13 +36413,13 @@ ; ) ; (deftype caveflamepots (process-drawable) -; ((~Tshove-up float :offset-assert 176) -; (~Tcycle-speed int32 :offset-assert 180) -; (~Tcycle-pause int32 :offset-assert 184) -; (~Tcycle-offset uint32 :offset-assert 188) -; (~Twas-deadly? basic :offset-assert 192) -; (~Tshould-play-sound? basic :offset-assert 196) -; (~Tlaunch-pos UNKNOWN 2 :offset-assert 208) +; ((shove-up float :offset-assert 176) +; (cycle-speed int32 :offset-assert 180) +; (cycle-pause int32 :offset-assert 184) +; (cycle-offset uint32 :offset-assert 188) +; (was-deadly? basic :offset-assert 192) +; (should-play-sound? basic :offset-assert 196) +; (launch-pos UNKNOWN 2 :offset-assert 208) ; ) ; :method-count-assert 20 ; :size-assert #xf0 @@ -36429,7 +36441,7 @@ ; ) ; (deftype cavespatula (process-drawable) -; ((~Tsync sync-info :inline :offset-assert 176) +; ((sync sync-info :inline :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb8 @@ -36451,7 +36463,7 @@ ; ) ; (deftype cavespatulatwo (process-drawable) -; ((~Tsync sync-info :inline :offset-assert 176) +; ((sync sync-info :inline :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb8 @@ -36473,15 +36485,15 @@ ; ) ; (deftype caveelevator (process-drawable) -; ((~Telev-mode uint64 :offset-assert 176) -; (~Telev-type int32 :offset-assert 184) -; (~Tprev-frame-num float :offset-assert 188) -; (~Tlast-update-bounce-time uint64 :offset-assert 192) -; (~Torig-trans vector :inline :offset-assert 208) -; (~Tsync sync-info :inline :offset-assert 224) -; (~Tsmush smush-control :inline :offset-assert 232) -; (~Tanim UNKNOWN 2 :offset-assert 264) -; (~Twheel-ry-mat matrix :inline :offset-assert 272) +; ((elev-mode uint64 :offset-assert 176) +; (elev-type int32 :offset-assert 184) +; (prev-frame-num float :offset-assert 188) +; (last-update-bounce-time uint64 :offset-assert 192) +; (orig-trans vector :inline :offset-assert 208) +; (sync sync-info :inline :offset-assert 224) +; (smush smush-control :inline :offset-assert 232) +; (anim UNKNOWN 2 :offset-assert 264) +; (wheel-ry-mat matrix :inline :offset-assert 272) ; ) ; :method-count-assert 22 ; :size-assert #x150 @@ -36598,7 +36610,7 @@ ;; - Types ; (deftype spiderwebs (process-drawable) -; ((~Tspring-height meters :offset-assert 176) +; ((spring-height meters :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -36641,13 +36653,13 @@ ;; - Types ; (deftype dark-crystal (process-drawable) -; ((~Tcrystal-num int32 :offset-assert 176) -; (~Tunderwater? basic :offset-assert 180) -; (~Texplode-danger-radius float :offset-assert 184) -; (~Tlit-color-mult vector :inline :offset-assert 192) -; (~Tlit-color-emissive vector :inline :offset-assert 208) -; (~Tunlit-color-mult vector :inline :offset-assert 224) -; (~Tunlit-color-emissive vector :inline :offset-assert 240) +; ((crystal-num int32 :offset-assert 176) +; (underwater? basic :offset-assert 180) +; (explode-danger-radius float :offset-assert 184) +; (lit-color-mult vector :inline :offset-assert 192) +; (lit-color-emissive vector :inline :offset-assert 208) +; (unlit-color-mult vector :inline :offset-assert 224) +; (unlit-color-emissive vector :inline :offset-assert 240) ; ) ; :method-count-assert 22 ; :size-assert #x100 @@ -36711,21 +36723,21 @@ ; ) ; (deftype baby-spider (nav-enemy) -; ((~Tdie-if-not-visible? basic :offset-assert 400) -; (~Thack-move-above-ground? basic :offset-assert 404) -; (~Tstate-float float :offset-assert 408) -; (~Twiggle-angle float :offset-assert 412) -; (~Tdelta-wiggle-angle float :offset-assert 416) -; (~Twiggle-factor float :offset-assert 420) -; (~Tevent-death basic :offset-assert 424) -; (~Tdelay-before-dying-if-not-visible uint64 :offset-assert 432) -; (~Tchase-rest-time uint64 :offset-assert 440) -; (~Ttarget-nav-time uint64 :offset-assert 448) -; (~Tfree-time uint64 :offset-assert 360) -; (~Twiggle-time uint64 :offset-assert 464) -; (~Tlast-visible-time uint64 :offset-assert 472) -; (~Tup-vector vector :inline :offset-assert 480) -; (~Tstate-vector vector :inline :offset-assert 496) +; ((die-if-not-visible? basic :offset-assert 400) +; (hack-move-above-ground? basic :offset-assert 404) +; (state-float float :offset-assert 408) +; (wiggle-angle float :offset-assert 412) +; (delta-wiggle-angle float :offset-assert 416) +; (wiggle-factor float :offset-assert 420) +; (event-death basic :offset-assert 424) +; (delay-before-dying-if-not-visible uint64 :offset-assert 432) +; (chase-rest-time uint64 :offset-assert 440) +; (target-nav-time uint64 :offset-assert 448) +; (free-time uint64 :offset-assert 360) +; (wiggle-time uint64 :offset-assert 464) +; (last-visible-time uint64 :offset-assert 472) +; (up-vector vector :inline :offset-assert 480) +; (state-vector vector :inline :offset-assert 496) ; ) ; :method-count-assert 76 ; :size-assert #x200 @@ -36827,10 +36839,10 @@ ;; - Types ; (deftype mother-spider-leg (process-drawable) -; ((~Tgravity float :offset-assert 176) -; (~Ttransv vector :inline :offset-assert 192) -; (~Tfacing-rot vector :inline :offset-assert 208) -; (~Tfacing-rotv vector :inline :offset-assert 224) +; ((gravity float :offset-assert 176) +; (transv vector :inline :offset-assert 192) +; (facing-rot vector :inline :offset-assert 208) +; (facing-rotv vector :inline :offset-assert 224) ; ) ; :method-count-assert 20 ; :size-assert #xf0 @@ -36890,48 +36902,48 @@ ; ) ; (deftype mother-spider (process-drawable) -; ((~Tmode uint64 :offset-assert 176) -; (~Tdamage int32 :offset-assert 184) -; (~Tbaby-count int32 :offset-assert 188) -; (~Tmax-baby-count int32 :offset-assert 192) -; (~Tbirthing-counter int32 :offset-assert 196) -; (~Tspit-counter int32 :offset-assert 200) -; (~Tleg-socket-part-mask int32 :offset-assert 204) -; (~Tdist-from-anchor float :offset-assert 208) -; (~Ttarg-dist-from-anchor float :offset-assert 212) -; (~Tidle-dist-from-anchor float :offset-assert 216) -; (~Tplayer-sticky-dist-from-anchor float :offset-assert 220) -; (~Tmax-dist-from-anchor float :offset-assert 224) -; (~Tactivate-xz-dist float :offset-assert 228) -; (~Tdeactivate-xz-dist float :offset-assert 232) -; (~Tmax-spit-xz-dist float :offset-assert 236) -; (~Tmax-swing-radius float :offset-assert 240) -; (~Tspin-vel float :offset-assert 244) -; (~Tthread-speed float :offset-assert 248) -; (~Tthread-vel float :offset-assert 252) -; (~Thistory basic :offset-assert 256) -; (~Thistory-len int32 :offset-assert 260) -; (~Thistory-next-index int32 :offset-assert 264) -; (~Thit? basic :offset-assert 268) -; (~Tgoing-up? basic :offset-assert 272) -; (~Tcheck-z-thresh? basic :offset-assert 276) -; (~Tactivate-z-thresh float :offset-assert 280) -; (~Tdeactivate-z-thresh float :offset-assert 284) -; (~Tspawned-time uint64 :offset-assert 288) -; (~Tlast-update-time uint64 :offset-assert 296) -; (~Tspin-time uint64 :offset-assert 304) -; (~Tlast-spit-time uint64 :offset-assert 312) -; (~Tlast-player-in-air-time uint64 :offset-assert 320) -; (~Tstarted-birthing-time uint64 :offset-assert 328) -; (~Tneck basic :offset-assert 336) -; (~Tplayer-attack-id uint64 :offset-assert 344) -; (~Tleg-socket-part-time UNKNOWN 6 :offset-assert 352) -; (~Torient-rot vector :inline :offset-assert 400) -; (~Tanchor-trans vector :inline :offset-assert 416) -; (~Tthread-min-trans vector :inline :offset-assert 432) -; (~Tswing-pos vector :inline :offset-assert 448) -; (~Tswing-base-pos vector :inline :offset-assert 464) -; (~Tswing-vel vector :inline :offset-assert 480) +; ((mode uint64 :offset-assert 176) +; (damage int32 :offset-assert 184) +; (baby-count int32 :offset-assert 188) +; (max-baby-count int32 :offset-assert 192) +; (birthing-counter int32 :offset-assert 196) +; (spit-counter int32 :offset-assert 200) +; (leg-socket-part-mask int32 :offset-assert 204) +; (dist-from-anchor float :offset-assert 208) +; (targ-dist-from-anchor float :offset-assert 212) +; (idle-dist-from-anchor float :offset-assert 216) +; (player-sticky-dist-from-anchor float :offset-assert 220) +; (max-dist-from-anchor float :offset-assert 224) +; (activate-xz-dist float :offset-assert 228) +; (deactivate-xz-dist float :offset-assert 232) +; (max-spit-xz-dist float :offset-assert 236) +; (max-swing-radius float :offset-assert 240) +; (spin-vel float :offset-assert 244) +; (thread-speed float :offset-assert 248) +; (thread-vel float :offset-assert 252) +; (history basic :offset-assert 256) +; (history-len int32 :offset-assert 260) +; (history-next-index int32 :offset-assert 264) +; (hit? basic :offset-assert 268) +; (going-up? basic :offset-assert 272) +; (check-z-thresh? basic :offset-assert 276) +; (activate-z-thresh float :offset-assert 280) +; (deactivate-z-thresh float :offset-assert 284) +; (spawned-time uint64 :offset-assert 288) +; (last-update-time uint64 :offset-assert 296) +; (spin-time uint64 :offset-assert 304) +; (last-spit-time uint64 :offset-assert 312) +; (last-player-in-air-time uint64 :offset-assert 320) +; (started-birthing-time uint64 :offset-assert 328) +; (neck basic :offset-assert 336) +; (player-attack-id uint64 :offset-assert 344) +; (leg-socket-part-time UNKNOWN 6 :offset-assert 352) +; (orient-rot vector :inline :offset-assert 400) +; (anchor-trans vector :inline :offset-assert 416) +; (thread-min-trans vector :inline :offset-assert 432) +; (swing-pos vector :inline :offset-assert 448) +; (swing-base-pos vector :inline :offset-assert 464) +; (swing-vel vector :inline :offset-assert 480) ; ) ; :method-count-assert 32 ; :size-assert #x1f0 @@ -36975,14 +36987,14 @@ ;; - Types ; (deftype mother-spider-egg (process-drawable) -; ((~Tanim-speed float :offset-assert 176) -; (~Tpart2 basic :offset-assert 180) -; (~Tfalling-start-time uint64 :offset-assert 184) -; (~Tfall-dest vector :inline :offset-assert 192) -; (~Tfall-dest-normal vector :inline :offset-assert 208) -; (~Tbroken-look lod-set :inline :offset-assert 224) -; (~Ttraj trajectory :inline :offset-assert 272) -; (~Tshadow-pos vector :inline :offset-assert 320) +; ((anim-speed float :offset-assert 176) +; (part2 basic :offset-assert 180) +; (falling-start-time uint64 :offset-assert 184) +; (fall-dest vector :inline :offset-assert 192) +; (fall-dest-normal vector :inline :offset-assert 208) +; (broken-look lod-set :inline :offset-assert 224) +; (traj trajectory :inline :offset-assert 272) +; (shadow-pos vector :inline :offset-assert 320) ; ) ; :method-count-assert 22 ; :size-assert #x150 @@ -37031,7 +37043,7 @@ ;; - Types ; (deftype mother-spider-proj (projectile) -; ((~Tfacing-dir vector :inline :offset-assert 416) +; ((facing-dir vector :inline :offset-assert 416) ; ) ; :method-count-assert 29 ; :size-assert #x1b0 @@ -37111,9 +37123,9 @@ ;; - Types ; (deftype gnawer-falling-segment (process-drawable) -; ((~Ttransv vector :inline :offset-assert 176) -; (~Tfacing-rot vector :inline :offset-assert 192) -; (~Tfacing-rotv vector :inline :offset-assert 208) +; ((transv vector :inline :offset-assert 176) +; (facing-rot vector :inline :offset-assert 192) +; (facing-rotv vector :inline :offset-assert 208) ; ) ; :method-count-assert 21 ; :size-assert #xe0 @@ -37174,23 +37186,23 @@ ; ) ; (deftype gnawer (process-drawable) -; ((~Thit-points int32 :offset-assert 176) -; (~Tgnawer-id int32 :offset-assert 180) -; (~Ttotal-money int32 :offset-assert 184) -; (~Tmoney-mask uint32 :offset-assert 188) -; (~Teco-green-mask uint32 :offset-assert 192) -; (~Thidden? basic :offset-assert 196) -; (~Tshow-damage? basic :offset-assert 200) -; (~Troute-dist float :offset-assert 204) -; (~Tspeed float :offset-assert 208) -; (~Tanim-speed float :offset-assert 212) -; (~Tpart2 basic :offset-assert 216) -; (~Tsound2 basic :offset-assert 220) -; (~Tlast-hit-time uint64 :offset-assert 224) -; (~Tpost-trans vector :inline :offset-assert 240) -; (~Tfall-trans vector :inline :offset-assert 256) -; (~Troute gnawer-route :inline :offset-assert 272) -; (~Tsegments UNKNOWN 10 :offset-assert 368) +; ((hit-points int32 :offset-assert 176) +; (gnawer-id int32 :offset-assert 180) +; (total-money int32 :offset-assert 184) +; (money-mask uint32 :offset-assert 188) +; (eco-green-mask uint32 :offset-assert 192) +; (hidden? basic :offset-assert 196) +; (show-damage? basic :offset-assert 200) +; (route-dist float :offset-assert 204) +; (speed float :offset-assert 208) +; (anim-speed float :offset-assert 212) +; (part2 basic :offset-assert 216) +; (sound2 basic :offset-assert 220) +; (last-hit-time uint64 :offset-assert 224) +; (post-trans vector :inline :offset-assert 240) +; (fall-trans vector :inline :offset-assert 256) +; (route gnawer-route :inline :offset-assert 272) +; (segments UNKNOWN 10 :offset-assert 368) ; ) ; :method-count-assert 31 ; :size-assert #x5d0 @@ -37252,30 +37264,30 @@ ;; - Types ; (deftype driller-lurker (process-drawable) -; ((~Thit-player? basic :offset-assert 176) -; (~Tplayed-drill-sound? basic :offset-assert 180) -; (~Tmode uint64 :offset-assert 184) -; (~Tpath-u float :offset-assert 192) -; (~Tpath-units-per-meter float :offset-assert 196) -; (~Tpath-speed float :offset-assert 200) -; (~Ttarg-path-speed float :offset-assert 204) -; (~Tpath-dir float :offset-assert 208) -; (~Tpath-ry float :offset-assert 212) -; (~Tfacing-ry float :offset-assert 216) -; (~Tdrill-rz float :offset-assert 220) -; (~Tdrill-speed float :offset-assert 224) -; (~Tup-blend float :offset-assert 228) -; (~Tplayer-path-u float :offset-assert 232) -; (~Tambient-drilling-u float :offset-assert 236) -; (~Ttimeout int32 :offset-assert 240) -; (~Tneck basic :offset-assert 244) -; (~Tdrill basic :offset-assert 248) -; (~Tsound2 basic :offset-assert 252) -; (~Tlast-update-time uint64 :offset-assert 256) -; (~Tlast-player-path-u-time uint64 :offset-assert 264) -; (~Tstarted-chasing-time uint64 :offset-assert 272) -; (~Thit-player-time uint64 :offset-assert 280) -; (~Tplayer-attack-id uint64 :offset-assert 288) +; ((hit-player? basic :offset-assert 176) +; (played-drill-sound? basic :offset-assert 180) +; (mode uint64 :offset-assert 184) +; (path-u float :offset-assert 192) +; (path-units-per-meter float :offset-assert 196) +; (path-speed float :offset-assert 200) +; (targ-path-speed float :offset-assert 204) +; (path-dir float :offset-assert 208) +; (path-ry float :offset-assert 212) +; (facing-ry float :offset-assert 216) +; (drill-rz float :offset-assert 220) +; (drill-speed float :offset-assert 224) +; (up-blend float :offset-assert 228) +; (player-path-u float :offset-assert 232) +; (ambient-drilling-u float :offset-assert 236) +; (timeout int32 :offset-assert 240) +; (neck basic :offset-assert 244) +; (drill basic :offset-assert 248) +; (sound2 basic :offset-assert 252) +; (last-update-time uint64 :offset-assert 256) +; (last-player-path-u-time uint64 :offset-assert 264) +; (started-chasing-time uint64 :offset-assert 272) +; (hit-player-time uint64 :offset-assert 280) +; (player-attack-id uint64 :offset-assert 288) ; ) ; :method-count-assert 28 ; :size-assert #x128 @@ -37416,11 +37428,11 @@ ; ) ; (deftype slide-control (process-drawable) -; ((~Ttarget uint64 :offset-assert 176) -; (~Tpos float :offset-assert 184) -; (~Ttrans vector :inline :offset-assert 192) -; (~Trot vector :inline :offset-assert 208) -; (~Tside vector :inline :offset-assert 224) +; ((target uint64 :offset-assert 176) +; (pos float :offset-assert 184) +; (trans vector :inline :offset-assert 192) +; (rot vector :inline :offset-assert 208) +; (side vector :inline :offset-assert 224) ; ) ; :method-count-assert 22 ; :size-assert #xf0 @@ -37534,7 +37546,7 @@ ; ) ; (deftype side-to-side-plat (plat) -; ((~Tpart-ry float :offset-assert 264) +; ((part-ry float :offset-assert 264) ; ) ; :method-count-assert 33 ; :size-assert #x10c @@ -37569,7 +37581,7 @@ ; ) ; (deftype sunkencam (pov-camera) -; ((~Tseq uint64 :offset-assert 224) +; ((seq uint64 :offset-assert 224) ; ) ; :method-count-assert 30 ; :size-assert #xe8 @@ -37601,7 +37613,7 @@ ; ) ; (deftype seaweed (process-drawable) -; ((~Tanim-speed float :offset-assert 176) +; ((anim-speed float :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -37641,7 +37653,7 @@ ;; - Types ; (deftype shover (process-drawable) -; ((~Tshove-up float :offset-assert 176) +; ((shove-up float :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -37679,16 +37691,16 @@ ;; - Types ; (deftype square-platform (baseplat) -; ((~Tplat-id int32 :offset-assert 228) -; (~Tpos-u float :offset-assert 232) -; (~Twater-entity basic :offset-assert 236) -; (~Tsplash-counter int32 :offset-assert 240) -; (~Tstart-splash-time uint64 :offset-assert 248) -; (~Tpart2 basic :offset-assert 256) -; (~Tpart3 basic :offset-assert 260) -; (~Tpart4 basic :offset-assert 264) -; (~Tup-pos vector :inline :offset-assert 272) -; (~Tdown-pos vector :inline :offset-assert 288) +; ((plat-id int32 :offset-assert 228) +; (pos-u float :offset-assert 232) +; (water-entity basic :offset-assert 236) +; (splash-counter int32 :offset-assert 240) +; (start-splash-time uint64 :offset-assert 248) +; (part2 basic :offset-assert 256) +; (part3 basic :offset-assert 260) +; (part4 basic :offset-assert 264) +; (up-pos vector :inline :offset-assert 272) +; (down-pos vector :inline :offset-assert 288) ; ) ; :method-count-assert 28 ; :size-assert #x130 @@ -37751,15 +37763,15 @@ ; ) ; (deftype square-platform-master (process-drawable) -; ((~Tbutton-id int32 :offset-assert 176) -; (~Tplat-id int32 :offset-assert 180) -; (~Tplat-mask uint32 :offset-assert 184) -; (~Tplat-id-dir int32 :offset-assert 188) -; (~Twiggled? basic :offset-assert 192) -; (~Ttimeout uint64 :offset-assert 200) -; (~Tlast-plat-activated-time uint64 :offset-assert 208) -; (~Tdelay-til-wiggle uint64 :offset-assert 216) -; (~Tticker ticky :inline :offset-assert 224) +; ((button-id int32 :offset-assert 176) +; (plat-id int32 :offset-assert 180) +; (plat-mask uint32 :offset-assert 184) +; (plat-id-dir int32 :offset-assert 188) +; (wiggled? basic :offset-assert 192) +; (timeout uint64 :offset-assert 200) +; (last-plat-activated-time uint64 :offset-assert 208) +; (delay-til-wiggle uint64 :offset-assert 216) +; (ticker ticky :inline :offset-assert 224) ; ) ; :method-count-assert 20 ; :size-assert #x100 @@ -37801,16 +37813,16 @@ ;; - Types ; (deftype sun-iris-door (process-drawable) -; ((~Ttimeout float :offset-assert 176) -; (~Tproximity? basic :offset-assert 180) -; (~Tdirectional-proximity? basic :offset-assert 184) -; (~Tmove-to? basic :offset-assert 188) -; (~Tlocked-by-task? basic :offset-assert 192) -; (~Tclose-dist float :offset-assert 196) -; (~Topen-dist float :offset-assert 200) -; (~Tmove-to-pos vector :inline :offset-assert 208) -; (~Toutward-vec vector :inline :offset-assert 224) -; (~Tmove-to-quat quaternion :inline :offset-assert 240) +; ((timeout float :offset-assert 176) +; (proximity? basic :offset-assert 180) +; (directional-proximity? basic :offset-assert 184) +; (move-to? basic :offset-assert 188) +; (locked-by-task? basic :offset-assert 192) +; (close-dist float :offset-assert 196) +; (open-dist float :offset-assert 200) +; (move-to-pos vector :inline :offset-assert 208) +; (outward-vec vector :inline :offset-assert 224) +; (move-to-quat quaternion :inline :offset-assert 240) ; ) ; :method-count-assert 22 ; :size-assert #x100 @@ -37856,7 +37868,7 @@ ;; - Types ; (deftype orbit-plat-bottom (process-drawable) -; ((~Tpart2 basic :offset-assert 176) +; ((part2 basic :offset-assert 176) ; ) ; :method-count-assert 21 ; :size-assert #xb4 @@ -37879,13 +37891,13 @@ ; ) ; (deftype orbit-plat (baseplat) -; ((~Tother basic :offset-assert 228) -; (~Trot-dir float :offset-assert 232) -; (~Treset-trans vector :inline :offset-assert 240) -; (~Tis-reset? basic :offset-assert 256) -; (~Treset-length float :offset-assert 260) -; (~Ttimeout float :offset-assert 264) -; (~Tplat-status uint64 :offset-assert 272) +; ((other basic :offset-assert 228) +; (rot-dir float :offset-assert 232) +; (reset-trans vector :inline :offset-assert 240) +; (is-reset? basic :offset-assert 256) +; (reset-length float :offset-assert 260) +; (timeout float :offset-assert 264) +; (plat-status uint64 :offset-assert 272) ; ) ; :method-count-assert 29 ; :size-assert #x118 @@ -37944,10 +37956,10 @@ ;; - Types ; (deftype wedge-plat-master (process) -; ((~Tcenter vector :inline :offset-assert 112) -; (~Trotspeed float :offset-assert 128) -; (~Trotate-inner float :offset-assert 132) -; (~Trotate-outer float :offset-assert 136) +; ((center vector :inline :offset-assert 112) +; (rotspeed float :offset-assert 128) +; (rotate-inner float :offset-assert 132) +; (rotate-outer float :offset-assert 136) ; ) ; :method-count-assert 14 ; :size-assert #x8c @@ -37963,9 +37975,9 @@ ; ) ; (deftype wedge-plat (baseplat) -; ((~Tmaster basic :offset-assert 228) -; (~Tdistance float :offset-assert 232) -; (~Toffset float :offset-assert 236) +; ((master basic :offset-assert 228) +; (distance float :offset-assert 232) +; (offset float :offset-assert 236) ; ) ; :method-count-assert 28 ; :size-assert #xf0 @@ -38044,11 +38056,11 @@ ;; - Types ; (deftype wall-plat (process-drawable) -; ((~Tuse-sync? basic :offset-assert 176) -; (~Textended-amount float :offset-assert 180) -; (~Tin-trans vector :inline :offset-assert 192) -; (~Tout-trans vector :inline :offset-assert 208) -; (~Tsync sync-info-paused :inline :offset-assert 224) +; ((use-sync? basic :offset-assert 176) +; (extended-amount float :offset-assert 180) +; (in-trans vector :inline :offset-assert 192) +; (out-trans vector :inline :offset-assert 208) +; (sync sync-info-paused :inline :offset-assert 224) ; ) ; :method-count-assert 20 ; :size-assert #xf0 @@ -38110,11 +38122,11 @@ ; ) ; (deftype qbert-plat (rigid-body-platform) -; ((~Tanchor-point vector :inline :offset-assert 736) -; (~Tplat-id int32 :offset-assert 752) -; (~Ton? basic :offset-assert 756) -; (~Tplayer-is-riding? basic :offset-assert 760) -; (~Tmaster basic :offset-assert 764) +; ((anchor-point vector :inline :offset-assert 736) +; (plat-id int32 :offset-assert 752) +; (on? basic :offset-assert 756) +; (player-is-riding? basic :offset-assert 760) +; (master basic :offset-assert 764) ; ) ; :method-count-assert 35 ; :size-assert #x300 @@ -38151,17 +38163,17 @@ ; ) ; (deftype qbert-plat-master (process-drawable) -; ((~Tlast-plat-triggered int32 :offset-assert 176) -; (~Tplat-states uint32 :offset-assert 180) -; (~Tplat-states-needed-to-open-door uint32 :offset-assert 184) -; (~Tplayer-in-bounds? basic :offset-assert 188) -; (~Tplayer-in-water? basic :offset-assert 192) -; (~Tplay-door-cam? basic :offset-assert 196) -; (~Tpuzzle-beaten? basic :offset-assert 200) -; (~Tdoor basic :offset-assert 204) -; (~Tdoor-plat basic :offset-assert 208) -; (~Tbounds-start vector :inline :offset-assert 224) -; (~Tbounds-end vector :inline :offset-assert 240) +; ((last-plat-triggered int32 :offset-assert 176) +; (plat-states uint32 :offset-assert 180) +; (plat-states-needed-to-open-door uint32 :offset-assert 184) +; (player-in-bounds? basic :offset-assert 188) +; (player-in-water? basic :offset-assert 192) +; (play-door-cam? basic :offset-assert 196) +; (puzzle-beaten? basic :offset-assert 200) +; (door basic :offset-assert 204) +; (door-plat basic :offset-assert 208) +; (bounds-start vector :inline :offset-assert 224) +; (bounds-end vector :inline :offset-assert 240) ; ) ; :method-count-assert 21 ; :size-assert #x100 @@ -38220,17 +38232,17 @@ ; ) ; (deftype steam-cap (process-drawable) -; ((~Tdo-burst? basic :offset-assert 176) -; (~Tdo-falling-sound? basic :offset-assert 180) -; (~Tdo-landing-sound? basic :offset-assert 184) -; (~Tbegin-travel-up float :offset-assert 188) -; (~Tbegin-travel-down float :offset-assert 192) -; (~Tsync sync-info :inline :offset-assert 196) -; (~Tpart2 basic :offset-assert 204) -; (~Tpart3 basic :offset-assert 208) -; (~Tdown vector :inline :offset-assert 224) -; (~Tup vector :inline :offset-assert 240) -; (~Tcontrol-pt UNKNOWN 3 :offset-assert 256) +; ((do-burst? basic :offset-assert 176) +; (do-falling-sound? basic :offset-assert 180) +; (do-landing-sound? basic :offset-assert 184) +; (begin-travel-up float :offset-assert 188) +; (begin-travel-down float :offset-assert 192) +; (sync sync-info :inline :offset-assert 196) +; (part2 basic :offset-assert 204) +; (part3 basic :offset-assert 208) +; (down vector :inline :offset-assert 224) +; (up vector :inline :offset-assert 240) +; (control-pt UNKNOWN 3 :offset-assert 256) ; ) ; :method-count-assert 22 ; :size-assert #x160 @@ -38269,10 +38281,10 @@ ;; - Types ; (deftype blue-eco-charger-orb (process-drawable) -; ((~Torbit-rot vector :inline :offset-assert 176) -; (~Torbit-rotv vector :inline :offset-assert 192) -; (~Ttarg-orbit-rotv vector :inline :offset-assert 208) -; (~Trest-pos vector :inline :offset-assert 224) +; ((orbit-rot vector :inline :offset-assert 176) +; (orbit-rotv vector :inline :offset-assert 192) +; (targ-orbit-rotv vector :inline :offset-assert 208) +; (rest-pos vector :inline :offset-assert 224) ; ) ; :method-count-assert 21 ; :size-assert #xf0 @@ -38295,9 +38307,9 @@ ; ) ; (deftype blue-eco-charger (process-drawable) -; ((~Tcharger-id int32 :offset-assert 176) -; (~Topen-level float :offset-assert 180) -; (~Tmaster basic :offset-assert 184) +; ((charger-id int32 :offset-assert 176) +; (open-level float :offset-assert 180) +; (master basic :offset-assert 184) ; ) ; :method-count-assert 22 ; :size-assert #xbc @@ -38333,16 +38345,16 @@ ; ) ; (deftype exit-chamber (process-drawable) -; ((~Tchargers-active uint32 :offset-assert 176) -; (~Tmove-player? basic :offset-assert 180) -; (~Tmove-fcell? basic :offset-assert 184) -; (~Tplay-assistant-message? basic :offset-assert 188) -; (~Twave-scale float :offset-assert 192) -; (~Tbutton uint32 :offset-assert 196) -; (~Tdoor uint32 :offset-assert 200) -; (~Tfcell-handle uint64 :offset-assert 208) -; (~Torig-trans vector :inline :offset-assert 224) -; (~Tlast-pos vector :inline :offset-assert 240) +; ((chargers-active uint32 :offset-assert 176) +; (move-player? basic :offset-assert 180) +; (move-fcell? basic :offset-assert 184) +; (play-assistant-message? basic :offset-assert 188) +; (wave-scale float :offset-assert 192) +; (button uint32 :offset-assert 196) +; (door uint32 :offset-assert 200) +; (fcell-handle uint64 :offset-assert 208) +; (orig-trans vector :inline :offset-assert 224) +; (last-pos vector :inline :offset-assert 240) ; ) ; :method-count-assert 25 ; :size-assert #x100 @@ -38435,8 +38447,8 @@ ;; - Types ; (deftype floating-launcher (baseplat) -; ((~Ttrigger-height float :offset-assert 228) -; (~Tlauncher uint32 :offset-assert 232) +; ((trigger-height float :offset-assert 228) +; (launcher uint32 :offset-assert 232) ; ) ; :method-count-assert 27 ; :size-assert #xec @@ -38482,15 +38494,15 @@ ;; - Types ; (deftype sunken-water (water-anim) -; ((~Tuse-sync? basic :offset-assert 220) -; (~Tplaying-deadly-sound? basic :offset-assert 224) -; (~Tdeadly-time float :offset-assert 228) -; (~Tdeadly-fade float :offset-assert 232) -; (~Tsync sync-info :inline :offset-assert 236) -; (~Tsafe-color-mult vector :inline :offset-assert 256) -; (~Tsafe-color-emissive vector :inline :offset-assert 272) -; (~Tdeadly-color-mult vector :inline :offset-assert 288) -; (~Tdeadly-color-emissive vector :inline :offset-assert 304) +; ((use-sync? basic :offset-assert 220) +; (playing-deadly-sound? basic :offset-assert 224) +; (deadly-time float :offset-assert 228) +; (deadly-fade float :offset-assert 232) +; (sync sync-info :inline :offset-assert 236) +; (safe-color-mult vector :inline :offset-assert 256) +; (safe-color-emissive vector :inline :offset-assert 272) +; (deadly-color-mult vector :inline :offset-assert 288) +; (deadly-color-emissive vector :inline :offset-assert 304) ; ) ; :method-count-assert 31 ; :size-assert #x140 @@ -38537,10 +38549,10 @@ ;; - Types ; (deftype whirlpool (process-drawable) -; ((~Tspin-ry float :offset-assert 176) -; (~Tspin-speed-idle float :offset-assert 180) -; (~Tspin-speed-delta float :offset-assert 184) -; (~Tsync sync-info-paused :inline :offset-assert 188) +; ((spin-ry float :offset-assert 176) +; (spin-speed-idle float :offset-assert 180) +; (spin-speed-delta float :offset-assert 184) +; (sync sync-info-paused :inline :offset-assert 188) ; ) ; :method-count-assert 21 ; :size-assert #xcc @@ -38630,12 +38642,12 @@ ; ) ; (deftype sunken-pipegame (process-drawable) -; ((~Tabort-audio-if-beaten? basic :offset-assert 176) -; (~Tchallenges-mask uint32 :offset-assert 180) -; (~Tchallenge int32 :offset-assert 184) -; (~Tticker ticky :inline :offset-assert 192) -; (~Tbutton UNKNOWN 3 :offset-assert 224) -; (~Tprize UNKNOWN 3 :offset-assert 240) +; ((abort-audio-if-beaten? basic :offset-assert 176) +; (challenges-mask uint32 :offset-assert 180) +; (challenge int32 :offset-assert 184) +; (ticker ticky :inline :offset-assert 192) +; (button UNKNOWN 3 :offset-assert 224) +; (prize UNKNOWN 3 :offset-assert 240) ; ) ; :method-count-assert 23 ; :size-assert #x2a0 @@ -38703,19 +38715,19 @@ ; ) ; (deftype bully (process-drawable) -; ((~Thit-player? basic :offset-assert 176) -; (~Tbounced? basic :offset-assert 180) -; (~Tbounce-volume int32 :offset-assert 184) -; (~Tfacing-ry float :offset-assert 188) -; (~Ttravel-ry float :offset-assert 192) -; (~Tspeed-u float :offset-assert 196) -; (~Tspin-vel float :offset-assert 200) -; (~Ttravel-speed float :offset-assert 204) -; (~Treaction-delay uint64 :offset-assert 208) -; (~Tstart-spin-time uint64 :offset-assert 216) -; (~Tslow-down uint64 :offset-assert 224) -; (~Thit-player-time uint64 :offset-assert 232) -; (~Tneck basic :offset-assert 240) +; ((hit-player? basic :offset-assert 176) +; (bounced? basic :offset-assert 180) +; (bounce-volume int32 :offset-assert 184) +; (facing-ry float :offset-assert 188) +; (travel-ry float :offset-assert 192) +; (speed-u float :offset-assert 196) +; (spin-vel float :offset-assert 200) +; (travel-speed float :offset-assert 204) +; (reaction-delay uint64 :offset-assert 208) +; (start-spin-time uint64 :offset-assert 216) +; (slow-down uint64 :offset-assert 224) +; (hit-player-time uint64 :offset-assert 232) +; (neck basic :offset-assert 240) ; ) ; :method-count-assert 21 ; :size-assert #xf4 @@ -38766,7 +38778,7 @@ ;; - Types ; (deftype double-lurker-top (nav-enemy) -; ((~Tfall-dest vector :inline :offset-assert 400) +; ((fall-dest vector :inline :offset-assert 400) ; ) ; :method-count-assert 76 ; :size-assert #x1a0 @@ -38844,11 +38856,11 @@ ; ) ; (deftype double-lurker (nav-enemy) -; ((~Tknocked-back-speed float :offset-assert 400) -; (~Tbuddy-on-shoulders? basic :offset-assert 404) -; (~Tdead? basic :offset-assert 408) -; (~Tbuddy-dead? basic :offset-assert 412) -; (~Tbuddy-handle uint64 :offset-assert 416) +; ((knocked-back-speed float :offset-assert 400) +; (buddy-on-shoulders? basic :offset-assert 404) +; (dead? basic :offset-assert 408) +; (buddy-dead? basic :offset-assert 412) +; (buddy-handle uint64 :offset-assert 416) ; ) ; :method-count-assert 76 ; :size-assert #x1a8 @@ -38981,11 +38993,11 @@ ; ) ; (deftype helix-button (process-drawable) -; ((~Tmy-water basic :offset-assert 176) -; (~Tmy-door basic :offset-assert 180) -; (~Tfcell-handle uint64 :offset-assert 184) -; (~Tdown-y float :offset-assert 192) -; (~Tspawn-trans vector :inline :offset-assert 208) +; ((my-water basic :offset-assert 176) +; (my-door basic :offset-assert 180) +; (fcell-handle uint64 :offset-assert 184) +; (down-y float :offset-assert 192) +; (spawn-trans vector :inline :offset-assert 208) ; ) ; :method-count-assert 20 ; :size-assert #xe0 @@ -39038,12 +39050,12 @@ ; ) ; (deftype helix-water (process-drawable) -; ((~Tlast-alt-actor-consumed int32 :offset-assert 176) -; (~Talt-actors basic :offset-assert 180) -; (~Ttransv-y float :offset-assert 184) -; (~Tstart-y float :offset-assert 188) -; (~Tend-y float :offset-assert 192) -; (~Tdark-eco uint32 :offset-assert 196) +; ((last-alt-actor-consumed int32 :offset-assert 176) +; (alt-actors basic :offset-assert 180) +; (transv-y float :offset-assert 184) +; (start-y float :offset-assert 188) +; (end-y float :offset-assert 192) +; (dark-eco uint32 :offset-assert 196) ; ) ; :method-count-assert 22 ; :size-assert #xc8 @@ -39095,33 +39107,33 @@ ;; - Types ; (deftype puffer (process-drawable) -; ((~Tpath-index int32 :offset-assert 176) -; (~Tfacing-ry float :offset-assert 180) -; (~Ttravel-ry float :offset-assert 184) -; (~Ttravel-speed float :offset-assert 188) -; (~Tattack-bottom-y float :offset-assert 192) -; (~Tpatrol-bottom-y float :offset-assert 196) -; (~Ttop-y float :offset-assert 200) -; (~Ttarg-trans-y float :offset-assert 204) -; (~Tacc-y float :offset-assert 208) -; (~Ttravel-turn-speed float :offset-assert 212) -; (~Tnotice-dist float :offset-assert 216) -; (~Tgive-up-dist float :offset-assert 220) -; (~Tattacking? basic :offset-assert 224) -; (~Thit-player? basic :offset-assert 228) -; (~Tlook-mean? basic :offset-assert 232) -; (~Tcprims-type uint64 :offset-assert 240) -; (~Tneck basic :offset-assert 248) -; (~Thit-player-time uint64 :offset-assert 256) -; (~Treaction-delay uint64 :offset-assert 264) -; (~Tpicked-point-time uint64 :offset-assert 272) -; (~Tpick-new-point-delay uint64 :offset-assert 280) -; (~Tlast-on-screen-time uint64 :offset-assert 288) -; (~Tbuddy basic :offset-assert 296) -; (~Tnice-look lod-set :inline :offset-assert 300) -; (~Tmean-look lod-set :inline :offset-assert 336) -; (~Tdest-pos vector :inline :offset-assert 384) -; (~Tsync sync-info :inline :offset-assert 400) +; ((path-index int32 :offset-assert 176) +; (facing-ry float :offset-assert 180) +; (travel-ry float :offset-assert 184) +; (travel-speed float :offset-assert 188) +; (attack-bottom-y float :offset-assert 192) +; (patrol-bottom-y float :offset-assert 196) +; (top-y float :offset-assert 200) +; (targ-trans-y float :offset-assert 204) +; (acc-y float :offset-assert 208) +; (travel-turn-speed float :offset-assert 212) +; (notice-dist float :offset-assert 216) +; (give-up-dist float :offset-assert 220) +; (attacking? basic :offset-assert 224) +; (hit-player? basic :offset-assert 228) +; (look-mean? basic :offset-assert 232) +; (cprims-type uint64 :offset-assert 240) +; (neck basic :offset-assert 248) +; (hit-player-time uint64 :offset-assert 256) +; (reaction-delay uint64 :offset-assert 264) +; (picked-point-time uint64 :offset-assert 272) +; (pick-new-point-delay uint64 :offset-assert 280) +; (last-on-screen-time uint64 :offset-assert 288) +; (buddy basic :offset-assert 296) +; (nice-look lod-set :inline :offset-assert 300) +; (mean-look lod-set :inline :offset-assert 336) +; (dest-pos vector :inline :offset-assert 384) +; (sync sync-info :inline :offset-assert 400) ; ) ; :method-count-assert 32 ; :size-assert #x198 @@ -39192,20 +39204,20 @@ ;; - Types ; (deftype sunkenfisha (process-drawable) -; ((~Tpath-u float :offset-assert 176) -; (~Tpath-speed float :offset-assert 180) -; (~Tpath-speed-seek-speed float :offset-assert 184) -; (~Ttarg-path-speed float :offset-assert 188) -; (~Tpath-normal-speed-lo float :offset-assert 192) -; (~Tpath-normal-speed-hi float :offset-assert 196) -; (~Tpath-dir float :offset-assert 200) -; (~Tchange-path-dir-time uint64 :offset-assert 208) -; (~Tlocal-path-offset vector :inline :offset-assert 224) -; (~Ttarg-local-path-offset vector :inline :offset-assert 240) -; (~Tlocal-path-offset-dir vector :inline :offset-assert 256) -; (~Tmax-local-path-offset vector :inline :offset-assert 272) -; (~Tfacing-rot vector :inline :offset-assert 288) -; (~Tpath-trans-offset vector :inline :offset-assert 304) +; ((path-u float :offset-assert 176) +; (path-speed float :offset-assert 180) +; (path-speed-seek-speed float :offset-assert 184) +; (targ-path-speed float :offset-assert 188) +; (path-normal-speed-lo float :offset-assert 192) +; (path-normal-speed-hi float :offset-assert 196) +; (path-dir float :offset-assert 200) +; (change-path-dir-time uint64 :offset-assert 208) +; (local-path-offset vector :inline :offset-assert 224) +; (targ-local-path-offset vector :inline :offset-assert 240) +; (local-path-offset-dir vector :inline :offset-assert 256) +; (max-local-path-offset vector :inline :offset-assert 272) +; (facing-rot vector :inline :offset-assert 288) +; (path-trans-offset vector :inline :offset-assert 304) ; ) ; :method-count-assert 28 ; :size-assert #x140 @@ -39319,7 +39331,7 @@ ; ) ; (deftype pusher-base (process-drawable) -; ((~Tmax-frame float :offset-assert 176) +; ((max-frame float :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -39341,8 +39353,8 @@ ; ) ; (deftype pusher (pusher-base) -; ((~Tsync sync-info-paused :inline :offset-assert 180) -; (~Tcyl cylinder :inline :offset-assert 208) +; ((sync sync-info-paused :inline :offset-assert 180) +; (cyl cylinder :inline :offset-assert 208) ; ) ; :method-count-assert 20 ; :size-assert #xf8 @@ -39364,7 +39376,7 @@ ; ) ; (deftype gorge-pusher (pusher-base) -; ((~Tmin-frame float :offset-assert 180) +; ((min-frame float :offset-assert 180) ; ) ; :method-count-assert 20 ; :size-assert #xb8 @@ -39386,8 +39398,8 @@ ; ) ; (deftype dark-plant (process-drawable) -; ((~Tnum-alts int32 :offset-assert 176) -; (~Talts UNKNOWN 4 :offset-assert 180) +; ((num-alts int32 :offset-assert 176) +; (alts UNKNOWN 4 :offset-assert 180) ; ) ; :method-count-assert 20 ; :size-assert #xc4 @@ -39409,7 +39421,7 @@ ; ) ; (deftype happy-plant (process-drawable) -; ((~Talt-actor basic :offset-assert 176) +; ((alt-actor basic :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -39439,8 +39451,8 @@ ; ) ; (deftype rolling-start (process-drawable) -; ((~Twhole-look lod-set :inline :offset-assert 176) -; (~Tbroken-look lod-set :inline :offset-assert 212) +; ((whole-look lod-set :inline :offset-assert 176) +; (broken-look lod-set :inline :offset-assert 212) ; ) ; :method-count-assert 20 ; :size-assert #xf5 @@ -39462,9 +39474,9 @@ ; ) ; (deftype gorge (process-drawable) -; ((~Tcoord matrix :inline :offset-assert 176) -; (~Tradius float :offset-assert 240) -; (~Tthickness float :offset-assert 244) +; ((coord matrix :inline :offset-assert 176) +; (radius float :offset-assert 240) +; (thickness float :offset-assert 244) ; ) ; :method-count-assert 20 ; :size-assert #xf8 @@ -39486,13 +39498,13 @@ ; ) ; (deftype gorge-start (gorge) -; ((~Ttasks basic :offset-assert 248) -; (~Trecord-time race-time :inline :offset-assert 252) -; (~Tthis-time race-time :inline :offset-assert 257) -; (~Tstart-banner uint64 :offset-assert 264) -; (~Tend-banner uint64 :offset-assert 272) -; (~Ttimer-pos-offset int32 :offset-assert 280) -; (~Tticker ticky :inline :offset-assert 288) +; ((tasks basic :offset-assert 248) +; (record-time race-time :inline :offset-assert 252) +; (this-time race-time :inline :offset-assert 257) +; (start-banner uint64 :offset-assert 264) +; (end-banner uint64 :offset-assert 272) +; (timer-pos-offset int32 :offset-assert 280) +; (ticker ticky :inline :offset-assert 288) ; ) ; :method-count-assert 20 ; :size-assert #x140 @@ -39514,7 +39526,7 @@ ; ) ; (deftype gorge-finish (gorge) -; ((~Talt-actor basic :offset-assert 248) +; ((alt-actor basic :offset-assert 248) ; ) ; :method-count-assert 20 ; :size-assert #xfc @@ -39677,12 +39689,12 @@ ; ) ; (deftype fleeing-nav-enemy (nav-enemy) -; ((~Tlast-reflection-time uint64 :offset-assert 400) -; (~Trun-blend-interp float :offset-assert 408) -; (~Tdesired-travel vector :inline :offset-assert 416) -; (~Tsaved-travel vector :inline :offset-assert 432) -; (~Tspeed-adjust float :offset-assert 448) -; (~Tflee-info fleeing-nav-enemy-info :inline :offset-assert 452) +; ((last-reflection-time uint64 :offset-assert 400) +; (run-blend-interp float :offset-assert 408) +; (desired-travel vector :inline :offset-assert 416) +; (saved-travel vector :inline :offset-assert 432) +; (speed-adjust float :offset-assert 448) +; (flee-info fleeing-nav-enemy-info :inline :offset-assert 452) ; ) ; :method-count-assert 76 ; :size-assert #x20c @@ -39760,8 +39772,8 @@ ; ) ; (deftype lightning-mole (fleeing-nav-enemy) -; ((~Tdebug-vector vector :inline :offset-assert 528) -; (~Talt-actor basic :offset-assert 544) +; ((debug-vector vector :inline :offset-assert 528) +; (alt-actor basic :offset-assert 544) ; ) ; :method-count-assert 76 ; :size-assert #x224 @@ -39903,20 +39915,20 @@ ;; - Types ; (deftype robber (process-drawable) -; ((~Tcurve-position float :offset-assert 176) -; (~Tspeed float :offset-assert 180) -; (~Tfacing vector :inline :offset-assert 192) -; (~Ttangent vector :inline :offset-assert 208) -; (~Trun-blend-interp float :offset-assert 224) -; (~Tnear-timer int32 :offset-assert 228) -; (~Tfar-time uint64 :offset-assert 232) -; (~Ty-offset float :offset-assert 240) -; (~Ty-offset-desired float :offset-assert 244) -; (~Ty-vel float :offset-assert 248) -; (~Twater-height float :offset-assert 252) -; (~Ttimeout uint64 :offset-assert 256) -; (~Tlast-ambient-time uint64 :offset-assert 264) -; (~Ttime-to-next-ambient uint64 :offset-assert 272) +; ((curve-position float :offset-assert 176) +; (speed float :offset-assert 180) +; (facing vector :inline :offset-assert 192) +; (tangent vector :inline :offset-assert 208) +; (run-blend-interp float :offset-assert 224) +; (near-timer int32 :offset-assert 228) +; (far-time uint64 :offset-assert 232) +; (y-offset float :offset-assert 240) +; (y-offset-desired float :offset-assert 244) +; (y-vel float :offset-assert 248) +; (water-height float :offset-assert 252) +; (timeout uint64 :offset-assert 256) +; (last-ambient-time uint64 :offset-assert 264) +; (time-to-next-ambient uint64 :offset-assert 272) ; ) ; :method-count-assert 20 ; :size-assert #x118 @@ -39973,15 +39985,15 @@ ;; - Types ; (deftype race-ring (process-drawable) -; ((~Trot-y float :offset-assert 176) -; (~Tface-vec vector :inline :offset-assert 192) -; (~Tpart-track uint64 :offset-assert 208) -; (~Tkeep-part-track-alive basic :offset-assert 216) -; (~Ttimeout uint64 :offset-assert 224) -; (~Talt-actor basic :offset-assert 232) -; (~Talt-task uint8 :offset-assert 236) -; (~Tcyl cylinder-flat :inline :offset-assert 240) -; (~Told-hips vector :inline :offset-assert 288) +; ((rot-y float :offset-assert 176) +; (face-vec vector :inline :offset-assert 192) +; (part-track uint64 :offset-assert 208) +; (keep-part-track-alive basic :offset-assert 216) +; (timeout uint64 :offset-assert 224) +; (alt-actor basic :offset-assert 232) +; (alt-task uint8 :offset-assert 236) +; (cyl cylinder-flat :inline :offset-assert 240) +; (old-hips vector :inline :offset-assert 288) ; ) ; :method-count-assert 20 ; :size-assert #x130 @@ -40048,7 +40060,7 @@ ; ) ; (deftype spike (process-drawable) -; ((~Tnum-alts int32 :offset-assert 176) +; ((num-alts int32 :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -40272,12 +40284,12 @@ ; ) ; (deftype ogre-plat (rigid-body-platform) -; ((~Tanchor-point vector :inline :offset-assert 736) -; (~Tidle-y-offset float :offset-assert 752) -; (~Tfloat-y-offset float :offset-assert 756) -; (~Tdelay uint64 :offset-assert 760) -; (~Tactive basic :offset-assert 768) -; (~Ttriggered basic :offset-assert 772) +; ((anchor-point vector :inline :offset-assert 736) +; (idle-y-offset float :offset-assert 752) +; (float-y-offset float :offset-assert 756) +; (delay uint64 :offset-assert 760) +; (active basic :offset-assert 768) +; (triggered basic :offset-assert 772) ; ) ; :method-count-assert 35 ; :size-assert #x308 @@ -40638,8 +40650,8 @@ ; ) ; (deftype ogre-bridge (process-drawable) -; ((~Tjoint-mod-array UNKNOWN 8 :offset-assert 176) -; (~Tdead-joint-count int8 :offset-assert 208) +; ((joint-mod-array UNKNOWN 8 :offset-assert 176) +; (dead-joint-count int8 :offset-assert 208) ; ) ; :method-count-assert 20 ; :size-assert #xd1 @@ -40682,8 +40694,8 @@ ; ) ; (deftype ogre-lava (water-anim) -; ((~Tidle-anim int32 :offset-assert 220) -; (~Tanim int32 :offset-assert 224) +; ((idle-anim int32 :offset-assert 220) +; (anim int32 :offset-assert 224) ; ) ; :method-count-assert 30 ; :size-assert #xe4 @@ -40715,7 +40727,7 @@ ; ) ; (deftype shortcut-boulder (process-drawable) -; ((~Tbroken-look lod-set :inline :offset-assert 176) +; ((broken-look lod-set :inline :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xd1 @@ -40778,8 +40790,8 @@ ;; - Types ; (deftype plunger-lurker (process-drawable) -; ((~Talt-actor basic :offset-assert 176) -; (~Tgot-hit basic :offset-assert 180) +; ((alt-actor basic :offset-assert 176) +; (got-hit basic :offset-assert 180) ; ) ; :method-count-assert 20 ; :size-assert #xb8 @@ -40801,25 +40813,25 @@ ; ) ; (deftype flying-lurker (process-drawable) -; ((~Tcurve-position float :offset-assert 176) -; (~Tspeed float :offset-assert 180) -; (~Ttangent vector :inline :offset-assert 192) -; (~Tanim-blend float :offset-assert 208) -; (~Ty-offset float :offset-assert 212) -; (~Ty-offset-desired float :offset-assert 216) -; (~Ty-vel float :offset-assert 220) -; (~Tlast-look-time uint64 :offset-assert 224) -; (~Ttime-to-next-look uint64 :offset-assert 232) -; (~Ttake-off basic :offset-assert 240) -; (~Trace-seconds float :offset-assert 244) -; (~Trace-start-time uint64 :offset-assert 248) -; (~Trank int32 :offset-assert 256) -; (~Talt-actor basic :offset-assert 260) -; (~Talt-trans vector :offset-assert 264) -; (~Tshadow-backup basic :offset-assert 268) -; (~Ttry-count uint8 :offset-assert 272) -; (~Ttry-counted basic :offset-assert 276) -; (~Tdefault-bounds vector :inline :offset-assert 288) +; ((curve-position float :offset-assert 176) +; (speed float :offset-assert 180) +; (tangent vector :inline :offset-assert 192) +; (anim-blend float :offset-assert 208) +; (y-offset float :offset-assert 212) +; (y-offset-desired float :offset-assert 216) +; (y-vel float :offset-assert 220) +; (last-look-time uint64 :offset-assert 224) +; (time-to-next-look uint64 :offset-assert 232) +; (take-off basic :offset-assert 240) +; (race-seconds float :offset-assert 244) +; (race-start-time uint64 :offset-assert 248) +; (rank int32 :offset-assert 256) +; (alt-actor basic :offset-assert 260) +; (alt-trans vector :offset-assert 264) +; (shadow-backup basic :offset-assert 268) +; (try-count uint8 :offset-assert 272) +; (try-counted basic :offset-assert 276) +; (default-bounds vector :inline :offset-assert 288) ; ) ; :method-count-assert 21 ; :size-assert #x130 @@ -40929,8 +40941,8 @@ ; ) ; (deftype gondola (process-drawable) -; ((~Tanim basic :offset-assert 176) -; (~Told-target-pos transformq :inline :offset-assert 192) +; ((anim basic :offset-assert 176) +; (old-target-pos transformq :inline :offset-assert 192) ; ) ; :method-count-assert 23 ; :size-assert #xf0 @@ -41021,9 +41033,9 @@ ;; - Types ; (deftype minecartsteel (process-drawable) -; ((~Tindex int32 :offset-assert 176) -; (~Tanim basic :offset-assert 180) -; (~Tsync sync-info :inline :offset-assert 184) +; ((index int32 :offset-assert 176) +; (anim basic :offset-assert 180) +; (sync sync-info :inline :offset-assert 184) ; ) ; :method-count-assert 21 ; :size-assert #xc0 @@ -41118,7 +41130,7 @@ ; ) ; (deftype minershort (process-taskable) -; ((~Tother-miner basic :offset-assert 380) +; ((other-miner basic :offset-assert 380) ; ) ; :method-count-assert 53 ; :size-assert #x180 @@ -41284,9 +41296,9 @@ ;; - Types ; (deftype sage-villagec (process-taskable) -; ((~Tevilbro uint64 :offset-assert 384) -; (~Tevilsis uint64 :offset-assert 392) -; (~Tassistant basic :offset-assert 400) +; ((evilbro uint64 :offset-assert 384) +; (evilsis uint64 :offset-assert 392) +; (assistant basic :offset-assert 400) ; ) ; :method-count-assert 53 ; :size-assert #x194 @@ -41357,11 +41369,11 @@ ;; - Types ; (deftype cave-trap (process-drawable) -; ((~Tspider-count int32 :offset-assert 176) -; (~Talt-actors basic :offset-assert 180) -; (~Tspawn-delay uint64 :offset-assert 184) -; (~Tlast-spawn-time uint64 :offset-assert 192) -; (~Tdebug-targ-pos vector :inline :offset-assert 208) +; ((spider-count int32 :offset-assert 176) +; (alt-actors basic :offset-assert 180) +; (spawn-delay uint64 :offset-assert 184) +; (last-spawn-time uint64 :offset-assert 192) +; (debug-targ-pos vector :inline :offset-assert 208) ; ) ; :method-count-assert 21 ; :size-assert #xe0 @@ -41384,7 +41396,7 @@ ; ) ; (deftype spider-vent (process-drawable) -; ((~Tlast-spawn-time uint64 :offset-assert 176) +; ((last-spawn-time uint64 :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb8 @@ -41444,8 +41456,8 @@ ;; - Types ; (deftype spider-egg (process-drawable) -; ((~Tnotify-actor basic :offset-assert 176) -; (~Tbroken-look lod-set :inline :offset-assert 180) +; ((notify-actor basic :offset-assert 176) +; (broken-look lod-set :inline :offset-assert 180) ; ) ; :method-count-assert 20 ; :size-assert #xd5 @@ -41560,22 +41572,22 @@ ;; - Types ; (deftype ice-cube (nav-enemy) -; ((~Tpart2 basic :offset-assert 400) -; (~Tpart3 basic :offset-assert 404) -; (~Tpart4 basic :offset-assert 408) -; (~Ttrack-target? basic :offset-assert 412) -; (~Tslow-down? basic :offset-assert 416) -; (~Ttracking-player? basic :offset-assert 420) -; (~Tforce-spawn-pt int32 :offset-assert 424) -; (~Tspeed float :offset-assert 428) -; (~Tanim-blend float :offset-assert 432) -; (~Tprev-charge-angle-diff float :offset-assert 436) -; (~Tcharge-angle float :offset-assert 440) -; (~Tground-y float :offset-assert 444) -; (~Tcprims-type uint64 :offset-assert 448) -; (~Tnext-skid-sound-time uint64 :offset-assert 456) -; (~Tstarting-pos vector :inline :offset-assert 464) -; (~Ttarget-pt vector :inline :offset-assert 480) +; ((part2 basic :offset-assert 400) +; (part3 basic :offset-assert 404) +; (part4 basic :offset-assert 408) +; (track-target? basic :offset-assert 412) +; (slow-down? basic :offset-assert 416) +; (tracking-player? basic :offset-assert 420) +; (force-spawn-pt int32 :offset-assert 424) +; (speed float :offset-assert 428) +; (anim-blend float :offset-assert 432) +; (prev-charge-angle-diff float :offset-assert 436) +; (charge-angle float :offset-assert 440) +; (ground-y float :offset-assert 444) +; (cprims-type uint64 :offset-assert 448) +; (next-skid-sound-time uint64 :offset-assert 456) +; (starting-pos vector :inline :offset-assert 464) +; (target-pt vector :inline :offset-assert 480) ; ) ; :method-count-assert 76 ; :size-assert #x1f0 @@ -41723,20 +41735,20 @@ ; ) ; (deftype snow-ball-roller (process-drawable) -; ((~Twhich-path int32 :offset-assert 176) -; (~Tpath-u float :offset-assert 180) -; (~Tpath-speed float :offset-assert 184) -; (~Tpath-length float :offset-assert 188) -; (~Tpath-fall-u float :offset-assert 192) -; (~Tpath-coming-out-u float :offset-assert 196) -; (~Tpath-faded-up-u float :offset-assert 200) -; (~Tdelay-til-bounce int32 :offset-assert 204) -; (~Trolling-sound-id uint32 :offset-assert 208) -; (~Trolling-sound-enabled? basic :offset-assert 212) -; (~Tlast-bounce-time uint64 :offset-assert 216) -; (~Thit-player-time uint64 :offset-assert 224) -; (~Tpath-info snow-ball-path-info :inline :offset-assert 240) -; (~Tjunctions UNKNOWN 4 :offset-assert 272) +; ((which-path int32 :offset-assert 176) +; (path-u float :offset-assert 180) +; (path-speed float :offset-assert 184) +; (path-length float :offset-assert 188) +; (path-fall-u float :offset-assert 192) +; (path-coming-out-u float :offset-assert 196) +; (path-faded-up-u float :offset-assert 200) +; (delay-til-bounce int32 :offset-assert 204) +; (rolling-sound-id uint32 :offset-assert 208) +; (rolling-sound-enabled? basic :offset-assert 212) +; (last-bounce-time uint64 :offset-assert 216) +; (hit-player-time uint64 :offset-assert 224) +; (path-info snow-ball-path-info :inline :offset-assert 240) +; (junctions UNKNOWN 4 :offset-assert 272) ; ) ; :method-count-assert 23 ; :size-assert #x150 @@ -41761,11 +41773,11 @@ ; ) ; (deftype snow-ball (process) -; ((~Tstate-time uint64 :offset-assert 112) -; (~Tlast-path-picked int32 :offset-assert 120) -; (~Tsame-path-picked-count int32 :offset-assert 124) -; (~Tdelay-til-next int32 :offset-assert 128) -; (~Tpath UNKNOWN 2 :offset-assert 132) +; ((state-time uint64 :offset-assert 112) +; (last-path-picked int32 :offset-assert 120) +; (same-path-picked-count int32 :offset-assert 124) +; (delay-til-next int32 :offset-assert 128) +; (path UNKNOWN 2 :offset-assert 132) ; ) ; :method-count-assert 16 ; :size-assert #x8c @@ -41809,7 +41821,7 @@ ;; - Types ; (deftype snowcam (pov-camera) -; ((~Tseq uint64 :offset-assert 224) +; ((seq uint64 :offset-assert 224) ; ) ; :method-count-assert 30 ; :size-assert #xe8 @@ -41841,8 +41853,8 @@ ; ) ; (deftype snow-eggtop (process-drawable) -; ((~Tspawn-trans vector :inline :offset-assert 176) -; (~Tplay-sound? basic :offset-assert 192) +; ((spawn-trans vector :inline :offset-assert 176) +; (play-sound? basic :offset-assert 192) ; ) ; :method-count-assert 20 ; :size-assert #xc4 @@ -41864,10 +41876,10 @@ ; ) ; (deftype snowpusher (process-drawable) -; ((~Tmax-frame float :offset-assert 176) -; (~Topen-sound uint128 :offset-assert 192) -; (~Tclose-sound uint128 :offset-assert 208) -; (~Tsync sync-info-paused :inline :offset-assert 224) +; ((max-frame float :offset-assert 176) +; (open-sound uint128 :offset-assert 192) +; (close-sound uint128 :offset-assert 208) +; (sync sync-info-paused :inline :offset-assert 224) ; ) ; :method-count-assert 20 ; :size-assert #xf0 @@ -41889,8 +41901,8 @@ ; ) ; (deftype snow-spatula (baseplat) -; ((~Tsync sync-info :inline :offset-assert 228) -; (~Tstartmat matrix :inline :offset-assert 240) +; ((sync sync-info :inline :offset-assert 228) +; (startmat matrix :inline :offset-assert 240) ; ) ; :method-count-assert 27 ; :size-assert #x130 @@ -41919,10 +41931,10 @@ ; ) ; (deftype snow-fort-gate (process-drawable) -; ((~Tpart2 basic :offset-assert 176) -; (~Tpart3 basic :offset-assert 180) -; (~Topen-trans vector :inline :offset-assert 192) -; (~Tclosed-trans vector :inline :offset-assert 208) +; ((part2 basic :offset-assert 176) +; (part3 basic :offset-assert 180) +; (open-trans vector :inline :offset-assert 192) +; (closed-trans vector :inline :offset-assert 208) ; ) ; :method-count-assert 20 ; :size-assert #xe0 @@ -41966,9 +41978,9 @@ ; ) ; (deftype snow-switch (process-drawable) -; ((~Tpressed? basic :offset-assert 176) -; (~Tfcell-handle uint64 :offset-assert 184) -; (~Torig-trans vector :inline :offset-assert 192) +; ((pressed? basic :offset-assert 176) +; (fcell-handle uint64 :offset-assert 184) +; (orig-trans vector :inline :offset-assert 192) ; ) ; :method-count-assert 20 ; :size-assert #xd0 @@ -41990,7 +42002,7 @@ ; ) ; (deftype snow-log (process-drawable) -; ((~Tmaster basic :offset-assert 176) +; ((master basic :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -42012,8 +42024,8 @@ ; ) ; (deftype snow-log-button (process-drawable) -; ((~Tlog basic :offset-assert 176) -; (~Torig-trans vector :inline :offset-assert 192) +; ((log basic :offset-assert 176) +; (orig-trans vector :inline :offset-assert 192) ; ) ; :method-count-assert 20 ; :size-assert #xd0 @@ -42083,18 +42095,18 @@ ;; - Types ; (deftype flutflut-plat (plat) -; ((~Thas-path? basic :offset-assert 264) -; (~Tplat-type int32 :offset-assert 268) -; (~Trise-time int32 :offset-assert 272) -; (~Tfall-time int32 :offset-assert 276) -; (~Tpart-ry float :offset-assert 280) -; (~Tsync-starting-val float :offset-assert 284) -; (~Tflutflut-button basic :offset-assert 288) -; (~Tappear-trans-top vector :inline :offset-assert 304) -; (~Tappear-trans-bottom vector :inline :offset-assert 320) -; (~Tappear-quat-top quaternion :inline :offset-assert 336) -; (~Tappear-quat-bottom quaternion :inline :offset-assert 352) -; (~Tstart-trans vector :inline :offset-assert 368) +; ((has-path? basic :offset-assert 264) +; (plat-type int32 :offset-assert 268) +; (rise-time int32 :offset-assert 272) +; (fall-time int32 :offset-assert 276) +; (part-ry float :offset-assert 280) +; (sync-starting-val float :offset-assert 284) +; (flutflut-button basic :offset-assert 288) +; (appear-trans-top vector :inline :offset-assert 304) +; (appear-trans-bottom vector :inline :offset-assert 320) +; (appear-quat-top quaternion :inline :offset-assert 336) +; (appear-quat-bottom quaternion :inline :offset-assert 352) +; (start-trans vector :inline :offset-assert 368) ; ) ; :method-count-assert 33 ; :size-assert #x180 @@ -42129,11 +42141,11 @@ ; ) ; (deftype snow-button (process-drawable) -; ((~Twiggled? basic :offset-assert 176) -; (~Ttimeout uint64 :offset-assert 184) -; (~Tdelay-til-wiggle uint64 :offset-assert 192) -; (~Tprev-button basic :offset-assert 200) -; (~Tticker ticky :inline :offset-assert 208) +; ((wiggled? basic :offset-assert 176) +; (timeout uint64 :offset-assert 184) +; (delay-til-wiggle uint64 :offset-assert 192) +; (prev-button basic :offset-assert 200) +; (ticker ticky :inline :offset-assert 208) ; ) ; :method-count-assert 20 ; :size-assert #xf0 @@ -42284,11 +42296,11 @@ ;; - Types ; (deftype snow-bumper (process-drawable) -; ((~Tbumper-id int32 :offset-assert 176) -; (~Tbase-shove-ry float :offset-assert 180) -; (~Tmax-shove-diff-ry float :offset-assert 184) -; (~Tpart2 basic :offset-assert 188) -; (~Tlast-shoved-player-time uint64 :offset-assert 192) +; ((bumper-id int32 :offset-assert 176) +; (base-shove-ry float :offset-assert 180) +; (max-shove-diff-ry float :offset-assert 184) +; (part2 basic :offset-assert 188) +; (last-shoved-player-time uint64 :offset-assert 192) ; ) ; :method-count-assert 22 ; :size-assert #xc8 @@ -42331,12 +42343,12 @@ ;; - Types ; (deftype ram (process-drawable) -; ((~Tram-id int32 :offset-assert 176) -; (~Tgive-fuel-cell? basic :offset-assert 180) -; (~Tgive-fuel-cell-anim basic :offset-assert 184) -; (~Tpart2 basic :offset-assert 188) -; (~Torient-ry float :offset-assert 192) -; (~Tfuel-cell-dest-pos vector :inline :offset-assert 208) +; ((ram-id int32 :offset-assert 176) +; (give-fuel-cell? basic :offset-assert 180) +; (give-fuel-cell-anim basic :offset-assert 184) +; (part2 basic :offset-assert 188) +; (orient-ry float :offset-assert 192) +; (fuel-cell-dest-pos vector :inline :offset-assert 208) ; ) ; :method-count-assert 23 ; :size-assert #xe0 @@ -42371,12 +42383,12 @@ ;; - Types ; (deftype ram-boss-proj (projectile) -; ((~Tpart2 basic :offset-assert 412) -; (~Tlaunched? basic :offset-assert 416) -; (~Tgrowth float :offset-assert 420) -; (~Tcharge-sound-id uint32 :offset-assert 424) -; (~Tlaunch-time uint64 :offset-assert 432) -; (~Tfacing-dir vector :inline :offset-assert 448) +; ((part2 basic :offset-assert 412) +; (launched? basic :offset-assert 416) +; (growth float :offset-assert 420) +; (charge-sound-id uint32 :offset-assert 424) +; (launch-time uint64 :offset-assert 432) +; (facing-dir vector :inline :offset-assert 448) ; ) ; :method-count-assert 29 ; :size-assert #x1d0 @@ -42407,20 +42419,20 @@ ; ) ; (deftype ram-boss (nav-enemy) -; ((~Tfacing-y float :offset-assert 400) -; (~Tplayer-dir-y float :offset-assert 404) -; (~Tlast-turn-speed float :offset-assert 408) -; (~Tfrustration int32 :offset-assert 412) -; (~Tdead? basic :offset-assert 416) -; (~Thas-shield? basic :offset-assert 420) -; (~Tproj-stoked basic :offset-assert 424) -; (~Tproj-status uint64 :offset-assert 432) -; (~Tpart2 basic :offset-assert 440) -; (~Tproj-last-thrown-time uint64 :offset-assert 448) -; (~Tnav-enemy-patrol-timeout uint64 :offset-assert 456) -; (~Tproj-launch-vec vector :inline :offset-assert 464) -; (~Tlocal-throw-point vector :inline :offset-assert 480) -; (~Tshield-jmod basic :offset-assert 496) +; ((facing-y float :offset-assert 400) +; (player-dir-y float :offset-assert 404) +; (last-turn-speed float :offset-assert 408) +; (frustration int32 :offset-assert 412) +; (dead? basic :offset-assert 416) +; (has-shield? basic :offset-assert 420) +; (proj-stoked basic :offset-assert 424) +; (proj-status uint64 :offset-assert 432) +; (part2 basic :offset-assert 440) +; (proj-last-thrown-time uint64 :offset-assert 448) +; (nav-enemy-patrol-timeout uint64 :offset-assert 456) +; (proj-launch-vec vector :inline :offset-assert 464) +; (local-throw-point vector :inline :offset-assert 480) +; (shield-jmod basic :offset-assert 496) ; ) ; :method-count-assert 76 ; :size-assert #x1f4 @@ -42585,8 +42597,8 @@ ;; - Types ; (deftype yeti-slave (nav-enemy) -; ((~Tground-y float :offset-assert 400) -; (~Tpart2 basic :offset-assert 404) +; ((ground-y float :offset-assert 400) +; (part2 basic :offset-assert 404) ; ) ; :method-count-assert 76 ; :size-assert #x198 @@ -42664,10 +42676,10 @@ ; ) ; (deftype yeti (process-drawable) -; ((~Tdesired-num-children int32 :offset-assert 176) -; (~Tspawn-delay int32 :offset-assert 180) -; (~Tfirst-time-spawn-dist float :offset-assert 184) -; (~Tstate-time uint64 :offset-assert 168) +; ((desired-num-children int32 :offset-assert 176) +; (spawn-delay int32 :offset-assert 180) +; (first-time-spawn-dist float :offset-assert 184) +; (state-time uint64 :offset-assert 168) ; ) ; :method-count-assert 22 ; :size-assert #xc8 @@ -42834,8 +42846,8 @@ ; ) ; (deftype darkecobarrel-base (process-drawable) -; ((~Tspeed float :offset-assert 176) -; (~Tsync uint64 :offset-assert 184) +; ((speed float :offset-assert 176) +; (sync uint64 :offset-assert 184) ; ) ; :method-count-assert 20 ; :size-assert #xc0 @@ -42857,13 +42869,13 @@ ; ) ; (deftype darkecobarrel-mover (darkecobarrel-base) -; ((~Tstart-time uint64 :offset-assert 192) -; (~Thits int32 :offset-assert 200) -; (~Tleak UNKNOWN 1 :offset-assert 208) -; (~Ty-offset bouncing-float :inline :offset-assert 240) -; (~Ty-offset-tgt delayed-rand-float :inline :offset-assert 280) -; (~Tdown oscillating-vector :inline :offset-assert 320) -; (~Tdown-tgt delayed-rand-vector :inline :offset-assert 384) +; ((start-time uint64 :offset-assert 192) +; (hits int32 :offset-assert 200) +; (leak UNKNOWN 1 :offset-assert 208) +; (y-offset bouncing-float :inline :offset-assert 240) +; (y-offset-tgt delayed-rand-float :inline :offset-assert 280) +; (down oscillating-vector :inline :offset-assert 320) +; (down-tgt delayed-rand-vector :inline :offset-assert 384) ; ) ; :method-count-assert 20 ; :size-assert #x1b0 @@ -42885,8 +42897,8 @@ ; ) ; (deftype darkecobarrel (darkecobarrel-base) -; ((~Tspawn-array basic :offset-assert 192) -; (~Tcur-spawn int32 :offset-assert 196) +; ((spawn-array basic :offset-assert 192) +; (cur-spawn int32 :offset-assert 196) ; ) ; :method-count-assert 20 ; :size-assert #xc8 @@ -42973,7 +42985,7 @@ ; ) ; (deftype lavaballoon (process-drawable) -; ((~Tmove-per-tick float :offset-assert 176) +; ((move-per-tick float :offset-assert 176) ; ) ; :method-count-assert 22 ; :size-assert #xb4 @@ -43092,7 +43104,7 @@ ;; - Types ; (deftype energydoor (process-drawable) -; ((~Talt-actor basic :offset-assert 176) +; ((alt-actor basic :offset-assert 176) ; ) ; :method-count-assert 20 ; :size-assert #xb4 @@ -43135,15 +43147,15 @@ ; ) ; (deftype energyhub (process-drawable) -; ((~Talts UNKNOWN 3 :offset-assert 176) -; (~Tarm UNKNOWN 5 :offset-assert 192) -; (~Trot-mat matrix :inline :offset-assert 240) -; (~Trot-mat-init matrix :inline :offset-assert 304) -; (~Trotation-speed oscillating-float :inline :offset-assert 368) -; (~Trotation-speed-offset delayed-rand-float :inline :offset-assert 392) -; (~Ty-rotation float :offset-assert 420) -; (~Tx-rotation float :offset-assert 424) -; (~Tpalette-val float :offset-assert 428) +; ((alts UNKNOWN 3 :offset-assert 176) +; (arm UNKNOWN 5 :offset-assert 192) +; (rot-mat matrix :inline :offset-assert 240) +; (rot-mat-init matrix :inline :offset-assert 304) +; (rotation-speed oscillating-float :inline :offset-assert 368) +; (rotation-speed-offset delayed-rand-float :inline :offset-assert 392) +; (y-rotation float :offset-assert 420) +; (x-rotation float :offset-assert 424) +; (palette-val float :offset-assert 428) ; ) ; :method-count-assert 20 ; :size-assert #x1b0 @@ -43165,15 +43177,15 @@ ; ) ; (deftype energyarm (process-drawable) -; ((~Toffset vector :inline :offset-assert 176) -; (~Ty-rotation float :offset-assert 192) -; (~Ty-chatter-rotation bouncing-float :inline :offset-assert 196) -; (~Ty-chatter-min delayed-rand-float :inline :offset-assert 240) -; (~Tx-rotation bouncing-float :inline :offset-assert 268) -; (~Tx-fall-rotation bouncing-float :inline :offset-assert 308) -; (~Trot-mat matrix :inline :offset-assert 352) -; (~Tball uint64 :offset-assert 416) -; (~Tx-correction float :offset-assert 424) +; ((offset vector :inline :offset-assert 176) +; (y-rotation float :offset-assert 192) +; (y-chatter-rotation bouncing-float :inline :offset-assert 196) +; (y-chatter-min delayed-rand-float :inline :offset-assert 240) +; (x-rotation bouncing-float :inline :offset-assert 268) +; (x-fall-rotation bouncing-float :inline :offset-assert 308) +; (rot-mat matrix :inline :offset-assert 352) +; (ball uint64 :offset-assert 416) +; (x-correction float :offset-assert 424) ; ) ; :method-count-assert 20 ; :size-assert #x1ac diff --git a/decompiler/config/jak1_ntsc_black_label/label_types.jsonc b/decompiler/config/jak1_ntsc_black_label/label_types.jsonc index 544184c83..140ce70d3 100644 --- a/decompiler/config/jak1_ntsc_black_label/label_types.jsonc +++ b/decompiler/config/jak1_ntsc_black_label/label_types.jsonc @@ -224,7 +224,13 @@ "sync-info": [ ["L78", "float", true], + ["L79", "float", true], + ["L80", "float", true], + ["L81", "float", true], + ["L82", "float", true], + ["L83", "float", true], ["L84", "float", true], + ["L85", "float", true], ["L86", "float", true] ], diff --git a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc index eeb019daf..2777e187e 100644 --- a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc +++ b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc @@ -460,6 +460,16 @@ "ripple-find-height": [ [[22, 72], "s4", "mei-ripple"] ], + + "(method 0 collide-shape-prim-sphere)": [ + [[4, 8], "v0", "collide-shape-prim-sphere"] + ], + "(method 0 collide-shape-prim-mesh)": [ + [[6, 11], "v0", "collide-shape-prim-mesh"] + ], + "(method 0 collide-shape-prim-group)": [ + [[11, 18], "v0", "collide-shape-prim-group"] + ], "camera-teleport-to-entity": [ [9, "a0", "transform"] diff --git a/decompiler/config/jak1_ntsc_black_label/var_names.jsonc b/decompiler/config/jak1_ntsc_black_label/var_names.jsonc index f1d66b6d1..2da2c4020 100644 --- a/decompiler/config/jak1_ntsc_black_label/var_names.jsonc +++ b/decompiler/config/jak1_ntsc_black_label/var_names.jsonc @@ -1529,13 +1529,16 @@ }, "(method 0 collide-shape-prim-sphere)": { - "args": ["allocation", "type-to-make", "cshape", "prim-id"] + "args": ["allocation", "type-to-make", "cshape", "prim-id"], + "vars": { "v0-0": ["obj", "collide-shape-prim-sphere"] } }, "(method 0 collide-shape-prim-mesh)": { - "args": ["allocation", "type-to-make", "cshape", "mesh-id", "prim-id"] + "args": ["allocation", "type-to-make", "cshape", "mesh-id", "prim-id"], + "vars": { "v0-0": ["obj", "collide-shape-prim-mesh"] } }, "(method 0 collide-shape-prim-group)": { - "args": ["allocation", "type-to-make", "cshape", "elt-count", "prim-id"] + "args": ["allocation", "type-to-make", "cshape", "elt-count", "prim-id"], + "vars": { "v0-0": ["obj", "collide-shape-prim-group"] } }, "(method 0 collide-shape)": { "args": [ @@ -1547,6 +1550,9 @@ ], "vars": { "s5-0": "obj" } }, + "(method 0 collide-sticky-rider-group)": { + "vars": { "v0-0": "obj" } + }, "(method 11 touching-prims-entry-pool)": { "vars": { "a1-0": "current", "v1-0": "prev", "a2-0": "next" } }, diff --git a/goal_src/engine/anim/aligner-h.gc b/goal_src/engine/anim/aligner-h.gc index dab3b5023..3098d6eaf 100644 --- a/goal_src/engine/anim/aligner-h.gc +++ b/goal_src/engine/anim/aligner-h.gc @@ -5,16 +5,16 @@ ;; name in dgo: aligner-h ;; dgos: GAME, ENGINE -;; definition of type align-control + (deftype align-control (basic) ((flags uint32 :offset-assert 4) - (process basic :offset-assert 8) + (process process :offset-assert 8) (frame-group basic :offset-assert 12) (frame-num float :offset-assert 16) (matrix matrix 2 :inline :offset-assert 32) (transform transform 2 :inline :offset-assert 160) (delta transformq :inline :offset-assert 256) - (last-speed float :offset-assert 304) + (last-speed float :offset-assert 304) ;; meters (align transformq :inline :offset 160) ) :method-count-assert 14 @@ -30,38 +30,18 @@ ) ) -;; definition for method 0 of type align-control -;; INFO: Return type mismatch object vs align-control. -(defmethod - new - align-control - ((allocation symbol) (type-to-make type) (arg0 process)) - (local-vars (pp process)) - (let - ((obj - (object-new allocation type-to-make (the-as int (-> type-to-make size))) - ) - ) - (if (zero? obj) - (return (begin - (let ((t9-1 (the-as (function object object) enter-state)) - (a0-1 "memory") - ) - (set! - (-> pp next-state) - (the-as state process-drawable-art-error) - ) - (t9-1 a0-1) - ) - (the-as align-control 0) - ) - ) - ) - (set! (-> obj process) arg0) - obj - ) + +(defmethod new align-control ((allocation symbol) (type-to-make type) (proc process)) + + (let ((obj (object-new allocation type-to-make (the-as int (-> type-to-make size))))) + (when (zero? obj) + (go process-drawable-art-error "memory") + (return (the align-control 0)) + ) + + (set! (-> obj process) proc) + obj + ) ) - - diff --git a/goal_src/engine/collide/collide-edge-grab-h.gc b/goal_src/engine/collide/collide-edge-grab-h.gc index d585ff76a..f7b9a10c9 100644 --- a/goal_src/engine/collide/collide-edge-grab-h.gc +++ b/goal_src/engine/collide/collide-edge-grab-h.gc @@ -41,7 +41,7 @@ (deftype collide-edge-edge (structure) ((ignore basic :offset-assert 0) (etri collide-edge-tri :offset-assert 4) - (vertex-ptr vector 2 :offset-assert 8) + (vertex-ptr vector 2 :offset-assert 8) (outward vector :inline :offset-assert 16) (edge-vec-norm vector :inline :offset-assert 32) ) @@ -64,11 +64,11 @@ ) (deftype collide-edge-hold-list (structure) - ((num-allocs uint32 :offset-assert 0) - (num-attempts uint32 :offset-assert 4) - (head collide-edge-hold-item :offset-assert 8) - (items collide-edge-hold-item 32 :inline :offset-assert 16) - (attempts qword 32 :inline :offset-assert 1552) + ((num-allocs uint32 :offset-assert 0) + (num-attempts uint32 :offset-assert 4) + (head collide-edge-hold-item :offset-assert 8) + (items collide-edge-hold-item 32 :inline :offset-assert 16) + (attempts qword 32 :inline :offset-assert 1552) ) :method-count-assert 11 :size-assert #x810 @@ -80,32 +80,32 @@ ) (deftype collide-edge-work (structure) - ((ccache basic :offset-assert 0) - (cshape basic :offset-assert 4) - (num-verts uint32 :offset-assert 8) - (num-edges uint32 :offset-assert 12) - (num-tris uint32 :offset-assert 16) - (cache-fill-box bounding-box :inline :offset-assert 32) - (within-reach-box bounding-box :inline :offset-assert 64) - (within-reach-box4w bounding-box4w :inline :offset-assert 96) - (search-pt vector :inline :offset-assert 128) - (search-dir-vec vector :inline :offset-assert 144) - (max-dist-sqrd-to-outward-pt float :offset-assert 160) - (max-dir-cosa-delta float :offset-assert 164) - (split-dists float 2 :offset-assert 168) - (outward-offset vector :inline :offset-assert 176) - (local-cache-fill-box bounding-box :inline :offset-assert 192) - (local-within-reach-box bounding-box :inline :offset-assert 224) - (local-player-spheres sphere 12 :inline :offset-assert 256) - (world-player-spheres sphere 12 :inline :offset-assert 448) - (local-player-hanging-spheres sphere 6 :inline :offset 256) - (world-player-hanging-spheres sphere 6 :inline :offset 448) - (local-player-leap-up-spheres sphere 6 :inline :offset 352) - (world-player-leap-up-spheres sphere 6 :inline :offset 544) - (verts vector 64 :inline :offset-assert 640) - (edges collide-edge-edge 96 :inline :offset-assert 1664) - (tris collide-edge-tri 48 :inline :offset-assert 6272) - (hold-list collide-edge-hold-list :inline :offset-assert 7808) + ((ccache basic :offset-assert 0) + (cshape basic :offset-assert 4) + (num-verts uint32 :offset-assert 8) + (num-edges uint32 :offset-assert 12) + (num-tris uint32 :offset-assert 16) + (cache-fill-box bounding-box :inline :offset-assert 32) + (within-reach-box bounding-box :inline :offset-assert 64) + (within-reach-box4w bounding-box4w :inline :offset-assert 96) + (search-pt vector :inline :offset-assert 128) + (search-dir-vec vector :inline :offset-assert 144) + (max-dist-sqrd-to-outward-pt float :offset-assert 160) + (max-dir-cosa-delta float :offset-assert 164) + (split-dists float 2 :offset-assert 168) + (outward-offset vector :inline :offset-assert 176) + (local-cache-fill-box bounding-box :inline :offset-assert 192) + (local-within-reach-box bounding-box :inline :offset-assert 224) + (local-player-spheres sphere 12 :inline :offset-assert 256) + (world-player-spheres sphere 12 :inline :offset-assert 448) + (local-player-hanging-spheres sphere 6 :inline :offset 256) + (world-player-hanging-spheres sphere 6 :inline :offset 448) + (local-player-leap-up-spheres sphere 6 :inline :offset 352) + (world-player-leap-up-spheres sphere 6 :inline :offset 544) + (verts vector 64 :inline :offset-assert 640) + (edges collide-edge-edge 96 :inline :offset-assert 1664) + (tris collide-edge-tri 48 :inline :offset-assert 6272) + (hold-list collide-edge-hold-list :inline :offset-assert 7808) ) :method-count-assert 20 :size-assert #x2690 @@ -125,107 +125,34 @@ ) ) -(define *collide-edge-work* - (new 'static 'collide-edge-work - :max-dist-sqrd-to-outward-pt 37748736.000000 - :max-dir-cosa-delta (the-as float #x3f19999a) - :split-dists (new 'static 'array float 2 1024.000000 (the-as float #x44b33333)) - :outward-offset (new 'static 'vector - :x (the-as float #x443126e9) - :y 13312.000000 - :w 1.000000 - ) - :local-cache-fill-box (new 'static 'bounding-box - :min (new 'static 'vector - :x -8192.000000 - :y (the-as float #xc62ccccd) - :z -8192.000000 - :w 1.000000 - ) - :max (new 'static 'vector - :x 8192.000000 - :y 24576.000000 - :z 8192.000000 - :w 1.000000 - ) +(define *collide-edge-work* (new 'static 'collide-edge-work + :max-dist-sqrd-to-outward-pt 37748736.0 + :max-dir-cosa-delta 0.6 + :split-dists (new 'static 'array float 2 1024.0 1433.6) + :outward-offset (new 'static 'vector :x 708.608 :y 13312.0 :w 1.0) + :local-cache-fill-box (new 'static 'bounding-box + :min (new 'static 'vector :x -8192.0 :y -11059.2 :z -8192.0 :w 1.0) + :max (new 'static 'vector :x 8192.0 :y 24576.0 :z 8192.0 :w 1.0) ) - :local-within-reach-box (new 'static 'bounding-box - :min (new 'static 'vector - :x -6144.000000 - :y (the-as float #x45a66666) - :z -6144.000000 - :w 1.000000 - ) - :max (new 'static 'vector - :x 6144.000000 - :y (the-as float #x462ccccd) - :z 6144.000000 - :w 1.000000 - ) - ) - :local-player-spheres (new 'static 'inline-array sphere 12 - (new 'static 'sphere - :x (the-as float #x44d70a3d) - :y (the-as float #xc44ccccd) - :w (the-as float #x44b33333) - ) - (new 'static 'sphere - :x (the-as float #x450f5c29) - :y (the-as float #xc54ccccd) - :w (the-as float #x44eb851f) - ) - (new 'static 'sphere - :x (the-as float #x44f5c28f) - :y -6144.000000 - :w (the-as float #x44c28f5c) - ) - (new 'static 'sphere - :x (the-as float #x44f5c28f) - :y (the-as float #xc6066666) - :w (the-as float #x44c28f5c) - ) - (new 'static 'sphere - :x (the-as float #x44dc28f6) - :y (the-as float #xc62ccccd) - :w (the-as float #x44a8f5c3) - ) - (new 'static 'sphere - :x (the-as float #x44d1eb85) - :y -13312.000000 - :w (the-as float #x449eb852) - ) - (new 'static 'sphere - :x (the-as float #xc43851ec) - :y 4096.000000 - :w 3072.000000 - ) - (new 'static 'sphere - :x (the-as float #xc43851ec) - :y (the-as float #x45cccccd) - :w 3072.000000 - ) - (new 'static 'sphere - :x (the-as float #xc43851ec) - :y (the-as float #x46133333) - :w 3072.000000 - ) - (new 'static 'sphere - :x (the-as float #x44d70a3d) - :y (the-as float #x45666666) - :w (the-as float #x453851ec) - ) - (new 'static 'sphere - :x (the-as float #x44d70a3d) - :y (the-as float #x45b33333) - :w (the-as float #x453851ec) - ) - (new 'static 'sphere - :x (the-as float #x44d70a3d) - :y (the-as float #x46066666) - :w (the-as float #x453851ec) - ) + :local-within-reach-box (new 'static 'bounding-box + :min (new 'static 'vector :x -6144.0 :y 5324.8 :z -6144.0 :w 1.0) + :max (new 'static 'vector :x 6144.0 :y 11059.2 :z 6144.0 :w 1.0) ) - ) + :local-player-spheres (new 'static 'inline-array sphere 12 + (new 'static 'sphere :x 1720.32 :y -819.2 :w 1433.6) + (new 'static 'sphere :x 2293.76 :y -3276.8 :w 1884.16) + (new 'static 'sphere :x 1966.08 :y -6144.0 :w 1556.48) + (new 'static 'sphere :x 1966.08 :y -8601.6 :w 1556.48) + (new 'static 'sphere :x 1761.28 :y -11059.2 :w 1351.68) + (new 'static 'sphere :x 1679.36 :y -13312.0 :w 1269.76) + (new 'static 'sphere :x -737.28 :y 4096.0 :w 3072.0) + (new 'static 'sphere :x -737.28 :y 6553.6 :w 3072.0) + (new 'static 'sphere :x -737.28 :y 9420.8 :w 3072.0) + (new 'static 'sphere :x 1720.32 :y 3686.4 :w 2949.12) + (new 'static 'sphere :x 1720.32 :y 5734.4 :w 2949.12) + (new 'static 'sphere :x 1720.32 :y 8601.6 :w 2949.12) + ) + ) ) (define-perm *edge-grab-info* edge-grab-info (new 'global 'edge-grab-info)) diff --git a/goal_src/engine/collide/collide-mesh-h.gc b/goal_src/engine/collide/collide-mesh-h.gc index 75d79b71e..05dfe2958 100644 --- a/goal_src/engine/collide/collide-mesh-h.gc +++ b/goal_src/engine/collide/collide-mesh-h.gc @@ -49,12 +49,13 @@ ) ) +(defconstant COLLIDE_MESH_CACHE_SIZE #xa000) + (deftype collide-mesh-cache (basic) ((used-size uint32 :offset-assert 4) (max-size uint32 :offset-assert 8) (id uint64 :offset-assert 16) - (pad uint8 8) ;; added - (data uint8 40960 :offset-assert 32) + (data uint8 #xa000 :offset 32) ) :method-count-assert 12 :size-assert #xa020 @@ -105,12 +106,9 @@ ) ;; only allocate if we don't have an existing one. -(define-extern *collide-mesh-cache* collide-mesh-cache) -(if (or (not *collide-mesh-cache*) (zero? *collide-mesh-cache*)) - (set! *collide-mesh-cache* (new 'global 'collide-mesh-cache)) - ) +(define-perm *collide-mesh-cache* collide-mesh-cache (new 'global 'collide-mesh-cache)) ;; in all cases, re-init. (set! (-> *collide-mesh-cache* id) 1) (set! (-> *collide-mesh-cache* used-size) 0) -(set! (-> *collide-mesh-cache* max-size) #xa000) +(set! (-> *collide-mesh-cache* max-size) COLLIDE_MESH_CACHE_SIZE) diff --git a/goal_src/engine/collide/collide-shape-h.gc b/goal_src/engine/collide/collide-shape-h.gc index 1494e1774..49f70d0c2 100644 --- a/goal_src/engine/collide/collide-shape-h.gc +++ b/goal_src/engine/collide/collide-shape-h.gc @@ -93,7 +93,8 @@ (defmethod reset! collide-overlap-result ((obj collide-overlap-result)) "Reset the result." - (set! (-> obj best-dist) 0.000000) + + (set! (-> obj best-dist) 0.0) (set! (-> obj best-from-prim) #f) (set! (-> obj best-to-prim) #f) (none) @@ -109,18 +110,9 @@ ) ;; The engine system is used to link collision checks with processes. -(define *collide-hit-by-player-list* - (new 'global 'engine 'collide-hit-by-player-list 768) - ) - -(define *collide-usually-hit-by-player-list* - (new 'global 'engine 'collide-usually-hit-by-player-list 256) - ) - -(define *collide-hit-by-others-list* - (new 'global 'engine 'collide-hit-by-others-list 96) - ) - +(define *collide-hit-by-player-list* (new 'global 'engine 'collide-hit-by-player-list 768)) +(define *collide-usually-hit-by-player-list* (new 'global 'engine 'collide-usually-hit-by-player-list 256)) +(define *collide-hit-by-others-list* (new 'global 'engine 'collide-hit-by-others-list 96)) (define *collide-player-list* (new 'global 'engine 'collide-player-list 32)) ;; some parts of collide-shape-prim are broken out here. @@ -285,6 +277,12 @@ ) ) +(defenum collide-list-enum + (hit-by-player) + (usually-hit-by-player) + (hit-by-others) + (player) + ) ;; an actual instance of a collision primitive. ;; it's based on a transform (q means quaternion, v means with derivatives) (deftype collide-shape (trsqv) @@ -304,7 +302,7 @@ :size-assert #xb8 :flag-assert #x38000000b8 (:methods - (new (symbol type process int) _type_) + (new (symbol type process collide-list-enum) _type_) (dummy-28 () none 28) (dummy-29 () none 29) (dummy-30 () none 30) @@ -383,83 +381,59 @@ (defmethod new collide-shape-prim ((allocation symbol) (type-to-make type) (cshape basic) (prim-id uint) (size-bytes int)) "Allocate a new collide-shape-prim. It is expected that children of collide-shape-prim override this. NOTE: uses the size-bytes as the TOTAL size of the structure." - (local-vars (v0-0 collide-shape-prim)) - (set! v0-0 (object-new allocation type-to-make size-bytes)) - ;; not sure what this is. - (set! (-> v0-0 cshape) cshape) - ;; sphere/mesh? - (set! (-> v0-0 prim-id) prim-id) - (set! (-> v0-0 prim-core action) 0) - (set! (-> v0-0 prim-core collide-as) 0) - (set! (-> v0-0 collide-with) 0) - (set! (-> v0-0 transform-index) -2) - (set! (-> v0-0 prim-core offense) 0) - (set! (-> v0-0 prim-core prim-type) -2) - v0-0 + + (let ((obj (object-new allocation type-to-make size-bytes))) + ;; not sure what this is. + (set! (-> obj cshape) cshape) + ;; sphere/mesh? + (set! (-> obj prim-id) prim-id) + (set! (-> obj prim-core action) 0) + (set! (-> obj prim-core collide-as) 0) + (set! (-> obj collide-with) 0) + (set! (-> obj transform-index) -2) + (set! (-> obj prim-core offense) 0) + (set! (-> obj prim-core prim-type) -2) + obj + ) ) + (defmethod new collide-shape-prim-sphere ((allocation symbol) (type-to-make type) (cshape basic) (prim-id uint)) "Allocate a new sphere primitive" - (local-vars (v0-0 collide-shape-prim-sphere)) - (set! v0-0 - (the collide-shape-prim-sphere - ((method-of-type collide-shape-prim new) - allocation - type-to-make - cshape - prim-id - 76 - ) - ) - ) - (set! (-> v0-0 pat) 16) ;; todo - bitfield - (set! (-> v0-0 prim-core prim-type) -1) - v0-0 + + (let ((obj (the collide-shape-prim-sphere ((method-of-type collide-shape-prim new) allocation type-to-make cshape prim-id (size-of collide-shape-prim-mesh))))) + (set! (-> obj pat) #x10) + (set! (-> obj prim-core prim-type) -1) + obj + ) ) (defmethod new collide-shape-prim-mesh ((allocation symbol) (type-to-make type) (cshape basic) (mesh-id uint) (prim-id uint)) "Allocate a new mesh primitive" - (local-vars (v0-0 collide-shape-prim-mesh)) - (set! v0-0 (the collide-shape-prim-mesh - ((method-of-type collide-shape-prim new) - allocation - type-to-make - cshape - prim-id - 92 - ) - ) - ) - (set! (-> (the-as collide-shape-prim-mesh v0-0) mesh) #f) - (set! (-> v0-0 mesh-id) (the int mesh-id)) - (set! (-> v0-0 mesh-cache-id) 0) - (set! (-> v0-0 prim-core prim-type) 1) - v0-0 + + (let ((obj (the collide-shape-prim-mesh ((method-of-type collide-shape-prim new) allocation type-to-make cshape prim-id (size-of collide-shape-prim-mesh))))) + (set! (-> obj mesh) #f) + (set! (-> obj mesh-id) (the int mesh-id)) + (set! (-> obj mesh-cache-id) 0) + (set! (-> obj prim-core prim-type) 1) + obj + ) ) (defmethod new collide-shape-prim-group ((allocation symbol) (type-to-make type) (cshape basic) (elt-count uint) (prim-id int)) "Allocate a group of primitives." - (local-vars (v0-0 collide-shape-prim-group)) - (set! v0-0 (the collide-shape-prim-group - ((method-of-type collide-shape-prim new) - allocation - type-to-make - cshape - (the-as uint prim-id) - ;; minus one for the one reference in the type. - (the-as int (+ (-> type-to-make size) (shl (+ elt-count -1) 2))) - ) - ) - ) - (set! (-> v0-0 allocated-prims) (the int elt-count)) - (set! (-> v0-0 num-prims) 0) - (set! (-> v0-0 prim-core prim-type) 0) - (while (nonzero? elt-count) - (+! elt-count -1) - (set! (-> v0-0 prim elt-count) (the uint #f)) - (nop!) + + (let ((obj (the collide-shape-prim-group ((method-of-type collide-shape-prim new) allocation type-to-make cshape (the uint prim-id) (the int (+ (-> type-to-make size) (* (+ elt-count -1) 4))))))) + (set! (-> obj allocated-prims) (the int elt-count)) + (set! (-> obj num-prims) 0) + (set! (-> obj prim-core prim-type) 0) + (while (nonzero? elt-count) + (+! elt-count -1) + (set! (-> obj prim elt-count) (the uint #f)) + (nop!) + ) + obj ) - v0-0 ) (defmethod length collide-shape-prim-group ((obj collide-shape-prim-group)) @@ -474,60 +448,60 @@ ) ) -(defmethod new collide-shape ((allocation symbol) (type-to-make type) (proc process) (collide-list-kind int)) - (local-vars (v1-5 symbol) (obj collide-shape)) - (set! obj (object-new allocation type-to-make (the-as int (-> type-to-make size)))) - (set! (-> obj process) proc) - (set! (-> obj max-iteration-count) 1) - (set! (-> obj nav-flags) 1) - (set! (-> obj event-self) #f) - (set! (-> obj event-other) #f) - (set! (-> obj riders) #f) - (set! (-> obj root-prim) #f) - (set! v1-5 (-> proc type symbol)) +(defmethod new collide-shape ((allocation symbol) (type-to-make type) (proc process) (collide-list-kind collide-list-enum)) + "Allocate a new collide-shape and add to a collide-list" - ;; add a special ignore mask for the camera vs other things. - (if (= v1-5 'camera) - (set! (-> obj pat-ignore-mask) 2) - (set! (-> obj pat-ignore-mask) 1) + (let ((obj (object-new allocation type-to-make (the int (-> type-to-make size))))) + (set! (-> obj process) proc) + (set! (-> obj max-iteration-count) 1) + (set! (-> obj nav-flags) #x1) + (set! (-> obj event-self) #f) + (set! (-> obj event-other) #f) + (set! (-> obj riders) #f) + (set! (-> obj root-prim) #f) + + ;; add a special ignore mask for the camera vs other things. + (case (-> proc type symbol) + (('camera) + (set! (-> obj pat-ignore-mask) #x2) + (set! (-> obj pat-ignore-mask) #x1) + ) ) - ;; reset transformation to the origin. - (set! (-> obj trans w) 1.000000) - (quaternion-identity! (the-as quaternion (-> obj rot))) - (vector-identity! (-> obj scale)) + ;; reset transformation to the origin. + (set! (-> obj trans w) 1.0) + (quaternion-identity! (the-as quaternion (-> obj rot))) + (vector-identity! (-> obj scale)) - ;; add us to right list. - (cond - ((zero? collide-list-kind) - (add-connection *collide-hit-by-player-list* proc (the (function object object object object object) #f) obj #f #f) - ) - ((= collide-list-kind 1) - (add-connection *collide-usually-hit-by-player-list* proc (the (function object object object object object) #f) obj #f #f) - ) - ((= collide-list-kind 2) - (add-connection *collide-hit-by-others-list* proc (the (function object object object object object) #f) obj #f #f) - ) - ((= collide-list-kind 3) - (add-connection *collide-player-list* proc (the (function object object object object object) #f) obj #f #f) - ) - (else - (format 0 "Unsupported collide-list-enum in collide-shape constructor!~%") - ) + ;; add us to right list. + (case collide-list-kind + (((collide-list-enum hit-by-player)) + (add-connection *collide-hit-by-player-list* proc (the (function object object object object object) #f) obj #f #f)) + + (((collide-list-enum usually-hit-by-player)) + (add-connection *collide-usually-hit-by-player-list* proc (the (function object object object object object) #f) obj #f #f)) + + (((collide-list-enum hit-by-others)) + (add-connection *collide-hit-by-others-list* proc (the (function object object object object object) #f) obj #f #f)) + + (((collide-list-enum player)) + (add-connection *collide-player-list* proc (the (function object object object object object) #f) obj #f #f)) + + (else + (format 0 "Unsupported collide-list-enum in collide-shape constructor!~%")) + ) + obj ) - obj ) -(defmethod new collide-sticky-rider-group ((allocation symbol) (type-to-make type) (arg0 int)) - (local-vars (v0-0 collide-sticky-rider-group)) - (set! v0-0 - (object-new allocation type-to-make - (the-as int (+ (-> type-to-make size) (the-as uint (shl (+ arg0 -1) 5)))) - ) - ) - (set! (-> v0-0 allocated-riders) arg0) - (set! (-> v0-0 num-riders) 0) - v0-0 +(defmethod new collide-sticky-rider-group ((allocation symbol) (type-to-make type) (riders-amount int)) + "Allocate a new collide-sticky-rider-group with space for riders-amount sticky riders." + + (let ((obj (object-new allocation type-to-make (the int (+ (-> type-to-make size) (the uint (* (1- riders-amount) (size-of collide-sticky-rider)))))))) + (set! (-> obj allocated-riders) riders-amount) + (set! (-> obj num-riders) 0) + obj + ) ) (defmethod length collide-sticky-rider-group ((obj collide-sticky-rider-group)) @@ -536,42 +510,36 @@ (defmethod asize-of collide-sticky-rider-group ((obj collide-sticky-rider-group)) (the-as int - (+ (-> obj type size) (the-as uint (shl (+ (-> obj allocated-riders) -1) 5))) + (+ (-> obj type size) (the-as uint (* (1- (-> obj allocated-riders)) (size-of collide-sticky-rider)))) ) ) (define *collide-shape-prim-backgnd* - (new 'static 'collide-shape-prim-mesh - :cshape #f - :prim-core - (new 'static 'collide-prim-core - :world-sphere - (new 'static 'vector :w 204800000.000000) - :collide-as #x1 - :action #x1 - :offense 4 - :prim-type 2 - ) - :local-sphere - (new 'static 'vector :w 204800000.000000) - :mesh #f - ) + (new 'static 'collide-shape-prim-mesh + :cshape #f + :prim-core (new 'static 'collide-prim-core + :world-sphere (new 'static 'vector :w 204800000.0) + :collide-as #x1 + :action #x1 + :offense 4 + :prim-type 2 + ) + :local-sphere (new 'static 'vector :w 204800000.0) + :mesh #f + ) ) (define *collide-shape-prim-water* - (new 'static 'collide-shape-prim-mesh - :cshape #f - :prim-core - (new 'static 'collide-prim-core - :world-sphere - (new 'static 'vector :w 204800000.000000) - :collide-as #x20 - :action #x1 - :offense 4 - :prim-type 2 - ) - :local-sphere - (new 'static 'vector :w 204800000.000000) - :mesh #f - ) + (new 'static 'collide-shape-prim-mesh + :cshape #f + :prim-core (new 'static 'collide-prim-core + :world-sphere (new 'static 'vector :w 204800000.0) + :collide-as #x20 + :action #x1 + :offense 4 + :prim-type 2 + ) + :local-sphere (new 'static 'vector :w 204800000.0) + :mesh #f + ) ) diff --git a/goal_src/engine/game/game-h.gc b/goal_src/engine/game/game-h.gc index 50aa1e4a3..900697224 100644 --- a/goal_src/engine/game/game-h.gc +++ b/goal_src/engine/game/game-h.gc @@ -5,29 +5,28 @@ ;; name in dgo: game-h ;; dgos: GAME, ENGINE -; TODO - for hud-h.gc and ripple + (deftype process-drawable (process) - ((root trsqv :offset-assert 112) - (node-list basic :offset-assert 116) - (draw draw-control :offset-assert 120) - (skel basic :offset-assert 124) - (nav basic :offset-assert 128) - (align basic :offset-assert 132) - (path basic :offset-assert 136) - (vol basic :offset-assert 140) - (fact basic :offset-assert 144) - (link basic :offset-assert 148) - (part basic :offset-assert 152) - (water basic :offset-assert 156) - (sound basic :offset-assert 160) - (state-flags uint32 :offset-assert 164) - (state-time uint64 :offset-assert 168) + ((root trsqv :offset-assert 112) + (node-list basic :offset-assert 116) + (draw draw-control :offset-assert 120) + (skel basic :offset-assert 124) + (nav basic :offset-assert 128) + (align basic :offset-assert 132) + (path basic :offset-assert 136) + (vol basic :offset-assert 140) + (fact basic :offset-assert 144) + (link basic :offset-assert 148) + (part basic :offset-assert 152) + (water basic :offset-assert 156) + (sound basic :offset-assert 160) + (state-flags uint32 :offset-assert 164) + (state-time uint64 :offset-assert 168) ) :heap-base #x40 :method-count-assert 20 :size-assert #xb0 :flag-assert #x14004000b0 - ;; inherited inspect of process (:methods (dummy-14 () none 14) (dummy-15 () none 15) @@ -38,7 +37,59 @@ ) ) -; TODO - for target-h +(deftype process-drawable-reserved (process-drawable) + () + :heap-base #x40 + :method-count-assert 63 + :size-assert #xb0 + :flag-assert #x3f004000b0 + (:methods + (dummy-20 () none 20) + (dummy-21 () none 21) + (dummy-22 () none 22) + (dummy-23 () none 23) + (dummy-24 () none 24) + (dummy-25 () none 25) + (dummy-26 () none 26) + (dummy-27 () none 27) + (dummy-28 () none 28) + (dummy-29 () none 29) + (dummy-30 () none 30) + (dummy-31 () none 31) + (dummy-32 () none 32) + (dummy-33 () none 33) + (dummy-34 () none 34) + (dummy-35 () none 35) + (dummy-36 () none 36) + (dummy-37 () none 37) + (dummy-38 () none 38) + (dummy-39 () none 39) + (dummy-40 () none 40) + (dummy-41 () none 41) + (dummy-42 () none 42) + (dummy-43 () none 43) + (dummy-44 () none 44) + (dummy-45 () none 45) + (dummy-46 () none 46) + (dummy-47 () none 47) + (dummy-48 () none 48) + (dummy-49 () none 49) + (dummy-50 () none 50) + (dummy-51 () none 51) + (dummy-52 () none 52) + (dummy-53 () none 53) + (dummy-54 () none 54) + (dummy-55 () none 55) + (dummy-56 () none 56) + (dummy-57 () none 57) + (dummy-58 () none 58) + (dummy-59 () none 59) + (dummy-60 () none 60) + (dummy-61 () none 61) + (dummy-62 () none 62) + ) + ) + (deftype attack-info (structure) ((trans vector :inline :offset-assert 0) (vector vector :inline :offset-assert 16) @@ -47,13 +98,13 @@ (invinc-time uint64 :offset-assert 56) (mask uint32 :offset-assert 64) (mode basic :offset-assert 68) - (shove-back float :offset-assert 72) ;; meters - (shove-up float :offset-assert 76) ;; meters - (speed float :offset-assert 80) ;; meters - (dist float :offset-assert 84) ;; meters + (shove-back float :offset-assert 72) ;; meters + (shove-up float :offset-assert 76) ;; meters + (speed float :offset-assert 80) ;; meters + (dist float :offset-assert 84) ;; meters (control float :offset-assert 88) (angle basic :offset-assert 92) - (rotate-to float :offset-assert 96) ;; deg + (rotate-to float :offset-assert 96) ;; deg (prev-state basic :offset-assert 100) ) :method-count-assert 10 @@ -64,3 +115,17 @@ (dummy-9 () none 9) ) ) + +(define *global-attack-id* 0) + +(deftype ground-tween-info (structure) + ((chan uint8 3 :offset-assert 0) + (blend uint32 3 :offset-assert 4) + (group uint32 5 :offset-assert 16) + ) + :method-count-assert 9 + :size-assert #x24 + :flag-assert #x900000024 + ) + + diff --git a/goal_src/engine/game/generic-obs-h.gc b/goal_src/engine/game/generic-obs-h.gc index a20752d51..37e96b51e 100644 --- a/goal_src/engine/game/generic-obs-h.gc +++ b/goal_src/engine/game/generic-obs-h.gc @@ -5,7 +5,141 @@ ;; name in dgo: generic-obs-h ;; dgos: GAME, ENGINE -;; TODO - for task-control-h + +(deftype manipy (process-drawable) + ((new-trans-hook function :offset-assert 176) + (cur-trans-hook function :offset-assert 180) + (cur-event-hook function :offset-assert 184) + (new-joint-anim basic :offset-assert 188) + (new-joint-anim-blend uint64 :offset-assert 192) + (anim-mode basic :offset-assert 200) + (cur-grab-handle uint64 :offset-assert 208) + (cur-target-handle uint64 :offset-assert 216) + (old-grab-pos vector :inline :offset-assert 224) + (joint joint 4 :offset-assert 240) + (new-post-hook function :offset-assert 256) + (cur-post-hook function :offset-assert 260) + (clone-copy-trans basic :offset-assert 264) + (shadow-backup basic :offset-assert 268) + (draw? symbol :offset-assert 272) + ) + :heap-base #xb0 + :method-count-assert 20 + :size-assert #x114 + :flag-assert #x1400b00114 + ;; inherited inspect of process-drawable + (: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) + ) + ) + +(deftype part-spawner (process-drawable) + ((mode uint32 :offset-assert 176) + (enable basic :offset-assert 180) + (radius float :offset-assert 184) ;; meters + (world-sphere sphere :inline :offset-assert 192) + ) + :heap-base #x60 + :method-count-assert 21 + :size-assert #xd0 + :flag-assert #x15006000d0 + ;; inherited inspect of process-drawable + (:methods + (dummy-20 () none 20) + ) + ) + +(deftype part-tracker (process) + ((root basic :offset-assert 112) + (part basic :offset-assert 116) + (target uint64 :offset-assert 120) + (callback basic :offset-assert 128) + (linger-callback basic :offset-assert 132) + (duration uint64 :offset-assert 136) + (linger-duration uint64 :offset-assert 144) + (start-time uint64 :offset-assert 152) + (offset vector :inline :offset-assert 160) + (userdata uint64 :offset-assert 176) + (user-time uint64 2 :offset-assert 184) + (user-vector vector 2 :inline :offset-assert 208) + (user-handle uint32 2 :offset-assert 240) + ) + :heap-base #x90 + :method-count-assert 14 + :size-assert #xf8 + :flag-assert #xe009000f8 + ;; inherited inspect of process + (:methods + ) + ) + +(deftype camera-tracker (process) + ( + ;(name basic :offset-assert 4) + (grab-target uint64 :offset 120) + (grab-event basic :offset-assert 128) + (release-event basic :offset-assert 132) + (old-global-mask uint32 :offset-assert 136) + (old-self-mask uint32 :offset-assert 140) + (old-parent-mask uint32 :offset-assert 144) + (look-at-target uint64 :offset-assert 152) + (pov-target uint64 :offset-assert 160) + (work-process uint64 :offset-assert 168) + (anim-process uint64 :offset-assert 176) + (start-time uint64 :offset-assert 184) + (callback basic :offset-assert 192) + (userdata basic :offset-assert 196) + (message basic :offset-assert 200) + (border-value basic :offset-assert 204) + (mask-to-clear uint32 :offset-assert 208) + (script basic :offset-assert 212) + (script-line basic :offset-assert 216) + (script-func basic :offset-assert 220) + ) + :heap-base #x70 + :method-count-assert 15 + :size-assert #xe0 + :flag-assert #xf007000e0 + ;; inherited inspect of process + ;; field ~Tuserdata is a basic loaded with a signed load + (:methods + (dummy-14 () none 14) + ) + ) + +(deftype touch-tracker (process-drawable) + ((duration uint64 :offset-assert 176) + (target uint64 :offset-assert 184) + (event basic :offset-assert 192) + (run-function basic :offset-assert 196) + (callback basic :offset-assert 200) + (event-mode basic :offset-assert 204) + ) + :heap-base #x60 + :method-count-assert 20 + :size-assert #xd0 + :flag-assert #x14006000d0 + ;; inherited inspect of process-drawable + ) + +(deftype swingpole (process) + ((root basic :offset-assert 112) + (dir vector :inline :offset-assert 128) + (range float :offset-assert 144) ;; meters + (edge-length float :offset-assert 148) ;; meters + ) + :heap-base #x30 + :method-count-assert 14 + :size-assert #x98 + :flag-assert #xe00300098 + ;; inherited inspect of process + ) + (deftype gui-query (structure) ((x-position int32 :offset-assert 0) (y-position int32 :offset-assert 4) @@ -24,3 +158,33 @@ (dummy-10 () none 10) ) ) + +(deftype othercam (process) + ((hand uint64 :offset-assert 112) + (old-global-mask uint32 :offset-assert 120) + (mask-to-clear uint32 :offset-assert 124) + (cam-joint-index int32 :offset-assert 128) + (old-pos vector :inline :offset-assert 144) + (old-mat-z vector :inline :offset-assert 160) + (had-valid-frame basic :offset-assert 176) + (border-value basic :offset-assert 180) + (die? basic :offset-assert 184) + (survive-anim-end? basic :offset-assert 188) + (spooling? basic :offset-assert 192) + ) + :heap-base #x60 + :method-count-assert 14 + :size-assert #xc4 + :flag-assert #xe006000c4 + ;; inherited inspect of process + ) + +(deftype process-hidden (process) + () + :method-count-assert 15 + :size-assert #x70 + :flag-assert #xf00000070 + (:methods + (dummy-14 () none 14) + ) + ) diff --git a/goal_src/engine/gfx/lights.gc b/goal_src/engine/gfx/lights.gc index cdc207d9c..8f41c2cfb 100644 --- a/goal_src/engine/gfx/lights.gc +++ b/goal_src/engine/gfx/lights.gc @@ -7,6 +7,7 @@ (defun light-slerp ((out light) (a light) (b light) (alpha float)) "Linearly interpolate between two light's vectors. Alpha is clamped between 0 - 1." + (let ((clamped-alpha (fmax 0.0 (fmin 1.0 alpha)))) (vector-lerp! (-> out color) (-> a color) (-> b color) clamped-alpha) (vector-deg-slerp @@ -27,6 +28,7 @@ (defun light-group-slerp ((out light-group) (a light-group) (b light-group) (alpha float)) "Linearly interpolate between each of the 4 vectors of two light-groups. Alpha is clamped between 0 - 1." + (dotimes (vec-index 4) (light-slerp (-> out lights vec-index) @@ -50,51 +52,20 @@ (none) ) -(define *default-lights* (the-as vu-lights (new 'global 'vu-lights))) +(define *default-lights* (new 'global 'vu-lights)) (defun vu-lights-default! ((lights vu-lights)) "Initialize a lights object with default values" - (let ((ambient-light (-> lights ambient))) - (set! (-> ambient-light x) 0.3) - (set! (-> ambient-light y) 0.3) - (set! (-> ambient-light z) 0.3) - (set! (-> ambient-light w) 1.0) - ) - (let ((red (-> lights color))) - (set! (-> red 0 x) 1.0) - (set! (-> red 0 y) 1.0) - (set! (-> red 0 z) 1.0) - (set! (-> red 0 w) 1.0) - ) - (let ((green (-> lights color 1))) - (set! (-> green x) 0.2) - (set! (-> green y) 0.2) - (set! (-> green z) 0.2) - (set! (-> green w) 1.0) - ) - (let ((blue (-> lights color 2))) - (set! (-> blue x) 0.0) - (set! (-> blue y) 0.0) - (set! (-> blue z) 0.0) - (set! (-> blue w) 1.0) - ) - (let ((dir-light-x (-> lights direction))) - (set! (-> dir-light-x 0 x) 1.0) - (set! (-> dir-light-x 0 y) 0.0) - (set! (-> dir-light-x 0 z) 0.0) - (set! (-> dir-light-x 0 w) 1.0) - ) - (let ((dir-light-y (-> lights direction 1))) - (set! (-> dir-light-y x) 0.0) - (set! (-> dir-light-y y) 1.0) - (set! (-> dir-light-y z) 0.0) - (set! (-> dir-light-y w) 1.0) - ) - (let ((dir-light-z (-> lights direction 2))) - (set! (-> dir-light-z x) 0.0) - (set! (-> dir-light-z y) 0.0) - (set! (-> dir-light-z z) 1.0) - (set! (-> dir-light-z w) 1.0) - ) + + (set-vector! (-> lights ambient) 0.3 0.3 0.3 1.0) + + (set-vector! (-> lights color 0) 1.0 1.0 1.0 1.0) + (set-vector! (-> lights color 1) 0.2 0.2 0.2 1.0) + (set-vector! (-> lights color 2) 0.0 0.0 0.0 1.0) + + (set-vector! (-> lights direction 0) 1.0 0.0 0.0 1.0) + (set-vector! (-> lights direction 1) 0.0 1.0 0.0 1.0) + (set-vector! (-> lights direction 2) 0.0 0.0 1.0 1.0) + lights ) diff --git a/goal_src/engine/util/smush-control-h.gc b/goal_src/engine/util/smush-control-h.gc index 2a22de831..bcfe45c74 100644 --- a/goal_src/engine/util/smush-control-h.gc +++ b/goal_src/engine/util/smush-control-h.gc @@ -33,84 +33,86 @@ ) (defmethod nonzero-amplitude? smush-control ((obj smush-control)) - (!= (-> obj amp) 0.000000) + "Return #t if amp is not zero, #f otherwise" + (declare (inline)) + + (!= (-> obj amp) 0.0) ) (defmethod set-zero! smush-control ((obj smush-control)) - (set! (-> obj period) 0.000000) - (set! (-> obj duration) 0.000000) - (set! (-> obj amp) 0.000000) - (set! (-> obj damp-amp) 0.000000) - (set! (-> obj damp-period) 0.000000) - (set! (-> obj ticks) 0.000000) + (set! (-> obj period) 0.0) + (set! (-> obj duration) 0.0) + (set! (-> obj amp) 0.0) + (set! (-> obj damp-amp) 0.0) + (set! (-> obj damp-period) 0.0) + (set! (-> obj ticks) 0.0) obj ) (defmethod update! smush-control ((obj smush-control)) "Run the smush control and return the result. Updates the internal state." - (local-vars (period float) (time-since-period-start float) (time-since-start float)) + (cond - ((!= (-> obj amp) 0.000000) - (set! time-since-start - (the float (- (-> *display* base-frame-counter) (-> obj start-time))) + ((nonzero-amplitude? obj) + (let* ((time-since-start (the float (- (-> *display* base-frame-counter) (-> obj start-time)))) + ;; use float to int rounding to figure out offset into the current period. + (time-since-period-start (- time-since-start (* (the float (the int (/ time-since-start (-> obj period)))) (-> obj period)))) + ) + ;; we completed a new period! + (when (>= (- time-since-start (-> obj ticks)) (-> obj period)) + ;; once per period updates of amp/period + (set! (-> obj amp) (* (-> obj amp) (-> obj damp-amp))) + (set! (-> obj period) (* (-> obj period) (-> obj damp-period))) + ;; store the ticks that we did this on + (set! (-> obj ticks) time-since-start) + ;; you can set damp-period to a negative number to indicate + ;; that it should die on the next update. Do that here. + (if (< (-> obj damp-period) 0.0) + (set-zero! obj) + ) ) - (set! period (-> obj period)) - ;; use float to int rounding to figure out offset into the current period. - (set! time-since-period-start (- time-since-start - (* (the float (the int (/ time-since-start period))) period)) - ) - ;; we completed a new period! - (when (>= (- time-since-start (-> obj ticks)) (-> obj period)) - ;; once per period updates of amp/period - (set! (-> obj amp) (* (-> obj amp) (-> obj damp-amp))) - (set! (-> obj period) (* (-> obj period) (-> obj damp-period))) - ;; store the ticks that we did this on - (set! (-> obj ticks) time-since-start) - ;; you can set damp-period to a negative number to indicate - ;; that it should die on the next update. Do that here. - (if (< (-> obj damp-period) 0.000000) + + ;; absolute duraction check + (if (>= time-since-start (-> obj duration)) (set-zero! obj) ) - ) - - ;; absolute duraction check - (if (>= time-since-start (-> obj duration)) - (set-zero! obj) + ;; sine term multiplied by amplitude, and scaled by how much is left to go. + (* (sin (/ (* DEGREES_PER_ROT time-since-period-start) (-> obj period))) + (* (-> obj amp) + (/ (- (-> obj duration) time-since-start) (-> obj duration))) + ) ) - ;; sine term multiplied by amplitude, and scaled by how much is left to go. - (* (sin (/ (* 65536.000000 time-since-period-start) (-> obj period))) - (* (-> obj amp) - (/ (- (-> obj duration) time-since-start) (-> obj duration))) - ) ) ;; amplitude = 0, die. - (else 0.000000) + (else 0.0) ) ) (defmethod get-no-update smush-control ((obj smush-control)) "Get the value, but don't update internal state" - (local-vars (f0-2 float) (f0-4 float) (f30-0 float)) + (cond - ((!= (-> obj amp) 0.000000) - (set! f30-0 - (the float (- (-> *display* base-frame-counter) (-> obj start-time))) - ) - (set! f0-2 (-> obj period)) - (set! f0-4 (- f30-0 (* (the float (the int (/ f30-0 f0-2))) f0-2))) - (* (sin (/ (* 65536.000000 f0-4) (-> obj period))) - (* (-> obj amp) (/ (- (-> obj duration) f30-0) (-> obj duration))) - ) + ((nonzero-amplitude? obj) + (let* ((time-since-start (the float (- (-> *display* base-frame-counter) (-> obj start-time)))) + (time-since-period-start (- time-since-start (* (the float (the int (/ time-since-start (-> obj period)))) (-> obj period)))) + ) + (* (sin (/ (* DEGREES_PER_ROT time-since-period-start) (-> obj period))) + (* (-> obj amp) + (/ (- (-> obj duration) time-since-start) (-> obj duration))) + ) + ) ) - (else 0.000000) + ;; amplitude = 0, die. + (else 0.0) ) ) (defmethod die-on-next-update! smush-control ((obj smush-control)) "On the next call to update!, zero everything. Calls to get-no-update will still work." - (when (!= (-> obj amp) 0.000000) - (set! (-> obj damp-period) -1.000000) + + (if (nonzero-amplitude? obj) + (set! (-> obj damp-period) -1.0) ) obj ) @@ -124,6 +126,7 @@ (arg5 float) ) "Activate the smush! This only activates if the ongoing smush is mostly done." + (when (>= (fabs (* 0.2 (-> obj amp))) (fabs (get-no-update obj)) ) @@ -132,7 +135,7 @@ (set! (-> obj duration) (the float arg2)) (set! (-> obj damp-amp) arg3) (set! (-> obj damp-period) arg4) - (set! (-> obj ticks) 0.000000) + (set! (-> obj ticks) 0.0) (set! (-> obj start-time) (-> *display* base-frame-counter)) ) obj diff --git a/goal_src/engine/util/sync-info-h.gc b/goal_src/engine/util/sync-info-h.gc index f408af34f..c90231233 100644 --- a/goal_src/engine/util/sync-info-h.gc +++ b/goal_src/engine/util/sync-info-h.gc @@ -19,7 +19,7 @@ (dummy-12 (_type_ float) float 12) (dummy-13 (_type_) float 13) (dummy-14 (_type_ uint float float float) int 14) - (dummy-15 (_type_) float 15) ;; wip + (dummy-15 (_type_ process) float 15) ;; wip (dummy-16 (_type_ float) float 16) (dummy-17 (_type_) float 17) ) @@ -42,7 +42,7 @@ (dummy-12 (_type_ float) float 12) (dummy-13 (_type_) float 13) (dummy-14 (_type_ uint float float float) int 14) - (dummy-15 (_type_) float 15) ;; wip + (dummy-15 (_type_ process) float 15) ;; wip ;; (dummy-16 () none 16) ;; (dummy-17 () none 17) ) @@ -62,7 +62,7 @@ (dummy-12 (_type_ float) float 12) (dummy-13 (_type_) float 13) (dummy-14 (_type_ uint float float float) int 14) - (dummy-15 (_type_) float 15) ;; wip + (dummy-15 (_type_ process) float 15) ;; wip ;; (dummy-16 () none 16) ;; (dummy-17 () none 17) ) diff --git a/goal_src/engine/util/sync-info.gc b/goal_src/engine/util/sync-info.gc index 89fb87a58..6c02d57ec 100644 --- a/goal_src/engine/util/sync-info.gc +++ b/goal_src/engine/util/sync-info.gc @@ -14,9 +14,8 @@ (set! (-> obj period) arg0) (let* ((f0-1 (the float arg0)) (f1-1 (* arg1 f0-1)) - (f0-3 (- f1-1 (* (the float (the int (/ f1-1 f0-1))) f0-1))) ) - (set! (-> obj offset) f0-3) + (set! (-> obj offset) (- f1-1 (* (the float (the int (/ f1-1 f0-1))) f0-1))) ) 0 ) @@ -29,9 +28,8 @@ (set! (-> obj period) arg0) (let* ((f0-1 (the float arg0)) (f1-1 (* arg1 f0-1)) - (f0-3 (- f1-1 (* (the float (the int (/ f1-1 f0-1))) f0-1))) ) - (set! (-> obj offset) f0-3) + (set! (-> obj offset) (- f1-1 (* (the float (the int (/ f1-1 f0-1))) f0-1))) ) (if (< arg2 0.0) (set! arg2 0.0) @@ -76,9 +74,8 @@ (set! (-> obj period) arg0) (let* ((f0-1 (the float arg0)) (f1-1 (* arg1 f0-1)) - (f0-3 (- f1-1 (* (the float (the int (/ f1-1 f0-1))) f0-1))) ) - (set! (-> obj offset) f0-3) + (set! (-> obj offset) (- f1-1 (* (the float (the int (/ f1-1 f0-1))) f0-1))) ) (cond ((< arg2 0.0) @@ -102,22 +99,13 @@ ) ;; definition for method 15 of type sync-info -;; WARN: Type Propagation failed: Could not get type of load: (set! a0 (l.wu (+ a1 48))). -;; WARN: Type Propagation failed: Type analysis failed -;; WARN: Unsupported inline assembly instruction kind - [sq r0, 16(sp)] -;; Used lq/sq +;; ERROR: function was not converted to expressions. Cannot decompile. ;; definition for method 15 of type sync-info-eased -;; WARN: Type Propagation failed: Could not get type of load: (set! a0 (l.wu (+ a1 48))). -;; WARN: Type Propagation failed: Type analysis failed -;; WARN: Unsupported inline assembly instruction kind - [sq r0, 16(sp)] -;; Used lq/sq +;; ERROR: function was not converted to expressions. Cannot decompile. ;; definition for method 15 of type sync-info-paused -;; WARN: Type Propagation failed: Could not get type of load: (set! a0 (l.wu (+ a1 48))). -;; WARN: Type Propagation failed: Type analysis failed -;; WARN: Unsupported inline assembly instruction kind - [sq r0, 16(sp)] -;; Used lq/sq +;; ERROR: function was not converted to expressions. Cannot decompile. ;; definition for method 10 of type sync-info (defmethod dummy-10 sync-info ((obj sync-info)) @@ -213,7 +201,7 @@ ;; definition for method 9 of type sync-info-paused (defmethod dummy-9 sync-info-paused ((obj sync-info-paused) (arg0 float)) - (* ((method-of-type sync-info-paused dummy-11) obj) arg0) + (* (dummy-11 obj) arg0) ) ;; definition for method 13 of type sync-info @@ -354,12 +342,12 @@ ;; definition for method 12 of type sync-info-eased (defmethod dummy-12 sync-info-eased ((obj sync-info-eased) (arg0 float)) - (* ((method-of-type sync-info-eased dummy-13) obj) arg0) + (* (dummy-13 obj) arg0) ) ;; definition for method 12 of type sync-info-paused (defmethod dummy-12 sync-info-paused ((obj sync-info-paused) (arg0 float)) - (* ((method-of-type sync-info-paused dummy-13) obj) arg0) + (* (dummy-13 obj) arg0) ) ;; definition for method 9 of type delayed-rand-float @@ -385,8 +373,9 @@ ) (set! (-> obj start-time) (-> *display* base-frame-counter)) (set! (-> obj timer) (rand-vu-int-range (-> obj min-time) (-> obj max-time))) - (let ((f0-3 (rand-vu-float-range (- (-> obj max-val)) (-> obj max-val)))) - (set! (-> obj value) f0-3) + (set! + (-> obj value) + (rand-vu-float-range (- (-> obj max-val)) (-> obj max-val)) ) ) (-> obj value) @@ -423,10 +412,9 @@ (fmin (-> obj max-vel) (fmax (- (-> obj max-vel)) (-> obj vel))) ) (set! (-> obj vel) (* (-> obj vel) (-> obj damping))) - (let - ((f0-10 (+ (-> obj value) (* (-> obj vel) (-> *display* time-adjust-ratio)))) - ) - (set! (-> obj value) f0-10) + (set! + (-> obj value) + (+ (-> obj value) (* (-> obj vel) (-> *display* time-adjust-ratio))) ) (-> obj value) ) @@ -444,7 +432,7 @@ (arg5 float) (arg6 float) ) - ((method-of-type oscillating-float dummy-9) (-> obj osc) arg0 arg4 arg5 arg6) + (dummy-9 (-> obj osc) arg0 arg4 arg5 arg6) (set! (-> obj max-value) arg1) (set! (-> obj min-value) arg2) (set! (-> obj elasticity) arg3) @@ -454,23 +442,19 @@ ;; definition for method 10 of type bouncing-float (defmethod dummy-10 bouncing-float ((obj bouncing-float) (arg0 float)) - ((method-of-type oscillating-float dummy-10) (-> obj osc) arg0) + (dummy-10 (-> obj osc) arg0) (set! (-> obj state) 0) (when (>= (-> obj osc value) (-> obj max-value)) (set! (-> obj osc value) (-> obj max-value)) (if (< 0.0 (-> obj osc vel)) - (let ((f0-4 (* (-> obj osc vel) (- (-> obj elasticity))))) - (set! (-> obj osc vel) f0-4) - ) + (set! (-> obj osc vel) (* (-> obj osc vel) (- (-> obj elasticity)))) ) (set! (-> obj state) 1) ) (when (>= (-> obj min-value) (-> obj osc value)) (set! (-> obj osc value) (-> obj min-value)) (if (< (-> obj osc vel) 0.0) - (let ((f0-9 (* (-> obj osc vel) (- (-> obj elasticity))))) - (set! (-> obj osc vel) f0-9) - ) + (set! (-> obj osc vel) (* (-> obj osc vel) (- (-> obj elasticity)))) ) (set! (-> obj state) -1) ) @@ -500,9 +484,7 @@ (set! (-> obj y-max) (* 0.5 arg3)) (set! (-> obj start-time) (the-as uint 0)) (set! (-> obj timer) 0) - (let ((v1-0 (-> obj value))) - (.svf (&-> v1-0 quad) vf0) - ) + (.svf (&-> (-> obj value) quad) vf0) (-> obj value) ) ) @@ -512,15 +494,15 @@ (set! (-> obj start-time) (-> *display* base-frame-counter)) (set! (-> obj timer) (rand-vu-int-range (-> obj min-time) (-> obj max-time))) (set! - (-> obj value data 0) + (-> obj value x) (rand-vu-float-range (- (-> obj xz-max)) (-> obj xz-max)) ) (set! - (-> obj value data 1) + (-> obj value y) (rand-vu-float-range (- (-> obj y-max)) (-> obj y-max)) ) (set! - (-> obj value data 2) + (-> obj value z) (rand-vu-float-range (- (-> obj xz-max)) (-> obj xz-max)) ) (-> obj value) @@ -533,7 +515,7 @@ (the-as int (- (-> *display* base-frame-counter) (-> obj start-time))) (-> obj timer) ) - ((method-of-type delayed-rand-vector dummy-10) obj) + (dummy-10 obj) ) (-> obj value) ) @@ -547,10 +529,8 @@ (the-as int (- (-> *display* base-frame-counter) (-> obj start-time))) (-> obj timer) ) - ((method-of-type delayed-rand-vector dummy-10) obj) - (let ((v1-5 (-> obj value))) - (.svf (&-> v1-5 quad) vf0) - ) + (dummy-10 obj) + (.svf (&-> (-> obj value) quad) vf0) ) (-> obj value) ) @@ -579,17 +559,11 @@ ) ) (else - (let ((v1-2 (-> obj value))) - (.svf (&-> v1-2 quad) vf0) - ) - (let ((v1-3 (-> obj target))) - (.svf (&-> v1-3 quad) vf0) - ) + (.svf (&-> (-> obj value) quad) vf0) + (.svf (&-> (-> obj target) quad) vf0) ) ) - (let ((v1-4 (-> obj vel))) - (.svf (&-> v1-4 quad) vf0) - ) + (.svf (&-> (-> obj vel) quad) vf0) (set! (-> obj max-vel) arg2) (set! (-> obj damping) arg3) (set! (-> obj accel) arg1) @@ -607,7 +581,7 @@ (vf6 :class vf) ) (init-vf0-vector) - (let ((s5-0 (new 'stack 'vector))) + (let ((s5-0 (new 'stack-no-clear 'vector))) (cond (arg0 (let ((a0-1 s5-0)) @@ -670,7 +644,7 @@ (.svf (&-> a1-4 quad) vf6) ) (let ((f0-2 (vector-length (-> obj vel)))) - (if (< (-> obj max-vel) f0-2) + (when (< (-> obj max-vel) f0-2) (let ((v1-6 (-> obj vel))) (let ((a0-8 (-> obj vel)) (f0-3 (/ (-> obj max-vel) f0-2)) diff --git a/goal_src/engine/util/types-h.gc b/goal_src/engine/util/types-h.gc index a90a42b00..85a13655d 100644 --- a/goal_src/engine/util/types-h.gc +++ b/goal_src/engine/util/types-h.gc @@ -60,13 +60,13 @@ "Convert number to seconds unit." (cond ((float? x) - (* (* 1.0 TICKS_PER_SECOND) x) + (* 1.0 TICKS_PER_SECOND x) ) ((integer? x) (* TICKS_PER_SECOND x) ) (#t - `(* (* 1.0 TICKS_PER_SECOND) ,x) + `(* 1.0 TICKS_PER_SECOND ,x) ) ) ) diff --git a/goal_src/goal-lib.gc b/goal_src/goal-lib.gc index 37eb509fd..7486285bf 100644 --- a/goal_src/goal-lib.gc +++ b/goal_src/goal-lib.gc @@ -22,7 +22,7 @@ (defmacro md (file &rest path) "Make Debug: make + print disassembly for a file" - `(asm-file ,file :color :write :disassemble ,@path) + `(asm-file ,file :color :write :disassemble ,(first path)) ) (defmacro ml (file) @@ -355,7 +355,7 @@ (defmacro case (switch &rest cases) "A switch-case construct. switch is saved onto a local variable and compared against each case, sequentially. - else can be used as the default case, but it must be the last one." + else can be used like the 'default' case, but it must be the last one." (with-gensyms (sw) ;; save the switch to a variable (only evaluated once) @@ -407,16 +407,20 @@ `(set! ,place (+ 1 ,place)) ) +(defmacro 1- (var) + `(- ,var 1) + ) + (defmacro -! (place amount) `(set! ,place (- ,place ,amount)) ) -(defmacro *! (place amount) - `(set! ,place (* ,place ,amount)) +(defmacro 1-! (place) + `(set! ,place (- 1 ,place)) ) -(defmacro 1- (var) - `(- ,var 1) +(defmacro *! (place amount) + `(set! ,place (* ,place ,amount)) ) (defmacro zero? (thing) diff --git a/goal_src/kernel/gstate.gc b/goal_src/kernel/gstate.gc index 0335e1d71..44d283287 100644 --- a/goal_src/kernel/gstate.gc +++ b/goal_src/kernel/gstate.gc @@ -27,7 +27,7 @@ There are several ways to "go" and shrink the process heap, if appropriate - go from outside the process. You can temporarily set pp to another process, and have that - process go to another state. The actually go will occur the next time the process is scheduled. + process go to another state. The actual go will occur the next time the process is scheduled. Use the go-process macro to do this. - go from a non-main thread in the right process. You can do a go from a temporary thread, like trans or post. diff --git a/test/decompiler/reference/engine/util/sync-info-h_REF.gc b/test/decompiler/reference/engine/util/sync-info-h_REF.gc index f715e335c..6df36cae9 100644 --- a/test/decompiler/reference/engine/util/sync-info-h_REF.gc +++ b/test/decompiler/reference/engine/util/sync-info-h_REF.gc @@ -16,7 +16,7 @@ (dummy-12 (_type_ float) float 12) (dummy-13 (_type_) float 13) (dummy-14 (_type_ uint float float float) int 14) - (dummy-15 (_type_) float 15) + (dummy-15 (_type_ process) float 15) (dummy-16 (_type_ float) float 16) (dummy-17 (_type_) float 17) ) @@ -234,3 +234,6 @@ (let ((v0-8 0)) ) + + +