diff --git a/decompiler/config/jak1/all-types.gc b/decompiler/config/jak1/all-types.gc index 6945ce28441..a93f892458f 100644 --- a/decompiler/config/jak1/all-types.gc +++ b/decompiler/config/jak1/all-types.gc @@ -20928,7 +20928,7 @@ (define-extern target-start-attack (function none :behavior target)) (define-extern target-danger-set! (function symbol symbol float :behavior target)) (define-extern average-turn-angle (function target float)) ;; NOTE - arg not confirmed, also unused -(define-extern can-play-stance-amibent? (function symbol :behavior target)) +(define-extern can-play-stance-ambient? (function symbol :behavior target)) (define-extern can-jump? (function symbol symbol :behavior target)) (define-extern move-legs? (function symbol :behavior target)) (define-extern fall-test (function none :behavior target)) ;; NOTE - first arg unused diff --git a/decompiler/config/jak2/all-types.gc b/decompiler/config/jak2/all-types.gc index 6978a9c1961..9b3d3b46d4b 100644 --- a/decompiler/config/jak2/all-types.gc +++ b/decompiler/config/jak2/all-types.gc @@ -25308,7 +25308,7 @@ Based on the implementation of point-poly-intersection?, these should likely be "Is the given point ([[vector]]) outside of the [[nav-mesh]]'s `bounds` [[sphere]] radius" (_type_ vector) symbol) ;; 10 (find-poly-containing-point-1 "Find nav-poly containing this point." (_type_ vector) nav-poly) ;; 11 - (cloest-point-on-mesh (_type_ vector vector nav-poly) nav-poly) ;; 12 + (closest-point-on-mesh (_type_ vector vector nav-poly) nav-poly) ;; 12 (find-nearest-poly-to-point "Find the nav-poly closest to this point in the nav-mesh." (_type_ vector) nav-poly) ;; 13 (project-point-onto-plane-of-poly "Move a point to the be on the plane containing the given nav-poly. Return the normal too" (_type_ nav-poly vector vector vector) none) ;; 14 (find-poly-containing-point-2 "Find nav-poly containing this point - same as 1" (_type_ vector) nav-poly) ;; 15 @@ -31148,7 +31148,7 @@ Consists of a header and a list of [[merc-effect]]s." (define-extern debounce-speed (function float float vector vector float :behavior target)) (define-extern target-align-vel-z-adjust (function float float :behavior target)) (define-extern average-turn-angle (function target float)) -(define-extern can-play-stance-amibent? (function symbol :behavior target)) +(define-extern can-play-stance-ambient? (function symbol :behavior target)) (define-extern target-height-above-ground (function float :behavior target)) (define-extern can-jump? (function symbol symbol :behavior target)) (define-extern target-jump-go (function none :behavior target)) diff --git a/decompiler/config/jak3/all-types.gc b/decompiler/config/jak3/all-types.gc index 0835aad2637..28f1cb84555 100644 --- a/decompiler/config/jak3/all-types.gc +++ b/decompiler/config/jak3/all-types.gc @@ -36354,7 +36354,7 @@ (define-extern debounce-speed (function float float vector vector float :behavior target)) (define-extern target-align-vel-z-adjust (function float float :behavior target)) (define-extern average-turn-angle (function target float)) -(define-extern can-play-stance-amibent? (function symbol :behavior target)) +(define-extern can-play-stance-ambient? (function symbol :behavior target)) (define-extern target-height-above-ground (function float :behavior target)) (define-extern find-collision-below (function vector vector float symbol)) (define-extern can-jump? (function symbol symbol :behavior target)) diff --git a/goal_src/jak1/engine/target/target-util.gc b/goal_src/jak1/engine/target/target-util.gc index fb5f58e48fd..106b2c25ca0 100644 --- a/goal_src/jak1/engine/target/target-util.gc +++ b/goal_src/jak1/engine/target/target-util.gc @@ -550,7 +550,7 @@ (fabs (deg-diff (atan (-> arg0 control unknown-vector-array00 s5-0 x) (-> arg0 control unknown-vector-array00 s5-0 z)) 0.0)))) (/ f30-0 8))) -(defbehavior can-play-stance-amibent? target () +(defbehavior can-play-stance-ambient? target () (and (time-elapsed? (-> self state-time) (seconds 30)) (not (-> *setting-control* current talking)) (not (-> *setting-control* current spooling)) diff --git a/goal_src/jak1/engine/target/target.gc b/goal_src/jak1/engine/target/target.gc index 5e475ee3a86..4c0ee57cc81 100644 --- a/goal_src/jak1/engine/target/target.gc +++ b/goal_src/jak1/engine/target/target.gc @@ -368,7 +368,7 @@ (ja :num! (loop!)) (ja :chan 1 :num! (chan 0)) (ja :chan 2 :num! (chan 0)) - (if (can-play-stance-amibent?) (go target-stance-ambient))))) + (if (can-play-stance-ambient?) (go target-stance-ambient))))) :post target-post) (defstate target-walk (target) diff --git a/goal_src/jak2/engine/nav/nav-control-h.gc b/goal_src/jak2/engine/nav/nav-control-h.gc index 588806e24c0..4d966de8fb8 100644 --- a/goal_src/jak2/engine/nav/nav-control-h.gc +++ b/goal_src/jak2/engine/nav/nav-control-h.gc @@ -177,7 +177,7 @@ (debug-draw (_type_) none) (point-in-bsphere? (_type_ vector) symbol) (find-poly-containing-point-1 (_type_ vector) nav-poly) - (cloest-point-on-mesh (_type_ vector vector nav-poly) nav-poly) + (closest-point-on-mesh (_type_ vector vector nav-poly) nav-poly) (find-nearest-poly-to-point (_type_ vector) nav-poly) (project-point-onto-plane-of-poly (_type_ nav-poly vector vector vector) none) (find-poly-containing-point-2 (_type_ vector) nav-poly) diff --git a/goal_src/jak2/engine/nav/nav-control.gc b/goal_src/jak2/engine/nav/nav-control.gc index 7cf3ea264db..9f12c99a216 100644 --- a/goal_src/jak2/engine/nav/nav-control.gc +++ b/goal_src/jak2/engine/nav/nav-control.gc @@ -2089,7 +2089,7 @@ Note that this doesn't actually return the nav-control, but instead adds this pr (none) ) -(defmethod cloest-point-on-mesh ((this nav-control) (arg0 vector) (arg1 vector) (arg2 nav-poly)) +(defmethod closest-point-on-mesh ((this nav-control) (arg0 vector) (arg1 vector) (arg2 nav-poly)) (local-vars (sv-16 vector)) (set! sv-16 arg0) (let ((gp-0 (new 'stack-no-clear 'nav-find-poly-parms))) diff --git a/goal_src/jak2/engine/nav/nav-enemy.gc b/goal_src/jak2/engine/nav/nav-enemy.gc index ae804edada7..94854ed71d5 100644 --- a/goal_src/jak2/engine/nav/nav-enemy.gc +++ b/goal_src/jak2/engine/nav/nav-enemy.gc @@ -105,7 +105,7 @@ (set! (-> s4-0 quad) (-> gp-0 trans quad)) ) (else - (if (or (not (cloest-point-on-mesh (-> s3-0 nav) s4-0 (-> gp-0 trans) (the-as nav-poly #f))) + (if (or (not (closest-point-on-mesh (-> s3-0 nav) s4-0 (-> gp-0 trans) (the-as nav-poly #f))) (let ((f0-0 32768.0)) (< (* f0-0 f0-0) (vector-vector-xz-distance-squared s4-0 (-> gp-0 trans))) ) @@ -2176,7 +2176,7 @@ This commonly includes things such as: (vector-normalize! s4-0 (rnd-float-range self 16384.0 49152.0)) (vector-rotate-around-y! s4-0 s4-0 f30-1) (vector+! s5-0 s5-0 s4-0) - (if (and (cloest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f)) + (if (and (closest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f)) (< 4096.0 (vector-vector-xz-distance s5-0 (-> self root trans))) ) (return #f) @@ -2333,7 +2333,7 @@ This commonly includes things such as: ) (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self root trans quad)) - (cloest-point-on-mesh (-> self nav) gp-1 s5-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) gp-1 s5-0 (the-as nav-poly #f)) (if (< (vector-vector-xz-distance gp-1 (-> self root trans)) 409.6) (set! (-> self enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag41) (-> self enemy-flags)))) (set! (-> self enemy-flags) (the-as enemy-flag (logclear (-> self enemy-flags) (enemy-flag enemy-flag41)))) diff --git a/goal_src/jak2/engine/target/board/board-states.gc b/goal_src/jak2/engine/target/board/board-states.gc index a7c5397f602..2efc40d2f69 100644 --- a/goal_src/jak2/engine/target/board/board-states.gc +++ b/goal_src/jak2/engine/target/board/board-states.gc @@ -11,7 +11,7 @@ (define-extern target-board-handler (function process int symbol event-message-block object :behavior target)) (define-extern ground-tween-initialize (function ground-tween-info uint uint uint uint uint uint float ground-tween-info :behavior target)) (define-extern ground-tween-update (function ground-tween-info float float float none :behavior target)) -(define-extern can-play-stance-amibent? (function symbol :behavior target)) +(define-extern can-play-stance-ambient? (function symbol :behavior target)) (define-extern ja-blend-eval (function int :behavior process-drawable)) (define-extern spawn-projectile (function type projectile-init-by-other-params process-tree dead-pool (pointer process))) (define-extern target-attacked (function symbol attack-info process touching-shapes-entry (state symbol attack-info target) object :behavior target)) @@ -699,7 +699,7 @@ ) ) (suspend) - (can-play-stance-amibent?) + (can-play-stance-ambient?) ) ) #f diff --git a/goal_src/jak2/engine/target/gun/gun-states.gc b/goal_src/jak2/engine/target/gun/gun-states.gc index 474ca999b4e..782039356e7 100644 --- a/goal_src/jak2/engine/target/gun/gun-states.gc +++ b/goal_src/jak2/engine/target/gun/gun-states.gc @@ -205,7 +205,7 @@ ) (suspend) (ja :num! (loop!)) - (when (can-play-stance-amibent?) + (when (can-play-stance-ambient?) (set-time! (-> self ambient-time)) (target-gun-end-mode #t) ) diff --git a/goal_src/jak2/engine/target/mech/mech-states.gc b/goal_src/jak2/engine/target/mech/mech-states.gc index 2474d80d118..6036d1b6e89 100644 --- a/goal_src/jak2/engine/target/mech/mech-states.gc +++ b/goal_src/jak2/engine/target/mech/mech-states.gc @@ -155,7 +155,7 @@ (set! (-> a0-44 param 0) 1.0) (joint-control-channel-group-eval! a0-44 (the-as art-joint-anim #f) num-func-loop!) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) ) ) #f diff --git a/goal_src/jak2/engine/target/target-anim.gc b/goal_src/jak2/engine/target/target-anim.gc index 415289f71ef..ce23050a59f 100644 --- a/goal_src/jak2/engine/target/target-anim.gc +++ b/goal_src/jak2/engine/target/target-anim.gc @@ -440,7 +440,7 @@ (until #f (suspend) (ja :num! (loop!)) - (if (can-play-stance-amibent?) + (if (can-play-stance-ambient?) (go target-stance-ambient) ) ) @@ -1617,14 +1617,14 @@ (until #f (ja-no-eval :group! jakb-edge-grab-stance0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (ja :num! (seek!)) ) (+! (-> self anim-seed) 1) (ja-no-eval :group! jakb-edge-grab-stance1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (ja :num! (seek!)) ) diff --git a/goal_src/jak2/engine/target/target-swim.gc b/goal_src/jak2/engine/target/target-swim.gc index 8b21f4614f0..fee3fbad0c1 100644 --- a/goal_src/jak2/engine/target/target-swim.gc +++ b/goal_src/jak2/engine/target/target-swim.gc @@ -467,7 +467,7 @@ (until #f (ja :group! jakb-swim-stance-ja :num! min) (until (and (ja-done? 0) (= (-> self skel root-channel 0) (-> self skel channel))) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (if (= (-> self skel root-channel 0) (-> self skel channel)) (ja :num! (seek!)) diff --git a/goal_src/jak2/engine/target/target-turret.gc b/goal_src/jak2/engine/target/target-turret.gc index 670b4291b05..42267a8c816 100644 --- a/goal_src/jak2/engine/target/target-turret.gc +++ b/goal_src/jak2/engine/target/target-turret.gc @@ -2157,7 +2157,7 @@ (ja :group! jakb-turret-stance-ja) (until v1-19 (suspend) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (ja :num! (loop! 0.5)) (set! v1-19 (and (or (not (-> self control unknown-handle02)) (cpad-pressed? (-> self control cpad number) triangle)) diff --git a/goal_src/jak2/engine/target/target-util.gc b/goal_src/jak2/engine/target/target-util.gc index 6fbfe143624..350202c43ed 100644 --- a/goal_src/jak2/engine/target/target-util.gc +++ b/goal_src/jak2/engine/target/target-util.gc @@ -1084,7 +1084,7 @@ ) ) -(defbehavior can-play-stance-amibent? target () +(defbehavior can-play-stance-ambient? target () (and (or (and (= *kernel-boot-message* 'kiosk) (>= (+ -300000 (-> *display* real-clock frame-counter)) (seconds 60)) (>= (- (-> *display* base-clock frame-counter) (-> self control cpad change-time)) (seconds 60)) diff --git a/goal_src/jak2/engine/target/target2.gc b/goal_src/jak2/engine/target/target2.gc index bc55bcfa46c..72900adb765 100644 --- a/goal_src/jak2/engine/target/target2.gc +++ b/goal_src/jak2/engine/target/target2.gc @@ -608,7 +608,7 @@ ) (ja-no-eval :group! jakb-pole-cycle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (ja :num! (seek!)) ) diff --git a/goal_src/jak2/levels/atoll/juicer.gc b/goal_src/jak2/levels/atoll/juicer.gc index d77b0967eef..29575bea45a 100644 --- a/goal_src/jak2/levels/atoll/juicer.gc +++ b/goal_src/jak2/levels/atoll/juicer.gc @@ -1072,7 +1072,7 @@ (set-vector! s4-0 (* 8192.0 (cos f28-0)) 0.0 (* 8192.0 (sin f28-0)) 1.0) ) (vector+! s4-0 s4-0 gp-0) - (cloest-point-on-mesh (-> self nav) s4-0 s4-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) s4-0 s4-0 (the-as nav-poly #f)) (vector-! s5-0 s4-0 gp-0) (set! (-> s5-0 y) 0.0) (vector-normalize! s5-0 30720.0) diff --git a/goal_src/jak2/levels/castle/boss/castle-baron.gc b/goal_src/jak2/levels/castle/boss/castle-baron.gc index b01905dab8f..390677cfdfa 100644 --- a/goal_src/jak2/levels/castle/boss/castle-baron.gc +++ b/goal_src/jak2/levels/castle/boss/castle-baron.gc @@ -2811,7 +2811,7 @@ ) (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self root trans quad)) - (cloest-point-on-mesh (-> self nav) gp-1 s5-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) gp-1 s5-0 (the-as nav-poly #f)) (if (< (vector-vector-xz-distance gp-1 (-> self root trans)) 409.6) (set! (-> self enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag41) (-> self enemy-flags)))) (set! (-> self enemy-flags) (the-as enemy-flag (logclear (-> self enemy-flags) (enemy-flag enemy-flag41)))) diff --git a/goal_src/jak2/levels/city/common/pilot-states.gc b/goal_src/jak2/levels/city/common/pilot-states.gc index c4144d7bdb4..8d7be7906c9 100644 --- a/goal_src/jak2/levels/city/common/pilot-states.gc +++ b/goal_src/jak2/levels/city/common/pilot-states.gc @@ -55,7 +55,7 @@ (set! (-> s5-2 frame-num) (ja-aframe f0-6 2)) ) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) ) #f diff --git a/goal_src/jak2/levels/city/kiddogescort/crocesc.gc b/goal_src/jak2/levels/city/kiddogescort/crocesc.gc index f96819081fd..286ea734ad8 100644 --- a/goal_src/jak2/levels/city/kiddogescort/crocesc.gc +++ b/goal_src/jak2/levels/city/kiddogescort/crocesc.gc @@ -258,7 +258,7 @@ (set! (-> s4-0 y) (-> s3-1 best-other-tri intersect y)) (let ((s3-2 (new 'stack-no-clear 'vector))) (do-navigation-to-destination (-> this nav state) (-> this root trans)) - (when (cloest-point-on-mesh (-> this nav) s3-2 s4-0 (the-as nav-poly #f)) + (when (closest-point-on-mesh (-> this nav) s3-2 s4-0 (the-as nav-poly #f)) (let ((f0-4 2048.0)) (when (>= (* f0-4 f0-4) (vector-vector-xz-distance-squared s3-2 s4-0)) (set! (-> arg0 quad) (-> s3-2 quad)) diff --git a/goal_src/jak2/levels/city/kiddogescort/kidesc.gc b/goal_src/jak2/levels/city/kiddogescort/kidesc.gc index 809d1559fc5..d385eaa21c8 100644 --- a/goal_src/jak2/levels/city/kiddogescort/kidesc.gc +++ b/goal_src/jak2/levels/city/kiddogescort/kidesc.gc @@ -675,7 +675,7 @@ This commonly includes things such as: (set! (-> s4-0 y) (-> s3-1 best-other-tri intersect y)) (let ((s3-2 (new 'stack-no-clear 'vector))) (do-navigation-to-destination (-> this nav state) (-> this root trans)) - (when (cloest-point-on-mesh (-> this nav) s3-2 s4-0 (the-as nav-poly #f)) + (when (closest-point-on-mesh (-> this nav) s3-2 s4-0 (the-as nav-poly #f)) (let ((f0-4 2048.0)) (when (>= (* f0-4 f0-4) (vector-vector-xz-distance-squared s3-2 s4-0)) (set! (-> arg0 quad) (-> s3-2 quad)) diff --git a/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc b/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc index 9eb64f217aa..53a62b51113 100644 --- a/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc +++ b/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc @@ -796,7 +796,7 @@ (cond ((-> self coming-from-pw) (let ((s5-1 (-> self nav)) - (s4-0 (method-of-type nav-control cloest-point-on-mesh)) + (s4-0 (method-of-type nav-control closest-point-on-mesh)) (s3-0 gp-0) (s2-0 (new 'stack-no-clear 'vector)) ) @@ -821,7 +821,7 @@ (set! (-> self coming-from-pw) #f) ) (else - (cloest-point-on-mesh (-> self nav) gp-0 (-> self root trans) (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) gp-0 (-> self root trans) (the-as nav-poly #f)) (when (< 4096.0 (vector-vector-xz-distance gp-0 (-> self root trans))) (set! (-> self root transv x) (- (-> gp-0 x) (-> self root trans x))) (set! (-> self root transv y) 40960.0) diff --git a/goal_src/jak2/levels/city/traffic/citizen/guard.gc b/goal_src/jak2/levels/city/traffic/citizen/guard.gc index 08430020a21..abfbc61f149 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/guard.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/guard.gc @@ -2174,7 +2174,7 @@ (s3-0 (new 'stack-no-clear 'vector)) ) (vector+! s3-0 (-> arg1 trans) arg2) - (cloest-point-on-mesh (-> arg0 nav) s4-0 s3-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> arg0 nav) s4-0 s3-0 (the-as nav-poly #f)) (cond ((< 409.6 (vector-vector-distance s3-0 s4-0)) #f diff --git a/goal_src/jak2/levels/common/enemy/grenadier.gc b/goal_src/jak2/levels/common/enemy/grenadier.gc index a8126999327..2aad91b6d8c 100644 --- a/goal_src/jak2/levels/common/enemy/grenadier.gc +++ b/goal_src/jak2/levels/common/enemy/grenadier.gc @@ -342,7 +342,7 @@ ;; WARN: Return type mismatch vector vs none. (defmethod grenadier-method-182 ((this grenadier) (arg0 vector)) - (cloest-point-on-mesh (-> this nav) arg0 arg0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> this nav) arg0 arg0 (the-as nav-poly #f)) (set! (-> this bank final-pos quad) (-> arg0 quad)) (set! (-> this bank tangent-pos quad) (-> arg0 quad)) (set! (-> this move-pos quad) (-> this bank tangent-pos quad)) @@ -517,7 +517,7 @@ (set! (-> s4-0 quad) (-> self root trans quad)) (new 'stack-no-clear 'vector) (vector-normalize! s3-1 49152.0) - (cloest-point-on-mesh (-> self nav) s4-0 (vector+! s4-0 s5-0 s3-1) (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) s4-0 (vector+! s4-0 s5-0 s3-1) (the-as nav-poly #f)) (when (< 32768.0 (vector-vector-distance gp-0 s4-0)) (set! (-> self move-pos quad) (-> s4-0 quad)) (let ((a0-11 (-> self nav state)) @@ -853,7 +853,7 @@ (a2-2 (vector+! (new 'stack-no-clear 'vector) (-> self root trans) v1-8)) ) (set! (-> self move-pos quad) (-> self root trans quad)) - (cloest-point-on-mesh (-> self nav) (-> self move-pos) a2-2 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) (-> self move-pos) a2-2 (the-as nav-poly #f)) ) (let ((a0-10 (-> self nav state)) (v1-13 (-> self move-pos)) diff --git a/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc b/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc index 4989fc1ccd7..757c7a5a44e 100644 --- a/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc +++ b/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc @@ -1483,7 +1483,7 @@ (when s5-0 (set! (-> this target-pos quad) (-> (get-trans (the-as process-focusable s5-0) 3) quad)) (if (= (-> this focus aware) (enemy-aware enemy-aware-3)) - (cloest-point-on-mesh (-> this nav) (-> this reachable-target-pos) (-> this target-pos) (the-as nav-poly #f)) + (closest-point-on-mesh (-> this nav) (-> this reachable-target-pos) (-> this target-pos) (the-as nav-poly #f)) ) (set! (-> this target-vel-vec quad) (-> (the-as process-focusable s5-0) root transv quad)) (set! (-> this target-vel) (vector-length (-> this target-vel-vec))) @@ -2951,7 +2951,7 @@ (s3-0 (new 'stack-no-clear 'vector)) ) (vector+! s3-0 (-> arg1 trans) arg2) - (cloest-point-on-mesh (-> arg0 nav) s4-0 s3-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> arg0 nav) s4-0 s3-0 (the-as nav-poly #f)) (cond ((< 409.6 (vector-vector-distance s3-0 s4-0)) #f diff --git a/goal_src/jak2/levels/common/enemy/hover/flamer.gc b/goal_src/jak2/levels/common/enemy/hover/flamer.gc index 6d51debf532..334007c5819 100644 --- a/goal_src/jak2/levels/common/enemy/hover/flamer.gc +++ b/goal_src/jak2/levels/common/enemy/hover/flamer.gc @@ -392,7 +392,7 @@ ) ) ) - (cloest-point-on-mesh (-> self nav) (-> self dest-pos) (-> self dest-pos) (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) (-> self dest-pos) (-> self dest-pos) (the-as nav-poly #f)) (if #f (add-debug-line #t diff --git a/goal_src/jak2/levels/common/enemy/spyder.gc b/goal_src/jak2/levels/common/enemy/spyder.gc index acd884e923b..3e993ebab75 100644 --- a/goal_src/jak2/levels/common/enemy/spyder.gc +++ b/goal_src/jak2/levels/common/enemy/spyder.gc @@ -418,7 +418,7 @@ ) ) (set! (-> this move-dest quad) (-> s5-0 quad)) - (cloest-point-on-mesh (-> this nav) (-> this move-dest) s4-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> this nav) (-> this move-dest) s4-0 (the-as nav-poly #f)) ) ) ) diff --git a/goal_src/jak2/levels/common/entities/gun-buoy.gc b/goal_src/jak2/levels/common/entities/gun-buoy.gc index 228a91be97d..0e0c0f02424 100644 --- a/goal_src/jak2/levels/common/entities/gun-buoy.gc +++ b/goal_src/jak2/levels/common/entities/gun-buoy.gc @@ -335,7 +335,7 @@ (vector+! s5-0 s4-0 v1-8) (cond ((logtest? (-> self flags) (gun-buoy-flags gubflags-0)) - (cloest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f)) (let ((v1-14 (-> self root trans))) (vector-length (vector-! (new 'stack-no-clear 'vector) v1-14 s5-0)) ) @@ -464,7 +464,7 @@ ) (set! (-> s5-0 y) -819.2) (let ((s3-2 (vector+! (new 'stack-no-clear 'vector) s4-0 s5-0))) - (cloest-point-on-mesh (-> self nav) s3-2 s3-2 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) s3-2 s3-2 (the-as nav-poly #f)) (set! (-> self root trans quad) (-> s3-2 quad)) ) (set! (-> self y-final) (-> self root trans y)) diff --git a/goal_src/jak2/levels/drill/ginsu.gc b/goal_src/jak2/levels/drill/ginsu.gc index 85d5f26b407..359c8a5728f 100644 --- a/goal_src/jak2/levels/drill/ginsu.gc +++ b/goal_src/jak2/levels/drill/ginsu.gc @@ -631,7 +631,7 @@ (vector+float*! gp-0 (-> self root trans) gp-0 20480.0) (vector+float*! gp-0 gp-0 s5-0 f30-0) ) - (cloest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f)) (if (< (vector-vector-xz-distance gp-0 (-> self root trans)) 409.6) (set! (-> self enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag41) (-> self enemy-flags)))) (set! (-> self enemy-flags) (the-as enemy-flag (logclear (-> self enemy-flags) (enemy-flag enemy-flag41)))) @@ -692,7 +692,7 @@ (set! (-> gp-0 y) 0.0) (vector-normalize! gp-0 -819.2) (vector+! gp-0 gp-0 (-> self root trans)) - (cloest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f)) (if (< (vector-vector-xz-distance gp-0 (-> self root trans)) 409.6) (set! (-> self enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag41) (-> self enemy-flags)))) (set! (-> self enemy-flags) (the-as enemy-flag (logclear (-> self enemy-flags) (enemy-flag enemy-flag41)))) diff --git a/goal_src/jak2/levels/forest/fish.gc b/goal_src/jak2/levels/forest/fish.gc index 5cc98f6183b..a47e5f2b115 100644 --- a/goal_src/jak2/levels/forest/fish.gc +++ b/goal_src/jak2/levels/forest/fish.gc @@ -428,7 +428,7 @@ (.add.mul.w.vf.xyz vf6 vf4 vf0 acc) (.svf (&-> a1-54 quad) vf6) ) - (cloest-point-on-mesh (-> self nav) s2-0 s2-0 sv-720) + (closest-point-on-mesh (-> self nav) s2-0 s2-0 sv-720) (set! (-> s2-0 y) -1638.4) (let ((v1-124 (handle->process (-> s1-0 handle)))) (when v1-124 diff --git a/goal_src/jak2/levels/nest/boss/metalkor-states.gc b/goal_src/jak2/levels/nest/boss/metalkor-states.gc index 98558437a54..18dfce78e86 100644 --- a/goal_src/jak2/levels/nest/boss/metalkor-states.gc +++ b/goal_src/jak2/levels/nest/boss/metalkor-states.gc @@ -2070,7 +2070,7 @@ (vector+! (-> self root trans) (-> self root trans) s4-0) ) (set! (-> self current-nav-poly) - (cloest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) + (closest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) ) (let ((s4-1 (new 'stack 'collide-query))) (if (above-ground? (-> self root) s4-1 (-> self root trans) (collide-spec backgnd) 12288.0 122880.0 1024.0) @@ -2260,7 +2260,7 @@ (set-time! (-> self state-time)) (set! (-> self shots-fired) 0) (set! (-> self current-nav-poly) - (cloest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) + (closest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) ) ) :exit (behavior () @@ -2321,7 +2321,7 @@ :enter (behavior () (set-time! (-> self state-time)) (set! (-> self current-nav-poly) - (cloest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) + (closest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) ) ) :trans (behavior () @@ -2625,7 +2625,7 @@ :enter (behavior () (set-time! (-> self state-time)) (set! (-> self current-nav-poly) - (cloest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) + (closest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) ) (ja :group! metalkor-walk-ja) ) @@ -2729,7 +2729,7 @@ (vector+! (-> self root trans) (-> self root trans) s5-1) ) (set! (-> self current-nav-poly) - (cloest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) + (closest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) ) (let ((s5-2 (new 'stack 'collide-query))) (if (above-ground? (-> self root) s5-2 (-> self root trans) (collide-spec backgnd) 12288.0 122880.0 1024.0) diff --git a/goal_src/jak2/levels/nest/mammoth.gc b/goal_src/jak2/levels/nest/mammoth.gc index ab1c0a00b68..05a66a985b1 100644 --- a/goal_src/jak2/levels/nest/mammoth.gc +++ b/goal_src/jak2/levels/nest/mammoth.gc @@ -258,7 +258,7 @@ (get-point-in-path! (-> self path) (new 'stack-no-clear 'vector) (the float (-> self path-index)) 'interp) ) ) - (cloest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f)) (set! (-> self move-pos 0 quad) (-> self move-pos 1 quad)) (set! (-> self move-pos 1 quad) (-> gp-0 quad)) ) @@ -279,7 +279,7 @@ s4-0 ) (vector+! gp-0 s4-0 s5-1) - (cloest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f)) (set! (-> self travel-dest quad) (-> gp-0 quad)) ) (let ((a0-5 (-> self nav state)) diff --git a/goal_src/jak2/levels/nest/mantis.gc b/goal_src/jak2/levels/nest/mantis.gc index 319d093ad92..80578d4d1cf 100644 --- a/goal_src/jak2/levels/nest/mantis.gc +++ b/goal_src/jak2/levels/nest/mantis.gc @@ -741,7 +741,7 @@ (s3-0 (new 'stack-no-clear 'vector)) ) (let ((f30-1 (* 4096.0 (rnd-float-range self 8.0 12.0))) - (s1-0 (cloest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f))) + (s1-0 (closest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f))) ) (vector-normalize-copy! s2-0 s4-1 1.0) (vector-rotate-around-y! s2-0 s2-0 (if (< 0.0 (vector-dot s2-0 s0-0)) @@ -1608,7 +1608,7 @@ (s5-1 (vector+float*! (new 'stack-no-clear 'vector) s3-0 a0-2 arg2)) (s2-0 (new 'stack-no-clear 'vector)) ) - (cloest-point-on-mesh (-> arg0 nav) s5-1 s5-1 (the-as nav-poly #f)) + (closest-point-on-mesh (-> arg0 nav) s5-1 s5-1 (the-as nav-poly #f)) (vector-! s2-0 s5-1 s3-0) (clamp-vector-to-mesh-cross-gaps (-> arg0 nav) diff --git a/goal_src/jak2/levels/palace/boss/squid-extras.gc b/goal_src/jak2/levels/palace/boss/squid-extras.gc index 66ebb679878..68cf00f5248 100644 --- a/goal_src/jak2/levels/palace/boss/squid-extras.gc +++ b/goal_src/jak2/levels/palace/boss/squid-extras.gc @@ -346,7 +346,7 @@ (when (-> self current-nav-poly) (vector+! (-> self root trans) (-> self root trans) (-> self root transv)) (set! (-> self current-nav-poly) - (cloest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) + (closest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) ) (let ((s3-0 (-> self nav)) (a1-14 (-> self current-nav-poly)) diff --git a/goal_src/jak2/levels/palace/boss/squid-setup.gc b/goal_src/jak2/levels/palace/boss/squid-setup.gc index 26ffa2b94d8..27bfa1a3135 100644 --- a/goal_src/jak2/levels/palace/boss/squid-setup.gc +++ b/goal_src/jak2/levels/palace/boss/squid-setup.gc @@ -398,7 +398,7 @@ (set! (-> self center-vel quad) (-> arg3 quad)) (change-to arg2 self) (set! (-> self current-nav-poly) - (cloest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (the-as nav-poly #f)) ) (set! (-> self part) (create-launch-control group-squid-whirlwind-fire self)) (set! (-> self whirl-sound) (new-sound-id)) @@ -1915,7 +1915,7 @@ (+! (-> sv-672 y) 8192.0) (set! (-> s3-0 quad) (-> arg0 quad)) (set! (-> s3-0 y) (-> this nav state mesh bounds y)) - (set! (-> this current-nav-poly) (cloest-point-on-mesh (-> this nav) s3-0 s3-0 (-> this current-nav-poly))) + (set! (-> this current-nav-poly) (closest-point-on-mesh (-> this nav) s3-0 s3-0 (-> this current-nav-poly))) (cond ((-> this current-nav-poly) (vector-! sv-656 (-> this nav state mesh bounds) s3-0) @@ -2312,7 +2312,7 @@ (set! (-> s5-0 quad) (-> this trans quad)) (set! (-> this trans y) (-> this nav state mesh bounds y)) (set! (-> this current-nav-poly) - (cloest-point-on-mesh (-> this nav) (-> this trans) (-> this trans) (-> this current-nav-poly)) + (closest-point-on-mesh (-> this nav) (-> this trans) (-> this trans) (-> this current-nav-poly)) ) (set! (-> this trans y) (-> s5-0 y)) (let ((f0-2 409.6)) diff --git a/goal_src/jak2/levels/palace/boss/squid-states.gc b/goal_src/jak2/levels/palace/boss/squid-states.gc index 50848822d94..49f78442e6d 100644 --- a/goal_src/jak2/levels/palace/boss/squid-states.gc +++ b/goal_src/jak2/levels/palace/boss/squid-states.gc @@ -1003,7 +1003,7 @@ (vector-seek-3d-smooth! (-> self trans) gp-3 (* 4096.0 f30-1) 0.5) (set! (-> gp-3 quad) (-> self trans quad)) (set! (-> self current-nav-poly) - (cloest-point-on-mesh (-> self nav) gp-3 (-> self trans) (-> self current-nav-poly)) + (closest-point-on-mesh (-> self nav) gp-3 (-> self trans) (-> self current-nav-poly)) ) (let ((s2-1 (-> self nav)) (a1-15 (-> self current-nav-poly)) @@ -1118,7 +1118,7 @@ (vector+float*! s5-0 s5-0 (-> gp-0 target-position) f30-0) (set! (-> s5-0 y) (-> self nav state mesh bounds y)) (set! (-> gp-0 target-position quad) (-> s5-0 quad)) - (let ((a1-5 (cloest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f))) + (let ((a1-5 (closest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f))) (a3-1 (new 'stack-no-clear 'vector)) (s3-0 (-> self nav)) (s4-2 s5-0) diff --git a/goal_src/jak2/levels/ruins/rapid-gunner.gc b/goal_src/jak2/levels/ruins/rapid-gunner.gc index f6472df568d..ff3e29a35e9 100644 --- a/goal_src/jak2/levels/ruins/rapid-gunner.gc +++ b/goal_src/jak2/levels/ruins/rapid-gunner.gc @@ -912,7 +912,7 @@ (.add.mul.w.vf.xyz vf6 vf4 vf0 acc) (.svf (&-> a2-0 quad) vf6) (set! (-> self dest-pos quad) (-> s5-0 quad)) - (cloest-point-on-mesh (-> self nav) (-> self dest-pos) a2-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) (-> self dest-pos) a2-0 (the-as nav-poly #f)) ) (if (< (vector-vector-distance s5-0 (-> self dest-pos)) 6144.0) (go-hostile self) diff --git a/goal_src/jak2/levels/stadium/stadium-obs.gc b/goal_src/jak2/levels/stadium/stadium-obs.gc index f44a9dce1da..fe1e805ff81 100644 --- a/goal_src/jak2/levels/stadium/stadium-obs.gc +++ b/goal_src/jak2/levels/stadium/stadium-obs.gc @@ -1597,7 +1597,7 @@ (when v1-14 (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> v1-14 quad)) - (cloest-point-on-mesh (-> self nav) gp-1 gp-1 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) gp-1 gp-1 (the-as nav-poly #f)) (let ((v1-19 (-> self nav state))) (logclear! (-> v1-19 flags) (nav-state-flag directional-mode)) (logior! (-> v1-19 flags) (nav-state-flag target-poly-dirty)) diff --git a/goal_src/jak2/levels/tomb/tomb-beetle.gc b/goal_src/jak2/levels/tomb/tomb-beetle.gc index 2362185c9ba..f6d80ebffd7 100644 --- a/goal_src/jak2/levels/tomb/tomb-beetle.gc +++ b/goal_src/jak2/levels/tomb/tomb-beetle.gc @@ -439,7 +439,7 @@ ) (vector+! (-> self move-dest) (-> self root trans) gp-0) ) - (cloest-point-on-mesh (-> self nav) (-> self move-dest) (-> self move-dest) (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) (-> self move-dest) (-> self move-dest) (the-as nav-poly #f)) (let ((a0-23 (-> self nav state)) (v1-19 (-> self move-dest)) ) diff --git a/goal_src/jak3/engine/target/board/board-states.gc b/goal_src/jak3/engine/target/board/board-states.gc index 04b0ac03c3f..a52afc20bd8 100644 --- a/goal_src/jak3/engine/target/board/board-states.gc +++ b/goal_src/jak3/engine/target/board/board-states.gc @@ -783,7 +783,7 @@ ) ) (suspend) - (can-play-stance-amibent?) + (can-play-stance-ambient?) ) ) #f diff --git a/goal_src/jak3/engine/target/flut/target-flut.gc b/goal_src/jak3/engine/target/flut/target-flut.gc index 1b931e38885..ee7ca810e48 100644 --- a/goal_src/jak3/engine/target/flut/target-flut.gc +++ b/goal_src/jak3/engine/target/flut/target-flut.gc @@ -1295,7 +1295,7 @@ ) ) (until #f - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (ja :num! (loop!)) ) diff --git a/goal_src/jak3/engine/target/gun/gun-states.gc b/goal_src/jak3/engine/target/gun/gun-states.gc index 36e26d3725e..7ce50421318 100644 --- a/goal_src/jak3/engine/target/gun/gun-states.gc +++ b/goal_src/jak3/engine/target/gun/gun-states.gc @@ -264,7 +264,7 @@ (set! s5-0 (-> self gun gun-type)) (suspend) (ja :num! (loop!)) - (when (can-play-stance-amibent?) + (when (can-play-stance-ambient?) (set-time! (-> self ambient-time)) (target-gun-end-mode #t) ) diff --git a/goal_src/jak3/engine/target/mech/mech-states.gc b/goal_src/jak3/engine/target/mech/mech-states.gc index 47b9c52321b..d82a9b5f020 100644 --- a/goal_src/jak3/engine/target/mech/mech-states.gc +++ b/goal_src/jak3/engine/target/mech/mech-states.gc @@ -174,7 +174,7 @@ (set! (-> a0-44 param 0) 1.0) (joint-control-channel-group-eval! a0-44 (the-as art-joint-anim #f) num-func-loop!) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) ) ) #f diff --git a/goal_src/jak3/engine/target/pilot-states.gc b/goal_src/jak3/engine/target/pilot-states.gc index 2bd2c59d75b..d07550099a8 100644 --- a/goal_src/jak3/engine/target/pilot-states.gc +++ b/goal_src/jak3/engine/target/pilot-states.gc @@ -53,7 +53,7 @@ (set! (-> s5-2 frame-num) (ja-aframe f0-6 2)) ) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) ) #f @@ -91,7 +91,7 @@ (set! (-> s5-2 frame-num) (ja-aframe f0-6 2)) ) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) ) #f @@ -129,7 +129,7 @@ (set! (-> s5-2 frame-num) (ja-aframe f0-6 2)) ) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) ) #f @@ -156,7 +156,7 @@ (set! (-> s5-1 frame-num) (ja-aframe f30-0 1)) ) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) ) #f @@ -220,7 +220,7 @@ ) ) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) ) #f diff --git a/goal_src/jak3/engine/target/target-anim.gc b/goal_src/jak3/engine/target/target-anim.gc index 046577a51a8..744fe32edec 100644 --- a/goal_src/jak3/engine/target/target-anim.gc +++ b/goal_src/jak3/engine/target/target-anim.gc @@ -590,7 +590,7 @@ ) (suspend) (ja :num! (loop!)) - (if (can-play-stance-amibent?) + (if (can-play-stance-ambient?) (go target-stance-ambient) ) ) @@ -1829,14 +1829,14 @@ (until #f (ja-no-eval :group! jakb-edge-grab-stance0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (ja :num! (seek!)) ) (+! (-> self anim-seed) 1) (ja-no-eval :group! jakb-edge-grab-stance1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (ja :num! (seek!)) ) diff --git a/goal_src/jak3/engine/target/target-ladder.gc b/goal_src/jak3/engine/target/target-ladder.gc index c3bd8338b03..c245cd4130e 100644 --- a/goal_src/jak3/engine/target/target-ladder.gc +++ b/goal_src/jak3/engine/target/target-ladder.gc @@ -223,7 +223,7 @@ (if (!= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0) (go target-ladder-walk-up) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) ) :code (behavior () (let ((v1-2 (ja-group))) diff --git a/goal_src/jak3/engine/target/target-swim.gc b/goal_src/jak3/engine/target/target-swim.gc index 3f6c175ffb5..0d08f873fa9 100644 --- a/goal_src/jak3/engine/target/target-swim.gc +++ b/goal_src/jak3/engine/target/target-swim.gc @@ -473,7 +473,7 @@ (until #f (ja :group! jakb-swim-stance-ja :num! min) (until (and (ja-done? 0) (= (-> self skel root-channel 0) (-> self skel channel))) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (if (= (-> self skel root-channel 0) (-> self skel channel)) (ja :num! (seek!)) diff --git a/goal_src/jak3/engine/target/target-turret.gc b/goal_src/jak3/engine/target/target-turret.gc index ef5039d2737..b503d8a53c5 100644 --- a/goal_src/jak3/engine/target/target-turret.gc +++ b/goal_src/jak3/engine/target/target-turret.gc @@ -1644,7 +1644,7 @@ (ja :group! jakb-turret-stance-ja) (until (target-turret-exit-turret?) (suspend) - (can-play-stance-amibent?) + (can-play-stance-ambient?) ) (none) ) @@ -1701,7 +1701,7 @@ ) ) (ja :num! (loop! 0.5)) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) ) (none) @@ -1714,7 +1714,7 @@ (ja :group! jakb-turret-stance-ja) (until v1-3 (suspend) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (set! v1-3 (or (ja-done? 0) (target-turret-exit-turret?))) ) (none) @@ -1727,7 +1727,7 @@ (ja :group! jakb-turret-for-fire-ja) (until v1-11 (suspend) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (ja :num! (seek!)) (set! v1-11 (or (ja-done? 0) (target-turret-exit-turret?))) ) diff --git a/goal_src/jak3/engine/target/target-util.gc b/goal_src/jak3/engine/target/target-util.gc index b0eadc9051c..71d3e913fd4 100644 --- a/goal_src/jak3/engine/target/target-util.gc +++ b/goal_src/jak3/engine/target/target-util.gc @@ -1258,7 +1258,7 @@ ) ) -(defbehavior can-play-stance-amibent? target () +(defbehavior can-play-stance-ambient? target () (and (or (and (kiosk?) (>= (+ -300000 (-> *display* real-clock frame-counter)) (seconds 60)) (>= (- (-> *display* base-clock frame-counter) (-> self control cpad change-time)) (seconds 60)) diff --git a/goal_src/jak3/engine/target/target2.gc b/goal_src/jak3/engine/target/target2.gc index fa919a0bd1f..e4fd8979ba1 100644 --- a/goal_src/jak3/engine/target/target2.gc +++ b/goal_src/jak3/engine/target/target2.gc @@ -285,7 +285,7 @@ (if (!= (-> self cam-user-mode) 'look-around) (go target-stance-look-around) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) ) #f @@ -768,7 +768,7 @@ ) (ja-no-eval :group! jakb-pole-cycle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (ja :num! (seek!)) ) diff --git a/test/decompiler/reference/jak1/engine/target/target-util_REF.gc b/test/decompiler/reference/jak1/engine/target/target-util_REF.gc index d948041298e..60a74e61fcb 100644 --- a/test/decompiler/reference/jak1/engine/target/target-util_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/target-util_REF.gc @@ -805,8 +805,8 @@ ) ) -;; definition for function can-play-stance-amibent? -(defbehavior can-play-stance-amibent? target () +;; definition for function can-play-stance-ambient? +(defbehavior can-play-stance-ambient? target () (and (time-elapsed? (-> self state-time) (seconds 30)) (not (-> *setting-control* current talking)) (not (-> *setting-control* current spooling)) diff --git a/test/decompiler/reference/jak1/engine/target/target_REF.gc b/test/decompiler/reference/jak1/engine/target/target_REF.gc index 1cec14bd477..79024628964 100644 --- a/test/decompiler/reference/jak1/engine/target/target_REF.gc +++ b/test/decompiler/reference/jak1/engine/target/target_REF.gc @@ -555,7 +555,7 @@ (ja :num! (loop!)) (ja :chan 1 :num! (chan 0)) (ja :chan 2 :num! (chan 0)) - (if (can-play-stance-amibent?) + (if (can-play-stance-ambient?) (go target-stance-ambient) ) ) diff --git a/test/decompiler/reference/jak2/engine/nav/nav-control-h_REF.gc b/test/decompiler/reference/jak2/engine/nav/nav-control-h_REF.gc index 81072304800..32efa100186 100644 --- a/test/decompiler/reference/jak2/engine/nav/nav-control-h_REF.gc +++ b/test/decompiler/reference/jak2/engine/nav/nav-control-h_REF.gc @@ -274,7 +274,7 @@ (debug-draw (_type_) none) (point-in-bsphere? (_type_ vector) symbol) (find-poly-containing-point-1 (_type_ vector) nav-poly) - (cloest-point-on-mesh (_type_ vector vector nav-poly) nav-poly) + (closest-point-on-mesh (_type_ vector vector nav-poly) nav-poly) (find-nearest-poly-to-point (_type_ vector) nav-poly) (project-point-onto-plane-of-poly (_type_ nav-poly vector vector vector) none) (find-poly-containing-point-2 (_type_ vector) nav-poly) diff --git a/test/decompiler/reference/jak2/engine/nav/nav-control_REF.gc b/test/decompiler/reference/jak2/engine/nav/nav-control_REF.gc index d64290229b5..1673bd334fa 100644 --- a/test/decompiler/reference/jak2/engine/nav/nav-control_REF.gc +++ b/test/decompiler/reference/jak2/engine/nav/nav-control_REF.gc @@ -2477,7 +2477,7 @@ ) ;; definition for method 12 of type nav-control -(defmethod cloest-point-on-mesh ((this nav-control) (arg0 vector) (arg1 vector) (arg2 nav-poly)) +(defmethod closest-point-on-mesh ((this nav-control) (arg0 vector) (arg1 vector) (arg2 nav-poly)) (local-vars (sv-16 vector)) (set! sv-16 arg0) (let ((gp-0 (new 'stack-no-clear 'nav-find-poly-parms))) diff --git a/test/decompiler/reference/jak2/engine/nav/nav-enemy_REF.gc b/test/decompiler/reference/jak2/engine/nav/nav-enemy_REF.gc index 84e33733f9c..fa2d58011d9 100644 --- a/test/decompiler/reference/jak2/engine/nav/nav-enemy_REF.gc +++ b/test/decompiler/reference/jak2/engine/nav/nav-enemy_REF.gc @@ -109,7 +109,7 @@ (set! (-> s4-0 quad) (-> gp-0 trans quad)) ) (else - (if (or (not (cloest-point-on-mesh (-> s3-0 nav) s4-0 (-> gp-0 trans) (the-as nav-poly #f))) + (if (or (not (closest-point-on-mesh (-> s3-0 nav) s4-0 (-> gp-0 trans) (the-as nav-poly #f))) (let ((f0-0 32768.0)) (< (* f0-0 f0-0) (vector-vector-xz-distance-squared s4-0 (-> gp-0 trans))) ) @@ -2300,7 +2300,7 @@ (vector-normalize! s4-0 (rnd-float-range self 16384.0 49152.0)) (vector-rotate-around-y! s4-0 s4-0 f30-1) (vector+! s5-0 s5-0 s4-0) - (if (and (cloest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f)) + (if (and (closest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f)) (< 4096.0 (vector-vector-xz-distance s5-0 (-> self root trans))) ) (return #f) @@ -2458,7 +2458,7 @@ ) (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self root trans quad)) - (cloest-point-on-mesh (-> self nav) gp-1 s5-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) gp-1 s5-0 (the-as nav-poly #f)) (if (< (vector-vector-xz-distance gp-1 (-> self root trans)) 409.6) (set! (-> self enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag41) (-> self enemy-flags)))) (set! (-> self enemy-flags) (the-as enemy-flag (logclear (-> self enemy-flags) (enemy-flag enemy-flag41)))) diff --git a/test/decompiler/reference/jak2/engine/target/board/board-states_REF.gc b/test/decompiler/reference/jak2/engine/target/board/board-states_REF.gc index 888f0fab06a..c8585007ce7 100644 --- a/test/decompiler/reference/jak2/engine/target/board/board-states_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/board/board-states_REF.gc @@ -690,7 +690,7 @@ ) ) (suspend) - (can-play-stance-amibent?) + (can-play-stance-ambient?) ) ) #f diff --git a/test/decompiler/reference/jak2/engine/target/mech/mech-states_REF.gc b/test/decompiler/reference/jak2/engine/target/mech/mech-states_REF.gc index 5b73190dbe8..4f1d01d75e6 100644 --- a/test/decompiler/reference/jak2/engine/target/mech/mech-states_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/mech/mech-states_REF.gc @@ -162,7 +162,7 @@ (set! (-> a0-44 param 0) 1.0) (joint-control-channel-group-eval! a0-44 (the-as art-joint-anim #f) num-func-loop!) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) ) ) #f diff --git a/test/decompiler/reference/jak2/engine/target/target-anim_REF.gc b/test/decompiler/reference/jak2/engine/target/target-anim_REF.gc index 5ef8c403bcc..9d2654d68a6 100644 --- a/test/decompiler/reference/jak2/engine/target/target-anim_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-anim_REF.gc @@ -436,7 +436,7 @@ (until #f (suspend) (ja :num! (loop!)) - (if (can-play-stance-amibent?) + (if (can-play-stance-ambient?) (go target-stance-ambient) ) ) @@ -1634,14 +1634,14 @@ (until #f (ja-no-eval :group! jakb-edge-grab-stance0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (ja :num! (seek!)) ) (+! (-> self anim-seed) 1) (ja-no-eval :group! jakb-edge-grab-stance1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (ja :num! (seek!)) ) diff --git a/test/decompiler/reference/jak2/engine/target/target-swim_REF.gc b/test/decompiler/reference/jak2/engine/target/target-swim_REF.gc index 4a9b553b302..2bb42a44ee3 100644 --- a/test/decompiler/reference/jak2/engine/target/target-swim_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-swim_REF.gc @@ -485,7 +485,7 @@ (until #f (ja :group! jakb-swim-stance-ja :num! min) (until (and (ja-done? 0) (= (-> self skel root-channel 0) (-> self skel channel))) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (if (= (-> self skel root-channel 0) (-> self skel channel)) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak2/engine/target/target-turret_REF.gc b/test/decompiler/reference/jak2/engine/target/target-turret_REF.gc index e213b0c3d8d..f7b222220f4 100644 --- a/test/decompiler/reference/jak2/engine/target/target-turret_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-turret_REF.gc @@ -2395,7 +2395,7 @@ (ja :group! jakb-turret-stance-ja) (until v1-19 (suspend) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (ja :num! (loop! 0.5)) (set! v1-19 (and (or (not (-> self control unknown-handle02)) (cpad-pressed? (-> self control cpad number) triangle)) diff --git a/test/decompiler/reference/jak2/engine/target/target-util_REF.gc b/test/decompiler/reference/jak2/engine/target/target-util_REF.gc index 23c1e3eda51..7bd89d3d2ec 100644 --- a/test/decompiler/reference/jak2/engine/target/target-util_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target-util_REF.gc @@ -1212,8 +1212,8 @@ ) ) -;; definition for function can-play-stance-amibent? -(defbehavior can-play-stance-amibent? target () +;; definition for function can-play-stance-ambient? +(defbehavior can-play-stance-ambient? target () (and (or (and (= *kernel-boot-message* 'kiosk) (>= (+ -300000 (-> *display* real-clock frame-counter)) (seconds 60)) (>= (- (-> *display* base-clock frame-counter) (-> self control cpad change-time)) (seconds 60)) diff --git a/test/decompiler/reference/jak2/engine/target/target2_REF.gc b/test/decompiler/reference/jak2/engine/target/target2_REF.gc index 122e4209cd2..127743a791a 100644 --- a/test/decompiler/reference/jak2/engine/target/target2_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/target2_REF.gc @@ -612,7 +612,7 @@ ) (ja-no-eval :group! jakb-pole-cycle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (ja :num! (seek!)) ) diff --git a/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc b/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc index a8112cd2ed3..06255cac295 100644 --- a/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc +++ b/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc @@ -1188,7 +1188,7 @@ (set-vector! s4-0 (* 8192.0 (cos f28-0)) 0.0 (* 8192.0 (sin f28-0)) 1.0) ) (vector+! s4-0 s4-0 gp-0) - (cloest-point-on-mesh (-> self nav) s4-0 s4-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) s4-0 s4-0 (the-as nav-poly #f)) (vector-! s5-0 s4-0 gp-0) (set! (-> s5-0 y) 0.0) (vector-normalize! s5-0 30720.0) diff --git a/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc b/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc index c111032d80f..583ff7b0fb9 100644 --- a/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc @@ -2715,7 +2715,7 @@ ) (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> self root trans quad)) - (cloest-point-on-mesh (-> self nav) gp-1 s5-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) gp-1 s5-0 (the-as nav-poly #f)) (if (< (vector-vector-xz-distance gp-1 (-> self root trans)) 409.6) (set! (-> self enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag41) (-> self enemy-flags)))) (set! (-> self enemy-flags) (the-as enemy-flag (logclear (-> self enemy-flags) (enemy-flag enemy-flag41)))) diff --git a/test/decompiler/reference/jak2/levels/city/common/pilot-states_REF.gc b/test/decompiler/reference/jak2/levels/city/common/pilot-states_REF.gc index 03bb3d60851..9c597efb017 100644 --- a/test/decompiler/reference/jak2/levels/city/common/pilot-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/common/pilot-states_REF.gc @@ -49,7 +49,7 @@ (set! (-> s5-2 frame-num) (ja-aframe f0-6 2)) ) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) ) #f diff --git a/test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc_REF.gc b/test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc_REF.gc index 9a783c6804e..675c8caf7cc 100644 --- a/test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc_REF.gc @@ -260,7 +260,7 @@ (set! (-> s4-0 y) (-> s3-1 best-other-tri intersect y)) (let ((s3-2 (new 'stack-no-clear 'vector))) (do-navigation-to-destination (-> this nav state) (-> this root trans)) - (when (cloest-point-on-mesh (-> this nav) s3-2 s4-0 (the-as nav-poly #f)) + (when (closest-point-on-mesh (-> this nav) s3-2 s4-0 (the-as nav-poly #f)) (let ((f0-4 2048.0)) (when (>= (* f0-4 f0-4) (vector-vector-xz-distance-squared s3-2 s4-0)) (set! (-> arg0 quad) (-> s3-2 quad)) diff --git a/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc_REF.gc b/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc_REF.gc index 0f386dbf12e..9927d38ab47 100644 --- a/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc_REF.gc @@ -671,7 +671,7 @@ (set! (-> s4-0 y) (-> s3-1 best-other-tri intersect y)) (let ((s3-2 (new 'stack-no-clear 'vector))) (do-navigation-to-destination (-> this nav state) (-> this root trans)) - (when (cloest-point-on-mesh (-> this nav) s3-2 s4-0 (the-as nav-poly #f)) + (when (closest-point-on-mesh (-> this nav) s3-2 s4-0 (the-as nav-poly #f)) (let ((f0-4 2048.0)) (when (>= (* f0-4 f0-4) (vector-vector-xz-distance-squared s3-2 s4-0)) (set! (-> arg0 quad) (-> s3-2 quad)) diff --git a/test/decompiler/reference/jak2/levels/city/meet-brutter/meet-brutter_REF.gc b/test/decompiler/reference/jak2/levels/city/meet-brutter/meet-brutter_REF.gc index 88b435adca8..b33993b45b4 100644 --- a/test/decompiler/reference/jak2/levels/city/meet-brutter/meet-brutter_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/meet-brutter/meet-brutter_REF.gc @@ -868,7 +868,7 @@ (cond ((-> self coming-from-pw) (let ((s5-1 (-> self nav)) - (s4-0 (method-of-type nav-control cloest-point-on-mesh)) + (s4-0 (method-of-type nav-control closest-point-on-mesh)) (s3-0 gp-0) (s2-0 (new 'stack-no-clear 'vector)) ) @@ -893,7 +893,7 @@ (set! (-> self coming-from-pw) #f) ) (else - (cloest-point-on-mesh (-> self nav) gp-0 (-> self root trans) (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) gp-0 (-> self root trans) (the-as nav-poly #f)) (when (< 4096.0 (vector-vector-xz-distance gp-0 (-> self root trans))) (set! (-> self root transv x) (- (-> gp-0 x) (-> self root trans x))) (set! (-> self root transv y) 40960.0) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc index 1ee2cb75935..33b4c6af7e4 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc @@ -2318,7 +2318,7 @@ (s3-0 (new 'stack-no-clear 'vector)) ) (vector+! s3-0 (-> arg1 trans) arg2) - (cloest-point-on-mesh (-> arg0 nav) s4-0 s3-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> arg0 nav) s4-0 s3-0 (the-as nav-poly #f)) (cond ((< 409.6 (vector-vector-distance s3-0 s4-0)) #f diff --git a/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc index 4283a1628a5..00432003058 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc @@ -370,7 +370,7 @@ ;; INFO: Used lq/sq ;; WARN: Return type mismatch vector vs none. (defmethod grenadier-method-182 ((this grenadier) (arg0 vector)) - (cloest-point-on-mesh (-> this nav) arg0 arg0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> this nav) arg0 arg0 (the-as nav-poly #f)) (set! (-> this bank final-pos quad) (-> arg0 quad)) (set! (-> this bank tangent-pos quad) (-> arg0 quad)) (set! (-> this move-pos quad) (-> this bank tangent-pos quad)) @@ -550,7 +550,7 @@ (set! (-> s4-0 quad) (-> self root trans quad)) (new 'stack-no-clear 'vector) (vector-normalize! s3-1 49152.0) - (cloest-point-on-mesh (-> self nav) s4-0 (vector+! s4-0 s5-0 s3-1) (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) s4-0 (vector+! s4-0 s5-0 s3-1) (the-as nav-poly #f)) (when (< 32768.0 (vector-vector-distance gp-0 s4-0)) (set! (-> self move-pos quad) (-> s4-0 quad)) (let ((a0-11 (-> self nav state)) @@ -891,7 +891,7 @@ (a2-2 (vector+! (new 'stack-no-clear 'vector) (-> self root trans) v1-8)) ) (set! (-> self move-pos quad) (-> self root trans quad)) - (cloest-point-on-mesh (-> self nav) (-> self move-pos) a2-2 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) (-> self move-pos) a2-2 (the-as nav-poly #f)) ) (let ((a0-10 (-> self nav state)) (v1-13 (-> self move-pos)) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc index 2fc17038a0d..61400770d8f 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc @@ -1606,7 +1606,7 @@ (when s5-0 (set! (-> this target-pos quad) (-> (get-trans (the-as process-focusable s5-0) 3) quad)) (if (= (-> this focus aware) (enemy-aware enemy-aware-3)) - (cloest-point-on-mesh (-> this nav) (-> this reachable-target-pos) (-> this target-pos) (the-as nav-poly #f)) + (closest-point-on-mesh (-> this nav) (-> this reachable-target-pos) (-> this target-pos) (the-as nav-poly #f)) ) (set! (-> this target-vel-vec quad) (-> (the-as process-focusable s5-0) root transv quad)) (set! (-> this target-vel) (vector-length (-> this target-vel-vec))) @@ -3094,7 +3094,7 @@ (s3-0 (new 'stack-no-clear 'vector)) ) (vector+! s3-0 (-> arg1 trans) arg2) - (cloest-point-on-mesh (-> arg0 nav) s4-0 s3-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> arg0 nav) s4-0 s3-0 (the-as nav-poly #f)) (cond ((< 409.6 (vector-vector-distance s3-0 s4-0)) #f diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc index 52695d57eb9..b2ff1c88853 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc @@ -455,7 +455,7 @@ ) ) ) - (cloest-point-on-mesh (-> self nav) (-> self dest-pos) (-> self dest-pos) (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) (-> self dest-pos) (-> self dest-pos) (the-as nav-poly #f)) (if #f (add-debug-line #t diff --git a/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc index ecbe4faa4ce..196f319fe24 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc @@ -455,7 +455,7 @@ ) ) (set! (-> this move-dest quad) (-> s5-0 quad)) - (cloest-point-on-mesh (-> this nav) (-> this move-dest) s4-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> this nav) (-> this move-dest) s4-0 (the-as nav-poly #f)) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/common/entities/gun-buoy_REF.gc b/test/decompiler/reference/jak2/levels/common/entities/gun-buoy_REF.gc index 464f9dfdc8a..fa2467a1689 100644 --- a/test/decompiler/reference/jak2/levels/common/entities/gun-buoy_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/entities/gun-buoy_REF.gc @@ -377,7 +377,7 @@ (vector+! s5-0 s4-0 v1-8) (cond ((logtest? (-> self flags) (gun-buoy-flags gubflags-0)) - (cloest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f)) (let ((v1-14 (-> self root trans))) (vector-length (vector-! (new 'stack-no-clear 'vector) v1-14 s5-0)) ) @@ -503,7 +503,7 @@ ) (set! (-> s5-0 y) -819.2) (let ((s3-2 (vector+! (new 'stack-no-clear 'vector) s4-0 s5-0))) - (cloest-point-on-mesh (-> self nav) s3-2 s3-2 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) s3-2 s3-2 (the-as nav-poly #f)) (set! (-> self root trans quad) (-> s3-2 quad)) ) (set! (-> self y-final) (-> self root trans y)) diff --git a/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc b/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc index c73e7af729d..df6b19d593e 100644 --- a/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc @@ -701,7 +701,7 @@ (vector+float*! gp-0 (-> self root trans) gp-0 20480.0) (vector+float*! gp-0 gp-0 s5-0 f30-0) ) - (cloest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f)) (if (< (vector-vector-xz-distance gp-0 (-> self root trans)) 409.6) (set! (-> self enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag41) (-> self enemy-flags)))) (set! (-> self enemy-flags) (the-as enemy-flag (logclear (-> self enemy-flags) (enemy-flag enemy-flag41)))) @@ -763,7 +763,7 @@ (set! (-> gp-0 y) 0.0) (vector-normalize! gp-0 -819.2) (vector+! gp-0 gp-0 (-> self root trans)) - (cloest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f)) (if (< (vector-vector-xz-distance gp-0 (-> self root trans)) 409.6) (set! (-> self enemy-flags) (the-as enemy-flag (logior (enemy-flag enemy-flag41) (-> self enemy-flags)))) (set! (-> self enemy-flags) (the-as enemy-flag (logclear (-> self enemy-flags) (enemy-flag enemy-flag41)))) diff --git a/test/decompiler/reference/jak2/levels/forest/fish_REF.gc b/test/decompiler/reference/jak2/levels/forest/fish_REF.gc index 2128a701206..1be9ac784a5 100644 --- a/test/decompiler/reference/jak2/levels/forest/fish_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/fish_REF.gc @@ -462,7 +462,7 @@ (.add.mul.w.vf.xyz vf6 vf4 vf0 acc) (.svf (&-> a1-54 quad) vf6) ) - (cloest-point-on-mesh (-> self nav) s2-0 s2-0 sv-720) + (closest-point-on-mesh (-> self nav) s2-0 s2-0 sv-720) (set! (-> s2-0 y) -1638.4) (let ((v1-124 (handle->process (-> s1-0 handle)))) (when v1-124 diff --git a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-states_REF.gc b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-states_REF.gc index 5902bbfe613..9e070b810d2 100644 --- a/test/decompiler/reference/jak2/levels/nest/boss/metalkor-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/boss/metalkor-states_REF.gc @@ -2074,7 +2074,7 @@ (vector+! (-> self root trans) (-> self root trans) s4-0) ) (set! (-> self current-nav-poly) - (cloest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) + (closest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) ) (let ((s4-1 (new 'stack 'collide-query))) (if (above-ground? (-> self root) s4-1 (-> self root trans) (collide-spec backgnd) 12288.0 122880.0 1024.0) @@ -2270,7 +2270,7 @@ (set-time! (-> self state-time)) (set! (-> self shots-fired) 0) (set! (-> self current-nav-poly) - (cloest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) + (closest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) ) ) :exit (behavior () @@ -2332,7 +2332,7 @@ :enter (behavior () (set-time! (-> self state-time)) (set! (-> self current-nav-poly) - (cloest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) + (closest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) ) ) :trans (behavior () @@ -2640,7 +2640,7 @@ :enter (behavior () (set-time! (-> self state-time)) (set! (-> self current-nav-poly) - (cloest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) + (closest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) ) (ja :group! metalkor-walk-ja) ) @@ -2744,7 +2744,7 @@ (vector+! (-> self root trans) (-> self root trans) s5-1) ) (set! (-> self current-nav-poly) - (cloest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) + (closest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) ) (let ((s5-2 (new 'stack 'collide-query))) (if (above-ground? (-> self root) s5-2 (-> self root trans) (collide-spec backgnd) 12288.0 122880.0 1024.0) diff --git a/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc b/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc index 104fbef39b9..36ceddc0ab3 100644 --- a/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc @@ -319,7 +319,7 @@ (get-point-in-path! (-> self path) (new 'stack-no-clear 'vector) (the float (-> self path-index)) 'interp) ) ) - (cloest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f)) (set! (-> self move-pos 0 quad) (-> self move-pos 1 quad)) (set! (-> self move-pos 1 quad) (-> gp-0 quad)) ) @@ -338,7 +338,7 @@ (vector-normalize! s5-1 65536.0) (vector-line-distance-point! (-> self root trans) (-> self move-pos 0) (-> self move-pos 1) s4-0) (vector+! gp-0 s4-0 s5-1) - (cloest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) gp-0 gp-0 (the-as nav-poly #f)) (set! (-> self travel-dest quad) (-> gp-0 quad)) ) (let ((a0-5 (-> self nav state)) diff --git a/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc b/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc index e1c6e907610..0716bbf036b 100644 --- a/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc @@ -788,7 +788,7 @@ (s3-0 (new 'stack-no-clear 'vector)) ) (let ((f30-1 (* 4096.0 (rnd-float-range self 8.0 12.0))) - (s1-0 (cloest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f))) + (s1-0 (closest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f))) ) (vector-normalize-copy! s2-0 s4-1 1.0) (vector-rotate-around-y! s2-0 s2-0 (if (< 0.0 (vector-dot s2-0 s0-0)) @@ -1684,7 +1684,7 @@ (s5-1 (vector+float*! (new 'stack-no-clear 'vector) s3-0 a0-2 arg2)) (s2-0 (new 'stack-no-clear 'vector)) ) - (cloest-point-on-mesh (-> arg0 nav) s5-1 s5-1 (the-as nav-poly #f)) + (closest-point-on-mesh (-> arg0 nav) s5-1 s5-1 (the-as nav-poly #f)) (vector-! s2-0 s5-1 s3-0) (clamp-vector-to-mesh-cross-gaps (-> arg0 nav) diff --git a/test/decompiler/reference/jak2/levels/palace/boss/squid-extras_REF.gc b/test/decompiler/reference/jak2/levels/palace/boss/squid-extras_REF.gc index 9a33968bc26..ae3d835393e 100644 --- a/test/decompiler/reference/jak2/levels/palace/boss/squid-extras_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/boss/squid-extras_REF.gc @@ -356,7 +356,7 @@ (when (-> self current-nav-poly) (vector+! (-> self root trans) (-> self root trans) (-> self root transv)) (set! (-> self current-nav-poly) - (cloest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) + (closest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (-> self current-nav-poly)) ) (let ((s3-0 (-> self nav)) (a1-14 (-> self current-nav-poly)) diff --git a/test/decompiler/reference/jak2/levels/palace/boss/squid-setup_REF.gc b/test/decompiler/reference/jak2/levels/palace/boss/squid-setup_REF.gc index e4e6c56bd33..9b4dd499e94 100644 --- a/test/decompiler/reference/jak2/levels/palace/boss/squid-setup_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/boss/squid-setup_REF.gc @@ -622,7 +622,7 @@ (set! (-> self center-vel quad) (-> arg3 quad)) (change-to arg2 self) (set! (-> self current-nav-poly) - (cloest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) (-> self root trans) (-> self root trans) (the-as nav-poly #f)) ) (set! (-> self part) (create-launch-control group-squid-whirlwind-fire self)) (set! (-> self whirl-sound) (new-sound-id)) @@ -2176,7 +2176,7 @@ (+! (-> sv-672 y) 8192.0) (set! (-> s3-0 quad) (-> arg0 quad)) (set! (-> s3-0 y) (-> this nav state mesh bounds y)) - (set! (-> this current-nav-poly) (cloest-point-on-mesh (-> this nav) s3-0 s3-0 (-> this current-nav-poly))) + (set! (-> this current-nav-poly) (closest-point-on-mesh (-> this nav) s3-0 s3-0 (-> this current-nav-poly))) (cond ((-> this current-nav-poly) (vector-! sv-656 (-> this nav state mesh bounds) s3-0) @@ -2583,7 +2583,7 @@ (set! (-> s5-0 quad) (-> this trans quad)) (set! (-> this trans y) (-> this nav state mesh bounds y)) (set! (-> this current-nav-poly) - (cloest-point-on-mesh (-> this nav) (-> this trans) (-> this trans) (-> this current-nav-poly)) + (closest-point-on-mesh (-> this nav) (-> this trans) (-> this trans) (-> this current-nav-poly)) ) (set! (-> this trans y) (-> s5-0 y)) (let ((f0-2 409.6)) diff --git a/test/decompiler/reference/jak2/levels/palace/boss/squid-states_REF.gc b/test/decompiler/reference/jak2/levels/palace/boss/squid-states_REF.gc index d7d21ca4ec2..deae221d546 100644 --- a/test/decompiler/reference/jak2/levels/palace/boss/squid-states_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/boss/squid-states_REF.gc @@ -1012,7 +1012,7 @@ (vector-seek-3d-smooth! (-> self trans) gp-3 (* 4096.0 f30-1) 0.5) (set! (-> gp-3 quad) (-> self trans quad)) (set! (-> self current-nav-poly) - (cloest-point-on-mesh (-> self nav) gp-3 (-> self trans) (-> self current-nav-poly)) + (closest-point-on-mesh (-> self nav) gp-3 (-> self trans) (-> self current-nav-poly)) ) (let ((s2-1 (-> self nav)) (a1-15 (-> self current-nav-poly)) @@ -1131,7 +1131,7 @@ (vector+float*! s5-0 s5-0 (-> gp-0 target-position) f30-0) (set! (-> s5-0 y) (-> self nav state mesh bounds y)) (set! (-> gp-0 target-position quad) (-> s5-0 quad)) - (let ((a1-5 (cloest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f))) + (let ((a1-5 (closest-point-on-mesh (-> self nav) s5-0 s5-0 (the-as nav-poly #f))) (a3-1 (new 'stack-no-clear 'vector)) (s3-0 (-> self nav)) (s4-2 s5-0) diff --git a/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc b/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc index e776f21e25f..4d1400503e2 100644 --- a/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc @@ -948,7 +948,7 @@ (.add.mul.w.vf.xyz vf6 vf4 vf0 acc) (.svf (&-> a2-0 quad) vf6) (set! (-> self dest-pos quad) (-> s5-0 quad)) - (cloest-point-on-mesh (-> self nav) (-> self dest-pos) a2-0 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) (-> self dest-pos) a2-0 (the-as nav-poly #f)) ) (if (< (vector-vector-distance s5-0 (-> self dest-pos)) 6144.0) (go-hostile self) diff --git a/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc b/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc index 8f92b2d4949..89c123be9d2 100644 --- a/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc @@ -1784,7 +1784,7 @@ (when v1-14 (let ((gp-1 (new 'stack-no-clear 'vector))) (set! (-> gp-1 quad) (-> v1-14 quad)) - (cloest-point-on-mesh (-> self nav) gp-1 gp-1 (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) gp-1 gp-1 (the-as nav-poly #f)) (let ((v1-19 (-> self nav state))) (logclear! (-> v1-19 flags) (nav-state-flag directional-mode)) (logior! (-> v1-19 flags) (nav-state-flag target-poly-dirty)) diff --git a/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc b/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc index a94b098ff13..24032ecc371 100644 --- a/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc @@ -484,7 +484,7 @@ ) (vector+! (-> self move-dest) (-> self root trans) gp-0) ) - (cloest-point-on-mesh (-> self nav) (-> self move-dest) (-> self move-dest) (the-as nav-poly #f)) + (closest-point-on-mesh (-> self nav) (-> self move-dest) (-> self move-dest) (the-as nav-poly #f)) (let ((a0-23 (-> self nav state)) (v1-19 (-> self move-dest)) ) diff --git a/test/decompiler/reference/jak3/engine/target/board/board-states_REF.gc b/test/decompiler/reference/jak3/engine/target/board/board-states_REF.gc index 45a32490a67..7fef51ff680 100644 --- a/test/decompiler/reference/jak3/engine/target/board/board-states_REF.gc +++ b/test/decompiler/reference/jak3/engine/target/board/board-states_REF.gc @@ -796,7 +796,7 @@ ) ) (suspend) - (can-play-stance-amibent?) + (can-play-stance-ambient?) ) ) #f diff --git a/test/decompiler/reference/jak3/engine/target/flut/target-flut_REF.gc b/test/decompiler/reference/jak3/engine/target/flut/target-flut_REF.gc index eabd7b3c342..daef4d80193 100644 --- a/test/decompiler/reference/jak3/engine/target/flut/target-flut_REF.gc +++ b/test/decompiler/reference/jak3/engine/target/flut/target-flut_REF.gc @@ -1343,7 +1343,7 @@ ) ) (until #f - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (ja :num! (loop!)) ) diff --git a/test/decompiler/reference/jak3/engine/target/gun/gun-states_REF.gc b/test/decompiler/reference/jak3/engine/target/gun/gun-states_REF.gc index d4f642fb20c..5875e41aaaa 100644 --- a/test/decompiler/reference/jak3/engine/target/gun/gun-states_REF.gc +++ b/test/decompiler/reference/jak3/engine/target/gun/gun-states_REF.gc @@ -274,7 +274,7 @@ (set! s5-0 (-> self gun gun-type)) (suspend) (ja :num! (loop!)) - (when (can-play-stance-amibent?) + (when (can-play-stance-ambient?) (set-time! (-> self ambient-time)) (target-gun-end-mode #t) ) diff --git a/test/decompiler/reference/jak3/engine/target/mech/mech-states_REF.gc b/test/decompiler/reference/jak3/engine/target/mech/mech-states_REF.gc index 69a88d75afc..54d5261aaba 100644 --- a/test/decompiler/reference/jak3/engine/target/mech/mech-states_REF.gc +++ b/test/decompiler/reference/jak3/engine/target/mech/mech-states_REF.gc @@ -183,7 +183,7 @@ (set! (-> a0-44 param 0) 1.0) (joint-control-channel-group-eval! a0-44 (the-as art-joint-anim #f) num-func-loop!) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) ) ) #f diff --git a/test/decompiler/reference/jak3/engine/target/pilot-states_REF.gc b/test/decompiler/reference/jak3/engine/target/pilot-states_REF.gc index 607ef6370c3..f6ec5b728ba 100644 --- a/test/decompiler/reference/jak3/engine/target/pilot-states_REF.gc +++ b/test/decompiler/reference/jak3/engine/target/pilot-states_REF.gc @@ -49,7 +49,7 @@ (set! (-> s5-2 frame-num) (ja-aframe f0-6 2)) ) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) ) #f @@ -88,7 +88,7 @@ (set! (-> s5-2 frame-num) (ja-aframe f0-6 2)) ) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) ) #f @@ -127,7 +127,7 @@ (set! (-> s5-2 frame-num) (ja-aframe f0-6 2)) ) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) ) #f @@ -155,7 +155,7 @@ (set! (-> s5-1 frame-num) (ja-aframe f30-0 1)) ) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) ) #f @@ -220,7 +220,7 @@ ) ) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) ) #f diff --git a/test/decompiler/reference/jak3/engine/target/target-anim_REF.gc b/test/decompiler/reference/jak3/engine/target/target-anim_REF.gc index 8241f59591a..bb488528bdd 100644 --- a/test/decompiler/reference/jak3/engine/target/target-anim_REF.gc +++ b/test/decompiler/reference/jak3/engine/target/target-anim_REF.gc @@ -586,7 +586,7 @@ ) (suspend) (ja :num! (loop!)) - (if (can-play-stance-amibent?) + (if (can-play-stance-ambient?) (go target-stance-ambient) ) ) @@ -1847,14 +1847,14 @@ (until #f (ja-no-eval :group! jakb-edge-grab-stance0-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (ja :num! (seek!)) ) (+! (-> self anim-seed) 1) (ja-no-eval :group! jakb-edge-grab-stance1-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (ja :num! (seek!)) ) diff --git a/test/decompiler/reference/jak3/engine/target/target-ladder_REF.gc b/test/decompiler/reference/jak3/engine/target/target-ladder_REF.gc index 66c6583a7d7..4fc7f85303a 100644 --- a/test/decompiler/reference/jak3/engine/target/target-ladder_REF.gc +++ b/test/decompiler/reference/jak3/engine/target/target-ladder_REF.gc @@ -224,7 +224,7 @@ (if (!= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0) (go target-ladder-walk-up) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) ) :code (behavior () (let ((v1-2 (ja-group))) diff --git a/test/decompiler/reference/jak3/engine/target/target-swim_REF.gc b/test/decompiler/reference/jak3/engine/target/target-swim_REF.gc index 61ce69042c9..c0ae5307a41 100644 --- a/test/decompiler/reference/jak3/engine/target/target-swim_REF.gc +++ b/test/decompiler/reference/jak3/engine/target/target-swim_REF.gc @@ -492,7 +492,7 @@ (until #f (ja :group! jakb-swim-stance-ja :num! min) (until (and (ja-done? 0) (= (-> self skel root-channel 0) (-> self skel channel))) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (if (= (-> self skel root-channel 0) (-> self skel channel)) (ja :num! (seek!)) diff --git a/test/decompiler/reference/jak3/engine/target/target-turret_REF.gc b/test/decompiler/reference/jak3/engine/target/target-turret_REF.gc index 09314e35e78..54e151f6dd6 100644 --- a/test/decompiler/reference/jak3/engine/target/target-turret_REF.gc +++ b/test/decompiler/reference/jak3/engine/target/target-turret_REF.gc @@ -1837,7 +1837,7 @@ (ja :group! jakb-turret-stance-ja) (until (target-turret-exit-turret?) (suspend) - (can-play-stance-amibent?) + (can-play-stance-ambient?) ) (none) ) @@ -1895,7 +1895,7 @@ ) ) (ja :num! (loop! 0.5)) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) ) (none) @@ -1909,7 +1909,7 @@ (ja :group! jakb-turret-stance-ja) (until v1-3 (suspend) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (set! v1-3 (or (ja-done? 0) (target-turret-exit-turret?))) ) (none) @@ -1923,7 +1923,7 @@ (ja :group! jakb-turret-for-fire-ja) (until v1-11 (suspend) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (ja :num! (seek!)) (set! v1-11 (or (ja-done? 0) (target-turret-exit-turret?))) ) diff --git a/test/decompiler/reference/jak3/engine/target/target-util_REF.gc b/test/decompiler/reference/jak3/engine/target/target-util_REF.gc index 4989878d8d8..a8f61540cab 100644 --- a/test/decompiler/reference/jak3/engine/target/target-util_REF.gc +++ b/test/decompiler/reference/jak3/engine/target/target-util_REF.gc @@ -1397,8 +1397,8 @@ ) ) -;; definition for function can-play-stance-amibent? -(defbehavior can-play-stance-amibent? target () +;; definition for function can-play-stance-ambient? +(defbehavior can-play-stance-ambient? target () (and (or (and (kiosk?) (>= (+ -300000 (-> *display* real-clock frame-counter)) (seconds 60)) (>= (- (-> *display* base-clock frame-counter) (-> self control cpad change-time)) (seconds 60)) diff --git a/test/decompiler/reference/jak3/engine/target/target2_REF.gc b/test/decompiler/reference/jak3/engine/target/target2_REF.gc index 34f98aa93c6..c3fbd6476dd 100644 --- a/test/decompiler/reference/jak3/engine/target/target2_REF.gc +++ b/test/decompiler/reference/jak3/engine/target/target2_REF.gc @@ -285,7 +285,7 @@ (if (!= (-> self cam-user-mode) 'look-around) (go target-stance-look-around) ) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) ) #f @@ -776,7 +776,7 @@ ) (ja-no-eval :group! jakb-pole-cycle-ja :num! (seek!) :frame-num 0.0) (until (ja-done? 0) - (can-play-stance-amibent?) + (can-play-stance-ambient?) (suspend) (ja :num! (seek!)) )